Unverified Commit fec3103b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.16-rockchip-dtsfixes1' of... 

Merge tag 'v6.16-rockchip-dtsfixes1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes

Switch to the gpio variant for spi-cs and mmc-detect for some boards
as the in-controller functionality does not work as intended for them.
HDMI drive strength adjustment for better ddc communication and some
missing supplies.

* tag 'v6.16-rockchip-dtsfixes1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: Add missing fan-supply to rk3566-quartz64-a
  arm64: dts: rockchip: use cs-gpios for spi1 on ringneck
  arm64: dts: rockchip: list all CPU supplies on ArmSoM Sige5
  arm64: dts: rockchip: Add cd-gpios for sdcard detect on Cool Pi 4B
  arm64: dts: rockchip: Add cd-gpios for sdcard detect on Cool Pi CM5
  arm64: dts: rockchip: Adjust the HDMI DDC IO driver strength for rk3588
  arm64: dts: rockchip: fix rk3576 pcie1 linux,pci-domain

Link: https://lore.kernel.org/r/5108768.AiC22s8V5E@diego


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1e7c8c54 9037532a

arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi

+23 −0
Original line number Diff line number Diff line
@@ -379,6 +379,18 @@ pmic_int: pmic-int { 
				<0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up>;

		};

	};



	spi1 {

		spi1_csn0_gpio_pin: spi1-csn0-gpio-pin {

			rockchip,pins =

				<3 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up_4ma>;

		};



		spi1_csn1_gpio_pin: spi1-csn1-gpio-pin {

			rockchip,pins =

				<3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up_4ma>;

		};

	};

};



