Commit 88c166ce authored by Maciej Purski's avatar Maciej Purski Committed by Krzysztof Kozlowski

ARM: dts: exynos: Use pinctrl labels in exynos4210-pinctrl

Labels for pinctrl's are defined in exynos4210.dtsi. Use them in
exynos4210-pinctrl instead of full names, as it is done in other Exynos
DTSes.
Signed-off-by: default avatarMaciej Purski <m.purski@samsung.com>
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parent 0cfec8ed
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
#include <dt-bindings/pinctrl/samsung.h> #include <dt-bindings/pinctrl/samsung.h>
/ { &pinctrl_0 {
pinctrl@11400000 {
gpa0: gpa0 { gpa0: gpa0 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
...@@ -418,9 +417,9 @@ lcd_data24: lcd-data-width24 { ...@@ -418,9 +417,9 @@ lcd_data24: lcd-data-width24 {
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
}; };
}; };
pinctrl@11000000 { &pinctrl_1 {
gpj0: gpj0 { gpj0: gpj0 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
...@@ -838,9 +837,9 @@ hdmi_cec: hdmi-cec { ...@@ -838,9 +837,9 @@ hdmi_cec: hdmi-cec {
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
}; };
}; };
pinctrl@3860000 { &pinctrl_2 {
gpz: gpz { gpz: gpz {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
...@@ -861,5 +860,4 @@ pcm0_bus: pcm0-bus { ...@@ -861,5 +860,4 @@ pcm0_bus: pcm0-bus {
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
}; };
};
}; };
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
*/ */
#include "exynos4.dtsi" #include "exynos4.dtsi"
#include "exynos4210-pinctrl.dtsi"
#include "exynos4-cpu-thermal.dtsi" #include "exynos4-cpu-thermal.dtsi"
/ { / {
...@@ -468,3 +467,5 @@ &rotator { ...@@ -468,3 +467,5 @@ &rotator {
&sysmmu_rotator { &sysmmu_rotator {
power-domains = <&pd_lcd0>; power-domains = <&pd_lcd0>;
}; };
#include "exynos4210-pinctrl.dtsi"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment