Unverified Commit 484aeb09 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.14-rockchip-dtsfixes2' of... 

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

A number of emmc fixes (removing CQE from Theobroma boards and slower
freq on Rock-5-ITX) as well as some pinmux fixes and missing supplies.

* tag 'v6.14-rockchip-dtsfixes2' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: slow down emmc freq for rock 5 itx
  arm64: dts: rockchip: Add missing PCIe supplies to RockPro64 board dtsi
  arm64: dts: rockchip: Add avdd HDMI supplies to RockPro64 board dtsi
  arm64: dts: rockchip: Remove undocumented sdmmc property from lubancat-1
  arm64: dts: rockchip: fix pinmux of UART5 for PX30 Ringneck on Haikou
  arm64: dts: rockchip: fix pinmux of UART0 for PX30 Ringneck on Haikou
  arm64: dts: rockchip: fix u2phy1_host status for NanoPi R4S
  arm64: dts: rockchip: remove supports-cqe from rk3588 tiger
  arm64: dts: rockchip: remove supports-cqe from rk3588 jaguar

Link: https://lore.kernel.org/r/1990830.tdWV9SEqCh@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0bf88b16 b36402e4

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

+12 −0
Original line number Diff line number Diff line
@@ -194,6 +194,13 @@ sd_card_led_pin: sd-card-led-pin { 
			  <3 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};



	uart {

		uart5_rts_pin: uart5-rts-pin {

			rockchip,pins =

			  <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;

		};

	};

};



&pwm0 {
@@ -222,10 +229,15 @@ &u2phy_otg { 
};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_xfer>;

	status = "okay";

};



&uart5 {

	/* Add pinmux for rts-gpios (uart5_rts_pin) */

	pinctrl-names = "default";

	pinctrl-0 = <&uart5_xfer &uart5_rts_pin>;

	rts-gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;

	status = "okay";

};

arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ &u2phy0_host { 
};



&u2phy1_host {

	status = "disabled";

	phy-supply = <&vdd_5v>;

};



&uart0 {

arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -227,6 +227,16 @@ vcc5v0_usb: regulator-vcc5v0-usb { 
		vin-supply = <&vcc12v_dcin>;

	};



	vcca_0v9: regulator-vcca-0v9 {

		compatible = "regulator-fixed";

		regulator-name = "vcca_0v9";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <900000>;

		regulator-max-microvolt = <900000>;

		vin-supply = <&vcc3v3_sys>;

	};



	vdd_log: regulator-vdd-log {

		compatible = "pwm-regulator";

		pwms = <&pwm2 0 25000 1>;
@@ -312,6 +322,8 @@ &gmac { 
};



&hdmi {

	avdd-0v9-supply = <&vcca_0v9>;

	avdd-1v8-supply = <&vcc1v8_dvp>;

	ddc-i2c-bus = <&i2c3>;

	pinctrl-names = "default";

	pinctrl-0 = <&hdmi_cec>;
@@ -661,6 +673,8 @@ &pcie0 { 
	num-lanes = <4>;

	pinctrl-names = "default";

	pinctrl-0 = <&pcie_perst>;

	vpcie0v9-supply = <&vcca_0v9>;

	vpcie1v8-supply = <&vcca_1v8>;

	vpcie12v-supply = <&vcc12v_dcin>;

	vpcie3v3-supply = <&vcc3v3_pcie>;

	status = "okay";

arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts

+0 −1
Original line number Diff line number Diff line
@@ -512,7 +512,6 @@ &sdhci { 


&sdmmc0 {

	max-frequency = <150000000>;

	supports-sd;

	bus-width = <4>;

	cap-mmc-highspeed;

	cap-sd-highspeed;

arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts

+0 −1
Original line number Diff line number Diff line
@@ -503,7 +503,6 @@ &sdhci { 
	non-removable;

	pinctrl-names = "default";

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

	supports-cqe;

	vmmc-supply = <&vcc_3v3_s3>;

	vqmmc-supply = <&vcc_1v8_s3>;

	status = "okay";