Commit e3c85076 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 25278720 d9565bf4

arch/mips/boot/dts/ingenic/ci20.dts

+2 −13
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ 
		label = "HDMI OUT";

		type = "a";



		ddc-en-gpios = <&gpa 25 GPIO_ACTIVE_HIGH>;



		port {

			hdmi_con: endpoint {

				remote-endpoint = <&dw_hdmi_out>;
@@ -114,17 +116,6 @@ 
		gpio = <&gpf 14 GPIO_ACTIVE_LOW>;

		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 {
@@ -576,8 +567,6 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&pins_hdmi_ddc>;



	hdmi-5v-supply = <&hdmi_power>;



	ports {

		#address-cells = <1>;

		#size-cells = <0>;