&pmu_io_domains {
@@ -396,6 +408,17 @@ &sdmmc { 
	vqmmc-supply = <&vccio_sd>;

};



&spi1 {

	/*

	 * Hardware CS has a very slow rise time of about 6us,

	 * causing transmission errors.

	 * With cs-gpios we have a rise time of about 20ns.

	 */

	cs-gpios = <&gpio3 RK_PB1 GPIO_ACTIVE_LOW>, <&gpio3 RK_PB2 GPIO_ACTIVE_LOW>;

	pinctrl-names = "default";

	pinctrl-0 = <&spi1_clk &spi1_csn0_gpio_pin &spi1_csn1_gpio_pin &spi1_miso &spi1_mosi>;

};



&tsadc {

	status = "okay";

};

arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ gmac1_clkin: external-gmac1-clock { 


	fan: gpio_fan {

		compatible = "gpio-fan";

		fan-supply = <&vcc12v_dcin>;

		gpios = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;

		gpio-fan,speed-map =

				<   0 0>,

arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts

+28 −0
Original line number Diff line number Diff line
@@ -211,10 +211,38 @@ &combphy0_ps { 
	status = "okay";

};



&cpu_b0 {

	cpu-supply = <&vdd_cpu_big_s0>;

};



&cpu_b1 {

	cpu-supply = <&vdd_cpu_big_s0>;

};



&cpu_b2 {

	cpu-supply = <&vdd_cpu_big_s0>;

};



&cpu_b3 {

	cpu-supply = <&vdd_cpu_big_s0>;

};



&cpu_l0 {

	cpu-supply = <&vdd_cpu_lit_s0>;

};



&cpu_l1 {

	cpu-supply = <&vdd_cpu_lit_s0>;

};



&cpu_l2 {

	cpu-supply = <&vdd_cpu_lit_s0>;

};



&cpu_l3 {

	cpu-supply = <&vdd_cpu_lit_s0>;

};



&gmac0 {

	phy-mode = "rgmii-id";

	clock_in_out = "output";

arch/arm64/boot/dts/rockchip/rk3576.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ pcie1: pcie@22400000 { 
					<0 0 0 2 &pcie1_intc 1>,

					<0 0 0 3 &pcie1_intc 2>,

					<0 0 0 4 &pcie1_intc 3>;

			linux,pci-domain = <0>;

			linux,pci-domain = <1>;

			max-link-speed = <2>;

			num-ib-windows = <8>;

			num-viewport = <8>;

arch/arm64/boot/dts/rockchip/rk3588-base-pinctrl.dtsi

+10 −10
Original line number Diff line number Diff line
@@ -578,14 +578,14 @@ hdmim0_tx0_hpd: hdmim0-tx0-hpd { 
		hdmim0_tx0_scl: hdmim0-tx0-scl {

			rockchip,pins =

				/* hdmim0_tx0_scl */

				<4 RK_PB7 5 &pcfg_pull_none>;

				<4 RK_PB7 5 &pcfg_pull_none_drv_level_5_smt>;

		};



		/omit-if-no-ref/

		hdmim0_tx0_sda: hdmim0-tx0-sda {

			rockchip,pins =

				/* hdmim0_tx0_sda */

				<4 RK_PC0 5 &pcfg_pull_none>;

				<4 RK_PC0 5 &pcfg_pull_none_drv_level_1_smt>;

		};



		/omit-if-no-ref/
@@ -640,14 +640,14 @@ hdmim1_tx0_hpd: hdmim1-tx0-hpd { 
		hdmim1_tx0_scl: hdmim1-tx0-scl {

			rockchip,pins =

				/* hdmim1_tx0_scl */

				<0 RK_PD5 11 &pcfg_pull_none>;

				<0 RK_PD5 11 &pcfg_pull_none_drv_level_5_smt>;

		};



		/omit-if-no-ref/

		hdmim1_tx0_sda: hdmim1-tx0-sda {

			rockchip,pins =

				/* hdmim1_tx0_sda */

				<0 RK_PD4 11 &pcfg_pull_none>;

				<0 RK_PD4 11 &pcfg_pull_none_drv_level_1_smt>;

		};



		/omit-if-no-ref/
@@ -668,14 +668,14 @@ hdmim1_tx1_hpd: hdmim1-tx1-hpd { 
		hdmim1_tx1_scl: hdmim1-tx1-scl {

			rockchip,pins =

				/* hdmim1_tx1_scl */

				<3 RK_PC6 5 &pcfg_pull_none>;

				<3 RK_PC6 5 &pcfg_pull_none_drv_level_5_smt>;

		};



		/omit-if-no-ref/

		hdmim1_tx1_sda: hdmim1-tx1-sda {

			rockchip,pins =

				/* hdmim1_tx1_sda */

				<3 RK_PC5 5 &pcfg_pull_none>;

				<3 RK_PC5 5 &pcfg_pull_none_drv_level_1_smt>;

		};

		/omit-if-no-ref/

		hdmim2_rx_cec: hdmim2-rx-cec {
@@ -709,14 +709,14 @@ hdmim2_rx_sda: hdmim2-rx-sda { 
		hdmim2_tx0_scl: hdmim2-tx0-scl {

			rockchip,pins =

				/* hdmim2_tx0_scl */

				<3 RK_PC7 5 &pcfg_pull_none>;

				<3 RK_PC7 5 &pcfg_pull_none_drv_level_5_smt>;

		};



		/omit-if-no-ref/

		hdmim2_tx0_sda: hdmim2-tx0-sda {

			rockchip,pins =

				/* hdmim2_tx0_sda */

				<3 RK_PD0 5 &pcfg_pull_none>;

				<3 RK_PD0 5 &pcfg_pull_none_drv_level_1_smt>;

		};



		/omit-if-no-ref/
@@ -730,14 +730,14 @@ hdmim2_tx1_cec: hdmim2-tx1-cec { 
		hdmim2_tx1_scl: hdmim2-tx1-scl {

			rockchip,pins =

				/* hdmim2_tx1_scl */

				<1 RK_PA4 5 &pcfg_pull_none>;

				<1 RK_PA4 5 &pcfg_pull_none_drv_level_5_smt>;

		};



		/omit-if-no-ref/

		hdmim2_tx1_sda: hdmim2-tx1-sda {

			rockchip,pins =

				/* hdmim2_tx1_sda */

				<1 RK_PA3 5 &pcfg_pull_none>;

				<1 RK_PA3 5 &pcfg_pull_none_drv_level_1_smt>;

		};



		/omit-if-no-ref/