* [PATCH 0/9] ARM: dts: exynos: Use macros for GPIO to make it more readable
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
0 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel
Cc: Javier Martinez Canillas, Tomasz Figa, Sylwester Nawrocki,
Krzysztof Kozlowski, Bartlomiej Zolnierkiewicz
Hi,
Example:
- samsung,pin-function = <0x2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
This should be just more readable. Especially for drive strenghts which
are unobvious and different between some SoCs.
Tested with dtx_diff:
for i in dts-old/exynos*dtb; do scripts/dtc/dtx_diff $i dts-new/$(basename $i); done
Everything generated with sed:
sed -i -e 's/samsung,pin-pud = <0>;$/samsung,pin-pud = <PIN_PULL_NONE>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-pud = <1>;$/samsung,pin-pud = <PIN_PULL_DOWN>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-pud = <3>;$/samsung,pin-pud = <PIN_PULL_UP>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-drv = <0>;$/samsung,pin-drv = <PIN_DRV_LV1>;/' arch/arm/boot/dts/exynos[34]* arch/arm/boot/dts/exynos5250*
sed -i -e 's/samsung,pin-drv = <2>;$/samsung,pin-drv = <PIN_DRV_LV2>;/' arch/arm/boot/dts/exynos[34]* arch/arm/boot/dts/exynos5250*
sed -i -e 's/samsung,pin-drv = <1>;$/samsung,pin-drv = <PIN_DRV_LV3>;/' arch/arm/boot/dts/exynos[34]* arch/arm/boot/dts/exynos5250*
sed -i -e 's/samsung,pin-drv = <3>;$/samsung,pin-drv = <PIN_DRV_LV4>;/' arch/arm/boot/dts/exynos[34]* arch/arm/boot/dts/exynos5250*
sed -i -e 's/samsung,pin-drv = <0>;$/samsung,pin-drv = <PIN_DRV_LV1>;/' arch/arm/boot/dts/exynos5260*
sed -i -e 's/samsung,pin-drv = <1>;$/samsung,pin-drv = <PIN_DRV_LV2>;/' arch/arm/boot/dts/exynos5260*
sed -i -e 's/samsung,pin-drv = <2>;$/samsung,pin-drv = <PIN_DRV_LV4>;/' arch/arm/boot/dts/exynos5260*
sed -i -e 's/samsung,pin-drv = <3>;$/samsung,pin-drv = <PIN_DRV_LV6>;/' arch/arm/boot/dts/exynos5260*
sed -i -e 's/samsung,pin-drv = <0>;$/samsung,pin-drv = <PIN_DRV_LV1>;/' arch/arm/boot/dts/exynos5[48]*
sed -i -e 's/samsung,pin-drv = <1>;$/samsung,pin-drv = <PIN_DRV_LV2>;/' arch/arm/boot/dts/exynos5[48]*
sed -i -e 's/samsung,pin-drv = <2>;$/samsung,pin-drv = <PIN_DRV_LV3>;/' arch/arm/boot/dts/exynos5[48]*
sed -i -e 's/samsung,pin-drv = <3>;$/samsung,pin-drv = <PIN_DRV_LV4>;/' arch/arm/boot/dts/exynos5[48]*
sed -i -e 's/samsung,pin-function = <0>;$/samsung,pin-function = <PIN_FUNC_INPUT>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <1>;$/samsung,pin-function = <PIN_FUNC_OUTPUT>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <2>;$/samsung,pin-function = <PIN_FUNC_SPC_2>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <\(0x\)\?2>;$/samsung,pin-function = <PIN_FUNC_SPC_2>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <\(0x\)\?3>;$/samsung,pin-function = <PIN_FUNC_SPC_3>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <3>;$/samsung,pin-function = <PIN_FUNC_SPC_3>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <4>;$/samsung,pin-function = <PIN_FUNC_SPC_4>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <5>;$/samsung,pin-function = <PIN_FUNC_SPC_5>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <6>;$/samsung,pin-function = <PIN_FUNC_SPC_6>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <0xf>;$/samsung,pin-function = <PIN_FUNC_SPC_F>;/' arch/arm/boot/dts/exynos*
Best regards,
Krzysztof
Krzysztof Kozlowski (9):
ARM: dts: exynos: Add macros for GPIO configuration
ARM: dts: exynos: Use macros for GPIO configuration on exynos3250
ARM: dts: exynos: Use macros for GPIO configuration on exynos4210
ARM: dts: exynos: Use macros for GPIO configuration on exynos4415
ARM: dts: exynos: Use macros for GPIO configuration on exynos4x12
ARM: dts: exynos: Use macros for GPIO configuration on exynos5250
ARM: dts: exynos: Use macros for GPIO configuration on exynos5260
ARM: dts: exynos: Use macros for GPIO configuration on exynos5410
ARM: dts: exynos: Use macros for GPIO configuration on
exynos542x/exynos5800
arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 275 +++++------
arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 471 ++++++++++---------
arch/arm/boot/dts/exynos4210-smdkv310.dts | 12 +-
arch/arm/boot/dts/exynos4210-universal_c210.dts | 8 +-
arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 14 +-
arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +-
arch/arm/boot/dts/exynos4412-origen.dts | 12 +-
arch/arm/boot/dts/exynos4412-smdk4412.dts | 12 +-
arch/arm/boot/dts/exynos4415-pinctrl.dtsi | 303 ++++++------
arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 517 +++++++++++----------
arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 419 +++++++++--------
arch/arm/boot/dts/exynos5250-smdk5250.dts | 6 +-
arch/arm/boot/dts/exynos5250-snow-common.dtsi | 76 +--
arch/arm/boot/dts/exynos5250-snow-rev5.dts | 6 +-
arch/arm/boot/dts/exynos5250-snow.dts | 6 +-
arch/arm/boot/dts/exynos5250-spring.dts | 72 +--
arch/arm/boot/dts/exynos5260-pinctrl.dtsi | 201 ++++----
arch/arm/boot/dts/exynos5260-xyref5260.dts | 6 +-
arch/arm/boot/dts/exynos5410-odroidxu.dts | 30 +-
arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 196 ++++----
arch/arm/boot/dts/exynos5410-smdk5410.dts | 10 +-
arch/arm/boot/dts/exynos5420-arndale-octa.dts | 6 +-
arch/arm/boot/dts/exynos5420-peach-pit.dts | 126 ++---
arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 371 ++++++++-------
arch/arm/boot/dts/exynos5420-smdk5420.dts | 18 +-
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 18 +-
arch/arm/boot/dts/exynos5800-peach-pi.dts | 126 ++---
27 files changed, 1716 insertions(+), 1603 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH 0/9] ARM: dts: exynos: Use macros for GPIO to make it more readable
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
0 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel
Cc: Javier Martinez Canillas, Krzysztof Kozlowski, Tomasz Figa,
Sylwester Nawrocki, Bartlomiej Zolnierkiewicz
Hi,
Example:
- samsung,pin-function = <0x2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
This should be just more readable. Especially for drive strenghts which
are unobvious and different between some SoCs.
Tested with dtx_diff:
for i in dts-old/exynos*dtb; do scripts/dtc/dtx_diff $i dts-new/$(basename $i); done
Everything generated with sed:
sed -i -e 's/samsung,pin-pud = <0>;$/samsung,pin-pud = <PIN_PULL_NONE>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-pud = <1>;$/samsung,pin-pud = <PIN_PULL_DOWN>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-pud = <3>;$/samsung,pin-pud = <PIN_PULL_UP>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-drv = <0>;$/samsung,pin-drv = <PIN_DRV_LV1>;/' arch/arm/boot/dts/exynos[34]* arch/arm/boot/dts/exynos5250*
sed -i -e 's/samsung,pin-drv = <2>;$/samsung,pin-drv = <PIN_DRV_LV2>;/' arch/arm/boot/dts/exynos[34]* arch/arm/boot/dts/exynos5250*
sed -i -e 's/samsung,pin-drv = <1>;$/samsung,pin-drv = <PIN_DRV_LV3>;/' arch/arm/boot/dts/exynos[34]* arch/arm/boot/dts/exynos5250*
sed -i -e 's/samsung,pin-drv = <3>;$/samsung,pin-drv = <PIN_DRV_LV4>;/' arch/arm/boot/dts/exynos[34]* arch/arm/boot/dts/exynos5250*
sed -i -e 's/samsung,pin-drv = <0>;$/samsung,pin-drv = <PIN_DRV_LV1>;/' arch/arm/boot/dts/exynos5260*
sed -i -e 's/samsung,pin-drv = <1>;$/samsung,pin-drv = <PIN_DRV_LV2>;/' arch/arm/boot/dts/exynos5260*
sed -i -e 's/samsung,pin-drv = <2>;$/samsung,pin-drv = <PIN_DRV_LV4>;/' arch/arm/boot/dts/exynos5260*
sed -i -e 's/samsung,pin-drv = <3>;$/samsung,pin-drv = <PIN_DRV_LV6>;/' arch/arm/boot/dts/exynos5260*
sed -i -e 's/samsung,pin-drv = <0>;$/samsung,pin-drv = <PIN_DRV_LV1>;/' arch/arm/boot/dts/exynos5[48]*
sed -i -e 's/samsung,pin-drv = <1>;$/samsung,pin-drv = <PIN_DRV_LV2>;/' arch/arm/boot/dts/exynos5[48]*
sed -i -e 's/samsung,pin-drv = <2>;$/samsung,pin-drv = <PIN_DRV_LV3>;/' arch/arm/boot/dts/exynos5[48]*
sed -i -e 's/samsung,pin-drv = <3>;$/samsung,pin-drv = <PIN_DRV_LV4>;/' arch/arm/boot/dts/exynos5[48]*
sed -i -e 's/samsung,pin-function = <0>;$/samsung,pin-function = <PIN_FUNC_INPUT>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <1>;$/samsung,pin-function = <PIN_FUNC_OUTPUT>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <2>;$/samsung,pin-function = <PIN_FUNC_SPC_2>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <\(0x\)\?2>;$/samsung,pin-function = <PIN_FUNC_SPC_2>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <\(0x\)\?3>;$/samsung,pin-function = <PIN_FUNC_SPC_3>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <3>;$/samsung,pin-function = <PIN_FUNC_SPC_3>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <4>;$/samsung,pin-function = <PIN_FUNC_SPC_4>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <5>;$/samsung,pin-function = <PIN_FUNC_SPC_5>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <6>;$/samsung,pin-function = <PIN_FUNC_SPC_6>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <0xf>;$/samsung,pin-function = <PIN_FUNC_SPC_F>;/' arch/arm/boot/dts/exynos*
Best regards,
Krzysztof
Krzysztof Kozlowski (9):
ARM: dts: exynos: Add macros for GPIO configuration
ARM: dts: exynos: Use macros for GPIO configuration on exynos3250
ARM: dts: exynos: Use macros for GPIO configuration on exynos4210
ARM: dts: exynos: Use macros for GPIO configuration on exynos4415
ARM: dts: exynos: Use macros for GPIO configuration on exynos4x12
ARM: dts: exynos: Use macros for GPIO configuration on exynos5250
ARM: dts: exynos: Use macros for GPIO configuration on exynos5260
ARM: dts: exynos: Use macros for GPIO configuration on exynos5410
ARM: dts: exynos: Use macros for GPIO configuration on
exynos542x/exynos5800
arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 275 +++++------
arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 471 ++++++++++---------
arch/arm/boot/dts/exynos4210-smdkv310.dts | 12 +-
arch/arm/boot/dts/exynos4210-universal_c210.dts | 8 +-
arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 14 +-
arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +-
arch/arm/boot/dts/exynos4412-origen.dts | 12 +-
arch/arm/boot/dts/exynos4412-smdk4412.dts | 12 +-
arch/arm/boot/dts/exynos4415-pinctrl.dtsi | 303 ++++++------
arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 517 +++++++++++----------
arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 419 +++++++++--------
arch/arm/boot/dts/exynos5250-smdk5250.dts | 6 +-
arch/arm/boot/dts/exynos5250-snow-common.dtsi | 76 +--
arch/arm/boot/dts/exynos5250-snow-rev5.dts | 6 +-
arch/arm/boot/dts/exynos5250-snow.dts | 6 +-
arch/arm/boot/dts/exynos5250-spring.dts | 72 +--
arch/arm/boot/dts/exynos5260-pinctrl.dtsi | 201 ++++----
arch/arm/boot/dts/exynos5260-xyref5260.dts | 6 +-
arch/arm/boot/dts/exynos5410-odroidxu.dts | 30 +-
arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 196 ++++----
arch/arm/boot/dts/exynos5410-smdk5410.dts | 10 +-
arch/arm/boot/dts/exynos5420-arndale-octa.dts | 6 +-
arch/arm/boot/dts/exynos5420-peach-pit.dts | 126 ++---
arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 371 ++++++++-------
arch/arm/boot/dts/exynos5420-smdk5420.dts | 18 +-
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 18 +-
arch/arm/boot/dts/exynos5800-peach-pi.dts | 126 ++---
27 files changed, 1716 insertions(+), 1603 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH 0/9] ARM: dts: exynos: Use macros for GPIO to make it more readable
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
0 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
Example:
- samsung,pin-function = <0x2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
This should be just more readable. Especially for drive strenghts which
are unobvious and different between some SoCs.
Tested with dtx_diff:
for i in dts-old/exynos*dtb; do scripts/dtc/dtx_diff $i dts-new/$(basename $i); done
Everything generated with sed:
sed -i -e 's/samsung,pin-pud = <0>;$/samsung,pin-pud = <PIN_PULL_NONE>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-pud = <1>;$/samsung,pin-pud = <PIN_PULL_DOWN>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-pud = <3>;$/samsung,pin-pud = <PIN_PULL_UP>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-drv = <0>;$/samsung,pin-drv = <PIN_DRV_LV1>;/' arch/arm/boot/dts/exynos[34]* arch/arm/boot/dts/exynos5250*
sed -i -e 's/samsung,pin-drv = <2>;$/samsung,pin-drv = <PIN_DRV_LV2>;/' arch/arm/boot/dts/exynos[34]* arch/arm/boot/dts/exynos5250*
sed -i -e 's/samsung,pin-drv = <1>;$/samsung,pin-drv = <PIN_DRV_LV3>;/' arch/arm/boot/dts/exynos[34]* arch/arm/boot/dts/exynos5250*
sed -i -e 's/samsung,pin-drv = <3>;$/samsung,pin-drv = <PIN_DRV_LV4>;/' arch/arm/boot/dts/exynos[34]* arch/arm/boot/dts/exynos5250*
sed -i -e 's/samsung,pin-drv = <0>;$/samsung,pin-drv = <PIN_DRV_LV1>;/' arch/arm/boot/dts/exynos5260*
sed -i -e 's/samsung,pin-drv = <1>;$/samsung,pin-drv = <PIN_DRV_LV2>;/' arch/arm/boot/dts/exynos5260*
sed -i -e 's/samsung,pin-drv = <2>;$/samsung,pin-drv = <PIN_DRV_LV4>;/' arch/arm/boot/dts/exynos5260*
sed -i -e 's/samsung,pin-drv = <3>;$/samsung,pin-drv = <PIN_DRV_LV6>;/' arch/arm/boot/dts/exynos5260*
sed -i -e 's/samsung,pin-drv = <0>;$/samsung,pin-drv = <PIN_DRV_LV1>;/' arch/arm/boot/dts/exynos5[48]*
sed -i -e 's/samsung,pin-drv = <1>;$/samsung,pin-drv = <PIN_DRV_LV2>;/' arch/arm/boot/dts/exynos5[48]*
sed -i -e 's/samsung,pin-drv = <2>;$/samsung,pin-drv = <PIN_DRV_LV3>;/' arch/arm/boot/dts/exynos5[48]*
sed -i -e 's/samsung,pin-drv = <3>;$/samsung,pin-drv = <PIN_DRV_LV4>;/' arch/arm/boot/dts/exynos5[48]*
sed -i -e 's/samsung,pin-function = <0>;$/samsung,pin-function = <PIN_FUNC_INPUT>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <1>;$/samsung,pin-function = <PIN_FUNC_OUTPUT>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <2>;$/samsung,pin-function = <PIN_FUNC_SPC_2>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <\(0x\)\?2>;$/samsung,pin-function = <PIN_FUNC_SPC_2>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <\(0x\)\?3>;$/samsung,pin-function = <PIN_FUNC_SPC_3>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <3>;$/samsung,pin-function = <PIN_FUNC_SPC_3>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <4>;$/samsung,pin-function = <PIN_FUNC_SPC_4>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <5>;$/samsung,pin-function = <PIN_FUNC_SPC_5>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <6>;$/samsung,pin-function = <PIN_FUNC_SPC_6>;/' arch/arm/boot/dts/exynos*
sed -i -e 's/samsung,pin-function = <0xf>;$/samsung,pin-function = <PIN_FUNC_SPC_F>;/' arch/arm/boot/dts/exynos*
Best regards,
Krzysztof
Krzysztof Kozlowski (9):
ARM: dts: exynos: Add macros for GPIO configuration
ARM: dts: exynos: Use macros for GPIO configuration on exynos3250
ARM: dts: exynos: Use macros for GPIO configuration on exynos4210
ARM: dts: exynos: Use macros for GPIO configuration on exynos4415
ARM: dts: exynos: Use macros for GPIO configuration on exynos4x12
ARM: dts: exynos: Use macros for GPIO configuration on exynos5250
ARM: dts: exynos: Use macros for GPIO configuration on exynos5260
ARM: dts: exynos: Use macros for GPIO configuration on exynos5410
ARM: dts: exynos: Use macros for GPIO configuration on
exynos542x/exynos5800
arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 275 +++++------
arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 471 ++++++++++---------
arch/arm/boot/dts/exynos4210-smdkv310.dts | 12 +-
arch/arm/boot/dts/exynos4210-universal_c210.dts | 8 +-
arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 14 +-
arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +-
arch/arm/boot/dts/exynos4412-origen.dts | 12 +-
arch/arm/boot/dts/exynos4412-smdk4412.dts | 12 +-
arch/arm/boot/dts/exynos4415-pinctrl.dtsi | 303 ++++++------
arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 517 +++++++++++----------
arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 419 +++++++++--------
arch/arm/boot/dts/exynos5250-smdk5250.dts | 6 +-
arch/arm/boot/dts/exynos5250-snow-common.dtsi | 76 +--
arch/arm/boot/dts/exynos5250-snow-rev5.dts | 6 +-
arch/arm/boot/dts/exynos5250-snow.dts | 6 +-
arch/arm/boot/dts/exynos5250-spring.dts | 72 +--
arch/arm/boot/dts/exynos5260-pinctrl.dtsi | 201 ++++----
arch/arm/boot/dts/exynos5260-xyref5260.dts | 6 +-
arch/arm/boot/dts/exynos5410-odroidxu.dts | 30 +-
arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 196 ++++----
arch/arm/boot/dts/exynos5410-smdk5410.dts | 10 +-
arch/arm/boot/dts/exynos5420-arndale-octa.dts | 6 +-
arch/arm/boot/dts/exynos5420-peach-pit.dts | 126 ++---
arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 371 ++++++++-------
arch/arm/boot/dts/exynos5420-smdk5420.dts | 18 +-
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 18 +-
arch/arm/boot/dts/exynos5800-peach-pi.dts | 126 ++---
27 files changed, 1716 insertions(+), 1603 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH 1/9] ARM: dts: exynos: Add macros for GPIO configuration
2016-08-31 12:13 ` Krzysztof Kozlowski
(?)
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel
Cc: Javier Martinez Canillas, Tomasz Figa, Sylwester Nawrocki,
Krzysztof Kozlowski, Bartlomiej Zolnierkiewicz
Add macros for replacing hard-coded GPIO configuration: pull up/down,
drive strength and function.
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 <k.kozlowski@samsung.com>
---
arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 5 +++++
arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 17 +++++++++++++++++
arch/arm/boot/dts/exynos4415-pinctrl.dtsi | 17 +++++++++++++++++
arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 13 +++++++++++++
arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 17 +++++++++++++++++
arch/arm/boot/dts/exynos5260-pinctrl.dtsi | 17 ++++++++++++++---
arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 16 ++++++++++++++++
arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 17 +++++++++++++++++
8 files changed, 116 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/exynos3250-pinctrl.dtsi b/arch/arm/boot/dts/exynos3250-pinctrl.dtsi
index 40ea7de44933..645bc3669554 100644
--- a/arch/arm/boot/dts/exynos3250-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos3250-pinctrl.dtsi
@@ -26,6 +26,11 @@
#define PIN_PDN_INPUT 2
#define PIN_PDN_PREV 3
+#define PIN_FUNC_INPUT 0
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
+
#define PIN_IN(_pin, _pull, _drv) \
_pin { \
samsung,pins = #_pin; \
diff --git a/arch/arm/boot/dts/exynos4210-pinctrl.dtsi b/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
index 9331c6252eff..21129263e4e5 100644
--- a/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
@@ -14,6 +14,23 @@
* published by the Free Software Foundation.
*/
+#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_FUNC_INPUT 0
+#define PIN_FUNC_OUTPUT 1
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
+#define PIN_FUNC_SPC_5 5
+#define PIN_FUNC_SPC_F 0xf
+
/ {
pinctrl@11400000 {
gpa0: gpa0 {
diff --git a/arch/arm/boot/dts/exynos4415-pinctrl.dtsi b/arch/arm/boot/dts/exynos4415-pinctrl.dtsi
index 75af9c56123e..ae9d140a24d1 100644
--- a/arch/arm/boot/dts/exynos4415-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4415-pinctrl.dtsi
@@ -11,6 +11,23 @@
* published by the Free Software Foundation.
*/
+#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_FUNC_INPUT 0
+#define PIN_FUNC_OUTPUT 1
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
+#define PIN_FUNC_SPC_5 5
+#define PIN_FUNC_SPC_F 0xf
+
&pinctrl_0 {
gpa0: gpa0 {
gpio-controller;
diff --git a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
index 856b29254374..ba5865208d3e 100644
--- a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
@@ -16,11 +16,24 @@
#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_PDN_OUT0 0
#define PIN_PDN_OUT1 1
#define PIN_PDN_INPUT 2
#define PIN_PDN_PREV 3
+#define PIN_FUNC_INPUT 0
+#define PIN_FUNC_OUTPUT 1
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
+#define PIN_FUNC_SPC_5 5
+#define PIN_FUNC_SPC_F 0xf
+
#define PIN_SLP(_pin, _mode, _pull) \
_pin { \
samsung,pins = #_pin; \
diff --git a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
index 880917e508b2..5563dd80d4d0 100644
--- a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
@@ -12,6 +12,23 @@
* published by the Free Software Foundation.
*/
+#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_FUNC_INPUT 0
+#define PIN_FUNC_OUTPUT 1
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
+#define PIN_FUNC_SPC_5 5
+#define PIN_FUNC_SPC_F 0xf
+
&pinctrl_0 {
gpa0: gpa0 {
gpio-controller;
diff --git a/arch/arm/boot/dts/exynos5260-pinctrl.dtsi b/arch/arm/boot/dts/exynos5260-pinctrl.dtsi
index f6ee55ea0708..efd01b816538 100644
--- a/arch/arm/boot/dts/exynos5260-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5260-pinctrl.dtsi
@@ -12,9 +12,20 @@
* published by the Free Software Foundation.
*/
-#define PIN_PULL_NONE 0
-#define PIN_PULL_DOWN 1
-#define PIN_PULL_UP 3
+#define PIN_PULL_NONE 0
+#define PIN_PULL_DOWN 1
+#define PIN_PULL_UP 3
+
+#define PIN_DRV_LV1 0
+#define PIN_DRV_LV2 1
+#define PIN_DRV_LV4 2
+#define PIN_DRV_LV6 3
+
+#define PIN_FUNC_INPUT 0
+#define PIN_FUNC_OUTPUT 1
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
&pinctrl_0 {
gpa0: gpa0 {
diff --git a/arch/arm/boot/dts/exynos5410-pinctrl.dtsi b/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
index b58a0f29f42c..10272fa54c37 100644
--- a/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
@@ -9,6 +9,22 @@
* published by the Free Software Foundation.
*/
+#define PIN_PULL_NONE 0
+#define PIN_PULL_DOWN 1
+#define PIN_PULL_UP 3
+
+#define PIN_DRV_LV1 0
+#define PIN_DRV_LV2 1
+#define PIN_DRV_LV3 2
+#define PIN_DRV_LV4 3
+
+#define PIN_FUNC_INPUT 0
+#define PIN_FUNC_OUTPUT 1
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
+#define PIN_FUNC_SPC_F 0xf
+
&pinctrl_0 {
gpa0: gpa0 {
gpio-controller;
diff --git a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
index 14beb7e07323..41abc8ec474a 100644
--- a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
@@ -12,6 +12,23 @@
* published by the Free Software Foundation.
*/
+#define PIN_PULL_NONE 0
+#define PIN_PULL_DOWN 1
+#define PIN_PULL_UP 3
+
+#define PIN_DRV_LV1 0
+#define PIN_DRV_LV2 1
+#define PIN_DRV_LV3 2
+#define PIN_DRV_LV4 3
+
+#define PIN_FUNC_INPUT 0
+#define PIN_FUNC_OUTPUT 1
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
+#define PIN_FUNC_SPC_5 5
+#define PIN_FUNC_SPC_F 0xf
+
&pinctrl_0 {
gpy7: gpy7 {
gpio-controller;
--
1.9.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 1/9] ARM: dts: exynos: Add macros for GPIO configuration
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
0 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel
Cc: Javier Martinez Canillas, Krzysztof Kozlowski, Tomasz Figa,
Sylwester Nawrocki, Bartlomiej Zolnierkiewicz
Add macros for replacing hard-coded GPIO configuration: pull up/down,
drive strength and function.
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 <k.kozlowski@samsung.com>
---
arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 5 +++++
arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 17 +++++++++++++++++
arch/arm/boot/dts/exynos4415-pinctrl.dtsi | 17 +++++++++++++++++
arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 13 +++++++++++++
arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 17 +++++++++++++++++
arch/arm/boot/dts/exynos5260-pinctrl.dtsi | 17 ++++++++++++++---
arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 16 ++++++++++++++++
arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 17 +++++++++++++++++
8 files changed, 116 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/exynos3250-pinctrl.dtsi b/arch/arm/boot/dts/exynos3250-pinctrl.dtsi
index 40ea7de44933..645bc3669554 100644
--- a/arch/arm/boot/dts/exynos3250-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos3250-pinctrl.dtsi
@@ -26,6 +26,11 @@
#define PIN_PDN_INPUT 2
#define PIN_PDN_PREV 3
+#define PIN_FUNC_INPUT 0
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
+
#define PIN_IN(_pin, _pull, _drv) \
_pin { \
samsung,pins = #_pin; \
diff --git a/arch/arm/boot/dts/exynos4210-pinctrl.dtsi b/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
index 9331c6252eff..21129263e4e5 100644
--- a/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
@@ -14,6 +14,23 @@
* published by the Free Software Foundation.
*/
+#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_FUNC_INPUT 0
+#define PIN_FUNC_OUTPUT 1
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
+#define PIN_FUNC_SPC_5 5
+#define PIN_FUNC_SPC_F 0xf
+
/ {
pinctrl@11400000 {
gpa0: gpa0 {
diff --git a/arch/arm/boot/dts/exynos4415-pinctrl.dtsi b/arch/arm/boot/dts/exynos4415-pinctrl.dtsi
index 75af9c56123e..ae9d140a24d1 100644
--- a/arch/arm/boot/dts/exynos4415-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4415-pinctrl.dtsi
@@ -11,6 +11,23 @@
* published by the Free Software Foundation.
*/
+#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_FUNC_INPUT 0
+#define PIN_FUNC_OUTPUT 1
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
+#define PIN_FUNC_SPC_5 5
+#define PIN_FUNC_SPC_F 0xf
+
&pinctrl_0 {
gpa0: gpa0 {
gpio-controller;
diff --git a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
index 856b29254374..ba5865208d3e 100644
--- a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
@@ -16,11 +16,24 @@
#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_PDN_OUT0 0
#define PIN_PDN_OUT1 1
#define PIN_PDN_INPUT 2
#define PIN_PDN_PREV 3
+#define PIN_FUNC_INPUT 0
+#define PIN_FUNC_OUTPUT 1
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
+#define PIN_FUNC_SPC_5 5
+#define PIN_FUNC_SPC_F 0xf
+
#define PIN_SLP(_pin, _mode, _pull) \
_pin { \
samsung,pins = #_pin; \
diff --git a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
index 880917e508b2..5563dd80d4d0 100644
--- a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
@@ -12,6 +12,23 @@
* published by the Free Software Foundation.
*/
+#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_FUNC_INPUT 0
+#define PIN_FUNC_OUTPUT 1
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
+#define PIN_FUNC_SPC_5 5
+#define PIN_FUNC_SPC_F 0xf
+
&pinctrl_0 {
gpa0: gpa0 {
gpio-controller;
diff --git a/arch/arm/boot/dts/exynos5260-pinctrl.dtsi b/arch/arm/boot/dts/exynos5260-pinctrl.dtsi
index f6ee55ea0708..efd01b816538 100644
--- a/arch/arm/boot/dts/exynos5260-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5260-pinctrl.dtsi
@@ -12,9 +12,20 @@
* published by the Free Software Foundation.
*/
-#define PIN_PULL_NONE 0
-#define PIN_PULL_DOWN 1
-#define PIN_PULL_UP 3
+#define PIN_PULL_NONE 0
+#define PIN_PULL_DOWN 1
+#define PIN_PULL_UP 3
+
+#define PIN_DRV_LV1 0
+#define PIN_DRV_LV2 1
+#define PIN_DRV_LV4 2
+#define PIN_DRV_LV6 3
+
+#define PIN_FUNC_INPUT 0
+#define PIN_FUNC_OUTPUT 1
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
&pinctrl_0 {
gpa0: gpa0 {
diff --git a/arch/arm/boot/dts/exynos5410-pinctrl.dtsi b/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
index b58a0f29f42c..10272fa54c37 100644
--- a/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
@@ -9,6 +9,22 @@
* published by the Free Software Foundation.
*/
+#define PIN_PULL_NONE 0
+#define PIN_PULL_DOWN 1
+#define PIN_PULL_UP 3
+
+#define PIN_DRV_LV1 0
+#define PIN_DRV_LV2 1
+#define PIN_DRV_LV3 2
+#define PIN_DRV_LV4 3
+
+#define PIN_FUNC_INPUT 0
+#define PIN_FUNC_OUTPUT 1
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
+#define PIN_FUNC_SPC_F 0xf
+
&pinctrl_0 {
gpa0: gpa0 {
gpio-controller;
diff --git a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
index 14beb7e07323..41abc8ec474a 100644
--- a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
@@ -12,6 +12,23 @@
* published by the Free Software Foundation.
*/
+#define PIN_PULL_NONE 0
+#define PIN_PULL_DOWN 1
+#define PIN_PULL_UP 3
+
+#define PIN_DRV_LV1 0
+#define PIN_DRV_LV2 1
+#define PIN_DRV_LV3 2
+#define PIN_DRV_LV4 3
+
+#define PIN_FUNC_INPUT 0
+#define PIN_FUNC_OUTPUT 1
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
+#define PIN_FUNC_SPC_5 5
+#define PIN_FUNC_SPC_F 0xf
+
&pinctrl_0 {
gpy7: gpy7 {
gpio-controller;
--
1.9.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 1/9] ARM: dts: exynos: Add macros for GPIO configuration
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
0 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: linux-arm-kernel
Add macros for replacing hard-coded GPIO configuration: pull up/down,
drive strength and function.
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 <k.kozlowski@samsung.com>
---
arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 5 +++++
arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 17 +++++++++++++++++
arch/arm/boot/dts/exynos4415-pinctrl.dtsi | 17 +++++++++++++++++
arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 13 +++++++++++++
arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 17 +++++++++++++++++
arch/arm/boot/dts/exynos5260-pinctrl.dtsi | 17 ++++++++++++++---
arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 16 ++++++++++++++++
arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 17 +++++++++++++++++
8 files changed, 116 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/exynos3250-pinctrl.dtsi b/arch/arm/boot/dts/exynos3250-pinctrl.dtsi
index 40ea7de44933..645bc3669554 100644
--- a/arch/arm/boot/dts/exynos3250-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos3250-pinctrl.dtsi
@@ -26,6 +26,11 @@
#define PIN_PDN_INPUT 2
#define PIN_PDN_PREV 3
+#define PIN_FUNC_INPUT 0
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
+
#define PIN_IN(_pin, _pull, _drv) \
_pin { \
samsung,pins = #_pin; \
diff --git a/arch/arm/boot/dts/exynos4210-pinctrl.dtsi b/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
index 9331c6252eff..21129263e4e5 100644
--- a/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
@@ -14,6 +14,23 @@
* published by the Free Software Foundation.
*/
+#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_FUNC_INPUT 0
+#define PIN_FUNC_OUTPUT 1
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
+#define PIN_FUNC_SPC_5 5
+#define PIN_FUNC_SPC_F 0xf
+
/ {
pinctrl at 11400000 {
gpa0: gpa0 {
diff --git a/arch/arm/boot/dts/exynos4415-pinctrl.dtsi b/arch/arm/boot/dts/exynos4415-pinctrl.dtsi
index 75af9c56123e..ae9d140a24d1 100644
--- a/arch/arm/boot/dts/exynos4415-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4415-pinctrl.dtsi
@@ -11,6 +11,23 @@
* published by the Free Software Foundation.
*/
+#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_FUNC_INPUT 0
+#define PIN_FUNC_OUTPUT 1
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
+#define PIN_FUNC_SPC_5 5
+#define PIN_FUNC_SPC_F 0xf
+
&pinctrl_0 {
gpa0: gpa0 {
gpio-controller;
diff --git a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
index 856b29254374..ba5865208d3e 100644
--- a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
@@ -16,11 +16,24 @@
#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_PDN_OUT0 0
#define PIN_PDN_OUT1 1
#define PIN_PDN_INPUT 2
#define PIN_PDN_PREV 3
+#define PIN_FUNC_INPUT 0
+#define PIN_FUNC_OUTPUT 1
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
+#define PIN_FUNC_SPC_5 5
+#define PIN_FUNC_SPC_F 0xf
+
#define PIN_SLP(_pin, _mode, _pull) \
_pin { \
samsung,pins = #_pin; \
diff --git a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
index 880917e508b2..5563dd80d4d0 100644
--- a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
@@ -12,6 +12,23 @@
* published by the Free Software Foundation.
*/
+#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_FUNC_INPUT 0
+#define PIN_FUNC_OUTPUT 1
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
+#define PIN_FUNC_SPC_5 5
+#define PIN_FUNC_SPC_F 0xf
+
&pinctrl_0 {
gpa0: gpa0 {
gpio-controller;
diff --git a/arch/arm/boot/dts/exynos5260-pinctrl.dtsi b/arch/arm/boot/dts/exynos5260-pinctrl.dtsi
index f6ee55ea0708..efd01b816538 100644
--- a/arch/arm/boot/dts/exynos5260-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5260-pinctrl.dtsi
@@ -12,9 +12,20 @@
* published by the Free Software Foundation.
*/
-#define PIN_PULL_NONE 0
-#define PIN_PULL_DOWN 1
-#define PIN_PULL_UP 3
+#define PIN_PULL_NONE 0
+#define PIN_PULL_DOWN 1
+#define PIN_PULL_UP 3
+
+#define PIN_DRV_LV1 0
+#define PIN_DRV_LV2 1
+#define PIN_DRV_LV4 2
+#define PIN_DRV_LV6 3
+
+#define PIN_FUNC_INPUT 0
+#define PIN_FUNC_OUTPUT 1
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
&pinctrl_0 {
gpa0: gpa0 {
diff --git a/arch/arm/boot/dts/exynos5410-pinctrl.dtsi b/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
index b58a0f29f42c..10272fa54c37 100644
--- a/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
@@ -9,6 +9,22 @@
* published by the Free Software Foundation.
*/
+#define PIN_PULL_NONE 0
+#define PIN_PULL_DOWN 1
+#define PIN_PULL_UP 3
+
+#define PIN_DRV_LV1 0
+#define PIN_DRV_LV2 1
+#define PIN_DRV_LV3 2
+#define PIN_DRV_LV4 3
+
+#define PIN_FUNC_INPUT 0
+#define PIN_FUNC_OUTPUT 1
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
+#define PIN_FUNC_SPC_F 0xf
+
&pinctrl_0 {
gpa0: gpa0 {
gpio-controller;
diff --git a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
index 14beb7e07323..41abc8ec474a 100644
--- a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
@@ -12,6 +12,23 @@
* published by the Free Software Foundation.
*/
+#define PIN_PULL_NONE 0
+#define PIN_PULL_DOWN 1
+#define PIN_PULL_UP 3
+
+#define PIN_DRV_LV1 0
+#define PIN_DRV_LV2 1
+#define PIN_DRV_LV3 2
+#define PIN_DRV_LV4 3
+
+#define PIN_FUNC_INPUT 0
+#define PIN_FUNC_OUTPUT 1
+#define PIN_FUNC_SPC_2 2
+#define PIN_FUNC_SPC_3 3
+#define PIN_FUNC_SPC_4 4
+#define PIN_FUNC_SPC_5 5
+#define PIN_FUNC_SPC_F 0xf
+
&pinctrl_0 {
gpy7: gpy7 {
gpio-controller;
--
1.9.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 2/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos3250
2016-08-31 12:13 ` Krzysztof Kozlowski
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel
Cc: Javier Martinez Canillas, Tomasz Figa, Sylwester Nawrocki,
Krzysztof Kozlowski, Bartlomiej Zolnierkiewicz
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>
---
arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 270 +++++++++++++++---------------
1 file changed, 135 insertions(+), 135 deletions(-)
diff --git a/arch/arm/boot/dts/exynos3250-pinctrl.dtsi b/arch/arm/boot/dts/exynos3250-pinctrl.dtsi
index 645bc3669554..2d0b39c206ad 100644
--- a/arch/arm/boot/dts/exynos3250-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos3250-pinctrl.dtsi
@@ -130,158 +130,158 @@
uart0_data: uart0-data {
samsung,pins = "gpa0-0", "gpa0-1";
- samsung,pin-function = <0x2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart0_fctl: uart0-fctl {
samsung,pins = "gpa0-2", "gpa0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_data: uart1-data {
samsung,pins = "gpa0-4", "gpa0-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_fctl: uart1-fctl {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c2_bus: i2c2-bus {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_data: uart2-data {
samsung,pins = "gpa1-0", "gpa1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c3_bus: i2c3-bus {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi0_bus: spi0-bus {
samsung,pins = "gpb-0", "gpb-2", "gpb-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c4_bus: i2c4-bus {
samsung,pins = "gpb-0", "gpb-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi1_bus: spi1-bus {
samsung,pins = "gpb-4", "gpb-6", "gpb-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c5_bus: i2c5-bus {
samsung,pins = "gpb-2", "gpb-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2s2_bus: i2s2-bus {
samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
"gpc1-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pcm2_bus: pcm2-bus {
samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
"gpc1-4";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c6_bus: i2c6-bus {
samsung,pins = "gpc1-3", "gpc1-4";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm0_out: pwm0-out {
samsung,pins = "gpd0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm1_out: pwm1-out {
samsung,pins = "gpd0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c7_bus: i2c7-bus {
samsung,pins = "gpd0-2", "gpd0-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm2_out: pwm2-out {
samsung,pins = "gpd0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm3_out: pwm3-out {
samsung,pins = "gpd0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c0_bus: i2c0-bus {
samsung,pins = "gpd1-0", "gpd1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
mipi0_clk: mipi0-clk {
samsung,pins = "gpd1-0", "gpd1-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c1_bus: i2c1-bus {
samsung,pins = "gpd1-2", "gpd1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -413,164 +413,164 @@
sd0_clk: sd0-clk {
samsung,pins = "gpk0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cmd: sd0-cmd {
samsung,pins = "gpk0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cd: sd0-cd {
samsung,pins = "gpk0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_rdqs: sd0-rdqs {
samsung,pins = "gpk0-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus1: sd0-bus-width1 {
samsung,pins = "gpk0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus4: sd0-bus-width4 {
samsung,pins = "gpk0-4", "gpk0-5", "gpk0-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus8: sd0-bus-width8 {
samsung,pins = "gpl0-0", "gpl0-1", "gpl0-2", "gpl0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_clk: sd1-clk {
samsung,pins = "gpk1-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cmd: sd1-cmd {
samsung,pins = "gpk1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cd: sd1-cd {
samsung,pins = "gpk1-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus1: sd1-bus-width1 {
samsung,pins = "gpk1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus4: sd1-bus-width4 {
samsung,pins = "gpk1-4", "gpk1-5", "gpk1-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_clk: sd2-clk {
samsung,pins = "gpk2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cmd: sd2-cmd {
samsung,pins = "gpk2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cd: sd2-cd {
samsung,pins = "gpk2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus1: sd2-bus-width1 {
samsung,pins = "gpk2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus4: sd2-bus-width4 {
samsung,pins = "gpk2-4", "gpk2-5", "gpk2-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
cam_port_b_io: cam-port-b-io {
samsung,pins = "gpm0-0", "gpm0-1", "gpm0-2", "gpm0-3",
"gpm0-4", "gpm0-5", "gpm0-6", "gpm0-7",
"gpm1-0", "gpm1-1", "gpm2-0", "gpm2-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_port_b_clk_active: cam-port-b-clk-active {
samsung,pins = "gpm2-2";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
cam_port_b_clk_idle: cam-port-b-clk-idle {
samsung,pins = "gpm2-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
fimc_is_i2c0: fimc-is-i2c0 {
samsung,pins = "gpm4-0", "gpm4-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
fimc_is_i2c1: fimc-is-i2c1 {
samsung,pins = "gpm4-2", "gpm4-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
fimc_is_uart: fimc-is-uart {
samsung,pins = "gpm3-5", "gpm3-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 2/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos3250
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
0 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 270 +++++++++++++++---------------
1 file changed, 135 insertions(+), 135 deletions(-)
diff --git a/arch/arm/boot/dts/exynos3250-pinctrl.dtsi b/arch/arm/boot/dts/exynos3250-pinctrl.dtsi
index 645bc3669554..2d0b39c206ad 100644
--- a/arch/arm/boot/dts/exynos3250-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos3250-pinctrl.dtsi
@@ -130,158 +130,158 @@
uart0_data: uart0-data {
samsung,pins = "gpa0-0", "gpa0-1";
- samsung,pin-function = <0x2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart0_fctl: uart0-fctl {
samsung,pins = "gpa0-2", "gpa0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_data: uart1-data {
samsung,pins = "gpa0-4", "gpa0-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_fctl: uart1-fctl {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c2_bus: i2c2-bus {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_data: uart2-data {
samsung,pins = "gpa1-0", "gpa1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c3_bus: i2c3-bus {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi0_bus: spi0-bus {
samsung,pins = "gpb-0", "gpb-2", "gpb-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c4_bus: i2c4-bus {
samsung,pins = "gpb-0", "gpb-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi1_bus: spi1-bus {
samsung,pins = "gpb-4", "gpb-6", "gpb-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c5_bus: i2c5-bus {
samsung,pins = "gpb-2", "gpb-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2s2_bus: i2s2-bus {
samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
"gpc1-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pcm2_bus: pcm2-bus {
samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
"gpc1-4";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c6_bus: i2c6-bus {
samsung,pins = "gpc1-3", "gpc1-4";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm0_out: pwm0-out {
samsung,pins = "gpd0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm1_out: pwm1-out {
samsung,pins = "gpd0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c7_bus: i2c7-bus {
samsung,pins = "gpd0-2", "gpd0-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm2_out: pwm2-out {
samsung,pins = "gpd0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm3_out: pwm3-out {
samsung,pins = "gpd0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c0_bus: i2c0-bus {
samsung,pins = "gpd1-0", "gpd1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
mipi0_clk: mipi0-clk {
samsung,pins = "gpd1-0", "gpd1-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c1_bus: i2c1-bus {
samsung,pins = "gpd1-2", "gpd1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -413,164 +413,164 @@
sd0_clk: sd0-clk {
samsung,pins = "gpk0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cmd: sd0-cmd {
samsung,pins = "gpk0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cd: sd0-cd {
samsung,pins = "gpk0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_rdqs: sd0-rdqs {
samsung,pins = "gpk0-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus1: sd0-bus-width1 {
samsung,pins = "gpk0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus4: sd0-bus-width4 {
samsung,pins = "gpk0-4", "gpk0-5", "gpk0-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus8: sd0-bus-width8 {
samsung,pins = "gpl0-0", "gpl0-1", "gpl0-2", "gpl0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_clk: sd1-clk {
samsung,pins = "gpk1-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cmd: sd1-cmd {
samsung,pins = "gpk1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cd: sd1-cd {
samsung,pins = "gpk1-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus1: sd1-bus-width1 {
samsung,pins = "gpk1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus4: sd1-bus-width4 {
samsung,pins = "gpk1-4", "gpk1-5", "gpk1-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_clk: sd2-clk {
samsung,pins = "gpk2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cmd: sd2-cmd {
samsung,pins = "gpk2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cd: sd2-cd {
samsung,pins = "gpk2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus1: sd2-bus-width1 {
samsung,pins = "gpk2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus4: sd2-bus-width4 {
samsung,pins = "gpk2-4", "gpk2-5", "gpk2-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
cam_port_b_io: cam-port-b-io {
samsung,pins = "gpm0-0", "gpm0-1", "gpm0-2", "gpm0-3",
"gpm0-4", "gpm0-5", "gpm0-6", "gpm0-7",
"gpm1-0", "gpm1-1", "gpm2-0", "gpm2-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_port_b_clk_active: cam-port-b-clk-active {
samsung,pins = "gpm2-2";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
cam_port_b_clk_idle: cam-port-b-clk-idle {
samsung,pins = "gpm2-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
fimc_is_i2c0: fimc-is-i2c0 {
samsung,pins = "gpm4-0", "gpm4-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
fimc_is_i2c1: fimc-is-i2c1 {
samsung,pins = "gpm4-2", "gpm4-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
fimc_is_uart: fimc-is-uart {
samsung,pins = "gpm3-5", "gpm3-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 3/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos4210
2016-08-31 12:13 ` Krzysztof Kozlowski
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel
Cc: Javier Martinez Canillas, Tomasz Figa, Sylwester Nawrocki,
Krzysztof Kozlowski, Bartlomiej Zolnierkiewicz
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>
---
arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 454 ++++++++++++------------
arch/arm/boot/dts/exynos4210-smdkv310.dts | 12 +-
arch/arm/boot/dts/exynos4210-universal_c210.dts | 8 +-
3 files changed, 237 insertions(+), 237 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4210-pinctrl.dtsi b/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
index 21129263e4e5..55d62cae4472 100644
--- a/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
@@ -163,245 +163,245 @@
uart0_data: uart0-data {
samsung,pins = "gpa0-0", "gpa0-1";
- samsung,pin-function = <0x2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart0_fctl: uart0-fctl {
samsung,pins = "gpa0-2", "gpa0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_data: uart1-data {
samsung,pins = "gpa0-4", "gpa0-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_fctl: uart1-fctl {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c2_bus: i2c2-bus {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_data: uart2-data {
samsung,pins = "gpa1-0", "gpa1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_fctl: uart2-fctl {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart_audio_a: uart-audio-a {
samsung,pins = "gpa1-0", "gpa1-1";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c3_bus: i2c3-bus {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart3_data: uart3-data {
samsung,pins = "gpa1-4", "gpa1-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart_audio_b: uart-audio-b {
samsung,pins = "gpa1-4", "gpa1-5";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi0_bus: spi0-bus {
samsung,pins = "gpb-0", "gpb-2", "gpb-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c4_bus: i2c4-bus {
samsung,pins = "gpb-2", "gpb-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi1_bus: spi1-bus {
samsung,pins = "gpb-4", "gpb-6", "gpb-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c5_bus: i2c5-bus {
samsung,pins = "gpb-6", "gpb-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2s1_bus: i2s1-bus {
samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
"gpc0-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pcm1_bus: pcm1-bus {
samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
"gpc0-4";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
ac97_bus: ac97-bus {
samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
"gpc0-4";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2s2_bus: i2s2-bus {
samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
"gpc1-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pcm2_bus: pcm2-bus {
samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
"gpc1-4";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spdif_bus: spdif-bus {
samsung,pins = "gpc1-0", "gpc1-1";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c6_bus: i2c6-bus {
samsung,pins = "gpc1-3", "gpc1-4";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi2_bus: spi2-bus {
samsung,pins = "gpc1-1", "gpc1-2", "gpc1-3", "gpc1-4";
- samsung,pin-function = <5>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_5>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c7_bus: i2c7-bus {
samsung,pins = "gpd0-2", "gpd0-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c0_bus: i2c0-bus {
samsung,pins = "gpd1-0", "gpd1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c1_bus: i2c1-bus {
samsung,pins = "gpd1-2", "gpd1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm0_out: pwm0-out {
samsung,pins = "gpd0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm1_out: pwm1-out {
samsung,pins = "gpd0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm2_out: pwm2-out {
samsung,pins = "gpd0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm3_out: pwm3-out {
samsung,pins = "gpd0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_ctrl: lcd-ctrl {
samsung,pins = "gpd0-0", "gpd0-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_sync: lcd-sync {
samsung,pins = "gpf0-0", "gpf0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_en: lcd-en {
samsung,pins = "gpe3-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_clk: lcd-clk {
samsung,pins = "gpf0-0", "gpf0-1", "gpf0-2", "gpf0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_data16: lcd-data-width16 {
@@ -409,9 +409,9 @@
"gpf1-3", "gpf1-6", "gpf1-7", "gpf2-0",
"gpf2-1", "gpf2-2", "gpf2-3", "gpf2-7",
"gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_data18: lcd-data-width18 {
@@ -420,9 +420,9 @@
"gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",
"gpf2-6", "gpf2-7", "gpf3-0", "gpf3-1",
"gpf3-2", "gpf3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_data24: lcd-data-width24 {
@@ -432,9 +432,9 @@
"gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",
"gpf2-4", "gpf2-5", "gpf2-6", "gpf2-7",
"gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -586,263 +586,263 @@
sd0_clk: sd0-clk {
samsung,pins = "gpk0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cmd: sd0-cmd {
samsung,pins = "gpk0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cd: sd0-cd {
samsung,pins = "gpk0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus1: sd0-bus-width1 {
samsung,pins = "gpk0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus4: sd0-bus-width4 {
samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus8: sd0-bus-width8 {
samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_clk: sd4-clk {
samsung,pins = "gpk0-0";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_cmd: sd4-cmd {
samsung,pins = "gpk0-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_cd: sd4-cd {
samsung,pins = "gpk0-2";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_bus1: sd4-bus-width1 {
samsung,pins = "gpk0-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_bus4: sd4-bus-width4 {
samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_bus8: sd4-bus-width8 {
samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
- samsung,pin-function = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
samsung,pin-pud = <4>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_clk: sd1-clk {
samsung,pins = "gpk1-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cmd: sd1-cmd {
samsung,pins = "gpk1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cd: sd1-cd {
samsung,pins = "gpk1-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus1: sd1-bus-width1 {
samsung,pins = "gpk1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus4: sd1-bus-width4 {
samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_clk: sd2-clk {
samsung,pins = "gpk2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cmd: sd2-cmd {
samsung,pins = "gpk2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cd: sd2-cd {
samsung,pins = "gpk2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus1: sd2-bus-width1 {
samsung,pins = "gpk2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus4: sd2-bus-width4 {
samsung,pins = "gpk2-3", "gpk2-4", "gpk2-5", "gpk2-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus8: sd2-bus-width8 {
samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_clk: sd3-clk {
samsung,pins = "gpk3-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_cmd: sd3-cmd {
samsung,pins = "gpk3-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_cd: sd3-cd {
samsung,pins = "gpk3-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_bus1: sd3-bus-width1 {
samsung,pins = "gpk3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_bus4: sd3-bus-width4 {
samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
eint0: ext-int0 {
samsung,pins = "gpx0-0";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
eint8: ext-int8 {
samsung,pins = "gpx1-0";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
eint15: ext-int15 {
samsung,pins = "gpx1-7";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
eint16: ext-int16 {
samsung,pins = "gpx2-0";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
eint31: ext-int31 {
samsung,pins = "gpx3-7";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_port_a_io: cam-port-a-io {
samsung,pins = "gpj0-0", "gpj0-1", "gpj0-2", "gpj0-3",
"gpj0-4", "gpj0-5", "gpj0-6", "gpj0-7",
"gpj1-0", "gpj1-1", "gpj1-2", "gpj1-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_port_a_clk_active: cam-port-a-clk-active {
samsung,pins = "gpj1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
cam_port_a_clk_idle: cam-port-a-clk-idle {
samsung,pins = "gpj1-3";
- samsung,pin-function = <0>;
- samsung,pin-pud = <1>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
hdmi_cec: hdmi-cec {
samsung,pins = "gpx3-6";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -855,17 +855,17 @@
i2s0_bus: i2s0-bus {
samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
"gpz-4", "gpz-5", "gpz-6";
- samsung,pin-function = <0x2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pcm0_bus: pcm0-bus {
samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
"gpz-4";
- samsung,pin-function = <0x3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
};
diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts
index 847fae3dd1f1..c543293d2ac0 100644
--- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -136,17 +136,17 @@
&pinctrl_1 {
keypad_rows: keypad-rows {
samsung,pins = "gpx2-0", "gpx2-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
keypad_cols: keypad-cols {
samsung,pins = "gpx1-0", "gpx1-1", "gpx1-2", "gpx1-3",
"gpx1-4", "gpx1-5", "gpx1-6", "gpx1-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts
index cf95202fa310..80daa81423f7 100644
--- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
+++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
@@ -521,16 +521,16 @@
&pinctrl_1 {
hdmi_hpd: hdmi-hpd {
samsung,pins = "gpx3-7";
- samsung,pin-pud = <0>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
};
};
&pinctrl_0 {
i2c_ddc_bus: i2c-ddc-bus {
samsung,pins = "gpe4-2", "gpe4-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 3/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos4210
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
0 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 454 ++++++++++++------------
arch/arm/boot/dts/exynos4210-smdkv310.dts | 12 +-
arch/arm/boot/dts/exynos4210-universal_c210.dts | 8 +-
3 files changed, 237 insertions(+), 237 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4210-pinctrl.dtsi b/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
index 21129263e4e5..55d62cae4472 100644
--- a/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
@@ -163,245 +163,245 @@
uart0_data: uart0-data {
samsung,pins = "gpa0-0", "gpa0-1";
- samsung,pin-function = <0x2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart0_fctl: uart0-fctl {
samsung,pins = "gpa0-2", "gpa0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_data: uart1-data {
samsung,pins = "gpa0-4", "gpa0-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_fctl: uart1-fctl {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c2_bus: i2c2-bus {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_data: uart2-data {
samsung,pins = "gpa1-0", "gpa1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_fctl: uart2-fctl {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart_audio_a: uart-audio-a {
samsung,pins = "gpa1-0", "gpa1-1";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c3_bus: i2c3-bus {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart3_data: uart3-data {
samsung,pins = "gpa1-4", "gpa1-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart_audio_b: uart-audio-b {
samsung,pins = "gpa1-4", "gpa1-5";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi0_bus: spi0-bus {
samsung,pins = "gpb-0", "gpb-2", "gpb-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c4_bus: i2c4-bus {
samsung,pins = "gpb-2", "gpb-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi1_bus: spi1-bus {
samsung,pins = "gpb-4", "gpb-6", "gpb-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c5_bus: i2c5-bus {
samsung,pins = "gpb-6", "gpb-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2s1_bus: i2s1-bus {
samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
"gpc0-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pcm1_bus: pcm1-bus {
samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
"gpc0-4";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
ac97_bus: ac97-bus {
samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
"gpc0-4";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2s2_bus: i2s2-bus {
samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
"gpc1-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pcm2_bus: pcm2-bus {
samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
"gpc1-4";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spdif_bus: spdif-bus {
samsung,pins = "gpc1-0", "gpc1-1";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c6_bus: i2c6-bus {
samsung,pins = "gpc1-3", "gpc1-4";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi2_bus: spi2-bus {
samsung,pins = "gpc1-1", "gpc1-2", "gpc1-3", "gpc1-4";
- samsung,pin-function = <5>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_5>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c7_bus: i2c7-bus {
samsung,pins = "gpd0-2", "gpd0-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c0_bus: i2c0-bus {
samsung,pins = "gpd1-0", "gpd1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c1_bus: i2c1-bus {
samsung,pins = "gpd1-2", "gpd1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm0_out: pwm0-out {
samsung,pins = "gpd0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm1_out: pwm1-out {
samsung,pins = "gpd0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm2_out: pwm2-out {
samsung,pins = "gpd0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm3_out: pwm3-out {
samsung,pins = "gpd0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_ctrl: lcd-ctrl {
samsung,pins = "gpd0-0", "gpd0-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_sync: lcd-sync {
samsung,pins = "gpf0-0", "gpf0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_en: lcd-en {
samsung,pins = "gpe3-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_clk: lcd-clk {
samsung,pins = "gpf0-0", "gpf0-1", "gpf0-2", "gpf0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_data16: lcd-data-width16 {
@@ -409,9 +409,9 @@
"gpf1-3", "gpf1-6", "gpf1-7", "gpf2-0",
"gpf2-1", "gpf2-2", "gpf2-3", "gpf2-7",
"gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_data18: lcd-data-width18 {
@@ -420,9 +420,9 @@
"gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",
"gpf2-6", "gpf2-7", "gpf3-0", "gpf3-1",
"gpf3-2", "gpf3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_data24: lcd-data-width24 {
@@ -432,9 +432,9 @@
"gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",
"gpf2-4", "gpf2-5", "gpf2-6", "gpf2-7",
"gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -586,263 +586,263 @@
sd0_clk: sd0-clk {
samsung,pins = "gpk0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cmd: sd0-cmd {
samsung,pins = "gpk0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cd: sd0-cd {
samsung,pins = "gpk0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus1: sd0-bus-width1 {
samsung,pins = "gpk0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus4: sd0-bus-width4 {
samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus8: sd0-bus-width8 {
samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_clk: sd4-clk {
samsung,pins = "gpk0-0";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_cmd: sd4-cmd {
samsung,pins = "gpk0-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_cd: sd4-cd {
samsung,pins = "gpk0-2";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_bus1: sd4-bus-width1 {
samsung,pins = "gpk0-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_bus4: sd4-bus-width4 {
samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_bus8: sd4-bus-width8 {
samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
- samsung,pin-function = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
samsung,pin-pud = <4>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_clk: sd1-clk {
samsung,pins = "gpk1-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cmd: sd1-cmd {
samsung,pins = "gpk1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cd: sd1-cd {
samsung,pins = "gpk1-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus1: sd1-bus-width1 {
samsung,pins = "gpk1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus4: sd1-bus-width4 {
samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_clk: sd2-clk {
samsung,pins = "gpk2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cmd: sd2-cmd {
samsung,pins = "gpk2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cd: sd2-cd {
samsung,pins = "gpk2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus1: sd2-bus-width1 {
samsung,pins = "gpk2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus4: sd2-bus-width4 {
samsung,pins = "gpk2-3", "gpk2-4", "gpk2-5", "gpk2-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus8: sd2-bus-width8 {
samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_clk: sd3-clk {
samsung,pins = "gpk3-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_cmd: sd3-cmd {
samsung,pins = "gpk3-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_cd: sd3-cd {
samsung,pins = "gpk3-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_bus1: sd3-bus-width1 {
samsung,pins = "gpk3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_bus4: sd3-bus-width4 {
samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
eint0: ext-int0 {
samsung,pins = "gpx0-0";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
eint8: ext-int8 {
samsung,pins = "gpx1-0";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
eint15: ext-int15 {
samsung,pins = "gpx1-7";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
eint16: ext-int16 {
samsung,pins = "gpx2-0";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
eint31: ext-int31 {
samsung,pins = "gpx3-7";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_port_a_io: cam-port-a-io {
samsung,pins = "gpj0-0", "gpj0-1", "gpj0-2", "gpj0-3",
"gpj0-4", "gpj0-5", "gpj0-6", "gpj0-7",
"gpj1-0", "gpj1-1", "gpj1-2", "gpj1-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_port_a_clk_active: cam-port-a-clk-active {
samsung,pins = "gpj1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
cam_port_a_clk_idle: cam-port-a-clk-idle {
samsung,pins = "gpj1-3";
- samsung,pin-function = <0>;
- samsung,pin-pud = <1>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
hdmi_cec: hdmi-cec {
samsung,pins = "gpx3-6";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -855,17 +855,17 @@
i2s0_bus: i2s0-bus {
samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
"gpz-4", "gpz-5", "gpz-6";
- samsung,pin-function = <0x2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pcm0_bus: pcm0-bus {
samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
"gpz-4";
- samsung,pin-function = <0x3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
};
diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts
index 847fae3dd1f1..c543293d2ac0 100644
--- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -136,17 +136,17 @@
&pinctrl_1 {
keypad_rows: keypad-rows {
samsung,pins = "gpx2-0", "gpx2-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
keypad_cols: keypad-cols {
samsung,pins = "gpx1-0", "gpx1-1", "gpx1-2", "gpx1-3",
"gpx1-4", "gpx1-5", "gpx1-6", "gpx1-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts
index cf95202fa310..80daa81423f7 100644
--- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
+++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
@@ -521,16 +521,16 @@
&pinctrl_1 {
hdmi_hpd: hdmi-hpd {
samsung,pins = "gpx3-7";
- samsung,pin-pud = <0>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
};
};
&pinctrl_0 {
i2c_ddc_bus: i2c-ddc-bus {
samsung,pins = "gpe4-2", "gpe4-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 4/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos4415
2016-08-31 12:13 ` Krzysztof Kozlowski
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel
Cc: Javier Martinez Canillas, Tomasz Figa, Sylwester Nawrocki,
Krzysztof Kozlowski, Bartlomiej Zolnierkiewicz
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>
---
arch/arm/boot/dts/exynos4415-pinctrl.dtsi | 286 +++++++++++++++---------------
1 file changed, 143 insertions(+), 143 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4415-pinctrl.dtsi b/arch/arm/boot/dts/exynos4415-pinctrl.dtsi
index ae9d140a24d1..e61741fb9765 100644
--- a/arch/arm/boot/dts/exynos4415-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4415-pinctrl.dtsi
@@ -111,180 +111,180 @@
uart0_data: uart0-data {
samsung,pins = "gpa0-0", "gpa0-1";
- samsung,pin-function = <0x2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart0_fctl: uart0-fctl {
samsung,pins = "gpa0-2", "gpa0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_data: uart1-data {
samsung,pins = "gpa0-4", "gpa0-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_fctl: uart1-fctl {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_data: uart2-data {
samsung,pins = "gpa1-0", "gpa1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_fctl: uart2-fctl {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart3_data: uart3-data {
samsung,pins = "gpa1-4", "gpa1-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c2_bus: i2c2-bus {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c3_bus: i2c3-bus {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi0_bus: spi0-bus {
samsung,pins = "gpb-0", "gpb-2", "gpb-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c4_bus: i2c4-bus {
samsung,pins = "gpb-0", "gpb-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi1_bus: spi1-bus {
samsung,pins = "gpb-4", "gpb-6", "gpb-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c5_bus: i2c5-bus {
samsung,pins = "gpb-2", "gpb-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2s1_bus: i2s1-bus {
samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
"gpc0-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2s2_bus: i2s2-bus {
samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
"gpc1-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pcm2_bus: pcm2-bus {
samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
"gpc1-4";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c6_bus: i2c6-bus {
samsung,pins = "gpc1-3", "gpc1-4";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi2_bus: spi2-bus {
samsung,pins = "gpc1-1", "gpc1-3", "gpc1-4";
- samsung,pin-function = <5>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_5>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm0_out: pwm0-out {
samsung,pins = "gpd0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm1_out: pwm1-out {
samsung,pins = "gpd0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm2_out: pwm2-out {
samsung,pins = "gpd0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm3_out: pwm3-out {
samsung,pins = "gpd0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c7_bus: i2c7-bus {
samsung,pins = "gpd0-2", "gpd0-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c0_bus: i2c0-bus {
samsung,pins = "gpd1-0", "gpd1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c1_bus: i2c1-bus {
samsung,pins = "gpd1-2", "gpd1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -409,120 +409,120 @@
sd0_clk: sd0-clk {
samsung,pins = "gpk0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cmd: sd0-cmd {
samsung,pins = "gpk0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cd: sd0-cd {
samsung,pins = "gpk0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_rdqs: sd0-rdqs {
samsung,pins = "gpk0-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus1: sd0-bus-width1 {
samsung,pins = "gpk0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus4: sd0-bus-width4 {
samsung,pins = "gpk0-4", "gpk0-5", "gpk0-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus8: sd0-bus-width8 {
samsung,pins = "gpl0-0", "gpl0-1", "gpl0-2", "gpl0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_clk: sd1-clk {
samsung,pins = "gpk1-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cmd: sd1-cmd {
samsung,pins = "gpk1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cd: sd1-cd {
samsung,pins = "gpk1-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus1: sd1-bus-width1 {
samsung,pins = "gpk1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus4: sd1-bus-width4 {
samsung,pins = "gpk1-4", "gpk1-5", "gpk1-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_clk: sd2-clk {
samsung,pins = "gpk2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
samsung,pin-drv = <4>;
};
sd2_cmd: sd2-cmd {
samsung,pins = "gpk2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
samsung,pin-drv = <4>;
};
sd2_cd: sd2-cd {
samsung,pins = "gpk2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus1: sd2-bus-width1 {
samsung,pins = "gpk2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
samsung,pin-drv = <4>;
};
sd2_bus4: sd2-bus-width4 {
samsung,pins = "gpk2-4", "gpk2-5", "gpk2-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
samsung,pin-drv = <4>;
};
@@ -530,44 +530,44 @@
samsung,pins = "gpm0-0", "gpm0-1", "gpm0-2", "gpm0-3",
"gpm0-4", "gpm0-5", "gpm0-6", "gpm0-7",
"gpm1-0", "gpm1-1", "gpm2-0", "gpm2-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_port_b_clk_active: cam-port-b-clk-active {
samsung,pins = "gpm2-2";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
cam_port_b_clk_idle: cam-port-b-clk-idle {
samsung,pins = "gpm2-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
fimc_is_i2c0: fimc-is-i2c0 {
samsung,pins = "gpm4-0", "gpm4-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
fimc_is_i2c1: fimc-is-i2c1 {
samsung,pins = "gpm4-2", "gpm4-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
fimc_is_uart: fimc-is-uart {
samsung,pins = "gpm3-5", "gpm3-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -583,8 +583,8 @@
i2s0_bus: i2s0-bus {
samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
"gpz-4", "gpz-5", "gpz-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 4/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos4415
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
0 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
arch/arm/boot/dts/exynos4415-pinctrl.dtsi | 286 +++++++++++++++---------------
1 file changed, 143 insertions(+), 143 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4415-pinctrl.dtsi b/arch/arm/boot/dts/exynos4415-pinctrl.dtsi
index ae9d140a24d1..e61741fb9765 100644
--- a/arch/arm/boot/dts/exynos4415-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4415-pinctrl.dtsi
@@ -111,180 +111,180 @@
uart0_data: uart0-data {
samsung,pins = "gpa0-0", "gpa0-1";
- samsung,pin-function = <0x2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart0_fctl: uart0-fctl {
samsung,pins = "gpa0-2", "gpa0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_data: uart1-data {
samsung,pins = "gpa0-4", "gpa0-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_fctl: uart1-fctl {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_data: uart2-data {
samsung,pins = "gpa1-0", "gpa1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_fctl: uart2-fctl {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart3_data: uart3-data {
samsung,pins = "gpa1-4", "gpa1-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c2_bus: i2c2-bus {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c3_bus: i2c3-bus {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi0_bus: spi0-bus {
samsung,pins = "gpb-0", "gpb-2", "gpb-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c4_bus: i2c4-bus {
samsung,pins = "gpb-0", "gpb-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi1_bus: spi1-bus {
samsung,pins = "gpb-4", "gpb-6", "gpb-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c5_bus: i2c5-bus {
samsung,pins = "gpb-2", "gpb-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2s1_bus: i2s1-bus {
samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
"gpc0-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2s2_bus: i2s2-bus {
samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
"gpc1-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pcm2_bus: pcm2-bus {
samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
"gpc1-4";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c6_bus: i2c6-bus {
samsung,pins = "gpc1-3", "gpc1-4";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi2_bus: spi2-bus {
samsung,pins = "gpc1-1", "gpc1-3", "gpc1-4";
- samsung,pin-function = <5>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_5>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm0_out: pwm0-out {
samsung,pins = "gpd0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm1_out: pwm1-out {
samsung,pins = "gpd0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm2_out: pwm2-out {
samsung,pins = "gpd0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm3_out: pwm3-out {
samsung,pins = "gpd0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c7_bus: i2c7-bus {
samsung,pins = "gpd0-2", "gpd0-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c0_bus: i2c0-bus {
samsung,pins = "gpd1-0", "gpd1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c1_bus: i2c1-bus {
samsung,pins = "gpd1-2", "gpd1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -409,120 +409,120 @@
sd0_clk: sd0-clk {
samsung,pins = "gpk0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cmd: sd0-cmd {
samsung,pins = "gpk0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cd: sd0-cd {
samsung,pins = "gpk0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_rdqs: sd0-rdqs {
samsung,pins = "gpk0-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus1: sd0-bus-width1 {
samsung,pins = "gpk0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus4: sd0-bus-width4 {
samsung,pins = "gpk0-4", "gpk0-5", "gpk0-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus8: sd0-bus-width8 {
samsung,pins = "gpl0-0", "gpl0-1", "gpl0-2", "gpl0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_clk: sd1-clk {
samsung,pins = "gpk1-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cmd: sd1-cmd {
samsung,pins = "gpk1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cd: sd1-cd {
samsung,pins = "gpk1-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus1: sd1-bus-width1 {
samsung,pins = "gpk1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus4: sd1-bus-width4 {
samsung,pins = "gpk1-4", "gpk1-5", "gpk1-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_clk: sd2-clk {
samsung,pins = "gpk2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
samsung,pin-drv = <4>;
};
sd2_cmd: sd2-cmd {
samsung,pins = "gpk2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
samsung,pin-drv = <4>;
};
sd2_cd: sd2-cd {
samsung,pins = "gpk2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus1: sd2-bus-width1 {
samsung,pins = "gpk2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
samsung,pin-drv = <4>;
};
sd2_bus4: sd2-bus-width4 {
samsung,pins = "gpk2-4", "gpk2-5", "gpk2-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
samsung,pin-drv = <4>;
};
@@ -530,44 +530,44 @@
samsung,pins = "gpm0-0", "gpm0-1", "gpm0-2", "gpm0-3",
"gpm0-4", "gpm0-5", "gpm0-6", "gpm0-7",
"gpm1-0", "gpm1-1", "gpm2-0", "gpm2-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_port_b_clk_active: cam-port-b-clk-active {
samsung,pins = "gpm2-2";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
cam_port_b_clk_idle: cam-port-b-clk-idle {
samsung,pins = "gpm2-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
fimc_is_i2c0: fimc-is-i2c0 {
samsung,pins = "gpm4-0", "gpm4-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
fimc_is_i2c1: fimc-is-i2c1 {
samsung,pins = "gpm4-2", "gpm4-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
fimc_is_uart: fimc-is-uart {
samsung,pins = "gpm3-5", "gpm3-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -583,8 +583,8 @@
i2s0_bus: i2s0-bus {
samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
"gpz-4", "gpz-5", "gpz-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 5/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos4x12
2016-08-31 12:13 ` Krzysztof Kozlowski
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel
Cc: Javier Martinez Canillas, Tomasz Figa, Sylwester Nawrocki,
Krzysztof Kozlowski, Bartlomiej Zolnierkiewicz
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>
---
arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 14 +-
arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +-
arch/arm/boot/dts/exynos4412-origen.dts | 12 +-
arch/arm/boot/dts/exynos4412-smdk4412.dts | 12 +-
arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 504 ++++++++++++------------
5 files changed, 272 insertions(+), 272 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index be644fe6a0fd..5adbeb485a97 100644
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -163,26 +163,26 @@
/* RSTN signal for eMMC */
&sd1_cd {
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
&pinctrl_1 {
gpio_power_key: power_key {
samsung,pins = "gpx1-3";
- samsung,pin-pud = <0>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
};
max77686_irq: max77686-irq {
samsung,pins = "gpx3-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
hdmi_hpd: hdmi-hpd {
samsung,pins = "gpx3-7";
- samsung,pin-pud = <1>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
};
};
diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
index 2af235151301..647a3e97d942 100644
--- a/arch/arm/boot/dts/exynos4412-odroidx.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
@@ -83,7 +83,7 @@
&pinctrl_1 {
gpio_home_key: home_key {
samsung,pins = "gpx2-2";
- samsung,pin-pud = <0>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
};
};
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index 26a36fed9652..0a490e0e7eac 100644
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -500,16 +500,16 @@
&pinctrl_1 {
keypad_rows: keypad-rows {
samsung,pins = "gpx2-0", "gpx2-1", "gpx2-2";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
keypad_cols: keypad-cols {
samsung,pins = "gpx1-0", "gpx1-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts b/arch/arm/boot/dts/exynos4412-smdk4412.dts
index 231ffbdbf9d0..d9ce24416bed 100644
--- a/arch/arm/boot/dts/exynos4412-smdk4412.dts
+++ b/arch/arm/boot/dts/exynos4412-smdk4412.dts
@@ -115,17 +115,17 @@
&pinctrl_1 {
keypad_rows: keypad-rows {
samsung,pins = "gpx2-0", "gpx2-1", "gpx2-2";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
keypad_cols: keypad-cols {
samsung,pins = "gpx1-0", "gpx1-1", "gpx1-2", "gpx1-3",
"gpx1-4", "gpx1-5", "gpx1-6", "gpx1-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
index ba5865208d3e..dc5e9a932357 100644
--- a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
@@ -149,245 +149,245 @@
uart0_data: uart0-data {
samsung,pins = "gpa0-0", "gpa0-1";
- samsung,pin-function = <0x2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart0_fctl: uart0-fctl {
samsung,pins = "gpa0-2", "gpa0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_data: uart1-data {
samsung,pins = "gpa0-4", "gpa0-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_fctl: uart1-fctl {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c2_bus: i2c2-bus {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_data: uart2-data {
samsung,pins = "gpa1-0", "gpa1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_fctl: uart2-fctl {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart_audio_a: uart-audio-a {
samsung,pins = "gpa1-0", "gpa1-1";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c3_bus: i2c3-bus {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart3_data: uart3-data {
samsung,pins = "gpa1-4", "gpa1-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart_audio_b: uart-audio-b {
samsung,pins = "gpa1-4", "gpa1-5";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi0_bus: spi0-bus {
samsung,pins = "gpb-0", "gpb-2", "gpb-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c4_bus: i2c4-bus {
samsung,pins = "gpb-0", "gpb-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi1_bus: spi1-bus {
samsung,pins = "gpb-4", "gpb-6", "gpb-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c5_bus: i2c5-bus {
samsung,pins = "gpb-2", "gpb-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2s1_bus: i2s1-bus {
samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
"gpc0-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pcm1_bus: pcm1-bus {
samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
"gpc0-4";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
ac97_bus: ac97-bus {
samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
"gpc0-4";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2s2_bus: i2s2-bus {
samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
"gpc1-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pcm2_bus: pcm2-bus {
samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
"gpc1-4";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spdif_bus: spdif-bus {
samsung,pins = "gpc1-0", "gpc1-1";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c6_bus: i2c6-bus {
samsung,pins = "gpc1-3", "gpc1-4";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi2_bus: spi2-bus {
samsung,pins = "gpc1-1", "gpc1-3", "gpc1-4";
- samsung,pin-function = <5>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_5>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm0_out: pwm0-out {
samsung,pins = "gpd0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm1_out: pwm1-out {
samsung,pins = "gpd0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_ctrl: lcd-ctrl {
samsung,pins = "gpd0-0", "gpd0-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c7_bus: i2c7-bus {
samsung,pins = "gpd0-2", "gpd0-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm2_out: pwm2-out {
samsung,pins = "gpd0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm3_out: pwm3-out {
samsung,pins = "gpd0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c0_bus: i2c0-bus {
samsung,pins = "gpd1-0", "gpd1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
mipi0_clk: mipi0-clk {
samsung,pins = "gpd1-0", "gpd1-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c1_bus: i2c1-bus {
samsung,pins = "gpd1-2", "gpd1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
mipi1_clk: mipi1-clk {
samsung,pins = "gpd1-2", "gpd1-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_clk: lcd-clk {
samsung,pins = "gpf0-0", "gpf0-1", "gpf0-2", "gpf0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_data16: lcd-data-width16 {
@@ -395,9 +395,9 @@
"gpf1-3", "gpf1-6", "gpf1-7", "gpf2-0",
"gpf2-1", "gpf2-2", "gpf2-3", "gpf2-7",
"gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_data18: lcd-data-width18 {
@@ -406,9 +406,9 @@
"gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",
"gpf2-6", "gpf2-7", "gpf3-0", "gpf3-1",
"gpf3-2", "gpf3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_data24: lcd-data-width24 {
@@ -418,39 +418,39 @@
"gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",
"gpf2-4", "gpf2-5", "gpf2-6", "gpf2-7",
"gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_ldi: lcd-ldi {
samsung,pins = "gpf3-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_port_a_io: cam-port-a-io {
samsung,pins = "gpj0-0", "gpj0-1", "gpj0-2", "gpj0-3",
"gpj0-4", "gpj0-5", "gpj0-6", "gpj0-7",
"gpj1-0", "gpj1-1", "gpj1-2", "gpj1-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_port_a_clk_active: cam-port-a-clk-active {
samsung,pins = "gpj1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
cam_port_a_clk_idle: cam-port-a-clk-idle {
samsung,pins = "gpj1-3";
- samsung,pin-function = <0>;
- samsung,pin-pud = <1>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -626,284 +626,284 @@
sd0_clk: sd0-clk {
samsung,pins = "gpk0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cmd: sd0-cmd {
samsung,pins = "gpk0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cd: sd0-cd {
samsung,pins = "gpk0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus1: sd0-bus-width1 {
samsung,pins = "gpk0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus4: sd0-bus-width4 {
samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus8: sd0-bus-width8 {
samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_clk: sd4-clk {
samsung,pins = "gpk0-0";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_cmd: sd4-cmd {
samsung,pins = "gpk0-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_cd: sd4-cd {
samsung,pins = "gpk0-2";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_bus1: sd4-bus-width1 {
samsung,pins = "gpk0-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_bus4: sd4-bus-width4 {
samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_bus8: sd4-bus-width8 {
samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_clk: sd1-clk {
samsung,pins = "gpk1-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cmd: sd1-cmd {
samsung,pins = "gpk1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cd: sd1-cd {
samsung,pins = "gpk1-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus1: sd1-bus-width1 {
samsung,pins = "gpk1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus4: sd1-bus-width4 {
samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_clk: sd2-clk {
samsung,pins = "gpk2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cmd: sd2-cmd {
samsung,pins = "gpk2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cd: sd2-cd {
samsung,pins = "gpk2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus1: sd2-bus-width1 {
samsung,pins = "gpk2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus4: sd2-bus-width4 {
samsung,pins = "gpk2-3", "gpk2-4", "gpk2-5", "gpk2-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus8: sd2-bus-width8 {
samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_clk: sd3-clk {
samsung,pins = "gpk3-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_cmd: sd3-cmd {
samsung,pins = "gpk3-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_cd: sd3-cd {
samsung,pins = "gpk3-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_bus1: sd3-bus-width1 {
samsung,pins = "gpk3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_bus4: sd3-bus-width4 {
samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
cam_port_b_io: cam-port-b-io {
samsung,pins = "gpm0-0", "gpm0-1", "gpm0-2", "gpm0-3",
"gpm0-4", "gpm0-5", "gpm0-6", "gpm0-7",
"gpm1-0", "gpm1-1", "gpm2-0", "gpm2-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_port_b_clk_active: cam-port-b-clk-active {
samsung,pins = "gpm2-2";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
cam_port_b_clk_idle: cam-port-b-clk-idle {
samsung,pins = "gpm2-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <1>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
eint0: ext-int0 {
samsung,pins = "gpx0-0";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
eint8: ext-int8 {
samsung,pins = "gpx1-0";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
eint15: ext-int15 {
samsung,pins = "gpx1-7";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
eint16: ext-int16 {
samsung,pins = "gpx2-0";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
eint31: ext-int31 {
samsung,pins = "gpx3-7";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
fimc_is_i2c0: fimc-is-i2c0 {
samsung,pins = "gpm4-0", "gpm4-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
fimc_is_i2c1: fimc-is-i2c1 {
samsung,pins = "gpm4-2", "gpm4-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
fimc_is_uart: fimc-is-uart {
samsung,pins = "gpm3-5", "gpm3-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
hdmi_cec: hdmi-cec {
samsung,pins = "gpx3-6";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -919,17 +919,17 @@
i2s0_bus: i2s0-bus {
samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
"gpz-4", "gpz-5", "gpz-6";
- samsung,pin-function = <0x2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pcm0_bus: pcm0-bus {
samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
"gpz-4";
- samsung,pin-function = <0x3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -984,9 +984,9 @@
"gpv3-0", "gpv3-1", "gpv3-2", "gpv3-3",
"gpv3-4", "gpv3-5", "gpv3-6", "gpv3-7",
"gpv4-0", "gpv4-1";
- samsung,pin-function = <0x2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 5/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos4x12
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
0 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 14 +-
arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +-
arch/arm/boot/dts/exynos4412-origen.dts | 12 +-
arch/arm/boot/dts/exynos4412-smdk4412.dts | 12 +-
arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 504 ++++++++++++------------
5 files changed, 272 insertions(+), 272 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index be644fe6a0fd..5adbeb485a97 100644
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -163,26 +163,26 @@
/* RSTN signal for eMMC */
&sd1_cd {
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
&pinctrl_1 {
gpio_power_key: power_key {
samsung,pins = "gpx1-3";
- samsung,pin-pud = <0>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
};
max77686_irq: max77686-irq {
samsung,pins = "gpx3-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
hdmi_hpd: hdmi-hpd {
samsung,pins = "gpx3-7";
- samsung,pin-pud = <1>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
};
};
diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
index 2af235151301..647a3e97d942 100644
--- a/arch/arm/boot/dts/exynos4412-odroidx.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
@@ -83,7 +83,7 @@
&pinctrl_1 {
gpio_home_key: home_key {
samsung,pins = "gpx2-2";
- samsung,pin-pud = <0>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
};
};
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index 26a36fed9652..0a490e0e7eac 100644
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -500,16 +500,16 @@
&pinctrl_1 {
keypad_rows: keypad-rows {
samsung,pins = "gpx2-0", "gpx2-1", "gpx2-2";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
keypad_cols: keypad-cols {
samsung,pins = "gpx1-0", "gpx1-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts b/arch/arm/boot/dts/exynos4412-smdk4412.dts
index 231ffbdbf9d0..d9ce24416bed 100644
--- a/arch/arm/boot/dts/exynos4412-smdk4412.dts
+++ b/arch/arm/boot/dts/exynos4412-smdk4412.dts
@@ -115,17 +115,17 @@
&pinctrl_1 {
keypad_rows: keypad-rows {
samsung,pins = "gpx2-0", "gpx2-1", "gpx2-2";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
keypad_cols: keypad-cols {
samsung,pins = "gpx1-0", "gpx1-1", "gpx1-2", "gpx1-3",
"gpx1-4", "gpx1-5", "gpx1-6", "gpx1-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
index ba5865208d3e..dc5e9a932357 100644
--- a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
@@ -149,245 +149,245 @@
uart0_data: uart0-data {
samsung,pins = "gpa0-0", "gpa0-1";
- samsung,pin-function = <0x2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart0_fctl: uart0-fctl {
samsung,pins = "gpa0-2", "gpa0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_data: uart1-data {
samsung,pins = "gpa0-4", "gpa0-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_fctl: uart1-fctl {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c2_bus: i2c2-bus {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_data: uart2-data {
samsung,pins = "gpa1-0", "gpa1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_fctl: uart2-fctl {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart_audio_a: uart-audio-a {
samsung,pins = "gpa1-0", "gpa1-1";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c3_bus: i2c3-bus {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart3_data: uart3-data {
samsung,pins = "gpa1-4", "gpa1-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart_audio_b: uart-audio-b {
samsung,pins = "gpa1-4", "gpa1-5";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi0_bus: spi0-bus {
samsung,pins = "gpb-0", "gpb-2", "gpb-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c4_bus: i2c4-bus {
samsung,pins = "gpb-0", "gpb-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi1_bus: spi1-bus {
samsung,pins = "gpb-4", "gpb-6", "gpb-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c5_bus: i2c5-bus {
samsung,pins = "gpb-2", "gpb-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2s1_bus: i2s1-bus {
samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
"gpc0-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pcm1_bus: pcm1-bus {
samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
"gpc0-4";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
ac97_bus: ac97-bus {
samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
"gpc0-4";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2s2_bus: i2s2-bus {
samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
"gpc1-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pcm2_bus: pcm2-bus {
samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
"gpc1-4";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spdif_bus: spdif-bus {
samsung,pins = "gpc1-0", "gpc1-1";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c6_bus: i2c6-bus {
samsung,pins = "gpc1-3", "gpc1-4";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi2_bus: spi2-bus {
samsung,pins = "gpc1-1", "gpc1-3", "gpc1-4";
- samsung,pin-function = <5>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_5>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm0_out: pwm0-out {
samsung,pins = "gpd0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm1_out: pwm1-out {
samsung,pins = "gpd0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_ctrl: lcd-ctrl {
samsung,pins = "gpd0-0", "gpd0-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c7_bus: i2c7-bus {
samsung,pins = "gpd0-2", "gpd0-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm2_out: pwm2-out {
samsung,pins = "gpd0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm3_out: pwm3-out {
samsung,pins = "gpd0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c0_bus: i2c0-bus {
samsung,pins = "gpd1-0", "gpd1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
mipi0_clk: mipi0-clk {
samsung,pins = "gpd1-0", "gpd1-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c1_bus: i2c1-bus {
samsung,pins = "gpd1-2", "gpd1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
mipi1_clk: mipi1-clk {
samsung,pins = "gpd1-2", "gpd1-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_clk: lcd-clk {
samsung,pins = "gpf0-0", "gpf0-1", "gpf0-2", "gpf0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_data16: lcd-data-width16 {
@@ -395,9 +395,9 @@
"gpf1-3", "gpf1-6", "gpf1-7", "gpf2-0",
"gpf2-1", "gpf2-2", "gpf2-3", "gpf2-7",
"gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_data18: lcd-data-width18 {
@@ -406,9 +406,9 @@
"gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",
"gpf2-6", "gpf2-7", "gpf3-0", "gpf3-1",
"gpf3-2", "gpf3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_data24: lcd-data-width24 {
@@ -418,39 +418,39 @@
"gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",
"gpf2-4", "gpf2-5", "gpf2-6", "gpf2-7",
"gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lcd_ldi: lcd-ldi {
samsung,pins = "gpf3-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_port_a_io: cam-port-a-io {
samsung,pins = "gpj0-0", "gpj0-1", "gpj0-2", "gpj0-3",
"gpj0-4", "gpj0-5", "gpj0-6", "gpj0-7",
"gpj1-0", "gpj1-1", "gpj1-2", "gpj1-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_port_a_clk_active: cam-port-a-clk-active {
samsung,pins = "gpj1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
cam_port_a_clk_idle: cam-port-a-clk-idle {
samsung,pins = "gpj1-3";
- samsung,pin-function = <0>;
- samsung,pin-pud = <1>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -626,284 +626,284 @@
sd0_clk: sd0-clk {
samsung,pins = "gpk0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cmd: sd0-cmd {
samsung,pins = "gpk0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cd: sd0-cd {
samsung,pins = "gpk0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus1: sd0-bus-width1 {
samsung,pins = "gpk0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus4: sd0-bus-width4 {
samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus8: sd0-bus-width8 {
samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_clk: sd4-clk {
samsung,pins = "gpk0-0";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_cmd: sd4-cmd {
samsung,pins = "gpk0-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_cd: sd4-cd {
samsung,pins = "gpk0-2";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_bus1: sd4-bus-width1 {
samsung,pins = "gpk0-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_bus4: sd4-bus-width4 {
samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd4_bus8: sd4-bus-width8 {
samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_clk: sd1-clk {
samsung,pins = "gpk1-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cmd: sd1-cmd {
samsung,pins = "gpk1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cd: sd1-cd {
samsung,pins = "gpk1-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus1: sd1-bus-width1 {
samsung,pins = "gpk1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus4: sd1-bus-width4 {
samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_clk: sd2-clk {
samsung,pins = "gpk2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cmd: sd2-cmd {
samsung,pins = "gpk2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cd: sd2-cd {
samsung,pins = "gpk2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus1: sd2-bus-width1 {
samsung,pins = "gpk2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus4: sd2-bus-width4 {
samsung,pins = "gpk2-3", "gpk2-4", "gpk2-5", "gpk2-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus8: sd2-bus-width8 {
samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_clk: sd3-clk {
samsung,pins = "gpk3-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_cmd: sd3-cmd {
samsung,pins = "gpk3-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_cd: sd3-cd {
samsung,pins = "gpk3-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_bus1: sd3-bus-width1 {
samsung,pins = "gpk3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_bus4: sd3-bus-width4 {
samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
cam_port_b_io: cam-port-b-io {
samsung,pins = "gpm0-0", "gpm0-1", "gpm0-2", "gpm0-3",
"gpm0-4", "gpm0-5", "gpm0-6", "gpm0-7",
"gpm1-0", "gpm1-1", "gpm2-0", "gpm2-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_port_b_clk_active: cam-port-b-clk-active {
samsung,pins = "gpm2-2";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
cam_port_b_clk_idle: cam-port-b-clk-idle {
samsung,pins = "gpm2-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <1>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
eint0: ext-int0 {
samsung,pins = "gpx0-0";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
eint8: ext-int8 {
samsung,pins = "gpx1-0";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
eint15: ext-int15 {
samsung,pins = "gpx1-7";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
eint16: ext-int16 {
samsung,pins = "gpx2-0";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
eint31: ext-int31 {
samsung,pins = "gpx3-7";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
fimc_is_i2c0: fimc-is-i2c0 {
samsung,pins = "gpm4-0", "gpm4-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
fimc_is_i2c1: fimc-is-i2c1 {
samsung,pins = "gpm4-2", "gpm4-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
fimc_is_uart: fimc-is-uart {
samsung,pins = "gpm3-5", "gpm3-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
hdmi_cec: hdmi-cec {
samsung,pins = "gpx3-6";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -919,17 +919,17 @@
i2s0_bus: i2s0-bus {
samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
"gpz-4", "gpz-5", "gpz-6";
- samsung,pin-function = <0x2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pcm0_bus: pcm0-bus {
samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
"gpz-4";
- samsung,pin-function = <0x3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -984,9 +984,9 @@
"gpv3-0", "gpv3-1", "gpv3-2", "gpv3-3",
"gpv3-4", "gpv3-5", "gpv3-6", "gpv3-7",
"gpv4-0", "gpv4-1";
- samsung,pin-function = <0x2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 6/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos5250
2016-08-31 12:13 ` Krzysztof Kozlowski
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel
Cc: Javier Martinez Canillas, Tomasz Figa, Sylwester Nawrocki,
Krzysztof Kozlowski, Bartlomiej Zolnierkiewicz
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>
---
arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 402 +++++++++++++-------------
arch/arm/boot/dts/exynos5250-smdk5250.dts | 6 +-
arch/arm/boot/dts/exynos5250-snow-common.dtsi | 76 ++---
arch/arm/boot/dts/exynos5250-snow-rev5.dts | 6 +-
arch/arm/boot/dts/exynos5250-snow.dts | 6 +-
arch/arm/boot/dts/exynos5250-spring.dts | 72 ++---
6 files changed, 284 insertions(+), 284 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
index 5563dd80d4d0..688c6231caae 100644
--- a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
@@ -217,392 +217,392 @@
uart0_data: uart0-data {
samsung,pins = "gpa0-0", "gpa0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart0_fctl: uart0-fctl {
samsung,pins = "gpa0-2", "gpa0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c2_bus: i2c2-bus {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c2_hs_bus: i2c2-hs-bus {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_data: uart2-data {
samsung,pins = "gpa1-0", "gpa1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_fctl: uart2-fctl {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c3_bus: i2c3-bus {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c3_hs_bus: i2c3-hs-bus {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart3_data: uart3-data {
samsung,pins = "gpa1-4", "gpa1-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi0_bus: spi0-bus {
samsung,pins = "gpa2-0", "gpa2-2", "gpa2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c4_bus: i2c4-bus {
samsung,pins = "gpa2-0", "gpa2-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c5_bus: i2c5-bus {
samsung,pins = "gpa2-2", "gpa2-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi1_bus: spi1-bus {
samsung,pins = "gpa2-4", "gpa2-6", "gpa2-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
ac97_bus: ac97-bus {
samsung,pins = "gpb0-0", "gpb0-1", "gpb0-2", "gpb0-3",
"gpb0-4";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2s2_bus: i2s2-bus {
samsung,pins = "gpb1-0", "gpb1-1", "gpb1-2", "gpb1-3",
"gpb1-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pcm2_bus: pcm2-bus {
samsung,pins = "gpb1-0", "gpb1-1", "gpb1-2", "gpb1-3",
"gpb1-4";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spdif_bus: spdif-bus {
samsung,pins = "gpb1-0", "gpb1-1";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi2_bus: spi2-bus {
samsung,pins = "gpb1-1", "gpb1-3", "gpb1-4";
- samsung,pin-function = <5>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_5>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c6_bus: i2c6-bus {
samsung,pins = "gpb1-3", "gpb1-4";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm0_out: pwm0-out {
samsung,pins = "gpb2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm1_out: pwm1-out {
samsung,pins = "gpb2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm2_out: pwm2-out {
samsung,pins = "gpb2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm3_out: pwm3-out {
samsung,pins = "gpb2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c7_bus: i2c7-bus {
samsung,pins = "gpb2-2", "gpb2-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c0_bus: i2c0-bus {
samsung,pins = "gpb3-0", "gpb3-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c1_bus: i2c1-bus {
samsung,pins = "gpb3-2", "gpb3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c0_hs_bus: i2c0-hs-bus {
samsung,pins = "gpb3-0", "gpb3-1";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c1_hs_bus: i2c1-hs-bus {
samsung,pins = "gpb3-2", "gpb3-3";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
sd0_clk: sd0-clk {
samsung,pins = "gpc0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cmd: sd0-cmd {
samsung,pins = "gpc0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cd: sd0-cd {
samsung,pins = "gpc0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus1: sd0-bus-width1 {
samsung,pins = "gpc0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus4: sd0-bus-width4 {
samsung,pins = "gpc0-3", "gpc0-4", "gpc0-5", "gpc0-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus8: sd0-bus-width8 {
samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_clk: sd1-clk {
samsung,pins = "gpc2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cmd: sd1-cmd {
samsung,pins = "gpc2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cd: sd1-cd {
samsung,pins = "gpc2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus1: sd1-bus-width1 {
samsung,pins = "gpc2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus4: sd1-bus-width4 {
samsung,pins = "gpc2-3", "gpc2-4", "gpc2-5", "gpc2-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_clk: sd2-clk {
samsung,pins = "gpc3-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cmd: sd2-cmd {
samsung,pins = "gpc3-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cd: sd2-cd {
samsung,pins = "gpc3-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus1: sd2-bus-width1 {
samsung,pins = "gpc3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus4: sd2-bus-width4 {
samsung,pins = "gpc3-3", "gpc3-4", "gpc3-5", "gpc3-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus8: sd2-bus-width8 {
samsung,pins = "gpc4-3", "gpc4-4", "gpc4-5", "gpc4-6";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_clk: sd3-clk {
samsung,pins = "gpc4-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_cmd: sd3-cmd {
samsung,pins = "gpc4-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_cd: sd3-cd {
samsung,pins = "gpc4-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_bus1: sd3-bus-width1 {
samsung,pins = "gpc4-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_bus4: sd3-bus-width4 {
samsung,pins = "gpc4-3", "gpc4-4", "gpc4-5", "gpc4-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
uart1_data: uart1-data {
samsung,pins = "gpd0-0", "gpd0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_fctl: uart1-fctl {
samsung,pins = "gpd0-2", "gpd0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
dp_hpd: dp_hpd {
samsung,pins = "gpx0-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -683,52 +683,52 @@
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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_i2c2_bus: cam-i2c2-bus {
samsung,pins = "gpe0-6", "gpe1-0";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_spi1_bus: cam-spi1-bus {
samsung,pins = "gpe0-4", "gpe0-5", "gpf0-2", "gpf0-3";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_i2c1_bus: cam-i2c1-bus {
samsung,pins = "gpf0-2", "gpf0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_i2c0_bus: cam-i2c0-bus {
samsung,pins = "gpf0-0", "gpf0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_bayrgb_bus: cam-bayrgb-bus {
@@ -737,18 +737,18 @@
"gpg1-0", "gpg1-1", "gpg1-2", "gpg1-3",
"gpg1-4", "gpg1-5", "gpg1-6", "gpg1-7",
"gpg2-0", "gpg2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_port_a: cam-port-a {
samsung,pins = "gph0-0", "gph0-1", "gph0-2", "gph0-3",
"gph1-0", "gph1-1", "gph1-2", "gph1-3",
"gph1-4", "gph1-5", "gph1-6", "gph1-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -798,9 +798,9 @@
"gpv0-4", "gpv0-5", "gpv0-6", "gpv0-7",
"gpv1-0", "gpv1-1", "gpv1-2", "gpv1-3",
"gpv1-4", "gpv1-5", "gpv1-6", "gpv1-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
c2c_txd: c2c-txd {
@@ -808,9 +808,9 @@
"gpv2-4", "gpv2-5", "gpv2-6", "gpv2-7",
"gpv3-0", "gpv3-1", "gpv3-2", "gpv3-3",
"gpv3-4", "gpv3-5", "gpv3-6", "gpv3-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -826,8 +826,8 @@
i2s0_bus: i2s0-bus {
samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
"gpz-4", "gpz-5", "gpz-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 7f27263728a1..72a07a1ef51c 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -416,8 +416,8 @@
&pinctrl_0 {
max77686_irq: max77686-irq {
samsung,pins = "gpx3-2";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
index 1055d25c0ccc..bd36ab64718e 100644
--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@ -440,7 +440,7 @@
* double-pulling gets us out of spec in some cases.
*/
&i2c2_bus {
- samsung,pin-pud = <0>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
};
&i2c_2 {
@@ -572,81 +572,81 @@
&pinctrl_0 {
wifi_en: wifi-en {
samsung,pins = "gpx0-1";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
wifi_rst: wifi-rst {
samsung,pins = "gpx0-2";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
power_key_irq: power-key-irq {
samsung,pins = "gpx1-3";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
ec_irq: ec-irq {
samsung,pins = "gpx1-6";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
tps65090_irq: tps65090-irq {
samsung,pins = "gpx2-6";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
usb3_vbus_en: usb3-vbus-en {
samsung,pins = "gpx2-7";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
max77686_irq: max77686-irq {
samsung,pins = "gpx3-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lid_irq: lid-irq {
samsung,pins = "gpx3-5";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
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 = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_1 {
arb_their_claim: arb-their-claim {
samsung,pins = "gpe0-4";
- samsung,pin-function = <0>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
arb_our_claim: arb-our-claim {
samsung,pins = "gpf0-3";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -657,16 +657,16 @@
};
&sd3_bus4 {
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
&sd3_clk {
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
&sd3_cmd {
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
&spi_1 {
diff --git a/arch/arm/boot/dts/exynos5250-snow-rev5.dts b/arch/arm/boot/dts/exynos5250-snow-rev5.dts
index f811dc800660..4daf8113867c 100644
--- a/arch/arm/boot/dts/exynos5250-snow-rev5.dts
+++ b/arch/arm/boot/dts/exynos5250-snow-rev5.dts
@@ -40,8 +40,8 @@
&pinctrl_0 {
max98090_irq: max98090-irq {
samsung,pins = "gpx0-4";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
index 995c7ce6c12b..832111c18460 100644
--- a/arch/arm/boot/dts/exynos5250-snow.dts
+++ b/arch/arm/boot/dts/exynos5250-snow.dts
@@ -36,8 +36,8 @@
&pinctrl_0 {
max98095_en: max98095-en {
samsung,pins = "gpx1-7";
- samsung,pin-function = <0>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts
index 1d52a79b2f18..886c5ea0adc7 100644
--- a/arch/arm/boot/dts/exynos5250-spring.dts
+++ b/arch/arm/boot/dts/exynos5250-spring.dts
@@ -357,7 +357,7 @@
* double-pulling gets us out of spec in some cases.
*/
&i2c2_bus {
- samsung,pin-pud = <0>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
};
&i2c_2 {
@@ -460,92 +460,92 @@
&pinctrl_0 {
s5m8767_dvs: s5m8767-dvs {
samsung,pins = "gpd1-0", "gpd1-1", "gpd1-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <1>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
dp_hpd_gpio: dp-hpd-gpio {
samsung,pins = "gpc3-0";
- samsung,pin-function = <0>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
trackpad_irq: trackpad-irq {
samsung,pins = "gpx1-2";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
power_key_irq: power-key-irq {
samsung,pins = "gpx1-3";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
ec_irq: ec-irq {
samsung,pins = "gpx1-6";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
s5m8767_ds: s5m8767-ds {
samsung,pins = "gpx2-3", "gpx2-4", "gpx2-5";
- samsung,pin-function = <0>;
- samsung,pin-pud = <1>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
s5m8767_irq: s5m8767-irq {
samsung,pins = "gpx3-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lid_irq: lid-irq {
samsung,pins = "gpx3-5";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
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 = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_1 {
hsic_reset: hsic-reset {
samsung,pins = "gpe1-0";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&sd1_bus4 {
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
&sd1_cd {
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
&sd1_clk {
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
&sd1_cmd {
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
&spi_1 {
--
1.9.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 6/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos5250
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
0 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 402 +++++++++++++-------------
arch/arm/boot/dts/exynos5250-smdk5250.dts | 6 +-
arch/arm/boot/dts/exynos5250-snow-common.dtsi | 76 ++---
arch/arm/boot/dts/exynos5250-snow-rev5.dts | 6 +-
arch/arm/boot/dts/exynos5250-snow.dts | 6 +-
arch/arm/boot/dts/exynos5250-spring.dts | 72 ++---
6 files changed, 284 insertions(+), 284 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
index 5563dd80d4d0..688c6231caae 100644
--- a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
@@ -217,392 +217,392 @@
uart0_data: uart0-data {
samsung,pins = "gpa0-0", "gpa0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart0_fctl: uart0-fctl {
samsung,pins = "gpa0-2", "gpa0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c2_bus: i2c2-bus {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c2_hs_bus: i2c2-hs-bus {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_data: uart2-data {
samsung,pins = "gpa1-0", "gpa1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_fctl: uart2-fctl {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c3_bus: i2c3-bus {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c3_hs_bus: i2c3-hs-bus {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart3_data: uart3-data {
samsung,pins = "gpa1-4", "gpa1-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi0_bus: spi0-bus {
samsung,pins = "gpa2-0", "gpa2-2", "gpa2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c4_bus: i2c4-bus {
samsung,pins = "gpa2-0", "gpa2-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c5_bus: i2c5-bus {
samsung,pins = "gpa2-2", "gpa2-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi1_bus: spi1-bus {
samsung,pins = "gpa2-4", "gpa2-6", "gpa2-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
ac97_bus: ac97-bus {
samsung,pins = "gpb0-0", "gpb0-1", "gpb0-2", "gpb0-3",
"gpb0-4";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2s2_bus: i2s2-bus {
samsung,pins = "gpb1-0", "gpb1-1", "gpb1-2", "gpb1-3",
"gpb1-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pcm2_bus: pcm2-bus {
samsung,pins = "gpb1-0", "gpb1-1", "gpb1-2", "gpb1-3",
"gpb1-4";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spdif_bus: spdif-bus {
samsung,pins = "gpb1-0", "gpb1-1";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi2_bus: spi2-bus {
samsung,pins = "gpb1-1", "gpb1-3", "gpb1-4";
- samsung,pin-function = <5>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_5>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c6_bus: i2c6-bus {
samsung,pins = "gpb1-3", "gpb1-4";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm0_out: pwm0-out {
samsung,pins = "gpb2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm1_out: pwm1-out {
samsung,pins = "gpb2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm2_out: pwm2-out {
samsung,pins = "gpb2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm3_out: pwm3-out {
samsung,pins = "gpb2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c7_bus: i2c7-bus {
samsung,pins = "gpb2-2", "gpb2-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c0_bus: i2c0-bus {
samsung,pins = "gpb3-0", "gpb3-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c1_bus: i2c1-bus {
samsung,pins = "gpb3-2", "gpb3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c0_hs_bus: i2c0-hs-bus {
samsung,pins = "gpb3-0", "gpb3-1";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c1_hs_bus: i2c1-hs-bus {
samsung,pins = "gpb3-2", "gpb3-3";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
sd0_clk: sd0-clk {
samsung,pins = "gpc0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cmd: sd0-cmd {
samsung,pins = "gpc0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cd: sd0-cd {
samsung,pins = "gpc0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus1: sd0-bus-width1 {
samsung,pins = "gpc0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus4: sd0-bus-width4 {
samsung,pins = "gpc0-3", "gpc0-4", "gpc0-5", "gpc0-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus8: sd0-bus-width8 {
samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_clk: sd1-clk {
samsung,pins = "gpc2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cmd: sd1-cmd {
samsung,pins = "gpc2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cd: sd1-cd {
samsung,pins = "gpc2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus1: sd1-bus-width1 {
samsung,pins = "gpc2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus4: sd1-bus-width4 {
samsung,pins = "gpc2-3", "gpc2-4", "gpc2-5", "gpc2-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_clk: sd2-clk {
samsung,pins = "gpc3-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cmd: sd2-cmd {
samsung,pins = "gpc3-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cd: sd2-cd {
samsung,pins = "gpc3-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus1: sd2-bus-width1 {
samsung,pins = "gpc3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus4: sd2-bus-width4 {
samsung,pins = "gpc3-3", "gpc3-4", "gpc3-5", "gpc3-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus8: sd2-bus-width8 {
samsung,pins = "gpc4-3", "gpc4-4", "gpc4-5", "gpc4-6";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_clk: sd3-clk {
samsung,pins = "gpc4-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_cmd: sd3-cmd {
samsung,pins = "gpc4-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_cd: sd3-cd {
samsung,pins = "gpc4-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_bus1: sd3-bus-width1 {
samsung,pins = "gpc4-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd3_bus4: sd3-bus-width4 {
samsung,pins = "gpc4-3", "gpc4-4", "gpc4-5", "gpc4-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
uart1_data: uart1-data {
samsung,pins = "gpd0-0", "gpd0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_fctl: uart1-fctl {
samsung,pins = "gpd0-2", "gpd0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
dp_hpd: dp_hpd {
samsung,pins = "gpx0-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -683,52 +683,52 @@
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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_i2c2_bus: cam-i2c2-bus {
samsung,pins = "gpe0-6", "gpe1-0";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_spi1_bus: cam-spi1-bus {
samsung,pins = "gpe0-4", "gpe0-5", "gpf0-2", "gpf0-3";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_i2c1_bus: cam-i2c1-bus {
samsung,pins = "gpf0-2", "gpf0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_i2c0_bus: cam-i2c0-bus {
samsung,pins = "gpf0-0", "gpf0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_bayrgb_bus: cam-bayrgb-bus {
@@ -737,18 +737,18 @@
"gpg1-0", "gpg1-1", "gpg1-2", "gpg1-3",
"gpg1-4", "gpg1-5", "gpg1-6", "gpg1-7",
"gpg2-0", "gpg2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_port_a: cam-port-a {
samsung,pins = "gph0-0", "gph0-1", "gph0-2", "gph0-3",
"gph1-0", "gph1-1", "gph1-2", "gph1-3",
"gph1-4", "gph1-5", "gph1-6", "gph1-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -798,9 +798,9 @@
"gpv0-4", "gpv0-5", "gpv0-6", "gpv0-7",
"gpv1-0", "gpv1-1", "gpv1-2", "gpv1-3",
"gpv1-4", "gpv1-5", "gpv1-6", "gpv1-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
c2c_txd: c2c-txd {
@@ -808,9 +808,9 @@
"gpv2-4", "gpv2-5", "gpv2-6", "gpv2-7",
"gpv3-0", "gpv3-1", "gpv3-2", "gpv3-3",
"gpv3-4", "gpv3-5", "gpv3-6", "gpv3-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -826,8 +826,8 @@
i2s0_bus: i2s0-bus {
samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
"gpz-4", "gpz-5", "gpz-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 7f27263728a1..72a07a1ef51c 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -416,8 +416,8 @@
&pinctrl_0 {
max77686_irq: max77686-irq {
samsung,pins = "gpx3-2";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
index 1055d25c0ccc..bd36ab64718e 100644
--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@ -440,7 +440,7 @@
* double-pulling gets us out of spec in some cases.
*/
&i2c2_bus {
- samsung,pin-pud = <0>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
};
&i2c_2 {
@@ -572,81 +572,81 @@
&pinctrl_0 {
wifi_en: wifi-en {
samsung,pins = "gpx0-1";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
wifi_rst: wifi-rst {
samsung,pins = "gpx0-2";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
power_key_irq: power-key-irq {
samsung,pins = "gpx1-3";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
ec_irq: ec-irq {
samsung,pins = "gpx1-6";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
tps65090_irq: tps65090-irq {
samsung,pins = "gpx2-6";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
usb3_vbus_en: usb3-vbus-en {
samsung,pins = "gpx2-7";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
max77686_irq: max77686-irq {
samsung,pins = "gpx3-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lid_irq: lid-irq {
samsung,pins = "gpx3-5";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
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 = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_1 {
arb_their_claim: arb-their-claim {
samsung,pins = "gpe0-4";
- samsung,pin-function = <0>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
arb_our_claim: arb-our-claim {
samsung,pins = "gpf0-3";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -657,16 +657,16 @@
};
&sd3_bus4 {
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
&sd3_clk {
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
&sd3_cmd {
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
&spi_1 {
diff --git a/arch/arm/boot/dts/exynos5250-snow-rev5.dts b/arch/arm/boot/dts/exynos5250-snow-rev5.dts
index f811dc800660..4daf8113867c 100644
--- a/arch/arm/boot/dts/exynos5250-snow-rev5.dts
+++ b/arch/arm/boot/dts/exynos5250-snow-rev5.dts
@@ -40,8 +40,8 @@
&pinctrl_0 {
max98090_irq: max98090-irq {
samsung,pins = "gpx0-4";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
index 995c7ce6c12b..832111c18460 100644
--- a/arch/arm/boot/dts/exynos5250-snow.dts
+++ b/arch/arm/boot/dts/exynos5250-snow.dts
@@ -36,8 +36,8 @@
&pinctrl_0 {
max98095_en: max98095-en {
samsung,pins = "gpx1-7";
- samsung,pin-function = <0>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts
index 1d52a79b2f18..886c5ea0adc7 100644
--- a/arch/arm/boot/dts/exynos5250-spring.dts
+++ b/arch/arm/boot/dts/exynos5250-spring.dts
@@ -357,7 +357,7 @@
* double-pulling gets us out of spec in some cases.
*/
&i2c2_bus {
- samsung,pin-pud = <0>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
};
&i2c_2 {
@@ -460,92 +460,92 @@
&pinctrl_0 {
s5m8767_dvs: s5m8767-dvs {
samsung,pins = "gpd1-0", "gpd1-1", "gpd1-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <1>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
dp_hpd_gpio: dp-hpd-gpio {
samsung,pins = "gpc3-0";
- samsung,pin-function = <0>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
trackpad_irq: trackpad-irq {
samsung,pins = "gpx1-2";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
power_key_irq: power-key-irq {
samsung,pins = "gpx1-3";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
ec_irq: ec-irq {
samsung,pins = "gpx1-6";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
s5m8767_ds: s5m8767-ds {
samsung,pins = "gpx2-3", "gpx2-4", "gpx2-5";
- samsung,pin-function = <0>;
- samsung,pin-pud = <1>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
s5m8767_irq: s5m8767-irq {
samsung,pins = "gpx3-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lid_irq: lid-irq {
samsung,pins = "gpx3-5";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
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 = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_1 {
hsic_reset: hsic-reset {
samsung,pins = "gpe1-0";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&sd1_bus4 {
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
&sd1_cd {
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
&sd1_clk {
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
&sd1_cmd {
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
&spi_1 {
--
1.9.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 7/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos5260
2016-08-31 12:13 ` Krzysztof Kozlowski
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel
Cc: Javier Martinez Canillas, Tomasz Figa, Sylwester Nawrocki,
Krzysztof Kozlowski, Bartlomiej Zolnierkiewicz
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>
---
arch/arm/boot/dts/exynos5260-pinctrl.dtsi | 184 ++++++++++++++---------------
arch/arm/boot/dts/exynos5260-xyref5260.dts | 6 +-
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 efd01b816538..acce33d93a7a 100644
--- a/arch/arm/boot/dts/exynos5260-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5260-pinctrl.dtsi
@@ -198,217 +198,217 @@
uart0_data: uart0-data {
samsung,pins = "gpa0-0", "gpa0-1";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart0_fctl: uart0-fctl {
samsung,pins = "gpa0-2", "gpa0-3";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_data: uart1-data {
samsung,pins = "gpa1-0", "gpa1-1";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_fctl: uart1-fctl {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_data: uart2-data {
samsung,pins = "gpa1-4", "gpa1-5";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi0_bus: spi0-bus {
samsung,pins = "gpa2-0", "gpa2-2", "gpa2-3";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi1_bus: spi1-bus {
samsung,pins = "gpa2-4", "gpa2-6", "gpa2-7";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
usb3_vbus0_en: usb3-vbus0-en {
samsung,pins = "gpa2-4";
- samsung,pin-function = <1>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <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 = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <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 = <PIN_FUNC_SPC_3>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spdif1_bus: spdif1-bus {
samsung,pins = "gpb0-0", "gpb0-1", "gpb0-2";
- samsung,pin-function = <4>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi2_bus: spi2-bus {
samsung,pins = "gpb1-0", "gpb1-2", "gpb1-3";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c0_hs_bus: i2c0-hs-bus {
samsung,pins = "gpb3-0", "gpb3-1";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c1_hs_bus: i2c1-hs-bus {
samsung,pins = "gpb3-2", "gpb3-3";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c2_hs_bus: i2c2-hs-bus {
samsung,pins = "gpb3-4", "gpb3-5";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c3_hs_bus: i2c3-hs-bus {
samsung,pins = "gpb3-6", "gpb3-7";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c4_bus: i2c4-bus {
samsung,pins = "gpb4-0", "gpb4-1";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c5_bus: i2c5-bus {
samsung,pins = "gpb4-2", "gpb4-3";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c6_bus: i2c6-bus {
samsung,pins = "gpb4-4", "gpb4-5";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c7_bus: i2c7-bus {
samsung,pins = "gpb4-6", "gpb4-7";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c8_bus: i2c8-bus {
samsung,pins = "gpb5-0", "gpb5-1";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c9_bus: i2c9-bus {
samsung,pins = "gpb5-2", "gpb5-3";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c10_bus: i2c10-bus {
samsung,pins = "gpb5-4", "gpb5-5";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c11_bus: i2c11-bus {
samsung,pins = "gpb5-6", "gpb5-7";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <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 = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <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 = <PIN_FUNC_SPC_3>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_i2c1_bus: cam-i2c1-bus {
samsung,pins = "gpf0-2", "gpf0-3";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_i2c0_bus: cam-i2c0-bus {
samsung,pins = "gpf0-0", "gpf0-1";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <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 = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <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 = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -455,114 +455,114 @@
sd0_clk: sd0-clk {
samsung,pins = "gpc0-0";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd0_cmd: sd0-cmd {
samsung,pins = "gpc0-1";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd0_bus1: sd0-bus-width1 {
samsung,pins = "gpc0-2";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd0_bus4: sd0-bus-width4 {
samsung,pins = "gpc0-3", "gpc0-4", "gpc0-5";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <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 = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd0_rdqs: sd0-rdqs {
samsung,pins = "gpc0-6";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd1_clk: sd1-clk {
samsung,pins = "gpc1-0";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd1_cmd: sd1-cmd {
samsung,pins = "gpc1-1";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd1_bus1: sd1-bus-width1 {
samsung,pins = "gpc1-2";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd1_bus4: sd1-bus-width4 {
samsung,pins = "gpc1-3", "gpc1-4", "gpc1-5";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <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 = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd2_clk: sd2-clk {
samsung,pins = "gpc2-0";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd2_cmd: sd2-cmd {
samsung,pins = "gpc2-1";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd2_cd: sd2-cd {
samsung,pins = "gpc2-2";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd2_bus1: sd2-bus-width1 {
samsung,pins = "gpc2-3";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd2_bus4: sd2-bus-width4 {
samsung,pins = "gpc2-4", "gpc2-5", "gpc2-6";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
};
diff --git a/arch/arm/boot/dts/exynos5260-xyref5260.dts b/arch/arm/boot/dts/exynos5260-xyref5260.dts
index 3daef94bee38..b784dfc6a059 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 = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 7/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos5260
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
0 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
arch/arm/boot/dts/exynos5260-pinctrl.dtsi | 184 ++++++++++++++---------------
arch/arm/boot/dts/exynos5260-xyref5260.dts | 6 +-
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 efd01b816538..acce33d93a7a 100644
--- a/arch/arm/boot/dts/exynos5260-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5260-pinctrl.dtsi
@@ -198,217 +198,217 @@
uart0_data: uart0-data {
samsung,pins = "gpa0-0", "gpa0-1";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart0_fctl: uart0-fctl {
samsung,pins = "gpa0-2", "gpa0-3";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_data: uart1-data {
samsung,pins = "gpa1-0", "gpa1-1";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_fctl: uart1-fctl {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_data: uart2-data {
samsung,pins = "gpa1-4", "gpa1-5";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi0_bus: spi0-bus {
samsung,pins = "gpa2-0", "gpa2-2", "gpa2-3";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi1_bus: spi1-bus {
samsung,pins = "gpa2-4", "gpa2-6", "gpa2-7";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
usb3_vbus0_en: usb3-vbus0-en {
samsung,pins = "gpa2-4";
- samsung,pin-function = <1>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <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 = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <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 = <PIN_FUNC_SPC_3>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spdif1_bus: spdif1-bus {
samsung,pins = "gpb0-0", "gpb0-1", "gpb0-2";
- samsung,pin-function = <4>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi2_bus: spi2-bus {
samsung,pins = "gpb1-0", "gpb1-2", "gpb1-3";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c0_hs_bus: i2c0-hs-bus {
samsung,pins = "gpb3-0", "gpb3-1";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c1_hs_bus: i2c1-hs-bus {
samsung,pins = "gpb3-2", "gpb3-3";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c2_hs_bus: i2c2-hs-bus {
samsung,pins = "gpb3-4", "gpb3-5";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c3_hs_bus: i2c3-hs-bus {
samsung,pins = "gpb3-6", "gpb3-7";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c4_bus: i2c4-bus {
samsung,pins = "gpb4-0", "gpb4-1";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c5_bus: i2c5-bus {
samsung,pins = "gpb4-2", "gpb4-3";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c6_bus: i2c6-bus {
samsung,pins = "gpb4-4", "gpb4-5";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c7_bus: i2c7-bus {
samsung,pins = "gpb4-6", "gpb4-7";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c8_bus: i2c8-bus {
samsung,pins = "gpb5-0", "gpb5-1";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c9_bus: i2c9-bus {
samsung,pins = "gpb5-2", "gpb5-3";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c10_bus: i2c10-bus {
samsung,pins = "gpb5-4", "gpb5-5";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c11_bus: i2c11-bus {
samsung,pins = "gpb5-6", "gpb5-7";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <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 = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <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 = <PIN_FUNC_SPC_3>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_i2c1_bus: cam-i2c1-bus {
samsung,pins = "gpf0-2", "gpf0-3";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_i2c0_bus: cam-i2c0-bus {
samsung,pins = "gpf0-0", "gpf0-1";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <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 = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <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 = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <0>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -455,114 +455,114 @@
sd0_clk: sd0-clk {
samsung,pins = "gpc0-0";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd0_cmd: sd0-cmd {
samsung,pins = "gpc0-1";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd0_bus1: sd0-bus-width1 {
samsung,pins = "gpc0-2";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd0_bus4: sd0-bus-width4 {
samsung,pins = "gpc0-3", "gpc0-4", "gpc0-5";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <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 = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd0_rdqs: sd0-rdqs {
samsung,pins = "gpc0-6";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd1_clk: sd1-clk {
samsung,pins = "gpc1-0";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd1_cmd: sd1-cmd {
samsung,pins = "gpc1-1";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd1_bus1: sd1-bus-width1 {
samsung,pins = "gpc1-2";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd1_bus4: sd1-bus-width4 {
samsung,pins = "gpc1-3", "gpc1-4", "gpc1-5";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <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 = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd2_clk: sd2-clk {
samsung,pins = "gpc2-0";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd2_cmd: sd2-cmd {
samsung,pins = "gpc2-1";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_NONE>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd2_cd: sd2-cd {
samsung,pins = "gpc2-2";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd2_bus1: sd2-bus-width1 {
samsung,pins = "gpc2-3";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
sd2_bus4: sd2-bus-width4 {
samsung,pins = "gpc2-4", "gpc2-5", "gpc2-6";
- samsung,pin-function = <2>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
samsung,pin-pud = <PIN_PULL_UP>;
- samsung,pin-drv = <3>;
+ samsung,pin-drv = <PIN_DRV_LV6>;
};
};
diff --git a/arch/arm/boot/dts/exynos5260-xyref5260.dts b/arch/arm/boot/dts/exynos5260-xyref5260.dts
index 3daef94bee38..b784dfc6a059 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 = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 8/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos5410
2016-08-31 12:13 ` Krzysztof Kozlowski
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel
Cc: Javier Martinez Canillas, Tomasz Figa, Sylwester Nawrocki,
Krzysztof Kozlowski, Bartlomiej Zolnierkiewicz
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>
---
arch/arm/boot/dts/exynos5410-odroidxu.dts | 30 ++---
arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 180 +++++++++++++++---------------
arch/arm/boot/dts/exynos5410-smdk5410.dts | 10 +-
3 files changed, 110 insertions(+), 110 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5410-odroidxu.dts b/arch/arm/boot/dts/exynos5410-odroidxu.dts
index a5ae76c1838f..6b36b9bfd1ec 100644
--- a/arch/arm/boot/dts/exynos5410-odroidxu.dts
+++ b/arch/arm/boot/dts/exynos5410-odroidxu.dts
@@ -473,38 +473,38 @@
&pinctrl_0 {
emmc_nrst_pin: emmc-nrst {
samsung,pins = "gpd1-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_dvs_3: pmic-dvs-3 {
samsung,pins = "gpx0-0";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_dvs_2: pmic-dvs-2 {
samsung,pins = "gpx0-1";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_dvs_1: pmic-dvs-1 {
samsung,pins = "gpx0-2";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
samsung,pin-val = <1>;
};
max77802_irq: max77802-irq {
samsung,pins = "gpx0-4";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5410-pinctrl.dtsi b/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
index 10272fa54c37..acb21cbbb1e1 100644
--- a/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
@@ -296,212 +296,212 @@
uart0_data: uart0-data {
samsung,pins = "gpa0-0", "gpa0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart0_fctl: uart0-fctl {
samsung,pins = "gpa0-2", "gpa0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_data: uart1-data {
samsung,pins = "gpa0-4", "gpa0-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_fctl: uart1-fctl {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c2_bus: i2c2-bus {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_data: uart2-data {
samsung,pins = "gpa1-0", "gpa1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_fctl: uart2-fctl {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c3_bus: i2c3-bus {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart3_data: uart3-data {
samsung,pins = "gpa1-4", "gpa1-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c4_hs_bus: i2c4-hs-bus {
samsung,pins = "gpa2-0", "gpa2-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c5_hs_bus: i2c5-hs-bus {
samsung,pins = "gpa2-2", "gpa2-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c6_hs_bus: i2c6-hs-bus {
samsung,pins = "gpb1-3", "gpb1-4";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm0_out: pwm0-out {
samsung,pins = "gpb2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm1_out: pwm1-out {
samsung,pins = "gpb2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm2_out: pwm2-out {
samsung,pins = "gpb2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm3_out: pwm3-out {
samsung,pins = "gpb2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c7_hs_bus: i2c7-hs-bus {
samsung,pins = "gpb2-2", "gpb2-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c0_bus: i2c0-bus {
samsung,pins = "gpb3-0", "gpb3-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c1_bus: i2c1-bus {
samsung,pins = "gpb3-2", "gpb3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
sd0_clk: sd0-clk {
samsung,pins = "gpc0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cmd: sd0-cmd {
samsung,pins = "gpc0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cd: sd0-cd {
samsung,pins = "gpc0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus1: sd0-bus-width1 {
samsung,pins = "gpc0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus4: sd0-bus-width4 {
samsung,pins = "gpc0-4", "gpc0-5", "gpc0-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_clk: sd2-clk {
samsung,pins = "gpc2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cmd: sd2-cmd {
samsung,pins = "gpc2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cd: sd2-cd {
samsung,pins = "gpc2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus1: sd2-bus-width1 {
samsung,pins = "gpc2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus4: sd2-bus-width4 {
samsung,pins = "gpc2-4", "gpc2-5", "gpc2-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus8: sd0-bus-width8 {
samsung,pins = "gpc3-0", "gpc3-1", "gpc3-2", "gpc3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
};
diff --git a/arch/arm/boot/dts/exynos5410-smdk5410.dts b/arch/arm/boot/dts/exynos5410-smdk5410.dts
index 777fcf2edd79..e566a18bb067 100644
--- a/arch/arm/boot/dts/exynos5410-smdk5410.dts
+++ b/arch/arm/boot/dts/exynos5410-smdk5410.dts
@@ -66,8 +66,8 @@
srom_ctl: srom-ctl {
samsung,pins = "gpy0-3", "gpy0-4", "gpy0-5",
"gpy1-0", "gpy1-1", "gpy1-2", "gpy1-3";
- samsung,pin-function = <2>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
srom_ebi: srom-ebi {
@@ -77,9 +77,9 @@
"gpy5-4", "gpy5-5", "gpy5-6", "gpy5-7",
"gpy6-0", "gpy6-1", "gpy6-2", "gpy6-3",
"gpy6-4", "gpy6-5", "gpy6-6", "gpy6-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 8/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos5410
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
0 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
arch/arm/boot/dts/exynos5410-odroidxu.dts | 30 ++---
arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 180 +++++++++++++++---------------
arch/arm/boot/dts/exynos5410-smdk5410.dts | 10 +-
3 files changed, 110 insertions(+), 110 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5410-odroidxu.dts b/arch/arm/boot/dts/exynos5410-odroidxu.dts
index a5ae76c1838f..6b36b9bfd1ec 100644
--- a/arch/arm/boot/dts/exynos5410-odroidxu.dts
+++ b/arch/arm/boot/dts/exynos5410-odroidxu.dts
@@ -473,38 +473,38 @@
&pinctrl_0 {
emmc_nrst_pin: emmc-nrst {
samsung,pins = "gpd1-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_dvs_3: pmic-dvs-3 {
samsung,pins = "gpx0-0";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_dvs_2: pmic-dvs-2 {
samsung,pins = "gpx0-1";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_dvs_1: pmic-dvs-1 {
samsung,pins = "gpx0-2";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
samsung,pin-val = <1>;
};
max77802_irq: max77802-irq {
samsung,pins = "gpx0-4";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5410-pinctrl.dtsi b/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
index 10272fa54c37..acb21cbbb1e1 100644
--- a/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
@@ -296,212 +296,212 @@
uart0_data: uart0-data {
samsung,pins = "gpa0-0", "gpa0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart0_fctl: uart0-fctl {
samsung,pins = "gpa0-2", "gpa0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_data: uart1-data {
samsung,pins = "gpa0-4", "gpa0-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_fctl: uart1-fctl {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c2_bus: i2c2-bus {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_data: uart2-data {
samsung,pins = "gpa1-0", "gpa1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_fctl: uart2-fctl {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c3_bus: i2c3-bus {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart3_data: uart3-data {
samsung,pins = "gpa1-4", "gpa1-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c4_hs_bus: i2c4-hs-bus {
samsung,pins = "gpa2-0", "gpa2-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c5_hs_bus: i2c5-hs-bus {
samsung,pins = "gpa2-2", "gpa2-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c6_hs_bus: i2c6-hs-bus {
samsung,pins = "gpb1-3", "gpb1-4";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm0_out: pwm0-out {
samsung,pins = "gpb2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm1_out: pwm1-out {
samsung,pins = "gpb2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm2_out: pwm2-out {
samsung,pins = "gpb2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm3_out: pwm3-out {
samsung,pins = "gpb2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c7_hs_bus: i2c7-hs-bus {
samsung,pins = "gpb2-2", "gpb2-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c0_bus: i2c0-bus {
samsung,pins = "gpb3-0", "gpb3-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c1_bus: i2c1-bus {
samsung,pins = "gpb3-2", "gpb3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
sd0_clk: sd0-clk {
samsung,pins = "gpc0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cmd: sd0-cmd {
samsung,pins = "gpc0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cd: sd0-cd {
samsung,pins = "gpc0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus1: sd0-bus-width1 {
samsung,pins = "gpc0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus4: sd0-bus-width4 {
samsung,pins = "gpc0-4", "gpc0-5", "gpc0-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_clk: sd2-clk {
samsung,pins = "gpc2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cmd: sd2-cmd {
samsung,pins = "gpc2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cd: sd2-cd {
samsung,pins = "gpc2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus1: sd2-bus-width1 {
samsung,pins = "gpc2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus4: sd2-bus-width4 {
samsung,pins = "gpc2-4", "gpc2-5", "gpc2-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus8: sd0-bus-width8 {
samsung,pins = "gpc3-0", "gpc3-1", "gpc3-2", "gpc3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
};
diff --git a/arch/arm/boot/dts/exynos5410-smdk5410.dts b/arch/arm/boot/dts/exynos5410-smdk5410.dts
index 777fcf2edd79..e566a18bb067 100644
--- a/arch/arm/boot/dts/exynos5410-smdk5410.dts
+++ b/arch/arm/boot/dts/exynos5410-smdk5410.dts
@@ -66,8 +66,8 @@
srom_ctl: srom-ctl {
samsung,pins = "gpy0-3", "gpy0-4", "gpy0-5",
"gpy1-0", "gpy1-1", "gpy1-2", "gpy1-3";
- samsung,pin-function = <2>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
srom_ebi: srom-ebi {
@@ -77,9 +77,9 @@
"gpy5-4", "gpy5-5", "gpy5-6", "gpy5-7",
"gpy6-0", "gpy6-1", "gpy6-2", "gpy6-3",
"gpy6-4", "gpy6-5", "gpy6-6", "gpy6-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 9/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos542x/exynos5800
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
0 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel
Cc: Javier Martinez Canillas, Tomasz Figa, Sylwester Nawrocki,
Krzysztof Kozlowski, Bartlomiej Zolnierkiewicz
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>
---
arch/arm/boot/dts/exynos5420-arndale-octa.dts | 6 +-
arch/arm/boot/dts/exynos5420-peach-pit.dts | 126 ++++----
arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 354 ++++++++++-----------
arch/arm/boot/dts/exynos5420-smdk5420.dts | 18 +-
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 18 +-
arch/arm/boot/dts/exynos5800-peach-pi.dts | 126 ++++----
6 files changed, 324 insertions(+), 324 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
index 39a3b81478fd..7b9f67807308 100644
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@ -378,9 +378,9 @@
&pinctrl_0 {
s2mps11_irq: s2mps11-irq {
samsung,pins = "gpx3-2";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index f6f256fd9b5e..69c511f67d26 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -753,171 +753,171 @@
wifi_en: wifi-en {
samsung,pins = "gpx0-0";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
max98090_irq: max98090-irq {
samsung,pins = "gpx0-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
/* We need GPX0_6 to be low at sleep time; just keep it low always */
mask_tpm_reset: mask-tpm-reset {
samsung,pins = "gpx0-6";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
samsung,pin-val = <0>;
};
tpm_irq: tpm-irq {
samsung,pins = "gpx1-0";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
trackpad_irq: trackpad-irq {
samsung,pins = "gpx1-1";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
power_key_irq: power-key-irq {
samsung,pins = "gpx1-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
ec_irq: ec-irq {
samsung,pins = "gpx1-5";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
tps65090_irq: tps65090-irq {
samsung,pins = "gpx2-5";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
dp_hpd_gpio: dp_hpd_gpio {
samsung,pins = "gpx2-6";
- samsung,pin-function = <0>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
max77802_irq: max77802-irq {
samsung,pins = "gpx3-1";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lid_irq: lid-irq {
samsung,pins = "gpx3-4";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
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 = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_dvs_1: pmic-dvs-1 {
samsung,pins = "gpy7-6";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_1 {
/* Adjust WiFi drive strengths lower for EMI */
sd1_clk: sd1-clk {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_cmd: sd1-cmd {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_bus1: sd1-bus-width1 {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_bus4: sd1-bus-width4 {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_bus8: sd1-bus-width8 {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
};
&pinctrl_2 {
pmic_dvs_2: pmic-dvs-2 {
samsung,pins = "gpj4-2";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_dvs_3: pmic-dvs-3 {
samsung,pins = "gpj4-3";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_3 {
/* Drive SPI lines at x2 for better integrity */
spi2-bus {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
/* Drive SPI chip select at x2 for better integrity */
ec_spi_cs: ec-spi-cs {
samsung,pins = "gpb1-2";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <2>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
usb300_vbus_en: usb300-vbus-en {
samsung,pins = "gph0-0";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
usb301_vbus_en: usb301-vbus-en {
samsung,pins = "gph0-1";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_selb: pmic-selb {
samsung,pins = "gph0-2", "gph0-3", "gph0-4", "gph0-5",
"gph0-6";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
index 41abc8ec474a..ab14116bdbf0 100644
--- a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
@@ -78,9 +78,9 @@
dp_hpd: dp_hpd {
samsung,pins = "gpx0-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -170,135 +170,135 @@
sd0_clk: sd0-clk {
samsung,pins = "gpc0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cmd: sd0-cmd {
samsung,pins = "gpc0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cd: sd0-cd {
samsung,pins = "gpc0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus1: sd0-bus-width1 {
samsung,pins = "gpc0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus4: sd0-bus-width4 {
samsung,pins = "gpc0-4", "gpc0-5", "gpc0-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus8: sd0-bus-width8 {
samsung,pins = "gpc3-0", "gpc3-1", "gpc3-2", "gpc3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_rclk: sd0-rclk {
samsung,pins = "gpc0-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <1>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_clk: sd1-clk {
samsung,pins = "gpc1-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cmd: sd1-cmd {
samsung,pins = "gpc1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cd: sd1-cd {
samsung,pins = "gpc1-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_int: sd1-int {
samsung,pins = "gpd1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
sd1_bus1: sd1-bus-width1 {
samsung,pins = "gpc1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus4: sd1-bus-width4 {
samsung,pins = "gpc1-4", "gpc1-5", "gpc1-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus8: sd1-bus-width8 {
samsung,pins = "gpd1-4", "gpd1-5", "gpd1-6", "gpd1-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_clk: sd2-clk {
samsung,pins = "gpc2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cmd: sd2-cmd {
samsung,pins = "gpc2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cd: sd2-cd {
samsung,pins = "gpc2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus1: sd2-bus-width1 {
samsung,pins = "gpc2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus4: sd2-bus-width4 {
samsung,pins = "gpc2-4", "gpc2-5", "gpc2-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
};
@@ -371,52 +371,52 @@
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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_i2c2_bus: cam-i2c2-bus {
samsung,pins = "gpf0-4", "gpf0-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_spi1_bus: cam-spi1-bus {
samsung,pins = "gpe0-4", "gpe0-5", "gpf0-2", "gpf0-3";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_i2c1_bus: cam-i2c1-bus {
samsung,pins = "gpf0-2", "gpf0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_i2c0_bus: cam-i2c0-bus {
samsung,pins = "gpf0-0", "gpf0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_bayrgb_bus: cam-bayrgb-bus {
@@ -425,9 +425,9 @@
"gpg1-0", "gpg1-1", "gpg1-2", "gpg1-3",
"gpg1-4", "gpg1-5", "gpg1-6", "gpg1-7",
"gpg2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -506,216 +506,216 @@
uart0_data: uart0-data {
samsung,pins = "gpa0-0", "gpa0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart0_fctl: uart0-fctl {
samsung,pins = "gpa0-2", "gpa0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_data: uart1-data {
samsung,pins = "gpa0-4", "gpa0-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_fctl: uart1-fctl {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c2_bus: i2c2-bus {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_data: uart2-data {
samsung,pins = "gpa1-0", "gpa1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_fctl: uart2-fctl {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c3_bus: i2c3-bus {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart3_data: uart3-data {
samsung,pins = "gpa1-4", "gpa1-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi0_bus: spi0-bus {
samsung,pins = "gpa2-0", "gpa2-1", "gpa2-2", "gpa2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi1_bus: spi1-bus {
samsung,pins = "gpa2-4", "gpa2-6", "gpa2-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c4_hs_bus: i2c4-hs-bus {
samsung,pins = "gpa2-0", "gpa2-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c5_hs_bus: i2c5-hs-bus {
samsung,pins = "gpa2-2", "gpa2-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2s2_bus: i2s2-bus {
samsung,pins = "gpb1-0", "gpb1-1", "gpb1-2", "gpb1-3",
"gpb1-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pcm2_bus: pcm2-bus {
samsung,pins = "gpb1-0", "gpb1-1", "gpb1-2", "gpb1-3",
"gpb1-4";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spdif_bus: spdif-bus {
samsung,pins = "gpb1-0", "gpb1-1";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi2_bus: spi2-bus {
samsung,pins = "gpb1-1", "gpb1-3", "gpb1-4";
- samsung,pin-function = <5>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_5>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c6_hs_bus: i2c6-hs-bus {
samsung,pins = "gpb1-3", "gpb1-4";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm0_out: pwm0-out {
samsung,pins = "gpb2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm1_out: pwm1-out {
samsung,pins = "gpb2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm2_out: pwm2-out {
samsung,pins = "gpb2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm3_out: pwm3-out {
samsung,pins = "gpb2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c7_hs_bus: i2c7-hs-bus {
samsung,pins = "gpb2-2", "gpb2-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c0_bus: i2c0-bus {
samsung,pins = "gpb3-0", "gpb3-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c1_bus: i2c1-bus {
samsung,pins = "gpb3-2", "gpb3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c8_hs_bus: i2c8-hs-bus {
samsung,pins = "gpb3-4", "gpb3-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c9_hs_bus: i2c9-hs-bus {
samsung,pins = "gpb3-6", "gpb3-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c10_hs_bus: i2c10-hs-bus {
samsung,pins = "gpb4-0", "gpb4-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -731,8 +731,8 @@
i2s0_bus: i2s0-bus {
samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
"gpz-4", "gpz-5", "gpz-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
index 29546465d3da..c659f86748ec 100644
--- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
@@ -386,25 +386,25 @@
&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 = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_2 {
usb300_vbus_en: usb300-vbus-en {
samsung,pins = "gpg0-5";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
usb301_vbus_en: usb301-vbus-en {
samsung,pins = "gpg1-4";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index 7bb8a370072a..d5e561d5def9 100644
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@ -548,25 +548,25 @@
&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 = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
s2mps11_irq: s2mps11-irq {
samsung,pins = "gpx0-4";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_1 {
emmc_nrst_pin: emmc-nrst {
samsung,pins = "gpd1-0";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index 51a8bca4691c..91447eb5cdf5 100644
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -722,171 +722,171 @@
wifi_en: wifi-en {
samsung,pins = "gpx0-0";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
max98091_irq: max98091-irq {
samsung,pins = "gpx0-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
/* We need GPX0_6 to be low at sleep time; just keep it low always */
mask_tpm_reset: mask-tpm-reset {
samsung,pins = "gpx0-6";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
samsung,pin-val = <0>;
};
tpm_irq: tpm-irq {
samsung,pins = "gpx1-0";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
trackpad_irq: trackpad-irq {
samsung,pins = "gpx1-1";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
power_key_irq: power-key-irq {
samsung,pins = "gpx1-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
ec_irq: ec-irq {
samsung,pins = "gpx1-5";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
tps65090_irq: tps65090-irq {
samsung,pins = "gpx2-5";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
dp_hpd_gpio: dp_hpd_gpio {
samsung,pins = "gpx2-6";
- samsung,pin-function = <0>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
max77802_irq: max77802-irq {
samsung,pins = "gpx3-1";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lid_irq: lid-irq {
samsung,pins = "gpx3-4";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
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 = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_dvs_1: pmic-dvs-1 {
samsung,pins = "gpy7-6";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_1 {
/* Adjust WiFi drive strengths lower for EMI */
sd1_clk: sd1-clk {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_cmd: sd1-cmd {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_bus1: sd1-bus-width1 {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_bus4: sd1-bus-width4 {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_bus8: sd1-bus-width8 {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
};
&pinctrl_2 {
pmic_dvs_2: pmic-dvs-2 {
samsung,pins = "gpj4-2";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_dvs_3: pmic-dvs-3 {
samsung,pins = "gpj4-3";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_3 {
/* Drive SPI lines at x2 for better integrity */
spi2-bus {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
/* Drive SPI chip select at x2 for better integrity */
ec_spi_cs: ec-spi-cs {
samsung,pins = "gpb1-2";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <2>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
usb300_vbus_en: usb300-vbus-en {
samsung,pins = "gph0-0";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
usb301_vbus_en: usb301-vbus-en {
samsung,pins = "gph0-1";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_selb: pmic-selb {
samsung,pins = "gph0-2", "gph0-3", "gph0-4", "gph0-5",
"gph0-6";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 9/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos542x/exynos5800
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
0 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: Javier Martinez Canillas, Tomasz Figa, Sylwester Nawrocki,
Krzysztof Kozlowski, Bartlomiej Zolnierkiewicz
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-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
---
arch/arm/boot/dts/exynos5420-arndale-octa.dts | 6 +-
arch/arm/boot/dts/exynos5420-peach-pit.dts | 126 ++++----
arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 354 ++++++++++-----------
arch/arm/boot/dts/exynos5420-smdk5420.dts | 18 +-
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 18 +-
arch/arm/boot/dts/exynos5800-peach-pi.dts | 126 ++++----
6 files changed, 324 insertions(+), 324 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
index 39a3b81478fd..7b9f67807308 100644
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@ -378,9 +378,9 @@
&pinctrl_0 {
s2mps11_irq: s2mps11-irq {
samsung,pins = "gpx3-2";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index f6f256fd9b5e..69c511f67d26 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -753,171 +753,171 @@
wifi_en: wifi-en {
samsung,pins = "gpx0-0";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
max98090_irq: max98090-irq {
samsung,pins = "gpx0-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
/* We need GPX0_6 to be low at sleep time; just keep it low always */
mask_tpm_reset: mask-tpm-reset {
samsung,pins = "gpx0-6";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
samsung,pin-val = <0>;
};
tpm_irq: tpm-irq {
samsung,pins = "gpx1-0";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
trackpad_irq: trackpad-irq {
samsung,pins = "gpx1-1";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
power_key_irq: power-key-irq {
samsung,pins = "gpx1-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
ec_irq: ec-irq {
samsung,pins = "gpx1-5";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
tps65090_irq: tps65090-irq {
samsung,pins = "gpx2-5";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
dp_hpd_gpio: dp_hpd_gpio {
samsung,pins = "gpx2-6";
- samsung,pin-function = <0>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
max77802_irq: max77802-irq {
samsung,pins = "gpx3-1";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lid_irq: lid-irq {
samsung,pins = "gpx3-4";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
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 = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_dvs_1: pmic-dvs-1 {
samsung,pins = "gpy7-6";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_1 {
/* Adjust WiFi drive strengths lower for EMI */
sd1_clk: sd1-clk {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_cmd: sd1-cmd {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_bus1: sd1-bus-width1 {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_bus4: sd1-bus-width4 {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_bus8: sd1-bus-width8 {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
};
&pinctrl_2 {
pmic_dvs_2: pmic-dvs-2 {
samsung,pins = "gpj4-2";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_dvs_3: pmic-dvs-3 {
samsung,pins = "gpj4-3";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_3 {
/* Drive SPI lines at x2 for better integrity */
spi2-bus {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
/* Drive SPI chip select at x2 for better integrity */
ec_spi_cs: ec-spi-cs {
samsung,pins = "gpb1-2";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <2>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
usb300_vbus_en: usb300-vbus-en {
samsung,pins = "gph0-0";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
usb301_vbus_en: usb301-vbus-en {
samsung,pins = "gph0-1";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_selb: pmic-selb {
samsung,pins = "gph0-2", "gph0-3", "gph0-4", "gph0-5",
"gph0-6";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
index 41abc8ec474a..ab14116bdbf0 100644
--- a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
@@ -78,9 +78,9 @@
dp_hpd: dp_hpd {
samsung,pins = "gpx0-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -170,135 +170,135 @@
sd0_clk: sd0-clk {
samsung,pins = "gpc0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cmd: sd0-cmd {
samsung,pins = "gpc0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cd: sd0-cd {
samsung,pins = "gpc0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus1: sd0-bus-width1 {
samsung,pins = "gpc0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus4: sd0-bus-width4 {
samsung,pins = "gpc0-4", "gpc0-5", "gpc0-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus8: sd0-bus-width8 {
samsung,pins = "gpc3-0", "gpc3-1", "gpc3-2", "gpc3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_rclk: sd0-rclk {
samsung,pins = "gpc0-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <1>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_clk: sd1-clk {
samsung,pins = "gpc1-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cmd: sd1-cmd {
samsung,pins = "gpc1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cd: sd1-cd {
samsung,pins = "gpc1-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_int: sd1-int {
samsung,pins = "gpd1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
sd1_bus1: sd1-bus-width1 {
samsung,pins = "gpc1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus4: sd1-bus-width4 {
samsung,pins = "gpc1-4", "gpc1-5", "gpc1-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus8: sd1-bus-width8 {
samsung,pins = "gpd1-4", "gpd1-5", "gpd1-6", "gpd1-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_clk: sd2-clk {
samsung,pins = "gpc2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cmd: sd2-cmd {
samsung,pins = "gpc2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cd: sd2-cd {
samsung,pins = "gpc2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus1: sd2-bus-width1 {
samsung,pins = "gpc2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus4: sd2-bus-width4 {
samsung,pins = "gpc2-4", "gpc2-5", "gpc2-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
};
@@ -371,52 +371,52 @@
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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_i2c2_bus: cam-i2c2-bus {
samsung,pins = "gpf0-4", "gpf0-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_spi1_bus: cam-spi1-bus {
samsung,pins = "gpe0-4", "gpe0-5", "gpf0-2", "gpf0-3";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_i2c1_bus: cam-i2c1-bus {
samsung,pins = "gpf0-2", "gpf0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_i2c0_bus: cam-i2c0-bus {
samsung,pins = "gpf0-0", "gpf0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_bayrgb_bus: cam-bayrgb-bus {
@@ -425,9 +425,9 @@
"gpg1-0", "gpg1-1", "gpg1-2", "gpg1-3",
"gpg1-4", "gpg1-5", "gpg1-6", "gpg1-7",
"gpg2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -506,216 +506,216 @@
uart0_data: uart0-data {
samsung,pins = "gpa0-0", "gpa0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart0_fctl: uart0-fctl {
samsung,pins = "gpa0-2", "gpa0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_data: uart1-data {
samsung,pins = "gpa0-4", "gpa0-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_fctl: uart1-fctl {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c2_bus: i2c2-bus {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_data: uart2-data {
samsung,pins = "gpa1-0", "gpa1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_fctl: uart2-fctl {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c3_bus: i2c3-bus {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart3_data: uart3-data {
samsung,pins = "gpa1-4", "gpa1-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi0_bus: spi0-bus {
samsung,pins = "gpa2-0", "gpa2-1", "gpa2-2", "gpa2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi1_bus: spi1-bus {
samsung,pins = "gpa2-4", "gpa2-6", "gpa2-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c4_hs_bus: i2c4-hs-bus {
samsung,pins = "gpa2-0", "gpa2-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c5_hs_bus: i2c5-hs-bus {
samsung,pins = "gpa2-2", "gpa2-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2s2_bus: i2s2-bus {
samsung,pins = "gpb1-0", "gpb1-1", "gpb1-2", "gpb1-3",
"gpb1-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pcm2_bus: pcm2-bus {
samsung,pins = "gpb1-0", "gpb1-1", "gpb1-2", "gpb1-3",
"gpb1-4";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spdif_bus: spdif-bus {
samsung,pins = "gpb1-0", "gpb1-1";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi2_bus: spi2-bus {
samsung,pins = "gpb1-1", "gpb1-3", "gpb1-4";
- samsung,pin-function = <5>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_5>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c6_hs_bus: i2c6-hs-bus {
samsung,pins = "gpb1-3", "gpb1-4";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm0_out: pwm0-out {
samsung,pins = "gpb2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm1_out: pwm1-out {
samsung,pins = "gpb2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm2_out: pwm2-out {
samsung,pins = "gpb2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm3_out: pwm3-out {
samsung,pins = "gpb2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c7_hs_bus: i2c7-hs-bus {
samsung,pins = "gpb2-2", "gpb2-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c0_bus: i2c0-bus {
samsung,pins = "gpb3-0", "gpb3-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c1_bus: i2c1-bus {
samsung,pins = "gpb3-2", "gpb3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c8_hs_bus: i2c8-hs-bus {
samsung,pins = "gpb3-4", "gpb3-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c9_hs_bus: i2c9-hs-bus {
samsung,pins = "gpb3-6", "gpb3-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c10_hs_bus: i2c10-hs-bus {
samsung,pins = "gpb4-0", "gpb4-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -731,8 +731,8 @@
i2s0_bus: i2s0-bus {
samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
"gpz-4", "gpz-5", "gpz-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
index 29546465d3da..c659f86748ec 100644
--- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
@@ -386,25 +386,25 @@
&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 = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_2 {
usb300_vbus_en: usb300-vbus-en {
samsung,pins = "gpg0-5";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
usb301_vbus_en: usb301-vbus-en {
samsung,pins = "gpg1-4";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index 7bb8a370072a..d5e561d5def9 100644
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@ -548,25 +548,25 @@
&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 = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
s2mps11_irq: s2mps11-irq {
samsung,pins = "gpx0-4";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_1 {
emmc_nrst_pin: emmc-nrst {
samsung,pins = "gpd1-0";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index 51a8bca4691c..91447eb5cdf5 100644
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -722,171 +722,171 @@
wifi_en: wifi-en {
samsung,pins = "gpx0-0";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
max98091_irq: max98091-irq {
samsung,pins = "gpx0-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
/* We need GPX0_6 to be low at sleep time; just keep it low always */
mask_tpm_reset: mask-tpm-reset {
samsung,pins = "gpx0-6";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
samsung,pin-val = <0>;
};
tpm_irq: tpm-irq {
samsung,pins = "gpx1-0";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
trackpad_irq: trackpad-irq {
samsung,pins = "gpx1-1";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
power_key_irq: power-key-irq {
samsung,pins = "gpx1-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
ec_irq: ec-irq {
samsung,pins = "gpx1-5";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
tps65090_irq: tps65090-irq {
samsung,pins = "gpx2-5";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
dp_hpd_gpio: dp_hpd_gpio {
samsung,pins = "gpx2-6";
- samsung,pin-function = <0>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
max77802_irq: max77802-irq {
samsung,pins = "gpx3-1";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lid_irq: lid-irq {
samsung,pins = "gpx3-4";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
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 = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_dvs_1: pmic-dvs-1 {
samsung,pins = "gpy7-6";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_1 {
/* Adjust WiFi drive strengths lower for EMI */
sd1_clk: sd1-clk {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_cmd: sd1-cmd {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_bus1: sd1-bus-width1 {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_bus4: sd1-bus-width4 {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_bus8: sd1-bus-width8 {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
};
&pinctrl_2 {
pmic_dvs_2: pmic-dvs-2 {
samsung,pins = "gpj4-2";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_dvs_3: pmic-dvs-3 {
samsung,pins = "gpj4-3";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_3 {
/* Drive SPI lines at x2 for better integrity */
spi2-bus {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
/* Drive SPI chip select at x2 for better integrity */
ec_spi_cs: ec-spi-cs {
samsung,pins = "gpb1-2";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <2>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
usb300_vbus_en: usb300-vbus-en {
samsung,pins = "gph0-0";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
usb301_vbus_en: usb301-vbus-en {
samsung,pins = "gph0-1";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_selb: pmic-selb {
samsung,pins = "gph0-2", "gph0-3", "gph0-4", "gph0-5",
"gph0-6";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [PATCH 9/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos542x/exynos5800
@ 2016-08-31 12:13 ` Krzysztof Kozlowski
0 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:13 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
arch/arm/boot/dts/exynos5420-arndale-octa.dts | 6 +-
arch/arm/boot/dts/exynos5420-peach-pit.dts | 126 ++++----
arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 354 ++++++++++-----------
arch/arm/boot/dts/exynos5420-smdk5420.dts | 18 +-
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 18 +-
arch/arm/boot/dts/exynos5800-peach-pi.dts | 126 ++++----
6 files changed, 324 insertions(+), 324 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
index 39a3b81478fd..7b9f67807308 100644
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@ -378,9 +378,9 @@
&pinctrl_0 {
s2mps11_irq: s2mps11-irq {
samsung,pins = "gpx3-2";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index f6f256fd9b5e..69c511f67d26 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -753,171 +753,171 @@
wifi_en: wifi-en {
samsung,pins = "gpx0-0";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
max98090_irq: max98090-irq {
samsung,pins = "gpx0-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
/* We need GPX0_6 to be low at sleep time; just keep it low always */
mask_tpm_reset: mask-tpm-reset {
samsung,pins = "gpx0-6";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
samsung,pin-val = <0>;
};
tpm_irq: tpm-irq {
samsung,pins = "gpx1-0";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
trackpad_irq: trackpad-irq {
samsung,pins = "gpx1-1";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
power_key_irq: power-key-irq {
samsung,pins = "gpx1-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
ec_irq: ec-irq {
samsung,pins = "gpx1-5";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
tps65090_irq: tps65090-irq {
samsung,pins = "gpx2-5";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
dp_hpd_gpio: dp_hpd_gpio {
samsung,pins = "gpx2-6";
- samsung,pin-function = <0>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
max77802_irq: max77802-irq {
samsung,pins = "gpx3-1";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lid_irq: lid-irq {
samsung,pins = "gpx3-4";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
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 = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_dvs_1: pmic-dvs-1 {
samsung,pins = "gpy7-6";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_1 {
/* Adjust WiFi drive strengths lower for EMI */
sd1_clk: sd1-clk {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_cmd: sd1-cmd {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_bus1: sd1-bus-width1 {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_bus4: sd1-bus-width4 {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_bus8: sd1-bus-width8 {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
};
&pinctrl_2 {
pmic_dvs_2: pmic-dvs-2 {
samsung,pins = "gpj4-2";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_dvs_3: pmic-dvs-3 {
samsung,pins = "gpj4-3";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_3 {
/* Drive SPI lines at x2 for better integrity */
spi2-bus {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
/* Drive SPI chip select at x2 for better integrity */
ec_spi_cs: ec-spi-cs {
samsung,pins = "gpb1-2";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <2>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
usb300_vbus_en: usb300-vbus-en {
samsung,pins = "gph0-0";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
usb301_vbus_en: usb301-vbus-en {
samsung,pins = "gph0-1";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_selb: pmic-selb {
samsung,pins = "gph0-2", "gph0-3", "gph0-4", "gph0-5",
"gph0-6";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
index 41abc8ec474a..ab14116bdbf0 100644
--- a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
@@ -78,9 +78,9 @@
dp_hpd: dp_hpd {
samsung,pins = "gpx0-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -170,135 +170,135 @@
sd0_clk: sd0-clk {
samsung,pins = "gpc0-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cmd: sd0-cmd {
samsung,pins = "gpc0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_cd: sd0-cd {
samsung,pins = "gpc0-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus1: sd0-bus-width1 {
samsung,pins = "gpc0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus4: sd0-bus-width4 {
samsung,pins = "gpc0-4", "gpc0-5", "gpc0-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_bus8: sd0-bus-width8 {
samsung,pins = "gpc3-0", "gpc3-1", "gpc3-2", "gpc3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd0_rclk: sd0-rclk {
samsung,pins = "gpc0-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <1>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_clk: sd1-clk {
samsung,pins = "gpc1-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cmd: sd1-cmd {
samsung,pins = "gpc1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_cd: sd1-cd {
samsung,pins = "gpc1-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_int: sd1-int {
samsung,pins = "gpd1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
sd1_bus1: sd1-bus-width1 {
samsung,pins = "gpc1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus4: sd1-bus-width4 {
samsung,pins = "gpc1-4", "gpc1-5", "gpc1-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd1_bus8: sd1-bus-width8 {
samsung,pins = "gpd1-4", "gpd1-5", "gpd1-6", "gpd1-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_clk: sd2-clk {
samsung,pins = "gpc2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cmd: sd2-cmd {
samsung,pins = "gpc2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_cd: sd2-cd {
samsung,pins = "gpc2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus1: sd2-bus-width1 {
samsung,pins = "gpc2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
sd2_bus4: sd2-bus-width4 {
samsung,pins = "gpc2-4", "gpc2-5", "gpc2-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <3>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV4>;
};
};
@@ -371,52 +371,52 @@
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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_i2c2_bus: cam-i2c2-bus {
samsung,pins = "gpf0-4", "gpf0-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_spi1_bus: cam-spi1-bus {
samsung,pins = "gpe0-4", "gpe0-5", "gpf0-2", "gpf0-3";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_i2c1_bus: cam-i2c1-bus {
samsung,pins = "gpf0-2", "gpf0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_i2c0_bus: cam-i2c0-bus {
samsung,pins = "gpf0-0", "gpf0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
cam_bayrgb_bus: cam-bayrgb-bus {
@@ -425,9 +425,9 @@
"gpg1-0", "gpg1-1", "gpg1-2", "gpg1-3",
"gpg1-4", "gpg1-5", "gpg1-6", "gpg1-7",
"gpg2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -506,216 +506,216 @@
uart0_data: uart0-data {
samsung,pins = "gpa0-0", "gpa0-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart0_fctl: uart0-fctl {
samsung,pins = "gpa0-2", "gpa0-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_data: uart1-data {
samsung,pins = "gpa0-4", "gpa0-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart1_fctl: uart1-fctl {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c2_bus: i2c2-bus {
samsung,pins = "gpa0-6", "gpa0-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_data: uart2-data {
samsung,pins = "gpa1-0", "gpa1-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart2_fctl: uart2-fctl {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c3_bus: i2c3-bus {
samsung,pins = "gpa1-2", "gpa1-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
uart3_data: uart3-data {
samsung,pins = "gpa1-4", "gpa1-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi0_bus: spi0-bus {
samsung,pins = "gpa2-0", "gpa2-1", "gpa2-2", "gpa2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi1_bus: spi1-bus {
samsung,pins = "gpa2-4", "gpa2-6", "gpa2-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c4_hs_bus: i2c4-hs-bus {
samsung,pins = "gpa2-0", "gpa2-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c5_hs_bus: i2c5-hs-bus {
samsung,pins = "gpa2-2", "gpa2-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <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-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2s2_bus: i2s2-bus {
samsung,pins = "gpb1-0", "gpb1-1", "gpb1-2", "gpb1-3",
"gpb1-4";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pcm2_bus: pcm2-bus {
samsung,pins = "gpb1-0", "gpb1-1", "gpb1-2", "gpb1-3",
"gpb1-4";
- samsung,pin-function = <3>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spdif_bus: spdif-bus {
samsung,pins = "gpb1-0", "gpb1-1";
- samsung,pin-function = <4>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
spi2_bus: spi2-bus {
samsung,pins = "gpb1-1", "gpb1-3", "gpb1-4";
- samsung,pin-function = <5>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_5>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c6_hs_bus: i2c6-hs-bus {
samsung,pins = "gpb1-3", "gpb1-4";
- samsung,pin-function = <4>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_4>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm0_out: pwm0-out {
samsung,pins = "gpb2-0";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm1_out: pwm1-out {
samsung,pins = "gpb2-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm2_out: pwm2-out {
samsung,pins = "gpb2-2";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pwm3_out: pwm3-out {
samsung,pins = "gpb2-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c7_hs_bus: i2c7-hs-bus {
samsung,pins = "gpb2-2", "gpb2-3";
- samsung,pin-function = <3>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_3>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c0_bus: i2c0-bus {
samsung,pins = "gpb3-0", "gpb3-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c1_bus: i2c1-bus {
samsung,pins = "gpb3-2", "gpb3-3";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c8_hs_bus: i2c8-hs-bus {
samsung,pins = "gpb3-4", "gpb3-5";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c9_hs_bus: i2c9-hs-bus {
samsung,pins = "gpb3-6", "gpb3-7";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
i2c10_hs_bus: i2c10-hs-bus {
samsung,pins = "gpb4-0", "gpb4-1";
- samsung,pin-function = <2>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
@@ -731,8 +731,8 @@
i2s0_bus: i2s0-bus {
samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
"gpz-4", "gpz-5", "gpz-6";
- samsung,pin-function = <2>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_2>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
index 29546465d3da..c659f86748ec 100644
--- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
@@ -386,25 +386,25 @@
&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 = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_2 {
usb300_vbus_en: usb300-vbus-en {
samsung,pins = "gpg0-5";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
usb301_vbus_en: usb301-vbus-en {
samsung,pins = "gpg1-4";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index 7bb8a370072a..d5e561d5def9 100644
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@ -548,25 +548,25 @@
&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 = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
s2mps11_irq: s2mps11-irq {
samsung,pins = "gpx0-4";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_1 {
emmc_nrst_pin: emmc-nrst {
samsung,pins = "gpd1-0";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index 51a8bca4691c..91447eb5cdf5 100644
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -722,171 +722,171 @@
wifi_en: wifi-en {
samsung,pins = "gpx0-0";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
max98091_irq: max98091-irq {
samsung,pins = "gpx0-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
/* We need GPX0_6 to be low at sleep time; just keep it low always */
mask_tpm_reset: mask-tpm-reset {
samsung,pins = "gpx0-6";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
samsung,pin-val = <0>;
};
tpm_irq: tpm-irq {
samsung,pins = "gpx1-0";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
trackpad_irq: trackpad-irq {
samsung,pins = "gpx1-1";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
power_key_irq: power-key-irq {
samsung,pins = "gpx1-2";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
ec_irq: ec-irq {
samsung,pins = "gpx1-5";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
tps65090_irq: tps65090-irq {
samsung,pins = "gpx2-5";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
dp_hpd_gpio: dp_hpd_gpio {
samsung,pins = "gpx2-6";
- samsung,pin-function = <0>;
- samsung,pin-pud = <3>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_UP>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
max77802_irq: max77802-irq {
samsung,pins = "gpx3-1";
- samsung,pin-function = <0>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
lid_irq: lid-irq {
samsung,pins = "gpx3-4";
- samsung,pin-function = <0xf>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_SPC_F>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
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 = <PIN_FUNC_INPUT>;
+ samsung,pin-pud = <PIN_PULL_DOWN>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_dvs_1: pmic-dvs-1 {
samsung,pins = "gpy7-6";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_1 {
/* Adjust WiFi drive strengths lower for EMI */
sd1_clk: sd1-clk {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_cmd: sd1-cmd {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_bus1: sd1-bus-width1 {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_bus4: sd1-bus-width4 {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
sd1_bus8: sd1-bus-width8 {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
};
&pinctrl_2 {
pmic_dvs_2: pmic-dvs-2 {
samsung,pins = "gpj4-2";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_dvs_3: pmic-dvs-3 {
samsung,pins = "gpj4-3";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
&pinctrl_3 {
/* Drive SPI lines at x2 for better integrity */
spi2-bus {
- samsung,pin-drv = <2>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
/* Drive SPI chip select at x2 for better integrity */
ec_spi_cs: ec-spi-cs {
samsung,pins = "gpb1-2";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <2>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV3>;
};
usb300_vbus_en: usb300-vbus-en {
samsung,pins = "gph0-0";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
usb301_vbus_en: usb301-vbus-en {
samsung,pins = "gph0-1";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
pmic_selb: pmic-selb {
samsung,pins = "gph0-2", "gph0-3", "gph0-4", "gph0-5",
"gph0-6";
- samsung,pin-function = <1>;
- samsung,pin-pud = <0>;
- samsung,pin-drv = <0>;
+ samsung,pin-function = <PIN_FUNC_OUTPUT>;
+ samsung,pin-pud = <PIN_PULL_NONE>;
+ samsung,pin-drv = <PIN_DRV_LV1>;
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 38+ messages in thread
* Re: [PATCH 0/9] ARM: dts: exynos: Use macros for GPIO to make it more readable
2016-08-31 12:13 ` Krzysztof Kozlowski
@ 2016-08-31 12:40 ` Javier Martinez Canillas
-1 siblings, 0 replies; 38+ messages in thread
From: Javier Martinez Canillas @ 2016-08-31 12:40 UTC (permalink / raw)
To: Krzysztof Kozlowski, Rob Herring, Mark Rutland, Kukjin Kim,
Krzysztof Kozlowski, devicetree, linux-arm-kernel,
linux-samsung-soc, linux-kernel
Cc: Tomasz Figa, Sylwester Nawrocki, Bartlomiej Zolnierkiewicz
Hello Krzysztof,
On 08/31/2016 02:13 PM, Krzysztof Kozlowski wrote:
> Hi,
>
> Example:
> - samsung,pin-function = <0x2>;
> - samsung,pin-pud = <0>;
> - samsung,pin-drv = <0>;
> + samsung,pin-function = <PIN_FUNC_SPC_2>;
> + samsung,pin-pud = <PIN_PULL_NONE>;
> + samsung,pin-drv = <PIN_DRV_LV1>;
>
> This should be just more readable. Especially for drive strenghts which
> are unobvious and different between some SoCs.
>
I agree that's better to have macros for these instead of using magic numbers.
For all the series:
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
> Tested with dtx_diff:
> for i in dts-old/exynos*dtb; do scripts/dtc/dtx_diff $i dts-new/$(basename $i); done
>
I've also tested the patches on an Exynos5800 Peach Pi board, and as expected
everything is working correctly since the compiled DTB is exactly the same.
So for patches 1/9 and 9/9:
Tested-by: Javier Martinez Canillas <javier@osg.samsung.com>
Best regards,
--
Javier Martinez Canillas
Open Source Group
Samsung Research America
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH 0/9] ARM: dts: exynos: Use macros for GPIO to make it more readable
@ 2016-08-31 12:40 ` Javier Martinez Canillas
0 siblings, 0 replies; 38+ messages in thread
From: Javier Martinez Canillas @ 2016-08-31 12:40 UTC (permalink / raw)
To: linux-arm-kernel
Hello Krzysztof,
On 08/31/2016 02:13 PM, Krzysztof Kozlowski wrote:
> Hi,
>
> Example:
> - samsung,pin-function = <0x2>;
> - samsung,pin-pud = <0>;
> - samsung,pin-drv = <0>;
> + samsung,pin-function = <PIN_FUNC_SPC_2>;
> + samsung,pin-pud = <PIN_PULL_NONE>;
> + samsung,pin-drv = <PIN_DRV_LV1>;
>
> This should be just more readable. Especially for drive strenghts which
> are unobvious and different between some SoCs.
>
I agree that's better to have macros for these instead of using magic numbers.
For all the series:
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
> Tested with dtx_diff:
> for i in dts-old/exynos*dtb; do scripts/dtc/dtx_diff $i dts-new/$(basename $i); done
>
I've also tested the patches on an Exynos5800 Peach Pi board, and as expected
everything is working correctly since the compiled DTB is exactly the same.
So for patches 1/9 and 9/9:
Tested-by: Javier Martinez Canillas <javier@osg.samsung.com>
Best regards,
--
Javier Martinez Canillas
Open Source Group
Samsung Research America
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 1/9] ARM: dts: exynos: Add macros for GPIO configuration
@ 2016-08-31 12:42 ` Arnd Bergmann
0 siblings, 0 replies; 38+ messages in thread
From: Arnd Bergmann @ 2016-08-31 12:42 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Krzysztof Kozlowski, Rob Herring, Mark Rutland, Kukjin Kim,
Krzysztof Kozlowski, devicetree, linux-samsung-soc, linux-kernel,
Javier Martinez Canillas, Tomasz Figa, Sylwester Nawrocki,
Bartlomiej Zolnierkiewicz
On Wednesday, August 31, 2016 2:13:25 PM CEST Krzysztof Kozlowski wrote:
>
> +#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_FUNC_INPUT 0
> +#define PIN_FUNC_OUTPUT 1
> +#define PIN_FUNC_SPC_2 2
> +#define PIN_FUNC_SPC_3 3
> +#define PIN_FUNC_SPC_4 4
> +#define PIN_FUNC_SPC_5 5
> +#define PIN_FUNC_SPC_F 0xf
Any reason for having a copy in each of those files instead of one
that is shared across all of them?
Arnd
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 1/9] ARM: dts: exynos: Add macros for GPIO configuration
@ 2016-08-31 12:42 ` Arnd Bergmann
0 siblings, 0 replies; 38+ messages in thread
From: Arnd Bergmann @ 2016-08-31 12:42 UTC (permalink / raw)
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
Cc: Krzysztof Kozlowski, Rob Herring, Mark Rutland, Kukjin Kim,
Krzysztof Kozlowski, devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Javier Martinez Canillas,
Tomasz Figa, Sylwester Nawrocki, Bartlomiej Zolnierkiewicz
On Wednesday, August 31, 2016 2:13:25 PM CEST Krzysztof Kozlowski wrote:
>
> +#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_FUNC_INPUT 0
> +#define PIN_FUNC_OUTPUT 1
> +#define PIN_FUNC_SPC_2 2
> +#define PIN_FUNC_SPC_3 3
> +#define PIN_FUNC_SPC_4 4
> +#define PIN_FUNC_SPC_5 5
> +#define PIN_FUNC_SPC_F 0xf
Any reason for having a copy in each of those files instead of one
that is shared across all of them?
Arnd
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH 1/9] ARM: dts: exynos: Add macros for GPIO configuration
@ 2016-08-31 12:42 ` Arnd Bergmann
0 siblings, 0 replies; 38+ messages in thread
From: Arnd Bergmann @ 2016-08-31 12:42 UTC (permalink / raw)
To: linux-arm-kernel
On Wednesday, August 31, 2016 2:13:25 PM CEST Krzysztof Kozlowski wrote:
>
> +#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_FUNC_INPUT 0
> +#define PIN_FUNC_OUTPUT 1
> +#define PIN_FUNC_SPC_2 2
> +#define PIN_FUNC_SPC_3 3
> +#define PIN_FUNC_SPC_4 4
> +#define PIN_FUNC_SPC_5 5
> +#define PIN_FUNC_SPC_F 0xf
Any reason for having a copy in each of those files instead of one
that is shared across all of them?
Arnd
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 1/9] ARM: dts: exynos: Add macros for GPIO configuration
2016-08-31 12:42 ` Arnd Bergmann
@ 2016-08-31 12:53 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:53 UTC (permalink / raw)
To: Arnd Bergmann, linux-arm-kernel
Cc: Rob Herring, Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
devicetree, linux-samsung-soc, linux-kernel,
Javier Martinez Canillas, Tomasz Figa, Sylwester Nawrocki,
Bartlomiej Zolnierkiewicz
On 08/31/2016 02:42 PM, Arnd Bergmann wrote:
> On Wednesday, August 31, 2016 2:13:25 PM CEST Krzysztof Kozlowski wrote:
>>
>> +#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_FUNC_INPUT 0
>> +#define PIN_FUNC_OUTPUT 1
>> +#define PIN_FUNC_SPC_2 2
>> +#define PIN_FUNC_SPC_3 3
>> +#define PIN_FUNC_SPC_4 4
>> +#define PIN_FUNC_SPC_5 5
>> +#define PIN_FUNC_SPC_F 0xf
>
> Any reason for having a copy in each of those files instead of one
> that is shared across all of them?
The drive strengths differ between some of them. There are three groups
of drive strengths:
1. Exynos3250, Exynos4 (all) and Exynos5250,
2. Exynos5260,
3. Exynos5410, 542x and 5800.
Rest (functions and pull up/down) is the same so sharing the defines is
possible but not that obvious. Solution would be for example adding a
SoC-family prefix for PIN_DRV_LVx. Not that good...
I could put it into three DTSI:
- exynos3-pinctrl.dtsi (new file)
- exynos5260-pinctrl.dtsi (like it is now)
- exynos54xx-pinctrl.dtsi (new file)
which would reduce the duplication. Other ideas?
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH 1/9] ARM: dts: exynos: Add macros for GPIO configuration
@ 2016-08-31 12:53 ` Krzysztof Kozlowski
0 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 12:53 UTC (permalink / raw)
To: linux-arm-kernel
On 08/31/2016 02:42 PM, Arnd Bergmann wrote:
> On Wednesday, August 31, 2016 2:13:25 PM CEST Krzysztof Kozlowski wrote:
>>
>> +#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_FUNC_INPUT 0
>> +#define PIN_FUNC_OUTPUT 1
>> +#define PIN_FUNC_SPC_2 2
>> +#define PIN_FUNC_SPC_3 3
>> +#define PIN_FUNC_SPC_4 4
>> +#define PIN_FUNC_SPC_5 5
>> +#define PIN_FUNC_SPC_F 0xf
>
> Any reason for having a copy in each of those files instead of one
> that is shared across all of them?
The drive strengths differ between some of them. There are three groups
of drive strengths:
1. Exynos3250, Exynos4 (all) and Exynos5250,
2. Exynos5260,
3. Exynos5410, 542x and 5800.
Rest (functions and pull up/down) is the same so sharing the defines is
possible but not that obvious. Solution would be for example adding a
SoC-family prefix for PIN_DRV_LVx. Not that good...
I could put it into three DTSI:
- exynos3-pinctrl.dtsi (new file)
- exynos5260-pinctrl.dtsi (like it is now)
- exynos54xx-pinctrl.dtsi (new file)
which would reduce the duplication. Other ideas?
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 1/9] ARM: dts: exynos: Add macros for GPIO configuration
2016-08-31 12:53 ` Krzysztof Kozlowski
(?)
@ 2016-08-31 12:58 ` Arnd Bergmann
-1 siblings, 0 replies; 38+ messages in thread
From: Arnd Bergmann @ 2016-08-31 12:58 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: linux-arm-kernel, Rob Herring, Mark Rutland, Kukjin Kim,
Krzysztof Kozlowski, devicetree, linux-samsung-soc, linux-kernel,
Javier Martinez Canillas, Tomasz Figa, Sylwester Nawrocki,
Bartlomiej Zolnierkiewicz
On Wednesday, August 31, 2016 2:53:02 PM CEST Krzysztof Kozlowski wrote:
> On 08/31/2016 02:42 PM, Arnd Bergmann wrote:
> > On Wednesday, August 31, 2016 2:13:25 PM CEST Krzysztof Kozlowski wrote:
> >>
> >> +#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_FUNC_INPUT 0
> >> +#define PIN_FUNC_OUTPUT 1
> >> +#define PIN_FUNC_SPC_2 2
> >> +#define PIN_FUNC_SPC_3 3
> >> +#define PIN_FUNC_SPC_4 4
> >> +#define PIN_FUNC_SPC_5 5
> >> +#define PIN_FUNC_SPC_F 0xf
> >
> > Any reason for having a copy in each of those files instead of one
> > that is shared across all of them?
>
> The drive strengths differ between some of them. There are three groups
> of drive strengths:
> 1. Exynos3250, Exynos4 (all) and Exynos5250,
> 2. Exynos5260,
> 3. Exynos5410, 542x and 5800.
I see. That sounds like an even stronger reason to not duplicate
the definitions, as this is very confusing.
> Rest (functions and pull up/down) is the same so sharing the defines is
> possible but not that obvious. Solution would be for example adding a
> SoC-family prefix for PIN_DRV_LVx. Not that good...
>
> I could put it into three DTSI:
> - exynos3-pinctrl.dtsi (new file)
> - exynos5260-pinctrl.dtsi (like it is now)
> - exynos54xx-pinctrl.dtsi (new file)
>
> which would reduce the duplication. Other ideas?
I think having the soc-family prefix is better, as it avoids
defining the same symbol to a different value. Better make this
as explicit as possible.
I think overall, a better solution would have been to define the
constants globally (shared with non-exynos) to start with,
and have the driver translate generic numbers into vendor
specific ones. Obviously it's too late for that now.
Arnd
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 1/9] ARM: dts: exynos: Add macros for GPIO configuration
@ 2016-08-31 12:58 ` Arnd Bergmann
0 siblings, 0 replies; 38+ messages in thread
From: Arnd Bergmann @ 2016-08-31 12:58 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Mark Rutland, devicetree, linux-samsung-soc,
Bartlomiej Zolnierkiewicz, linux-kernel, Krzysztof Kozlowski,
Tomasz Figa, Javier Martinez Canillas, Rob Herring, Kukjin Kim,
Sylwester Nawrocki, linux-arm-kernel
On Wednesday, August 31, 2016 2:53:02 PM CEST Krzysztof Kozlowski wrote:
> On 08/31/2016 02:42 PM, Arnd Bergmann wrote:
> > On Wednesday, August 31, 2016 2:13:25 PM CEST Krzysztof Kozlowski wrote:
> >>
> >> +#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_FUNC_INPUT 0
> >> +#define PIN_FUNC_OUTPUT 1
> >> +#define PIN_FUNC_SPC_2 2
> >> +#define PIN_FUNC_SPC_3 3
> >> +#define PIN_FUNC_SPC_4 4
> >> +#define PIN_FUNC_SPC_5 5
> >> +#define PIN_FUNC_SPC_F 0xf
> >
> > Any reason for having a copy in each of those files instead of one
> > that is shared across all of them?
>
> The drive strengths differ between some of them. There are three groups
> of drive strengths:
> 1. Exynos3250, Exynos4 (all) and Exynos5250,
> 2. Exynos5260,
> 3. Exynos5410, 542x and 5800.
I see. That sounds like an even stronger reason to not duplicate
the definitions, as this is very confusing.
> Rest (functions and pull up/down) is the same so sharing the defines is
> possible but not that obvious. Solution would be for example adding a
> SoC-family prefix for PIN_DRV_LVx. Not that good...
>
> I could put it into three DTSI:
> - exynos3-pinctrl.dtsi (new file)
> - exynos5260-pinctrl.dtsi (like it is now)
> - exynos54xx-pinctrl.dtsi (new file)
>
> which would reduce the duplication. Other ideas?
I think having the soc-family prefix is better, as it avoids
defining the same symbol to a different value. Better make this
as explicit as possible.
I think overall, a better solution would have been to define the
constants globally (shared with non-exynos) to start with,
and have the driver translate generic numbers into vendor
specific ones. Obviously it's too late for that now.
Arnd
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH 1/9] ARM: dts: exynos: Add macros for GPIO configuration
@ 2016-08-31 12:58 ` Arnd Bergmann
0 siblings, 0 replies; 38+ messages in thread
From: Arnd Bergmann @ 2016-08-31 12:58 UTC (permalink / raw)
To: linux-arm-kernel
On Wednesday, August 31, 2016 2:53:02 PM CEST Krzysztof Kozlowski wrote:
> On 08/31/2016 02:42 PM, Arnd Bergmann wrote:
> > On Wednesday, August 31, 2016 2:13:25 PM CEST Krzysztof Kozlowski wrote:
> >>
> >> +#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_FUNC_INPUT 0
> >> +#define PIN_FUNC_OUTPUT 1
> >> +#define PIN_FUNC_SPC_2 2
> >> +#define PIN_FUNC_SPC_3 3
> >> +#define PIN_FUNC_SPC_4 4
> >> +#define PIN_FUNC_SPC_5 5
> >> +#define PIN_FUNC_SPC_F 0xf
> >
> > Any reason for having a copy in each of those files instead of one
> > that is shared across all of them?
>
> The drive strengths differ between some of them. There are three groups
> of drive strengths:
> 1. Exynos3250, Exynos4 (all) and Exynos5250,
> 2. Exynos5260,
> 3. Exynos5410, 542x and 5800.
I see. That sounds like an even stronger reason to not duplicate
the definitions, as this is very confusing.
> Rest (functions and pull up/down) is the same so sharing the defines is
> possible but not that obvious. Solution would be for example adding a
> SoC-family prefix for PIN_DRV_LVx. Not that good...
>
> I could put it into three DTSI:
> - exynos3-pinctrl.dtsi (new file)
> - exynos5260-pinctrl.dtsi (like it is now)
> - exynos54xx-pinctrl.dtsi (new file)
>
> which would reduce the duplication. Other ideas?
I think having the soc-family prefix is better, as it avoids
defining the same symbol to a different value. Better make this
as explicit as possible.
I think overall, a better solution would have been to define the
constants globally (shared with non-exynos) to start with,
and have the driver translate generic numbers into vendor
specific ones. Obviously it's too late for that now.
Arnd
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 1/9] ARM: dts: exynos: Add macros for GPIO configuration
2016-08-31 12:58 ` Arnd Bergmann
(?)
@ 2016-08-31 13:07 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 13:07 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, Rob Herring, Mark Rutland, Kukjin Kim,
Krzysztof Kozlowski, devicetree, linux-samsung-soc, linux-kernel,
Javier Martinez Canillas, Tomasz Figa, Sylwester Nawrocki,
Bartlomiej Zolnierkiewicz
On 08/31/2016 02:58 PM, Arnd Bergmann wrote:
> On Wednesday, August 31, 2016 2:53:02 PM CEST Krzysztof Kozlowski wrote:
>> On 08/31/2016 02:42 PM, Arnd Bergmann wrote:
>>> On Wednesday, August 31, 2016 2:13:25 PM CEST Krzysztof Kozlowski wrote:
>>>>
>>>> +#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_FUNC_INPUT 0
>>>> +#define PIN_FUNC_OUTPUT 1
>>>> +#define PIN_FUNC_SPC_2 2
>>>> +#define PIN_FUNC_SPC_3 3
>>>> +#define PIN_FUNC_SPC_4 4
>>>> +#define PIN_FUNC_SPC_5 5
>>>> +#define PIN_FUNC_SPC_F 0xf
>>>
>>> Any reason for having a copy in each of those files instead of one
>>> that is shared across all of them?
>>
>> The drive strengths differ between some of them. There are three groups
>> of drive strengths:
>> 1. Exynos3250, Exynos4 (all) and Exynos5250,
>> 2. Exynos5260,
>> 3. Exynos5410, 542x and 5800.
>
> I see. That sounds like an even stronger reason to not duplicate
> the definitions, as this is very confusing.
Okay.
>
>> Rest (functions and pull up/down) is the same so sharing the defines is
>> possible but not that obvious. Solution would be for example adding a
>> SoC-family prefix for PIN_DRV_LVx. Not that good...
>>
>> I could put it into three DTSI:
>> - exynos3-pinctrl.dtsi (new file)
>> - exynos5260-pinctrl.dtsi (like it is now)
>> - exynos54xx-pinctrl.dtsi (new file)
>>
>> which would reduce the duplication. Other ideas?
>
> I think having the soc-family prefix is better, as it avoids
> defining the same symbol to a different value. Better make this
> as explicit as possible.
Ok, sounds reasonable. I want to convert also older platforms S3C (drive
strengths and pull up/down differ) and arm64 SoC: Exynos7. For the
latter the problem is there is no common place for sharing DTS, except
the headers. However this does not really belong to headers. I guess
some level of duplication might be still exist.
> I think overall, a better solution would have been to define the
> constants globally (shared with non-exynos) to start with,
> and have the driver translate generic numbers into vendor
> specific ones. Obviously it's too late for that now.
We could extend driver by adding new bindings accepting generic numbers
(and still backward compatible) but this looks like an overkill.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 1/9] ARM: dts: exynos: Add macros for GPIO configuration
@ 2016-08-31 13:07 ` Krzysztof Kozlowski
0 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 13:07 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Rob Herring,
Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Javier Martinez Canillas,
Tomasz Figa, Sylwester Nawrocki, Bartlomiej Zolnierkiewicz
On 08/31/2016 02:58 PM, Arnd Bergmann wrote:
> On Wednesday, August 31, 2016 2:53:02 PM CEST Krzysztof Kozlowski wrote:
>> On 08/31/2016 02:42 PM, Arnd Bergmann wrote:
>>> On Wednesday, August 31, 2016 2:13:25 PM CEST Krzysztof Kozlowski wrote:
>>>>
>>>> +#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_FUNC_INPUT 0
>>>> +#define PIN_FUNC_OUTPUT 1
>>>> +#define PIN_FUNC_SPC_2 2
>>>> +#define PIN_FUNC_SPC_3 3
>>>> +#define PIN_FUNC_SPC_4 4
>>>> +#define PIN_FUNC_SPC_5 5
>>>> +#define PIN_FUNC_SPC_F 0xf
>>>
>>> Any reason for having a copy in each of those files instead of one
>>> that is shared across all of them?
>>
>> The drive strengths differ between some of them. There are three groups
>> of drive strengths:
>> 1. Exynos3250, Exynos4 (all) and Exynos5250,
>> 2. Exynos5260,
>> 3. Exynos5410, 542x and 5800.
>
> I see. That sounds like an even stronger reason to not duplicate
> the definitions, as this is very confusing.
Okay.
>
>> Rest (functions and pull up/down) is the same so sharing the defines is
>> possible but not that obvious. Solution would be for example adding a
>> SoC-family prefix for PIN_DRV_LVx. Not that good...
>>
>> I could put it into three DTSI:
>> - exynos3-pinctrl.dtsi (new file)
>> - exynos5260-pinctrl.dtsi (like it is now)
>> - exynos54xx-pinctrl.dtsi (new file)
>>
>> which would reduce the duplication. Other ideas?
>
> I think having the soc-family prefix is better, as it avoids
> defining the same symbol to a different value. Better make this
> as explicit as possible.
Ok, sounds reasonable. I want to convert also older platforms S3C (drive
strengths and pull up/down differ) and arm64 SoC: Exynos7. For the
latter the problem is there is no common place for sharing DTS, except
the headers. However this does not really belong to headers. I guess
some level of duplication might be still exist.
> I think overall, a better solution would have been to define the
> constants globally (shared with non-exynos) to start with,
> and have the driver translate generic numbers into vendor
> specific ones. Obviously it's too late for that now.
We could extend driver by adding new bindings accepting generic numbers
(and still backward compatible) but this looks like an overkill.
Best regards,
Krzysztof
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH 1/9] ARM: dts: exynos: Add macros for GPIO configuration
@ 2016-08-31 13:07 ` Krzysztof Kozlowski
0 siblings, 0 replies; 38+ messages in thread
From: Krzysztof Kozlowski @ 2016-08-31 13:07 UTC (permalink / raw)
To: linux-arm-kernel
On 08/31/2016 02:58 PM, Arnd Bergmann wrote:
> On Wednesday, August 31, 2016 2:53:02 PM CEST Krzysztof Kozlowski wrote:
>> On 08/31/2016 02:42 PM, Arnd Bergmann wrote:
>>> On Wednesday, August 31, 2016 2:13:25 PM CEST Krzysztof Kozlowski wrote:
>>>>
>>>> +#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_FUNC_INPUT 0
>>>> +#define PIN_FUNC_OUTPUT 1
>>>> +#define PIN_FUNC_SPC_2 2
>>>> +#define PIN_FUNC_SPC_3 3
>>>> +#define PIN_FUNC_SPC_4 4
>>>> +#define PIN_FUNC_SPC_5 5
>>>> +#define PIN_FUNC_SPC_F 0xf
>>>
>>> Any reason for having a copy in each of those files instead of one
>>> that is shared across all of them?
>>
>> The drive strengths differ between some of them. There are three groups
>> of drive strengths:
>> 1. Exynos3250, Exynos4 (all) and Exynos5250,
>> 2. Exynos5260,
>> 3. Exynos5410, 542x and 5800.
>
> I see. That sounds like an even stronger reason to not duplicate
> the definitions, as this is very confusing.
Okay.
>
>> Rest (functions and pull up/down) is the same so sharing the defines is
>> possible but not that obvious. Solution would be for example adding a
>> SoC-family prefix for PIN_DRV_LVx. Not that good...
>>
>> I could put it into three DTSI:
>> - exynos3-pinctrl.dtsi (new file)
>> - exynos5260-pinctrl.dtsi (like it is now)
>> - exynos54xx-pinctrl.dtsi (new file)
>>
>> which would reduce the duplication. Other ideas?
>
> I think having the soc-family prefix is better, as it avoids
> defining the same symbol to a different value. Better make this
> as explicit as possible.
Ok, sounds reasonable. I want to convert also older platforms S3C (drive
strengths and pull up/down differ) and arm64 SoC: Exynos7. For the
latter the problem is there is no common place for sharing DTS, except
the headers. However this does not really belong to headers. I guess
some level of duplication might be still exist.
> I think overall, a better solution would have been to define the
> constants globally (shared with non-exynos) to start with,
> and have the driver translate generic numbers into vendor
> specific ones. Obviously it's too late for that now.
We could extend driver by adding new bindings accepting generic numbers
(and still backward compatible) but this looks like an overkill.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 1/9] ARM: dts: exynos: Add macros for GPIO configuration
2016-08-31 13:07 ` Krzysztof Kozlowski
@ 2016-08-31 13:33 ` Arnd Bergmann
-1 siblings, 0 replies; 38+ messages in thread
From: Arnd Bergmann @ 2016-08-31 13:33 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: linux-arm-kernel, Rob Herring, Mark Rutland, Kukjin Kim,
Krzysztof Kozlowski, devicetree, linux-samsung-soc, linux-kernel,
Javier Martinez Canillas, Tomasz Figa, Sylwester Nawrocki,
Bartlomiej Zolnierkiewicz
On Wednesday, August 31, 2016 3:07:00 PM CEST Krzysztof Kozlowski wrote:
>
> Ok, sounds reasonable. I want to convert also older platforms S3C (drive
> strengths and pull up/down differ) and arm64 SoC: Exynos7. For the
> latter the problem is there is no common place for sharing DTS, except
> the headers. However this does not really belong to headers. I guess
> some level of duplication might be still exist.
We have stuff in the headers that belongs way less there, so I wouldn't
mind, but having a separate set of definitions for arm64 also isn't
a problem at all.
> > I think overall, a better solution would have been to define the
> > constants globally (shared with non-exynos) to start with,
> > and have the driver translate generic numbers into vendor
> > specific ones. Obviously it's too late for that now.
>
> We could extend driver by adding new bindings accepting generic numbers
> (and still backward compatible) but this looks like an overkill.
Agreed, that would only make things more confusing, not less.
Arnd
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH 1/9] ARM: dts: exynos: Add macros for GPIO configuration
@ 2016-08-31 13:33 ` Arnd Bergmann
0 siblings, 0 replies; 38+ messages in thread
From: Arnd Bergmann @ 2016-08-31 13:33 UTC (permalink / raw)
To: linux-arm-kernel
On Wednesday, August 31, 2016 3:07:00 PM CEST Krzysztof Kozlowski wrote:
>
> Ok, sounds reasonable. I want to convert also older platforms S3C (drive
> strengths and pull up/down differ) and arm64 SoC: Exynos7. For the
> latter the problem is there is no common place for sharing DTS, except
> the headers. However this does not really belong to headers. I guess
> some level of duplication might be still exist.
We have stuff in the headers that belongs way less there, so I wouldn't
mind, but having a separate set of definitions for arm64 also isn't
a problem at all.
> > I think overall, a better solution would have been to define the
> > constants globally (shared with non-exynos) to start with,
> > and have the driver translate generic numbers into vendor
> > specific ones. Obviously it's too late for that now.
>
> We could extend driver by adding new bindings accepting generic numbers
> (and still backward compatible) but this looks like an overkill.
Agreed, that would only make things more confusing, not less.
Arnd
^ permalink raw reply [flat|nested] 38+ messages in thread
end of thread, other threads:[~2016-08-31 13:34 UTC | newest]
Thread overview: 38+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-31 12:13 [PATCH 0/9] ARM: dts: exynos: Use macros for GPIO to make it more readable Krzysztof Kozlowski
2016-08-31 12:13 ` Krzysztof Kozlowski
2016-08-31 12:13 ` Krzysztof Kozlowski
2016-08-31 12:13 ` [PATCH 1/9] ARM: dts: exynos: Add macros for GPIO configuration Krzysztof Kozlowski
2016-08-31 12:13 ` Krzysztof Kozlowski
2016-08-31 12:13 ` Krzysztof Kozlowski
2016-08-31 12:42 ` Arnd Bergmann
2016-08-31 12:42 ` Arnd Bergmann
2016-08-31 12:42 ` Arnd Bergmann
2016-08-31 12:53 ` Krzysztof Kozlowski
2016-08-31 12:53 ` Krzysztof Kozlowski
2016-08-31 12:58 ` Arnd Bergmann
2016-08-31 12:58 ` Arnd Bergmann
2016-08-31 12:58 ` Arnd Bergmann
2016-08-31 13:07 ` Krzysztof Kozlowski
2016-08-31 13:07 ` Krzysztof Kozlowski
2016-08-31 13:07 ` Krzysztof Kozlowski
2016-08-31 13:33 ` Arnd Bergmann
2016-08-31 13:33 ` Arnd Bergmann
2016-08-31 12:13 ` [PATCH 2/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos3250 Krzysztof Kozlowski
2016-08-31 12:13 ` Krzysztof Kozlowski
2016-08-31 12:13 ` [PATCH 3/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos4210 Krzysztof Kozlowski
2016-08-31 12:13 ` Krzysztof Kozlowski
2016-08-31 12:13 ` [PATCH 4/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos4415 Krzysztof Kozlowski
2016-08-31 12:13 ` Krzysztof Kozlowski
2016-08-31 12:13 ` [PATCH 5/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos4x12 Krzysztof Kozlowski
2016-08-31 12:13 ` Krzysztof Kozlowski
2016-08-31 12:13 ` [PATCH 6/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos5250 Krzysztof Kozlowski
2016-08-31 12:13 ` Krzysztof Kozlowski
2016-08-31 12:13 ` [PATCH 7/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos5260 Krzysztof Kozlowski
2016-08-31 12:13 ` Krzysztof Kozlowski
2016-08-31 12:13 ` [PATCH 8/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos5410 Krzysztof Kozlowski
2016-08-31 12:13 ` Krzysztof Kozlowski
2016-08-31 12:13 ` [PATCH 9/9] ARM: dts: exynos: Use macros for GPIO configuration on exynos542x/exynos5800 Krzysztof Kozlowski
2016-08-31 12:13 ` Krzysztof Kozlowski
2016-08-31 12:13 ` Krzysztof Kozlowski
2016-08-31 12:40 ` [PATCH 0/9] ARM: dts: exynos: Use macros for GPIO to make it more readable Javier Martinez Canillas
2016-08-31 12:40 ` Javier Martinez Canillas
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.