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-arndale.dts | 26 ++++++++++++++++++++++++++ arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 2 +- arch/arm/boot/dts/exynos5250.dtsi | 6 ++++-- 3 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts index 3937993..95c08e7 100644 --- a/arch/arm/boot/dts/exynos5250-arndale.dts +++ b/arch/arm/boot/dts/exynos5250-arndale.dts @@ -485,4 +485,30 @@ rtc { status = "okay"; }; + + leds { + compatible = "gpio-leds"; + + user1 { + label = "D12"; + gpios = <&gpy6 5 1 0 0>; + linux,default-trigger = "heartbeat"; + }; + + user2 { + label = "D13"; + gpios = <&gpy6 6 1 0 0>; + }; + + user3 { + label = "D14"; + gpios = <&gpy6 7 1 0 0>; + }; + + user4 { + label = "D15"; + gpios = <&gpy6 4 1 0 0>; + }; + }; + }; diff --git a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi index 03f5b89..7e26955 100644 --- a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi +++ b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi @@ -708,6 +708,7 @@ }; };
+ /* moved to ACPI pinctrl@10d10000 { gpv0: gpv0 { gpio-controller; @@ -770,7 +771,6 @@ }; };
- /* moved to ACPI pinctrl@03860000 { gpz: gpz { gpio-controller; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index f7aa20f..515f79e 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -48,8 +48,10 @@ i2c8 = &i2c_8; pinctrl0 = &pinctrl_0; pinctrl1 = &pinctrl_1; + /* Moved to ACPI pinctrl2 = &pinctrl_2; - /* pinctrl3 = &pinctrl_3; */ + pinctrl3 = &pinctrl_3; + */ };
cpus { @@ -146,13 +148,13 @@ interrupts = <0 45 0>; };
+ /* Moved to ACPI pinctrl_2: pinctrl@10d10000 { compatible = "samsung,exynos5250-pinctrl"; reg = <0x10d10000 0x1000>; interrupts = <0 50 0>; };
- /* pinctrl_3: pinctrl@03860000 { compatible = "samsung,exynos5250-pinctrl"; reg = <0x03860000 0x1000>;