Commit d64420e8 authored by Heiko Stuebner's avatar Heiko Stuebner
Browse files

arm64: dts: rockchip: bulk convert gpios to their constant counterparts 



Rockchip SoCs use 2 different numbering schemes. Where the gpio-
controllers just count 0-31 for their 32 gpios, the underlying
iomux controller splits these into 4 separate entities A-D.

Device-schematics always use these iomux-values to identify pins,
so to make mapping schematics to devicetree easier Andy Yan introduced
named constants for the pins but so far we only used them on new
additions.

Using a sed-script created by Emil Renner Berthing bulk-convert
the remaining raw gpio numbers into their descriptive counterparts
and also gets rid of the unhelpful RK_FUNC_x -> x and RK_GPIOx -> x
mappings:

/rockchip,pins *=/bcheck
b # to end of script
:append-next-line
N
:check
/^[^;]*$/bappend-next-line
s/<RK_GPIO\([0-9]\) /<\1 /g
s/<\([^ ][^ ]*  *\)0 /<\1RK_PA0 /g
s/<\([^ ][^ ]*  *\)1 /<\1RK_PA1 /g
s/<\([^ ][^ ]*  *\)2 /<\1RK_PA2 /g
s/<\([^ ][^ ]*  *\)3 /<\1RK_PA3 /g
s/<\([^ ][^ ]*  *\)4 /<\1RK_PA4 /g
s/<\([^ ][^ ]*  *\)5 /<\1RK_PA5 /g
s/<\([^ ][^ ]*  *\)6 /<\1RK_PA6 /g
s/<\([^ ][^ ]*  *\)7 /<\1RK_PA7 /g
s/<\([^ ][^ ]*  *\)8 /<\1RK_PB0 /g
s/<\([^ ][^ ]*  *\)9 /<\1RK_PB1 /g
s/<\([^ ][^ ]*  *\)10 /<\1RK_PB2 /g
s/<\([^ ][^ ]*  *\)11 /<\1RK_PB3 /g
s/<\([^ ][^ ]*  *\)12 /<\1RK_PB4 /g
s/<\([^ ][^ ]*  *\)13 /<\1RK_PB5 /g
s/<\([^ ][^ ]*  *\)14 /<\1RK_PB6 /g
s/<\([^ ][^ ]*  *\)15 /<\1RK_PB7 /g
s/<\([^ ][^ ]*  *\)16 /<\1RK_PC0 /g
s/<\([^ ][^ ]*  *\)17 /<\1RK_PC1 /g
s/<\([^ ][^ ]*  *\)18 /<\1RK_PC2 /g
s/<\([^ ][^ ]*  *\)19 /<\1RK_PC3 /g
s/<\([^ ][^ ]*  *\)20 /<\1RK_PC4 /g
s/<\([^ ][^ ]*  *\)21 /<\1RK_PC5 /g
s/<\([^ ][^ ]*  *\)22 /<\1RK_PC6 /g
s/<\([^ ][^ ]*  *\)23 /<\1RK_PC7 /g
s/<\([^ ][^ ]*  *\)24 /<\1RK_PD0 /g
s/<\([^ ][^ ]*  *\)25 /<\1RK_PD1 /g
s/<\([^ ][^ ]*  *\)26 /<\1RK_PD2 /g
s/<\([^ ][^ ]*  *\)27 /<\1RK_PD3 /g
s/<\([^ ][^ ]*  *\)28 /<\1RK_PD4 /g
s/<\([^ ][^ ]*  *\)29 /<\1RK_PD5 /g
s/<\([^ ][^ ]*  *\)30 /<\1RK_PD6 /g
s/<\([^ ][^ ]*  *\)31 /<\1RK_PD7 /g
s/<\([^ ][^ ]*  *[^ ][^ ]*  *\)0 /<\1RK_FUNC_GPIO /g
s/<\([^ ][^ ]*  *[^ ][^ ]*  *\)RK_FUNC_\([1-9]\) /<\1\2 /g

Suggested-by: default avatarEmil Renner Berthing <esmil@mailme.dk>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Tested-by: default avatarKatsuhiro Suzuki <katsuhiro@katsuster.net>
Acked-by: default avatarRobin Murphy <robin.murphy@arm.com>
parent efd38668

arch/arm64/boot/dts/rockchip/px30-evb.dts

+2 −2
Original line number Diff line number Diff line
@@ -145,12 +145,12 @@ 


		soc_slppin_slp: soc_slppin_slp {

			rockchip,pins =

				<0 RK_PA4 RK_FUNC_1 &pcfg_pull_none>;

				<0 RK_PA4 1 &pcfg_pull_none>;

		};



		soc_slppin_rst: soc_slppin_rst {

			rockchip,pins =

				<0 RK_PA4 RK_FUNC_2 &pcfg_pull_none>;

				<0 RK_PA4 2 &pcfg_pull_none>;

		};

	};

