Unverified Commit 795a2ab1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.17-rockchip-dtsfixes1' of... 

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

Fix the display-port-sound on Gru devices, DDR voltage on the Quartz-A
board, fix emmc signal-integrity and usb OTG mode on rk3399-puma as well
as a number of dtschema fixes to make the reduce the number of errors.

* tag 'v5.17-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: fix a typo on rk3288 crypto-controller
  ARM: dts: rockchip: reorder rk322x hmdi clocks
  arm64: dts: rockchip: reorder rk3399 hdmi clocks
  arm64: dts: rockchip: align pl330 node name with dtschema
  arm64: dts: rockchip: fix rk3399-puma eMMC HS400 signal integrity
  arm64: dts: rockchip: fix Quartz64-A ddr regulator voltage
  arm64: dts: rockchip: Switch RK3399-Gru DP to SPDIF output
  arm64: dts: rockchip: fix rk3399-puma-haikou USB OTG mode
  arm64: dts: rockchip: drop pclk_xpcs from gmac0 on rk3568
  arm64: dts: rockchip: fix dma-controller node names on rk356x

Link: https://lore.kernel.org/r/1973741.CViHJPHrxy@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 98e437f1 3916c361

arch/arm/boot/dts/rk322x.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -718,8 +718,8 @@ 
		interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;

		assigned-clocks = <&cru SCLK_HDMI_PHY>;

		assigned-clock-parents = <&hdmi_phy>;

		clocks = <&cru SCLK_HDMI_HDCP>, <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_CEC>;

		clock-names = "isfr", "iahb", "cec";

		clocks = <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>, <&cru SCLK_HDMI_CEC>;

		clock-names = "iahb", "isfr", "cec";

		pinctrl-names = "default";

		pinctrl-0 = <&hdmii2c_xfer &hdmi_hpd &hdmi_cec>;

		resets = <&cru SRST_HDMI_P>;

arch/arm/boot/dts/rk3288.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -971,7 +971,7 @@ 
		status = "disabled";

	};



	crypto: cypto-controller@ff8a0000 {

	crypto: crypto@ff8a0000 {

		compatible = "rockchip,rk3288-crypto";

		reg = <0x0 0xff8a0000 0x0 0x4000>;

		interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;

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

+1 −1
Original line number Diff line number Diff line
@@ -711,7 +711,7 @@ 
		clock-names = "pclk", "timer";

	};



	dmac: dmac@ff240000 {

	dmac: dma-controller@ff240000 {

		compatible = "arm,pl330", "arm,primecell";

		reg = <0x0 0xff240000 0x0 0x4000>;

		interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,

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

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ 
		status = "disabled";

	};



	dmac: dmac@ff1f0000 {

	dmac: dma-controller@ff1f0000 {

		compatible = "arm,pl330", "arm,primecell";

		reg = <0x0 0xff1f0000 0x0 0x4000>;

		interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,

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

+12 −5
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ 


	sound: sound {

		compatible = "rockchip,rk3399-gru-sound";

		rockchip,cpu = <&i2s0 &i2s2>;

		rockchip,cpu = <&i2s0 &spdif>;

	};

};
@@ -437,10 +437,6 @@ ap_i2c_audio: &i2c8 { 
	status = "okay";

};



&i2s2 {

	status = "okay";

};



&io_domains {

	status = "okay";
@@ -537,6 +533,17 @@ ap_i2c_audio: &i2c8 { 
	vqmmc-supply = <&ppvar_sd_card_io>;

};



&spdif {

	status = "okay";



	/*

	 * SPDIF is routed internally to DP; we either don't use these pins, or

	 * mux them to something else.

	 */

	/delete-property/ pinctrl-0;

	/delete-property/ pinctrl-names;

};



&spi1 {

	status = "okay";