Commit b726e211 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v5.2-rockchip-dts64-2' of... 

Merge tag 'v5.2-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

Bulk conversion of remaining gpios to the helper constants, new peripherals
for the rk3328-roc-cc and some minor fixes for rk3399 and rockpro64.

* tag 'v5.2-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  arm64: dts: rockchip: fix IO domain voltage setting of APIO5 on rockpro64
  arm64: dts: rockchip: fix cts, rts pin assign of UART3 for rk3399
  arm64: dts: rockchip: bulk convert gpios to their constant counterparts
  arm64: dts: rockchip: enable display nodes on rk3328-roc-cc
  arm64: dts: rockchip: eMMC additions for rk3328-roc-cc

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents bcb84a10 798689e4

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/rk3328-roc-cc.dts

+21 −0
Original line number Diff line number Diff line
@@ -122,9 +122,14 @@ 
&emmc {

	bus-width = <8>;

	cap-mmc-highspeed;

	max-frequency = <150000000>;

	mmc-ddr-1_8v;

	mmc-hs200-1_8v;

	non-removable;

	pinctrl-names = "default";

	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;

	vmmc-supply = <&vcc_io>;

	vqmmc-supply = <&vcc18_emmc>;

	status = "okay";

};
@@ -145,6 +150,14 @@ 
	status = "okay";

};



&hdmi {

	status = "okay";

};



&hdmiphy {

	status = "okay";

};



&i2c1 {

	status = "okay";
@@ -328,3 +341,11 @@ 
&usb_host0_ohci {

	status = "okay";

};



&vop {

	status = "okay";

};



&vop_mmu {

	status = "okay";

};

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>;

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE