| Message ID | 20190726101618.26896-1-thierry.reding@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | eef97c2a77febcccd3a9d70b9a6856ad43c7c069 |
| Headers | show |
| Series | [1/3] arm64: tegra: Add unit-address for CBB on Tegra194 | expand |
On Fri, Jul 26, 2019 at 12:16:16PM +0200, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > The control back-bone (CBB) starts at physical address 0, so give it a > unit-address to comply with standard naming practices checked for by the > device tree compiler. > > Signed-off-by: Thierry Reding <treding@nvidia.com> > --- > .../arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 20 +++++++++---------- > .../boot/dts/nvidia/tegra194-p2972-0000.dts | 2 +- > arch/arm64/boot/dts/nvidia/tegra194.dtsi | 2 +- > 3 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi > index 62e07e1197cc..02f6a8f0d741 100644 > --- a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi > +++ b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi > @@ -8,17 +8,17 @@ > compatible = "nvidia,p2888", "nvidia,tegra194"; > > aliases { > - sdhci0 = "/cbb/sdhci@3460000"; > - sdhci1 = "/cbb/sdhci@3400000"; > + sdhci0 = "/cbb@0/sdhci@3460000"; > + sdhci1 = "/cbb@0/sdhci@3400000"; > serial0 = &tcu; > i2c0 = "/bpmp/i2c"; > - i2c1 = "/cbb/i2c@3160000"; > - i2c2 = "/cbb/i2c@c240000"; > - i2c3 = "/cbb/i2c@3180000"; > - i2c4 = "/cbb/i2c@3190000"; > - i2c5 = "/cbb/i2c@31c0000"; > - i2c6 = "/cbb/i2c@c250000"; > - i2c7 = "/cbb/i2c@31e0000"; > + i2c1 = "/cbb@0/i2c@3160000"; > + i2c2 = "/cbb@0/i2c@c240000"; > + i2c3 = "/cbb@0/i2c@3180000"; > + i2c4 = "/cbb@0/i2c@3190000"; > + i2c5 = "/cbb@0/i2c@31c0000"; > + i2c6 = "/cbb@0/i2c@c250000"; > + i2c7 = "/cbb@0/i2c@31e0000"; > }; [...] There are aliases in tegra194.dtsi like gen1_i2c, maybe they could be used here? Best Regards, Michał Mirosław
On Fri, Jul 26, 2019 at 12:16:16PM +0200, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > The control back-bone (CBB) starts at physical address 0, so give it a > unit-address to comply with standard naming practices checked for by the > device tree compiler. > > Signed-off-by: Thierry Reding <treding@nvidia.com> > --- > .../arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 20 +++++++++---------- > .../boot/dts/nvidia/tegra194-p2972-0000.dts | 2 +- > arch/arm64/boot/dts/nvidia/tegra194.dtsi | 2 +- > 3 files changed, 12 insertions(+), 12 deletions(-) All three patches applied to for-5.5/arm64/dt. Thierry
diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi index 62e07e1197cc..02f6a8f0d741 100644 --- a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi @@ -8,17 +8,17 @@ compatible = "nvidia,p2888", "nvidia,tegra194"; aliases { - sdhci0 = "/cbb/sdhci@3460000"; - sdhci1 = "/cbb/sdhci@3400000"; + sdhci0 = "/cbb@0/sdhci@3460000"; + sdhci1 = "/cbb@0/sdhci@3400000"; serial0 = &tcu; i2c0 = "/bpmp/i2c"; - i2c1 = "/cbb/i2c@3160000"; - i2c2 = "/cbb/i2c@c240000"; - i2c3 = "/cbb/i2c@3180000"; - i2c4 = "/cbb/i2c@3190000"; - i2c5 = "/cbb/i2c@31c0000"; - i2c6 = "/cbb/i2c@c250000"; - i2c7 = "/cbb/i2c@31e0000"; + i2c1 = "/cbb@0/i2c@3160000"; + i2c2 = "/cbb@0/i2c@c240000"; + i2c3 = "/cbb@0/i2c@3180000"; + i2c4 = "/cbb@0/i2c@3190000"; + i2c5 = "/cbb@0/i2c@31c0000"; + i2c6 = "/cbb@0/i2c@c250000"; + i2c7 = "/cbb@0/i2c@31e0000"; }; chosen { @@ -26,7 +26,7 @@ stdout-path = "serial0:115200n8"; }; - cbb { + cbb@0 { ethernet@2490000 { status = "okay"; diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts b/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts index 23597d53c9c9..740aaf597115 100644 --- a/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts +++ b/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts @@ -10,7 +10,7 @@ model = "NVIDIA Jetson AGX Xavier Developer Kit"; compatible = "nvidia,p2972-0000", "nvidia,tegra194"; - cbb { + cbb@0 { aconnect { status = "okay"; diff --git a/arch/arm64/boot/dts/nvidia/tegra194.dtsi b/arch/arm64/boot/dts/nvidia/tegra194.dtsi index adebbbf36bd0..2597eb7f747b 100644 --- a/arch/arm64/boot/dts/nvidia/tegra194.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra194.dtsi @@ -14,7 +14,7 @@ #size-cells = <2>; /* control backbone */ - cbb { + cbb@0 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>;