Merge branch 'sprd/dt' into next/dt

[linux-2.6-block.git] / arch / arm / boot / dts / tegra30-apalis.dtsi

diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi
index d1d21ec2a844905b5831a6c1a1d8098857cc54de..2f807d40c1b792bd35c662bcd243588b7fa91d0b 100644 (file)
--- a/arch/arm/boot/dts/tegra30-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra30-apalis.dtsi
@@ -10,6 +10,10 @@
        model = "Toradex Apalis T30";
        compatible = "toradex,apalis_t30", "nvidia,tegra30";
 
+       memory@80000000 {
+               reg = <0x80000000 0x40000000>;
+       };
+
        pcie@3000 {
                avdd-pexa-supply = <&vdd2_reg>;
                vdd-pexa-supply = <&vdd2_reg>;
@@ -118,6 +122,7 @@
                                nvidia,function = "spi4";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                               nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                        };
                        /* CAN_INT2 */
                        spi2_cs2_n_pw3 {
@@ -585,8 +590,6 @@
                /* STMPE811 touch screen controller */
                stmpe811@41 {
                        compatible = "st,stmpe811";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
                        reg = <0x41>;
                        interrupts = <TEGRA_GPIO(V, 0) IRQ_TYPE_LEVEL_LOW>;
                        interrupt-parent = <&gpio>;
@@ -595,7 +598,7 @@
                        blocks = <0x5>;
                        irq-trigger = <0x1>;
 
-                       stmpe_touchscreen@0 {
+                       stmpe_touchscreen {
                                compatible = "st,stmpe-ts";
                                /* 3.25 MHz ADC clock speed */
                                st,adc-freq = <1>;