From: Graeme Gregory graeme.gregory@linaro.org
To allow prototype to probe i2c from ACPI we need to remove the FDT definitions of the same device.
Signed-off-by: Graeme Gregory graeme.gregory@linaro.org --- arch/arm/boot/dts/exynos5250-arndale.dts | 12 +++++++----- arch/arm/boot/dts/exynos5250.dtsi | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts index b2781ef..8ccdb6b 100644 --- a/arch/arm/boot/dts/exynos5250-arndale.dts +++ b/arch/arm/boot/dts/exynos5250-arndale.dts @@ -37,6 +37,7 @@ samsung,mfc-l = <0x51000000 0x800000>; };
+/* i2c@12C60000 { samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <20000>; @@ -352,11 +353,12 @@ reg = <0x38>; }; }; +*/
sata@122F0000 { samsung,sata-freq = <66>; }; - + dwmmc_0: dwmmc0@12200000 { num-slots = <1>; supports-highspeed; @@ -516,12 +518,12 @@ }; };
- hdmi { +/* hdmi { hpd-gpio = <&gpx3 7 0xf 1 3>; vdd_osc-supply = <&ldo10_reg>; vdd_pll-supply = <&ldo8_reg>; vdd-supply = <&ldo8_reg>; - }; + };*/
mmc_reg: voltage-regulator { compatible = "regulator-fixed"; @@ -546,7 +548,7 @@
leds { compatible = "gpio-leds"; - + user1 { label = "D12"; gpios = <&gpy6 5 1 0 0>; @@ -564,6 +566,6 @@ label = "D15"; gpios = <&gpy6 4 1 0 0>; }; - + }; }; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index ac3de7e..c52497f 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -35,7 +35,7 @@ mshc1 = &dwmmc_1; mshc2 = &dwmmc_2; mshc3 = &dwmmc_3; - i2c0 = &i2c_0; +/* i2c0 = &i2c_0; i2c1 = &i2c_1; i2c2 = &i2c_2; i2c3 = &i2c_3; @@ -43,7 +43,7 @@ i2c5 = &i2c_5; i2c6 = &i2c_6; i2c7 = &i2c_7; - i2c8 = &i2c_8; + i2c8 = &i2c_8;*/ };
gic:interrupt-controller@10481000 { @@ -184,7 +184,7 @@ reg = <0x12170000 0x1ff>; };
- i2c_0: i2c@12C60000 { +/* i2c_0: i2c@12C60000 { compatible = "samsung,s3c2440-i2c"; reg = <0x12C60000 0x100>; interrupts = <0 56 0>; @@ -261,7 +261,7 @@ reg = <0x121D0000 0x100>; #address-cells = <1>; #size-cells = <0>; - }; + };*/
spi_0: spi@12d20000 { compatible = "samsung,exynos4210-spi";