Unverified Commit 32a1eaa9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'v6.9-armsoc/dtsfixes' of... 

Merge branch 'v6.9-armsoc/dtsfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into for-next

* 'v6.9-armsoc/dtsfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: Fix USB interface compatible string on kobol-helios64
  arm64: dts: rockchip: regulator for sd needs to be always on for BPI-R2Pro
  dt-bindings: rockchip: grf: Add missing type to 'pcie-phy' node
  arm64: dts: rockchip: drop redundant disable-gpios in Lubancat 2
  arm64: dts: rockchip: drop redundant disable-gpios in Lubancat 1
  arm64: dts: rockchip: drop redundant pcie-reset-suspend in Scarlet Dumo
  arm64: dts: rockchip: mark system power controller and fix typo on orangepi-5-plus
  arm64: dts: rockchip: Designate the system power controller on QuartzPro64
  arm64: dts: rockchip: drop panel port unit address in GRU Scarlet
  arm64: dts: rockchip: Remove unsupported node from the Pinebook Pro dts
  arm64: dts: rockchip: Fix the i2c address of es8316 on Cool Pi CM5
  arm64: dts: rockchip: add regulators for PCIe on RK3399 Puma Haikou
  arm64: dts: rockchip: enable internal pull-up on PCIE_WAKE# for RK3399 Puma
  arm64: dts: rockchip: enable internal pull-up on Q7_USB_ID for RK3399 Puma
  arm64: dts: rockchip: fix alphabetical ordering RK3399 puma
  arm64: dts: rockchip: enable internal pull-up for Q7_THRM# on RK3399 Puma
  arm64: dts: rockchip: set PHY address of MT7531 switch to 0x1f

Link: https://lore.kernel.org/r/3413596.CbtlEUcBR6@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0bbac3fa 93b36e1d

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

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ allOf: 
          unevaluatedProperties: false



        pcie-phy:

          type: object

          description:

            Documentation/devicetree/bindings/phy/rockchip-pcie-phy.txt

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

+1 −2
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ mipi_in_panel: endpoint { 
			port@1 {

				reg = <1>;



				mipi1_in_panel: endpoint@1 {

				mipi1_in_panel: endpoint {

					remote-endpoint = <&mipi1_out_panel>;

				};

			};
@@ -689,7 +689,6 @@ &pcie0 { 
	ep-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;



	/* PERST# asserted in S3 */

	pcie-reset-suspend = <1>;



	vpcie3v3-supply = <&wlan_3v3>;

	vpcie1v8-supply = <&pp1800_pcie>;

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

+1 −1
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ device@4 { 
				#size-cells = <0>;



				interface@0 {	/* interface 0 of configuration 1 */

					compatible = "usbbda,8156.config1.0";

					compatible = "usbifbda,8156.config1.0";

					reg = <0 1>;

				};

			};

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

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



&pcie0 {

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

	ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;

	num-lanes = <4>;

	pinctrl-names = "default";

arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts

+2 −0
Original line number Diff line number Diff line
@@ -194,6 +194,8 @@ &pcie0 { 
	num-lanes = <4>;

	pinctrl-names = "default";

	pinctrl-0 = <&pcie_clkreqn_cpm>;

	vpcie3v3-supply = <&vcc3v3_baseboard>;

	vpcie12v-supply = <&dc_12v>;

	status = "okay";

};