提交 e3c85076 编写于 作者: L Linus Torvalds

Merge tag 'mips-fixes-5.17_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

Pull MIPS fix from Thomas Bogendoerfer:
 "Device tree fix for Ingenic CI20"

* tag 'mips-fixes-5.17_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: DTS: CI20: fix how ddc power is enabled
...@@ -83,6 +83,8 @@ ...@@ -83,6 +83,8 @@
label = "HDMI OUT"; label = "HDMI OUT";
type = "a"; type = "a";
ddc-en-gpios = <&gpa 25 GPIO_ACTIVE_HIGH>;
port { port {
hdmi_con: endpoint { hdmi_con: endpoint {
remote-endpoint = <&dw_hdmi_out>; remote-endpoint = <&dw_hdmi_out>;
...@@ -114,17 +116,6 @@ ...@@ -114,17 +116,6 @@
gpio = <&gpf 14 GPIO_ACTIVE_LOW>; gpio = <&gpf 14 GPIO_ACTIVE_LOW>;
enable-active-high; enable-active-high;
}; };
hdmi_power: fixedregulator@3 {
compatible = "regulator-fixed";
regulator-name = "hdmi_power";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpa 25 0>;
enable-active-high;
};
}; };
&ext { &ext {
...@@ -576,8 +567,6 @@ ...@@ -576,8 +567,6 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pins_hdmi_ddc>; pinctrl-0 = <&pins_hdmi_ddc>;
hdmi-5v-supply = <&hdmi_power>;
ports { ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册