Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17dcc16f authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

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



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: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent bad96a01

arch/arm/boot/dts/exynos5410-odroidxu.dts

+15 −15
Original line number Diff line number Diff line
@@ -476,38 +476,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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_OUTPUT>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_OUTPUT>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_OUTPUT>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_F>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;

	};

};

arch/arm/boot/dts/exynos5410-pinctrl.dtsi

+90 −90
Original line number Diff line number Diff line
@@ -282,212 +282,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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_4>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_3>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV4>;

	};

};

arch/arm/boot/dts/exynos5410-smdk5410.dts

+5 −5
Original line number Diff line number Diff line
@@ -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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-drv = <EXYNOS5420_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 = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;

		samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;

	};

};