Unverified Commit fd1e5745 authored Dec 08, 2023 by Arnd Bergmann

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

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

Devicetree fixes for the 6.7-cycle.

All over the place this time. From adapting the size of the vdec nodes
on rk3328 and rk3399, fixing some wrong pinctrl settings on rk3128 and
the Turing RK1 board, emmc-settings fixes on rk3588 and interrupt-name
mishaps, down to some dt-cleanups.

Also this adds the missing rockchip,rk3588-pmugrf compatible to the soc
grf binding, that I somehow messed up during the pull requests for the
-rc1 . At least with it included the dt-checker is happier.

* tag 'v6.7-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: Fix eMMC Data Strobe PD on rk3588
  arm64: dts: rockchip: Fix PCI node addresses on rk3399-gru
  arm64: dts: rockchip: drop interrupt-names property from rk3588s dfi
  arm64: dts: rockchip: Fix Turing RK1 interrupt pinctrls
  ARM: dts: rockchip: Fix sdmmc_pwren's pinmux setting for RK3128
  arm64: dts: rockchip: minor whitespace cleanup around '='
  ARM: dts: rockchip: minor whitespace cleanup around '='
  dt-bindings: soc: rockchip: grf: add rockchip,rk3588-pmugrf
  arm64: dts: rockchip: fix rk356x pcie msg interrupt name
  arm64: dts: rockchip: Expand reg size of vdec node for RK3399
  arm64: dts: rockchip: Expand reg size of vdec node for RK3328

Link: https://lore.kernel.org/r/2709704.mvXUDI8C0e@phil


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 7c9bb190 37f3d610

Documentation/devicetree/bindings/soc/rockchip/grf.yaml

+1 −0

Original line number	Diff line number	Diff line
		@@ -233,6 +233,7 @@ allOf:
		- rockchip,rk3399-grf
		- rockchip,rk3399-pmugrf
		- rockchip,rk3568-pmugrf
		- rockchip,rk3588-pmugrf
		- rockchip,rv1108-grf
		- rockchip,rv1108-pmugrf

arch/arm/boot/dts/rockchip/rk3128.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -848,7 +848,7 @@ sdmmc_wp: sdmmc-wp {
		};

		sdmmc_pwren: sdmmc-pwren {
		rockchip,pins = <1 RK_PB6 1 &pcfg_pull_default>;
		rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_default>;
		};

		sdmmc_bus4: sdmmc-bus4 {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -668,7 +668,7 @@ vpu_mmu: iommu@ff350800 {

		vdec: video-codec@ff360000 {
		compatible = "rockchip,rk3328-vdec", "rockchip,rk3399-vdec";
		reg = <0x0 0xff360000 0x0 0x400>;
		reg = <0x0 0xff360000 0x0 0x480>;
		interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
		clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>,
		<&cru SCLK_VDEC_CABAC>, <&cru SCLK_VDEC_CORE>;

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -509,8 +509,7 @@ wacky_spi_audio: spi2@0 {
		&pci_rootport {
		mvl_wifi: wifi@0,0 {
		compatible = "pci1b4b,2b42";
		reg = <0x83010000 0x0 0x00000000 0x0 0x00100000
		0x83010000 0x0 0x00100000 0x0 0x00100000>;
		reg = <0x0000 0x0 0x0 0x0 0x0>;
		interrupt-parent = <&gpio0>;
		interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
		pinctrl-names = "default";

arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -34,8 +34,8 @@ &mipi_panel {
		&pci_rootport {
		wifi@0,0 {
		compatible = "qcom,ath10k";
		reg = <0x00010000 0x0 0x00000000 0x0 0x00000000>,
		<0x03010010 0x0 0x00000000 0x0 0x00200000>;
		reg = <0x00000000 0x0 0x00000000 0x0 0x00000000>,
		<0x03000010 0x0 0x00000000 0x0 0x00200000>;
		qcom,ath10k-calibration-variant = "GO_DUMO";
		};
		};