Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adb97bcd authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v4.20-rockchip-dts64fixes-1' of... 

Merge tag 'v4.20-rockchip-dts64fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes

Removal of vdd_log regulator on rk960 to fix a stability issue
and fixup of the pcie reset polarity on puma-haikou.

* tag 'v4.20-rockchip-dts64fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  arm64: dts: rockchip: Fix PCIe reset polarity for rk3399-puma-haikou.
  arm64: dts: rockchip: remove vdd_log from rock960 to fix a stability issues

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a8505b4e c1d91f86

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

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ 
};



&pcie0 {

	ep-gpios = <&gpio4 RK_PC6 GPIO_ACTIVE_LOW>;

	ep-gpios = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;

	num-lanes = <4>;

	pinctrl-names = "default";

	pinctrl-0 = <&pcie_clkreqn_cpm>;

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

+0 −12
Original line number Diff line number Diff line
@@ -57,18 +57,6 @@ 
		regulator-always-on;

		vin-supply = <&vcc_sys>;

	};



	vdd_log: vdd-log {

		compatible = "pwm-regulator";

		pwms = <&pwm2 0 25000 0>;

		regulator-name = "vdd_log";

		regulator-min-microvolt = <800000>;

		regulator-max-microvolt = <1400000>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vcc_sys>;

	};



};



&cpu_l0 {