> Am 12.02.2022 um 15:58 schrieb Paul Cercueil <paul@xxxxxxxxxxxxxxx>:
>
> Hi,
>
> Le sam., févr. 12 2022 at 15:19:26 +0100, H. Nikolaus Schaller <hns@xxxxxxxxxxxxx> a écrit :
>> Originally we proposed a new hdmi-5v-supply regulator reference
>> for CI20 device tree but that was superseded by a better idea to use
>> the already defined "ddc-en-gpios" property of the "hdmi-connector".
>> Since "MIPS: DTS: CI20: Add DT nodes for HDMI setup" has already
>> been applied to v5.17-rc1, we add this on top.
>> Fixes: ae1b8d2c2de9 ("MIPS: DTS: CI20: Add DT nodes for HDMI setup")
>> Signed-off-by: H. Nikolaus Schaller <hns@xxxxxxxxxxxxx>
>> Reviewed-by: Paul Cercueil <paul@xxxxxxxxxxxxxxx>
>
> Since it's already applied you don't have to send this patch anymore.
I see, it has arrived in linux-next but not yet in drm-misc-next...
So if someone wants to test the series directly on top of drm-misc-next (as I am doing), it would be incomplete without.
IMHO these side-branches and partial merges here and there sometimes make more problems than they seem to solve...
But I leave already applied out commits for v15.
>
> Cheers,
> -Paul
>
>> ---
>> arch/mips/boot/dts/ingenic/ci20.dts | 15 ++-------------
>> 1 file changed, 2 insertions(+), 13 deletions(-)
>> diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts
>> index 3e336b3dbb109..ab6e3dc0bc1d0 100644
>> --- a/arch/mips/boot/dts/ingenic/ci20.dts
>> +++ b/arch/mips/boot/dts/ingenic/ci20.dts
>> @@ -83,6 +83,8 @@ hdmi_out: connector {
>> 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 @@ otg_power: fixedregulator@2 {
>> 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 @@ &hdmi {
>> pinctrl-names = "default";
>> pinctrl-0 = <&pins_hdmi_ddc>;
>> - hdmi-5v-supply = <&hdmi_power>;
>> -
>> ports {
>> #address-cells = <1>;
>> #size-cells = <0>;
>> --
>> 2.33.0
>
>
