Commit d6780626 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.0-rockchip-dts64fixes-1' of... 

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

Fix for new dtc graph warnings and a regulator fix for rock64.

* tag 'v5.0-rockchip-dts64fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: enable usb-host regulators at boot on rk3328-rock64
  arm64: dts: rockchip: fix graph_port warning on rk3399 bob kevin and excavator
parents d50ce40a 26e2d7b0

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

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
		pinctrl-0 = <&usb30_host_drv>;

		regulator-name = "vcc_host_5v";

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vcc_sys>;

	};
@@ -51,6 +52,7 @@ 
		pinctrl-0 = <&usb20_host_drv>;

		regulator-name = "vcc_host1_5v";

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vcc_sys>;

	};

arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
		backlight = <&backlight>;

		power-supply = <&pp3300_disp>;



		ports {

		port {

			panel_in_edp: endpoint {

				remote-endpoint = <&edp_out_panel>;

			};

arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
		backlight = <&backlight>;

		power-supply = <&pp3300_disp>;



		ports {

		port {

			panel_in_edp: endpoint {

				remote-endpoint = <&edp_out_panel>;

			};

arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 
		pinctrl-0 = <&lcd_panel_reset>;

		power-supply = <&vcc3v3_s0>;



		ports {

		port {

			panel_in_edp: endpoint {

				remote-endpoint = <&edp_out_panel>;

			};

CRA Git | Maintained and supported by SUSTech CRA and CCSE