diff mbox series

[v2,4/6] arm64: dts: hisilicon: hikey: fixes to comply with adi, adv7533 DT binding

Message ID 20200511110611.3142-5-ricardo.canuelo@collabora.com
State New, archived
Headers show
Series Convert adi,adv7511.txt DT bindings to yaml | expand

Commit Message

Ricardo Cañuelo May 11, 2020, 11:06 a.m. UTC
hi3660-hikey960.dts:
  Define a 'ports' node for 'adv7533: adv7533@39' and the
  'adi,dsi-lanes' property to make it compliant with the adi,adv7533 DT
  binding.

  This fills the requirements to meet the binding requirements,
  remote endpoints are not defined.

hi6220-hikey.dts:
  Change property name s/pd-gpio/pd-gpios, gpio properties should be
  plural. This is just a cosmetic change.

Signed-off-by: Ricardo Cañuelo <ricardo.canuelo@collabora.com>
---
 arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 11 +++++++++++
 arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts    |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

Comments

Laurent Pinchart May 14, 2020, 1:37 a.m. UTC | #1
Hi Ricardo,

Thank you for the patch.

On Mon, May 11, 2020 at 01:06:09PM +0200, Ricardo Cañuelo wrote:
> hi3660-hikey960.dts:
>   Define a 'ports' node for 'adv7533: adv7533@39' and the
>   'adi,dsi-lanes' property to make it compliant with the adi,adv7533 DT
>   binding.
> 
>   This fills the requirements to meet the binding requirements,
>   remote endpoints are not defined.
> 
> hi6220-hikey.dts:
>   Change property name s/pd-gpio/pd-gpios, gpio properties should be
>   plural. This is just a cosmetic change.
> 
> Signed-off-by: Ricardo Cañuelo <ricardo.canuelo@collabora.com>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 11 +++++++++++
>  arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts    |  2 +-
>  2 files changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
> index e035cf195b19..8c4bfbaf3a80 100644
> --- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
> +++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
> @@ -530,6 +530,17 @@
>  		status = "ok";
>  		compatible = "adi,adv7533";
>  		reg = <0x39>;
> +		adi,dsi-lanes = <4>;
> +		ports {
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			port@0 {
> +				reg = <0>;
> +			};
> +			port@1 {
> +				reg = <1>;
> +			};
> +		};
>  	};
>  };
>  
> diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> index c14205cd6bf5..3e47150c05ec 100644
> --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> @@ -516,7 +516,7 @@
>  		reg = <0x39>;
>  		interrupt-parent = <&gpio1>;
>  		interrupts = <1 2>;
> -		pd-gpio = <&gpio0 4 0>;
> +		pd-gpios = <&gpio0 4 0>;
>  		adi,dsi-lanes = <4>;
>  		#sound-dai-cells = <0>;
>
John Stultz Aug. 4, 2020, 8:57 p.m. UTC | #2
On Mon, May 11, 2020 at 4:07 AM Ricardo Cañuelo
<ricardo.canuelo@collabora.com> wrote:
>
> hi3660-hikey960.dts:
>   Define a 'ports' node for 'adv7533: adv7533@39' and the
>   'adi,dsi-lanes' property to make it compliant with the adi,adv7533 DT
>   binding.
>
>   This fills the requirements to meet the binding requirements,
>   remote endpoints are not defined.
>
> hi6220-hikey.dts:
>   Change property name s/pd-gpio/pd-gpios, gpio properties should be
>   plural. This is just a cosmetic change.
>
> Signed-off-by: Ricardo Cañuelo <ricardo.canuelo@collabora.com>

As a heads up.
So this change sounds sane, but I just bisected it down as the cause
of a regression on HiKey960 where the adv7511 driver doesn't probe.

I'll dig a bit more on what is going on (the DRM driver is still out
of tree, so maybe the DTS bits for that are not quite right?), but if
you have any suggestions, I'll give those a try.

If anyone is curious, my latest patches for the board is here:
https://git.linaro.org/people/john.stultz/android-dev.git/log/?h=dev/hikey960-mainline-WIP&id=4e6cefcc9bc1c13a503fdcb3768b3fd6479d8655

thanks
-john
John Stultz Aug. 4, 2020, 9:24 p.m. UTC | #3
On Tue, Aug 4, 2020 at 1:57 PM John Stultz <john.stultz@linaro.org> wrote:
>
> On Mon, May 11, 2020 at 4:07 AM Ricardo Cañuelo
> <ricardo.canuelo@collabora.com> wrote:
> >
> > hi3660-hikey960.dts:
> >   Define a 'ports' node for 'adv7533: adv7533@39' and the
> >   'adi,dsi-lanes' property to make it compliant with the adi,adv7533 DT
> >   binding.
> >
> >   This fills the requirements to meet the binding requirements,
> >   remote endpoints are not defined.
> >
> > hi6220-hikey.dts:
> >   Change property name s/pd-gpio/pd-gpios, gpio properties should be
> >   plural. This is just a cosmetic change.
> >
> > Signed-off-by: Ricardo Cañuelo <ricardo.canuelo@collabora.com>
>
> As a heads up.
> So this change sounds sane, but I just bisected it down as the cause
> of a regression on HiKey960 where the adv7511 driver doesn't probe.
>
> I'll dig a bit more on what is going on (the DRM driver is still out
> of tree, so maybe the DTS bits for that are not quite right?), but if
> you have any suggestions, I'll give those a try.

Yes. It ends up the DRM driver dts changes were being done in the
wrong file so it was adding adv7511 bits in the dtsi, which were then
being overridden by your tweak. I'll fixup the pending DRM driver dts
bits. Apologies for the noise.

thanks
-john
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
index e035cf195b19..8c4bfbaf3a80 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
@@ -530,6 +530,17 @@ 
 		status = "ok";
 		compatible = "adi,adv7533";
 		reg = <0x39>;
+		adi,dsi-lanes = <4>;
+		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			port@0 {
+				reg = <0>;
+			};
+			port@1 {
+				reg = <1>;
+			};
+		};
 	};
 };
 
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index c14205cd6bf5..3e47150c05ec 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
@@ -516,7 +516,7 @@ 
 		reg = <0x39>;
 		interrupt-parent = <&gpio1>;
 		interrupts = <1 2>;
-		pd-gpio = <&gpio0 4 0>;
+		pd-gpios = <&gpio0 4 0>;
 		adi,dsi-lanes = <4>;
 		#sound-dai-cells = <0>;