Commit f2d514b4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Wrong irq number on px30 and cleanups of stuff on rk3399 regarding
wrongly used dt properties and parts that shouldn't be enabled.

* tag 'v5.11-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: Disable display for NanoPi R2S
  arm64: dts: rockchip: remove interrupt-names property from rk3399 vdec node
  arm64: dts: rockchip: Fix PCIe DT properties on rk3399
  arm64: dts: rockchip: Use only supported PCIe link speed on Pinebook Pro
  arm64: dts: rockchip: fix vopl iommu irq on px30

Link: https://lore.kernel.org/r/5429065.DvuYhMxLoT@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2a3e487a 74532de4

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

+1 −1
Original line number Diff line number Diff line
@@ -1097,7 +1097,7 @@ 
	vopl_mmu: iommu@ff470f00 {

		compatible = "rockchip,iommu";

		reg = <0x0 0xff470f00 0x0 0x100>;

		interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "vopl_mmu";

		clocks = <&cru ACLK_VOPL>, <&cru HCLK_VOPL>;

		clock-names = "aclk", "iface";

arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts

+4 −0
Original line number Diff line number Diff line
@@ -114,6 +114,10 @@ 
	cpu-supply = <&vdd_arm>;

};



&display_subsystem {

	status = "disabled";

};



&gmac2io {

	assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;

	assigned-clock-parents = <&gmac_clk>, <&gmac_clk>;

arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts

+0 −1
Original line number Diff line number Diff line
@@ -790,7 +790,6 @@ 
&pcie0 {

	bus-scan-delay-ms = <1000>;

	ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;

	max-link-speed = <2>;

	num-lanes = <4>;

	pinctrl-names = "default";

	pinctrl-0 = <&pcie_clkreqn_cpm>;

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

+1 −2
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ 
		reg = <0x0 0xf8000000 0x0 0x2000000>,

		      <0x0 0xfd000000 0x0 0x1000000>;

		reg-names = "axi-base", "apb-base";

		device_type = "pci";

		#address-cells = <3>;

		#size-cells = <2>;

		#interrupt-cells = <1>;
@@ -252,7 +253,6 @@ 
				<0 0 0 2 &pcie0_intc 1>,

				<0 0 0 3 &pcie0_intc 2>,

				<0 0 0 4 &pcie0_intc 3>;

		linux,pci-domain = <0>;

		max-link-speed = <1>;

		msi-map = <0x0 &its 0x0 0x1000>;

		phys = <&pcie_phy 0>, <&pcie_phy 1>,
@@ -1278,7 +1278,6 @@ 
		compatible = "rockchip,rk3399-vdec";

		reg = <0x0 0xff660000 0x0 0x400>;

		interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH 0>;

		interrupt-names = "vdpu";

		clocks = <&cru ACLK_VDU>, <&cru HCLK_VDU>,

			 <&cru SCLK_VDU_CA>, <&cru SCLK_VDU_CORE>;

		clock-names = "axi", "ahb", "cabac", "core";