diff mbox series

ARM: tegra: Drop reg-shift for Tegra HS UART

Message ID 20211207101316.381031-1-thierry.reding@gmail.com
State Superseded
Headers show
Series ARM: tegra: Drop reg-shift for Tegra HS UART | expand

Commit Message

Thierry Reding Dec. 7, 2021, 10:13 a.m. UTC 
From: Thierry Reding <treding@nvidia.com>

When the Tegra High-Speed UART is used instead of the regular UART, the
reg-shift property is implied from the compatible string and should not
be explicitly listed.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi               | 3 +++
 arch/arm/boot/dts/tegra124-jetson-tk1.dts                 | 2 ++
 arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi | 2 ++
 arch/arm/boot/dts/tegra30-colibri.dtsi                    | 2 ++
 4 files changed, 9 insertions(+)

Comments

Dmitry Osipenko Dec. 7, 2021, 2:19 p.m. UTC | #1 
07.12.2021 13:13, Thierry Reding пишет:
> From: Thierry Reding <treding@nvidia.com>
> 
> When the Tegra High-Speed UART is used instead of the regular UART, the
> reg-shift property is implied from the compatible string and should not
> be explicitly listed.
> 
> Signed-off-by: Thierry Reding <treding@nvidia.com>
> ---
>  arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi               | 3 +++
>  arch/arm/boot/dts/tegra124-jetson-tk1.dts                 | 2 ++
>  arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi | 2 ++
>  arch/arm/boot/dts/tegra30-colibri.dtsi                    | 2 ++
>  4 files changed, 9 insertions(+)

What about Ouya?
Dmitry Osipenko Dec. 7, 2021, 2:41 p.m. UTC | #2 
07.12.2021 17:19, Dmitry Osipenko пишет:
> 07.12.2021 13:13, Thierry Reding пишет:
>> From: Thierry Reding <treding@nvidia.com>
>>
>> When the Tegra High-Speed UART is used instead of the regular UART, the
>> reg-shift property is implied from the compatible string and should not
>> be explicitly listed.
>>
>> Signed-off-by: Thierry Reding <treding@nvidia.com>
>> ---
>>  arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi               | 3 +++
>>  arch/arm/boot/dts/tegra124-jetson-tk1.dts                 | 2 ++
>>  arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi | 2 ++
>>  arch/arm/boot/dts/tegra30-colibri.dtsi                    | 2 ++
>>  4 files changed, 9 insertions(+)
> 
> What about Ouya?
> 

What about T20?
Thierry Reding Dec. 8, 2021, 2:59 p.m. UTC | #3 
On Tue, Dec 07, 2021 at 05:41:52PM +0300, Dmitry Osipenko wrote:
> 07.12.2021 17:19, Dmitry Osipenko пишет:
> > 07.12.2021 13:13, Thierry Reding пишет:
> >> From: Thierry Reding <treding@nvidia.com>
> >>
> >> When the Tegra High-Speed UART is used instead of the regular UART, the
> >> reg-shift property is implied from the compatible string and should not
> >> be explicitly listed.
> >>
> >> Signed-off-by: Thierry Reding <treding@nvidia.com>
> >> ---
> >>  arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi               | 3 +++
> >>  arch/arm/boot/dts/tegra124-jetson-tk1.dts                 | 2 ++
> >>  arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi | 2 ++
> >>  arch/arm/boot/dts/tegra30-colibri.dtsi                    | 2 ++
> >>  4 files changed, 9 insertions(+)
> > 
> > What about Ouya?
> > 
> 
> What about T20?

I went through all of the above based on results from a dtbs_check run.
I don't see these errors flagged for Ouya or any Tegra20 boards. I have
no idea why and will need to look into it some more.

Thierry
Dmitry Osipenko Dec. 8, 2021, 3:04 p.m. UTC | #4 
08.12.2021 17:59, Thierry Reding пишет:
> On Tue, Dec 07, 2021 at 05:41:52PM +0300, Dmitry Osipenko wrote:
>> 07.12.2021 17:19, Dmitry Osipenko пишет:
>>> 07.12.2021 13:13, Thierry Reding пишет:
>>>> From: Thierry Reding <treding@nvidia.com>
>>>>
>>>> When the Tegra High-Speed UART is used instead of the regular UART, the
>>>> reg-shift property is implied from the compatible string and should not
>>>> be explicitly listed.
>>>>
>>>> Signed-off-by: Thierry Reding <treding@nvidia.com>
>>>> ---
>>>>  arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi               | 3 +++
>>>>  arch/arm/boot/dts/tegra124-jetson-tk1.dts                 | 2 ++
>>>>  arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi | 2 ++
>>>>  arch/arm/boot/dts/tegra30-colibri.dtsi                    | 2 ++
>>>>  4 files changed, 9 insertions(+)
>>>
>>> What about Ouya?
>>>
>>
>> What about T20?
> 
> I went through all of the above based on results from a dtbs_check run.
> I don't see these errors flagged for Ouya or any Tegra20 boards. I have
> no idea why and will need to look into it some more.

