Skip to contentSkip to conversation

arm64: tegra: Add unit-address for CBB on Tegra194

PATCH In review Thierry Reding 2 participants 5 messages Jul 26, 2019 – Oct 1, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 arm64: tegra: Add unit-address for CBB on Tegra194

From: Thierry Reding <[email protected]>

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.

---
 .../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(-)
arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi +10 -10
index 62e07e1197cc..02f6a8f0d741 100644
@@ -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";
 
arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts +1 -1
index 23597d53c9c9..740aaf597115 100644
@@ -10,7 +10,7 @@
 	model = "NVIDIA Jetson AGX Xavier Developer Kit";
 	compatible = "nvidia,p2972-0000", "nvidia,tegra194";
 
-	cbb {
+	cbb@0 {
 		aconnect {
 			status = "okay";
 
arch/arm64/boot/dts/nvidia/tegra194.dtsi +1 -1
index adebbbf36bd0..2597eb7f747b 100644
@@ -14,7 +14,7 @@
 	#size-cells = <2>;
 
 	/* control backbone */
-	cbb {
+	cbb@0 {
 		compatible = "simple-bus";
 		#address-cells = <1>;
 		#size-cells = <1>;
Signature · 1 line
2.22.0
#1 lore raw

PATCH 2/3 arm64: tegra: Add unit-address for ACONNECT on Tegra194

From: Thierry Reding <[email protected]>

The ACONNECT complex starts at physical address 0x2900000, so give it a unit-address to comply with standard naming practices checked for by the device tree compiler.

---
 arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 2 +-
 arch/arm64/boot/dts/nvidia/tegra194.dtsi           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts +1 -1
index 740aaf597115..fb0b9fd0b405 100644
@@ -11,7 +11,7 @@
 	compatible = "nvidia,p2972-0000", "nvidia,tegra194";
 
 	cbb@0 {
-		aconnect {
+		aconnect@2900000 {
 			status = "okay";
 
 			dma-controller@2930000 {
arch/arm64/boot/dts/nvidia/tegra194.dtsi +1 -1
index 2597eb7f747b..923415fd72a4 100644
@@ -59,7 +59,7 @@
 			snps,rxpbl = <8>;
 		};
 
-		aconnect {
+		aconnect@2900000 {
 			compatible = "nvidia,tegra194-aconnect",
 				     "nvidia,tegra210-aconnect";
 			clocks = <&bpmp TEGRA194_CLK_APE>,
Signature · 1 line
2.22.0
#2 lore raw

PATCH 3/3 arm64: tegra: Fix base address for SOR1 on Tegra194

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The SOR1 hardware block's registers start at physical address 0x15b40000 as correctly specified by the unit-address, but the reg property lists a wrong value, likely because it was copy-and-pasted from SOR0 but not correctly updated.

---
 arch/arm64/boot/dts/nvidia/tegra194.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/nvidia/tegra194.dtsi +1 -1
index 923415fd72a4..ca5ffbc79e2f 100644
@@ -1045,7 +1045,7 @@
 
 			sor1: sor@15b40000 {
 				compatible = "nvidia,tegra194-sor";
-				reg = <0x155c0000 0x40000>;
+				reg = <0x15b40000 0x40000>;
 				interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&bpmp TEGRA194_CLK_SOR1_REF>,
 					 <&bpmp TEGRA194_CLK_SOR1_OUT>,
Signature · 1 line
2.22.0
#3 lore raw
In reply to Thierry Reding
Quoted 32 lines · Thierry Reding

From: Thierry Reding <[email protected]>

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.

---
 .../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(-)
arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi +2 -7
index 62e07e1197cc..02f6a8f0d741 100644
@@ -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";

arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi line 22

Quoted 10 lines
arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi +7 -2
-		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

#4 lore raw
In reply to Thierry Reding
Quoted 6 lines · Thierry Reding

From: Thierry Reding <[email protected]>

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.

Quoted 6 lines
---
 .../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

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel