Commit 876816b2 authored by Robin Murphy's avatar Robin Murphy Committed by Heiko Stuebner
Browse files

arm64: dts: rockchip: Improve nanopi4 PCIe 



Expand the power tree description with the 0V9 and 1V8 supplies to the
RK3399 PCIe block. The NanoPis M4 and NEO4 just route 2 lanes to the
user expansion pins, so there's not much more to say at the board level
for them; NanoPC-T4 has a standard M.2 connector so we can at least
claim the 3.3V supply to that too.

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/a04a17f4b9b12e8698c76b34e7ca22f0c81845ce.1573908195.git.robin.murphy@arm.com


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent a793e19c

arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts

+5 −0
Original line number Diff line number Diff line
@@ -94,6 +94,11 @@ map3 { 
	};

};



&pcie0 {

	num-lanes = <4>;

	vpcie3v3-supply = <&vcc3v3_sys>;

};



&pinctrl {

	ir {

		ir_rx: ir-rx {

arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi

+25 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ vcc5v0_sys: vcc5v0-sys { 
	};



	/* switched by pmic_sleep */

	vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {

	vcc1v8_s3: vcc1v8-s3 {

		compatible = "regulator-fixed";

		regulator-always-on;

		regulator-boot-on;
@@ -71,6 +71,27 @@ vcc3v0_sd: vcc3v0-sd { 
		vin-supply = <&vcc3v3_sys>;

	};



	/*

	 * Really, this is supplied by vcc_1v8, and vcc1v8_s3 only

	 * drives the enable pin, but we can't quite model that.

	 */

	vcca0v9_s3: vcca0v9-s3 {

		compatible = "regulator-fixed";

		regulator-min-microvolt = <900000>;

		regulator-max-microvolt = <900000>;

		regulator-name = "vcca0v9_s3";

		vin-supply = <&vcc1v8_s3>;

	};



	/* As above, actually supplied by vcc3v3_sys */

	vcca1v8_s3: vcca1v8-s3 {

		compatible = "regulator-fixed";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-name = "vcca1v8_s3";

		vin-supply = <&vcc1v8_s3>;

	};



	vbus_typec: vbus-typec {

		compatible = "regulator-fixed";

		regulator-min-microvolt = <5000000>;
@@ -485,7 +506,9 @@ &pcie_phy { 
&pcie0 {

	ep-gpios = <&gpio2 RK_PA4 GPIO_ACTIVE_HIGH>;

	max-link-speed = <2>;

	num-lanes = <4>;

	num-lanes = <2>;

	vpcie0v9-supply = <&vcca0v9_s3>;

	vpcie1v8-supply = <&vcca1v8_s3>;

	status = "okay";

};