Commit 9f1bbcc4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.17-rockchip-dtsfixes2' of... 

Merge tag 'v6.17-rockchip-dtsfixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt

Another missing supply and a wrong headphone gpio level.

* tag 'v6.17-rockchip-dtsfixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: Fix the headphone detection on the orangepi 5
  arm64: dts: rockchip: Add vcc supply for SPI Flash on NanoPC-T6
  arm64: dts: rockchip: fix second M.2 slot on ROCK 5T
  arm64: dts: rockchip: fix USB on RADXA ROCK 5T
  arm64: dts: rockchip: Add vcc-supply to SPI flash on Pinephone Pro
  arm64: dts: rockchip: fix es8388 address on rk3588s-roc-pc
  arm64: dts: rockchip: Fix Bluetooth interrupts flag on Neardi LBA3368
  arm64: dts: rockchip: correct network description on Sige5
  arm64: dts: rockchip: Minor whitespace cleanup
  ARM: dts: rockchip: Minor whitespace cleanup
  arm64: dts: rockchip: Add supplies for eMMC on rk3588-orangepi-5
  arm64: dts: rockchip: Fix the headphone detection on the orangepi 5 plus
  arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3399-pinebook-pro
  arm64: dts: rockchip: mark eeprom as read-only for Radxa E52C
parents ec1ede18 0f860eef

arch/arm64/boot/dts/rockchip/rk3368-lba3368.dts

+1 −1
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ &uart0 { 


	bluetooth {

		compatible = "brcm,bcm4345c5";

		interrupts-extended = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>;

		interrupts-extended = <&gpio3 RK_PA7 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "host-wakeup";

		clocks = <&rk808 RK808_CLKOUT1>;

		clock-names = "lpo";

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

+1 −0
Original line number Diff line number Diff line
@@ -977,6 +977,7 @@ spiflash: flash@0 { 
		reg = <0>;

		m25p,fast-read;

		spi-max-frequency = <10000000>;

		vcc-supply = <&vcc_3v0>;

	};

};

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

+1 −0
Original line number Diff line number Diff line
@@ -772,6 +772,7 @@ flash@0 { 
		compatible = "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <10000000>;

		vcc-supply = <&vcc_1v8>;

	};

};

arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts

+1 −4
Original line number Diff line number Diff line
@@ -302,8 +302,7 @@ &gmac1 { 
		     &eth1m0_tx_bus2

		     &eth1m0_rx_bus2

		     &eth1m0_rgmii_clk

		     &eth1m0_rgmii_bus

		     &ethm0_clk1_25m_out>;

		     &eth1m0_rgmii_bus>;

	status = "okay";

};
@@ -784,7 +783,6 @@ &mdio0 { 
	rgmii_phy0: phy@1 {

		compatible = "ethernet-phy-ieee802.3-c22";

		reg = <0x1>;

		clocks = <&cru REFCLKO25M_GMAC0_OUT>;

		pinctrl-names = "default";

		pinctrl-0 = <&gmac0_rst>;

		reset-assert-us = <20000>;
@@ -797,7 +795,6 @@ &mdio1 { 
	rgmii_phy1: phy@1 {

		compatible = "ethernet-phy-ieee802.3-c22";

		reg = <0x1>;

		clocks = <&cru REFCLKO25M_GMAC1_OUT>;

		pinctrl-names = "default";

		pinctrl-0 = <&gmac1_rst>;

		reset-assert-us = <20000>;

arch/arm64/boot/dts/rockchip/rk3582-radxa-e52c.dts

+1 −0
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ eeprom@50 { 
		compatible = "belling,bl24c16a", "atmel,24c16";

		reg = <0x50>;

		pagesize = <16>;

		read-only;

		vcc-supply = <&vcc_3v3_pmu>;

	};

};