From: Al Stone ahs3@redhat.com
These are FDT changes only.
Signed-off-by: Al Stone al.stone@linaro.org --- arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 2 +- arch/arm/boot/dts/exynos5250.dtsi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi index 7e26955..656e381 100644 --- a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi +++ b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi @@ -562,6 +562,7 @@ }; };
+ /* moved to ACPI pinctrl@13400000 { gpe0: gpe0 { gpio-controller; @@ -708,7 +709,6 @@ }; };
- /* moved to ACPI pinctrl@10d10000 { gpv0: gpv0 { gpio-controller; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 515f79e..7262532 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -47,8 +47,8 @@ i2c7 = &i2c_7; i2c8 = &i2c_8; pinctrl0 = &pinctrl_0; - pinctrl1 = &pinctrl_1; /* Moved to ACPI + pinctrl1 = &pinctrl_1; pinctrl2 = &pinctrl_2; pinctrl3 = &pinctrl_3; */ @@ -142,13 +142,13 @@ }; };
+ /* Moved to ACPI pinctrl_1: pinctrl@13400000 { compatible = "samsung,exynos5250-pinctrl"; reg = <0x13400000 0x1000>; interrupts = <0 45 0>; };
- /* Moved to ACPI pinctrl_2: pinctrl@10d10000 { compatible = "samsung,exynos5250-pinctrl"; reg = <0x10d10000 0x1000>;