Alright, something is wrong then. The serial@70006200 node on Ouya is
exactly the same as on Nexus7, T20 Acer A500 is almost the same.
Thierry Reding Dec. 8, 2021, 3:12 p.m. UTC | #5 
On Wed, Dec 08, 2021 at 06:04:45PM +0300, Dmitry Osipenko wrote:
> 08.12.2021 17:59, Thierry Reding пишет:
> > On Tue, Dec 07, 2021 at 05:41:52PM +0300, Dmitry Osipenko wrote:
> >> 07.12.2021 17:19, Dmitry Osipenko пишет:
> >>> 07.12.2021 13:13, Thierry Reding пишет:
> >>>> From: Thierry Reding <treding@nvidia.com>
> >>>>
> >>>> When the Tegra High-Speed UART is used instead of the regular UART, the
> >>>> reg-shift property is implied from the compatible string and should not
> >>>> be explicitly listed.
> >>>>
> >>>> Signed-off-by: Thierry Reding <treding@nvidia.com>
> >>>> ---
> >>>>  arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi               | 3 +++
> >>>>  arch/arm/boot/dts/tegra124-jetson-tk1.dts                 | 2 ++
> >>>>  arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi | 2 ++
> >>>>  arch/arm/boot/dts/tegra30-colibri.dtsi                    | 2 ++
> >>>>  4 files changed, 9 insertions(+)
> >>>
> >>> What about Ouya?
> >>>
> >>
> >> What about T20?
> > 
> > I went through all of the above based on results from a dtbs_check run.
> > I don't see these errors flagged for Ouya or any Tegra20 boards. I have
> > no idea why and will need to look into it some more.
> 
> Alright, something is wrong then. The serial@70006200 node on Ouya is
> exactly the same as on Nexus7, T20 Acer A500 is almost the same.

Indeed, looks like I no longer get any reg-shift related warnings even
if I revert this patch in my tree. I don't immediately see why that
would be. The reg-shift property is definitely not defined by either the
HSUART bindings or anywhere that it references.

Rob, any idea where this might be coming from? Doesn't look like
reg-shift is defined anywhere in the core schema either. Is this perhaps
some fallout from the additionalProperties: true fixup? Perhaps that's
not applied correctly in all cases?

Thierry
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
index f00ef4d08fd4..b952b272afc0 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -1539,14 +1539,17 @@  sdmmc3-clk-lb-out-pee4 { /* NC */
 
 	serial@70006040 {
 		compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+		/delete-property/ reg-shift;
 	};
 
 	serial@70006200 {
 		compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+		/delete-property/ reg-shift;
 	};
 
 	serial@70006300 {
 		compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+		/delete-property/ reg-shift;
 	};
 
 	hdmi_ddc: i2c@7000c700 {
diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index e056e737abdf..f76f4e13458a 100644
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -1389,6 +1389,7 @@  dsi_b {
 	 */
 	serial@70006000 {
 		compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+		/delete-property/ reg-shift;
 		status = "okay";
 	};
 
@@ -1401,6 +1402,7 @@  serial@70006000 {
 	 */
 	serial@70006040 {
 		compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+		/delete-property/ reg-shift;
 		status = "okay";
 	};
 
diff --git a/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi b/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
index 3fbb57d517c4..f3d14d8dd87f 100644
--- a/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
+++ b/arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
@@ -804,11 +804,13 @@  drive_gma {
 
 	uartb: serial@70006040 {
 		compatible = "nvidia,tegra30-hsuart";
+		/delete-property/ reg-shift;
 		/* GPS BCM4751 */
 	};
 
 	uartc: serial@70006200 {
 		compatible = "nvidia,tegra30-hsuart";
+		/delete-property/ reg-shift;
 		status = "okay";
 
 		nvidia,adjust-baud-rates = <0 9600 100>,
diff --git a/arch/arm/boot/dts/tegra30-colibri.dtsi b/arch/arm/boot/dts/tegra30-colibri.dtsi
index 03b930bce479..e89b4e5a238d 100644
--- a/arch/arm/boot/dts/tegra30-colibri.dtsi
+++ b/arch/arm/boot/dts/tegra30-colibri.dtsi
@@ -701,10 +701,12 @@  pv0 {
 
 	serial@70006040 {
 		compatible = "nvidia,tegra30-hsuart";
+		/delete-property/ reg-shift;
 	};
 
 	serial@70006300 {
 		compatible = "nvidia,tegra30-hsuart";
+		/delete-property/ reg-shift;
 	};
 
 	hdmi_ddc: i2c@7000c700 {