arch/arm64/boot/dts/rockchip/rk3328-evb.dts

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ 
	sdio-pwrseq {

		wifi_enable_h: wifi-enable-h {

		rockchip,pins =

			<1 18 RK_FUNC_GPIO &pcfg_pull_none>;

			<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};

};

arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi

+17 −17
Original line number Diff line number Diff line
@@ -154,60 +154,60 @@ 


	backlight {

		bl_en: bl-en {

			rockchip,pins = <0 20 RK_FUNC_GPIO &pcfg_pull_none>;

			rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	emmc {

		emmc_bus8: emmc-bus8 {

			rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,

					<1 19 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,

					<1 20 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,

					<1 21 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,

					<1 22 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,

					<1 23 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,

					<1 24 RK_FUNC_2 &pcfg_pull_up_drv_8ma>,

					<1 25 RK_FUNC_2 &pcfg_pull_up_drv_8ma>;

			rockchip,pins = <1 RK_PC2 2 &pcfg_pull_up_drv_8ma>,

					<1 RK_PC3 2 &pcfg_pull_up_drv_8ma>,

					<1 RK_PC4 2 &pcfg_pull_up_drv_8ma>,

					<1 RK_PC5 2 &pcfg_pull_up_drv_8ma>,

					<1 RK_PC6 2 &pcfg_pull_up_drv_8ma>,

					<1 RK_PC7 2 &pcfg_pull_up_drv_8ma>,

					<1 RK_PD0 2 &pcfg_pull_up_drv_8ma>,

					<1 RK_PD1 2 &pcfg_pull_up_drv_8ma>;

		};



		emmc-clk {

			rockchip,pins = <2 4 RK_FUNC_2 &pcfg_pull_none_drv_8ma>;

			rockchip,pins = <2 RK_PA4 2 &pcfg_pull_none_drv_8ma>;

		};



		emmc-cmd {

			rockchip,pins = <1 26 RK_FUNC_2 &pcfg_pull_up_drv_8ma>;

			rockchip,pins = <1 RK_PD2 2 &pcfg_pull_up_drv_8ma>;

		};



		emmc_reset: emmc-reset {

			rockchip,pins = <2 3 RK_FUNC_GPIO &pcfg_pull_none>;

			rockchip,pins = <2 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	keys {

		pwr_key: pwr-key {

			rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_up>;

			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;

		};

	};



	pmic {

		pmic_int: pmic-int {

			rockchip,pins = <0 1 RK_FUNC_GPIO &pcfg_pull_up>;

			rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;

		};

	};



	sdio {

		wifi_reg_on: wifi-reg-on {

			rockchip,pins = <3 4 RK_FUNC_GPIO &pcfg_pull_none>;

			rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;

		};



		bt_rst: bt-rst {

			rockchip,pins = <3 5 RK_FUNC_GPIO &pcfg_pull_none>;

			rockchip,pins = <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	usb {

		host_vbus_drv: host-vbus-drv {

			rockchip,pins = <0 4 RK_FUNC_GPIO &pcfg_pull_none>;

			rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};

};

arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts

+4 −4
Original line number Diff line number Diff line
@@ -233,23 +233,23 @@ 
&pinctrl {

	ir {

		ir_int: ir-int {

			rockchip,pins = <3 30 RK_FUNC_GPIO &pcfg_pull_none>;

			rockchip,pins = <3 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	keys {

		pwr_key: pwr-key {

			rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_none>;

			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	pmic {

		pmic_sleep: pmic-sleep {

			rockchip,pins = <0 0 RK_FUNC_2 &pcfg_pull_none>;

			rockchip,pins = <0 RK_PA0 2 &pcfg_pull_none>;

		};



		pmic_int: pmic-int {

			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;

			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;

		};

	};

};

arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts

+7 −7
Original line number Diff line number Diff line
@@ -113,34 +113,34 @@ 
		haikou_pin_hog: haikou-pin-hog {

			rockchip,pins =

				/* LID_BTN */

				<RK_GPIO3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>,

				<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>,

				/* BATLOW# */

				<RK_GPIO0 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>,

				<0 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>,

				/* SLP_BTN# */

				<RK_GPIO3 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>,

				<3 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>,

				/* BIOS_DISABLE# */

				<RK_GPIO3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;

				<3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;

		};

	};



	leds {

		led_sd_haikou: led-sd-gpio {

			rockchip,pins =

				<RK_GPIO0 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;

				<0 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	sdmmc {

		sdmmc_cd_gpio: sdmmc-cd-gpio {

			rockchip,pins =

				<RK_GPIO2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;

				<2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	usb_otg {

		otg_vbus_drv: otg-vbus-drv {

			rockchip,pins =

				<RK_GPIO0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;

				<0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE