Commit d6780626 authored by Arnd Bergmann's avatar Arnd Bergmann

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
...@@ -40,6 +40,7 @@ vcc_host_5v: vcc-host-5v-regulator { ...@@ -40,6 +40,7 @@ vcc_host_5v: vcc-host-5v-regulator {
pinctrl-0 = <&usb30_host_drv>; pinctrl-0 = <&usb30_host_drv>;
regulator-name = "vcc_host_5v"; regulator-name = "vcc_host_5v";
regulator-always-on; regulator-always-on;
regulator-boot-on;
vin-supply = <&vcc_sys>; vin-supply = <&vcc_sys>;
}; };
...@@ -51,6 +52,7 @@ vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator { ...@@ -51,6 +52,7 @@ vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator {
pinctrl-0 = <&usb20_host_drv>; pinctrl-0 = <&usb20_host_drv>;
regulator-name = "vcc_host1_5v"; regulator-name = "vcc_host1_5v";
regulator-always-on; regulator-always-on;
regulator-boot-on;
vin-supply = <&vcc_sys>; vin-supply = <&vcc_sys>;
}; };
......
...@@ -22,7 +22,7 @@ edp_panel: edp-panel { ...@@ -22,7 +22,7 @@ edp_panel: edp-panel {
backlight = <&backlight>; backlight = <&backlight>;
power-supply = <&pp3300_disp>; power-supply = <&pp3300_disp>;
ports { port {
panel_in_edp: endpoint { panel_in_edp: endpoint {
remote-endpoint = <&edp_out_panel>; remote-endpoint = <&edp_out_panel>;
}; };
......
...@@ -43,7 +43,7 @@ edp_panel: edp-panel { ...@@ -43,7 +43,7 @@ edp_panel: edp-panel {
backlight = <&backlight>; backlight = <&backlight>;
power-supply = <&pp3300_disp>; power-supply = <&pp3300_disp>;
ports { port {
panel_in_edp: endpoint { panel_in_edp: endpoint {
remote-endpoint = <&edp_out_panel>; remote-endpoint = <&edp_out_panel>;
}; };
......
...@@ -91,7 +91,7 @@ edp_panel: edp-panel { ...@@ -91,7 +91,7 @@ edp_panel: edp-panel {
pinctrl-0 = <&lcd_panel_reset>; pinctrl-0 = <&lcd_panel_reset>;
power-supply = <&vcc3v3_s0>; power-supply = <&vcc3v3_s0>;
ports { port {
panel_in_edp: endpoint { panel_in_edp: endpoint {
remote-endpoint = <&edp_out_panel>; remote-endpoint = <&edp_out_panel>;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment