ARM: dts: exynos: Use macros for pinctrl configuration on exynos5260

Usage of DTS macros instead of hard-coded numbers makes code easier to
read.  One does not have to remember which value means pull-up/down or
specific driver strength.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>

2 files changed, 95 insertions, 95 deletions

diff --git a/arch/arm/boot/dts/exynos5260-pinctrl.dtsi b/arch/arm/boot/dts/exynos5260-pinctrl.dtsi
index 39c046758029..1b911a219a27 100644
--- a/arch/arm/boot/dts/exynos5260-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5260-pinctrl.dtsi
@@ -185,217 +185,217 @@
 
         uart0_data: uart0-data {
                 samsung,pins = "gpa0-0", "gpa0-1";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         uart0_fctl: uart0-fctl {
                 samsung,pins = "gpa0-2", "gpa0-3";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         uart1_data: uart1-data {
                 samsung,pins = "gpa1-0", "gpa1-1";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         uart1_fctl: uart1-fctl {
                 samsung,pins = "gpa1-2", "gpa1-3";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         uart2_data: uart2-data {
                 samsung,pins = "gpa1-4", "gpa1-5";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         spi0_bus: spi0-bus {
                 samsung,pins = "gpa2-0", "gpa2-2", "gpa2-3";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         spi1_bus: spi1-bus {
                 samsung,pins = "gpa2-4", "gpa2-6", "gpa2-7";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         usb3_vbus0_en: usb3-vbus0-en {
                 samsung,pins = "gpa2-4";
-                samsung,pin-function = <1>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         i2s1_bus: i2s1-bus {
                 samsung,pins = "gpb0-0", "gpb0-1", "gpb0-2", "gpb0-3",
                                 "gpb0-4";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         pcm1_bus: pcm1-bus {
                 samsung,pins = "gpb0-0", "gpb0-1", "gpb0-2", "gpb0-3",
                                 "gpb0-4";
-                samsung,pin-function = <3>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         spdif1_bus: spdif1-bus {
                 samsung,pins = "gpb0-0", "gpb0-1", "gpb0-2";
-                samsung,pin-function = <4>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         spi2_bus: spi2-bus {
                 samsung,pins = "gpb1-0", "gpb1-2", "gpb1-3";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         i2c0_hs_bus: i2c0-hs-bus {
                 samsung,pins = "gpb3-0", "gpb3-1";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         i2c1_hs_bus: i2c1-hs-bus {
                 samsung,pins = "gpb3-2", "gpb3-3";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         i2c2_hs_bus: i2c2-hs-bus {
                 samsung,pins = "gpb3-4", "gpb3-5";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         i2c3_hs_bus: i2c3-hs-bus {
                 samsung,pins = "gpb3-6", "gpb3-7";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         i2c4_bus: i2c4-bus {
                 samsung,pins = "gpb4-0", "gpb4-1";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         i2c5_bus: i2c5-bus {
                 samsung,pins = "gpb4-2", "gpb4-3";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         i2c6_bus: i2c6-bus {
                 samsung,pins = "gpb4-4", "gpb4-5";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         i2c7_bus: i2c7-bus {
                 samsung,pins = "gpb4-6", "gpb4-7";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         i2c8_bus: i2c8-bus {
                 samsung,pins = "gpb5-0", "gpb5-1";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         i2c9_bus: i2c9-bus {
                 samsung,pins = "gpb5-2", "gpb5-3";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         i2c10_bus: i2c10-bus {
                 samsung,pins = "gpb5-4", "gpb5-5";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         i2c11_bus: i2c11-bus {
                 samsung,pins = "gpb5-6", "gpb5-7";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         cam_gpio_a: cam-gpio-a {
                 samsung,pins = "gpe0-0", "gpe0-1", "gpe0-2", "gpe0-3",
                         "gpe0-4", "gpe0-5", "gpe0-6", "gpe0-7",
                         "gpe1-0", "gpe1-1";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         cam_gpio_b: cam-gpio-b {
                 samsung,pins = "gpf0-0", "gpf0-1", "gpf0-2", "gpf0-3",
                         "gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3";
-                samsung,pin-function = <3>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         cam_i2c1_bus: cam-i2c1-bus {
                 samsung,pins = "gpf0-2", "gpf0-3";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         cam_i2c0_bus: cam-i2c0-bus {
                 samsung,pins = "gpf0-0", "gpf0-1";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         cam_spi0_bus: cam-spi0-bus {
                 samsung,pins = "gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 
         cam_spi1_bus: cam-spi1-bus {
                 samsung,pins = "gpf1-4", "gpf1-5", "gpf1-6", "gpf1-7";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                samsung,pin-drv = <0>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 };
 
@@ -442,114 +442,114 @@
 
         sd0_clk: sd0-clk {
                 samsung,pins = "gpc0-0";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                samsung,pin-drv = <3>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV6>;
         };
 
         sd0_cmd: sd0-cmd {
                 samsung,pins = "gpc0-1";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                samsung,pin-drv = <3>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV6>;
         };
 
         sd0_bus1: sd0-bus-width1 {
                 samsung,pins = "gpc0-2";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <3>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV6>;
         };
 
         sd0_bus4: sd0-bus-width4 {
                 samsung,pins = "gpc0-3", "gpc0-4", "gpc0-5";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <3>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV6>;
         };
 
         sd0_bus8: sd0-bus-width8 {
                 samsung,pins = "gpc3-0", "gpc3-1", "gpc3-2", "gpc3-3";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <3>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV6>;
         };
 
         sd0_rdqs: sd0-rdqs {
                 samsung,pins = "gpc0-6";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <3>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV6>;
         };
 
         sd1_clk: sd1-clk {
                 samsung,pins = "gpc1-0";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                samsung,pin-drv = <3>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV6>;
         };
 
         sd1_cmd: sd1-cmd {
                 samsung,pins = "gpc1-1";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                samsung,pin-drv = <3>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV6>;
         };
 
         sd1_bus1: sd1-bus-width1 {
                 samsung,pins = "gpc1-2";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <3>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV6>;
         };
 
         sd1_bus4: sd1-bus-width4 {
                 samsung,pins = "gpc1-3", "gpc1-4", "gpc1-5";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <3>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV6>;
         };
 
         sd1_bus8: sd1-bus-width8 {
                 samsung,pins = "gpc4-0", "gpc4-1", "gpc4-2", "gpc4-3";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <3>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV6>;
         };
 
         sd2_clk: sd2-clk {
                 samsung,pins = "gpc2-0";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                samsung,pin-drv = <3>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV6>;
         };
 
         sd2_cmd: sd2-cmd {
                 samsung,pins = "gpc2-1";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                samsung,pin-drv = <3>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV6>;
         };
 
         sd2_cd: sd2-cd {
                 samsung,pins = "gpc2-2";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <3>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV6>;
         };
 
         sd2_bus1: sd2-bus-width1 {
                 samsung,pins = "gpc2-3";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <3>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV6>;
         };
 
         sd2_bus4: sd2-bus-width4 {
                 samsung,pins = "gpc2-4", "gpc2-5", "gpc2-6";
-                samsung,pin-function = <2>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
                 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                samsung,pin-drv = <3>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV6>;
         };
 };
 
diff --git a/arch/arm/boot/dts/exynos5260-xyref5260.dts b/arch/arm/boot/dts/exynos5260-xyref5260.dts
index 3daef94bee38..ccbdc8ad3da3 100644
--- a/arch/arm/boot/dts/exynos5260-xyref5260.dts
+++ b/arch/arm/boot/dts/exynos5260-xyref5260.dts
@@ -42,9 +42,9 @@
 &pinctrl_0 {
         hdmi_hpd_irq: hdmi-hpd-irq {
                 samsung,pins = "gpx3-7";
-                samsung,pin-function = <0>;
-                samsung,pin-pud = <1>;
-                samsung,pin-drv = <0>;
+                samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
+                samsung,pin-drv = <EXYNOS5260_PIN_DRV_LV1>;
         };
 };