From: Al Stone ahs3@redhat.com
Signed-off-by: Al Stone al.stone@linaro.org --- arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 2 ++ arch/arm/boot/dts/exynos5250.dtsi | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi index 724a22f..03f5b89 100644 --- a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi +++ b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi @@ -770,6 +770,7 @@ }; };
+ /* moved to ACPI pinctrl@03860000 { gpz: gpz { gpio-controller; @@ -787,4 +788,5 @@ samsung,pin-drv = <0>; }; }; + */ }; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index ef57277..f7aa20f 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -49,7 +49,7 @@ pinctrl0 = &pinctrl_0; pinctrl1 = &pinctrl_1; pinctrl2 = &pinctrl_2; - pinctrl3 = &pinctrl_3; + /* pinctrl3 = &pinctrl_3; */ };
cpus { @@ -152,11 +152,13 @@ interrupts = <0 50 0>; };
+ /* pinctrl_3: pinctrl@03860000 { compatible = "samsung,exynos5250-pinctrl"; reg = <0x03860000 0x1000>; interrupts = <0 47 0>; }; + */
watchdog { clocks = <&clock 336>; @@ -420,7 +422,7 @@ samsung,supports-secdai; samsung,idma-addr = <0x03000000>; pinctrl-names = "default"; - pinctrl-0 = <&i2s0_bus>; + /* pinctrl-0 = <&i2s0_bus>; */ };
i2s1: i2s@12D60000 {