Unverified Commit 4ead53ba authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

In terms of bigger fixes, RK3576 GPU register range was overflowing into
the next peripheral, Nano Pi M5 sound was not working correctly, the
adc-keys voltage levels for 2 buttons on the Pinephone Pro were wrong
and a really wrong PCIe linkspeed was removed from helios64.

Apart from that there are a number of dt-cleanlieness fixes.

* tag 'v6.19-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  arm64: dts: rockchip: Drop unsupported properties
  arm64: dts: rockchip: Fix gpio pinctrl node names
  arm64: dts: rockchip: Fix pinctrl property typo on rk3326-odroid-go3
  arm64: dts: rockchip: Drop "sitronix,st7789v" fallback compatible from rk3568-wolfvision
  arm64: dts: rockchip: Fix wrong register range of rk3576 gpu
  arm64: dts: rockchip: Configure MCLK for analog sound on NanoPi M5
  arm64: dts: rockchip: Fix headphones widget name on NanoPi M5
  arm64: dts: rockchip: remove redundant max-link-speed from nanopi-r4s
  arm64: dts: rockchip: remove dangerous max-link-speed from helios64
  arm64: dts: rockchip: fix unit-address for RK3588 NPU's core1 and core2's IOMMU
  arm64: dts: rockchip: Fix wifi interrupts flag on Sakura Pi RK3308B
  arm64: dts: rockchip: Fix voltage threshold for volume keys for Pinephone Pro

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1902e2ea 56e7cc8d

arch/arm64/boot/dts/rockchip/rk3308-sakurapi-rk3308b.dts

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ brcmf: wifi@1 { 
		compatible = "brcm,bcm43455-fmac", "brcm,bcm4329-fmac";

		reg = <1>;

		interrupt-parent = <&gpio0>;

		interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;

		interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "host-wake";

		pinctrl-names = "default";

		pinctrl-0 = <&wifi_host_wake>;

arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ / { 


	joystick_mux_controller: mux-controller {

		compatible = "gpio-mux";

		pinctrl = <&mux_en_pins>;

		pinctrl-0 = <&mux_en_pins>;

		pinctrl-names = "default";

		#mux-control-cells = <0>;



		mux-gpios = <&gpio3 RK_PB3 GPIO_ACTIVE_LOW>,

arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts

+0 −2
Original line number Diff line number Diff line
@@ -424,9 +424,7 @@ &pcie_phy { 


&pcie0 {

	ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;

	max-link-speed = <2>;

	num-lanes = <2>;

	pinctrl-names = "default";

	status = "okay";



	vpcie12v-supply = <&vcc12v_dcin>;

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

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ &i2c4 { 
};



&pcie0 {

	max-link-speed = <1>;

	num-lanes = <1>;

	vpcie3v3-supply = <&vcc3v3_sys>;

};

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

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



&spi1 {

	max-freq = <10000000>;

	status = "okay";



	spiflash: flash@0 {