[PATCH v3 14/17] ARM: dts: s3c64xx: Use common macros for pinctrl configuration

[Krzysztof Kozlowski]

From: Krzysztof Kozlowski 

Replace duplicated macros in each DTSI file with a common macro coming
from header.  Include the header in each pinctrl DTSI so further changes
could use it.

Although PIN_FUNC_SPC_2 does not bring much information about the
function itself, it still is more descriptive then hard-coded
number <2>.

Signed-off-by: Krzysztof Kozlowski 
Reviewed-by: Javier Martinez Canillas 
---
 arch/arm/boot/dts/s3c6410-mini6410.dts |   4 +-
 arch/arm/boot/dts/s3c64xx-pinctrl.dtsi | 180 -
 2 files changed, 91 insertions(+), 93 deletions(-)

diff --git a/arch/arm/boot/dts/s3c6410-mini6410.dts 
b/arch/arm/boot/dts/s3c6410-mini6410.dts
index a25debb50401..f4afda3594f8 100644
--- a/arch/arm/boot/dts/s3c6410-mini6410.dts
+++ b/arch/arm/boot/dts/s3c6410-mini6410.dts
@@ -201,13 +201,13 @@
  {
gpio_leds: gpio-leds {
samsung,pins = "gpk-4", "gpk-5", "gpk-6", "gpk-7";
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
gpio_keys: gpio-keys {
samsung,pins = "gpn-0", "gpn-1", "gpn-2", "gpn-3",
"gpn-4", "gpn-5", "gpl-11", "gpl-12";
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 };
 
diff --git a/arch/arm/boot/dts/s3c64xx-pinctrl.dtsi 
b/arch/arm/boot/dts/s3c64xx-pinctrl.dtsi
index b1197d8b04de..93810d992c3f 100644
--- a/arch/arm/boot/dts/s3c64xx-pinctrl.dtsi
+++ b/arch/arm/boot/dts/s3c64xx-pinctrl.dtsi
@@ -12,9 +12,7 @@
  * published by the Free Software Foundation.
  */
 
-#define PIN_PULL_NONE  0
-#define PIN_PULL_DOWN  1
-#define PIN_PULL_UP2
+#include 
 
  {
/*
@@ -139,219 +137,219 @@
uart0_data: uart0-data {
samsung,pins = "gpa-0", "gpa-1";
samsung,pin-function = <2>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
uart0_fctl: uart0-fctl {
samsung,pins = "gpa-2", "gpa-3";
samsung,pin-function = <2>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
uart1_data: uart1-data {
samsung,pins = "gpa-4", "gpa-5";
samsung,pin-function = <2>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
uart1_fctl: uart1-fctl {
samsung,pins = "gpa-6", "gpa-7";
samsung,pin-function = <2>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
uart2_data: uart2-data {
samsung,pins = "gpb-0", "gpb-1";
samsung,pin-function = <2>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
uart3_data: uart3-data {
samsung,pins = "gpb-2", "gpb-3";
samsung,pin-function = <2>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
ext_dma_0: ext-dma-0 {
samsung,pins = "gpb-0", "gpb-1";
samsung,pin-function = <3>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
ext_dma_1: ext-dma-1 {
samsung,pins = "gpb-2", "gpb-3";
samsung,pin-function = <4>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
irda_data_0: irda-data-0 {
samsung,pins = "gpb-0", "gpb-1";
samsung,pin-function = <4>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
irda_data_1: irda-data-1 {
samsung,pins = "gpb-2", "gpb-3";
samsung,pin-function = <3>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
irda_sdbw: irda-sdbw {
samsung,pins = "gpb-4";
samsung,pin-function = <2>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
i2c0_bus: i2c0-bus {
samsung,pins = "gpb-5", "gpb-6";
samsung,pin-function = <2>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
i2c1_bus: i2c1-bus {
/* S3C6410-only */
samsung,pins = "gpb-2", "gpb-3";
samsung,pin-function = <6>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
spi0_bus: spi0-bus {
samsung,pins = "gpc-0", "gpc-1", "gpc-2";
samsung,pin-function = <2>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
spi0_cs: spi0-cs {
samsung,pins = "gpc-3";
samsung,pin-function = <2>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
spi1_bus: spi1-bus {

[PATCH v3 14/17] ARM: dts: s3c64xx: Use common macros for pinctrl configuration

[Krzysztof Kozlowski]

From: Krzysztof Kozlowski 

Replace duplicated macros in each DTSI file with a common macro coming
from header.  Include the header in each pinctrl DTSI so further changes
could use it.

Although PIN_FUNC_SPC_2 does not bring much information about the
function itself, it still is more descriptive then hard-coded
number <2>.

Signed-off-by: Krzysztof Kozlowski 
Reviewed-by: Javier Martinez Canillas 
---
 arch/arm/boot/dts/s3c6410-mini6410.dts |   4 +-
 arch/arm/boot/dts/s3c64xx-pinctrl.dtsi | 180 -
 2 files changed, 91 insertions(+), 93 deletions(-)

diff --git a/arch/arm/boot/dts/s3c6410-mini6410.dts 
b/arch/arm/boot/dts/s3c6410-mini6410.dts
index a25debb50401..f4afda3594f8 100644
--- a/arch/arm/boot/dts/s3c6410-mini6410.dts
+++ b/arch/arm/boot/dts/s3c6410-mini6410.dts
@@ -201,13 +201,13 @@
  {
gpio_leds: gpio-leds {
samsung,pins = "gpk-4", "gpk-5", "gpk-6", "gpk-7";
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
gpio_keys: gpio-keys {
samsung,pins = "gpn-0", "gpn-1", "gpn-2", "gpn-3",
"gpn-4", "gpn-5", "gpl-11", "gpl-12";
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 };
 
diff --git a/arch/arm/boot/dts/s3c64xx-pinctrl.dtsi 
b/arch/arm/boot/dts/s3c64xx-pinctrl.dtsi
index b1197d8b04de..93810d992c3f 100644
--- a/arch/arm/boot/dts/s3c64xx-pinctrl.dtsi
+++ b/arch/arm/boot/dts/s3c64xx-pinctrl.dtsi
@@ -12,9 +12,7 @@
  * published by the Free Software Foundation.
  */
 
-#define PIN_PULL_NONE  0
-#define PIN_PULL_DOWN  1
-#define PIN_PULL_UP2
+#include 
 
  {
/*
@@ -139,219 +137,219 @@
uart0_data: uart0-data {
samsung,pins = "gpa-0", "gpa-1";
samsung,pin-function = <2>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
uart0_fctl: uart0-fctl {
samsung,pins = "gpa-2", "gpa-3";
samsung,pin-function = <2>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
uart1_data: uart1-data {
samsung,pins = "gpa-4", "gpa-5";
samsung,pin-function = <2>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
uart1_fctl: uart1-fctl {
samsung,pins = "gpa-6", "gpa-7";
samsung,pin-function = <2>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
uart2_data: uart2-data {
samsung,pins = "gpb-0", "gpb-1";
samsung,pin-function = <2>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
uart3_data: uart3-data {
samsung,pins = "gpb-2", "gpb-3";
samsung,pin-function = <2>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
ext_dma_0: ext-dma-0 {
samsung,pins = "gpb-0", "gpb-1";
samsung,pin-function = <3>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
ext_dma_1: ext-dma-1 {
samsung,pins = "gpb-2", "gpb-3";
samsung,pin-function = <4>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
irda_data_0: irda-data-0 {
samsung,pins = "gpb-0", "gpb-1";
samsung,pin-function = <4>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
irda_data_1: irda-data-1 {
samsung,pins = "gpb-2", "gpb-3";
samsung,pin-function = <3>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
irda_sdbw: irda-sdbw {
samsung,pins = "gpb-4";
samsung,pin-function = <2>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
i2c0_bus: i2c0-bus {
samsung,pins = "gpb-5", "gpb-6";
samsung,pin-function = <2>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
i2c1_bus: i2c1-bus {
/* S3C6410-only */
samsung,pins = "gpb-2", "gpb-3";
samsung,pin-function = <6>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
spi0_bus: spi0-bus {
samsung,pins = "gpc-0", "gpc-1", "gpc-2";
samsung,pin-function = <2>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
spi0_cs: spi0-cs {
samsung,pins = "gpc-3";
samsung,pin-function = <2>;
-   samsung,pin-pud = ;
+   samsung,pin-pud = ;
};
 
spi1_bus: spi1-bus {
samsung,pins = "gpc-4", "gpc-5", "gpc-6";