Unverified Commit fc30ed4e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.18-rockchip-dts64-2' of... 

Merge tag 'v5.18-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

Some corrections for the rk80x pmic nodes, a supply fix for rk3399-firefly
and addition of the usb/sata combophys for rk3568.

* tag 'v5.18-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: Add #clock-cells value for rk805
  arm64: dts: rockchip: Remove vcc13 and vcc14 for rk808
  arm64: dts: rockchip: Fix SDIO regulator supply properties on rk3399-firefly
  arm64: dts: rockchip: add naneng combo phy nodes for rk3568

Link: https://lore.kernel.org/r/13959624.7hp8jFWaoN@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7b4fc7c6 9d25aadd

arch/arm64/boot/dts/rockchip/rk3328-a1.dts

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ 
		pinctrl-0 = <&pmic_int_l>;

		rockchip,system-power-controller;

		wakeup-source;

		#clock-cells = <0>;



		vcc1-supply = <&vcc_sys>;

		vcc2-supply = <&vcc_sys>;

arch/arm64/boot/dts/rockchip/rk3399-firefly.dts

+2 −2
Original line number Diff line number Diff line
@@ -775,8 +775,8 @@ 
	sd-uhs-sdr104;



	/* Power supply */

	vqmmc-supply = &vcc1v8_s3;	/* IO line */

	vmmc-supply = &vcc_sdio;	/* card's power */

	vqmmc-supply = <&vcc1v8_s3>;	/* IO line */

	vmmc-supply = <&vcc_sdio>;	/* card's power */



	#address-cells = <1>;

	#size-cells = <0>;

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

+0 −2
Original line number Diff line number Diff line
@@ -472,8 +472,6 @@ 
		vcc10-supply = <&vcc_sysin>;

		vcc11-supply = <&vcc_sysin>;

		vcc12-supply = <&vcc3v3_sys>;

		vcc13-supply = <&vcc_sysin>;

		vcc14-supply = <&vcc_sysin>;



		regulators {

			/* rk3399 center logic supply */

arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -310,8 +310,6 @@ 
		vcc10-supply = <&vcc3v3_sys>;

		vcc11-supply = <&vcc3v3_sys>;

		vcc12-supply = <&vcc3v3_sys>;

		vcc13-supply = <&vcc3v3_sys>;

		vcc14-supply = <&vcc3v3_sys>;

		vddio-supply = <&vcc_3v0>;



		regulators {

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

+21 −0
Original line number Diff line number Diff line
@@ -8,6 +8,11 @@ 
/ {

	compatible = "rockchip,rk3568";



	pipe_phy_grf0: syscon@fdc70000 {

		compatible = "rockchip,rk3568-pipe-phy-grf", "syscon";

		reg = <0x0 0xfdc70000 0x0 0x1000>;

	};



	qos_pcie3x1: qos@fe190080 {

		compatible = "rockchip,rk3568-qos", "syscon";

		reg = <0x0 0xfe190080 0x0 0x20>;
@@ -71,6 +76,22 @@ 
			queue0 {};

		};

	};



	combphy0: phy@fe820000 {

		compatible = "rockchip,rk3568-naneng-combphy";

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

		clocks = <&pmucru CLK_PCIEPHY0_REF>,

			 <&cru PCLK_PIPEPHY0>,

			 <&cru PCLK_PIPE>;

		clock-names = "ref", "apb", "pipe";

		assigned-clocks = <&pmucru CLK_PCIEPHY0_REF>;

		assigned-clock-rates = <100000000>;

		resets = <&cru SRST_PIPEPHY0>;

		rockchip,pipe-grf = <&pipegrf>;

		rockchip,pipe-phy-grf = <&pipe_phy_grf0>;

		#phy-cells = <1>;

		status = "disabled";

	};

};



&cpu0_opp_table {