* [PATCH 0/4] Use Exynos macros for pinctrl settings [not found] <CGME20161229084221epcas1p4d76b4b30f59734f7eee29aec53b54af3@epcas1p4.samsung.com> @ 2016-12-29 8:42 ` Andi Shyti [not found] ` <CGME20161229084221epcas5p43926b87dccbee0db4045faa5ddca565d@epcas5p4.samsung.com> ` (3 more replies) 0 siblings, 4 replies; 12+ messages in thread From: Andi Shyti @ 2016-12-29 8:42 UTC (permalink / raw) To: Tomasz Figa, Chanwoo Choi, Krzysztof Kozlowski, Sylwester Nawrocki, Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon, Kukjin Kim, Javier Martinez Canillas Cc: devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel, Andi Shyti, Andi Shyti Hi, This patchset is just a refactoring of the exynos5433 and TM2 pinctrl definitions. Standing to the samsung-pinctrl.txt binding the Exynos related DTS should use the macros introduced by commit: 5db7e3bb87df ("pinctrl: dt-bindings: samsung: Add header with values used for configuration") Would be nice to see in the future all the PIN related macros in the same file, as they more or less do the same thing. Thanks, Andi Andi Shyti (4): pinctrl: dt-bindings: samsung: add drive strength macros for Exynos5433 ARM64: dts: exynos5433: use macros for pinctrl configuration on Exynos5433 ARM64: dts: TM2: comply to the samsung pinctrl naming convention ARM64: dts: exynos5433: remove unused code arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 373 ++++++++++----------- arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 254 +++++++------- include/dt-bindings/pinctrl/samsung.h | 6 + 3 files changed, 314 insertions(+), 319 deletions(-) -- 2.11.0 ^ permalink raw reply [flat|nested] 12+ messages in thread
[parent not found: <CGME20161229084221epcas5p43926b87dccbee0db4045faa5ddca565d@epcas5p4.samsung.com>]
* [PATCH 1/4] pinctrl: dt-bindings: samsung: add drive strength macros for Exynos5433 [not found] ` <CGME20161229084221epcas5p43926b87dccbee0db4045faa5ddca565d@epcas5p4.samsung.com> @ 2016-12-29 8:42 ` Andi Shyti 2016-12-29 9:17 ` Chanwoo Choi ` (2 more replies) 0 siblings, 3 replies; 12+ messages in thread From: Andi Shyti @ 2016-12-29 8:42 UTC (permalink / raw) To: Tomasz Figa, Chanwoo Choi, Krzysztof Kozlowski, Sylwester Nawrocki, Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon, Kukjin Kim, Javier Martinez Canillas Cc: devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel, Andi Shyti, Andi Shyti Commit 5db7e3bb87df ("pinctrl: dt-bindings: samsung: Add header with values used for configuration") has added a header file for defining the pinctrl values in order to avoid hardcoded settings in the Exynos DTS related files. Extend samsung.h to the Exynos5433 for drive strength values which are strictly related to the particular SoC and may defer from others. Signed-off-by: Andi Shyti <andi.shyti@samsung.com> --- include/dt-bindings/pinctrl/samsung.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/dt-bindings/pinctrl/samsung.h b/include/dt-bindings/pinctrl/samsung.h index 6276eb785e2b..58868313d64b 100644 --- a/include/dt-bindings/pinctrl/samsung.h +++ b/include/dt-bindings/pinctrl/samsung.h @@ -45,6 +45,12 @@ #define EXYNOS5420_PIN_DRV_LV3 2 #define EXYNOS5420_PIN_DRV_LV4 3 +/* Drive strengths for Exynos5433 */ +#define EXYNOS5433_PIN_DRV_LV1 0 +#define EXYNOS5433_PIN_DRV_LV2 1 +#define EXYNOS5433_PIN_DRV_LV3 2 +#define EXYNOS5433_PIN_DRV_LV4 3 + #define EXYNOS_PIN_FUNC_INPUT 0 #define EXYNOS_PIN_FUNC_OUTPUT 1 #define EXYNOS_PIN_FUNC_2 2 -- 2.11.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 1/4] pinctrl: dt-bindings: samsung: add drive strength macros for Exynos5433 2016-12-29 8:42 ` [PATCH 1/4] pinctrl: dt-bindings: samsung: add drive strength macros for Exynos5433 Andi Shyti @ 2016-12-29 9:17 ` Chanwoo Choi 2016-12-29 10:33 ` Chanwoo Choi [not found] ` <CGME20161229093931epcas1p11b118da454a0dbf3a798ba406f35ce54@epcas1p1.samsung.com> 2016-12-29 11:50 ` [PATCH 1/4] " Krzysztof Kozlowski 2 siblings, 1 reply; 12+ messages in thread From: Chanwoo Choi @ 2016-12-29 9:17 UTC (permalink / raw) To: Andi Shyti, Tomasz Figa, Krzysztof Kozlowski, Sylwester Nawrocki, Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon, Kukjin Kim, Javier Martinez Canillas Cc: devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel, Andi Shyti Hi Andi, On 2016년 12월 29일 17:42, Andi Shyti wrote: > Commit 5db7e3bb87df ("pinctrl: dt-bindings: samsung: Add header with > values used for configuration") has added a header file for defining the > pinctrl values in order to avoid hardcoded settings in the Exynos > DTS related files. > > Extend samsung.h to the Exynos5433 for drive strength values > which are strictly related to the particular SoC and may defer > from others. > > Signed-off-by: Andi Shyti <andi.shyti@samsung.com> > --- > include/dt-bindings/pinctrl/samsung.h | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/include/dt-bindings/pinctrl/samsung.h b/include/dt-bindings/pinctrl/samsung.h > index 6276eb785e2b..58868313d64b 100644 > --- a/include/dt-bindings/pinctrl/samsung.h > +++ b/include/dt-bindings/pinctrl/samsung.h > @@ -45,6 +45,12 @@ > #define EXYNOS5420_PIN_DRV_LV3 2 > #define EXYNOS5420_PIN_DRV_LV4 3 > > +/* Drive strengths for Exynos5433 */ > +#define EXYNOS5433_PIN_DRV_LV1 0 > +#define EXYNOS5433_PIN_DRV_LV2 1 > +#define EXYNOS5433_PIN_DRV_LV3 2 > +#define EXYNOS5433_PIN_DRV_LV4 3 Exynos5433 has the same value with EXYNOS5420. So, I'd like you to use the EXYNOS5420_PIN_DRV_LVx instead of separate the definitions. > + > #define EXYNOS_PIN_FUNC_INPUT 0 > #define EXYNOS_PIN_FUNC_OUTPUT 1 > #define EXYNOS_PIN_FUNC_2 2 > -- Regards, Chanwoo Choi ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/4] pinctrl: dt-bindings: samsung: add drive strength macros for Exynos5433 2016-12-29 9:17 ` Chanwoo Choi @ 2016-12-29 10:33 ` Chanwoo Choi 0 siblings, 0 replies; 12+ messages in thread From: Chanwoo Choi @ 2016-12-29 10:33 UTC (permalink / raw) To: Andi Shyti, Tomasz Figa, Krzysztof Kozlowski, Sylwester Nawrocki, Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon, Kukjin Kim, Javier Martinez Canillas Cc: devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel, Andi Shyti Hi Andi, On 2016년 12월 29일 18:17, Chanwoo Choi wrote: > Hi Andi, > > On 2016년 12월 29일 17:42, Andi Shyti wrote: >> Commit 5db7e3bb87df ("pinctrl: dt-bindings: samsung: Add header with >> values used for configuration") has added a header file for defining the >> pinctrl values in order to avoid hardcoded settings in the Exynos >> DTS related files. >> >> Extend samsung.h to the Exynos5433 for drive strength values >> which are strictly related to the particular SoC and may defer >> from others. >> >> Signed-off-by: Andi Shyti <andi.shyti@samsung.com> >> --- >> include/dt-bindings/pinctrl/samsung.h | 6 ++++++ >> 1 file changed, 6 insertions(+) >> >> diff --git a/include/dt-bindings/pinctrl/samsung.h b/include/dt-bindings/pinctrl/samsung.h >> index 6276eb785e2b..58868313d64b 100644 >> --- a/include/dt-bindings/pinctrl/samsung.h >> +++ b/include/dt-bindings/pinctrl/samsung.h >> @@ -45,6 +45,12 @@ >> #define EXYNOS5420_PIN_DRV_LV3 2 >> #define EXYNOS5420_PIN_DRV_LV4 3 >> >> +/* Drive strengths for Exynos5433 */ >> +#define EXYNOS5433_PIN_DRV_LV1 0 >> +#define EXYNOS5433_PIN_DRV_LV2 1 >> +#define EXYNOS5433_PIN_DRV_LV3 2 >> +#define EXYNOS5433_PIN_DRV_LV4 3 > > Exynos5433 has the same value with EXYNOS5420. So, I'd like you to use the EXYNOS5420_PIN_DRV_LVx instead of separate the definitions. I found the problem to handle the *_DRV register of Exynos5433. Because Exynos5433 has the different width length of *_DRV (PINCFG_TYPE_DRV) bitfields from Exynos542x as following. When I was sending the exynos5433 pinctrl patches, I was missing this issue. Exynos5422/Exynos5410 have two different bitfields in the same register to set the DRV_LVx as following: (n=0 to 7) [2n+1:2n] : 2bits 0x0 = 1x, 0x1 = 2x, 0x2 = 3x, 0x3 = 4x, [n+16:16] 0x0 = Fast Slew Rate, 0x1 = Slow Slew Rate, But, Exynos5433 has the following value for PIN_DRV_LVx without additional bitfields to separate 'Fast Slew Rate' and 'Slow Slew Rate'. Just exynos5433 defines the 'Fast Slew Rate(0x0 ~ 0x5)' and 'Slow Slew Rate (0x8 ~ 0xF)'. (n=0 to 7) [4n+3:4n] : 4 bits 0x0 = Fast Slew Rate 1x 0x1 = Fast Slew Rate 2x 0x2 = Fast Slew Rate 3x 0x3 = Fast Slew Rate 4x 0x4 = Fast Slew Rate 5x 0x5 = Fast Slew Rate 6x 0x8 = Slow Slew Rate 1x 0x9 = Slow Slew Rate 2x 0xA = Slow Slew Rate 3x 0xB = Slow Slew Rate 4x 0xC = Slow Slew Rate 5x 0xF = Slow Slew Rate 6x So, before this patch, we have to fix it to support the DRV reigster of Exynos5433. I'll fix it. > >> + >> #define EXYNOS_PIN_FUNC_INPUT 0 >> #define EXYNOS_PIN_FUNC_OUTPUT 1 >> #define EXYNOS_PIN_FUNC_2 2 >> > -- Regards, Chanwoo Choi ^ permalink raw reply [flat|nested] 12+ messages in thread
[parent not found: <CGME20161229093931epcas1p11b118da454a0dbf3a798ba406f35ce54@epcas1p1.samsung.com>]
* Re: [1/4] pinctrl: dt-bindings: samsung: add drive strength macros for Exynos5433 [not found] ` <CGME20161229093931epcas1p11b118da454a0dbf3a798ba406f35ce54@epcas1p1.samsung.com> @ 2016-12-29 9:39 ` Jaehoon Chung 0 siblings, 0 replies; 12+ messages in thread From: Jaehoon Chung @ 2016-12-29 9:39 UTC (permalink / raw) To: Andi Shyti, Tomasz Figa, Chanwoo Choi, Krzysztof Kozlowski, Sylwester Nawrocki, Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon, Kukjin Kim, Javier Martinez Canillas Cc: devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel, Andi Shyti On 12/29/2016 05:42 PM, Andi Shyti wrote: > Commit 5db7e3bb87df ("pinctrl: dt-bindings: samsung: Add header with > values used for configuration") has added a header file for defining the > pinctrl values in order to avoid hardcoded settings in the Exynos > DTS related files. > > Extend samsung.h to the Exynos5433 for drive strength values > which are strictly related to the particular SoC and may defer > from others. > > Signed-off-by: Andi Shyti <andi.shyti@samsung.com> > --- > include/dt-bindings/pinctrl/samsung.h | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/include/dt-bindings/pinctrl/samsung.h b/include/dt-bindings/pinctrl/samsung.h > index 6276eb785e2b..58868313d64b 100644 > --- a/include/dt-bindings/pinctrl/samsung.h > +++ b/include/dt-bindings/pinctrl/samsung.h > @@ -45,6 +45,12 @@ > #define EXYNOS5420_PIN_DRV_LV3 2 > #define EXYNOS5420_PIN_DRV_LV4 3 > > +/* Drive strengths for Exynos5433 */ > +#define EXYNOS5433_PIN_DRV_LV1 0 > +#define EXYNOS5433_PIN_DRV_LV2 1 > +#define EXYNOS5433_PIN_DRV_LV3 2 > +#define EXYNOS5433_PIN_DRV_LV4 3 Well, i'm not sure..but you needs to compare the other Exynos5 series. it's difference bit Offset. Did you check it? I didn't check pinctrl file..if it doesn't apply any exynos5433 pinctrl for drv_strength. it will work wrong.. Best Regards, Jaehoon Chung > + > #define EXYNOS_PIN_FUNC_INPUT 0 > #define EXYNOS_PIN_FUNC_OUTPUT 1 > #define EXYNOS_PIN_FUNC_2 2 > > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/4] pinctrl: dt-bindings: samsung: add drive strength macros for Exynos5433 2016-12-29 8:42 ` [PATCH 1/4] pinctrl: dt-bindings: samsung: add drive strength macros for Exynos5433 Andi Shyti 2016-12-29 9:17 ` Chanwoo Choi [not found] ` <CGME20161229093931epcas1p11b118da454a0dbf3a798ba406f35ce54@epcas1p1.samsung.com> @ 2016-12-29 11:50 ` Krzysztof Kozlowski 2016-12-29 13:41 ` Andi Shyti 2 siblings, 1 reply; 12+ messages in thread From: Krzysztof Kozlowski @ 2016-12-29 11:50 UTC (permalink / raw) To: Andi Shyti Cc: Tomasz Figa, Chanwoo Choi, Krzysztof Kozlowski, Sylwester Nawrocki, Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon, Kukjin Kim, Javier Martinez Canillas, devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel, Andi Shyti On Thu, Dec 29, 2016 at 05:42:08PM +0900, Andi Shyti wrote: > Commit 5db7e3bb87df ("pinctrl: dt-bindings: samsung: Add header with > values used for configuration") has added a header file for defining the > pinctrl values in order to avoid hardcoded settings in the Exynos > DTS related files. > > Extend samsung.h to the Exynos5433 for drive strength values > which are strictly related to the particular SoC and may defer > from others. > > Signed-off-by: Andi Shyti <andi.shyti@samsung.com> > --- > include/dt-bindings/pinctrl/samsung.h | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/include/dt-bindings/pinctrl/samsung.h b/include/dt-bindings/pinctrl/samsung.h > index 6276eb785e2b..58868313d64b 100644 > --- a/include/dt-bindings/pinctrl/samsung.h > +++ b/include/dt-bindings/pinctrl/samsung.h > @@ -45,6 +45,12 @@ > #define EXYNOS5420_PIN_DRV_LV3 2 > #define EXYNOS5420_PIN_DRV_LV4 3 > > +/* Drive strengths for Exynos5433 */ > +#define EXYNOS5433_PIN_DRV_LV1 0 > +#define EXYNOS5433_PIN_DRV_LV2 1 > +#define EXYNOS5433_PIN_DRV_LV3 2 > +#define EXYNOS5433_PIN_DRV_LV4 3 Same values as existing. No need to re-define these. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/4] pinctrl: dt-bindings: samsung: add drive strength macros for Exynos5433 2016-12-29 11:50 ` [PATCH 1/4] " Krzysztof Kozlowski @ 2016-12-29 13:41 ` Andi Shyti 0 siblings, 0 replies; 12+ messages in thread From: Andi Shyti @ 2016-12-29 13:41 UTC (permalink / raw) To: Krzysztof Kozlowski Cc: Andi Shyti, Tomasz Figa, Chanwoo Choi, Sylwester Nawrocki, Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon, Kukjin Kim, Javier Martinez Canillas, devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel, Andi Shyti Hi Krzysztof, > > #define EXYNOS5420_PIN_DRV_LV3 2 > > #define EXYNOS5420_PIN_DRV_LV4 3 > > > > +/* Drive strengths for Exynos5433 */ > > +#define EXYNOS5433_PIN_DRV_LV1 0 > > +#define EXYNOS5433_PIN_DRV_LV2 1 > > +#define EXYNOS5433_PIN_DRV_LV3 2 > > +#define EXYNOS5433_PIN_DRV_LV4 3 > > Same values as existing. No need to re-define these. Yes, I was in doubt when I prepared this patch as on one hand it didn't look right to use EXYNOS5420_* for exynos5433, on the other hand it didn't look right to duplicate the macros. In anycase this values need to be fixed as Chanwoo wrote in the other mail. Thanks, Andi ^ permalink raw reply [flat|nested] 12+ messages in thread
[parent not found: <CGME20161229084222epcas1p4b9ef5db922132015bf74d0f0fcecb486@epcas1p4.samsung.com>]
* [PATCH 2/4] ARM64: dts: exynos5433: use macros for pinctrl configuration on Exynos5433 [not found] ` <CGME20161229084222epcas1p4b9ef5db922132015bf74d0f0fcecb486@epcas1p4.samsung.com> @ 2016-12-29 8:42 ` Andi Shyti 0 siblings, 0 replies; 12+ messages in thread From: Andi Shyti @ 2016-12-29 8:42 UTC (permalink / raw) To: Tomasz Figa, Chanwoo Choi, Krzysztof Kozlowski, Sylwester Nawrocki, Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon, Kukjin Kim, Javier Martinez Canillas Cc: devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel, Andi Shyti, Andi Shyti Use the macros defined in include/dt-bindings/pinctrl/samsung.h instead of hardcoded values. Signed-off-by: Andi Shyti <andi.shyti@samsung.com> --- arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 348 +++++++++++---------- 1 file changed, 175 insertions(+), 173 deletions(-) diff --git a/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi index ad71247b074f..36da7dce409a 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi @@ -12,6 +12,8 @@ * published by the Free Software Foundation. */ +#include <dt-bindings/pinctrl/samsung.h> + #define PIN_PULL_NONE 0 #define PIN_PULL_DOWN 1 #define PIN_PULL_UP 3 @@ -145,23 +147,23 @@ i2s0_bus: i2s0-bus { samsung,pins = "gpz0-0", "gpz0-1", "gpz0-2", "gpz0-3", "gpz0-4", "gpz0-5", "gpz0-6"; - samsung,pin-function = <2>; - samsung,pin-pud = <1>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; pcm0_bus: pcm0-bus { samsung,pins = "gpz1-0", "gpz1-1", "gpz1-2", "gpz1-3"; - samsung,pin-function = <3>; - samsung,pin-pud = <1>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_3>; + samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; uart_aud_bus: uart-aud-bus { samsung,pins = "gpz1-3", "gpz1-2", "gpz1-1", "gpz1-0"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; }; @@ -196,16 +198,16 @@ spi2_bus: spi2-bus { samsung,pins = "gpd5-0", "gpd5-2", "gpd5-3"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; hs_i2c6_bus: hs-i2c6-bus { samsung,pins = "gpd5-3", "gpd5-2"; - samsung,pin-function = <4>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_4>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; }; @@ -260,141 +262,141 @@ sd0_clk: sd0-clk { samsung,pins = "gpr0-0"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <3>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV4>; }; sd0_cmd: sd0-cmd { samsung,pins = "gpr0-1"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <3>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV4>; }; sd0_rdqs: sd0-rdqs { samsung,pins = "gpr0-2"; - samsung,pin-function = <2>; - samsung,pin-pud = <1>; - samsung,pin-drv = <3>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV4>; }; sd0_qrdy: sd0-qrdy { samsung,pins = "gpr0-3"; - samsung,pin-function = <2>; - samsung,pin-pud = <1>; - samsung,pin-drv = <3>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV4>; }; sd0_bus1: sd0-bus-width1 { samsung,pins = "gpr1-0"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV4>; }; sd0_bus4: sd0-bus-width4 { samsung,pins = "gpr1-1", "gpr1-2", "gpr1-3"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV4>; }; sd0_bus8: sd0-bus-width8 { samsung,pins = "gpr1-4", "gpr1-5", "gpr1-6", "gpr1-7"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV4>; }; sd1_clk: sd1-clk { samsung,pins = "gpr2-0"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <3>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV4>; }; sd1_cmd: sd1-cmd { samsung,pins = "gpr2-1"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <3>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV4>; }; sd1_bus1: sd1-bus-width1 { samsung,pins = "gpr3-0"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV4>; }; sd1_bus4: sd1-bus-width4 { samsung,pins = "gpr3-1", "gpr3-2", "gpr3-3"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV4>; }; sd1_bus8: sd1-bus-width8 { samsung,pins = "gpr3-4", "gpr3-5", "gpr3-6", "gpr3-7"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV4>; }; pcie_bus: pcie_bus { samsung,pins = "gpr3-4", "gpr3-5", "gpr3-6", "gpr3-7"; - samsung,pin-function = <3>; - samsung,pin-pud = <3>; + samsung,pin-function = <EXYNOS_PIN_FUNC_3>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; }; sd2_clk: sd2-clk { samsung,pins = "gpr4-0"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <3>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV4>; }; sd2_cmd: sd2-cmd { samsung,pins = "gpr4-1"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <3>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV4>; }; sd2_cd: sd2-cd { samsung,pins = "gpr4-2"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV4>; }; sd2_bus1: sd2-bus-width1 { samsung,pins = "gpr4-3"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV4>; }; sd2_bus4: sd2-bus-width4 { samsung,pins = "gpr4-4", "gpr4-5", "gpr4-6"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV4>; }; sd2_clk_output: sd2-clk-output { samsung,pins = "gpr4-0"; - samsung,pin-function = <1>; - samsung,pin-pud = <0>; - samsung,pin-drv = <2>; + samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV3>; }; sd2_cmd_output: sd2-cmd-output { samsung,pins = "gpr4-1"; - samsung,pin-function = <1>; - samsung,pin-pud = <0>; - samsung,pin-drv = <2>; + samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV3>; }; }; @@ -419,9 +421,9 @@ hs_i2c4_bus: hs-i2c4-bus { samsung,pins = "gpj0-1", "gpj0-0"; - samsung,pin-function = <4>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_4>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; }; @@ -564,225 +566,225 @@ hs_i2c8_bus: hs-i2c8-bus { samsung,pins = "gpb0-1", "gpb0-0"; - samsung,pin-function = <4>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_4>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; hs_i2c9_bus: hs-i2c9-bus { samsung,pins = "gpb0-3", "gpb0-2"; - samsung,pin-function = <4>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_4>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; i2s1_bus: i2s1-bus { samsung,pins = "gpd4-0", "gpd4-1", "gpd4-2", "gpd4-3", "gpd4-4"; - samsung,pin-function = <2>; - samsung,pin-pud = <1>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; pcm1_bus: pcm1-bus { samsung,pins = "gpd4-0", "gpd4-1", "gpd4-2", "gpd4-3", "gpd4-4"; - samsung,pin-function = <3>; - samsung,pin-pud = <1>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_3>; + samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; spdif_bus: spdif-bus { samsung,pins = "gpd4-3", "gpd4-4"; - samsung,pin-function = <4>; - samsung,pin-pud = <1>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_4>; + samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; fimc_is_spi_pin0: fimc-is-spi-pin0 { samsung,pins = "gpc3-3", "gpc3-2", "gpc3-1", "gpc3-0"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; fimc_is_spi_pin1: fimc-is-spi-pin1 { samsung,pins = "gpc3-7", "gpc3-6", "gpc3-5", "gpc3-4"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; uart0_bus: uart0-bus { samsung,pins = "gpd0-3", "gpd0-2", "gpd0-1", "gpd0-0"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; }; hs_i2c2_bus: hs-i2c2-bus { samsung,pins = "gpd0-3", "gpd0-2"; - samsung,pin-function = <3>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_3>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; uart2_bus: uart2-bus { samsung,pins = "gpd1-5", "gpd1-4"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; }; uart1_bus: uart1-bus { samsung,pins = "gpd1-3", "gpd1-2", "gpd1-1", "gpd1-0"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; }; hs_i2c3_bus: hs-i2c3-bus { samsung,pins = "gpd1-3", "gpd1-2"; - samsung,pin-function = <3>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_3>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; hs_i2c0_bus: hs-i2c0-bus { samsung,pins = "gpd2-1", "gpd2-0"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; hs_i2c1_bus: hs-i2c1-bus { samsung,pins = "gpd2-3", "gpd2-2"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; pwm0_out: pwm0-out { samsung,pins = "gpd2-4"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; pwm1_out: pwm1-out { samsung,pins = "gpd2-5"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; pwm2_out: pwm2-out { samsung,pins = "gpd2-6"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; pwm3_out: pwm3-out { samsung,pins = "gpd2-7"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; spi1_bus: spi1-bus { samsung,pins = "gpd6-2", "gpd6-4", "gpd6-5"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; hs_i2c7_bus: hs-i2c7-bus { samsung,pins = "gpd2-7", "gpd2-6"; - samsung,pin-function = <4>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_4>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; spi0_bus: spi0-bus { samsung,pins = "gpd8-0", "gpd6-0", "gpd6-1"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; hs_i2c10_bus: hs-i2c10-bus { samsung,pins = "gpg3-1", "gpg3-0"; - samsung,pin-function = <4>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_4>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; hs_i2c11_bus: hs-i2c11-bus { samsung,pins = "gpg3-3", "gpg3-2"; - samsung,pin-function = <4>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_4>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; spi3_bus: spi3-bus { samsung,pins = "gpg3-4", "gpg3-6", "gpg3-7"; - samsung,pin-function = <3>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_3>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; spi4_bus: spi4-bus { samsung,pins = "gpv7-1", "gpv7-3", "gpv7-4"; - samsung,pin-function = <3>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_3>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; fimc_is_uart: fimc-is-uart { samsung,pins = "gpc1-1", "gpc0-7"; - samsung,pin-function = <3>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_3>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; fimc_is_ch0_i2c: fimc-is-ch0_i2c { samsung,pins = "gpc2-1", "gpc2-0"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; fimc_is_ch0_mclk: fimc-is-ch0_mclk { samsung,pins = "gpd7-0"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; fimc_is_ch1_i2c: fimc-is-ch1-i2c { samsung,pins = "gpc2-3", "gpc2-2"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; fimc_is_ch1_mclk: fimc-is-ch1-mclk { samsung,pins = "gpd7-1"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; fimc_is_ch2_i2c: fimc-is-ch2-i2c { samsung,pins = "gpc2-5", "gpc2-4"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; fimc_is_ch2_mclk: fimc-is-ch2-mclk { samsung,pins = "gpd7-2"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_2>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; }; @@ -797,8 +799,8 @@ hs_i2c5_bus: hs-i2c5-bus { samsung,pins = "gpj1-1", "gpj1-0"; - samsung,pin-function = <4>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; + samsung,pin-function = <EXYNOS_PIN_FUNC_4>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-drv = <EXYNOS5433_PIN_DRV_LV1>; }; }; -- 2.11.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
[parent not found: <CGME20161229084222epcas1p4c0db2fd327fc92bfe123442f44b88ab5@epcas1p4.samsung.com>]
* [PATCH 3/4] ARM64: dts: TM2: comply to the samsung pinctrl naming convention [not found] ` <CGME20161229084222epcas1p4c0db2fd327fc92bfe123442f44b88ab5@epcas1p4.samsung.com> @ 2016-12-29 8:42 ` Andi Shyti 0 siblings, 0 replies; 12+ messages in thread From: Andi Shyti @ 2016-12-29 8:42 UTC (permalink / raw) To: Tomasz Figa, Chanwoo Choi, Krzysztof Kozlowski, Sylwester Nawrocki, Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon, Kukjin Kim, Javier Martinez Canillas Cc: devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel, Andi Shyti, Andi Shyti Change the PIN() macro definition so that it can use the macros from pinctrl/samsung.h header file. Signed-off-by: Andi Shyti <andi.shyti@samsung.com> --- arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 12 +- arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 254 ++++++++++----------- 2 files changed, 133 insertions(+), 133 deletions(-) diff --git a/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi index 36da7dce409a..9afed9fcf7e1 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi @@ -27,12 +27,12 @@ #define PIN_OUT 1 #define PIN_FUNC1 2 -#define PIN(_func, _pin, _pull, _drv) \ - _pin { \ - samsung,pins = #_pin; \ - samsung,pin-function = <PIN_ ##_func>; \ - samsung,pin-pud = <PIN_PULL_ ##_pull>; \ - samsung,pin-drv = <PIN_DRV_ ##_drv>; \ +#define PIN(_func, _pin, _pull, _drv) \ + _pin { \ + samsung,pins = #_pin; \ + samsung,pin-function = <EXYNOS_PIN_FUNC_ ##_func>; \ + samsung,pin-pud = <EXYNOS_PIN_PULL_ ##_pull>; \ + samsung,pin-drv = <EXYNOS5433_PIN_DRV_ ##_drv>; \ } &pinctrl_alive { diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts b/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts index f21bdc2ff834..a2bc8e48eca4 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts +++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts @@ -742,77 +742,77 @@ pinctrl-0 = <&initial_alive>; initial_alive: initial-state { - PIN(IN, gpa0-0, DOWN, LV1); - PIN(IN, gpa0-1, NONE, LV1); - PIN(IN, gpa0-2, DOWN, LV1); - PIN(IN, gpa0-3, NONE, LV1); - PIN(IN, gpa0-4, NONE, LV1); - PIN(IN, gpa0-5, DOWN, LV1); - PIN(IN, gpa0-6, NONE, LV1); - PIN(IN, gpa0-7, NONE, LV1); - - PIN(IN, gpa1-0, UP, LV1); - PIN(IN, gpa1-1, NONE, LV1); - PIN(IN, gpa1-2, NONE, LV1); - PIN(IN, gpa1-3, DOWN, LV1); - PIN(IN, gpa1-4, DOWN, LV1); - PIN(IN, gpa1-5, NONE, LV1); - PIN(IN, gpa1-6, NONE, LV1); - PIN(IN, gpa1-7, NONE, LV1); - - PIN(IN, gpa2-0, NONE, LV1); - PIN(IN, gpa2-1, NONE, LV1); - PIN(IN, gpa2-2, NONE, LV1); - PIN(IN, gpa2-3, DOWN, LV1); - PIN(IN, gpa2-4, NONE, LV1); - PIN(IN, gpa2-5, DOWN, LV1); - PIN(IN, gpa2-6, DOWN, LV1); - PIN(IN, gpa2-7, NONE, LV1); - - PIN(IN, gpa3-0, DOWN, LV1); - PIN(IN, gpa3-1, DOWN, LV1); - PIN(IN, gpa3-2, NONE, LV1); - PIN(IN, gpa3-3, DOWN, LV1); - PIN(IN, gpa3-4, NONE, LV1); - PIN(IN, gpa3-5, DOWN, LV1); - PIN(IN, gpa3-6, DOWN, LV1); - PIN(IN, gpa3-7, DOWN, LV1); - - PIN(IN, gpf1-0, NONE, LV1); - PIN(IN, gpf1-1, NONE, LV1); - PIN(IN, gpf1-2, DOWN, LV1); - PIN(IN, gpf1-4, UP, LV1); - PIN(OUT, gpf1-5, NONE, LV1); - PIN(IN, gpf1-6, DOWN, LV1); - PIN(IN, gpf1-7, DOWN, LV1); - - PIN(IN, gpf2-0, DOWN, LV1); - PIN(IN, gpf2-1, DOWN, LV1); - PIN(IN, gpf2-2, DOWN, LV1); - PIN(IN, gpf2-3, DOWN, LV1); - - PIN(IN, gpf3-0, DOWN, LV1); - PIN(IN, gpf3-1, DOWN, LV1); - PIN(IN, gpf3-2, NONE, LV1); - PIN(IN, gpf3-3, DOWN, LV1); - - PIN(IN, gpf4-0, DOWN, LV1); - PIN(IN, gpf4-1, DOWN, LV1); - PIN(IN, gpf4-2, DOWN, LV1); - PIN(IN, gpf4-3, DOWN, LV1); - PIN(IN, gpf4-4, DOWN, LV1); - PIN(IN, gpf4-5, DOWN, LV1); - PIN(IN, gpf4-6, DOWN, LV1); - PIN(IN, gpf4-7, DOWN, LV1); - - PIN(IN, gpf5-0, DOWN, LV1); - PIN(IN, gpf5-1, DOWN, LV1); - PIN(IN, gpf5-2, DOWN, LV1); - PIN(IN, gpf5-3, DOWN, LV1); - PIN(OUT, gpf5-4, NONE, LV1); - PIN(IN, gpf5-5, DOWN, LV1); - PIN(IN, gpf5-6, DOWN, LV1); - PIN(IN, gpf5-7, DOWN, LV1); + PIN(INPUT, gpa0-0, DOWN, LV1); + PIN(INPUT, gpa0-1, NONE, LV1); + PIN(INPUT, gpa0-2, DOWN, LV1); + PIN(INPUT, gpa0-3, NONE, LV1); + PIN(INPUT, gpa0-4, NONE, LV1); + PIN(INPUT, gpa0-5, DOWN, LV1); + PIN(INPUT, gpa0-6, NONE, LV1); + PIN(INPUT, gpa0-7, NONE, LV1); + + PIN(INPUT, gpa1-0, UP, LV1); + PIN(INPUT, gpa1-1, NONE, LV1); + PIN(INPUT, gpa1-2, NONE, LV1); + PIN(INPUT, gpa1-3, DOWN, LV1); + PIN(INPUT, gpa1-4, DOWN, LV1); + PIN(INPUT, gpa1-5, NONE, LV1); + PIN(INPUT, gpa1-6, NONE, LV1); + PIN(INPUT, gpa1-7, NONE, LV1); + + PIN(INPUT, gpa2-0, NONE, LV1); + PIN(INPUT, gpa2-1, NONE, LV1); + PIN(INPUT, gpa2-2, NONE, LV1); + PIN(INPUT, gpa2-3, DOWN, LV1); + PIN(INPUT, gpa2-4, NONE, LV1); + PIN(INPUT, gpa2-5, DOWN, LV1); + PIN(INPUT, gpa2-6, DOWN, LV1); + PIN(INPUT, gpa2-7, NONE, LV1); + + PIN(INPUT, gpa3-0, DOWN, LV1); + PIN(INPUT, gpa3-1, DOWN, LV1); + PIN(INPUT, gpa3-2, NONE, LV1); + PIN(INPUT, gpa3-3, DOWN, LV1); + PIN(INPUT, gpa3-4, NONE, LV1); + PIN(INPUT, gpa3-5, DOWN, LV1); + PIN(INPUT, gpa3-6, DOWN, LV1); + PIN(INPUT, gpa3-7, DOWN, LV1); + + PIN(INPUT, gpf1-0, NONE, LV1); + PIN(INPUT, gpf1-1, NONE, LV1); + PIN(INPUT, gpf1-2, DOWN, LV1); + PIN(INPUT, gpf1-4, UP, LV1); + PIN(OUTPUT, gpf1-5, NONE, LV1); + PIN(INPUT, gpf1-6, DOWN, LV1); + PIN(INPUT, gpf1-7, DOWN, LV1); + + PIN(INPUT, gpf2-0, DOWN, LV1); + PIN(INPUT, gpf2-1, DOWN, LV1); + PIN(INPUT, gpf2-2, DOWN, LV1); + PIN(INPUT, gpf2-3, DOWN, LV1); + + PIN(INPUT, gpf3-0, DOWN, LV1); + PIN(INPUT, gpf3-1, DOWN, LV1); + PIN(INPUT, gpf3-2, NONE, LV1); + PIN(INPUT, gpf3-3, DOWN, LV1); + + PIN(INPUT, gpf4-0, DOWN, LV1); + PIN(INPUT, gpf4-1, DOWN, LV1); + PIN(INPUT, gpf4-2, DOWN, LV1); + PIN(INPUT, gpf4-3, DOWN, LV1); + PIN(INPUT, gpf4-4, DOWN, LV1); + PIN(INPUT, gpf4-5, DOWN, LV1); + PIN(INPUT, gpf4-6, DOWN, LV1); + PIN(INPUT, gpf4-7, DOWN, LV1); + + PIN(INPUT, gpf5-0, DOWN, LV1); + PIN(INPUT, gpf5-1, DOWN, LV1); + PIN(INPUT, gpf5-2, DOWN, LV1); + PIN(INPUT, gpf5-3, DOWN, LV1); + PIN(OUTPUT, gpf5-4, NONE, LV1); + PIN(INPUT, gpf5-5, DOWN, LV1); + PIN(INPUT, gpf5-6, DOWN, LV1); + PIN(INPUT, gpf5-7, DOWN, LV1); }; te_irq: te_irq { @@ -826,8 +826,8 @@ pinctrl-0 = <&initial_cpif>; initial_cpif: initial-state { - PIN(IN, gpv6-0, DOWN, LV1); - PIN(IN, gpv6-1, DOWN, LV1); + PIN(INPUT, gpv6-0, DOWN, LV1); + PIN(INPUT, gpv6-1, DOWN, LV1); }; }; @@ -836,9 +836,9 @@ pinctrl-0 = <&initial_ese>; initial_ese: initial-state { - PIN(IN, gpj2-0, DOWN, LV1); - PIN(IN, gpj2-1, DOWN, LV1); - PIN(IN, gpj2-2, DOWN, LV1); + PIN(INPUT, gpj2-0, DOWN, LV1); + PIN(INPUT, gpj2-1, DOWN, LV1); + PIN(INPUT, gpj2-2, DOWN, LV1); }; }; @@ -847,11 +847,11 @@ pinctrl-0 = <&initial_fsys>; initial_fsys: initial-state { - PIN(IN, gpr3-0, NONE, LV1); - PIN(IN, gpr3-1, DOWN, LV1); - PIN(IN, gpr3-2, DOWN, LV1); - PIN(IN, gpr3-3, DOWN, LV1); - PIN(IN, gpr3-7, NONE, LV1); + PIN(INPUT, gpr3-0, NONE, LV1); + PIN(INPUT, gpr3-1, DOWN, LV1); + PIN(INPUT, gpr3-2, DOWN, LV1); + PIN(INPUT, gpr3-3, DOWN, LV1); + PIN(INPUT, gpr3-7, NONE, LV1); }; }; @@ -860,14 +860,14 @@ pinctrl-0 = <&initial_imem>; initial_imem: initial-state { - PIN(IN, gpf0-0, UP, LV1); - PIN(IN, gpf0-1, UP, LV1); - PIN(IN, gpf0-2, DOWN, LV1); - PIN(IN, gpf0-3, UP, LV1); - PIN(IN, gpf0-4, DOWN, LV1); - PIN(IN, gpf0-5, NONE, LV1); - PIN(IN, gpf0-6, DOWN, LV1); - PIN(IN, gpf0-7, UP, LV1); + PIN(INPUT, gpf0-0, UP, LV1); + PIN(INPUT, gpf0-1, UP, LV1); + PIN(INPUT, gpf0-2, DOWN, LV1); + PIN(INPUT, gpf0-3, UP, LV1); + PIN(INPUT, gpf0-4, DOWN, LV1); + PIN(INPUT, gpf0-5, NONE, LV1); + PIN(INPUT, gpf0-6, DOWN, LV1); + PIN(INPUT, gpf0-7, UP, LV1); }; }; @@ -876,7 +876,7 @@ pinctrl-0 = <&initial_nfc>; initial_nfc: initial-state { - PIN(IN, gpj0-2, DOWN, LV1); + PIN(INPUT, gpj0-2, DOWN, LV1); }; }; @@ -885,54 +885,54 @@ pinctrl-0 = <&initial_peric>; initial_peric: initial-state { - PIN(IN, gpv7-0, DOWN, LV1); - PIN(IN, gpv7-1, DOWN, LV1); - PIN(IN, gpv7-2, NONE, LV1); - PIN(IN, gpv7-3, DOWN, LV1); - PIN(IN, gpv7-4, DOWN, LV1); - PIN(IN, gpv7-5, DOWN, LV1); + PIN(INPUT, gpv7-0, DOWN, LV1); + PIN(INPUT, gpv7-1, DOWN, LV1); + PIN(INPUT, gpv7-2, NONE, LV1); + PIN(INPUT, gpv7-3, DOWN, LV1); + PIN(INPUT, gpv7-4, DOWN, LV1); + PIN(INPUT, gpv7-5, DOWN, LV1); - PIN(IN, gpb0-4, DOWN, LV1); + PIN(INPUT, gpb0-4, DOWN, LV1); - PIN(IN, gpc0-2, DOWN, LV1); - PIN(IN, gpc0-5, DOWN, LV1); - PIN(IN, gpc0-7, DOWN, LV1); + PIN(INPUT, gpc0-2, DOWN, LV1); + PIN(INPUT, gpc0-5, DOWN, LV1); + PIN(INPUT, gpc0-7, DOWN, LV1); - PIN(IN, gpc1-1, DOWN, LV1); + PIN(INPUT, gpc1-1, DOWN, LV1); - PIN(IN, gpc3-4, NONE, LV1); - PIN(IN, gpc3-5, NONE, LV1); - PIN(IN, gpc3-6, NONE, LV1); - PIN(IN, gpc3-7, NONE, LV1); + PIN(INPUT, gpc3-4, NONE, LV1); + PIN(INPUT, gpc3-5, NONE, LV1); + PIN(INPUT, gpc3-6, NONE, LV1); + PIN(INPUT, gpc3-7, NONE, LV1); - PIN(OUT, gpg0-0, NONE, LV1); - PIN(FUNC1, gpg0-1, DOWN, LV1); + PIN(OUTPUT, gpg0-0, NONE, LV1); + PIN(2, gpg0-1, DOWN, LV1); - PIN(IN, gpd2-5, DOWN, LV1); + PIN(INPUT, gpd2-5, DOWN, LV1); - PIN(IN, gpd4-0, NONE, LV1); - PIN(IN, gpd4-1, DOWN, LV1); - PIN(IN, gpd4-2, DOWN, LV1); - PIN(IN, gpd4-3, DOWN, LV1); - PIN(IN, gpd4-4, DOWN, LV1); + PIN(INPUT, gpd4-0, NONE, LV1); + PIN(INPUT, gpd4-1, DOWN, LV1); + PIN(INPUT, gpd4-2, DOWN, LV1); + PIN(INPUT, gpd4-3, DOWN, LV1); + PIN(INPUT, gpd4-4, DOWN, LV1); - PIN(IN, gpd6-3, DOWN, LV1); + PIN(INPUT, gpd6-3, DOWN, LV1); - PIN(IN, gpd8-1, UP, LV1); + PIN(INPUT, gpd8-1, UP, LV1); - PIN(IN, gpg1-0, DOWN, LV1); - PIN(IN, gpg1-1, DOWN, LV1); - PIN(IN, gpg1-2, DOWN, LV1); - PIN(IN, gpg1-3, DOWN, LV1); - PIN(IN, gpg1-4, DOWN, LV1); + PIN(INPUT, gpg1-0, DOWN, LV1); + PIN(INPUT, gpg1-1, DOWN, LV1); + PIN(INPUT, gpg1-2, DOWN, LV1); + PIN(INPUT, gpg1-3, DOWN, LV1); + PIN(INPUT, gpg1-4, DOWN, LV1); - PIN(IN, gpg2-0, DOWN, LV1); - PIN(IN, gpg2-1, DOWN, LV1); + PIN(INPUT, gpg2-0, DOWN, LV1); + PIN(INPUT, gpg2-1, DOWN, LV1); - PIN(IN, gpg3-0, DOWN, LV1); - PIN(IN, gpg3-1, DOWN, LV1); - PIN(IN, gpg3-5, DOWN, LV1); - PIN(IN, gpg3-7, DOWN, LV1); + PIN(INPUT, gpg3-0, DOWN, LV1); + PIN(INPUT, gpg3-1, DOWN, LV1); + PIN(INPUT, gpg3-5, DOWN, LV1); + PIN(INPUT, gpg3-7, DOWN, LV1); }; }; @@ -941,7 +941,7 @@ pinctrl-0 = <&initial_touch>; initial_touch: initial-state { - PIN(IN, gpj1-2, DOWN, LV1); + PIN(INPUT, gpj1-2, DOWN, LV1); }; }; -- 2.11.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
[parent not found: <CGME20161229084222epcas5p41dacaeed3e2d4f10b07eee3930f7531c@epcas5p4.samsung.com>]
* [PATCH 4/4] ARM64: dts: exynos5433: remove unused code [not found] ` <CGME20161229084222epcas5p41dacaeed3e2d4f10b07eee3930f7531c@epcas5p4.samsung.com> @ 2016-12-29 8:42 ` Andi Shyti 2016-12-29 11:54 ` Krzysztof Kozlowski 0 siblings, 1 reply; 12+ messages in thread From: Andi Shyti @ 2016-12-29 8:42 UTC (permalink / raw) To: Tomasz Figa, Chanwoo Choi, Krzysztof Kozlowski, Sylwester Nawrocki, Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon, Kukjin Kim, Javier Martinez Canillas Cc: devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel, Andi Shyti, Andi Shyti Because the pinctrl DTS is using the samsung.h macros, the previously pin defines are anused. Remove them. Signed-off-by: Andi Shyti <andi.shyti@samsung.com> --- arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi index 9afed9fcf7e1..3c821e5c241e 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi @@ -14,19 +14,6 @@ #include <dt-bindings/pinctrl/samsung.h> -#define PIN_PULL_NONE 0 -#define PIN_PULL_DOWN 1 -#define PIN_PULL_UP 3 - -#define PIN_DRV_LV1 0 -#define PIN_DRV_LV2 2 -#define PIN_DRV_LV3 1 -#define PIN_DRV_LV4 3 - -#define PIN_IN 0 -#define PIN_OUT 1 -#define PIN_FUNC1 2 - #define PIN(_func, _pin, _pull, _drv) \ _pin { \ samsung,pins = #_pin; \ -- 2.11.0 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 4/4] ARM64: dts: exynos5433: remove unused code 2016-12-29 8:42 ` [PATCH 4/4] ARM64: dts: exynos5433: remove unused code Andi Shyti @ 2016-12-29 11:54 ` Krzysztof Kozlowski 2016-12-29 13:41 ` Andi Shyti 0 siblings, 1 reply; 12+ messages in thread From: Krzysztof Kozlowski @ 2016-12-29 11:54 UTC (permalink / raw) To: Andi Shyti Cc: Tomasz Figa, Chanwoo Choi, Krzysztof Kozlowski, Sylwester Nawrocki, Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon, Kukjin Kim, Javier Martinez Canillas, devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel, Andi Shyti On Thu, Dec 29, 2016 at 05:42:11PM +0900, Andi Shyti wrote: > Because the pinctrl DTS is using the samsung.h macros, the > previously pin defines are anused. Remove them. > > Signed-off-by: Andi Shyti <andi.shyti@samsung.com> > --- > arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 13 ------------- > 1 file changed, 13 deletions(-) > > diff --git a/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi > index 9afed9fcf7e1..3c821e5c241e 100644 > --- a/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi > +++ b/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi > @@ -14,19 +14,6 @@ > > #include <dt-bindings/pinctrl/samsung.h> > > -#define PIN_PULL_NONE 0 > -#define PIN_PULL_DOWN 1 > -#define PIN_PULL_UP 3 > - > -#define PIN_DRV_LV1 0 > -#define PIN_DRV_LV2 2 > -#define PIN_DRV_LV3 1 > -#define PIN_DRV_LV4 3 > - > -#define PIN_IN 0 > -#define PIN_OUT 1 > -#define PIN_FUNC1 2 > - This should be squashed with 3/4 because logically it is strictly related to it and splitting it does not bring any benefits. Actually while looking at 3/4 I was surprised to see them not removed. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 4/4] ARM64: dts: exynos5433: remove unused code 2016-12-29 11:54 ` Krzysztof Kozlowski @ 2016-12-29 13:41 ` Andi Shyti 0 siblings, 0 replies; 12+ messages in thread From: Andi Shyti @ 2016-12-29 13:41 UTC (permalink / raw) To: Krzysztof Kozlowski Cc: Andi Shyti, Tomasz Figa, Chanwoo Choi, Sylwester Nawrocki, Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon, Kukjin Kim, Javier Martinez Canillas, devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel, Andi Shyti > > #include <dt-bindings/pinctrl/samsung.h> > > > > -#define PIN_PULL_NONE 0 > > -#define PIN_PULL_DOWN 1 > > -#define PIN_PULL_UP 3 > > - > > -#define PIN_DRV_LV1 0 > > -#define PIN_DRV_LV2 2 > > -#define PIN_DRV_LV3 1 > > -#define PIN_DRV_LV4 3 > > - > > -#define PIN_IN 0 > > -#define PIN_OUT 1 > > -#define PIN_FUNC1 2 > > - > > This should be squashed with 3/4 because logically it is strictly > related to it and splitting it does not bring any benefits. Actually > while looking at 3/4 I was surprised to see them not removed. Yes, right :) Thanks, Andi ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2016-12-29 13:52 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <CGME20161229084221epcas1p4d76b4b30f59734f7eee29aec53b54af3@epcas1p4.samsung.com>
2016-12-29 8:42 ` [PATCH 0/4] Use Exynos macros for pinctrl settings Andi Shyti
[not found] ` <CGME20161229084221epcas5p43926b87dccbee0db4045faa5ddca565d@epcas5p4.samsung.com>
2016-12-29 8:42 ` [PATCH 1/4] pinctrl: dt-bindings: samsung: add drive strength macros for Exynos5433 Andi Shyti
2016-12-29 9:17 ` Chanwoo Choi
2016-12-29 10:33 ` Chanwoo Choi
[not found] ` <CGME20161229093931epcas1p11b118da454a0dbf3a798ba406f35ce54@epcas1p1.samsung.com>
2016-12-29 9:39 ` [1/4] " Jaehoon Chung
2016-12-29 11:50 ` [PATCH 1/4] " Krzysztof Kozlowski
2016-12-29 13:41 ` Andi Shyti
[not found] ` <CGME20161229084222epcas1p4b9ef5db922132015bf74d0f0fcecb486@epcas1p4.samsung.com>
2016-12-29 8:42 ` [PATCH 2/4] ARM64: dts: exynos5433: use macros for pinctrl configuration on Exynos5433 Andi Shyti
[not found] ` <CGME20161229084222epcas1p4c0db2fd327fc92bfe123442f44b88ab5@epcas1p4.samsung.com>
2016-12-29 8:42 ` [PATCH 3/4] ARM64: dts: TM2: comply to the samsung pinctrl naming convention Andi Shyti
[not found] ` <CGME20161229084222epcas5p41dacaeed3e2d4f10b07eee3930f7531c@epcas5p4.samsung.com>
2016-12-29 8:42 ` [PATCH 4/4] ARM64: dts: exynos5433: remove unused code Andi Shyti
2016-12-29 11:54 ` Krzysztof Kozlowski
2016-12-29 13:41 ` Andi Shyti
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).