Merge tag 'v5.7-rockchip-dtsfixes1' of... (3b3e88e0) · Commits · 戴 / test

Merge tag 'v5.7-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes Some fixes for the newly added Pinebook Pro and other fixes to make dtc and the new dtscheck against yaml bindings happy. * tag 'v5.7-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: fix pinctrl sub nodename for spi in rk322x.dtsi arm64: dts: rockchip: Fix Pinebook Pro FUSB302 interrupt ARM: dts: rockchip: swap clock-names of gpu nodes arm64: dts: rockchip: swap interrupts interrupt-names rk3399 gpu node arm64: dts: rockchip: fix status for &gmac2phy in rk3328-evb.dts arm64: dts: rockchip: remove extra assigned-clocks property from &gmac2phy node in rk3328-evb.dts ARM: dts: rockchip: fix phy nodename for rk3229-xms6 ARM: dts: rockchip: fix phy nodename for rk3228-evb arm64: dts: rockchip: Rename dwc3 device nodes on rk3399 to make dtc happy arm64: dts: rockchip: drop #address-cells, #size-cells from rk3399 pmugrf node arm64: dts: rockchip: drop #address-cells, #size-cells from rk3328 grf node arm64: dts: rockchip: drop non-existent gmac2phy pinmux options from rk3328 arm64: dts: rockchip: Replace RK805 PMIC node name with "pmic" on rk3328 boards arm64: dts: rockchip: enable DC charger detection pullup on Pinebook Pro arm64: dts: rockchip: fix inverted headphone detection on Pinebook Pro arm64: dts: rockchip: Correct PMU compatibles for PX30 and RK3308 Link: https://lore.kernel.org/r/1738941.6LdaBJIBqS@phil Signed-off-by:

Arnd Bergmann <arnd@arndb.de>

arch/arm/boot/dts/rk3036.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -128,7 +128,7 @@
		assigned-clocks = <&cru SCLK_GPU>;
		assigned-clock-rates = <100000000>;
		clocks = <&cru SCLK_GPU>, <&cru SCLK_GPU>;
		clock-names = "core", "bus";
		clock-names = "bus", "core";
		resets = <&cru SRST_GPU>;
		status = "disabled";
		};

arch/arm/boot/dts/rk3228-evb.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@
		#address-cells = <1>;
		#size-cells = <0>;

		phy: phy@0 {
		phy: ethernet-phy@0 {
		compatible = "ethernet-phy-id1234.d400", "ethernet-phy-ieee802.3-c22";
		reg = <0>;
		clocks = <&cru SCLK_MAC_PHY>;

arch/arm/boot/dts/rk3229-xms6.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -150,7 +150,7 @@
		#address-cells = <1>;
		#size-cells = <0>;

		phy: phy@0 {
		phy: ethernet-phy@0 {
		compatible = "ethernet-phy-id1234.d400",
		"ethernet-phy-ieee802.3-c22";
		reg = <0>;

arch/arm/boot/dts/rk322x.dtsi

+3 −3

Original line number	Diff line number	Diff line
		@@ -555,7 +555,7 @@
		"pp1",
		"ppmmu1";
		clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>;
		clock-names = "core", "bus";
		clock-names = "bus", "core";
		resets = <&cru SRST_GPU_A>;
		status = "disabled";
		};
		@@ -1020,7 +1020,7 @@
		};
		};

		spi-0 {
		spi0 {
		spi0_clk: spi0-clk {
		rockchip,pins = <0 RK_PB1 2 &pcfg_pull_up>;
		};
		@@ -1038,7 +1038,7 @@
		};
		};

		spi-1 {
		spi1 {
		spi1_clk: spi1-clk {
		rockchip,pins = <0 RK_PC7 2 &pcfg_pull_up>;
		};

arch/arm/boot/dts/rk3xxx.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@
		compatible = "arm,mali-400";
		reg = <0x10090000 0x10000>;
		clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>;
		clock-names = "core", "bus";
		clock-names = "bus", "core";
		assigned-clocks = <&cru ACLK_GPU>;
		assigned-clock-rates = <100000000>;
		resets = <&cru SRST_GPU>;

Admin message