Skip to contentSkip to conversation

ARM: tegra: Various fixes for DT schema validation

PATCH In review Thierry Reding 5 participants 88 messages Jun 16, 2020 – Jun 30, 2020 1 message not in the archive

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

cover ARM: tegra: Various fixes for DT schema validation

From: Thierry Reding <[email protected]>

This set of patches fixes a bunch of issues that I ran into while validating device trees for Tegra-based boards against json-schema. Note that some of these issues won't become apparent until the DT binding conversions to json-schema are applied:

	http://patchwork.ozlabs.org/project/linux-tegra/list/?series=183004

Marcel, Philippe: I've Cc'ed you explicitly on a couple of patches that make changes to Toradex boards where I wasn't sure whether those changes would be safe. Those are mostly things like node names that I wasn't sure whether maybe some firmware might run into issues if we rename them. Please take a look and shout if any of those are problematic.

Thierry

Thierry Reding (73):
ARM: tegra: Add missing clock-names for SDHCI on Tegra114
ARM: tegra: Remove simple clocks bus
ARM: tegra: Remove simple regulators bus
ARM: tegra: Remove battery-name property
ARM: tegra: roth: Use the correct DSI/CSI supply
ARM: tegra: tn7: Use the correct DSI/CSI supply
ARM: tegra: Do not mark host1x as simple bus
ARM: tegra: Add missing host1x properties
ARM: tegra: gr2d is not backwards-compatible
ARM: tegra: gr3d is not backwards-compatible
ARM: tegra: The Tegra114 DC is not backwards-compatible
ARM: tegra: Drop display controller parent clocks on Tegra114
ARM: tegra: Rename sdhci nodes to mmc
ARM: tegra: Tegra114 SDHCI is not backwards-compatible
ARM: tegra: Add missing #phy-cells property to USB PHYs
ARM: tegra: Add missing #sound-dai-cells property to codecs
ARM: tegra: Name GPIO hog nodes consistently
ARM: tegra: Use standard name for Ethernet devices
ARM: tegra: Use proper tuple notation
ARM: tegra: Add micro-USB A/B port on Jetson TK1
ARM: tegra: Add missing panel power supplies on Nyan
ARM: tegra: Add #reset-cells to Tegra124 memory controller
ARM: tegra: Fix order of XUSB controller clocks
ARM: tegra: Add missing clock-names for SDHCI controllers
ARM: tegra: Use proper unit-addresses for OPPs
ARM: tegra: medcom-wide: Remove extra panel power supply
ARM: tegra: Use numeric unit-addresses
ARM: tegra: Use standard names for LED nodes
ARM: tegra: seaboard: Use standard battery bindings
ARM: tegra: Use standard names for SRAM nodes
ARM: tegra: Add parent clock to DSI output
ARM: tegra: Remove spurious comma from node name
ARM: tegra: The Tegra30 DC is not backwards-compatible
ARM: tegra: The Tegra30 SDHCI is not backwards-compatible
arm64: tegra: Add missing #phy-cells property on Jetson TX2
arm64: tegra: Add missing #phy-cells property on Jetson AGX Xavier
arm64: tegra: Fix #address-cells/#size-cells for SRAM on Tegra186
arm64: tegra: Use standard notation for interrupts
arm64: tegra: Remove extra compatible for Tegra194 SDHCI
arm64: tegra: Remove extra compatible for Tegra210 SDHCI
arm64: tegra: Describe interconnect paths on Tegra186
arm64: tegra: Describe interconnect paths on Tegra194
arm64: tegra: Add interrupt for Tegra194 memory controller
arm64: tegra: Add Tegra132 compatible string for host1x
arm64: tegra: Add interrupt-names for host1x
arm64: tegra: Remove parent clock from display controllers
arm64: tegra: Fixup I/O and PLL supply names for HDMI/DP
arm64: tegra: Add unit-address to memory node
arm64: tegra: Rename sdhci nodes to mmc
arm64: tegra: Enable XUSB on Norrin
arm64: tegra: Remove undocumented battery-name property
arm64: tegra: Remove simple clocks bus
arm64: tegra: Remove simple regulators bus
arm64: tegra: norrin: Add missing panel power supply
arm64: tegra: Use proper tuple notation
arm64: tegra: Do not mark host1x as simple bus
arm64: tegra: Use sor0_out clock on Tegra132
arm64: tegra: Tegra132 EMC is not compatible with Tegra124
arm64: tegra: Add missing #phy-cells property to USB PHYs
arm64: tegra: Remove unneeded power supplies
arm64: tegra: Update USB connector nodes
arm64: tegra: Use standard EEPROM properties
arm64: tegra: Remove XUSB pad controller interrupt from XUSB node
arm64: tegra: Fix {clock,reset}-names ordering
arm64: tegra: Do not mark display hub as simple bus
arm64: tegra: Use standard names for SRAM nodes
arm64: tegra: Remove unused interrupts from Tegra194 AON GPIO
arm64: tegra: Fix indentation in Tegra194 device tree
arm64: tegra: Rename agic -> interrupt-controller
arm64: tegra: Various fixes for PMICs
arm64: tegra: Sort nodes by unit-address on Jetson Nano
arm64: tegra: Rename cbb@0 to bus@0 on Tegra194
arm64: tegra: Fix order of XUSB controller clocks

 arch/arm/boot/dts/tegra114-dalmore.dts        | 149 +++----
 arch/arm/boot/dts/tegra114-roth.dts           | 141 +++---
 arch/arm/boot/dts/tegra114-tn7.dts            |  84 ++--
 arch/arm/boot/dts/tegra114.dtsi               |  44 +-
 arch/arm/boot/dts/tegra124-apalis-eval.dts    |   6 +-
 .../boot/dts/tegra124-apalis-v1.2-eval.dts    |   6 +-
 arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi   |   9 +-
 arch/arm/boot/dts/tegra124-apalis.dtsi        |   9 +-
 arch/arm/boot/dts/tegra124-jetson-tk1.dts     | 263 ++++++-----
 arch/arm/boot/dts/tegra124-nyan-big.dts       |   3 +-
 arch/arm/boot/dts/tegra124-nyan-blaze.dts     |   1 +
 arch/arm/boot/dts/tegra124-nyan.dtsi          | 280 ++++++------
 arch/arm/boot/dts/tegra124-venice2.dts        | 284 ++++++------
 arch/arm/boot/dts/tegra124.dtsi               |  50 ++-
 arch/arm/boot/dts/tegra20-colibri-eval-v3.dts |   2 +-
 arch/arm/boot/dts/tegra20-colibri-iris.dts    |   2 +-
 arch/arm/boot/dts/tegra20-colibri.dtsi        |   6 +-
 .../boot/dts/tegra20-cpu-opp-microvolt.dtsi   |  98 ++---
 arch/arm/boot/dts/tegra20-cpu-opp.dtsi        |  98 ++---
 arch/arm/boot/dts/tegra20-harmony.dts         | 140 +++---
 arch/arm/boot/dts/tegra20-medcom-wide.dts     |  68 ++-
 arch/arm/boot/dts/tegra20-paz00.dts           |  61 +--
 arch/arm/boot/dts/tegra20-plutux.dts          |  66 ++-
 arch/arm/boot/dts/tegra20-seaboard.dts        | 152 +++----
 arch/arm/boot/dts/tegra20-tamonten.dtsi       |  39 +-
 arch/arm/boot/dts/tegra20-tec.dts             |  66 ++-
 arch/arm/boot/dts/tegra20-trimslice.dts       | 104 ++---
 arch/arm/boot/dts/tegra20-ventana.dts         | 106 ++---
 arch/arm/boot/dts/tegra20.dtsi                |  61 +--
 arch/arm/boot/dts/tegra30-apalis-eval.dts     |   6 +-
 .../arm/boot/dts/tegra30-apalis-v1.1-eval.dts |  10 +-
 arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi    |   5 +-
 arch/arm/boot/dts/tegra30-apalis.dtsi         |   5 +-
 arch/arm/boot/dts/tegra30-beaver.dts          | 212 ++++-----
 arch/arm/boot/dts/tegra30-cardhu-a02.dts      | 128 +++---
 arch/arm/boot/dts/tegra30-cardhu-a04.dts      | 149 +++----
 arch/arm/boot/dts/tegra30-cardhu.dtsi         | 280 ++++++------
 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts |   2 +-
 arch/arm/boot/dts/tegra30-colibri.dtsi        |   7 +-
 .../boot/dts/tegra30-cpu-opp-microvolt.dtsi   | 398 ++++++++---------
 arch/arm/boot/dts/tegra30-cpu-opp.dtsi        | 398 ++++++++---------
 arch/arm/boot/dts/tegra30.dtsi                |  77 ++--
 .../arm64/boot/dts/nvidia/tegra132-norrin.dts | 396 ++++++++++-------
 arch/arm64/boot/dts/nvidia/tegra132.dtsi      | 194 ++++++--
 .../boot/dts/nvidia/tegra186-p2771-0000.dts   | 110 ++---
 .../arm64/boot/dts/nvidia/tegra186-p3310.dtsi |  78 ++--
 arch/arm64/boot/dts/nvidia/tegra186.dtsi      | 122 ++++--
 .../arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 123 +++---
 .../boot/dts/nvidia/tegra194-p2972-0000.dts   |  16 +-
 arch/arm64/boot/dts/nvidia/tegra194.dtsi      | 220 ++++++----
 .../arm64/boot/dts/nvidia/tegra210-p2180.dtsi |  46 +-
 .../boot/dts/nvidia/tegra210-p2371-2180.dts   |   6 +-
 .../arm64/boot/dts/nvidia/tegra210-p2530.dtsi |  19 +-
 .../arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 292 ++++++------
 .../arm64/boot/dts/nvidia/tegra210-p2894.dtsi | 414 ++++++++----------
 .../boot/dts/nvidia/tegra210-p3450-0000.dts   | 230 +++++-----
 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 171 ++++----
 arch/arm64/boot/dts/nvidia/tegra210.dtsi      |  51 ++-
 58 files changed, 3214 insertions(+), 3349 deletions(-)
Signature · 1 line
2.24.1
#1 lore raw

PATCH 1/73 ARM: tegra: Add missing clock-names for SDHCI on Tegra114

From: Thierry Reding <[email protected]>

The Tegra SDHCI controller bindings state that the clock-names property is required, so add the missing properties on Tegra114.

---
 arch/arm/boot/dts/tegra114.dtsi | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm/boot/dts/tegra114.dtsi +4 -0
index 450a1f1b12a0..01a81d380f1f 100644
@@ -649,6 +649,7 @@ sdhci@78000000 {
 		reg = <0x78000000 0x200>;
 		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA114_CLK_SDMMC1>;
+		clock-names = "sdhci";
 		resets = <&tegra_car 14>;
 		reset-names = "sdhci";
 		status = "disabled";
@@ -659,6 +660,7 @@ sdhci@78000200 {
 		reg = <0x78000200 0x200>;
 		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA114_CLK_SDMMC2>;
+		clock-names = "sdhci";
 		resets = <&tegra_car 9>;
 		reset-names = "sdhci";
 		status = "disabled";
@@ -669,6 +671,7 @@ sdhci@78000400 {
 		reg = <0x78000400 0x200>;
 		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA114_CLK_SDMMC3>;
+		clock-names = "sdhci";
 		resets = <&tegra_car 69>;
 		reset-names = "sdhci";
 		status = "disabled";
@@ -679,6 +682,7 @@ sdhci@78000600 {
 		reg = <0x78000600 0x200>;
 		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA114_CLK_SDMMC4>;
+		clock-names = "sdhci";
 		resets = <&tegra_car 15>;
 		reset-names = "sdhci";
 		status = "disabled";
Signature · 1 line
2.24.1
#2 lore raw

PATCH 2/73 ARM: tegra: Remove simple clocks bus

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The standard way to do this is to list out the clocks at the top-level. Adopt the standard way to fix validation.

---
 arch/arm/boot/dts/tegra114-dalmore.dts    | 15 ++++-----------
 arch/arm/boot/dts/tegra114-roth.dts       | 15 ++++-----------
 arch/arm/boot/dts/tegra114-tn7.dts        | 15 ++++-----------
 arch/arm/boot/dts/tegra124-jetson-tk1.dts | 15 ++++-----------
 arch/arm/boot/dts/tegra124-nyan.dtsi      | 15 ++++-----------
 arch/arm/boot/dts/tegra124-venice2.dts    | 15 ++++-----------
 arch/arm/boot/dts/tegra20-harmony.dts     | 15 ++++-----------
 arch/arm/boot/dts/tegra20-paz00.dts       | 15 ++++-----------
 arch/arm/boot/dts/tegra20-seaboard.dts    | 15 ++++-----------
 arch/arm/boot/dts/tegra20-trimslice.dts   | 19 ++++++-------------
 arch/arm/boot/dts/tegra20-ventana.dts     | 15 ++++-----------
 arch/arm/boot/dts/tegra30-beaver.dts      | 15 ++++-----------
 arch/arm/boot/dts/tegra30-cardhu.dtsi     | 15 ++++-----------
 13 files changed, 54 insertions(+), 145 deletions(-)
arch/arm/boot/dts/tegra114-dalmore.dts +4 -11
index 08be733ee2cd..04adfcb30cd7 100644
@@ -1152,17 +1152,10 @@ backlight: backlight {
 		default-brightness-level = <6>;
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};
 
 	gpio-keys {
arch/arm/boot/dts/tegra114-roth.dts +4 -11
index 3d3835591cd2..73b83d51b59b 100644
@@ -1016,17 +1016,10 @@ backlight: backlight {
 		enable-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>;
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};
 
 	gpio-keys {
arch/arm/boot/dts/tegra114-tn7.dts +4 -11
index bfdd1bf61816..94e801b7986e 100644
@@ -273,17 +273,10 @@ backlight: backlight {
 		power-supply = <&lcd_bl_en>;
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};
 
 	gpio-keys {
arch/arm/boot/dts/tegra124-jetson-tk1.dts +4 -11
index 3bce7a1b288a..51b217a6507d 100644
@@ -1855,17 +1855,10 @@ usb-phy@7d008000 {
 		vbus-supply = <&vdd_usb3_vbus>;
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};
 
 	cpus {
arch/arm/boot/dts/tegra124-nyan.dtsi +4 -11
index 9cb5921bb1fa..4555d01094b5 100644
@@ -575,17 +575,10 @@ backlight: backlight {
 			 256>;
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};
 
 	cpus {
arch/arm/boot/dts/tegra124-venice2.dts +4 -11
index 710a68c5d4c7..6a7a31c831c5 100644
@@ -1057,17 +1057,10 @@ backlight: backlight {
 		default-brightness-level = <6>;
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};
 
 	gpio-keys {
arch/arm/boot/dts/tegra20-harmony.dts +4 -11
index 02cd67ea2503..bdfbe26fa26a 100644
@@ -640,17 +640,10 @@ backlight: backlight {
 		default-brightness-level = <6>;
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};
 
 	gpio-keys {
arch/arm/boot/dts/tegra20-paz00.dts +4 -11
index cce3a3fb82ed..bfc9625a6c72 100644
@@ -569,17 +569,10 @@ backlight: backlight {
 		backlight-boot-off;
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};
 
 	gpio-keys {
arch/arm/boot/dts/tegra20-seaboard.dts +4 -11
index 376ecb6435f4..28dcff3b7d7e 100644
@@ -792,17 +792,10 @@ backlight: backlight {
 		default-brightness-level = <6>;
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};
 
 	gpio-keys {
arch/arm/boot/dts/tegra20-trimslice.dts +6 -13
index 8debd3d3c20d..5b26482a55b7 100644
@@ -366,30 +366,23 @@ usb-phy@c5008000 {
 		status = "okay";
 	};
 
-	sdhci@c8000000 {
+	mmc@c8000000 {
 		status = "okay";
 		broken-cd;
 		bus-width = <4>;
 	};
 
-	sdhci@c8000600 {
+	mmc@c8000600 {
 		status = "okay";
 		cd-gpios = <&gpio TEGRA_GPIO(P, 1) GPIO_ACTIVE_LOW>;
 		wp-gpios = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
 		bus-width = <4>;
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};
 
 	gpio-keys {
arch/arm/boot/dts/tegra20-ventana.dts +4 -11
index 022649119821..59998d3708a1 100644
@@ -586,17 +586,10 @@ backlight: backlight {
 		default-brightness-level = <6>;
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};
 
 	gpio-keys {
arch/arm/boot/dts/tegra30-beaver.dts +4 -11
index 6b6fd8a8058f..ef3ea08f8d19 100644
@@ -1965,17 +1965,10 @@ usb-phy@7d008000 {
 		status = "okay";
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};
 
 	gpio-leds {
arch/arm/boot/dts/tegra30-cardhu.dtsi +4 -11
index 5ee5d141bd81..c166967b6c3f 100644
@@ -418,17 +418,10 @@ backlight: backlight {
 		default-brightness-level = <6>;
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};
 
 	panel: panel {
Signature · 1 line
2.24.1
maintainer
#3 lore raw

Re: [PATCH 02/73] ARM: tegra: Remove simple clocks bus

Quoted 21 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The standard way to do this is to list out the clocks at the top-level. Adopt the standard way to fix validation.

---
 arch/arm/boot/dts/tegra114-dalmore.dts    | 15 ++++-----------
 arch/arm/boot/dts/tegra114-roth.dts       | 15 ++++-----------
 arch/arm/boot/dts/tegra114-tn7.dts        | 15 ++++-----------
 arch/arm/boot/dts/tegra124-jetson-tk1.dts | 15 ++++-----------
 arch/arm/boot/dts/tegra124-nyan.dtsi      | 15 ++++-----------
 arch/arm/boot/dts/tegra124-venice2.dts    | 15 ++++-----------
 arch/arm/boot/dts/tegra20-harmony.dts     | 15 ++++-----------
 arch/arm/boot/dts/tegra20-paz00.dts       | 15 ++++-----------
 arch/arm/boot/dts/tegra20-seaboard.dts    | 15 ++++-----------
 arch/arm/boot/dts/tegra20-trimslice.dts   | 19 ++++++-------------
 arch/arm/boot/dts/tegra20-ventana.dts     | 15 ++++-----------
 arch/arm/boot/dts/tegra30-beaver.dts      | 15 ++++-----------
 arch/arm/boot/dts/tegra30-cardhu.dtsi     | 15 ++++-----------
 13 files changed, 54 insertions(+), 145 deletions(-)

...

Quoted 12 lines
arch/arm/boot/dts/tegra20-trimslice.dts +1 -1
index 8debd3d3c20d..5b26482a55b7 100644
@@ -366,30 +366,23 @@ usb-phy@c5008000 {
 		status = "okay";
 	};
 
-	sdhci@c8000000 {
+	mmc@c8000000 {
 		status = "okay";
 		broken-cd;

arch/arm/boot/dts/tegra20-trimslice.dts usb-phy@c5008000 { · line 380

Quoted 10 lines
arch/arm/boot/dts/tegra20-trimslice.dts +1 -1
 		bus-width = <4>;
 	};
 
-	sdhci@c8000600 {
+	mmc@c8000600 {
 		status = "okay";
 		cd-gpios = <&gpio TEGRA_GPIO(P, 1) GPIO_ACTIVE_LOW>;
 		wp-gpios = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
 		bus-width = <4>;
 	};

I think that the above belongs in patch 13/73.

Jon

Signature · 1 line
nvpublic
#4 lore raw

Re: [PATCH 02/73] ARM: tegra: Remove simple clocks bus

Quoted 42 lines · Jon Hunter
Quoted 21 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The standard way to do this is to list out the clocks at the top-level. Adopt the standard way to fix validation.

---
 arch/arm/boot/dts/tegra114-dalmore.dts    | 15 ++++-----------
 arch/arm/boot/dts/tegra114-roth.dts       | 15 ++++-----------
 arch/arm/boot/dts/tegra114-tn7.dts        | 15 ++++-----------
 arch/arm/boot/dts/tegra124-jetson-tk1.dts | 15 ++++-----------
 arch/arm/boot/dts/tegra124-nyan.dtsi      | 15 ++++-----------
 arch/arm/boot/dts/tegra124-venice2.dts    | 15 ++++-----------
 arch/arm/boot/dts/tegra20-harmony.dts     | 15 ++++-----------
 arch/arm/boot/dts/tegra20-paz00.dts       | 15 ++++-----------
 arch/arm/boot/dts/tegra20-seaboard.dts    | 15 ++++-----------
 arch/arm/boot/dts/tegra20-trimslice.dts   | 19 ++++++-------------
 arch/arm/boot/dts/tegra20-ventana.dts     | 15 ++++-----------
 arch/arm/boot/dts/tegra30-beaver.dts      | 15 ++++-----------
 arch/arm/boot/dts/tegra30-cardhu.dtsi     | 15 ++++-----------
 13 files changed, 54 insertions(+), 145 deletions(-)

...

Quoted 15 lines
arch/arm/boot/dts/tegra20-trimslice.dts +1 -1
index 8debd3d3c20d..5b26482a55b7 100644
@@ -366,30 +366,23 @@ usb-phy@c5008000 {
 		status = "okay";
 	};
 
-	sdhci@c8000000 {
+	mmc@c8000000 {
 		status = "okay";
 		broken-cd;
 		bus-width = <4>;
 	};
 
Quoted 9 lines

arch/arm/boot/dts/tegra20-trimslice.dts usb-phy@c5008000 { · line 380

Quoted 7 lines
arch/arm/boot/dts/tegra20-trimslice.dts +1 -1
-	sdhci@c8000600 {
+	mmc@c8000600 {
 		status = "okay";
 		cd-gpios = <&gpio TEGRA_GPIO(P, 1) GPIO_ACTIVE_LOW>;
 		wp-gpios = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
 		bus-width = <4>;
 	};

I think that the above belongs in patch 13/73.

Good catch!

Thierry

#5 lore raw

PATCH 3/73 ARM: tegra: Remove simple regulators bus

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The standard way to do this is to list out the regulators at the top level. Adopt the standard way to fix validation.

---
 arch/arm/boot/dts/tegra114-dalmore.dts    | 129 +++++------
 arch/arm/boot/dts/tegra114-roth.dts       | 120 +++++-----
 arch/arm/boot/dts/tegra114-tn7.dts        |  65 +++---
 arch/arm/boot/dts/tegra124-jetson-tk1.dts | 238 +++++++++----------
 arch/arm/boot/dts/tegra124-nyan.dtsi      | 259 ++++++++++-----------
 arch/arm/boot/dts/tegra124-venice2.dts    | 265 ++++++++++------------
 arch/arm/boot/dts/tegra20-harmony.dts     | 121 +++++-----
 arch/arm/boot/dts/tegra20-medcom-wide.dts |  66 +++---
 arch/arm/boot/dts/tegra20-paz00.dts       |  38 ++--
 arch/arm/boot/dts/tegra20-plutux.dts      |  66 +++---
 arch/arm/boot/dts/tegra20-seaboard.dts    | 125 +++++-----
 arch/arm/boot/dts/tegra20-tamonten.dtsi   |  39 +---
 arch/arm/boot/dts/tegra20-tec.dts         |  66 +++---
 arch/arm/boot/dts/tegra20-trimslice.dts   |  85 +++----
 arch/arm/boot/dts/tegra20-ventana.dts     |  85 +++----
 arch/arm/boot/dts/tegra30-beaver.dts      | 193 ++++++++--------
 arch/arm/boot/dts/tegra30-cardhu-a02.dts  | 128 +++++------
 arch/arm/boot/dts/tegra30-cardhu-a04.dts  | 149 ++++++------
 arch/arm/boot/dts/tegra30-cardhu.dtsi     | 261 ++++++++++-----------
 19 files changed, 1130 insertions(+), 1368 deletions(-)
arch/arm/boot/dts/tegra114-dalmore.dts +58 -71
index 04adfcb30cd7..1dfff574e371 100644
@@ -1187,83 +1187,70 @@ volume_up {
 		};
 	};
 
-	regulators {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		vdd_ac_bat_reg: regulator@0 {
-			compatible = "regulator-fixed";
-			reg = <0>;
-			regulator-name = "vdd_ac_bat";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			regulator-always-on;
-		};
+	vdd_ac_bat_reg: regulator@0 {
+		compatible = "regulator-fixed";
+		regulator-name = "vdd_ac_bat";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		regulator-always-on;
+	};
 
-		dvdd_ts_reg: regulator@1 {
-			compatible = "regulator-fixed";
-			reg = <1>;
-			regulator-name = "dvdd_ts";
-			regulator-min-microvolt = <1800000>;
-			regulator-max-microvolt = <1800000>;
-			enable-active-high;
-			gpio = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_HIGH>;
-		};
+	dvdd_ts_reg: regulator@1 {
+		compatible = "regulator-fixed";
+		regulator-name = "dvdd_ts";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		enable-active-high;
+		gpio = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_HIGH>;
+	};
 
-		usb1_vbus_reg: regulator@3 {
-			compatible = "regulator-fixed";
-			reg = <3>;
-			regulator-name = "usb1_vbus";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			enable-active-high;
-			gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
-			gpio-open-drain;
-			vin-supply = <&tps65090_dcdc1_reg>;
-		};
+	usb1_vbus_reg: regulator@3 {
+		compatible = "regulator-fixed";
+		regulator-name = "usb1_vbus";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		enable-active-high;
+		gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
+		gpio-open-drain;
+		vin-supply = <&tps65090_dcdc1_reg>;
+	};
 
-		usb3_vbus_reg: regulator@4 {
-			compatible = "regulator-fixed";
-			reg = <4>;
-			regulator-name = "usb2_vbus";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			enable-active-high;
-			gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
-			gpio-open-drain;
-			vin-supply = <&tps65090_dcdc1_reg>;
-		};
+	usb3_vbus_reg: regulator@4 {
+		compatible = "regulator-fixed";
+		regulator-name = "usb2_vbus";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		enable-active-high;
+		gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
+		gpio-open-drain;
+		vin-supply = <&tps65090_dcdc1_reg>;
+	};
 
-		vdd_hdmi_reg: regulator@5 {
-			compatible = "regulator-fixed";
-			reg = <5>;
-			regulator-name = "vdd_hdmi_5v0";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			vin-supply = <&tps65090_dcdc1_reg>;
-		};
+	vdd_hdmi_reg: regulator@5 {
+		compatible = "regulator-fixed";
+		regulator-name = "vdd_hdmi_5v0";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&tps65090_dcdc1_reg>;
+	};
 
-		vdd_cam_1v8_reg: regulator@6 {
-			compatible = "regulator-fixed";
-			reg = <6>;
-			regulator-name = "vdd_cam_1v8_reg";
-			regulator-min-microvolt = <1800000>;
-			regulator-max-microvolt = <1800000>;
-			enable-active-high;
-			gpio = <&palmas_gpio 6 0>;
-		};
+	vdd_cam_1v8_reg: regulator@6 {
+		compatible = "regulator-fixed";
+		regulator-name = "vdd_cam_1v8_reg";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		enable-active-high;
+		gpio = <&palmas_gpio 6 0>;
+	};
 
-		vdd_5v0_hdmi: regulator@7 {
-			compatible = "regulator-fixed";
-			reg = <7>;
-			regulator-name = "VDD_5V0_HDMI_CON";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
-			enable-active-high;
-			vin-supply = <&tps65090_dcdc1_reg>;
-		};
+	vdd_5v0_hdmi: regulator@7 {
+		compatible = "regulator-fixed";
+		regulator-name = "VDD_5V0_HDMI_CON";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+		vin-supply = <&tps65090_dcdc1_reg>;
 	};
 
 	sound {
arch/arm/boot/dts/tegra114-roth.dts +54 -66

130 lines not on this page · raw message

arch/arm/boot/dts/tegra114-tn7.dts +28 -37

72 lines not on this page · raw message

arch/arm/boot/dts/tegra124-jetson-tk1.dts +110 -128

255 lines not on this page · raw message

arch/arm/boot/dts/tegra124-nyan.dtsi +120 -139

277 lines not on this page · raw message

arch/arm/boot/dts/tegra124-venice2.dts +123 -142

287 lines not on this page · raw message

arch/arm/boot/dts/tegra20-harmony.dts +54 -67

133 lines not on this page · raw message

arch/arm/boot/dts/tegra20-medcom-wide.dts +30 -36

74 lines not on this page · raw message

arch/arm/boot/dts/tegra20-paz00.dts +15 -23
index bfc9625a6c72..2a0e5754f50f 100644
@@ -606,30 +606,22 @@ panel: panel {
 		backlight = <&backlight>;
 	};
 
-	regulators {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		p5valw_reg: regulator@0 {
-			compatible = "regulator-fixed";
-			reg = <0>;
-			regulator-name = "+5valw";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			regulator-always-on;
-		};
+	p5valw_reg: regulator@0 {
+		compatible = "regulator-fixed";
+		regulator-name = "+5valw";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		regulator-always-on;
+	};
 
-		vdd_pnl_reg: regulator@1 {
-			compatible = "regulator-fixed";
-			reg = <1>;
-			regulator-name = "+3VS,vdd_pnl";
-			regulator-min-microvolt = <3300000>;
-			regulator-max-microvolt = <3300000>;
-			regulator-boot-on;
-			gpio = <&gpio TEGRA_GPIO(A, 4) GPIO_ACTIVE_HIGH>;
-			enable-active-high;
-		};
+	vdd_pnl_reg: regulator@1 {
+		compatible = "regulator-fixed";
+		regulator-name = "+3VS,vdd_pnl";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-boot-on;
+		gpio = <&gpio TEGRA_GPIO(A, 4) GPIO_ACTIVE_HIGH>;
+		enable-active-high;
 	};
 
 	sound {
arch/arm/boot/dts/tegra20-plutux.dts +30 -36

74 lines not on this page · raw message

arch/arm/boot/dts/tegra20-seaboard.dts +56 -69

137 lines not on this page · raw message

arch/arm/boot/dts/tegra20-tamonten.dtsi +12 -27
index 20137fc578b1..95e6bccdb4f6 100644
@@ -495,40 +495,25 @@ usb-phy@c5008000 {
 		status = "okay";
 	};
 
-	sdhci@c8000600 {
+	mmc@c8000600 {
 		cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;
 		wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
 		bus-width = <4>;
 		status = "okay";
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};
 
-	regulators {
-		compatible = "simple-bus";
-
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		pci_vdd_reg: regulator@1 {
-			compatible = "regulator-fixed";
-			reg = <1>;
-			regulator-name = "vdd_1v05";
-			regulator-min-microvolt = <1050000>;
-			regulator-max-microvolt = <1050000>;
-			gpio = <&pmic 2 0>;
-			enable-active-high;
-		};
+	pci_vdd_reg: regulator@1 {
+		compatible = "regulator-fixed";
+		regulator-name = "vdd_1v05";
+		regulator-min-microvolt = <1050000>;
+		regulator-max-microvolt = <1050000>;
+		gpio = <&pmic 2 0>;
+		enable-active-high;
 	};
 };
arch/arm/boot/dts/tegra20-tec.dts +30 -36

74 lines not on this page · raw message

arch/arm/boot/dts/tegra20-trimslice.dts +37 -48

95 lines not on this page · raw message

arch/arm/boot/dts/tegra20-ventana.dts +37 -48

95 lines not on this page · raw message

arch/arm/boot/dts/tegra30-beaver.dts +89 -104

207 lines not on this page · raw message

arch/arm/boot/dts/tegra30-cardhu-a02.dts +58 -70

145 lines not on this page · raw message

arch/arm/boot/dts/tegra30-cardhu-a04.dts +68 -81

167 lines not on this page · raw message

arch/arm/boot/dts/tegra30-cardhu.dtsi +121 -140

279 lines not on this page · raw message

Signature · 1 line
2.24.1
maintainer
#6 lore raw

Re: [PATCH 03/73] ARM: tegra: Remove simple regulators bus

Quoted 27 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The standard way to do this is to list out the regulators at the top level. Adopt the standard way to fix validation.

---
 arch/arm/boot/dts/tegra114-dalmore.dts    | 129 +++++------
 arch/arm/boot/dts/tegra114-roth.dts       | 120 +++++-----
 arch/arm/boot/dts/tegra114-tn7.dts        |  65 +++---
 arch/arm/boot/dts/tegra124-jetson-tk1.dts | 238 +++++++++----------
 arch/arm/boot/dts/tegra124-nyan.dtsi      | 259 ++++++++++-----------
 arch/arm/boot/dts/tegra124-venice2.dts    | 265 ++++++++++------------
 arch/arm/boot/dts/tegra20-harmony.dts     | 121 +++++-----
 arch/arm/boot/dts/tegra20-medcom-wide.dts |  66 +++---
 arch/arm/boot/dts/tegra20-paz00.dts       |  38 ++--
 arch/arm/boot/dts/tegra20-plutux.dts      |  66 +++---
 arch/arm/boot/dts/tegra20-seaboard.dts    | 125 +++++-----
 arch/arm/boot/dts/tegra20-tamonten.dtsi   |  39 +---
 arch/arm/boot/dts/tegra20-tec.dts         |  66 +++---
 arch/arm/boot/dts/tegra20-trimslice.dts   |  85 +++----
 arch/arm/boot/dts/tegra20-ventana.dts     |  85 +++----
 arch/arm/boot/dts/tegra30-beaver.dts      | 193 ++++++++--------
 arch/arm/boot/dts/tegra30-cardhu-a02.dts  | 128 +++++------
 arch/arm/boot/dts/tegra30-cardhu-a04.dts  | 149 ++++++------
 arch/arm/boot/dts/tegra30-cardhu.dtsi     | 261 ++++++++++-----------
 19 files changed, 1130 insertions(+), 1368 deletions(-)

...

arch/arm/boot/dts/tegra124-venice2.dts power { · line 1083

Quoted 13 lines
arch/arm/boot/dts/tegra124-venice2.dts +1 -1
index 6a7a31c831c5..effdb303c7f7 100644
@@ -1077,164 +1077,145 @@ power {
 
 	panel: panel {
 		compatible = "lg,lp129qe";
-
+		power-supply = <&vdd_3v3_panel>;
 		backlight = <&backlight>;
 		ddc-i2c-bus = <&dpaux>;
 	};

Is this meant to be in this patch?

Quoted 22 lines
arch/arm/boot/dts/tegra20-tamonten.dtsi +1 -7
index 20137fc578b1..95e6bccdb4f6 100644
@@ -495,40 +495,25 @@ usb-phy@c5008000 {
 		status = "okay";
 	};
 
-	sdhci@c8000600 {
+	mmc@c8000600 {
 		cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;
 		wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
 		bus-width = <4>;
 		status = "okay";
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {

arch/arm/boot/dts/tegra20-tamonten.dtsi usb-phy@c5008000 { · line 509

Quoted 10 lines
arch/arm/boot/dts/tegra20-tamonten.dtsi +4 -5
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};

The above appears in to be in the wrong patch.

Quoted 5 lines
arch/arm/boot/dts/tegra30-cardhu-a02.dts +0 -0
index a02ec5082287..4899e05a0d9c 100644

arch/arm/boot/dts/tegra30-cardhu-a02.dts / { · line 17

Quoted 10 lines
arch/arm/boot/dts/tegra30-cardhu-a02.dts +1 -1
@@ -9,87 +9,75 @@ / {
 	model = "NVIDIA Tegra30 Cardhu A02 evaluation board";
 	compatible = "nvidia,cardhu-a02", "nvidia,cardhu", "nvidia,tegra30";
 
-	sdhci@78000400 {
+	mmc@78000400 {
 		status = "okay";
 		power-gpios = <&gpio TEGRA_GPIO(D, 4) GPIO_ACTIVE_HIGH>;
 		bus-width = <4>;
 		keep-power-in-suspend;
 	};

And here.

Quoted 5 lines
arch/arm/boot/dts/tegra30-cardhu-a04.dts +0 -0
index 9234988624ec..c1c0ca628af1 100644

arch/arm/boot/dts/tegra30-cardhu-a04.dts / { · line 19

Quoted 10 lines
arch/arm/boot/dts/tegra30-cardhu-a04.dts +1 -1
@@ -11,99 +11,86 @@ / {
 	model = "NVIDIA Tegra30 Cardhu A04 (A05, A06, A07) evaluation board";
 	compatible = "nvidia,cardhu-a04", "nvidia,cardhu", "nvidia,tegra30";
 
-	sdhci@78000400 {
+	mmc@78000400 {
 		status = "okay";
 		power-gpios = <&gpio TEGRA_GPIO(D, 3) GPIO_ACTIVE_HIGH>;
 		bus-width = <4>;
 		keep-power-in-suspend;
 	};

And here.

Jon

Signature · 1 line
nvpublic
#7 lore raw

Re: [PATCH 03/73] ARM: tegra: Remove simple regulators bus

Quoted 110 lines · Jon Hunter
Quoted 27 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The standard way to do this is to list out the regulators at the top level. Adopt the standard way to fix validation.

---
 arch/arm/boot/dts/tegra114-dalmore.dts    | 129 +++++------
 arch/arm/boot/dts/tegra114-roth.dts       | 120 +++++-----
 arch/arm/boot/dts/tegra114-tn7.dts        |  65 +++---
 arch/arm/boot/dts/tegra124-jetson-tk1.dts | 238 +++++++++----------
 arch/arm/boot/dts/tegra124-nyan.dtsi      | 259 ++++++++++-----------
 arch/arm/boot/dts/tegra124-venice2.dts    | 265 ++++++++++------------
 arch/arm/boot/dts/tegra20-harmony.dts     | 121 +++++-----
 arch/arm/boot/dts/tegra20-medcom-wide.dts |  66 +++---
 arch/arm/boot/dts/tegra20-paz00.dts       |  38 ++--
 arch/arm/boot/dts/tegra20-plutux.dts      |  66 +++---
 arch/arm/boot/dts/tegra20-seaboard.dts    | 125 +++++-----
 arch/arm/boot/dts/tegra20-tamonten.dtsi   |  39 +---
 arch/arm/boot/dts/tegra20-tec.dts         |  66 +++---
 arch/arm/boot/dts/tegra20-trimslice.dts   |  85 +++----
 arch/arm/boot/dts/tegra20-ventana.dts     |  85 +++----
 arch/arm/boot/dts/tegra30-beaver.dts      | 193 ++++++++--------
 arch/arm/boot/dts/tegra30-cardhu-a02.dts  | 128 +++++------
 arch/arm/boot/dts/tegra30-cardhu-a04.dts  | 149 ++++++------
 arch/arm/boot/dts/tegra30-cardhu.dtsi     | 261 ++++++++++-----------
 19 files changed, 1130 insertions(+), 1368 deletions(-)

...

arch/arm/boot/dts/tegra124-venice2.dts power { · line 1083

Quoted 13 lines
arch/arm/boot/dts/tegra124-venice2.dts +1 -1
index 6a7a31c831c5..effdb303c7f7 100644
@@ -1077,164 +1077,145 @@ power {
 
 	panel: panel {
 		compatible = "lg,lp129qe";
-
+		power-supply = <&vdd_3v3_panel>;
 		backlight = <&backlight>;
 		ddc-i2c-bus = <&dpaux>;
 	};

Is this meant to be in this patch?

Quoted 22 lines
arch/arm/boot/dts/tegra20-tamonten.dtsi +1 -7
index 20137fc578b1..95e6bccdb4f6 100644
@@ -495,40 +495,25 @@ usb-phy@c5008000 {
 		status = "okay";
 	};
 
-	sdhci@c8000600 {
+	mmc@c8000600 {
 		cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;
 		wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
 		bus-width = <4>;
 		status = "okay";
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {

arch/arm/boot/dts/tegra20-tamonten.dtsi usb-phy@c5008000 { · line 509

Quoted 10 lines
arch/arm/boot/dts/tegra20-tamonten.dtsi +4 -5
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};

The above appears in to be in the wrong patch.

Quoted 5 lines
arch/arm/boot/dts/tegra30-cardhu-a02.dts +0 -0
index a02ec5082287..4899e05a0d9c 100644

arch/arm/boot/dts/tegra30-cardhu-a02.dts / { · line 17

Quoted 10 lines
arch/arm/boot/dts/tegra30-cardhu-a02.dts +1 -1
@@ -9,87 +9,75 @@ / {
 	model = "NVIDIA Tegra30 Cardhu A02 evaluation board";
 	compatible = "nvidia,cardhu-a02", "nvidia,cardhu", "nvidia,tegra30";
 
-	sdhci@78000400 {
+	mmc@78000400 {
 		status = "okay";
 		power-gpios = <&gpio TEGRA_GPIO(D, 4) GPIO_ACTIVE_HIGH>;
 		bus-width = <4>;
 		keep-power-in-suspend;
 	};

And here.

Quoted 8 lines
arch/arm/boot/dts/tegra30-cardhu-a04.dts +0 -0
index 9234988624ec..c1c0ca628af1 100644
@@ -11,99 +11,86 @@ / {
 	model = "NVIDIA Tegra30 Cardhu A04 (A05, A06, A07) evaluation board";
 	compatible = "nvidia,cardhu-a04", "nvidia,cardhu", "nvidia,tegra30";
 
Quoted 9 lines

arch/arm/boot/dts/tegra30-cardhu-a04.dts / { · line 19

Quoted 7 lines
arch/arm/boot/dts/tegra30-cardhu-a04.dts +1 -1
-	sdhci@78000400 {
+	mmc@78000400 {
 		status = "okay";
 		power-gpios = <&gpio TEGRA_GPIO(D, 3) GPIO_ACTIVE_HIGH>;
 		bus-width = <4>;
 		keep-power-in-suspend;
 	};

And here.

Ugh... indeed. To be honest, I'm surprised there aren't more of these issues given the amount of rebasing that I needed to get this whole set sorted out. I'll do some more rebasing to get these into the right patches.

Thanks,
Thierry

#8 lore raw

PATCH 4/73 ARM: tegra: Remove battery-name property

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

This property is not documented and will cause a validation failure.

---
 arch/arm/boot/dts/tegra114-dalmore.dts | 1 -
 1 file changed, 1 deletion(-)
arch/arm/boot/dts/tegra114-dalmore.dts +0 -1
index 1dfff574e371..584db54cd750 100644
@@ -769,7 +769,6 @@ i2c@7000c000 {
 		battery: smart-battery@b {
 			compatible = "ti,bq20z45", "sbs,sbs-battery";
 			reg = <0xb>;
-			battery-name = "battery";
 			sbs,i2c-retry-count = <2>;
 			sbs,poll-retry-count = <100>;
 			power-supplies = <&charger>;
Signature · 1 line
2.24.1
#9 lore raw

PATCH 5/73 ARM: tegra: roth: Use the correct DSI/CSI supply

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The correct DSI/CSI supply property is called vdd-dsi-csi-supply, so use that instead of the wrong vdd-supply property.

---
 arch/arm/boot/dts/tegra114-roth.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/tegra114-roth.dts +1 -1
index 5249afdca577..7378b5d6f2fa 100644
@@ -37,7 +37,7 @@ host1x@50000000 {
 		dsi@54300000 {
 			status = "okay";
 
-			vdd-supply = <&vdd_1v2_ap>;
+			avdd-dsi-csi-supply = <&vdd_1v2_ap>;
 
 			panel@0 {
 				compatible = "lg,lh500wx1-sd03";
Signature · 1 line
2.24.1
#10 lore raw

PATCH 6/73 ARM: tegra: tn7: Use the correct DSI/CSI supply

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The correct DSI/CSI supply property is called vdd-dsi-csi-supply, so use that instead of the wrong vdd-supply property.

---
 arch/arm/boot/dts/tegra114-tn7.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/tegra114-tn7.dts +1 -1
index 90935db591a5..0e520ae1109d 100644
@@ -37,7 +37,7 @@ host1x@50000000 {
 		dsi@54300000 {
 			status = "okay";
 
-			vdd-supply = <&vdd_1v2_ap>;
+			avdd-dsi-csi-supply = <&vdd_1v2_ap>;
 
 			panel@0 {
 				compatible = "lg,ld070wx3-sl01";
Signature · 1 line
2.24.1
#11 lore raw

PATCH 7/73 ARM: tegra: Do not mark host1x as simple bus

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The host1x is not a simple bus, so drop the corresponding compatible string.

---
 arch/arm/boot/dts/tegra114.dtsi | 2 +-
 arch/arm/boot/dts/tegra124.dtsi | 2 +-
 arch/arm/boot/dts/tegra20.dtsi  | 2 +-
 arch/arm/boot/dts/tegra30.dtsi  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/tegra114.dtsi +1 -1
index 01a81d380f1f..be048aa553ee 100644
@@ -18,7 +18,7 @@ memory@80000000 {
 	};
 
 	host1x@50000000 {
-		compatible = "nvidia,tegra114-host1x", "simple-bus";
+		compatible = "nvidia,tegra114-host1x";
 		reg = <0x50000000 0x00028000>;
 		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */
 			     <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; /* general */
arch/arm/boot/dts/tegra124.dtsi +1 -1
index 94cac13d3e50..fc124343658e 100644
@@ -85,7 +85,7 @@ pci@2,0 {
 	};
 
 	host1x@50000000 {
-		compatible = "nvidia,tegra124-host1x", "simple-bus";
+		compatible = "nvidia,tegra124-host1x";
 		reg = <0x0 0x50000000 0x0 0x00034000>;
 		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */
 			     <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; /* general */
arch/arm/boot/dts/tegra20.dtsi +1 -1
index c3b8ad53b967..7319df2fcd3e 100644
@@ -31,7 +31,7 @@ vde_pool: vde@400 {
 	};
 
 	host1x@50000000 {
-		compatible = "nvidia,tegra20-host1x", "simple-bus";
+		compatible = "nvidia,tegra20-host1x";
 		reg = <0x50000000 0x00024000>;
 		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */
 			     <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; /* general */
arch/arm/boot/dts/tegra30.dtsi +1 -1
index d2d05f1da274..0b58863e570e 100644
@@ -111,7 +111,7 @@ vde_pool: vde@400 {
 	};
 
 	host1x@50000000 {
-		compatible = "nvidia,tegra30-host1x", "simple-bus";
+		compatible = "nvidia,tegra30-host1x";
 		reg = <0x50000000 0x00024000>;
 		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */
 			     <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; /* general */
Signature · 1 line
2.24.1
#12 lore raw

PATCH 8/73 ARM: tegra: Add missing host1x properties

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The host1x device tree bindings require the clock- and interrupt-names properties to be present, so add them where missing.

---
 arch/arm/boot/dts/tegra114.dtsi | 2 ++
 arch/arm/boot/dts/tegra124.dtsi | 2 ++
 arch/arm/boot/dts/tegra20.dtsi  | 2 ++
 arch/arm/boot/dts/tegra30.dtsi  | 2 ++
 4 files changed, 8 insertions(+)
arch/arm/boot/dts/tegra114.dtsi +2 -0
index be048aa553ee..a0ac9ea9ec9d 100644
@@ -22,7 +22,9 @@ host1x@50000000 {
 		reg = <0x50000000 0x00028000>;
 		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */
 			     <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; /* general */
+		interrupt-names = "syncpt", "host1x";
 		clocks = <&tegra_car TEGRA114_CLK_HOST1X>;
+		clock-names = "host1x";
 		resets = <&tegra_car 28>;
 		reset-names = "host1x";
 		iommus = <&mc TEGRA_SWGROUP_HC>;
arch/arm/boot/dts/tegra124.dtsi +2 -0
index fc124343658e..1afed8496c95 100644
@@ -89,7 +89,9 @@ host1x@50000000 {
 		reg = <0x0 0x50000000 0x0 0x00034000>;
 		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */
 			     <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; /* general */
+		interrupt-names = "syncpt", "host1x";
 		clocks = <&tegra_car TEGRA124_CLK_HOST1X>;
+		clock-names = "host1x";
 		resets = <&tegra_car 28>;
 		reset-names = "host1x";
 		iommus = <&mc TEGRA_SWGROUP_HC>;
arch/arm/boot/dts/tegra20.dtsi +2 -0
index 7319df2fcd3e..f0a172c61b26 100644
@@ -35,7 +35,9 @@ host1x@50000000 {
 		reg = <0x50000000 0x00024000>;
 		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */
 			     <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; /* general */
+		interrupt-names = "syncpt", "host1x";
 		clocks = <&tegra_car TEGRA20_CLK_HOST1X>;
+		clock-names = "host1x";
 		resets = <&tegra_car 28>;
 		reset-names = "host1x";
 
arch/arm/boot/dts/tegra30.dtsi +2 -0
index 0b58863e570e..27000f0ba35b 100644
@@ -115,7 +115,9 @@ host1x@50000000 {
 		reg = <0x50000000 0x00024000>;
 		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */
 			     <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; /* general */
+		interrupt-names = "syncpt", "host1x";
 		clocks = <&tegra_car TEGRA30_CLK_HOST1X>;
+		clock-names = "host1x";
 		resets = <&tegra_car 28>;
 		reset-names = "host1x";
 		iommus = <&mc TEGRA_SWGROUP_HC>;
Signature · 1 line
2.24.1
#13 lore raw

PATCH 9/73 ARM: tegra: gr2d is not backwards-compatible

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The instantiation of gr2d in Tegra114 is not backwards-compatible with the version found on earlier chips. Remove the misleading compatible string.

---
 arch/arm/boot/dts/tegra114.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/tegra114.dtsi +1 -1
index a0ac9ea9ec9d..d583dfba688f 100644
@@ -35,7 +35,7 @@ host1x@50000000 {
 		ranges = <0x54000000 0x54000000 0x01000000>;
 
 		gr2d@54140000 {
-			compatible = "nvidia,tegra114-gr2d", "nvidia,tegra20-gr2d";
+			compatible = "nvidia,tegra114-gr2d";
 			reg = <0x54140000 0x00040000>;
 			interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&tegra_car TEGRA114_CLK_GR2D>;
Signature · 1 line
2.24.1
#14 lore raw

Re: [PATCH 09/73] ARM: tegra: gr2d is not backwards-compatible

16.06.2020 16:51, Thierry Reding пишет:

Quoted 17 lines

From: Thierry Reding <[email protected]>

The instantiation of gr2d in Tegra114 is not backwards-compatible with the version found on earlier chips. Remove the misleading compatible string.

---
 arch/arm/boot/dts/tegra114.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/tegra114.dtsi +0 -0
index a0ac9ea9ec9d..d583dfba688f 100644

arch/arm/boot/dts/tegra114.dtsi host1x@50000000 { · line 41

Quoted 8 lines
arch/arm/boot/dts/tegra114.dtsi +1 -1
@@ -35,7 +35,7 @@ host1x@50000000 {
 		ranges = <0x54000000 0x54000000 0x01000000>;
 
 		gr2d@54140000 {
-			compatible = "nvidia,tegra114-gr2d", "nvidia,tegra20-gr2d";
+			compatible = "nvidia,tegra114-gr2d";
 			reg = <0x54140000 0x00040000>;
 			interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&tegra_car TEGRA114_CLK_GR2D>;

Could you please explain what's the difference? AFAIK, the 2D HW is identical on T20/30/114.

A message that is not in the archive (sent off-list or not yet received): 9f56be9a-1a79-07cc-371f-f3abcd20701e-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

#16 lore raw

Re: [PATCH 09/73] ARM: tegra: gr2d is not backwards-compatible

Quoted 19 lines · Dmitry Osipenko

16.06.2020 16:51, Thierry Reding пишет:

Quoted 18 lines

From: Thierry Reding <[email protected]>

The instantiation of gr2d in Tegra114 is not backwards-compatible with the version found on earlier chips. Remove the misleading compatible string.

---
 arch/arm/boot/dts/tegra114.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/tegra114.dtsi +0 -0
index a0ac9ea9ec9d..d583dfba688f 100644
@@ -35,7 +35,7 @@ host1x@50000000 {
 		ranges = <0x54000000 0x54000000 0x01000000>;
 
Quoted 10 lines

arch/arm/boot/dts/tegra114.dtsi host1x@50000000 { · line 41

Quoted 7 lines
arch/arm/boot/dts/tegra114.dtsi +1 -1
 		gr2d@54140000 {
-			compatible = "nvidia,tegra114-gr2d", "nvidia,tegra20-gr2d";
+			compatible = "nvidia,tegra114-gr2d";
 			reg = <0x54140000 0x00040000>;
 			interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&tegra_car TEGRA114_CLK_GR2D>;

Could you please explain what's the difference? AFAIK, the 2D HW is identical on T20/30/114.

My understanding is that the IP core itself is identical. However, the compatible string really describes the integration of the IP, which in case of Tegra114 is slightly different in that it's part of the HEG power partition, whereas it wasn't previously.

That means that without knowledge of the power partition we won't be able to access the gr2d IP on Tegra114 at all and hence it isn't backwards compatible with Tegra20.

Thierry

#17 lore raw

Re: [PATCH 09/73] ARM: tegra: gr2d is not backwards-compatible

22.06.2020 18:22, Thierry Reding пишет:

Quoted 31 lines · Dmitry Osipenko
Quoted 19 lines

16.06.2020 16:51, Thierry Reding пишет:

Quoted 18 lines

From: Thierry Reding <[email protected]>

The instantiation of gr2d in Tegra114 is not backwards-compatible with the version found on earlier chips. Remove the misleading compatible string.

---
 arch/arm/boot/dts/tegra114.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/tegra114.dtsi +0 -0
index a0ac9ea9ec9d..d583dfba688f 100644
@@ -35,7 +35,7 @@ host1x@50000000 {
 		ranges = <0x54000000 0x54000000 0x01000000>;
 
Quoted 10 lines

arch/arm/boot/dts/tegra114.dtsi host1x@50000000 { · line 41

Quoted 7 lines
arch/arm/boot/dts/tegra114.dtsi +1 -1
 		gr2d@54140000 {
-			compatible = "nvidia,tegra114-gr2d", "nvidia,tegra20-gr2d";
+			compatible = "nvidia,tegra114-gr2d";
 			reg = <0x54140000 0x00040000>;
 			interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&tegra_car TEGRA114_CLK_GR2D>;

Could you please explain what's the difference? AFAIK, the 2D HW is identical on T20/30/114.

Quoted 8 lines

My understanding is that the IP core itself is identical. However, the compatible string really describes the integration of the IP, which in case of Tegra114 is slightly different in that it's part of the HEG power partition, whereas it wasn't previously.

That means that without knowledge of the power partition we won't be able to access the gr2d IP on Tegra114 at all and hence it isn't backwards compatible with Tegra20.

Thank you very much for the clarification! Will nice if this could be added into the commit's description.

#18 lore raw

PATCH 10/73 ARM: tegra: gr3d is not backwards-compatible

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The instantiation of gr3d in Tegra114 is not backwards-compatible with the version found on earlier chips. Remove the misleading compatible string.

---
 arch/arm/boot/dts/tegra114.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/tegra114.dtsi +1 -1
index d583dfba688f..392f06107b32 100644
@@ -46,7 +46,7 @@ gr2d@54140000 {
 		};
 
 		gr3d@54180000 {
-			compatible = "nvidia,tegra114-gr3d", "nvidia,tegra20-gr3d";
+			compatible = "nvidia,tegra114-gr3d";
 			reg = <0x54180000 0x00040000>;
 			clocks = <&tegra_car TEGRA114_CLK_GR3D>;
 			resets = <&tegra_car 24>;
Signature · 1 line
2.24.1
#19 lore raw

PATCH 11/73 ARM: tegra: The Tegra114 DC is not backwards-compatible

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The display controller on Tegra114 is in fact not backwards-compatible with the instantiation found on earlier SoCs. Drop the misleading compatible string.

---
 arch/arm/boot/dts/tegra114.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/tegra114.dtsi +2 -2
index 392f06107b32..a06b88b01ef3 100644
@@ -56,7 +56,7 @@ gr3d@54180000 {
 		};
 
 		dc@54200000 {
-			compatible = "nvidia,tegra114-dc", "nvidia,tegra20-dc";
+			compatible = "nvidia,tegra114-dc";
 			reg = <0x54200000 0x00040000>;
 			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&tegra_car TEGRA114_CLK_DISP1>,
@@ -75,7 +75,7 @@ rgb {
 		};
 
 		dc@54240000 {
-			compatible = "nvidia,tegra114-dc", "nvidia,tegra20-dc";
+			compatible = "nvidia,tegra114-dc";
 			reg = <0x54240000 0x00040000>;
 			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&tegra_car TEGRA114_CLK_DISP2>,
Signature · 1 line
2.24.1
#20 lore raw

PATCH 12/73 ARM: tegra: Drop display controller parent clocks on Tegra114

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The parent clocks are determined by the output that will be used, not by the display controller that drives the output. Drop the parent clocks from the display controller device tree nodes.

---
 arch/arm/boot/dts/tegra114.dtsi | 10 ++++------
 arch/arm/boot/dts/tegra124.dtsi | 10 ++++------
 arch/arm/boot/dts/tegra20.dtsi  | 10 ++++------
 arch/arm/boot/dts/tegra30.dtsi  | 10 ++++------
 4 files changed, 16 insertions(+), 24 deletions(-)
arch/arm/boot/dts/tegra114.dtsi +4 -6
index a06b88b01ef3..23df7a5f37d3 100644
@@ -59,9 +59,8 @@ dc@54200000 {
 			compatible = "nvidia,tegra114-dc";
 			reg = <0x54200000 0x00040000>;
 			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA114_CLK_DISP1>,
-				 <&tegra_car TEGRA114_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA114_CLK_DISP1>;
+			clock-names = "dc";
 			resets = <&tegra_car 27>;
 			reset-names = "dc";
 
@@ -78,9 +77,8 @@ dc@54240000 {
 			compatible = "nvidia,tegra114-dc";
 			reg = <0x54240000 0x00040000>;
 			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA114_CLK_DISP2>,
-				 <&tegra_car TEGRA114_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA114_CLK_DISP2>;
+			clock-names = "dc";
 			resets = <&tegra_car 26>;
 			reset-names = "dc";
 
arch/arm/boot/dts/tegra124.dtsi +4 -6
index 1afed8496c95..2c992e8e3594 100644
@@ -105,9 +105,8 @@ dc@54200000 {
 			compatible = "nvidia,tegra124-dc";
 			reg = <0x0 0x54200000 0x0 0x00040000>;
 			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA124_CLK_DISP1>,
-				 <&tegra_car TEGRA124_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA124_CLK_DISP1>;
+			clock-names = "dc";
 			resets = <&tegra_car 27>;
 			reset-names = "dc";
 
@@ -120,9 +119,8 @@ dc@54240000 {
 			compatible = "nvidia,tegra124-dc";
 			reg = <0x0 0x54240000 0x0 0x00040000>;
 			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA124_CLK_DISP2>,
-				 <&tegra_car TEGRA124_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA124_CLK_DISP2>;
+			clock-names = "dc";
 			resets = <&tegra_car 26>;
 			reset-names = "dc";
 
arch/arm/boot/dts/tegra20.dtsi +4 -6
index f0a172c61b26..8b6909839f59 100644
@@ -103,9 +103,8 @@ dc@54200000 {
 			compatible = "nvidia,tegra20-dc";
 			reg = <0x54200000 0x00040000>;
 			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA20_CLK_DISP1>,
-				 <&tegra_car TEGRA20_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA20_CLK_DISP1>;
+			clock-names = "dc";
 			resets = <&tegra_car 27>;
 			reset-names = "dc";
 
@@ -120,9 +119,8 @@ dc@54240000 {
 			compatible = "nvidia,tegra20-dc";
 			reg = <0x54240000 0x00040000>;
 			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA20_CLK_DISP2>,
-				 <&tegra_car TEGRA20_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA20_CLK_DISP2>;
+			clock-names = "dc";
 			resets = <&tegra_car 26>;
 			reset-names = "dc";
 
arch/arm/boot/dts/tegra30.dtsi +4 -6
index 27000f0ba35b..23fedb76e5ae 100644
@@ -200,9 +200,8 @@ dc@54200000 {
 			compatible = "nvidia,tegra30-dc", "nvidia,tegra20-dc";
 			reg = <0x54200000 0x00040000>;
 			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA30_CLK_DISP1>,
-				 <&tegra_car TEGRA30_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA30_CLK_DISP1>;
+			clock-names = "dc";
 			resets = <&tegra_car 27>;
 			reset-names = "dc";
 
@@ -219,9 +218,8 @@ dc@54240000 {
 			compatible = "nvidia,tegra30-dc";
 			reg = <0x54240000 0x00040000>;
 			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA30_CLK_DISP2>,
-				 <&tegra_car TEGRA30_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA30_CLK_DISP2>;
+			clock-names = "dc";
 			resets = <&tegra_car 26>;
 			reset-names = "dc";
 
Signature · 1 line
2.24.1
#21 lore raw

Re: [PATCH 12/73] ARM: tegra: Drop display controller parent clocks on Tegra114

16.06.2020 16:51, Thierry Reding пишет:

Quoted 117 lines

From: Thierry Reding <[email protected]>

The parent clocks are determined by the output that will be used, not by the display controller that drives the output. Drop the parent clocks from the display controller device tree nodes.

---
 arch/arm/boot/dts/tegra114.dtsi | 10 ++++------
 arch/arm/boot/dts/tegra124.dtsi | 10 ++++------
 arch/arm/boot/dts/tegra20.dtsi  | 10 ++++------
 arch/arm/boot/dts/tegra30.dtsi  | 10 ++++------
 4 files changed, 16 insertions(+), 24 deletions(-)
arch/arm/boot/dts/tegra114.dtsi +4 -6
index a06b88b01ef3..23df7a5f37d3 100644
@@ -59,9 +59,8 @@ dc@54200000 {
 			compatible = "nvidia,tegra114-dc";
 			reg = <0x54200000 0x00040000>;
 			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA114_CLK_DISP1>,
-				 <&tegra_car TEGRA114_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA114_CLK_DISP1>;
+			clock-names = "dc";
 			resets = <&tegra_car 27>;
 			reset-names = "dc";
 
@@ -78,9 +77,8 @@ dc@54240000 {
 			compatible = "nvidia,tegra114-dc";
 			reg = <0x54240000 0x00040000>;
 			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA114_CLK_DISP2>,
-				 <&tegra_car TEGRA114_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA114_CLK_DISP2>;
+			clock-names = "dc";
 			resets = <&tegra_car 26>;
 			reset-names = "dc";
 
arch/arm/boot/dts/tegra124.dtsi +4 -6
index 1afed8496c95..2c992e8e3594 100644
@@ -105,9 +105,8 @@ dc@54200000 {
 			compatible = "nvidia,tegra124-dc";
 			reg = <0x0 0x54200000 0x0 0x00040000>;
 			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA124_CLK_DISP1>,
-				 <&tegra_car TEGRA124_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA124_CLK_DISP1>;
+			clock-names = "dc";
 			resets = <&tegra_car 27>;
 			reset-names = "dc";
 
@@ -120,9 +119,8 @@ dc@54240000 {
 			compatible = "nvidia,tegra124-dc";
 			reg = <0x0 0x54240000 0x0 0x00040000>;
 			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA124_CLK_DISP2>,
-				 <&tegra_car TEGRA124_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA124_CLK_DISP2>;
+			clock-names = "dc";
 			resets = <&tegra_car 26>;
 			reset-names = "dc";
 
arch/arm/boot/dts/tegra20.dtsi +4 -6
index f0a172c61b26..8b6909839f59 100644
@@ -103,9 +103,8 @@ dc@54200000 {
 			compatible = "nvidia,tegra20-dc";
 			reg = <0x54200000 0x00040000>;
 			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA20_CLK_DISP1>,
-				 <&tegra_car TEGRA20_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA20_CLK_DISP1>;
+			clock-names = "dc";
 			resets = <&tegra_car 27>;
 			reset-names = "dc";
 
@@ -120,9 +119,8 @@ dc@54240000 {
 			compatible = "nvidia,tegra20-dc";
 			reg = <0x54240000 0x00040000>;
 			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA20_CLK_DISP2>,
-				 <&tegra_car TEGRA20_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA20_CLK_DISP2>;
+			clock-names = "dc";
 			resets = <&tegra_car 26>;
 			reset-names = "dc";
 
arch/arm/boot/dts/tegra30.dtsi +2 -3
index 27000f0ba35b..23fedb76e5ae 100644
@@ -200,9 +200,8 @@ dc@54200000 {
 			compatible = "nvidia,tegra30-dc", "nvidia,tegra20-dc";
 			reg = <0x54200000 0x00040000>;
 			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA30_CLK_DISP1>,
-				 <&tegra_car TEGRA30_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA30_CLK_DISP1>;
+			clock-names = "dc";
 			resets = <&tegra_car 27>;
 			reset-names = "dc";
 
@@ -219,9 +218,8 @@ dc@54240000 {
 			compatible = "nvidia,tegra30-dc";

arch/arm/boot/dts/tegra30.dtsi dc@54240000 { · line 225

Quoted 10 lines
arch/arm/boot/dts/tegra30.dtsi +2 -3
 			reg = <0x54240000 0x00040000>;
 			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA30_CLK_DISP2>,
-				 <&tegra_car TEGRA30_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA30_CLK_DISP2>;
+			clock-names = "dc";
 			resets = <&tegra_car 26>;
 			reset-names = "dc";
 

Hello Thierry,

Tegra DRM fails to probe after this change using next-20200624 on T20/30 (T124 also should be broken):

tegra-dc 54200000.dc: failed to get parent clock tegra-dc 54200000.dc: failed to probe RGB output: -2

BTW, the commit's title is misleading since the patch touches all SoCs and not only the T114.

Please correct or drop this patch, thanks in advance.

#22 lore raw

Re: [PATCH 12/73] ARM: tegra: Drop display controller parent clocks on Tegra114

Quoted 131 lines · Dmitry Osipenko

16.06.2020 16:51, Thierry Reding пишет:

Quoted 117 lines

From: Thierry Reding <[email protected]>

The parent clocks are determined by the output that will be used, not by the display controller that drives the output. Drop the parent clocks from the display controller device tree nodes.

---
 arch/arm/boot/dts/tegra114.dtsi | 10 ++++------
 arch/arm/boot/dts/tegra124.dtsi | 10 ++++------
 arch/arm/boot/dts/tegra20.dtsi  | 10 ++++------
 arch/arm/boot/dts/tegra30.dtsi  | 10 ++++------
 4 files changed, 16 insertions(+), 24 deletions(-)
arch/arm/boot/dts/tegra114.dtsi +4 -6
index a06b88b01ef3..23df7a5f37d3 100644
@@ -59,9 +59,8 @@ dc@54200000 {
 			compatible = "nvidia,tegra114-dc";
 			reg = <0x54200000 0x00040000>;
 			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA114_CLK_DISP1>,
-				 <&tegra_car TEGRA114_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA114_CLK_DISP1>;
+			clock-names = "dc";
 			resets = <&tegra_car 27>;
 			reset-names = "dc";
 
@@ -78,9 +77,8 @@ dc@54240000 {
 			compatible = "nvidia,tegra114-dc";
 			reg = <0x54240000 0x00040000>;
 			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA114_CLK_DISP2>,
-				 <&tegra_car TEGRA114_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA114_CLK_DISP2>;
+			clock-names = "dc";
 			resets = <&tegra_car 26>;
 			reset-names = "dc";
 
arch/arm/boot/dts/tegra124.dtsi +4 -6
index 1afed8496c95..2c992e8e3594 100644
@@ -105,9 +105,8 @@ dc@54200000 {
 			compatible = "nvidia,tegra124-dc";
 			reg = <0x0 0x54200000 0x0 0x00040000>;
 			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA124_CLK_DISP1>,
-				 <&tegra_car TEGRA124_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA124_CLK_DISP1>;
+			clock-names = "dc";
 			resets = <&tegra_car 27>;
 			reset-names = "dc";
 
@@ -120,9 +119,8 @@ dc@54240000 {
 			compatible = "nvidia,tegra124-dc";
 			reg = <0x0 0x54240000 0x0 0x00040000>;
 			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA124_CLK_DISP2>,
-				 <&tegra_car TEGRA124_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA124_CLK_DISP2>;
+			clock-names = "dc";
 			resets = <&tegra_car 26>;
 			reset-names = "dc";
 
arch/arm/boot/dts/tegra20.dtsi +4 -6
index f0a172c61b26..8b6909839f59 100644
@@ -103,9 +103,8 @@ dc@54200000 {
 			compatible = "nvidia,tegra20-dc";
 			reg = <0x54200000 0x00040000>;
 			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA20_CLK_DISP1>,
-				 <&tegra_car TEGRA20_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA20_CLK_DISP1>;
+			clock-names = "dc";
 			resets = <&tegra_car 27>;
 			reset-names = "dc";
 
@@ -120,9 +119,8 @@ dc@54240000 {
 			compatible = "nvidia,tegra20-dc";
 			reg = <0x54240000 0x00040000>;
 			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA20_CLK_DISP2>,
-				 <&tegra_car TEGRA20_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA20_CLK_DISP2>;
+			clock-names = "dc";
 			resets = <&tegra_car 26>;
 			reset-names = "dc";
 
arch/arm/boot/dts/tegra30.dtsi +2 -3
index 27000f0ba35b..23fedb76e5ae 100644
@@ -200,9 +200,8 @@ dc@54200000 {
 			compatible = "nvidia,tegra30-dc", "nvidia,tegra20-dc";
 			reg = <0x54200000 0x00040000>;
 			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA30_CLK_DISP1>,
-				 <&tegra_car TEGRA30_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA30_CLK_DISP1>;
+			clock-names = "dc";
 			resets = <&tegra_car 27>;
 			reset-names = "dc";
 
@@ -219,9 +218,8 @@ dc@54240000 {
 			compatible = "nvidia,tegra30-dc";

arch/arm/boot/dts/tegra30.dtsi dc@54240000 { · line 225

Quoted 10 lines
arch/arm/boot/dts/tegra30.dtsi +2 -3
 			reg = <0x54240000 0x00040000>;
 			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA30_CLK_DISP2>,
-				 <&tegra_car TEGRA30_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA30_CLK_DISP2>;
+			clock-names = "dc";
 			resets = <&tegra_car 26>;
 			reset-names = "dc";
 

Hello Thierry,

Quoted 5 lines

Tegra DRM fails to probe after this change using next-20200624 on T20/30 (T124 also should be broken):

tegra-dc 54200000.dc: failed to get parent clock tegra-dc 54200000.dc: failed to probe RGB output: -2

Indeed. I had completely missed that we used to have this RGB output on prior chips and therefore do need the parent clock. As of Tegra124 that RGB output is no longer present, so this isn't needed anymore.

Quoted 2 lines

BTW, the commit's title is misleading since the patch touches all SoCs and not only the T114.

Good catch. I've replaced this with the following:

--- >8 ---
commit afd92390fcaa784a6d064f3b07c8d8124e43e5d1

Author: Thierry Reding <[email protected]>
Date:   Thu Jun 11 19:09:36 2020 +0200

ARM: tegra: Drop display controller parent clocks on Tegra124

The parent clocks are determined by the output that will be used, not by the display controller that drives the output. On previous generations a simple RGB output used to be part of the display controller and hence an explicit parent clock needed to be assigned to the display controller to drive the RGB output. Starting with Tegra124, that RGB output has been dropped and the parent clock can therefore be removed from the display controller device tree nodes.

arch/arm/boot/dts/tegra124.dtsi +4 -7
index 1afed8496c95..2c992e8e3594 100644
@@ -105,9 +105,8 @@ dc@54200000 {
 			compatible = "nvidia,tegra124-dc";
 			reg = <0x0 0x54200000 0x0 0x00040000>;
 			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA124_CLK_DISP1>,
-				 <&tegra_car TEGRA124_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA124_CLK_DISP1>;
+			clock-names = "dc";
 			resets = <&tegra_car 27>;
 			reset-names = "dc";
 
@@ -120,9 +119,8 @@ dc@54240000 {
 			compatible = "nvidia,tegra124-dc";
 			reg = <0x0 0x54240000 0x0 0x00040000>;
 			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA124_CLK_DISP2>,
-				 <&tegra_car TEGRA124_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA124_CLK_DISP2>;
+			clock-names = "dc";
 			resets = <&tegra_car 26>;
 			reset-names = "dc";
--- >8 ---

Thierry

#23 lore raw

Re: [PATCH 12/73] ARM: tegra: Drop display controller parent clocks on Tegra114

25.06.2020 10:37, Thierry Reding пишет:

Quoted 10 lines · Dmitry Osipenko
Quoted 9 lines

16.06.2020 16:51, Thierry Reding пишет:

Quoted 8 lines

From: Thierry Reding <[email protected]>

The parent clocks are determined by the output that will be used, not by the display controller that drives the output. Drop the parent clocks from the display controller device tree nodes.

---

...

Quoted 52 lines
Quoted 7 lines

Hello Thierry,

Tegra DRM fails to probe after this change using next-20200624 on T20/30 (T124 also should be broken):

tegra-dc 54200000.dc: failed to get parent clock tegra-dc 54200000.dc: failed to probe RGB output: -2

Indeed. I had completely missed that we used to have this RGB output on prior chips and therefore do need the parent clock. As of Tegra124 that RGB output is no longer present, so this isn't needed anymore.

Quoted 2 lines

BTW, the commit's title is misleading since the patch touches all SoCs and not only the T114.

Good catch. I've replaced this with the following:

--- >8 ---
commit afd92390fcaa784a6d064f3b07c8d8124e43e5d1

Author: Thierry Reding <[email protected]>
Date:   Thu Jun 11 19:09:36 2020 +0200

ARM: tegra: Drop display controller parent clocks on Tegra124

The parent clocks are determined by the output that will be used, not by the display controller that drives the output. On previous generations a simple RGB output used to be part of the display controller and hence an explicit parent clock needed to be assigned to the display controller to drive the RGB output. Starting with Tegra124, that RGB output has been dropped and the parent clock can therefore be removed from the display controller device tree nodes.

arch/arm/boot/dts/tegra124.dtsi +2 -3
index 1afed8496c95..2c992e8e3594 100644
@@ -105,9 +105,8 @@ dc@54200000 {
 			compatible = "nvidia,tegra124-dc";
 			reg = <0x0 0x54200000 0x0 0x00040000>;
 			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA124_CLK_DISP1>,
-				 <&tegra_car TEGRA124_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA124_CLK_DISP1>;
+			clock-names = "dc";
 			resets = <&tegra_car 27>;
 			reset-names = "dc";
 
@@ -120,9 +119,8 @@ dc@54240000 {
 			compatible = "nvidia,tegra124-dc";

arch/arm/boot/dts/tegra124.dtsi dc@54240000 { · line 128

Quoted 10 lines
arch/arm/boot/dts/tegra124.dtsi +2 -4
 			reg = <0x0 0x54240000 0x0 0x00040000>;
 			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA124_CLK_DISP2>,
-				 <&tegra_car TEGRA124_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA124_CLK_DISP2>;
+			clock-names = "dc";
 			resets = <&tegra_car 26>;
 			reset-names = "dc";
--- >8 ---

Looks good, thank you!

#24 lore raw

PATCH 13/73 ARM: tegra: Rename sdhci nodes to mmc

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The new json-schema based validation tools require SD/MMC controller nodes to be named mmc. Rename all references to them.

Cc Marcel Ziswiler <[email protected]>
Cc Philippe Schenker <[email protected]>
---
 arch/arm/boot/dts/tegra114-dalmore.dts          | 4 ++--
 arch/arm/boot/dts/tegra114-roth.dts             | 4 ++--
 arch/arm/boot/dts/tegra114-tn7.dts              | 2 +-
 arch/arm/boot/dts/tegra114.dtsi                 | 8 ++++----
 arch/arm/boot/dts/tegra124-apalis-eval.dts      | 4 ++--
 arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 4 ++--
 arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi     | 2 +-
 arch/arm/boot/dts/tegra124-apalis.dtsi          | 2 +-
 arch/arm/boot/dts/tegra124-jetson-tk1.dts       | 4 ++--
 arch/arm/boot/dts/tegra124-nyan-big.dts         | 2 +-
 arch/arm/boot/dts/tegra124-nyan.dtsi            | 6 +++---
 arch/arm/boot/dts/tegra124-venice2.dts          | 4 ++--
 arch/arm/boot/dts/tegra124.dtsi                 | 8 ++++----
 arch/arm/boot/dts/tegra20-colibri-eval-v3.dts   | 2 +-
 arch/arm/boot/dts/tegra20-colibri-iris.dts      | 2 +-
 arch/arm/boot/dts/tegra20-harmony.dts           | 4 ++--
 arch/arm/boot/dts/tegra20-paz00.dts             | 4 ++--
 arch/arm/boot/dts/tegra20-seaboard.dts          | 6 +++---
 arch/arm/boot/dts/tegra20-ventana.dts           | 6 +++---
 arch/arm/boot/dts/tegra20.dtsi                  | 8 ++++----
 arch/arm/boot/dts/tegra30-apalis-eval.dts       | 4 ++--
 arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts  | 4 ++--
 arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi      | 2 +-
 arch/arm/boot/dts/tegra30-apalis.dtsi           | 2 +-
 arch/arm/boot/dts/tegra30-beaver.dts            | 4 ++--
 arch/arm/boot/dts/tegra30-cardhu.dtsi           | 4 ++--
 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts   | 2 +-
 arch/arm/boot/dts/tegra30-colibri.dtsi          | 2 +-
 arch/arm/boot/dts/tegra30.dtsi                  | 8 ++++----
 29 files changed, 59 insertions(+), 59 deletions(-)
arch/arm/boot/dts/tegra114-dalmore.dts +2 -2
index 584db54cd750..c04162ddec3c 100644
@@ -1108,14 +1108,14 @@ i2s@70080400 {
 		};
 	};
 
-	sdhci@78000400 {
+	mmc@78000400 {
 		cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
 		wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_HIGH>;
 		bus-width = <4>;
 		status = "okay";
 	};
 
-	sdhci@78000600 {
+	mmc@78000600 {
 		bus-width = <8>;
 		status = "okay";
 		non-removable;
arch/arm/boot/dts/tegra114-roth.dts +2 -2
index 7378b5d6f2fa..07960171fabe 100644
@@ -962,7 +962,7 @@ pmc@7000e400 {
 	};
 
 	/* SD card */
-	sdhci@78000400 {
+	mmc@78000400 {
 		status = "okay";
 		bus-width = <4>;
 		vqmmc-supply = <&vddio_sdmmc3>;
@@ -971,7 +971,7 @@ sdhci@78000400 {
 	};
 
 	/* eMMC */
-	sdhci@78000600 {
+	mmc@78000600 {
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
arch/arm/boot/dts/tegra114-tn7.dts +1 -1
index 0e520ae1109d..745d234b105b 100644
@@ -242,7 +242,7 @@ pmc@7000e400 {
 	};
 
 	/* eMMC */
-	sdhci@78000600 {
+	mmc@78000600 {
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
arch/arm/boot/dts/tegra114.dtsi +4 -4
index 23df7a5f37d3..69e0e3eeffb4 100644
@@ -644,7 +644,7 @@ mipi: mipi@700e3000 {
 		#nvidia,mipi-calibrate-cells = <1>;
 	};
 
-	sdhci@78000000 {
+	mmc@78000000 {
 		compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
 		reg = <0x78000000 0x200>;
 		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -655,7 +655,7 @@ sdhci@78000000 {
 		status = "disabled";
 	};
 
-	sdhci@78000200 {
+	mmc@78000200 {
 		compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
 		reg = <0x78000200 0x200>;
 		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -666,7 +666,7 @@ sdhci@78000200 {
 		status = "disabled";
 	};
 
-	sdhci@78000400 {
+	mmc@78000400 {
 		compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
 		reg = <0x78000400 0x200>;
 		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -677,7 +677,7 @@ sdhci@78000400 {
 		status = "disabled";
 	};
 
-	sdhci@78000600 {
+	mmc@78000600 {
 		compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
 		reg = <0x78000600 0x200>;
 		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
arch/arm/boot/dts/tegra124-apalis-eval.dts +2 -2
index ceb3f6388c7d..28c29b6813a7 100644
@@ -130,7 +130,7 @@ usb@70090000 {
 	};
 
 	/* Apalis MMC1 */
-	sdhci@700b0000 {
+	mmc@700b0000 {
 		status = "okay";
 		bus-width = <4>;
 		/* MMC1_CD# */
@@ -139,7 +139,7 @@ sdhci@700b0000 {
 	};
 
 	/* Apalis SD1 */
-	sdhci@700b0400 {
+	mmc@700b0400 {
 		status = "okay";
 		bus-width = <4>;
 		/* SD1_CD# */
arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts +2 -2
index 826b776fbe6f..f3afde410615 100644
@@ -132,7 +132,7 @@ usb@70090000 {
 	};
 
 	/* Apalis MMC1 */
-	sdhci@700b0000 {
+	mmc@700b0000 {
 		status = "okay";
 		bus-width = <4>;
 		/* MMC1_CD# */
@@ -141,7 +141,7 @@ sdhci@700b0000 {
 	};
 
 	/* Apalis SD1 */
-	sdhci@700b0400 {
+	mmc@700b0400 {
 		status = "okay";
 		bus-width = <4>;
 		/* SD1_CD# */
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi +1 -1
index 1cc080fd062e..3fdc6ff32b0c 100644
@@ -1909,7 +1909,7 @@ usb3-1 {
 	};
 
 	/* eMMC */
-	sdhci@700b0600 {
+	mmc@700b0600 {
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
arch/arm/boot/dts/tegra124-apalis.dtsi +1 -1
index f2b243d98c7c..29ceeba1e7b1 100644
@@ -1901,7 +1901,7 @@ usb3-1 {
 	};
 
 	/* eMMC */
-	sdhci@700b0600 {
+	mmc@700b0600 {
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
arch/arm/boot/dts/tegra124-jetson-tk1.dts +2 -2
index e97943871fd8..289bf6e99041 100644
@@ -1797,7 +1797,7 @@ usb3-0 {
 	};
 
 	/* SD card */
-	sdhci@700b0400 {
+	mmc@700b0400 {
 		status = "okay";
 		cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
 		power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
@@ -1807,7 +1807,7 @@ sdhci@700b0400 {
 	};
 
 	/* eMMC */
-	sdhci@700b0600 {
+	mmc@700b0600 {
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
arch/arm/boot/dts/tegra124-nyan-big.dts +1 -1
index d97791b98958..4d14dec21af6 100644
@@ -20,7 +20,7 @@ panel: panel {
 		ddc-i2c-bus = <&dpaux>;
 	};
 
-	sdhci@700b0400 { /* SD Card on this bus */
+	mmc@700b0400 { /* SD Card on this bus */
 		wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>;
 	};
 
arch/arm/boot/dts/tegra124-nyan.dtsi +3 -3
index b3b5c12cbda9..41a3db6649c5 100644
@@ -491,7 +491,7 @@ sdhci0_pwrseq: sdhci0_pwrseq {
 		reset-gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_LOW>;
 	};
 
-	sdhci@700b0000 { /* WiFi/BT on this bus */
+	mmc@700b0000 { /* WiFi/BT on this bus */
 		status = "okay";
 		bus-width = <4>;
 		no-1-8-v;
@@ -502,7 +502,7 @@ sdhci@700b0000 { /* WiFi/BT on this bus */
 		keep-power-in-suspend;
 	};
 
-	sdhci@700b0400 { /* SD Card on this bus */
+	mmc@700b0400 { /* SD Card on this bus */
 		status = "okay";
 		cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
 		power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
@@ -511,7 +511,7 @@ sdhci@700b0400 { /* SD Card on this bus */
 		vqmmc-supply = <&vddio_sdmmc3>;
 	};
 
-	sdhci@700b0600 { /* eMMC on this bus */
+	mmc@700b0600 { /* eMMC on this bus */
 		status = "okay";
 		bus-width = <8>;
 		no-1-8-v;
arch/arm/boot/dts/tegra124-venice2.dts +2 -2
index effdb303c7f7..584a3b2125cd 100644
@@ -998,7 +998,7 @@ usb3-1 {
 		};
 	};
 
-	sdhci@700b0400 {
+	mmc@700b0400 {
 		cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
 		power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
 		wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>;
@@ -1007,7 +1007,7 @@ sdhci@700b0400 {
 		vqmmc-supply = <&vddio_sdmmc3>;
 	};
 
-	sdhci@700b0600 {
+	mmc@700b0600 {
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
arch/arm/boot/dts/tegra124.dtsi +4 -4
index 2c992e8e3594..76c1ef923213 100644
@@ -833,7 +833,7 @@ usb3-1 {
 		};
 	};
 
-	sdhci@700b0000 {
+	mmc@700b0000 {
 		compatible = "nvidia,tegra124-sdhci";
 		reg = <0x0 0x700b0000 0x0 0x200>;
 		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -843,7 +843,7 @@ sdhci@700b0000 {
 		status = "disabled";
 	};
 
-	sdhci@700b0200 {
+	mmc@700b0200 {
 		compatible = "nvidia,tegra124-sdhci";
 		reg = <0x0 0x700b0200 0x0 0x200>;
 		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -853,7 +853,7 @@ sdhci@700b0200 {
 		status = "disabled";
 	};
 
-	sdhci@700b0400 {
+	mmc@700b0400 {
 		compatible = "nvidia,tegra124-sdhci";
 		reg = <0x0 0x700b0400 0x0 0x200>;
 		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -863,7 +863,7 @@ sdhci@700b0400 {
 		status = "disabled";
 	};
 
-	sdhci@700b0600 {
+	mmc@700b0600 {
 		compatible = "nvidia,tegra124-sdhci";
 		reg = <0x0 0x700b0600 0x0 0x200>;
 		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
arch/arm/boot/dts/tegra20-colibri-eval-v3.dts +1 -1
index 37ad508b61d9..a05fb3853da8 100644
@@ -183,7 +183,7 @@ can@0 {
 	};
 
 	/* SD/MMC */
-	sdhci@c8000600 {
+	mmc@c8000600 {
 		status = "okay";
 		bus-width = <4>;
 		cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */
arch/arm/boot/dts/tegra20-colibri-iris.dts +1 -1
index af4740847769..425494b9ed54 100644
@@ -171,7 +171,7 @@ spi@7000da00 {
 	};
 
 	/* SD/MMC */
-	sdhci@c8000600 {
+	mmc@c8000600 {
 		status = "okay";
 		bus-width = <4>;
 		cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */
arch/arm/boot/dts/tegra20-harmony.dts +2 -2
index b051d75d4642..86494cb4d5a1 100644
@@ -613,7 +613,7 @@ usb-phy@c5008000 {
 		status = "okay";
 	};
 
-	sdhci@c8000200 {
+	mmc@c8000200 {
 		status = "okay";
 		cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
 		wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
@@ -621,7 +621,7 @@ sdhci@c8000200 {
 		bus-width = <4>;
 	};
 
-	sdhci@c8000600 {
+	mmc@c8000600 {
 		status = "okay";
 		cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;
 		wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
arch/arm/boot/dts/tegra20-paz00.dts +2 -2
index 2a0e5754f50f..91b6bb82e960 100644
@@ -543,7 +543,7 @@ usb-phy@c5008000 {
 		status = "okay";
 	};
 
-	sdhci@c8000000 {
+	mmc@c8000000 {
 		status = "okay";
 		cd-gpios = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_LOW>;
 		wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
@@ -551,7 +551,7 @@ sdhci@c8000000 {
 		bus-width = <4>;
 	};
 
-	sdhci@c8000600 {
+	mmc@c8000600 {
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
arch/arm/boot/dts/tegra20-seaboard.dts +3 -3
index 9a1ab4bd43e0..f1baf16c5010 100644
@@ -760,14 +760,14 @@ usb-phy@c5008000 {
 		status = "okay";
 	};
 
-	sdhci@c8000000 {
+	mmc@c8000000 {
 		status = "okay";
 		power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
 		bus-width = <4>;
 		keep-power-in-suspend;
 	};
 
-	sdhci@c8000400 {
+	mmc@c8000400 {
 		status = "okay";
 		cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
 		wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
@@ -775,7 +775,7 @@ sdhci@c8000400 {
 		bus-width = <4>;
 	};
 
-	sdhci@c8000600 {
+	mmc@c8000600 {
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
arch/arm/boot/dts/tegra20-ventana.dts +3 -3
index ccc24674be03..b158771ac0b7 100644
@@ -554,14 +554,14 @@ usb-phy@c5008000 {
 		status = "okay";
 	};
 
-	sdhci@c8000000 {
+	mmc@c8000000 {
 		status = "okay";
 		power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
 		bus-width = <4>;
 		keep-power-in-suspend;
 	};
 
-	sdhci@c8000400 {
+	mmc@c8000400 {
 		status = "okay";
 		cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
 		wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
@@ -569,7 +569,7 @@ sdhci@c8000400 {
 		bus-width = <4>;
 	};
 
-	sdhci@c8000600 {
+	mmc@c8000600 {
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
arch/arm/boot/dts/tegra20.dtsi +4 -4
index 8b6909839f59..9e71ed84bf28 100644
@@ -805,7 +805,7 @@ phy3: usb-phy@c5008000 {
 		status = "disabled";
 	};
 
-	sdhci@c8000000 {
+	mmc@c8000000 {
 		compatible = "nvidia,tegra20-sdhci";
 		reg = <0xc8000000 0x200>;
 		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -815,7 +815,7 @@ sdhci@c8000000 {
 		status = "disabled";
 	};
 
-	sdhci@c8000200 {
+	mmc@c8000200 {
 		compatible = "nvidia,tegra20-sdhci";
 		reg = <0xc8000200 0x200>;
 		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -825,7 +825,7 @@ sdhci@c8000200 {
 		status = "disabled";
 	};
 
-	sdhci@c8000400 {
+	mmc@c8000400 {
 		compatible = "nvidia,tegra20-sdhci";
 		reg = <0xc8000400 0x200>;
 		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -835,7 +835,7 @@ sdhci@c8000400 {
 		status = "disabled";
 	};
 
-	sdhci@c8000600 {
+	mmc@c8000600 {
 		compatible = "nvidia,tegra20-sdhci";
 		reg = <0xc8000600 0x200>;
 		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
arch/arm/boot/dts/tegra30-apalis-eval.dts +2 -2
index b39c26806bf2..9f653ef41da4 100644
@@ -120,7 +120,7 @@ spi@7000dc00 {
 	};
 
 	/* Apalis SD1 */
-	sdhci@78000000 {
+	mmc@78000000 {
 		status = "okay";
 		bus-width = <4>;
 		/* SD1_CD# */
@@ -129,7 +129,7 @@ sdhci@78000000 {
 	};
 
 	/* Apalis MMC1 */
-	sdhci@78000400 {
+	mmc@78000400 {
 		status = "okay";
 		bus-width = <8>;
 		/* MMC1_CD# */
arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts +2 -2
index e29dca92ba0a..dc633e529822 100644
@@ -121,7 +121,7 @@ spi@7000dc00 {
 	};
 
 	/* Apalis SD1 */
-	sdhci@78000000 {
+	mmc@78000000 {
 		status = "okay";
 		bus-width = <4>;
 		/* SD1_CD# */
@@ -130,7 +130,7 @@ sdhci@78000000 {
 	};
 
 	/* Apalis MMC1 */
-	sdhci@78000400 {
+	mmc@78000400 {
 		status = "okay";
 		bus-width = <8>;
 		/* MMC1_CD# */
arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi +1 -1
index 387b17458e22..9421063cd86c 100644
@@ -1112,7 +1112,7 @@ i2s@70080500 {
 	};
 
 	/* eMMC */
-	sdhci@78000600 {
+	mmc@78000600 {
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
arch/arm/boot/dts/tegra30-apalis.dtsi +1 -1
index 6648506f3aa4..d13f6b0c7c0c 100644
@@ -1094,7 +1094,7 @@ i2s@70080500 {
 	};
 
 	/* eMMC */
-	sdhci@78000600 {
+	mmc@78000600 {
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
arch/arm/boot/dts/tegra30-beaver.dts +2 -2
index 3211c61f956c..e0624b74fb50 100644
@@ -1922,7 +1922,7 @@ i2s@70080400 {
 		};
 	};
 
-	sdhci@78000000 {
+	mmc@78000000 {
 		status = "okay";
 		vqmmc-supply = <&ldo5_reg>;
 		cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
@@ -1931,7 +1931,7 @@ sdhci@78000000 {
 		bus-width = <4>;
 	};
 
-	sdhci@78000600 {
+	mmc@78000600 {
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
arch/arm/boot/dts/tegra30-cardhu.dtsi +2 -2
index c8dc3b6ab2f6..dab9989fa760 100644
@@ -384,7 +384,7 @@ i2s@70080400 {
 		};
 	};
 
-	sdhci@78000000 {
+	mmc@78000000 {
 		status = "okay";
 		cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
 		wp-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>;
@@ -392,7 +392,7 @@ sdhci@78000000 {
 		bus-width = <4>;
 	};
 
-	sdhci@78000600 {
+	mmc@78000600 {
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +1 -1
index 8e106e784dce..7d4a6ca4936a 100644
@@ -98,7 +98,7 @@ can@0 {
 	};
 
 	/* SD/MMC */
-	sdhci@78000200 {
+	mmc@78000200 {
 		status = "okay";
 		bus-width = <4>;
 		cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */
arch/arm/boot/dts/tegra30-colibri.dtsi +1 -1
index adba554381c7..a7bfe26f038d 100644
@@ -933,7 +933,7 @@ i2s@70080500 {
 	};
 
 	/* eMMC */
-	sdhci@78000600 {
+	mmc@78000600 {
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
arch/arm/boot/dts/tegra30.dtsi +4 -4
index 23fedb76e5ae..536cc5629440 100644
@@ -851,7 +851,7 @@ tegra_i2s4: i2s@70080700 {
 		};
 	};
 
-	sdhci@78000000 {
+	mmc@78000000 {
 		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
 		reg = <0x78000000 0x200>;
 		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -861,7 +861,7 @@ sdhci@78000000 {
 		status = "disabled";
 	};
 
-	sdhci@78000200 {
+	mmc@78000200 {
 		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
 		reg = <0x78000200 0x200>;
 		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -871,7 +871,7 @@ sdhci@78000200 {
 		status = "disabled";
 	};
 
-	sdhci@78000400 {
+	mmc@78000400 {
 		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
 		reg = <0x78000400 0x200>;
 		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -881,7 +881,7 @@ sdhci@78000400 {
 		status = "disabled";
 	};
 
-	sdhci@78000600 {
+	mmc@78000600 {
 		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
 		reg = <0x78000600 0x200>;
 		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.24.1
#25 lore raw

PATCH 14/73 ARM: tegra: Tegra114 SDHCI is not backwards-compatible

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The SDHCI controller instantiated on Tegra114 is not backwards- compatible with the version on Tegra30, so remove the corresponding compatible string.

---
 arch/arm/boot/dts/tegra114.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/tegra114.dtsi +4 -4
index 69e0e3eeffb4..88632d8d0bde 100644
@@ -645,7 +645,7 @@ mipi: mipi@700e3000 {
 	};
 
 	mmc@78000000 {
-		compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
+		compatible = "nvidia,tegra114-sdhci";
 		reg = <0x78000000 0x200>;
 		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA114_CLK_SDMMC1>;
@@ -656,7 +656,7 @@ mmc@78000000 {
 	};
 
 	mmc@78000200 {
-		compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
+		compatible = "nvidia,tegra114-sdhci";
 		reg = <0x78000200 0x200>;
 		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA114_CLK_SDMMC2>;
@@ -667,7 +667,7 @@ mmc@78000200 {
 	};
 
 	mmc@78000400 {
-		compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
+		compatible = "nvidia,tegra114-sdhci";
 		reg = <0x78000400 0x200>;
 		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA114_CLK_SDMMC3>;
@@ -678,7 +678,7 @@ mmc@78000400 {
 	};
 
 	mmc@78000600 {
-		compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
+		compatible = "nvidia,tegra114-sdhci";
 		reg = <0x78000600 0x200>;
 		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA114_CLK_SDMMC4>;
Signature · 1 line
2.24.1
#26 lore raw

PATCH 15/73 ARM: tegra: Add missing #phy-cells property to USB PHYs

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

USB PHYs must have a #phy-cells property, so add one to the Tegra USB PHYs which don't have one.

---
 arch/arm/boot/dts/tegra114.dtsi | 2 ++
 arch/arm/boot/dts/tegra124.dtsi | 3 +++
 arch/arm/boot/dts/tegra20.dtsi  | 3 +++
 arch/arm/boot/dts/tegra30.dtsi  | 3 +++
 4 files changed, 11 insertions(+)
arch/arm/boot/dts/tegra114.dtsi +2 -0
index 88632d8d0bde..d28d35dc3f5c 100644
@@ -710,6 +710,7 @@ phy1: usb-phy@7d000000 {
 		clock-names = "reg", "pll_u", "utmi-pads";
 		resets = <&tegra_car 22>, <&tegra_car 22>;
 		reset-names = "usb", "utmi-pads";
+		#phy-cells = <0>;
 		nvidia,hssync-start-delay = <0>;
 		nvidia,idle-wait-delay = <17>;
 		nvidia,elastic-limit = <16>;
@@ -746,6 +747,7 @@ phy3: usb-phy@7d008000 {
 		clock-names = "reg", "pll_u", "utmi-pads";
 		resets = <&tegra_car 59>, <&tegra_car 22>;
 		reset-names = "usb", "utmi-pads";
+		#phy-cells = <0>;
 		nvidia,hssync-start-delay = <0>;
 		nvidia,idle-wait-delay = <17>;
 		nvidia,elastic-limit = <16>;
arch/arm/boot/dts/tegra124.dtsi +3 -0
index 76c1ef923213..f00e962c8f55 100644
@@ -1056,6 +1056,7 @@ phy1: usb-phy@7d000000 {
 		clock-names = "reg", "pll_u", "utmi-pads";
 		resets = <&tegra_car 22>, <&tegra_car 22>;
 		reset-names = "usb", "utmi-pads";
+		#phy-cells = <0>;
 		nvidia,hssync-start-delay = <0>;
 		nvidia,idle-wait-delay = <17>;
 		nvidia,elastic-limit = <16>;
@@ -1093,6 +1094,7 @@ phy2: usb-phy@7d004000 {
 		clock-names = "reg", "pll_u", "utmi-pads";
 		resets = <&tegra_car 58>, <&tegra_car 22>;
 		reset-names = "usb", "utmi-pads";
+		#phy-cells = <0>;
 		nvidia,hssync-start-delay = <0>;
 		nvidia,idle-wait-delay = <17>;
 		nvidia,elastic-limit = <16>;
@@ -1129,6 +1131,7 @@ phy3: usb-phy@7d008000 {
 		clock-names = "reg", "pll_u", "utmi-pads";
 		resets = <&tegra_car 59>, <&tegra_car 22>;
 		reset-names = "usb", "utmi-pads";
+		#phy-cells = <0>;
 		nvidia,hssync-start-delay = <0>;
 		nvidia,idle-wait-delay = <17>;
 		nvidia,elastic-limit = <16>;
arch/arm/boot/dts/tegra20.dtsi +3 -0
index 9e71ed84bf28..77f6b3ee8418 100644
@@ -735,6 +735,7 @@ phy1: usb-phy@c5000000 {
 		clock-names = "reg", "pll_u", "timer", "utmi-pads";
 		resets = <&tegra_car 22>, <&tegra_car 22>;
 		reset-names = "usb", "utmi-pads";
+		#phy-cells = <0>;
 		nvidia,has-legacy-mode;
 		nvidia,hssync-start-delay = <9>;
 		nvidia,idle-wait-delay = <17>;
@@ -769,6 +770,7 @@ phy2: usb-phy@c5004000 {
 		clock-names = "reg", "pll_u", "ulpi-link";
 		resets = <&tegra_car 58>, <&tegra_car 22>;
 		reset-names = "usb", "utmi-pads";
+		#phy-cells = <0>;
 		status = "disabled";
 	};
 
@@ -795,6 +797,7 @@ phy3: usb-phy@c5008000 {
 		clock-names = "reg", "pll_u", "timer", "utmi-pads";
 		resets = <&tegra_car 59>, <&tegra_car 22>;
 		reset-names = "usb", "utmi-pads";
+		#phy-cells = <0>;
 		nvidia,hssync-start-delay = <9>;
 		nvidia,idle-wait-delay = <17>;
 		nvidia,elastic-limit = <16>;
arch/arm/boot/dts/tegra30.dtsi +3 -0
index 536cc5629440..3d0515f6db51 100644
@@ -914,6 +914,7 @@ phy1: usb-phy@7d000000 {
 		clock-names = "reg", "pll_u", "utmi-pads";
 		resets = <&tegra_car 22>, <&tegra_car 22>;
 		reset-names = "usb", "utmi-pads";
+		#phy-cells = <0>;
 		nvidia,hssync-start-delay = <9>;
 		nvidia,idle-wait-delay = <17>;
 		nvidia,elastic-limit = <16>;
@@ -951,6 +952,7 @@ phy2: usb-phy@7d004000 {
 		clock-names = "reg", "pll_u", "utmi-pads";
 		resets = <&tegra_car 58>, <&tegra_car 22>;
 		reset-names = "usb", "utmi-pads";
+		#phy-cells = <0>;
 		nvidia,hssync-start-delay = <9>;
 		nvidia,idle-wait-delay = <17>;
 		nvidia,elastic-limit = <16>;
@@ -987,6 +989,7 @@ phy3: usb-phy@7d008000 {
 		clock-names = "reg", "pll_u", "utmi-pads";
 		resets = <&tegra_car 59>, <&tegra_car 22>;
 		reset-names = "usb", "utmi-pads";
+		#phy-cells = <0>;
 		nvidia,hssync-start-delay = <0>;
 		nvidia,idle-wait-delay = <17>;
 		nvidia,elastic-limit = <16>;
Signature · 1 line
2.24.1
#27 lore raw

PATCH 16/73 ARM: tegra: Add missing #sound-dai-cells property to codecs

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

Audio codecs need a #sound-dai-cells property, so add one to the audio codecs on various Tegra-based boards that don't have one.

Cc Marcel Ziswiler <[email protected]>
Cc Philippe Schenker <[email protected]>
---
 arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 1 +
 arch/arm/boot/dts/tegra124-apalis.dtsi      | 1 +
 arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi  | 1 +
 arch/arm/boot/dts/tegra30-apalis.dtsi       | 1 +
 arch/arm/boot/dts/tegra30-colibri.dtsi      | 1 +
 5 files changed, 5 insertions(+)
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi +1 -0
index 3fdc6ff32b0c..0d6890af457e 100644
@@ -1559,6 +1559,7 @@ i2c@7000d000 {
 		sgtl5000: codec@a {
 			compatible = "fsl,sgtl5000";
 			reg = <0x0a>;
+			#sound-dai-cells = <0>;
 			VDDA-supply = <&reg_module_3v3_audio>;
 			VDDD-supply = <&reg_1v8_vddio>;
 			VDDIO-supply = <&reg_1v8_vddio>;
arch/arm/boot/dts/tegra124-apalis.dtsi +1 -0
index 29ceeba1e7b1..8857a11332c2 100644
@@ -1552,6 +1552,7 @@ i2c@7000d000 {
 		sgtl5000: codec@a {
 			compatible = "fsl,sgtl5000";
 			reg = <0x0a>;
+			#sound-dai-cells = <0>;
 			VDDA-supply = <&reg_module_3v3_audio>;
 			VDDD-supply = <&reg_1v8_vddio>;
 			VDDIO-supply = <&reg_1v8_vddio>;
arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi +1 -0
index 9421063cd86c..fdd3e4e3522b 100644
@@ -855,6 +855,7 @@ i2c@7000d000 {
 		sgtl5000: codec@a {
 			compatible = "fsl,sgtl5000";
 			reg = <0x0a>;
+			#sound-dai-cells = <0>;
 			VDDA-supply = <&reg_module_3v3_audio>;
 			VDDD-supply = <&reg_1v8_vio>;
 			VDDIO-supply = <&reg_module_3v3>;
arch/arm/boot/dts/tegra30-apalis.dtsi +1 -0
index d13f6b0c7c0c..90694d1a3b0c 100644
@@ -846,6 +846,7 @@ i2c@7000d000 {
 		sgtl5000: codec@a {
 			compatible = "fsl,sgtl5000";
 			reg = <0x0a>;
+			#sound-dai-cells = <0>;
 			VDDA-supply = <&reg_module_3v3_audio>;
 			VDDD-supply = <&reg_1v8_vio>;
 			VDDIO-supply = <&reg_module_3v3>;
arch/arm/boot/dts/tegra30-colibri.dtsi +1 -0
index a7bfe26f038d..933087ee45a8 100644
@@ -723,6 +723,7 @@ i2c@7000d000 {
 		sgtl5000: codec@a {
 			compatible = "fsl,sgtl5000";
 			reg = <0x0a>;
+			#sound-dai-cells = <0>;
 			VDDA-supply = <&reg_module_3v3_audio>;
 			VDDD-supply = <&reg_1v8_vio>;
 			VDDIO-supply = <&reg_module_3v3>;
Signature · 1 line
2.24.1
#28 lore raw

PATCH 17/73 ARM: tegra: Name GPIO hog nodes consistently

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

Use the common gpios- prefix for GPIO hog node names to make it clear that they are all hogs. This helps with json-schema based validation.

Cc Marcel Ziswiler <[email protected]>
Cc Philippe Schenker <[email protected]>
---
 arch/arm/boot/dts/tegra124-apalis-eval.dts      | 2 +-
 arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 2 +-
 arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi     | 4 ++--
 arch/arm/boot/dts/tegra124-apalis.dtsi          | 4 ++--
 arch/arm/boot/dts/tegra20-colibri.dtsi          | 6 +++---
 arch/arm/boot/dts/tegra30-apalis-eval.dts       | 2 +-
 arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts  | 2 +-
 arch/arm/boot/dts/tegra30-colibri.dtsi          | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)
arch/arm/boot/dts/tegra124-apalis-eval.dts +1 -1
index 28c29b6813a7..89fafa39aa2a 100644
@@ -246,7 +246,7 @@ reg_usbh_vbus: regulator-usbh-vbus {
 
 &gpio {
 	/* Apalis GPIO7 MXM3 pin 15 PLX PEX 8605 PCIe Switch Reset */
-	pex-perst-n {
+	gpios-pex-perst-n {
 		gpio-hog;
 		gpios = <TEGRA_GPIO(DD, 1) GPIO_ACTIVE_HIGH>;
 		output-high;
arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts +1 -1
index f3afde410615..441a244ef6c1 100644
@@ -248,7 +248,7 @@ reg_usbh_vbus: regulator-usbh-vbus {
 
 &gpio {
 	/* Apalis GPIO7 MXM3 pin 15 PLX PEX 8605 PCIe Switch Reset */
-	pex-perst-n {
+	gpios-pex-perst-n {
 		gpio-hog;
 		gpios = <TEGRA_GPIO(DD, 1) GPIO_ACTIVE_HIGH>;
 		output-high;
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi +2 -2
index 0d6890af457e..eb5f4ad0fe71 100644
@@ -2048,7 +2048,7 @@ gpu-shutdown-trip {
 
 &gpio {
 	/* I210 Gigabit Ethernet Controller Reset */
-	lan-reset-n {
+	gpios-lan-reset-n {
 		gpio-hog;
 		gpios = <TEGRA_GPIO(S, 2) GPIO_ACTIVE_HIGH>;
 		output-high;
@@ -2056,7 +2056,7 @@ lan-reset-n {
 	};
 
 	/* Control MXM3 pin 26 Reset Module Output Carrier Input */
-	reset-moci-ctrl {
+	gpios-reset-moci-ctrl {
 		gpio-hog;
 		gpios = <TEGRA_GPIO(U, 4) GPIO_ACTIVE_HIGH>;
 		output-high;
arch/arm/boot/dts/tegra124-apalis.dtsi +2 -2
index 8857a11332c2..64a18b525378 100644
@@ -2040,7 +2040,7 @@ gpu-shutdown-trip {
 
 &gpio {
 	/* I210 Gigabit Ethernet Controller Reset */
-	lan-reset-n {
+	gpios-lan-reset-n {
 		gpio-hog;
 		gpios = <TEGRA_GPIO(S, 2) GPIO_ACTIVE_HIGH>;
 		output-high;
@@ -2048,7 +2048,7 @@ lan-reset-n {
 	};
 
 	/* Control MXM3 pin 26 Reset Module Output Carrier Input */
-	reset-moci-ctrl {
+	gpios-reset-moci-ctrl {
 		gpio-hog;
 		gpios = <TEGRA_GPIO(U, 4) GPIO_ACTIVE_HIGH>;
 		output-high;
arch/arm/boot/dts/tegra20-colibri.dtsi +3 -3
index 6162d193e12c..90f317117298 100644
@@ -743,7 +743,7 @@ sound {
 };
 
 &gpio {
-	lan-reset-n {
+	gpios-lan-reset-n {
 		gpio-hog;
 		gpios = <TEGRA_GPIO(V, 4) GPIO_ACTIVE_HIGH>;
 		output-high;
@@ -751,7 +751,7 @@ lan-reset-n {
 	};
 
 	/* Tri-stating GMI_WR_N on SODIMM pin 99 nPWE */
-	npwe {
+	gpios-npwe {
 		gpio-hog;
 		gpios = <TEGRA_GPIO(T, 5) GPIO_ACTIVE_HIGH>;
 		output-high;
@@ -759,7 +759,7 @@ npwe {
 	};
 
 	/* Not tri-stating GMI_WR_N on SODIMM pin 93 RDnWR */
-	rdnwr {
+	gpios-rdnwr {
 		gpio-hog;
 		gpios = <TEGRA_GPIO(T, 6) GPIO_ACTIVE_HIGH>;
 		output-low;
arch/arm/boot/dts/tegra30-apalis-eval.dts +1 -1
index 9f653ef41da4..01b2a9db77c8 100644
@@ -239,7 +239,7 @@ reg_usbh_vbus: regulator-usbh-vbus {
 
 &gpio {
 	/* Apalis GPIO7 MXM3 pin 15 PLX PEX 8605 PCIe Switch Reset */
-	pex-perst-n {
+	gpios-pex-perst-n {
 		gpio-hog;
 		gpios = <TEGRA_GPIO(S, 7) GPIO_ACTIVE_HIGH>;
 		output-high;
arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts +1 -1
index dc633e529822..d5a244351137 100644
@@ -257,7 +257,7 @@ reg_vddio_sdmmc3: regulator-vddio-sdmmc3 {
 
 &gpio {
 	/* Apalis GPIO7 MXM3 pin 15 PLX PEX 8605 PCIe Switch Reset */
-	pex-perst-n {
+	gpios-pex-perst-n {
 		gpio-hog;
 		gpios = <TEGRA_GPIO(S, 7) GPIO_ACTIVE_HIGH>;
 		output-high;
arch/arm/boot/dts/tegra30-colibri.dtsi +1 -1
index 933087ee45a8..c209020e13fd 100644
@@ -1043,7 +1043,7 @@ sound {
 };
 
 &gpio {
-	lan-reset-n {
+	gpios-lan-reset-n {
 		gpio-hog;
 		gpios = <TEGRA_GPIO(DD, 0) GPIO_ACTIVE_HIGH>;
 		output-high;
Signature · 1 line
2.24.1
#29 lore raw

PATCH 18/73 ARM: tegra: Use standard name for Ethernet devices

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

Ethernet device should be named "ethernet@<unit-address>".

Cc Marcel Ziswiler <[email protected]>
Cc Philippe Schenker <[email protected]>
---
 arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 2 +-
 arch/arm/boot/dts/tegra124-apalis.dtsi      | 2 +-
 arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi  | 2 +-
 arch/arm/boot/dts/tegra30-apalis.dtsi       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi +1 -1
index eb5f4ad0fe71..8f4c11f918b4 100644
@@ -37,7 +37,7 @@ pci@2,0 {
 			phy-names = "pcie-0";
 			status = "okay";
 
-			pcie@0 {
+			ethernet@0,0 {
 				reg = <0 0 0 0 0>;
 				local-mac-address = [00 00 00 00 00 00];
 			};
arch/arm/boot/dts/tegra124-apalis.dtsi +1 -1
index 64a18b525378..39a5744dbcb4 100644
@@ -36,7 +36,7 @@ pci@2,0 {
 			phy-names = "pcie-0";
 			status = "okay";
 
-			pcie@0 {
+			ethernet@0,0 {
 				reg = <0 0 0 0 0>;
 				local-mac-address = [00 00 00 00 00 00];
 			};
arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi +1 -1
index fdd3e4e3522b..6a3a72f81c44 100644
@@ -37,7 +37,7 @@ pci@3,0 {
 			status = "okay";
 			nvidia,num-lanes = <1>;
 
-			pcie@0 {
+			ethernet@0,0 {
 				reg = <0 0 0 0 0>;
 				local-mac-address = [00 00 00 00 00 00];
 			};
arch/arm/boot/dts/tegra30-apalis.dtsi +1 -1
index 90694d1a3b0c..6544ce70b46f 100644
@@ -36,7 +36,7 @@ pci@3,0 {
 			status = "okay";
 			nvidia,num-lanes = <1>;
 
-			pcie@0 {
+			ethernet@0,0 {
 				reg = <0 0 0 0 0>;
 				local-mac-address = [00 00 00 00 00 00];
 			};
Signature · 1 line
2.24.1
#30 lore raw

PATCH 19/73 ARM: tegra: Use proper tuple notation

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

Tuple boundaries should be marked by < and > to make it clear which cells are part of the same tuple. This also helps the json-schema based validation tooling to properly parse this data.

While at it, also remove the "immovable" bit from PCI addresses. All of these addresses are in fact "movable".

Cc Marcel Ziswiler <[email protected]>
Cc Philippe Schenker <[email protected]>
---
 arch/arm/boot/dts/tegra124.dtsi               | 16 +++++-----
 arch/arm/boot/dts/tegra20.dtsi                | 24 +++++++--------
 .../arm/boot/dts/tegra30-apalis-v1.1-eval.dts |  4 +--
 arch/arm/boot/dts/tegra30.dtsi                | 30 +++++++++----------
 4 files changed, 37 insertions(+), 37 deletions(-)
arch/arm/boot/dts/tegra124.dtsi +8 -8
index f00e962c8f55..6d34742b56b9 100644
@@ -22,9 +22,9 @@ memory@80000000 {
 	pcie@1003000 {
 		compatible = "nvidia,tegra124-pcie";
 		device_type = "pci";
-		reg = <0x0 0x01003000 0x0 0x00000800   /* PADS registers */
-		       0x0 0x01003800 0x0 0x00000800   /* AFI registers */
-		       0x0 0x02000000 0x0 0x10000000>; /* configuration space */
+		reg = <0x0 0x01003000 0x0 0x00000800>, /* PADS registers */
+		      <0x0 0x01003800 0x0 0x00000800>, /* AFI registers */
+		      <0x0 0x02000000 0x0 0x10000000>; /* configuration space */
 		reg-names = "pads", "afi", "cs";
 		interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>, /* controller interrupt */
 			     <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; /* MSI interrupt */
@@ -38,11 +38,11 @@ pcie@1003000 {
 		#address-cells = <3>;
 		#size-cells = <2>;
 
-		ranges = <0x82000000 0 0x01000000 0x0 0x01000000 0 0x00001000   /* port 0 configuration space */
-			  0x82000000 0 0x01001000 0x0 0x01001000 0 0x00001000   /* port 1 configuration space */
-			  0x81000000 0 0x0        0x0 0x12000000 0 0x00010000   /* downstream I/O (64 KiB) */
-			  0x82000000 0 0x13000000 0x0 0x13000000 0 0x0d000000   /* non-prefetchable memory (208 MiB) */
-			  0xc2000000 0 0x20000000 0x0 0x20000000 0 0x20000000>; /* prefetchable memory (512 MiB) */
+		ranges = <0x02000000 0 0x01000000 0x0 0x01000000 0 0x00001000>, /* port 0 configuration space */
+			 <0x02000000 0 0x01001000 0x0 0x01001000 0 0x00001000>, /* port 1 configuration space */
+			 <0x01000000 0 0x0        0x0 0x12000000 0 0x00010000>, /* downstream I/O (64 KiB) */
+			 <0x02000000 0 0x13000000 0x0 0x13000000 0 0x0d000000>, /* non-prefetchable memory (208 MiB) */
+			 <0x42000000 0 0x20000000 0x0 0x20000000 0 0x20000000>; /* prefetchable memory (512 MiB) */
 
 		clocks = <&tegra_car TEGRA124_CLK_PCIE>,
 			 <&tegra_car TEGRA124_CLK_AFI>,
arch/arm/boot/dts/tegra20.dtsi +12 -12
index 77f6b3ee8418..90393d8f5ebc 100644
@@ -172,8 +172,8 @@ timer@50040600 {
 
 	intc: interrupt-controller@50041000 {
 		compatible = "arm,cortex-a9-gic";
-		reg = <0x50041000 0x1000
-		       0x50040100 0x0100>;
+		reg = <0x50041000 0x1000>,
+		      <0x50040100 0x0100>;
 		interrupt-controller;
 		#interrupt-cells = <3>;
 		interrupt-parent = <&intc>;
@@ -649,12 +649,12 @@ fuse@7000f800 {
 	pcie@80003000 {
 		compatible = "nvidia,tegra20-pcie";
 		device_type = "pci";
-		reg = <0x80003000 0x00000800   /* PADS registers */
-		       0x80003800 0x00000200   /* AFI registers */
-		       0x90000000 0x10000000>; /* configuration space */
+		reg = <0x80003000 0x00000800>, /* PADS registers */
+		      <0x80003800 0x00000200>, /* AFI registers */
+		      <0x90000000 0x10000000>; /* configuration space */
 		reg-names = "pads", "afi", "cs";
-		interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH   /* controller interrupt */
-			      GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; /* MSI interrupt */
+		interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>, /* controller interrupt */
+			     <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; /* MSI interrupt */
 		interrupt-names = "intr", "msi";
 
 		#interrupt-cells = <1>;
@@ -665,11 +665,11 @@ pcie@80003000 {
 		#address-cells = <3>;
 		#size-cells = <2>;
 
-		ranges = <0x82000000 0 0x80000000 0x80000000 0 0x00001000   /* port 0 registers */
-			  0x82000000 0 0x80001000 0x80001000 0 0x00001000   /* port 1 registers */
-			  0x81000000 0 0          0x82000000 0 0x00010000   /* downstream I/O */
-			  0x82000000 0 0xa0000000 0xa0000000 0 0x08000000   /* non-prefetchable memory */
-			  0xc2000000 0 0xa8000000 0xa8000000 0 0x18000000>; /* prefetchable memory */
+		ranges = <0x02000000 0 0x80000000 0x80000000 0 0x00001000>, /* port 0 registers */
+			 <0x02000000 0 0x80001000 0x80001000 0 0x00001000>, /* port 1 registers */
+			 <0x01000000 0 0          0x82000000 0 0x00010000>, /* downstream I/O */
+			 <0x02000000 0 0xa0000000 0xa0000000 0 0x08000000>, /* non-prefetchable memory */
+			 <0x42000000 0 0xa8000000 0xa8000000 0 0x18000000>; /* prefetchable memory */
 
 		clocks = <&tegra_car TEGRA20_CLK_PEX>,
 			 <&tegra_car TEGRA20_CLK_AFI>,
arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts +2 -2
index d5a244351137..1fa440d02e83 100644
@@ -248,8 +248,8 @@ reg_vddio_sdmmc3: regulator-vddio-sdmmc3 {
 		regulator-max-microvolt = <3300000>;
 		regulator-type = "voltage";
 		gpios = <&gpio TEGRA_GPIO(J, 5) GPIO_ACTIVE_HIGH>;
-		states = <1800000 0x0
-			  3300000 0x1>;
+		states = <1800000 0x0>,
+			 <3300000 0x1>;
 		startup-delay-us = <100000>;
 		vin-supply = <&vddio_sdmmc_1v8_reg>;
 	};
arch/arm/boot/dts/tegra30.dtsi +15 -15
index 3d0515f6db51..9a8c07ccbb30 100644
@@ -20,12 +20,12 @@ memory@80000000 {
 	pcie@3000 {
 		compatible = "nvidia,tegra30-pcie";
 		device_type = "pci";
-		reg = <0x00003000 0x00000800   /* PADS registers */
-		       0x00003800 0x00000200   /* AFI registers */
-		       0x10000000 0x10000000>; /* configuration space */
+		reg = <0x00003000 0x00000800>, /* PADS registers */
+		      <0x00003800 0x00000200>, /* AFI registers */
+		      <0x10000000 0x10000000>; /* configuration space */
 		reg-names = "pads", "afi", "cs";
-		interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH   /* controller interrupt */
-			      GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; /* MSI interrupt */
+		interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>, /* controller interrupt */
+			     <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; /* MSI interrupt */
 		interrupt-names = "intr", "msi";
 
 		#interrupt-cells = <1>;
@@ -36,12 +36,12 @@ pcie@3000 {
 		#address-cells = <3>;
 		#size-cells = <2>;
 
-		ranges = <0x82000000 0 0x00000000 0x00000000 0 0x00001000   /* port 0 configuration space */
-			  0x82000000 0 0x00001000 0x00001000 0 0x00001000   /* port 1 configuration space */
-			  0x82000000 0 0x00004000 0x00004000 0 0x00001000   /* port 2 configuration space */
-			  0x81000000 0 0          0x02000000 0 0x00010000   /* downstream I/O */
-			  0x82000000 0 0x20000000 0x20000000 0 0x08000000   /* non-prefetchable memory */
-			  0xc2000000 0 0x28000000 0x28000000 0 0x18000000>; /* prefetchable memory */
+		ranges = <0x02000000 0 0x00000000 0x00000000 0 0x00001000>, /* port 0 configuration space */
+			 <0x02000000 0 0x00001000 0x00001000 0 0x00001000>, /* port 1 configuration space */
+			 <0x02000000 0 0x00004000 0x00004000 0 0x00001000>, /* port 2 configuration space */
+			 <0x01000000 0 0          0x02000000 0 0x00010000>, /* downstream I/O */
+			 <0x02000000 0 0x20000000 0x20000000 0 0x08000000>, /* non-prefetchable memory */
+			 <0x42000000 0 0x28000000 0x28000000 0 0x18000000>; /* prefetchable memory */
 
 		clocks = <&tegra_car TEGRA30_CLK_PCIE>,
 			 <&tegra_car TEGRA30_CLK_AFI>,
@@ -185,8 +185,8 @@ gr2d@54140000 {
 		gr3d@54180000 {
 			compatible = "nvidia,tegra30-gr3d";
 			reg = <0x54180000 0x00040000>;
-			clocks = <&tegra_car TEGRA30_CLK_GR3D
-				  &tegra_car TEGRA30_CLK_GR3D2>;
+			clocks = <&tegra_car TEGRA30_CLK_GR3D>,
+				 <&tegra_car TEGRA30_CLK_GR3D2>;
 			clock-names = "3d", "3d2";
 			resets = <&tegra_car 24>,
 				 <&tegra_car 98>;
@@ -273,8 +273,8 @@ timer@50040600 {
 
 	intc: interrupt-controller@50041000 {
 		compatible = "arm,cortex-a9-gic";
-		reg = <0x50041000 0x1000
-		       0x50040100 0x0100>;
+		reg = <0x50041000 0x1000>,
+		      <0x50040100 0x0100>;
 		interrupt-controller;
 		#interrupt-cells = <3>;
 		interrupt-parent = <&intc>;
Signature · 1 line
2.24.1
#31 lore raw

PATCH 20/73 ARM: tegra: Add micro-USB A/B port on Jetson TK1

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

Run the micro-USB A/B port on Jetson TK1 in host mode by default.

---
 arch/arm/boot/dts/tegra124-jetson-tk1.dts | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm/boot/dts/tegra124-jetson-tk1.dts +6 -0
index 289bf6e99041..6eaa39646221 100644
@@ -1775,6 +1775,12 @@ sata-0 {
 		};
 
 		ports {
+			/* Micro A/B */
+			usb2-0 {
+				status = "okay";
+				mode = "host";
+			};
+
 			/* Mini PCIe */
 			usb2-1 {
 				status = "okay";
Signature · 1 line
2.24.1
#32 lore raw

PATCH 21/73 ARM: tegra: Add missing panel power supplies on Nyan

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

Both Nyan boards are missing panel power supplies. Add them.

---
 arch/arm/boot/dts/tegra124-nyan-big.dts   | 1 +
 arch/arm/boot/dts/tegra124-nyan-blaze.dts | 1 +
 2 files changed, 2 insertions(+)
arch/arm/boot/dts/tegra124-nyan-big.dts +1 -0
index 4d14dec21af6..1d2aac2cb6d0 100644
@@ -16,6 +16,7 @@ / {
 	panel: panel {
 		compatible = "auo,b133xtn01";
 
+		power-supply = <&vdd_3v3_panel>;
 		backlight = <&backlight>;
 		ddc-i2c-bus = <&dpaux>;
 	};
arch/arm/boot/dts/tegra124-nyan-blaze.dts +1 -0
index 2a029ee86dd7..677babde6460 100644
@@ -18,6 +18,7 @@ / {
 	panel: panel {
 		compatible = "samsung,ltn140at29-301";
 
+		power-supply = <&vdd_3v3_panel>;
 		backlight = <&backlight>;
 		ddc-i2c-bus = <&dpaux>;
 	};
Signature · 1 line
2.24.1
#33 lore raw

PATCH 22/73 ARM: tegra: Add #reset-cells to Tegra124 memory controller

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The memory controller exposes a set of memory client resets and needs to specify the #reset-cells property in order to advertise the number of cells needed to describe each of the resets.

---
 arch/arm/boot/dts/tegra124.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/boot/dts/tegra124.dtsi +1 -0
index 6d34742b56b9..98cd7962a559 100644
@@ -622,6 +622,7 @@ mc: memory-controller@70019000 {
 		interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
 
 		#iommu-cells = <1>;
+		#reset-cells = <1>;
 	};
 
 	emc: external-memory-controller@7001b000 {
Signature · 1 line
2.24.1
#34 lore raw

PATCH 23/73 ARM: tegra: Fix order of XUSB controller clocks

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

This is purely to make the json-schema validation tools happy because they cannot deal with string arrays that may be in arbitrary order.

---
 arch/arm/boot/dts/tegra124.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/tegra124.dtsi +2 -2
index 98cd7962a559..3840019ed5c6 100644
@@ -680,8 +680,8 @@ usb@70090000 {
 			 <&tegra_car TEGRA124_CLK_XUSB_HOST_SRC>,
 			 <&tegra_car TEGRA124_CLK_XUSB_FALCON_SRC>,
 			 <&tegra_car TEGRA124_CLK_XUSB_SS>,
-			 <&tegra_car TEGRA124_CLK_XUSB_SS_DIV2>,
 			 <&tegra_car TEGRA124_CLK_XUSB_SS_SRC>,
+			 <&tegra_car TEGRA124_CLK_XUSB_SS_DIV2>,
 			 <&tegra_car TEGRA124_CLK_XUSB_HS_SRC>,
 			 <&tegra_car TEGRA124_CLK_XUSB_FS_SRC>,
 			 <&tegra_car TEGRA124_CLK_PLL_U_480M>,
@@ -689,7 +689,7 @@ usb@70090000 {
 			 <&tegra_car TEGRA124_CLK_PLL_E>;
 		clock-names = "xusb_host", "xusb_host_src",
 			      "xusb_falcon_src", "xusb_ss",
-			      "xusb_ss_div2", "xusb_ss_src",
+			      "xusb_ss_src", "xusb_ss_div2",
 			      "xusb_hs_src", "xusb_fs_src",
 			      "pll_u_480m", "clk_m", "pll_e";
 		resets = <&tegra_car 89>, <&tegra_car 156>,
Signature · 1 line
2.24.1
#35 lore raw

PATCH 24/73 ARM: tegra: Add missing clock-names for SDHCI controllers

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The Tegra SDHCI controllers need to have a clock-names property according to the bindings.

---
 arch/arm/boot/dts/tegra124.dtsi | 4 ++++
 arch/arm/boot/dts/tegra20.dtsi  | 4 ++++
 arch/arm/boot/dts/tegra30.dtsi  | 4 ++++
 3 files changed, 12 insertions(+)
arch/arm/boot/dts/tegra124.dtsi +4 -0
index 3840019ed5c6..175d0bcd7a2b 100644
@@ -839,6 +839,7 @@ mmc@700b0000 {
 		reg = <0x0 0x700b0000 0x0 0x200>;
 		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA124_CLK_SDMMC1>;
+		clock-names = "sdhci";
 		resets = <&tegra_car 14>;
 		reset-names = "sdhci";
 		status = "disabled";
@@ -849,6 +850,7 @@ mmc@700b0200 {
 		reg = <0x0 0x700b0200 0x0 0x200>;
 		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA124_CLK_SDMMC2>;
+		clock-names = "sdhci";
 		resets = <&tegra_car 9>;
 		reset-names = "sdhci";
 		status = "disabled";
@@ -859,6 +861,7 @@ mmc@700b0400 {
 		reg = <0x0 0x700b0400 0x0 0x200>;
 		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA124_CLK_SDMMC3>;
+		clock-names = "sdhci";
 		resets = <&tegra_car 69>;
 		reset-names = "sdhci";
 		status = "disabled";
@@ -869,6 +872,7 @@ mmc@700b0600 {
 		reg = <0x0 0x700b0600 0x0 0x200>;
 		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA124_CLK_SDMMC4>;
+		clock-names = "sdhci";
 		resets = <&tegra_car 15>;
 		reset-names = "sdhci";
 		status = "disabled";
arch/arm/boot/dts/tegra20.dtsi +4 -0
index 90393d8f5ebc..ccd2995aef83 100644
@@ -813,6 +813,7 @@ mmc@c8000000 {
 		reg = <0xc8000000 0x200>;
 		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA20_CLK_SDMMC1>;
+		clock-names = "sdhci";
 		resets = <&tegra_car 14>;
 		reset-names = "sdhci";
 		status = "disabled";
@@ -823,6 +824,7 @@ mmc@c8000200 {
 		reg = <0xc8000200 0x200>;
 		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA20_CLK_SDMMC2>;
+		clock-names = "sdhci";
 		resets = <&tegra_car 9>;
 		reset-names = "sdhci";
 		status = "disabled";
@@ -833,6 +835,7 @@ mmc@c8000400 {
 		reg = <0xc8000400 0x200>;
 		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA20_CLK_SDMMC3>;
+		clock-names = "sdhci";
 		resets = <&tegra_car 69>;
 		reset-names = "sdhci";
 		status = "disabled";
@@ -843,6 +846,7 @@ mmc@c8000600 {
 		reg = <0xc8000600 0x200>;
 		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA20_CLK_SDMMC4>;
+		clock-names = "sdhci";
 		resets = <&tegra_car 15>;
 		reset-names = "sdhci";
 		status = "disabled";
arch/arm/boot/dts/tegra30.dtsi +4 -0
index 9a8c07ccbb30..f838e4775cf6 100644
@@ -856,6 +856,7 @@ mmc@78000000 {
 		reg = <0x78000000 0x200>;
 		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA30_CLK_SDMMC1>;
+		clock-names = "sdhci";
 		resets = <&tegra_car 14>;
 		reset-names = "sdhci";
 		status = "disabled";
@@ -866,6 +867,7 @@ mmc@78000200 {
 		reg = <0x78000200 0x200>;
 		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA30_CLK_SDMMC2>;
+		clock-names = "sdhci";
 		resets = <&tegra_car 9>;
 		reset-names = "sdhci";
 		status = "disabled";
@@ -876,6 +878,7 @@ mmc@78000400 {
 		reg = <0x78000400 0x200>;
 		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA30_CLK_SDMMC3>;
+		clock-names = "sdhci";
 		resets = <&tegra_car 69>;
 		reset-names = "sdhci";
 		status = "disabled";
@@ -886,6 +889,7 @@ mmc@78000600 {
 		reg = <0x78000600 0x200>;
 		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA30_CLK_SDMMC4>;
+		clock-names = "sdhci";
 		resets = <&tegra_car 15>;
 		reset-names = "sdhci";
 		status = "disabled";
Signature · 1 line
2.24.1
#36 lore raw

PATCH 25/73 ARM: tegra: Use proper unit-addresses for OPPs

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

Use commas rather than underscores to separate the various parts of the unit-address in CPU OPPs to make them properly validate under the json- schema bindings.

---
 .../boot/dts/tegra20-cpu-opp-microvolt.dtsi   |  98 ++---
 arch/arm/boot/dts/tegra20-cpu-opp.dtsi        |  98 ++---
 .../boot/dts/tegra30-cpu-opp-microvolt.dtsi   | 398 +++++++++---------
 arch/arm/boot/dts/tegra30-cpu-opp.dtsi        | 398 +++++++++---------
 4 files changed, 496 insertions(+), 496 deletions(-)
arch/arm/boot/dts/tegra20-cpu-opp-microvolt.dtsi +49 -49
index e85ffdbef876..dce85d39480d 100644
@@ -2,199 +2,199 @@
 
 / {
 	cpu0_opp_table: cpu_opp_table0 {
-		opp@216000000_750 {
+		opp@216000000,750 {
 			opp-microvolt = <750000 750000 1125000>;
 		};
 
-		opp@216000000_800 {
+		opp@216000000,800 {
 			opp-microvolt = <800000 800000 1125000>;
 		};
 
-		opp@312000000_750 {
+		opp@312000000,750 {
 			opp-microvolt = <750000 750000 1125000>;
 		};
 
-		opp@312000000_800 {
+		opp@312000000,800 {
 			opp-microvolt = <800000 800000 1125000>;
 		};
 
-		opp@456000000_750 {
+		opp@456000000,750 {
 			opp-microvolt = <750000 750000 1125000>;
 		};
 
-		opp@456000000_800 {
+		opp@456000000,800 {
 			opp-microvolt = <800000 800000 1125000>;
 		};
 
-		opp@456000000_800_2_2 {
+		opp@456000000,800,2,2 {
 			opp-microvolt = <800000 800000 1125000>;
 		};
 
-		opp@456000000_800_3_2 {
+		opp@456000000,800,3,2 {
 			opp-microvolt = <800000 800000 1125000>;
 		};
 
-		opp@456000000_825 {
+		opp@456000000,825 {
 			opp-microvolt = <825000 825000 1125000>;
 		};
 
-		opp@608000000_750 {
+		opp@608000000,750 {
 			opp-microvolt = <750000 750000 1125000>;
 		};
 
-		opp@608000000_800 {
+		opp@608000000,800 {
 			opp-microvolt = <800000 800000 1125000>;
 		};
 
-		opp@608000000_800_3_2 {
+		opp@608000000,800,3,2 {
 			opp-microvolt = <800000 800000 1125000>;
 		};
 
-		opp@608000000_825 {
+		opp@608000000,825 {
 			opp-microvolt = <825000 825000 1125000>;
 		};
 
-		opp@608000000_850 {
+		opp@608000000,850 {
 			opp-microvolt = <850000 850000 1125000>;
 		};
 
-		opp@608000000_900 {
+		opp@608000000,900 {
 			opp-microvolt = <900000 900000 1125000>;
 		};
 
-		opp@760000000_775 {
+		opp@760000000,775 {
 			opp-microvolt = <775000 775000 1125000>;
 		};
 
-		opp@760000000_800 {
+		opp@760000000,800 {
 			opp-microvolt = <800000 800000 1125000>;
 		};
 
-		opp@760000000_850 {
+		opp@760000000,850 {
 			opp-microvolt = <850000 850000 1125000>;
 		};
 
-		opp@760000000_875 {
+		opp@760000000,875 {
 			opp-microvolt = <875000 875000 1125000>;
 		};
 
-		opp@760000000_875_1_1 {
+		opp@760000000,875,1,1 {
 			opp-microvolt = <875000 875000 1125000>;
 		};
 
-		opp@760000000_875_0_2 {
+		opp@760000000,875,0,2 {
 			opp-microvolt = <875000 875000 1125000>;
 		};
 
-		opp@760000000_875_1_2 {
+		opp@760000000,875,1,2 {
 			opp-microvolt = <875000 875000 1125000>;
 		};
 
-		opp@760000000_900 {
+		opp@760000000,900 {
 			opp-microvolt = <900000 900000 1125000>;
 		};
 
-		opp@760000000_975 {
+		opp@760000000,975 {
 			opp-microvolt = <975000 975000 1125000>;
 		};
 
-		opp@816000000_800 {
+		opp@816000000,800 {
 			opp-microvolt = <800000 800000 1125000>;
 		};
 
-		opp@816000000_850 {
+		opp@816000000,850 {
 			opp-microvolt = <850000 850000 1125000>;
 		};
 
-		opp@816000000_875 {
+		opp@816000000,875 {
 			opp-microvolt = <875000 875000 1125000>;
 		};
 
-		opp@816000000_950 {
+		opp@816000000,950 {
 			opp-microvolt = <950000 950000 1125000>;
 		};
 
-		opp@816000000_1000 {
+		opp@816000000,1000 {
 			opp-microvolt = <1000000 1000000 1125000>;
 		};
 
-		opp@912000000_850 {
+		opp@912000000,850 {
 			opp-microvolt = <850000 850000 1125000>;
 		};
 
-		opp@912000000_900 {
+		opp@912000000,900 {
 			opp-microvolt = <900000 900000 1125000>;
 		};
 
-		opp@912000000_925 {
+		opp@912000000,925 {
 			opp-microvolt = <925000 925000 1125000>;
 		};
 
-		opp@912000000_950 {
+		opp@912000000,950 {
 			opp-microvolt = <950000 950000 1125000>;
 		};
 
-		opp@912000000_950_0_2 {
+		opp@912000000,950,0,2 {
 			opp-microvolt = <950000 950000 1125000>;
 		};
 
-		opp@912000000_950_2_2 {
+		opp@912000000,950,2,2 {
 			opp-microvolt = <950000 950000 1125000>;
 		};
 
-		opp@912000000_1000 {
+		opp@912000000,1000 {
 			opp-microvolt = <1000000 1000000 1125000>;
 		};
 
-		opp@912000000_1050 {
+		opp@912000000,1050 {
 			opp-microvolt = <1050000 1050000 1125000>;
 		};
 
-		opp@1000000000_875 {
+		opp@1000000000,875 {
 			opp-microvolt = <875000 875000 1125000>;
 		};
 
-		opp@1000000000_900 {
+		opp@1000000000,900 {
 			opp-microvolt = <900000 900000 1125000>;
 		};
 
-		opp@1000000000_950 {
+		opp@1000000000,950 {
 			opp-microvolt = <950000 950000 1125000>;
 		};
 
-		opp@1000000000_975 {
+		opp@1000000000,975 {
 			opp-microvolt = <975000 975000 1125000>;
 		};
 
-		opp@1000000000_1000 {
+		opp@1000000000,1000 {
 			opp-microvolt = <1000000 1000000 1125000>;
 		};
 
-		opp@1000000000_1000_0_2 {
+		opp@1000000000,1000,0,2 {
 			opp-microvolt = <1000000 1000000 1125000>;
 		};
 
-		opp@1000000000_1025 {
+		opp@1000000000,1025 {
 			opp-microvolt = <1025000 1025000 1125000>;
 		};
 
-		opp@1000000000_1100 {
+		opp@1000000000,1100 {
 			opp-microvolt = <1100000 1100000 1125000>;
 		};
 
-		opp@1200000000_1000 {
+		opp@1200000000,1000 {
 			opp-microvolt = <1000000 1000000 1125000>;
 		};
 
-		opp@1200000000_1050 {
+		opp@1200000000,1050 {
 			opp-microvolt = <1050000 1050000 1125000>;
 		};
 
-		opp@1200000000_1100 {
+		opp@1200000000,1100 {
 			opp-microvolt = <1100000 1100000 1125000>;
 		};
 
-		opp@1200000000_1125 {
+		opp@1200000000,1125 {
 			opp-microvolt = <1125000 1125000 1125000>;
 		};
 	};
arch/arm/boot/dts/tegra20-cpu-opp.dtsi +49 -49

344 lines not on this page · raw message

arch/arm/boot/dts/tegra30-cpu-opp-microvolt.dtsi +199 -199

998 lines not on this page · raw message

arch/arm/boot/dts/tegra30-cpu-opp.dtsi +199 -199

1,394 lines not on this page · raw message

Signature · 1 line
2.24.1
#37 lore raw

PATCH 26/73 ARM: tegra: medcom-wide: Remove extra panel power supply

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

Simple panels can only have a single power supply. The second listed supply is not needed because it is also the input supply of the first supply and therefore will always be on at the same time.

In retrospect the panel probably doesn't qualify as simple since it apparently does need both of these supplies, even if in the case of the Medcom Wide it isn't necessary to explicitly hook them up.

---
 arch/arm/boot/dts/tegra20-medcom-wide.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/tegra20-medcom-wide.dts +1 -1
index 049181421a86..a348ca30e522 100644
@@ -59,7 +59,7 @@ backlight: backlight {
 	panel: panel {
 		compatible = "innolux,n156bge-l21";
 
-		power-supply =  <&vdd_1v8_reg>, <&vdd_3v3_reg>;
+		power-supply =  <&vdd_1v8_reg>; // <&vdd_3v3_reg>;
 		enable-gpios = <&gpio TEGRA_GPIO(B, 2) GPIO_ACTIVE_HIGH>;
 
 		backlight = <&backlight>;
Signature · 1 line
2.24.1
#38 lore raw

PATCH 27/73 ARM: tegra: Use numeric unit-addresses

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

Unit-addresses should be numeric. This fixes a validation failure seen using the json-schema tooling.

---
 arch/arm/boot/dts/tegra20-paz00.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/tegra20-paz00.dts +1 -1
index 91b6bb82e960..f6aa783b0f02 100644
@@ -314,7 +314,7 @@ nvec@7000c500 {
 	memory-controller@7000f400 {
 		nvidia,use-ram-code;
 
-		emc-tables@hynix {
+		emc-tables@0 {
 			nvidia,ram-code = <0x0>;
 			#address-cells = <1>;
 			#size-cells = <0>;
Signature · 1 line
2.24.1
#39 lore raw

PATCH 28/73 ARM: tegra: Use standard names for LED nodes

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

LED nodes should be named led-* to match the bindings.

---
 arch/arm/boot/dts/tegra20-paz00.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/tegra20-paz00.dts +1 -1
index f6aa783b0f02..ada2bed8b1b5 100644
@@ -589,7 +589,7 @@ wakeup {
 	gpio-leds {
 		compatible = "gpio-leds";
 
-		wifi {
+		led-0 {
 			label = "wifi-led";
 			gpios = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "rfkill0";
Signature · 1 line
2.24.1
#40 lore raw

PATCH 29/73 ARM: tegra: seaboard: Use standard battery bindings

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

Seaboard uses a non-existing, possibly obsoleted, binding for the battery. Move to the standard binding which seems to be a super- set of the odl binding.

---
 arch/arm/boot/dts/tegra20-seaboard.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/tegra20-seaboard.dts +3 -3
index f1baf16c5010..c24d4a37613e 100644
@@ -394,10 +394,10 @@ lvds_ddc: i2c@1 {
 			#size-cells = <0>;
 
 			smart-battery@b {
-				compatible = "ti,bq20z75", "smart-battery-1.1";
+				compatible = "ti,bq20z75", "sbs,sbs-battery";
 				reg = <0xb>;
-				ti,i2c-retry-count = <2>;
-				ti,poll-retry-count = <10>;
+				sbs,i2c-retry-count = <2>;
+				sbs,poll-retry-count = <10>;
 			};
 		};
 	};
Signature · 1 line
2.24.1
#41 lore raw

PATCH 30/73 ARM: tegra: Use standard names for SRAM nodes

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

SRAM nodes should be named sram@<unit-address> to match the bindings.

---
 arch/arm/boot/dts/tegra20.dtsi | 4 ++--
 arch/arm/boot/dts/tegra30.dtsi | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/tegra20.dtsi +2 -2
index ccd2995aef83..2568236284ad 100644
@@ -17,14 +17,14 @@ memory@0 {
 		reg = <0 0>;
 	};
 
-	iram@40000000 {
+	sram@40000000 {
 		compatible = "mmio-sram";
 		reg = <0x40000000 0x40000>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 		ranges = <0 0x40000000 0x40000>;
 
-		vde_pool: vde@400 {
+		vde_pool: sram@400 {
 			reg = <0x400 0x3fc00>;
 			pool;
 		};
arch/arm/boot/dts/tegra30.dtsi +2 -2
index f838e4775cf6..690e1628860f 100644
@@ -97,14 +97,14 @@ pci@3,0 {
 		};
 	};
 
-	iram@40000000 {
+	sram@40000000 {
 		compatible = "mmio-sram";
 		reg = <0x40000000 0x40000>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 		ranges = <0 0x40000000 0x40000>;
 
-		vde_pool: vde@400 {
+		vde_pool: sram@400 {
 			reg = <0x400 0x3fc00>;
 			pool;
 		};
Signature · 1 line
2.24.1
#42 lore raw

PATCH 31/73 ARM: tegra: Add parent clock to DSI output

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The DSI output needs to specify a parent clock that will be used to drive both the output and the display controller.

---
 arch/arm/boot/dts/tegra20.dtsi | 4 +++-
 arch/arm/boot/dts/tegra30.dtsi | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
arch/arm/boot/dts/tegra20.dtsi +3 -1
index 2568236284ad..19d5d4b8692b 100644
@@ -154,7 +154,9 @@ tvo@542c0000 {
 		dsi@54300000 {
 			compatible = "nvidia,tegra20-dsi";
 			reg = <0x54300000 0x00040000>;
-			clocks = <&tegra_car TEGRA20_CLK_DSI>;
+			clocks = <&tegra_car TEGRA20_CLK_DSI>,
+				 <&tegra_car TEGRA20_CLK_PLL_D_OUT0>;
+			clock-names = "dsi", "parent";
 			resets = <&tegra_car 48>;
 			reset-names = "dsi";
 			status = "disabled";
arch/arm/boot/dts/tegra30.dtsi +3 -1
index 690e1628860f..d80f9d3d2d18 100644
@@ -255,7 +255,9 @@ tvo@542c0000 {
 		dsi@54300000 {
 			compatible = "nvidia,tegra30-dsi";
 			reg = <0x54300000 0x00040000>;
-			clocks = <&tegra_car TEGRA30_CLK_DSIA>;
+			clocks = <&tegra_car TEGRA30_CLK_DSIA>,
+				 <&tegra_car TEGRA30_CLK_PLL_D_OUT0>;
+			clock-names = "dsi", "parent";
 			resets = <&tegra_car 48>;
 			reset-names = "dsi";
 			status = "disabled";
Signature · 1 line
2.24.1
#43 lore raw

PATCH 32/73 ARM: tegra: Remove spurious comma from node name

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

This was probably left there by mistake or perhaps was a typo in the first place. Remove it.

Cc Marcel Ziswiler <[email protected]>
Cc Philippe Schenker <[email protected]>
---
 arch/arm/boot/dts/tegra30-colibri.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/tegra30-colibri.dtsi +1 -1
index c209020e13fd..811c06599bfa 100644
@@ -527,7 +527,7 @@ spi2-cs1-n-pw2 {
 			};
 
 			/* Colibri USBH_OC */
-			spi2-cs2-n-pw3, {
+			spi2-cs2-n-pw3 {
 				nvidia,pins = "spi2_cs2_n_pw3";
 				nvidia,function = "spi2_alt";
 				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
Signature · 1 line
2.24.1
#44 lore raw

PATCH 33/73 ARM: tegra: The Tegra30 DC is not backwards-compatible

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The display controller on Tegra30 is in fact not backwards-compatible with the instantiation found on earlier SoCs. Drop the misleading compatible string.

---
 arch/arm/boot/dts/tegra30.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/tegra30.dtsi +1 -1
index d80f9d3d2d18..bedab43016c7 100644
@@ -197,7 +197,7 @@ gr3d@54180000 {
 		};
 
 		dc@54200000 {
-			compatible = "nvidia,tegra30-dc", "nvidia,tegra20-dc";
+			compatible = "nvidia,tegra30-dc";
 			reg = <0x54200000 0x00040000>;
 			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&tegra_car TEGRA30_CLK_DISP1>;
Signature · 1 line
2.24.1
#45 lore raw

PATCH 34/73 ARM: tegra: The Tegra30 SDHCI is not backwards-compatible

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The SDHCI on Tegra30 is in fact not backwards-compatible with the instantiation found on earlier SoCs. Drop the misleading compatible string.

---
 arch/arm/boot/dts/tegra30.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/tegra30.dtsi +4 -4
index bedab43016c7..3c7ee0b871c0 100644
@@ -854,7 +854,7 @@ tegra_i2s4: i2s@70080700 {
 	};
 
 	mmc@78000000 {
-		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
+		compatible = "nvidia,tegra30-sdhci";
 		reg = <0x78000000 0x200>;
 		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA30_CLK_SDMMC1>;
@@ -865,7 +865,7 @@ mmc@78000000 {
 	};
 
 	mmc@78000200 {
-		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
+		compatible = "nvidia,tegra30-sdhci";
 		reg = <0x78000200 0x200>;
 		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA30_CLK_SDMMC2>;
@@ -876,7 +876,7 @@ mmc@78000200 {
 	};
 
 	mmc@78000400 {
-		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
+		compatible = "nvidia,tegra30-sdhci";
 		reg = <0x78000400 0x200>;
 		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA30_CLK_SDMMC3>;
@@ -887,7 +887,7 @@ mmc@78000400 {
 	};
 
 	mmc@78000600 {
-		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
+		compatible = "nvidia,tegra30-sdhci";
 		reg = <0x78000600 0x200>;
 		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA30_CLK_SDMMC4>;
Signature · 1 line
2.24.1
#46 lore raw

PATCH 35/73 arm64: tegra: Add missing #phy-cells property on Jetson TX2

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

PHYs need to have a #phy-cells property that defines how many cells are required in their specifier. The standard Ethernet PHY doesn't require a specifier, so set its #phy-cells to 0.

---
 arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi +2 -0
index 2fcaa2e64370..de049d8d458a 100644
@@ -50,6 +50,8 @@ phy: phy@0 {
 				interrupt-parent = <&gpio>;
 				interrupts = <TEGRA186_MAIN_GPIO(M, 5)
 					      IRQ_TYPE_LEVEL_LOW>;
+
+				#phy-cells = <0>;
 			};
 		};
 	};
Signature · 1 line
2.24.1
#47 lore raw

PATCH 36/73 arm64: tegra: Add missing #phy-cells property on Jetson AGX Xavier

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

PHYs need to have a #phy-cells property that defines how many cells are required in their specifier. The standard Ethernet PHY doesn't require a specifier, so set its #phy-cells to 0.

---
 arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi +1 -0
index b96eb4e14556..f3781e86f321 100644
@@ -44,6 +44,7 @@ phy: phy@0 {
 					reg = <0x0>;
 					interrupt-parent = <&gpio>;
 					interrupts = <TEGRA194_MAIN_GPIO(G, 4) IRQ_TYPE_LEVEL_LOW>;
+					#phy-cells = <0>;
 				};
 			};
 		};
Signature · 1 line
2.24.1
#48 lore raw

PATCH 37/73 arm64: tegra: Fix #address-cells/#size-cells for SRAM on Tegra186

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The standard mmio-sram bindings require the #address- and #size-cells properties to be 1.

---
 arch/arm64/boot/dts/nvidia/tegra186.dtsi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/nvidia/tegra186.dtsi +5 -5
index 58100fb9cd8b..373f575b8678 100644
@@ -1216,20 +1216,20 @@ gpu@17000000 {
 	sysram@30000000 {
 		compatible = "nvidia,tegra186-sysram", "mmio-sram";
 		reg = <0x0 0x30000000 0x0 0x50000>;
-		#address-cells = <2>;
-		#size-cells = <2>;
-		ranges = <0 0x0 0x0 0x30000000 0x0 0x50000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges = <0x0 0x0 0x30000000 0x50000>;
 
 		cpu_bpmp_tx: shmem@4e000 {
 			compatible = "nvidia,tegra186-bpmp-shmem";
-			reg = <0x0 0x4e000 0x0 0x1000>;
+			reg = <0x4e000 0x1000>;
 			label = "cpu-bpmp-tx";
 			pool;
 		};
 
 		cpu_bpmp_rx: shmem@4f000 {
 			compatible = "nvidia,tegra186-bpmp-shmem";
-			reg = <0x0 0x4f000 0x0 0x1000>;
+			reg = <0x4f000 0x1000>;
 			label = "cpu-bpmp-rx";
 			pool;
 		};
Signature · 1 line
2.24.1
#49 lore raw

PATCH 38/73 arm64: tegra: Use standard notation for interrupts

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

It is customary to use angle brackets around each tuple in the interrupts property.

---
 arch/arm64/boot/dts/nvidia/tegra186.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/nvidia/tegra186.dtsi +2 -2
index 373f575b8678..50b56168fc97 100644
@@ -1199,8 +1199,8 @@ gpu@17000000 {
 		compatible = "nvidia,gp10b";
 		reg = <0x0 0x17000000 0x0 0x1000000>,
 		      <0x0 0x18000000 0x0 0x1000000>;
-		interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH
-			      GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
+		interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
 		interrupt-names = "stall", "nonstall";
 
 		clocks = <&bpmp TEGRA186_CLK_GPCCLK>,
Signature · 1 line
2.24.1
#50 lore raw

PATCH 39/73 arm64: tegra: Remove extra compatible for Tegra194 SDHCI

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The SDHCI on Tegra194 is in fact not compatible with the one found on Tegra186. Remove the extra compatible string to reflect that.

---
 arch/arm64/boot/dts/nvidia/tegra194.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/nvidia/tegra194.dtsi +3 -3
index 4bc187a4eacd..ae438b2c4dd9 100644
@@ -450,7 +450,7 @@ pwm8: pwm@32f0000 {
 		};
 
 		sdmmc1: sdhci@3400000 {
-			compatible = "nvidia,tegra194-sdhci", "nvidia,tegra186-sdhci";
+			compatible = "nvidia,tegra194-sdhci";
 			reg = <0x03400000 0x10000>;
 			interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&bpmp TEGRA194_CLK_SDMMC1>;
@@ -472,7 +472,7 @@ sdmmc1: sdhci@3400000 {
 		};
 
 		sdmmc3: sdhci@3440000 {
-			compatible = "nvidia,tegra194-sdhci", "nvidia,tegra186-sdhci";
+			compatible = "nvidia,tegra194-sdhci";
 			reg = <0x03440000 0x10000>;
 			interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&bpmp TEGRA194_CLK_SDMMC3>;
@@ -495,7 +495,7 @@ sdmmc3: sdhci@3440000 {
 		};
 
 		sdmmc4: sdhci@3460000 {
-			compatible = "nvidia,tegra194-sdhci", "nvidia,tegra186-sdhci";
+			compatible = "nvidia,tegra194-sdhci";
 			reg = <0x03460000 0x10000>;
 			interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&bpmp TEGRA194_CLK_SDMMC4>;
Signature · 1 line
2.24.1
#51 lore raw

PATCH 40/73 arm64: tegra: Remove extra compatible for Tegra210 SDHCI

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The SDHCI on Tegra210 is in fact not compatible with the one found on Tegra124. Remove the extra compatible string to reflect that.

---
 arch/arm64/boot/dts/nvidia/tegra210.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/nvidia/tegra210.dtsi +4 -4
index 08655081f72d..cbf0d30a2f8b 100644
@@ -1177,7 +1177,7 @@ usb3-3 {
 	};
 
 	sdhci@700b0000 {
-		compatible = "nvidia,tegra210-sdhci", "nvidia,tegra124-sdhci";
+		compatible = "nvidia,tegra210-sdhci";
 		reg = <0x0 0x700b0000 0x0 0x200>;
 		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA210_CLK_SDMMC1>;
@@ -1205,7 +1205,7 @@ sdhci@700b0000 {
 	};
 
 	sdhci@700b0200 {
-		compatible = "nvidia,tegra210-sdhci", "nvidia,tegra124-sdhci";
+		compatible = "nvidia,tegra210-sdhci";
 		reg = <0x0 0x700b0200 0x0 0x200>;
 		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA210_CLK_SDMMC2>;
@@ -1222,7 +1222,7 @@ sdhci@700b0200 {
 	};
 
 	sdhci@700b0400 {
-		compatible = "nvidia,tegra210-sdhci", "nvidia,tegra124-sdhci";
+		compatible = "nvidia,tegra210-sdhci";
 		reg = <0x0 0x700b0400 0x0 0x200>;
 		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA210_CLK_SDMMC3>;
@@ -1245,7 +1245,7 @@ sdhci@700b0400 {
 	};
 
 	sdhci@700b0600 {
-		compatible = "nvidia,tegra210-sdhci", "nvidia,tegra124-sdhci";
+		compatible = "nvidia,tegra210-sdhci";
 		reg = <0x0 0x700b0600 0x0 0x200>;
 		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&tegra_car TEGRA210_CLK_SDMMC4>;
Signature · 1 line
2.24.1
#52 lore raw

PATCH 41/73 arm64: tegra: Describe interconnect paths on Tegra186

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The interface used by clients of the memory controller can be configured in a number of different ways. Describe this path using the interconnect bindings to enable the configuration of these parameters.

---
 arch/arm64/boot/dts/nvidia/tegra186.dtsi | 54 ++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
arch/arm64/boot/dts/nvidia/tegra186.dtsi +54 -0
index 50b56168fc97..decf8de3bbe5 100644
@@ -60,6 +60,9 @@ ethernet@2490000 {
 		clock-names = "master_bus", "slave_bus", "rx", "tx", "ptp_ref";
 		resets = <&bpmp TEGRA186_RESET_EQOS>;
 		reset-names = "eqos";
+		interconnects = <&mc TEGRA186_MEMORY_CLIENT_EQOSR &emc>,
+				<&mc TEGRA186_MEMORY_CLIENT_EQOSW &emc>;
+		interconnect-names = "dma-mem", "write";
 		iommus = <&smmu TEGRA186_SID_EQOS>;
 		status = "disabled";
 
@@ -145,6 +148,7 @@ memory-controller@2c00000 {
 		interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>;
 		status = "disabled";
 
+		#interconnect-cells = <1>;
 		#address-cells = <2>;
 		#size-cells = <2>;
 
@@ -163,6 +167,8 @@ emc: external-memory-controller@2c60000 {
 			clocks = <&bpmp TEGRA186_CLK_EMC>;
 			clock-names = "emc";
 
+			#interconnect-cells = <0>;
+
 			nvidia,bpmp = <&bpmp>;
 		};
 	};
@@ -335,6 +341,9 @@ sdmmc1: sdhci@3400000 {
 		clock-names = "sdhci";
 		resets = <&bpmp TEGRA186_RESET_SDMMC1>;
 		reset-names = "sdhci";
+		interconnects = <&mc TEGRA186_MEMORY_CLIENT_SDMMCRA &emc>,
+				<&mc TEGRA186_MEMORY_CLIENT_SDMMCWA &emc>;
+		interconnect-names = "dma-mem", "write";
 		iommus = <&smmu TEGRA186_SID_SDMMC1>;
 		pinctrl-names = "sdmmc-3v3", "sdmmc-1v8";
 		pinctrl-0 = <&sdmmc1_3v3>;
@@ -361,6 +370,9 @@ sdmmc2: sdhci@3420000 {
 		clock-names = "sdhci";
 		resets = <&bpmp TEGRA186_RESET_SDMMC2>;
 		reset-names = "sdhci";
+		interconnects = <&mc TEGRA186_MEMORY_CLIENT_SDMMCRAA &emc>,
+				<&mc TEGRA186_MEMORY_CLIENT_SDMMCWAA &emc>;
+		interconnect-names = "dma-mem", "write";
 		iommus = <&smmu TEGRA186_SID_SDMMC2>;
 		pinctrl-names = "sdmmc-3v3", "sdmmc-1v8";
 		pinctrl-0 = <&sdmmc2_3v3>;
@@ -382,6 +394,9 @@ sdmmc3: sdhci@3440000 {
 		clock-names = "sdhci";
 		resets = <&bpmp TEGRA186_RESET_SDMMC3>;
 		reset-names = "sdhci";
+		interconnects = <&mc TEGRA186_MEMORY_CLIENT_SDMMCR &emc>,
+				<&mc TEGRA186_MEMORY_CLIENT_SDMMCW &emc>;
+		interconnect-names = "dma-mem", "write";
 		iommus = <&smmu TEGRA186_SID_SDMMC3>;
 		pinctrl-names = "sdmmc-3v3", "sdmmc-1v8";
 		pinctrl-0 = <&sdmmc3_3v3>;
@@ -408,6 +423,9 @@ sdmmc4: sdhci@3460000 {
 		assigned-clock-parents = <&bpmp TEGRA186_CLK_PLLC4_VCO>;
 		resets = <&bpmp TEGRA186_RESET_SDMMC4>;
 		reset-names = "sdhci";
+		interconnects = <&mc TEGRA186_MEMORY_CLIENT_SDMMCRAB &emc>,
+				<&mc TEGRA186_MEMORY_CLIENT_SDMMCWAB &emc>;
+		interconnect-names = "dma-mem", "write";
 		iommus = <&smmu TEGRA186_SID_SDMMC4>;
 		nvidia,pad-autocal-pull-up-offset-hs400 = <0x05>;
 		nvidia,pad-autocal-pull-down-offset-hs400 = <0x05>;
@@ -436,6 +454,9 @@ hda@3510000 {
 			 <&bpmp TEGRA186_RESET_HDA2CODEC_2X>;
 		reset-names = "hda", "hda2hdmi", "hda2codec_2x";
 		power-domains = <&bpmp TEGRA186_POWER_DOMAIN_DISP>;
+		interconnects = <&mc TEGRA186_MEMORY_CLIENT_HDAR &emc>,
+				<&mc TEGRA186_MEMORY_CLIENT_HDAW &emc>;
+		interconnect-names = "dma-mem", "write";
 		iommus = <&smmu TEGRA186_SID_HDA>;
 		status = "disabled";
 	};
@@ -564,6 +585,9 @@ usb@3530000 {
 		power-domains = <&bpmp TEGRA186_POWER_DOMAIN_XUSBC>,
 				<&bpmp TEGRA186_POWER_DOMAIN_XUSBA>;
 		power-domain-names = "xusb_host", "xusb_ss";
+		interconnects = <&mc TEGRA186_MEMORY_CLIENT_XUSB_HOSTR &emc>,
+				<&mc TEGRA186_MEMORY_CLIENT_XUSB_HOSTW &emc>;
+		interconnect-names = "dma-mem", "write";
 		iommus = <&smmu TEGRA186_SID_XUSB_HOST>;
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -786,6 +810,10 @@ pcie@10003000 {
 			 <&bpmp TEGRA186_RESET_PCIEXCLK>;
 		reset-names = "afi", "pex", "pcie_x";
 
+		interconnects = <&mc TEGRA186_MEMORY_CLIENT_AFIR &emc>,
+				<&mc TEGRA186_MEMORY_CLIENT_AFIW &emc>;
+		interconnect-names = "dma-mem", "write";
+
 		iommus = <&smmu TEGRA186_SID_AFI>;
 		iommu-map = <0x0 &smmu TEGRA186_SID_AFI 0x1000>;
 		iommu-map-mask = <0x0>;
@@ -921,6 +949,10 @@ host1x@13e00000 {
 		#size-cells = <1>;
 
 		ranges = <0x15000000 0x0 0x15000000 0x01000000>;
+
+		interconnects = <&mc TEGRA186_MEMORY_CLIENT_HOST1XDMAR &emc>;
+		interconnect-names = "dma-mem";
+
 		iommus = <&smmu TEGRA186_SID_HOST1X>;
 
 		dpaux1: dpaux@15040000 {
@@ -992,6 +1024,9 @@ display@15200000 {
 				reset-names = "dc";
 
 				power-domains = <&bpmp TEGRA186_POWER_DOMAIN_DISP>;
+				interconnects = <&mc TEGRA186_MEMORY_CLIENT_NVDISPLAYR &emc>,
+						<&mc TEGRA186_MEMORY_CLIENT_NVDISPLAYR1 &emc>;
+				interconnect-names = "dma-mem", "read-1";
 				iommus = <&smmu TEGRA186_SID_NVDISPLAY>;
 
 				nvidia,outputs = <&dsia &dsib &sor0 &sor1>;
@@ -1008,6 +1043,9 @@ display@15210000 {
 				reset-names = "dc";
 
 				power-domains = <&bpmp TEGRA186_POWER_DOMAIN_DISPB>;
+				interconnects = <&mc TEGRA186_MEMORY_CLIENT_NVDISPLAYR &emc>,
+						<&mc TEGRA186_MEMORY_CLIENT_NVDISPLAYR1 &emc>;
+				interconnect-names = "dma-mem", "read-1";
 				iommus = <&smmu TEGRA186_SID_NVDISPLAY>;
 
 				nvidia,outputs = <&dsia &dsib &sor0 &sor1>;
@@ -1024,6 +1062,9 @@ display@15220000 {
 				reset-names = "dc";
 
 				power-domains = <&bpmp TEGRA186_POWER_DOMAIN_DISPC>;
+				interconnects = <&mc TEGRA186_MEMORY_CLIENT_NVDISPLAYR &emc>,
+						<&mc TEGRA186_MEMORY_CLIENT_NVDISPLAYR1 &emc>;
+				interconnect-names = "dma-mem", "read-1";
 				iommus = <&smmu TEGRA186_SID_NVDISPLAY>;
 
 				nvidia,outputs = <&sor0 &sor1>;
@@ -1056,6 +1097,9 @@ vic@15340000 {
 			reset-names = "vic";
 
 			power-domains = <&bpmp TEGRA186_POWER_DOMAIN_VIC>;
+			interconnects = <&mc TEGRA186_MEMORY_CLIENT_VICSRD &emc>,
+					<&mc TEGRA186_MEMORY_CLIENT_VICSWR &emc>;
+			interconnect-names = "dma-mem", "write";
 			iommus = <&smmu TEGRA186_SID_VIC>;
 		};
 
@@ -1211,6 +1255,11 @@ gpu@17000000 {
 		status = "disabled";
 
 		power-domains = <&bpmp TEGRA186_POWER_DOMAIN_GPU>;
+		interconnects = <&mc TEGRA186_MEMORY_CLIENT_GPUSRD &emc>,
+				<&mc TEGRA186_MEMORY_CLIENT_GPUSWR &emc>,
+				<&mc TEGRA186_MEMORY_CLIENT_GPUSRD2 &emc>,
+				<&mc TEGRA186_MEMORY_CLIENT_GPUSWR2 &emc>;
+		interconnect-names = "dma-mem", "write-0", "read-1", "write-1";
 	};
 
 	sysram@30000000 {
@@ -1237,6 +1286,11 @@ cpu_bpmp_rx: shmem@4f000 {
 
 	bpmp: bpmp {
 		compatible = "nvidia,tegra186-bpmp";
+		interconnects = <&mc TEGRA186_MEMORY_CLIENT_BPMPR &emc>,
+				<&mc TEGRA186_MEMORY_CLIENT_BPMPW &emc>,
+				<&mc TEGRA186_MEMORY_CLIENT_BPMPDMAR &emc>,
+				<&mc TEGRA186_MEMORY_CLIENT_BPMPDMAW &emc>;
+		interconnect-names = "read", "write", "dma-mem", "dma-write";
 		iommus = <&smmu TEGRA186_SID_BPMP>;
 		mboxes = <&hsp_top0 TEGRA_HSP_MBOX_TYPE_DB
 				    TEGRA_HSP_DB_MASTER_BPMP>;
Signature · 1 line
2.24.1
#53 lore raw

PATCH 42/73 arm64: tegra: Describe interconnect paths on Tegra194

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

On Tegra194, all clients of the memory subsystem can generally address 40 bits of system memory. However, bit 39 has special meaning and will cause the memory controller to reorder sectors for block-linear buffer formats. This is primarily useful for graphics-related devices.

Use of bit 39 must be controlled on a case-by-case basis. Buffers that are used with bit 39 set by one device may be used with bit 39 cleared by other devices.

Care must be taken to allocate buffers at addresses that do not require bit 39 to be set. This is normally not an issue for system memory since there are no Tegra-based systems with enough RAM to exhaust the 39-bit physical address space. However, when a device is behind an IOMMU, such as the ARM SMMU on Tegra194, the IOMMUs input address space can cause IOVA allocations to happen in this region. This is for example the case when an operating system implements a top-down allocation policy for IO virtual addresses.

To account for this, describe the path that memory accesses take through the system. Memory clients will send requests to the memory controller, which forwards bits [38:0] of the address either to the external memory controller or the SMMU, depending on the stream ID of the access. A good way to describe this is using the interconnects bindings, see:

Documentation/devicetree/bindings/interconnect/interconnect.txt

The standard "dma-mem" path is used to describe the path towards system memory via the memory controller. A dma-ranges property in the memory controller's device tree node limits the range of DMA addresses that the memory clients can use to bits [38:0], ensuring that bit 39 is not used.

---
Changes in v4:
- add additional entries for interconnect-names to match interconnects
- add EMC as destination for interconnect paths

Changes in v3:
- add missing interconnect properties for VIC

Changes in v2:
- use memory client IDs instead of stream IDs (Mikko Perttunen)

---
 arch/arm64/boot/dts/nvidia/tegra194.dtsi | 70 ++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
arch/arm64/boot/dts/nvidia/tegra194.dtsi +70 -0
index ae438b2c4dd9..a50504a317d7 100644
@@ -59,6 +59,9 @@ ethernet@2490000 {
 			clock-names = "master_bus", "slave_bus", "rx", "tx", "ptp_ref";
 			resets = <&bpmp TEGRA194_RESET_EQOS>;
 			reset-names = "eqos";
+			interconnects = <&mc TEGRA194_MEMORY_CLIENT_EQOSR &emc>,
+					<&mc TEGRA194_MEMORY_CLIENT_EQOSW &emc>;
+			interconnect-names = "dma-mem", "write";
 			status = "disabled";
 
 			snps,write-requests = <1>;
@@ -176,6 +179,7 @@ mc: memory-controller@2c00000 {
 			reg = <0x02c00000 0x100000>,
 			      <0x02b80000 0x040000>,
 			      <0x01700000 0x100000>;
+			#interconnect-cells = <1>;
 			status = "disabled";
 
 			#address-cells = <2>;
@@ -209,6 +213,8 @@ emc: external-memory-controller@2c60000 {
 				clocks = <&bpmp TEGRA194_CLK_EMC>;
 				clock-names = "emc";
 
+				#interconnect-cells = <0>;
+
 				nvidia,bpmp = <&bpmp>;
 			};
 		};
@@ -457,6 +463,9 @@ sdmmc1: sdhci@3400000 {
 			clock-names = "sdhci";
 			resets = <&bpmp TEGRA194_RESET_SDMMC1>;
 			reset-names = "sdhci";
+			interconnects = <&mc TEGRA194_MEMORY_CLIENT_SDMMCRA &emc>,
+					<&mc TEGRA194_MEMORY_CLIENT_SDMMCWA &emc>;
+			interconnect-names = "dma-mem", "write";
 			nvidia,pad-autocal-pull-up-offset-3v3-timeout =
 									<0x07>;
 			nvidia,pad-autocal-pull-down-offset-3v3-timeout =
@@ -479,6 +488,9 @@ sdmmc3: sdhci@3440000 {
 			clock-names = "sdhci";
 			resets = <&bpmp TEGRA194_RESET_SDMMC3>;
 			reset-names = "sdhci";
+			interconnects = <&mc TEGRA194_MEMORY_CLIENT_SDMMCR &emc>,
+					<&mc TEGRA194_MEMORY_CLIENT_SDMMCW &emc>;
+			interconnect-names = "dma-mem", "write";
 			nvidia,pad-autocal-pull-up-offset-1v8 = <0x00>;
 			nvidia,pad-autocal-pull-down-offset-1v8 = <0x7a>;
 			nvidia,pad-autocal-pull-up-offset-3v3-timeout = <0x07>;
@@ -506,6 +518,9 @@ sdmmc4: sdhci@3460000 {
 					  <&bpmp TEGRA194_CLK_PLLC4>;
 			resets = <&bpmp TEGRA194_RESET_SDMMC4>;
 			reset-names = "sdhci";
+			interconnects = <&mc TEGRA194_MEMORY_CLIENT_SDMMCRAB &emc>,
+					<&mc TEGRA194_MEMORY_CLIENT_SDMMCWAB &emc>;
+			interconnect-names = "dma-mem", "write";
 			nvidia,pad-autocal-pull-up-offset-hs400 = <0x00>;
 			nvidia,pad-autocal-pull-down-offset-hs400 = <0x00>;
 			nvidia,pad-autocal-pull-up-offset-1v8-timeout = <0x0a>;
@@ -534,6 +549,9 @@ hda@3510000 {
 				 <&bpmp TEGRA194_RESET_HDA2HDMICODEC>;
 			reset-names = "hda", "hda2codec_2x", "hda2hdmi";
 			power-domains = <&bpmp TEGRA194_POWER_DOMAIN_DISP>;
+			interconnects = <&mc TEGRA194_MEMORY_CLIENT_HDAR &emc>,
+					<&mc TEGRA194_MEMORY_CLIENT_HDAW &emc>;
+			interconnect-names = "dma-mem", "write";
 			status = "disabled";
 		};
 
@@ -1032,6 +1050,8 @@ host1x@13e00000 {
 			#size-cells = <1>;
 
 			ranges = <0x15000000 0x15000000 0x01000000>;
+			interconnects = <&mc TEGRA194_MEMORY_CLIENT_HOST1XDMAR &emc>;
+			interconnect-names = "dma-mem";
 
 			display-hub@15200000 {
 				compatible = "nvidia,tegra194-display", "simple-bus";
@@ -1067,6 +1087,9 @@ display@15200000 {
 					reset-names = "dc";
 
 					power-domains = <&bpmp TEGRA194_POWER_DOMAIN_DISP>;
+					interconnects = <&mc TEGRA194_MEMORY_CLIENT_NVDISPLAYR &emc>,
+							<&mc TEGRA194_MEMORY_CLIENT_NVDISPLAYR1 &emc>;
+					interconnect-names = "dma-mem", "read-1";
 
 					nvidia,outputs = <&sor0 &sor1 &sor2 &sor3>;
 					nvidia,head = <0>;
@@ -1082,6 +1105,9 @@ display@15210000 {
 					reset-names = "dc";
 
 					power-domains = <&bpmp TEGRA194_POWER_DOMAIN_DISPB>;
+					interconnects = <&mc TEGRA194_MEMORY_CLIENT_NVDISPLAYR &emc>,
+							<&mc TEGRA194_MEMORY_CLIENT_NVDISPLAYR1 &emc>;
+					interconnect-names = "dma-mem", "read-1";
 
 					nvidia,outputs = <&sor0 &sor1 &sor2 &sor3>;
 					nvidia,head = <1>;
@@ -1097,6 +1123,9 @@ display@15220000 {
 					reset-names = "dc";
 
 					power-domains = <&bpmp TEGRA194_POWER_DOMAIN_DISPC>;
+					interconnects = <&mc TEGRA194_MEMORY_CLIENT_NVDISPLAYR &emc>,
+							<&mc TEGRA194_MEMORY_CLIENT_NVDISPLAYR1 &emc>;
+					interconnect-names = "dma-mem", "read-1";
 
 					nvidia,outputs = <&sor0 &sor1 &sor2 &sor3>;
 					nvidia,head = <2>;
@@ -1112,6 +1141,9 @@ display@15230000 {
 					reset-names = "dc";
 
 					power-domains = <&bpmp TEGRA194_POWER_DOMAIN_DISPC>;
+					interconnects = <&mc TEGRA194_MEMORY_CLIENT_NVDISPLAYR &emc>,
+							<&mc TEGRA194_MEMORY_CLIENT_NVDISPLAYR1 &emc>;
+					interconnect-names = "dma-mem", "read-1";
 
 					nvidia,outputs = <&sor0 &sor1 &sor2 &sor3>;
 					nvidia,head = <3>;
@@ -1128,6 +1160,9 @@ vic@15340000 {
 				reset-names = "vic";
 
 				power-domains = <&bpmp TEGRA194_POWER_DOMAIN_VIC>;
+				interconnects = <&mc TEGRA194_MEMORY_CLIENT_VICSRD &emc>,
+						<&mc TEGRA194_MEMORY_CLIENT_VICSWR &emc>;
+				interconnect-names = "dma-mem", "write";
 			};
 
 			dpaux0: dpaux@155c0000 {
@@ -1404,9 +1439,14 @@ pcie@14100000 {
 		nvidia,aspm-l0s-entrance-latency-us = <3>;
 
 		bus-range = <0x0 0xff>;
+
 		ranges = <0x81000000 0x0  0x30100000 0x0  0x30100000 0x0 0x00100000   /* downstream I/O (1MB) */
 			  0xc3000000 0x12 0x00000000 0x12 0x00000000 0x0 0x30000000   /* prefetchable memory (768MB) */
 			  0x82000000 0x0  0x40000000 0x12 0x30000000 0x0 0x10000000>; /* non-prefetchable memory (256MB) */
+
+		interconnects = <&mc TEGRA194_MEMORY_CLIENT_PCIE1R &emc>,
+				<&mc TEGRA194_MEMORY_CLIENT_PCIE1W &emc>;
+		interconnect-names = "read", "write";
 	};
 
 	pcie@14120000 {
@@ -1449,9 +1489,14 @@ pcie@14120000 {
 		nvidia,aspm-l0s-entrance-latency-us = <3>;
 
 		bus-range = <0x0 0xff>;
+
 		ranges = <0x81000000 0x0  0x32100000 0x0  0x32100000 0x0 0x00100000   /* downstream I/O (1MB) */
 			  0xc3000000 0x12 0x40000000 0x12 0x40000000 0x0 0x30000000   /* prefetchable memory (768MB) */
 			  0x82000000 0x0  0x40000000 0x12 0x70000000 0x0 0x10000000>; /* non-prefetchable memory (256MB) */
+
+		interconnects = <&mc TEGRA194_MEMORY_CLIENT_PCIE2AR &emc>,
+				<&mc TEGRA194_MEMORY_CLIENT_PCIE2AW &emc>;
+		interconnect-names = "read", "write";
 	};
 
 	pcie@14140000 {
@@ -1494,9 +1539,14 @@ pcie@14140000 {
 		nvidia,aspm-l0s-entrance-latency-us = <3>;
 
 		bus-range = <0x0 0xff>;
+
 		ranges = <0x81000000 0x0  0x34100000 0x0  0x34100000 0x0 0x00100000   /* downstream I/O (1MB) */
 			  0xc3000000 0x12 0x80000000 0x12 0x80000000 0x0 0x30000000   /* prefetchable memory (768MB) */
 			  0x82000000 0x0  0x40000000 0x12 0xb0000000 0x0 0x10000000>; /* non-prefetchable memory (256MB) */
+
+		interconnects = <&mc TEGRA194_MEMORY_CLIENT_PCIE3R &emc>,
+				<&mc TEGRA194_MEMORY_CLIENT_PCIE3W &emc>;
+		interconnect-names = "read", "write";
 	};
 
 	pcie@14160000 {
@@ -1539,9 +1589,14 @@ pcie@14160000 {
 		nvidia,aspm-l0s-entrance-latency-us = <3>;
 
 		bus-range = <0x0 0xff>;
+
 		ranges = <0x81000000 0x0  0x36100000 0x0  0x36100000 0x0 0x00100000   /* downstream I/O (1MB) */
 			  0xc3000000 0x14 0x00000000 0x14 0x00000000 0x3 0x40000000   /* prefetchable memory (13GB) */
 			  0x82000000 0x0  0x40000000 0x17 0x40000000 0x0 0xc0000000>; /* non-prefetchable memory (3GB) */
+
+		interconnects = <&mc TEGRA194_MEMORY_CLIENT_PCIE4R &emc>,
+				<&mc TEGRA194_MEMORY_CLIENT_PCIE4W &emc>;
+		interconnect-names = "read", "write";
 	};
 
 	pcie@14180000 {
@@ -1584,9 +1639,14 @@ pcie@14180000 {
 		nvidia,aspm-l0s-entrance-latency-us = <3>;
 
 		bus-range = <0x0 0xff>;
+
 		ranges = <0x81000000 0x0  0x38100000 0x0  0x38100000 0x0 0x00100000   /* downstream I/O (1MB) */
 			  0xc3000000 0x18 0x00000000 0x18 0x00000000 0x3 0x40000000   /* prefetchable memory (13GB) */
 			  0x82000000 0x0  0x40000000 0x1b 0x40000000 0x0 0xc0000000>; /* non-prefetchable memory (3GB) */
+
+		interconnects = <&mc TEGRA194_MEMORY_CLIENT_PCIE0R &emc>,
+				<&mc TEGRA194_MEMORY_CLIENT_PCIE0W &emc>;
+		interconnect-names = "read", "write";
 	};
 
 	pcie@141a0000 {
@@ -1633,9 +1693,14 @@ pcie@141a0000 {
 		nvidia,aspm-l0s-entrance-latency-us = <3>;
 
 		bus-range = <0x0 0xff>;
+
 		ranges = <0x81000000 0x0  0x3a100000 0x0  0x3a100000 0x0 0x00100000   /* downstream I/O (1MB) */
 			  0xc3000000 0x1c 0x00000000 0x1c 0x00000000 0x3 0x40000000   /* prefetchable memory (13GB) */
 			  0x82000000 0x0  0x40000000 0x1f 0x40000000 0x0 0xc0000000>; /* non-prefetchable memory (3GB) */
+
+		interconnects = <&mc TEGRA194_MEMORY_CLIENT_PCIE5R &emc>,
+				<&mc TEGRA194_MEMORY_CLIENT_PCIE5W &emc>;
+		interconnect-names = "read", "write";
 	};
 
 	pcie_ep@14160000 {
@@ -1767,6 +1832,11 @@ bpmp: bpmp {
 		#clock-cells = <1>;
 		#reset-cells = <1>;
 		#power-domain-cells = <1>;
+		interconnects = <&mc TEGRA194_MEMORY_CLIENT_BPMPR &emc>,
+				<&mc TEGRA194_MEMORY_CLIENT_BPMPW &emc>,
+				<&mc TEGRA194_MEMORY_CLIENT_BPMPDMAR &emc>,
+				<&mc TEGRA194_MEMORY_CLIENT_BPMPDMAW &emc>;
+		interconnect-names = "read", "write", "dma-mem", "dma-write";
 
 		bpmp_i2c: i2c {
 			compatible = "nvidia,tegra186-bpmp-i2c";
Signature · 1 line
2.24.1
#54 lore raw

PATCH 43/73 arm64: tegra: Add interrupt for Tegra194 memory controller

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

This interrupt can be used for the operating system to be interrupted when certain events occur.

---
 arch/arm64/boot/dts/nvidia/tegra194.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/nvidia/tegra194.dtsi +1 -0
index a50504a317d7..73aba724bf67 100644
@@ -179,6 +179,7 @@ mc: memory-controller@2c00000 {
 			reg = <0x02c00000 0x100000>,
 			      <0x02b80000 0x040000>,
 			      <0x01700000 0x100000>;
+			interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>;
 			#interconnect-cells = <1>;
 			status = "disabled";
 
Signature · 1 line
2.24.1
#55 lore raw

PATCH 44/73 arm64: tegra: Add Tegra132 compatible string for host1x

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

While the host1x controller found on Tegra132 is the same as on Tegra124 it is good practice to also list a SoC-specific compatible string so any SoC-specific quirks can be implemented in drivers if necessary.

---
 arch/arm64/boot/dts/nvidia/tegra132.dtsi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/nvidia/tegra132.dtsi +3 -1
index 11a1bb428595..6ebfe503489f 100644
@@ -83,7 +83,9 @@ pci@2,0 {
 	};
 
 	host1x@50000000 {
-		compatible = "nvidia,tegra124-host1x", "simple-bus";
+		compatible = "nvidia,tegra132-host1x",
+			     "nvidia,tegra124-host1x",
+			     "simple-bus";
 		reg = <0x0 0x50000000 0x0 0x00034000>;
 		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */
 			     <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; /* general */
Signature · 1 line
2.24.1
#56 lore raw

PATCH 45/73 arm64: tegra: Add interrupt-names for host1x

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

Interrupt names are used to distinguish between the syncpoint and general host1x interrupts. Make sure they are available in the DT so that drivers can use them if necessary.

---
 arch/arm64/boot/dts/nvidia/tegra132.dtsi | 1 +
 arch/arm64/boot/dts/nvidia/tegra186.dtsi | 1 +
 arch/arm64/boot/dts/nvidia/tegra194.dtsi | 1 +
 arch/arm64/boot/dts/nvidia/tegra210.dtsi | 1 +
 4 files changed, 4 insertions(+)
arch/arm64/boot/dts/nvidia/tegra132.dtsi +1 -0
index 6ebfe503489f..76e1a6451e83 100644
@@ -89,6 +89,7 @@ host1x@50000000 {
 		reg = <0x0 0x50000000 0x0 0x00034000>;
 		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */
 			     <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; /* general */
+		interrupt-names = "syncpt", "host1x";
 		clocks = <&tegra_car TEGRA124_CLK_HOST1X>;
 		clock-names = "host1x";
 		resets = <&tegra_car 28>;
arch/arm64/boot/dts/nvidia/tegra186.dtsi +1 -0
index decf8de3bbe5..e86b682f8645 100644
@@ -940,6 +940,7 @@ host1x@13e00000 {
 		reg-names = "hypervisor", "vm";
 		interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>,
 		             <GIC_SPI 263 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "syncpt", "host1x";
 		clocks = <&bpmp TEGRA186_CLK_HOST1X>;
 		clock-names = "host1x";
 		resets = <&bpmp TEGRA186_RESET_HOST1X>;
arch/arm64/boot/dts/nvidia/tegra194.dtsi +1 -0
index 73aba724bf67..f056158a2634 100644
@@ -1042,6 +1042,7 @@ host1x@13e00000 {
 			reg-names = "hypervisor", "vm";
 			interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 263 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "syncpt", "host1x";
 			clocks = <&bpmp TEGRA194_CLK_HOST1X>;
 			clock-names = "host1x";
 			resets = <&bpmp TEGRA194_RESET_HOST1X>;
arch/arm64/boot/dts/nvidia/tegra210.dtsi +1 -0
index cbf0d30a2f8b..0586722df64b 100644
@@ -90,6 +90,7 @@ host1x@50000000 {
 		reg = <0x0 0x50000000 0x0 0x00034000>;
 		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */
 			     <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; /* general */
+		interrupt-names = "syncpt", "host1x";
 		clocks = <&tegra_car TEGRA210_CLK_HOST1X>;
 		clock-names = "host1x";
 		resets = <&tegra_car 28>;
Signature · 1 line
2.24.1
#57 lore raw

PATCH 46/73 arm64: tegra: Remove parent clock from display controllers

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The display controller's parent clock depends on the output that's consuming data from the display controller, so it needs to be specified as the parent of the corresponding output. The device tree bindings do specify this, so just correct the existing device trees that get this wrong.

---
 arch/arm64/boot/dts/nvidia/tegra132.dtsi | 10 ++++------
 arch/arm64/boot/dts/nvidia/tegra210.dtsi | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)
arch/arm64/boot/dts/nvidia/tegra132.dtsi +4 -6
index 76e1a6451e83..4fc34c5ec2dc 100644
@@ -104,9 +104,8 @@ dc@54200000 {
 			compatible = "nvidia,tegra124-dc";
 			reg = <0x0 0x54200000 0x0 0x00040000>;
 			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA124_CLK_DISP1>,
-				 <&tegra_car TEGRA124_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA124_CLK_DISP1>;
+			clock-names = "dc";
 			resets = <&tegra_car 27>;
 			reset-names = "dc";
 
@@ -119,9 +118,8 @@ dc@54240000 {
 			compatible = "nvidia,tegra124-dc";
 			reg = <0x0 0x54240000 0x0 0x00040000>;
 			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA124_CLK_DISP2>,
-				 <&tegra_car TEGRA124_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA124_CLK_DISP2>;
+			clock-names = "dc";
 			resets = <&tegra_car 26>;
 			reset-names = "dc";
 
arch/arm64/boot/dts/nvidia/tegra210.dtsi +4 -6
index 0586722df64b..41ffa0531cd8 100644
@@ -187,9 +187,8 @@ dc@54200000 {
 			compatible = "nvidia,tegra210-dc";
 			reg = <0x0 0x54200000 0x0 0x00040000>;
 			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA210_CLK_DISP1>,
-				 <&tegra_car TEGRA210_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA210_CLK_DISP1>;
+			clock-names = "dc";
 			resets = <&tegra_car 27>;
 			reset-names = "dc";
 
@@ -202,9 +201,8 @@ dc@54240000 {
 			compatible = "nvidia,tegra210-dc";
 			reg = <0x0 0x54240000 0x0 0x00040000>;
 			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&tegra_car TEGRA210_CLK_DISP2>,
-				 <&tegra_car TEGRA210_CLK_PLL_P>;
-			clock-names = "dc", "parent";
+			clocks = <&tegra_car TEGRA210_CLK_DISP2>;
+			clock-names = "dc";
 			resets = <&tegra_car 26>;
 			reset-names = "dc";
 
Signature · 1 line
2.24.1
#58 lore raw

PATCH 47/73 arm64: tegra: Fixup I/O and PLL supply names for HDMI/DP

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The I/O and PLL supplies used for HDMI/DP have alternative names. Use the names that are given in the hardware documentation for consistency.

---
 arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 4 ++--
 arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 4 ++--
 arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi     | 4 ++--
 arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts +2 -2
index 1af7f9ffb7b6..f35b0ba29cb5 100644
@@ -286,8 +286,8 @@ sor@15540000 {
 		sor@15580000 {
 			status = "okay";
 
-			avdd-io-supply = <&vdd_hdmi_1v05>;
-			vdd-pll-supply = <&vdd_1v8_ap>;
+			avdd-io-hdmi-dp-supply = <&vdd_hdmi_1v05>;
+			vdd-hdmi-dp-pll-supply = <&vdd_1v8_ap>;
 			hdmi-supply = <&vdd_hdmi>;
 
 			nvidia,ddc-i2c-bus = <&ddc>;
arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts +2 -2
index e15d1eac05f5..9a7d136b467f 100644
@@ -145,8 +145,8 @@ sor@15b40000 {
 			sor@15b80000 {
 				status = "okay";
 
-				avdd-io-supply = <&vdd_1v0>;
-				vdd-pll-supply = <&vdd_1v8hs>;
+				avdd-io-hdmi-dp-supply = <&vdd_1v0>;
+				vdd-hdmi-dp-pll-supply = <&vdd_1v8hs>;
 				hdmi-supply = <&vdd_hdmi>;
 
 				nvidia,ddc-i2c-bus = <&ddc>;
arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi +2 -2
index 5c3771e8d683..f72afdf547ee 100644
@@ -27,8 +27,8 @@ csi@838 {
 		sor@54580000 {
 			status = "okay";
 
-			avdd-io-supply = <&avdd_1v05>;
-			vdd-pll-supply = <&vdd_1v8>;
+			avdd-io-hdmi-dp-supply = <&avdd_1v05>;
+			vdd-hdmi-dp-pll-supply = <&vdd_1v8>;
 			hdmi-supply = <&vdd_hdmi>;
 
 			nvidia,ddc-i2c-bus = <&hdmi_ddc>;
arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts +2 -2
index ced01d15e457..e7ebf1afeb7a 100644
@@ -74,8 +74,8 @@ sor@54540000 {
 		sor@54580000 {
 			status = "okay";
 
-			avdd-io-supply = <&avdd_1v05>;
-			vdd-pll-supply = <&vdd_1v8>;
+			avdd-io-hdmi-dp-supply = <&avdd_1v05>;
+			vdd-hdmi-dp-pll-supply = <&vdd_1v8>;
 			hdmi-supply = <&vdd_hdmi>;
 
 			nvidia,ddc-i2c-bus = <&hdmi_ddc>;
Signature · 1 line
2.24.1
#59 lore raw

PATCH 48/73 arm64: tegra: Add unit-address to memory node

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The memory node requires a unit-address. For some boards the bootloader, which is usually locked down, uses a hard-coded name for the memory node without a unit-address, so we can't fix it on those boards.

---
 arch/arm64/boot/dts/nvidia/tegra132-norrin.dts     | 2 +-
 arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi     | 2 +-
 arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi     | 2 +-
 arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi     | 2 +-
 arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi     | 2 +-
 arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/nvidia/tegra132-norrin.dts +1 -1
index 9f3206c63900..d0d03cc30197 100644
@@ -18,7 +18,7 @@ chosen {
 		stdout-path = "serial0:115200n8";
 	};
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x0 0x80000000 0x0 0x80000000>;
 	};
arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi +1 -1
index de049d8d458a..7b5b9bb332cf 100644
@@ -27,7 +27,7 @@ chosen {
 		stdout-path = "serial0:115200n8";
 	};
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x0 0x80000000 0x2 0x00000000>;
 	};
arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi +1 -1
index cc6ed45a2b48..751775357d51 100644
@@ -17,7 +17,7 @@ chosen {
 		stdout-path = "serial0:115200n8";
 	};
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x0 0x80000000 0x1 0x0>;
 	};
arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi +1 -1
index d0dc03923723..9ace2d9ea085 100644
@@ -14,7 +14,7 @@ chosen {
 		stdout-path = "serial0:115200n8";
 	};
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x0 0x80000000 0x0 0xc0000000>;
 	};
arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi +1 -1
index 88a4b9333d84..615a8f5a6cf2 100644
@@ -16,7 +16,7 @@ chosen {
 		stdout-path = "serial0:115200n8";
 	};
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x0 0x80000000 0x0 0xc0000000>;
 	};
arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts +1 -1
index e7ebf1afeb7a..e6f4a36efa73 100644
@@ -22,7 +22,7 @@ chosen {
 		stdout-path = "serial0:115200n8";
 	};
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		reg = <0x0 0x80000000 0x1 0x0>;
 	};
Signature · 1 line
2.24.1
#60 lore raw

PATCH 49/73 arm64: tegra: Rename sdhci nodes to mmc

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The new json-schema based validation tools require SD/MMC controller nodes to be named mmc. Rename all references to them.

---
 arch/arm64/boot/dts/nvidia/tegra132-norrin.dts     |  6 +++---
 arch/arm64/boot/dts/nvidia/tegra132.dtsi           |  8 ++++----
 arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts |  2 +-
 arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi     | 10 +++++-----
 arch/arm64/boot/dts/nvidia/tegra186.dtsi           |  8 ++++----
 arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi     |  8 ++++----
 arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts |  2 +-
 arch/arm64/boot/dts/nvidia/tegra194.dtsi           |  6 +++---
 arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi     |  2 +-
 arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi     |  2 +-
 arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi     |  2 +-
 arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi     |  2 +-
 arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts |  4 ++--
 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts      |  2 +-
 arch/arm64/boot/dts/nvidia/tegra210.dtsi           |  8 ++++----
 15 files changed, 36 insertions(+), 36 deletions(-)
arch/arm64/boot/dts/nvidia/tegra132-norrin.dts +3 -3
index d0d03cc30197..e6fe62e5c234 100644
@@ -894,12 +894,12 @@ pmc@7000e400 {
 	};
 
 	/* WIFI/BT module */
-	sdhci@700b0000 {
+	mmc@700b0000 {
 		status = "disabled";
 	};
 
 	/* external SD/MMC */
-	sdhci@700b0400 {
+	mmc@700b0400 {
 		cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
 		power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
 		wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_HIGH>;
@@ -909,7 +909,7 @@ sdhci@700b0400 {
 	};
 
 	/* EMMC 4.51 */
-	sdhci@700b0600 {
+	mmc@700b0600 {
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
arch/arm64/boot/dts/nvidia/tegra132.dtsi +4 -4
index 4fc34c5ec2dc..8558ad38b69c 100644
@@ -691,7 +691,7 @@ utmi-2 {
 		};
 	};
 
-	sdhci@700b0000 {
+	mmc@700b0000 {
 		compatible = "nvidia,tegra124-sdhci";
 		reg = <0x0 0x700b0000 0x0 0x200>;
 		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -702,7 +702,7 @@ sdhci@700b0000 {
 		status = "disabled";
 	};
 
-	sdhci@700b0200 {
+	mmc@700b0200 {
 		compatible = "nvidia,tegra124-sdhci";
 		reg = <0x0 0x700b0200 0x0 0x200>;
 		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -713,7 +713,7 @@ sdhci@700b0200 {
 		status = "disabled";
 	};
 
-	sdhci@700b0400 {
+	mmc@700b0400 {
 		compatible = "nvidia,tegra124-sdhci";
 		reg = <0x0 0x700b0400 0x0 0x200>;
 		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -724,7 +724,7 @@ sdhci@700b0400 {
 		status = "disabled";
 	};
 
-	sdhci@700b0600 {
+	mmc@700b0600 {
 		compatible = "nvidia,tegra124-sdhci";
 		reg = <0x0 0x700b0600 0x0 0x200>;
 		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts +1 -1
index f35b0ba29cb5..37ec15a14c77 100644
@@ -103,7 +103,7 @@ exp2: gpio@77 {
 	};
 
 	/* SDMMC1 (SD/MMC) */
-	sdhci@3400000 {
+	mmc@3400000 {
 		status = "okay";
 
 		vmmc-supply = <&vdd_sd>;
arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi +5 -5
index 7b5b9bb332cf..d1ed7eee949a 100644
@@ -9,8 +9,8 @@ / {
 
 	aliases {
 		ethernet0 = "/ethernet@2490000";
-		sdhci0 = "/sdhci@3460000";
-		sdhci1 = "/sdhci@3400000";
+		mmc0 = "/mmc@3460000";
+		mmc1 = "/mmc@3400000";
 		serial0 = &uarta;
 		i2c0 = "/bpmp/i2c";
 		i2c1 = "/i2c@3160000";
@@ -135,7 +135,7 @@ i2c@31e0000 {
 	};
 
 	/* SDMMC1 (SD/MMC) */
-	sdhci@3400000 {
+	mmc@3400000 {
 		cd-gpios = <&gpio TEGRA186_MAIN_GPIO(P, 5) GPIO_ACTIVE_LOW>;
 		wp-gpios = <&gpio TEGRA186_MAIN_GPIO(P, 4) GPIO_ACTIVE_HIGH>;
 
@@ -143,12 +143,12 @@ sdhci@3400000 {
 	};
 
 	/* SDMMC3 (SDIO) */
-	sdhci@3440000 {
+	mmc@3440000 {
 		status = "okay";
 	};
 
 	/* SDMMC4 (eMMC) */
-	sdhci@3460000 {
+	mmc@3460000 {
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
arch/arm64/boot/dts/nvidia/tegra186.dtsi +4 -4
index e86b682f8645..927c646620cb 100644
@@ -333,7 +333,7 @@ gen9_i2c: i2c@31e0000 {
 		status = "disabled";
 	};
 
-	sdmmc1: sdhci@3400000 {
+	sdmmc1: mmc@3400000 {
 		compatible = "nvidia,tegra186-sdhci";
 		reg = <0x0 0x03400000 0x0 0x10000>;
 		interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
@@ -362,7 +362,7 @@ sdmmc1: sdhci@3400000 {
 		status = "disabled";
 	};
 
-	sdmmc2: sdhci@3420000 {
+	sdmmc2: mmc@3420000 {
 		compatible = "nvidia,tegra186-sdhci";
 		reg = <0x0 0x03420000 0x0 0x10000>;
 		interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
@@ -386,7 +386,7 @@ sdmmc2: sdhci@3420000 {
 		status = "disabled";
 	};
 
-	sdmmc3: sdhci@3440000 {
+	sdmmc3: mmc@3440000 {
 		compatible = "nvidia,tegra186-sdhci";
 		reg = <0x0 0x03440000 0x0 0x10000>;
 		interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
@@ -412,7 +412,7 @@ sdmmc3: sdhci@3440000 {
 		status = "disabled";
 	};
 
-	sdmmc4: sdhci@3460000 {
+	sdmmc4: mmc@3460000 {
 		compatible = "nvidia,tegra186-sdhci";
 		reg = <0x0 0x03460000 0x0 0x10000>;
 		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi +4 -4
index f3781e86f321..442e333ac13f 100644
@@ -9,8 +9,8 @@ / {
 
 	aliases {
 		ethernet0 = "/cbb@0/ethernet@2490000";
-		sdhci0 = "/cbb@0/sdhci@3460000";
-		sdhci1 = "/cbb@0/sdhci@3400000";
+		mmc0 = "/cbb@0/mmc@3460000";
+		mmc1 = "/cbb@0/mmc@3400000";
 		serial0 = &tcu;
 		i2c0 = "/bpmp/i2c";
 		i2c1 = "/cbb@0/i2c@3160000";
@@ -58,12 +58,12 @@ serial@3110000 {
 		};
 
 		/* SDMMC1 (SD/MMC) */
-		sdhci@3400000 {
+		mmc@3400000 {
 			cd-gpios = <&gpio TEGRA194_MAIN_GPIO(A, 0) GPIO_ACTIVE_LOW>;
 		};
 
 		/* SDMMC4 (eMMC) */
-		sdhci@3460000 {
+		mmc@3460000 {
 			status = "okay";
 			bus-width = <8>;
 			non-removable;
arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts +1 -1
index 9a7d136b467f..0f9868b6fd6b 100644
@@ -28,7 +28,7 @@ ddc: i2c@31c0000 {
 		};
 
 		/* SDMMC1 (SD/MMC) */
-		sdhci@3400000 {
+		mmc@3400000 {
 			status = "okay";
 		};
 
arch/arm64/boot/dts/nvidia/tegra194.dtsi +3 -3
index f056158a2634..d5246c75b782 100644
@@ -456,7 +456,7 @@ pwm8: pwm@32f0000 {
 			#pwm-cells = <2>;
 		};
 
-		sdmmc1: sdhci@3400000 {
+		sdmmc1: mmc@3400000 {
 			compatible = "nvidia,tegra194-sdhci";
 			reg = <0x03400000 0x10000>;
 			interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
@@ -481,7 +481,7 @@ sdmmc1: sdhci@3400000 {
 			status = "disabled";
 		};
 
-		sdmmc3: sdhci@3440000 {
+		sdmmc3: mmc@3440000 {
 			compatible = "nvidia,tegra194-sdhci";
 			reg = <0x03440000 0x10000>;
 			interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
@@ -507,7 +507,7 @@ sdmmc3: sdhci@3440000 {
 			status = "disabled";
 		};
 
-		sdmmc4: sdhci@3460000 {
+		sdmmc4: mmc@3460000 {
 			compatible = "nvidia,tegra194-sdhci";
 			reg = <0x03460000 0x10000>;
 			interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi +1 -1
index 751775357d51..251c6099482a 100644
@@ -293,7 +293,7 @@ pmc@7000e400 {
 	};
 
 	/* eMMC */
-	sdhci@700b0600 {
+	mmc@700b0600 {
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi +1 -1
index 9ace2d9ea085..f9158dc943f9 100644
@@ -34,7 +34,7 @@ pmc@7000e400 {
 	};
 
 	/* eMMC */
-	sdhci@700b0600 {
+	mmc@700b0600 {
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi +1 -1
index f72afdf547ee..fb0db05647c4 100644
@@ -1500,7 +1500,7 @@ usb3-1 {
 	};
 
 	/* MMC/SD */
-	sdhci@700b0000 {
+	mmc@700b0000 {
 		status = "okay";
 		bus-width = <4>;
 
arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi +1 -1
index 615a8f5a6cf2..579d5b8a757d 100644
@@ -1580,7 +1580,7 @@ pmc@7000e400 {
 		status = "okay";
 	};
 
-	sdhci@700b0600 {
+	mmc@700b0600 {
 		bus-width = <8>;
 		non-removable;
 		status = "okay";
arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts +2 -2
index e6f4a36efa73..4a354f5293fc 100644
@@ -535,7 +535,7 @@ usb3-0 {
 		};
 	};
 
-	sdhci@700b0000 {
+	mmc@700b0000 {
 		status = "okay";
 		bus-width = <4>;
 
@@ -553,7 +553,7 @@ usb@700d0000 {
 		hvdd-usb-supply = <&vdd_1v8>;
 	};
 
-	sdhci@700b0400 {
+	mmc@700b0400 {
 		status = "okay";
 		bus-width = <4>;
 
arch/arm64/boot/dts/nvidia/tegra210-smaug.dts +1 -1
index 0b5b6ffbff43..d32053934f3c 100644
@@ -1693,7 +1693,7 @@ usb3-0 {
 		};
 	};
 
-	sdhci@700b0600 {
+	mmc@700b0600 {
 		bus-width = <8>;
 		non-removable;
 		status = "okay";
arch/arm64/boot/dts/nvidia/tegra210.dtsi +4 -4
index 41ffa0531cd8..1f7dc518b394 100644
@@ -1175,7 +1175,7 @@ usb3-3 {
 		};
 	};
 
-	sdhci@700b0000 {
+	mmc@700b0000 {
 		compatible = "nvidia,tegra210-sdhci";
 		reg = <0x0 0x700b0000 0x0 0x200>;
 		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -1203,7 +1203,7 @@ sdhci@700b0000 {
 		status = "disabled";
 	};
 
-	sdhci@700b0200 {
+	mmc@700b0200 {
 		compatible = "nvidia,tegra210-sdhci";
 		reg = <0x0 0x700b0200 0x0 0x200>;
 		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -1220,7 +1220,7 @@ sdhci@700b0200 {
 		status = "disabled";
 	};
 
-	sdhci@700b0400 {
+	mmc@700b0400 {
 		compatible = "nvidia,tegra210-sdhci";
 		reg = <0x0 0x700b0400 0x0 0x200>;
 		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -1243,7 +1243,7 @@ sdhci@700b0400 {
 		status = "disabled";
 	};
 
-	sdhci@700b0600 {
+	mmc@700b0600 {
 		compatible = "nvidia,tegra210-sdhci";
 		reg = <0x0 0x700b0600 0x0 0x200>;
 		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.24.1
#61 lore raw

PATCH 50/73 arm64: tegra: Enable XUSB on Norrin

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

Use the XUSB controller instead of the legacy EHCI controller to enable USB 3.0 support.

---
 .../arm64/boot/dts/nvidia/tegra132-norrin.dts | 124 +++++++++++----
 arch/arm64/boot/dts/nvidia/tegra132.dtsi      | 148 ++++++++++++++++--
 2 files changed, 230 insertions(+), 42 deletions(-)
arch/arm64/boot/dts/nvidia/tegra132-norrin.dts +96 -28
index e6fe62e5c234..bba8a4b82b0b 100644
@@ -671,7 +671,7 @@ vdd_gpu: sd6 {
 					regulator-boot-on;
 				};
 
-				ldo0 {
+				avdd_1v05_run: ldo0 {
 					regulator-name = "+1.05_RUN_AVDD";
 					regulator-min-microvolt = <1050000>;
 					regulator-max-microvolt = <1050000>;
@@ -893,6 +893,101 @@ pmc@7000e400 {
 		nvidia,reset-gpio = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
 	};
 
+	usb@70090000 {
+		phys = <&{/padctl@7009f000/pads/usb2/lanes/usb2-0}>, /* 1st USB A */
+		       <&{/padctl@7009f000/pads/usb2/lanes/usb2-1}>, /* Internal USB */
+		       <&{/padctl@7009f000/pads/usb2/lanes/usb2-2}>, /* 2nd USB A */
+		       <&{/padctl@7009f000/pads/pcie/lanes/pcie-0}>, /* 1st USB A */
+		       <&{/padctl@7009f000/pads/pcie/lanes/pcie-1}>; /* 2nd USB A */
+		phy-names = "usb2-0", "usb2-1", "usb2-2", "usb3-0", "usb3-1";
+
+		avddio-pex-supply = <&vdd_1v05_run>;
+		dvddio-pex-supply = <&vdd_1v05_run>;
+		avdd-usb-supply = <&vdd_3v3_lp0>;
+		hvdd-usb-ss-supply = <&vdd_3v3_lp0>;
+
+		status = "okay";
+	};
+
+	padctl@7009f000 {
+		avdd-pll-utmip-supply = <&vddio_1v8>;
+		avdd-pll-erefe-supply = <&avdd_1v05_run>;
+		avdd-pex-pll-supply = <&vdd_1v05_run>;
+		hvdd-pex-pll-e-supply = <&vdd_3v3_lp0>;
+
+		pads {
+			usb2 {
+				status = "okay";
+
+				lanes {
+					usb2-0 {
+						nvidia,function = "xusb";
+						status = "okay";
+					};
+
+					usb2-1 {
+						nvidia,function = "xusb";
+						status = "okay";
+					};
+
+					usb2-2 {
+						nvidia,function = "xusb";
+						status = "okay";
+					};
+				};
+			};
+
+			pcie {
+				status = "okay";
+
+				lanes {
+					pcie-0 {
+						nvidia,function = "usb3-ss";
+						status = "okay";
+					};
+
+					pcie-1 {
+						nvidia,function = "usb3-ss";
+						status = "okay";
+					};
+				};
+			};
+		};
+
+		ports {
+			usb2-0 {
+				status = "okay";
+				mode = "otg";
+
+				vbus-supply = <&vdd_usb1_vbus>;
+			};
+
+			usb2-1 {
+				status = "okay";
+				mode = "host";
+
+				vbus-supply = <&vdd_run_cam>;
+			};
+
+			usb2-2 {
+				status = "okay";
+				mode = "host";
+
+				vbus-supply = <&vdd_usb3_vbus>;
+			};
+
+			usb3-0 {
+				nvidia,usb2-companion = <0>;
+				status = "okay";
+			};
+
+			usb3-1 {
+				nvidia,usb2-companion = <2>;
+				status = "okay";
+			};
+		};
+	};
+
 	/* WIFI/BT module */
 	mmc@700b0000 {
 		status = "disabled";
@@ -915,33 +1010,6 @@ mmc@700b0600 {
 		non-removable;
 	};
 
-	usb@7d000000 {
-		status = "okay";
-	};
-
-	usb-phy@7d000000 {
-		status = "okay";
-		vbus-supply = <&vdd_usb1_vbus>;
-	};
-
-	usb@7d004000 {
-		status = "okay";
-	};
-
-	usb-phy@7d004000 {
-		status = "okay";
-		vbus-supply = <&vdd_run_cam>;
-	};
-
-	usb@7d008000 {
-		status = "okay";
-	};
-
-	usb-phy@7d008000 {
-		status = "okay";
-		vbus-supply = <&vdd_usb3_vbus>;
-	};
-
 	backlight: backlight {
 		compatible = "pwm-backlight";
 
arch/arm64/boot/dts/nvidia/tegra132.dtsi +134 -14

191 lines not on this page · raw message

Signature · 1 line
2.24.1
#62 lore raw

PATCH 51/73 arm64: tegra: Remove undocumented battery-name property

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

battery-name is not a documented property, so drop it to avoid validation failures.

---
 arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 1 -
 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts  | 1 -
 2 files changed, 2 deletions(-)
arch/arm64/boot/dts/nvidia/tegra132-norrin.dts +0 -1
index bba8a4b82b0b..bb45ca6a5cf2 100644
@@ -781,7 +781,6 @@ TEGRA_GPIO(J, 0)
 				battery: smart-battery {
 					compatible = "sbs,sbs-battery";
 					reg = <0xb>;
-					battery-name = "battery";
 					sbs,i2c-retry-count = <2>;
 					sbs,poll-retry-count = <10>;
 				/*	power-supplies = <&charger>; */
arch/arm64/boot/dts/nvidia/tegra210-smaug.dts +0 -1
index d32053934f3c..9f630ecc06bc 100644
@@ -1330,7 +1330,6 @@ ec_i2c_0: i2c-tunnel {
 				battery: bq27742@55 {
 					compatible = "ti,bq27742";
 					reg = <0x55>;
-					battery-name = "battery";
 				};
 			};
 		};
Signature · 1 line
2.24.1
#63 lore raw

PATCH 52/73 arm64: tegra: Remove simple clocks bus

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The standard way to do this is to list out the clocks at the top-level. Adopt the standard way to fix validation.

---
 arch/arm64/boot/dts/nvidia/tegra132-norrin.dts    | 15 ++++-----------
 arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi    | 15 ++++-----------
 arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi    | 15 ++++-----------
 arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi    | 15 ++++-----------
 .../arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 15 ++++-----------
 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts     | 15 ++++-----------
 6 files changed, 24 insertions(+), 66 deletions(-)
arch/arm64/boot/dts/nvidia/tegra132-norrin.dts +4 -11
index bb45ca6a5cf2..278bef2d8810 100644
@@ -1022,17 +1022,10 @@ backlight: backlight {
 		backlight-boot-off;
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {
-			compatible = "fixed-clock";
-			reg=<0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};
 
 	gpio-keys {
arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi +4 -11
index 251c6099482a..8a4ba371ff92 100644
@@ -300,17 +300,10 @@ mmc@700b0600 {
 		vqmmc-supply = <&vdd_1v8>;
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};
 
 	cpus {
arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi +4 -11
index f9158dc943f9..58aa0518965e 100644
@@ -40,17 +40,10 @@ mmc@700b0600 {
 		non-removable;
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};
 
 	cpus {
arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi +4 -11
index 579d5b8a757d..9f81cabdcbb6 100644
@@ -1586,17 +1586,10 @@ mmc@700b0600 {
 		status = "okay";
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};
 
 	gpio-keys {
arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts +4 -11
index 4a354f5293fc..b888efcea86f 100644
@@ -566,17 +566,10 @@ mmc@700b0400 {
 		wakeup-source;
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};
 
 	cpus {
arch/arm64/boot/dts/nvidia/tegra210-smaug.dts +4 -11
index 9f630ecc06bc..a28ca6620b86 100644
@@ -1722,17 +1722,10 @@ agic@702f9000 {
 		};
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clock@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: clock@0 {
+		compatible = "fixed-clock";
+		clock-frequency = <32768>;
+		#clock-cells = <0>;
 	};
 
 	cpus {
Signature · 1 line
2.24.1
maintainer
#64 lore raw

Re: [PATCH 52/73] arm64: tegra: Remove simple clocks bus

Quoted 6 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The standard way to do this is to list out the clocks at the top-level. Adopt the standard way to fix validation.

Quoted 8 lines
---
 arch/arm64/boot/dts/nvidia/tegra132-norrin.dts    | 15 ++++-----------
 arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi    | 15 ++++-----------
 arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi    | 15 ++++-----------
 arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi    | 15 ++++-----------
 .../arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 15 ++++-----------
 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts     | 15 ++++-----------
 6 files changed, 24 insertions(+), 66 deletions(-)

After applying this patch I see the following build breakage ...

DTC arch/arm64/boot/dts/nvidia/tegra132-norrin.dtb
arch/arm64/boot/dts/nvidia/tegra132.dtsi:649.15-682.4: ERROR (phandle_references): /usb@70090000: Reference to non-existent node or label "vdd_3v3_lp0"

also defined at
arch/arm64/boot/dts/nvidia/tegra132-norrin.dts:895.15-909.4 arch/arm64/boot/dts/nvidia/tegra132.dtsi:649.15-682.4: ERROR (phandle_references): /usb@70090000: Reference to non-existent node or label "vdd_3v3_lp0"

also defined at
arch/arm64/boot/dts/nvidia/tegra132-norrin.dts:895.15-909.4 arch/arm64/boot/dts/nvidia/tegra132.dtsi:684.26-812.4: ERROR (phandle_references): /padctl@7009f000: Reference to non-existent node or label "vdd_3v3_lp0"

Jon

Signature · 1 line
nvpublic
maintainer
#65 lore raw

Re: [PATCH 52/73] arm64: tegra: Remove simple clocks bus

Quoted 30 lines · Jon Hunter
Quoted 6 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The standard way to do this is to list out the clocks at the top-level. Adopt the standard way to fix validation.

Quoted 8 lines
---
 arch/arm64/boot/dts/nvidia/tegra132-norrin.dts    | 15 ++++-----------
 arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi    | 15 ++++-----------
 arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi    | 15 ++++-----------
 arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi    | 15 ++++-----------
 .../arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 15 ++++-----------
 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts     | 15 ++++-----------
 6 files changed, 24 insertions(+), 66 deletions(-)

After applying this patch I see the following build breakage ...

DTC arch/arm64/boot/dts/nvidia/tegra132-norrin.dtb
arch/arm64/boot/dts/nvidia/tegra132.dtsi:649.15-682.4: ERROR (phandle_references): /usb@70090000: Reference to non-existent node or label "vdd_3v3_lp0"

also defined at
arch/arm64/boot/dts/nvidia/tegra132-norrin.dts:895.15-909.4 arch/arm64/boot/dts/nvidia/tegra132.dtsi:649.15-682.4: ERROR (phandle_references): /usb@70090000: Reference to non-existent node or label "vdd_3v3_lp0"

Quoted 5 lines

also defined at
arch/arm64/boot/dts/nvidia/tegra132-norrin.dts:895.15-909.4 arch/arm64/boot/dts/nvidia/tegra132.dtsi:684.26-812.4: ERROR (phandle_references): /padctl@7009f000: Reference to non-existent node or label "vdd_3v3_lp0"

Same here is might not be this patch, but somewhere during this series I see a few build breakages.

Jon

Signature · 1 line
nvpublic
#66 lore raw

PATCH 53/73 arm64: tegra: Remove simple regulators bus

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The standard way to do this is to list out the regulators at the top- level. Adopt the standard way to fix validation.

---
 .../arm64/boot/dts/nvidia/tegra132-norrin.dts | 247 ++++++------
 .../boot/dts/nvidia/tegra186-p2771-0000.dts   |  81 ++--
 .../arm64/boot/dts/nvidia/tegra186-p3310.dtsi |  60 ++-
 .../arm64/boot/dts/nvidia/tegra194-p2888.dtsi |  96 ++---
 .../arm64/boot/dts/nvidia/tegra210-p2180.dtsi |  23 +-
 .../arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 274 +++++++------
 .../arm64/boot/dts/nvidia/tegra210-p2894.dtsi | 361 ++++++++----------
 .../boot/dts/nvidia/tegra210-p3450-0000.dts   | 177 ++++-----
 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 137 +++----
 9 files changed, 671 insertions(+), 785 deletions(-)
arch/arm64/boot/dts/nvidia/tegra132-norrin.dts +122 -125
index 278bef2d8810..607d28a6772e 100644
@@ -1055,142 +1055,139 @@ panel: panel {
 		ddc-i2c-bus = <&dpaux>;
 	};
 
-	regulators {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
+	vdd_mux: regulator@0 {
+		compatible = "regulator-fixed";
+		regulator-name = "+VDD_MUX";
+		regulator-min-microvolt = <19000000>;
+		regulator-max-microvolt = <19000000>;
+		regulator-always-on;
+		regulator-boot-on;
+	};
 
-		vdd_mux: regulator@0 {
-			compatible = "regulator-fixed";
-			reg = <0>;
-			regulator-name = "+VDD_MUX";
-			regulator-min-microvolt = <19000000>;
-			regulator-max-microvolt = <19000000>;
-			regulator-always-on;
-			regulator-boot-on;
-		};
+	vdd_5v0_sys: regulator@1 {
+		compatible = "regulator-fixed";
+		regulator-name = "+5V_SYS";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		regulator-always-on;
+		regulator-boot-on;
+		vin-supply = <&vdd_mux>;
+	};
 
-		vdd_5v0_sys: regulator@1 {
-			compatible = "regulator-fixed";
-			reg = <1>;
-			regulator-name = "+5V_SYS";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			regulator-always-on;
-			regulator-boot-on;
-			vin-supply = <&vdd_mux>;
-		};
+	vdd_3v3_sys: regulator@2 {
+		compatible = "regulator-fixed";
+		regulator-name = "+3.3V_SYS";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+		regulator-boot-on;
+		vin-supply = <&vdd_mux>;
+	};
 
-		vdd_3v3_sys: regulator@2 {
-			compatible = "regulator-fixed";
-			reg = <2>;
-			regulator-name = "+3.3V_SYS";
-			regulator-min-microvolt = <3300000>;
-			regulator-max-microvolt = <3300000>;
-			regulator-always-on;
-			regulator-boot-on;
-			vin-supply = <&vdd_mux>;
-		};
+	vdd_3v3_run: regulator@3 {
+		compatible = "regulator-fixed";
+		regulator-name = "+3.3V_RUN";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+		regulator-boot-on;
+		gpio = <&as3722 1 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+		vin-supply = <&vdd_3v3_sys>;
+	};
 
-		vdd_3v3_run: regulator@3 {
-			compatible = "regulator-fixed";
-			reg = <3>;
-			regulator-name = "+3.3V_RUN";
-			regulator-min-microvolt = <3300000>;
-			regulator-max-microvolt = <3300000>;
-			regulator-always-on;
-			regulator-boot-on;
-			gpio = <&as3722 1 GPIO_ACTIVE_HIGH>;
-			enable-active-high;
-			vin-supply = <&vdd_3v3_sys>;
-		};
+	vdd_3v3_hdmi: regulator@4 {
+		compatible = "regulator-fixed";
+		regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vdd_3v3_run>;
+	};
 
-		vdd_3v3_hdmi: regulator@4 {
-			compatible = "regulator-fixed";
-			reg = <4>;
-			regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";
-			regulator-min-microvolt = <3300000>;
-			regulator-max-microvolt = <3300000>;
-			vin-supply = <&vdd_3v3_run>;
-		};
+	vdd_led: regulator@5 {
+		compatible = "regulator-fixed";
+		regulator-name = "+VDD_LED";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		gpio = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+		vin-supply = <&vdd_mux>;
+	};
 
-		vdd_led: regulator@5 {
-			compatible = "regulator-fixed";
-			reg = <5>;
-			regulator-name = "+VDD_LED";
-			regulator-min-microvolt = <3300000>;
-			regulator-max-microvolt = <3300000>;
-			gpio = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
-			enable-active-high;
-			vin-supply = <&vdd_mux>;
-		};
+	vdd_usb1_vbus: regulator@6 {
+		compatible = "regulator-fixed";
+		regulator-name = "+5V_USB_HS";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+		gpio-open-drain;
+		vin-supply = <&vdd_5v0_sys>;
+	};
 
-		vdd_usb1_vbus: regulator@6 {
-			compatible = "regulator-fixed";
-			reg = <6>;
-			regulator-name = "+5V_USB_HS";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
-			enable-active-high;
-			gpio-open-drain;
-			vin-supply = <&vdd_5v0_sys>;
-		};
+	vdd_usb3_vbus: regulator@7 {
+		compatible = "regulator-fixed";
+		regulator-name = "+5V_USB_SS";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+		gpio-open-drain;
+		vin-supply = <&vdd_5v0_sys>;
+	};
 
-		vdd_usb3_vbus: regulator@7 {
-			compatible = "regulator-fixed";
-			reg = <7>;
-			regulator-name = "+5V_USB_SS";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
-			enable-active-high;
-			gpio-open-drain;
-			vin-supply = <&vdd_5v0_sys>;
-		};
+	vdd_3v3_panel: regulator@8 {
+		compatible = "regulator-fixed";
+		regulator-name = "+3.3V_PANEL";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		gpio = <&as3722 4 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+		vin-supply = <&vdd_3v3_sys>;
+	};
 
-		vdd_3v3_panel: regulator@8 {
-			compatible = "regulator-fixed";
-			reg = <8>;
-			regulator-name = "+3.3V_PANEL";
-			regulator-min-microvolt = <3300000>;
-			regulator-max-microvolt = <3300000>;
-			gpio = <&as3722 4 GPIO_ACTIVE_HIGH>;
-			enable-active-high;
-			vin-supply = <&vdd_3v3_sys>;
-		};
+	vdd_hdmi_pll: regulator@9 {
+		compatible = "regulator-fixed";
+		regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL_AP_GATE";
+		regulator-min-microvolt = <1050000>;
+		regulator-max-microvolt = <1050000>;
+		gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
+		vin-supply = <&vdd_1v05_run>;
+	};
 
-		vdd_hdmi_pll: regulator@9 {
-			compatible = "regulator-fixed";
-			reg = <9>;
-			regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL_AP_GATE";
-			regulator-min-microvolt = <1050000>;
-			regulator-max-microvolt = <1050000>;
-			gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
-			vin-supply = <&vdd_1v05_run>;
-		};
+	vdd_5v0_hdmi: regulator@10 {
+		compatible = "regulator-fixed";
+		regulator-name = "+5V_HDMI_CON";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+		vin-supply = <&vdd_5v0_sys>;
+	};
 
-		vdd_5v0_hdmi: regulator@10 {
-			compatible = "regulator-fixed";
-			reg = <10>;
-			regulator-name = "+5V_HDMI_CON";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
-			enable-active-high;
-			vin-supply = <&vdd_5v0_sys>;
-		};
+	vdd_5v0_ts: regulator@11 {
+		compatible = "regulator-fixed";
+		regulator-name = "+5V_VDD_TS";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		regulator-always-on;
+		regulator-boot-on;
+		gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+	};
 
-		vdd_5v0_ts: regulator@11 {
-			compatible = "regulator-fixed";
-			reg = <11>;
-			regulator-name = "+5V_VDD_TS";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			regulator-always-on;
-			regulator-boot-on;
-			gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
-			enable-active-high;
-		};
+	vdd_3v3_lp0: regulator@12 {
+		compatible = "regulator-fixed";
+		regulator-name = "+3.3V_LP0";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		/*
+		 * TODO: find a way to wire this up with the USB EHCI
+		 * controllers so that it can be enabled on demand.
+		 */
+		regulator-always-on;
+		gpio = <&as3722 2 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+		vin-supply = <&vdd_3v3_sys>;
 	};
 };
arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts +35 -46

97 lines not on this page · raw message

arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi +24 -36

69 lines not on this page · raw message

arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi +40 -56

105 lines not on this page · raw message

arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi +10 -13
index 8a4ba371ff92..d818fac3070c 100644
@@ -335,18 +335,15 @@ psci {
 		method = "smc";
 	};
 
-	regulators {
-		vdd_gpu: regulator@100 {
-			compatible = "pwm-regulator";
-			reg = <100>;
-			pwms = <&pwm 1 4880>;
-			regulator-name = "VDD_GPU";
-			regulator-min-microvolt = <710000>;
-			regulator-max-microvolt = <1320000>;
-			enable-gpios = <&pmic 6 GPIO_ACTIVE_HIGH>;
-			regulator-ramp-delay = <80>;
-			regulator-enable-ramp-delay = <2000>;
-			regulator-settling-time-us = <160>;
-		};
+	vdd_gpu: regulator@100 {
+		compatible = "pwm-regulator";
+		pwms = <&pwm 1 4880>;
+		regulator-name = "VDD_GPU";
+		regulator-min-microvolt = <710000>;
+		regulator-max-microvolt = <1320000>;
+		enable-gpios = <&pmic 6 GPIO_ACTIVE_HIGH>;
+		regulator-ramp-delay = <80>;
+		regulator-enable-ramp-delay = <2000>;
+		regulator-settling-time-us = <160>;
 	};
 };
arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi +128 -146

284 lines not on this page · raw message

arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi +168 -193

391 lines not on this page · raw message

arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts +83 -94

203 lines not on this page · raw message

arch/arm64/boot/dts/nvidia/tegra210-smaug.dts +61 -76

149 lines not on this page · raw message

Signature · 1 line
2.24.1
maintainer
#67 lore raw

Re: [PATCH 53/73] arm64: tegra: Remove simple regulators bus

Quoted 6 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The standard way to do this is to list out the regulators at the top- level. Adopt the standard way to fix validation.

Quoted 11 lines
---
 .../arm64/boot/dts/nvidia/tegra132-norrin.dts | 247 ++++++------
 .../boot/dts/nvidia/tegra186-p2771-0000.dts   |  81 ++--
 .../arm64/boot/dts/nvidia/tegra186-p3310.dtsi |  60 ++-
 .../arm64/boot/dts/nvidia/tegra194-p2888.dtsi |  96 ++---
 .../arm64/boot/dts/nvidia/tegra210-p2180.dtsi |  23 +-
 .../arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 274 +++++++------
 .../arm64/boot/dts/nvidia/tegra210-p2894.dtsi | 361 ++++++++----------
 .../boot/dts/nvidia/tegra210-p3450-0000.dts   | 177 ++++-----
 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 137 +++----
 9 files changed, 671 insertions(+), 785 deletions(-)

After this patch is applied I see the following build breakage ...

DTC arch/arm64/boot/dts/nvidia/tegra210-p2894-0050-a08.dtb
arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi:1646.23-1656.4: ERROR (phandle_references): /regulator@1: Reference to non-existent node or label "pmic"

arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi:1658.30-1670.4: ERROR (phandle_references): /regulator@2: Reference to non-existent node or label "pmic"

arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi:1705.29-1715.4: ERROR (phandle_references): /regulator@6: Reference to non-existent node or label "pmic"

Jon

Signature · 1 line
nvpublic
maintainer
#68 lore raw

Re: [PATCH 53/73] arm64: tegra: Remove simple regulators bus

Quoted 28 lines · Jon Hunter
Quoted 6 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The standard way to do this is to list out the regulators at the top- level. Adopt the standard way to fix validation.

Quoted 11 lines
---
 .../arm64/boot/dts/nvidia/tegra132-norrin.dts | 247 ++++++------
 .../boot/dts/nvidia/tegra186-p2771-0000.dts   |  81 ++--
 .../arm64/boot/dts/nvidia/tegra186-p3310.dtsi |  60 ++-
 .../arm64/boot/dts/nvidia/tegra194-p2888.dtsi |  96 ++---
 .../arm64/boot/dts/nvidia/tegra210-p2180.dtsi |  23 +-
 .../arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 274 +++++++------
 .../arm64/boot/dts/nvidia/tegra210-p2894.dtsi | 361 ++++++++----------
 .../boot/dts/nvidia/tegra210-p3450-0000.dts   | 177 ++++-----
 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 137 +++----
 9 files changed, 671 insertions(+), 785 deletions(-)

After this patch is applied I see the following build breakage ...

DTC arch/arm64/boot/dts/nvidia/tegra210-p2894-0050-a08.dtb
arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi:1646.23-1656.4: ERROR (phandle_references): /regulator@1: Reference to non-existent node or label "pmic"

Quoted 7 lines

arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi:1658.30-1670.4: ERROR (phandle_references): /regulator@2: Reference to non-existent node or label "pmic"

arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi:1705.29-1715.4: ERROR (phandle_references): /regulator@6: Reference to non-existent node or label "pmic"

Actually it might not be this patch. However, I noticed that builds were getting skipped when bisecting other issues. So we may need to ensure all of these build OK.

Jon

Signature · 1 line
nvpublic
#69 lore raw

PATCH 54/73 arm64: tegra: norrin: Add missing panel power supply

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

This panel supply is always on, so this does happen to work by accident. Make sure to properly hook up the power supply to model the dependency correctly and so that the panel continues to operate properly even if the supply is not always on.

---
 arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/nvidia/tegra132-norrin.dts +1 -0
index 607d28a6772e..fb27812eace1 100644
@@ -1051,6 +1051,7 @@ power {
 
 	panel: panel {
 		compatible = "innolux,n116bge";
+		power-supply = <&vdd_3v3_panel>;
 		backlight = <&backlight>;
 		ddc-i2c-bus = <&dpaux>;
 	};
Signature · 1 line
2.24.1
#70 lore raw

PATCH 55/73 arm64: tegra: Use proper tuple notation

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

Tuple boundaries should be marked by < and > to make it clear which cells are part of the same tuple. This also helps the json-schema based validation tooling to properly parse this data.

While at it, also remove the "immovable" bit from PCI addresses. All of these addresses are in fact "movable".

---
 arch/arm64/boot/dts/nvidia/tegra132.dtsi      |  16 +--
 arch/arm64/boot/dts/nvidia/tegra186.dtsi      |  18 +--
 arch/arm64/boot/dts/nvidia/tegra194.dtsi      | 112 +++++++++---------
 .../arm64/boot/dts/nvidia/tegra210-p2894.dtsi |   3 +-
 arch/arm64/boot/dts/nvidia/tegra210.dtsi      |  16 +--
 5 files changed, 83 insertions(+), 82 deletions(-)
arch/arm64/boot/dts/nvidia/tegra132.dtsi +8 -8
index 0cc6b4e9f954..fa5ee55fd4a5 100644
@@ -17,9 +17,9 @@ / {
 	pcie@1003000 {
 		compatible = "nvidia,tegra124-pcie";
 		device_type = "pci";
-		reg = <0x0 0x01003000 0x0 0x00000800   /* PADS registers */
-		       0x0 0x01003800 0x0 0x00000800   /* AFI registers */
-		       0x0 0x02000000 0x0 0x10000000>; /* configuration space */
+		reg = <0x0 0x01003000 0x0 0x00000800>, /* PADS registers */
+		      <0x0 0x01003800 0x0 0x00000800>, /* AFI registers */
+		      <0x0 0x02000000 0x0 0x10000000>; /* configuration space */
 		reg-names = "pads", "afi", "cs";
 		interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>, /* controller interrupt */
 			     <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; /* MSI interrupt */
@@ -33,11 +33,11 @@ pcie@1003000 {
 		#address-cells = <3>;
 		#size-cells = <2>;
 
-		ranges = <0x82000000 0 0x01000000 0x0 0x01000000 0 0x00001000   /* port 0 configuration space */
-			  0x82000000 0 0x01001000 0x0 0x01001000 0 0x00001000   /* port 1 configuration space */
-			  0x81000000 0 0x0        0x0 0x12000000 0 0x00010000   /* downstream I/O (64 KiB) */
-			  0x82000000 0 0x13000000 0x0 0x13000000 0 0x0d000000   /* non-prefetchable memory (208 MiB) */
-			  0xc2000000 0 0x20000000 0x0 0x20000000 0 0x20000000>; /* prefetchable memory (512 MiB) */
+		ranges = <0x02000000 0 0x01000000 0x0 0x01000000 0 0x00001000>, /* port 0 configuration space */
+			 <0x02000000 0 0x01001000 0x0 0x01001000 0 0x00001000>, /* port 1 configuration space */
+			 <0x01000000 0 0x0        0x0 0x12000000 0 0x00010000>, /* downstream I/O (64 KiB) */
+			 <0x02000000 0 0x13000000 0x0 0x13000000 0 0x0d000000>, /* non-prefetchable memory (208 MiB) */
+			 <0x42000000 0 0x20000000 0x0 0x20000000 0 0x20000000>; /* prefetchable memory (512 MiB) */
 
 		clocks = <&tegra_car TEGRA124_CLK_PCIE>,
 			 <&tegra_car TEGRA124_CLK_AFI>,
arch/arm64/boot/dts/nvidia/tegra186.dtsi +9 -9
index 927c646620cb..184cc0365002 100644
@@ -776,9 +776,9 @@ pcie@10003000 {
 		compatible = "nvidia,tegra186-pcie";
 		power-domains = <&bpmp TEGRA186_POWER_DOMAIN_PCX>;
 		device_type = "pci";
-		reg = <0x0 0x10003000 0x0 0x00000800   /* PADS registers */
-		       0x0 0x10003800 0x0 0x00000800   /* AFI registers */
-		       0x0 0x40000000 0x0 0x10000000>; /* configuration space */
+		reg = <0x0 0x10003000 0x0 0x00000800>, /* PADS registers */
+		      <0x0 0x10003800 0x0 0x00000800>, /* AFI registers */
+		      <0x0 0x40000000 0x0 0x10000000>; /* configuration space */
 		reg-names = "pads", "afi", "cs";
 
 		interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>, /* controller interrupt */
@@ -793,12 +793,12 @@ pcie@10003000 {
 		#address-cells = <3>;
 		#size-cells = <2>;
 
-		ranges = <0x82000000 0 0x10000000 0x0 0x10000000 0 0x00001000   /* port 0 configuration space */
-			  0x82000000 0 0x10001000 0x0 0x10001000 0 0x00001000   /* port 1 configuration space */
-			  0x82000000 0 0x10004000 0x0 0x10004000 0 0x00001000   /* port 2 configuration space */
-			  0x81000000 0 0x0        0x0 0x50000000 0 0x00010000   /* downstream I/O (64 KiB) */
-			  0x82000000 0 0x50100000 0x0 0x50100000 0 0x07F00000   /* non-prefetchable memory (127 MiB) */
-			  0xc2000000 0 0x58000000 0x0 0x58000000 0 0x28000000>; /* prefetchable memory (640 MiB) */
+		ranges = <0x02000000 0 0x10000000 0x0 0x10000000 0 0x00001000>, /* port 0 configuration space */
+			 <0x02000000 0 0x10001000 0x0 0x10001000 0 0x00001000>,/* port 1 configuration space */
+			 <0x02000000 0 0x10004000 0x0 0x10004000 0 0x00001000>, /* port 2 configuration space */
+			 <0x01000000 0 0x0        0x0 0x50000000 0 0x00010000>, /* downstream I/O (64 KiB) */
+			 <0x02000000 0 0x50100000 0x0 0x50100000 0 0x07f00000>, /* non-prefetchable memory (127 MiB) */
+			 <0x42000000 0 0x58000000 0x0 0x58000000 0 0x28000000>; /* prefetchable memory (640 MiB) */
 
 		clocks = <&bpmp TEGRA186_CLK_AFI>,
 			 <&bpmp TEGRA186_CLK_PCIE>,
arch/arm64/boot/dts/nvidia/tegra194.dtsi +56 -56

208 lines not on this page · raw message

arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi +2 -1
index a348789bc5e1..1acb9bb6c7df 100644
@@ -1387,7 +1387,8 @@ pin_gpio3 {
 			spmic-default-output-high {
 				gpio-hog;
 				output-high;
-				gpios = <2 GPIO_ACTIVE_HIGH 7 GPIO_ACTIVE_HIGH>;
+				gpios = <2 GPIO_ACTIVE_HIGH>,
+					<7 GPIO_ACTIVE_HIGH>;
 			};
 
 			fps {
arch/arm64/boot/dts/nvidia/tegra210.dtsi +8 -8
index 1f7dc518b394..6a78056b94f4 100644
@@ -18,9 +18,9 @@ / {
 	pcie@1003000 {
 		compatible = "nvidia,tegra210-pcie";
 		device_type = "pci";
-		reg = <0x0 0x01003000 0x0 0x00000800   /* PADS registers */
-		       0x0 0x01003800 0x0 0x00000800   /* AFI registers */
-		       0x0 0x02000000 0x0 0x10000000>; /* configuration space */
+		reg = <0x0 0x01003000 0x0 0x00000800>, /* PADS registers */
+		      <0x0 0x01003800 0x0 0x00000800>, /* AFI registers */
+		      <0x0 0x02000000 0x0 0x10000000>; /* configuration space */
 		reg-names = "pads", "afi", "cs";
 		interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>, /* controller interrupt */
 			     <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; /* MSI interrupt */
@@ -34,11 +34,11 @@ pcie@1003000 {
 		#address-cells = <3>;
 		#size-cells = <2>;
 
-		ranges = <0x82000000 0 0x01000000 0x0 0x01000000 0 0x00001000   /* port 0 configuration space */
-			  0x82000000 0 0x01001000 0x0 0x01001000 0 0x00001000   /* port 1 configuration space */
-			  0x81000000 0 0x0        0x0 0x12000000 0 0x00010000   /* downstream I/O (64 KiB) */
-			  0x82000000 0 0x13000000 0x0 0x13000000 0 0x0d000000   /* non-prefetchable memory (208 MiB) */
-			  0xc2000000 0 0x20000000 0x0 0x20000000 0 0x20000000>; /* prefetchable memory (512 MiB) */
+		ranges = <0x02000000 0 0x01000000 0x0 0x01000000 0 0x00001000>, /* port 0 configuration space */
+			 <0x02000000 0 0x01001000 0x0 0x01001000 0 0x00001000>, /* port 1 configuration space */
+			 <0x01000000 0 0x0        0x0 0x12000000 0 0x00010000>, /* downstream I/O (64 KiB) */
+			 <0x02000000 0 0x13000000 0x0 0x13000000 0 0x0d000000>, /* non-prefetchable memory (208 MiB) */
+			 <0x42000000 0 0x20000000 0x0 0x20000000 0 0x20000000>; /* prefetchable memory (512 MiB) */
 
 		clocks = <&tegra_car TEGRA210_CLK_PCIE>,
 			 <&tegra_car TEGRA210_CLK_AFI>,
Signature · 1 line
2.24.1
#71 lore raw

PATCH 56/73 arm64: tegra: Do not mark host1x as simple bus

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The host1x is not a simple bus, so drop the corresponding compatible string.

---
 arch/arm64/boot/dts/nvidia/tegra132.dtsi | 3 +--
 arch/arm64/boot/dts/nvidia/tegra186.dtsi | 2 +-
 arch/arm64/boot/dts/nvidia/tegra194.dtsi | 2 +-
 arch/arm64/boot/dts/nvidia/tegra210.dtsi | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/nvidia/tegra132.dtsi +1 -2
index fa5ee55fd4a5..c4d3a88403eb 100644
@@ -81,8 +81,7 @@ pci@2,0 {
 
 	host1x@50000000 {
 		compatible = "nvidia,tegra132-host1x",
-			     "nvidia,tegra124-host1x",
-			     "simple-bus";
+			     "nvidia,tegra124-host1x";
 		reg = <0x0 0x50000000 0x0 0x00034000>;
 		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */
 			     <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; /* general */
arch/arm64/boot/dts/nvidia/tegra186.dtsi +1 -1
index 184cc0365002..b4150d8cccf5 100644
@@ -934,7 +934,7 @@ smmu: iommu@12000000 {
 	};
 
 	host1x@13e00000 {
-		compatible = "nvidia,tegra186-host1x", "simple-bus";
+		compatible = "nvidia,tegra186-host1x";
 		reg = <0x0 0x13e00000 0x0 0x10000>,
 		      <0x0 0x13e10000 0x0 0x10000>;
 		reg-names = "hypervisor", "vm";
arch/arm64/boot/dts/nvidia/tegra194.dtsi +1 -1
index 72ba5146b0a9..bf696ada856c 100644
@@ -1036,7 +1036,7 @@ pmc: pmc@c360000 {
 		};
 
 		host1x@13e00000 {
-			compatible = "nvidia,tegra194-host1x", "simple-bus";
+			compatible = "nvidia,tegra194-host1x";
 			reg = <0x13e00000 0x10000>,
 			      <0x13e10000 0x10000>;
 			reg-names = "hypervisor", "vm";
arch/arm64/boot/dts/nvidia/tegra210.dtsi +1 -1
index 6a78056b94f4..02a02ed1b264 100644
@@ -86,7 +86,7 @@ pci@2,0 {
 	};
 
 	host1x@50000000 {
-		compatible = "nvidia,tegra210-host1x", "simple-bus";
+		compatible = "nvidia,tegra210-host1x";
 		reg = <0x0 0x50000000 0x0 0x00034000>;
 		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */
 			     <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; /* general */
Signature · 1 line
2.24.1
#72 lore raw

PATCH 57/73 arm64: tegra: Use sor0_out clock on Tegra132

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The sor0_out clock is required to make eDP work properly.

---
 arch/arm64/boot/dts/nvidia/tegra132.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/nvidia/tegra132.dtsi +2 -1
index c4d3a88403eb..6d9bd9cae388 100644
@@ -141,10 +141,11 @@ sor@54540000 {
 			reg = <0x0 0x54540000 0x0 0x00040000>;
 			interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&tegra_car TEGRA124_CLK_SOR0>,
+				 <&tegra_car TEGRA124_CLK_SOR0_OUT>,
 				 <&tegra_car TEGRA124_CLK_PLL_D_OUT0>,
 				 <&tegra_car TEGRA124_CLK_PLL_DP>,
 				 <&tegra_car TEGRA124_CLK_CLK_M>;
-			clock-names = "sor", "parent", "dp", "safe";
+			clock-names = "sor", "out", "parent", "dp", "safe";
 			resets = <&tegra_car 182>;
 			reset-names = "sor";
 			status = "disabled";
Signature · 1 line
2.24.1
#73 lore raw

PATCH 58/73 arm64: tegra: Tegra132 EMC is not compatible with Tegra124

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The external memory controller found on Tegra132 is not fully compatible with the instantiation on Tegra124, so remove the corresponding string from the list of compatible strings.

---
 arch/arm64/boot/dts/nvidia/tegra132.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/nvidia/tegra132.dtsi +1 -1
index 6d9bd9cae388..0425e584791b 100644
@@ -605,7 +605,7 @@ mc: memory-controller@70019000 {
 	};
 
 	emc: external-memory-controller@7001b000 {
-		compatible = "nvidia,tegra132-emc", "nvidia,tegra124-emc";
+		compatible = "nvidia,tegra132-emc";
 		reg = <0x0 0x7001b000 0x0 0x1000>;
 		clocks = <&tegra_car TEGRA124_CLK_EMC>;
 		clock-names = "emc";
Signature · 1 line
2.24.1
#74 lore raw

PATCH 59/73 arm64: tegra: Add missing #phy-cells property to USB PHYs

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

USB PHYs must have a #phy-cells property, so add one to the Tegra USB PHYs which don't have one.

---
 arch/arm64/boot/dts/nvidia/tegra132.dtsi | 3 +++
 1 file changed, 3 insertions(+)
arch/arm64/boot/dts/nvidia/tegra132.dtsi +3 -0
index 0425e584791b..9d1dd021a2cb 100644
@@ -1113,6 +1113,7 @@ phy1: usb-phy@7d000000 {
 		clock-names = "reg", "pll_u", "utmi-pads";
 		resets = <&tegra_car 22>, <&tegra_car 22>;
 		reset-names = "usb", "utmi-pads";
+		#phy-cells = <0>;
 		nvidia,hssync-start-delay = <0>;
 		nvidia,idle-wait-delay = <17>;
 		nvidia,elastic-limit = <16>;
@@ -1151,6 +1152,7 @@ phy2: usb-phy@7d004000 {
 		clock-names = "reg", "pll_u", "utmi-pads";
 		resets = <&tegra_car 58>, <&tegra_car 22>;
 		reset-names = "usb", "utmi-pads";
+		#phy-cells = <0>;
 		nvidia,hssync-start-delay = <0>;
 		nvidia,idle-wait-delay = <17>;
 		nvidia,elastic-limit = <16>;
@@ -1188,6 +1190,7 @@ phy3: usb-phy@7d008000 {
 		clock-names = "reg", "pll_u", "utmi-pads";
 		resets = <&tegra_car 59>, <&tegra_car 22>;
 		reset-names = "usb", "utmi-pads";
+		#phy-cells = <0>;
 		nvidia,hssync-start-delay = <0>;
 		nvidia,idle-wait-delay = <17>;
 		nvidia,elastic-limit = <16>;
Signature · 1 line
2.24.1
#75 lore raw

PATCH 60/73 arm64: tegra: Remove unneeded power supplies

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

On Tegra186 and later, the BPMP is responsible for enabling/disabling the PCIe related power supplies of the pad controller and there is no need for the operating system to control them, so they can be removed.

---
 arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 4 ----
 1 file changed, 4 deletions(-)
arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts +0 -4
index 43b8d643e7a1..482ed7b0fcff 100644
@@ -119,10 +119,6 @@ padctl@3520000 {
 
 		avdd-pll-erefeut-supply = <&vdd_1v8_pll>;
 		avdd-usb-supply = <&vdd_3v3_sys>;
-		dvdd-pex-supply = <&vdd_pex>;
-		dvdd-pex-pll-supply = <&vdd_pex>;
-		hvdd-pex-supply = <&vdd_1v8>;
-		hvdd-pex-pll-supply = <&vdd_1v8>;
 		vclamp-usb-supply = <&vdd_1v8>;
 		vddio-hsic-supply = <&gnd>;
 
Signature · 1 line
2.24.1
#76 lore raw

PATCH 61/73 arm64: tegra: Update USB connector nodes

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

Use the preferred {id,vbus}-gpios over the {id,vbus}-gpio properties and fix the ordering of compatible strings (most-specific ones should come first).

---
 .../arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 15 +++++++--------
 arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi    | 12 ++++++------
 .../arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 10 +++++-----
 3 files changed, 18 insertions(+), 19 deletions(-)
arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts +7 -8
index 482ed7b0fcff..4a7a022acabb 100644
@@ -171,19 +171,18 @@ usb2-0 {
 				status = "okay";
 				mode = "otg";
 				vbus-supply = <&vdd_usb0>;
-
 				usb-role-switch;
+
 				connector {
-					compatible = "usb-b-connector",
-						     "gpio-usb-b-connector";
+					compatible = "gpio-usb-b-connector",
+						     "usb-b-connector";
 					label = "micro-USB";
 					type = "micro";
-					vbus-gpio = <&gpio
-						     TEGRA186_MAIN_GPIO(X, 7)
-						     GPIO_ACTIVE_LOW>;
-					id-gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
+					vbus-gpios = <&gpio
+						      TEGRA186_MAIN_GPIO(X, 7)
+						      GPIO_ACTIVE_LOW>;
+					id-gpios = <&pmic 0 GPIO_ACTIVE_HIGH>;
 				};
-
 			};
 
 			usb2-1 {
arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi +6 -6
index 4771c1668825..3ba36a52dc89 100644
@@ -1456,17 +1456,17 @@ ports {
 			usb2-0 {
 				status = "okay";
 				vbus-supply = <&vdd_usb_vbus_otg>;
+				usb-role-switch;
 				mode = "otg";
 
-				usb-role-switch;
 				connector {
-					compatible = "usb-b-connector",
-						     "gpio-usb-b-connector";
+					compatible = "gpio-usb-b-connector",
+						     "usb-b-connector";
 					label = "micro-USB";
 					type = "micro";
-					vbus-gpio = <&gpio TEGRA_GPIO(Z, 0)
-						     GPIO_ACTIVE_LOW>;
-					id-gpio = <&pmic 0 0>;
+					vbus-gpios = <&gpio TEGRA_GPIO(Z, 0)
+						      GPIO_ACTIVE_LOW>;
+					id-gpios = <&pmic 0 GPIO_ACTIVE_HIGH>;
 				};
 			};
 
arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts +5 -5
index d7a4eced0149..ac17f5485bf8 100644
@@ -505,15 +505,15 @@ ports {
 			usb2-0 {
 				status = "okay";
 				mode = "peripheral";
-
 				usb-role-switch;
+
 				connector {
-					compatible = "usb-b-connector",
-						     "gpio-usb-b-connector";
+					compatible = "gpio-usb-b-connector",
+						     "usb-b-connector";
 					label = "micro-USB";
 					type = "micro";
-					vbus-gpio = <&gpio TEGRA_GPIO(CC, 4)
-						     GPIO_ACTIVE_LOW>;
+					vbus-gpios = <&gpio TEGRA_GPIO(CC, 4)
+						      GPIO_ACTIVE_LOW>;
 				};
 			};
 
Signature · 1 line
2.24.1
#77 lore raw

PATCH 62/73 arm64: tegra: Use standard EEPROM properties

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The address-bits and page-size properties that are currently used are not valid properties according to the bindings. Use the address-width and pagesize properties instead.

---
 arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 4 ++--
 arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi     | 4 ++--
 arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi     | 4 ++--
 arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 4 ++--
 arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)
arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts +2 -2
index 4a7a022acabb..a70fd4e86840 100644
@@ -222,8 +222,8 @@ eeprom@57 {
 			reg = <0x57>;
 
 			vcc-supply = <&vdd_1v8>;
-			address-bits = <8>;
-			page-size = <8>;
+			address-width = <8>;
+			pagesize = <8>;
 			size = <256>;
 			read-only;
 		};
arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi +2 -2
index b5568b9ff181..654c55ed048b 100644
@@ -174,8 +174,8 @@ eeprom@50 {
 			reg = <0x50>;
 
 			vcc-supply = <&vdd_1v8>;
-			address-bits = <8>;
-			page-size = <8>;
+			address-width = <8>;
+			pagesize = <8>;
 			size = <256>;
 			read-only;
 		};
arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi +2 -2
index d818fac3070c..6a4b50aaa25d 100644
@@ -274,8 +274,8 @@ eeprom@50 {
 			reg = <0x50>;
 
 			vcc-supply = <&vdd_1v8>;
-			address-bits = <8>;
-			page-size = <8>;
+			address-width = <8>;
+			pagesize = <8>;
 			size = <256>;
 			read-only;
 		};
arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts +2 -2
index eb46f745d75f..0c0d51c23975 100644
@@ -84,8 +84,8 @@ eeprom@57 {
 			reg = <0x57>;
 
 			vcc-supply = <&vdd_1v8>;
-			address-bits = <8>;
-			page-size = <8>;
+			address-width = <8>;
+			pagesize = <8>;
 			size = <256>;
 			read-only;
 		};
arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts +4 -4
index ac17f5485bf8..beec6aab2157 100644
@@ -116,8 +116,8 @@ eeprom@50 {
 			reg = <0x50>;
 
 			vcc-supply = <&vdd_1v8>;
-			address-bits = <8>;
-			page-size = <8>;
+			address-width = <8>;
+			pagesize = <8>;
 			size = <256>;
 			read-only;
 		};
@@ -127,8 +127,8 @@ eeprom@57 {
 			reg = <0x57>;
 
 			vcc-supply = <&vdd_1v8>;
-			address-bits = <8>;
-			page-size = <8>;
+			address-width = <8>;
+			pagesize = <8>;
 			size = <256>;
 			read-only;
 		};
Signature · 1 line
2.24.1
#78 lore raw

PATCH 63/73 arm64: tegra: Remove XUSB pad controller interrupt from XUSB node

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The XUSB controller doesn't need the XUSB pad controller's interrupt, so remove it.

---
 arch/arm64/boot/dts/nvidia/tegra186.dtsi | 3 +--
 arch/arm64/boot/dts/nvidia/tegra194.dtsi | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/nvidia/tegra186.dtsi +1 -2
index b4150d8cccf5..1cd369ac48d2 100644
@@ -568,8 +568,7 @@ usb@3530000 {
 		      <0x0 0x03538000 0x0 0x1000>;
 		reg-names = "hcd", "fpci";
 		interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>,
-			     <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>,
-			     <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
+			     <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&bpmp TEGRA186_CLK_XUSB_HOST>,
 			 <&bpmp TEGRA186_CLK_XUSB_FALCON>,
 			 <&bpmp TEGRA186_CLK_XUSB_SS>,
arch/arm64/boot/dts/nvidia/tegra194.dtsi +1 -2
index bf696ada856c..4d6f2127dd4a 100644
@@ -688,8 +688,7 @@ usb@3610000 {
 			reg-names = "hcd", "fpci";
 
 			interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
+				     <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
 
 			clocks = <&bpmp TEGRA194_CLK_XUSB_CORE_HOST>,
 				 <&bpmp TEGRA194_CLK_XUSB_FALCON>,
Signature · 1 line
2.24.1
#79 lore raw

PATCH 64/73 arm64: tegra: Fix {clock,reset}-names ordering

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

It's very difficult to describe string lists that can be in arbitrary order using the json-schema based validation tooling. Since the OS is not going to care either way, take the easy way out and reorder these entries to match the order defined in the bindings.

---
 arch/arm64/boot/dts/nvidia/tegra186.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/nvidia/tegra186.dtsi +6 -6
index 1cd369ac48d2..a73050ec61a7 100644
@@ -799,15 +799,15 @@ pcie@10003000 {
 			 <0x02000000 0 0x50100000 0x0 0x50100000 0 0x07f00000>, /* non-prefetchable memory (127 MiB) */
 			 <0x42000000 0 0x58000000 0x0 0x58000000 0 0x28000000>; /* prefetchable memory (640 MiB) */
 
-		clocks = <&bpmp TEGRA186_CLK_AFI>,
-			 <&bpmp TEGRA186_CLK_PCIE>,
+		clocks = <&bpmp TEGRA186_CLK_PCIE>,
+			 <&bpmp TEGRA186_CLK_AFI>,
 			 <&bpmp TEGRA186_CLK_PLLE>;
-		clock-names = "afi", "pex", "pll_e";
+		clock-names = "pex", "afi", "pll_e";
 
-		resets = <&bpmp TEGRA186_RESET_AFI>,
-			 <&bpmp TEGRA186_RESET_PCIE>,
+		resets = <&bpmp TEGRA186_RESET_PCIE>,
+			 <&bpmp TEGRA186_RESET_AFI>,
 			 <&bpmp TEGRA186_RESET_PCIEXCLK>;
-		reset-names = "afi", "pex", "pcie_x";
+		reset-names = "pex", "afi", "pcie_x";
 
 		interconnects = <&mc TEGRA186_MEMORY_CLIENT_AFIR &emc>,
 				<&mc TEGRA186_MEMORY_CLIENT_AFIW &emc>;
Signature · 1 line
2.24.1
#80 lore raw

PATCH 65/73 arm64: tegra: Do not mark display hub as simple bus

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The display hub on Tegra186 and Tegra194 is not a simple bus, so drop the corresponding compatible string.

---
 arch/arm64/boot/dts/nvidia/tegra186.dtsi | 2 +-
 arch/arm64/boot/dts/nvidia/tegra194.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/nvidia/tegra186.dtsi +1 -1
index a73050ec61a7..3a41203deba2 100644
@@ -990,7 +990,7 @@ i2c-bus {
 		};
 
 		display-hub@15200000 {
-			compatible = "nvidia,tegra186-display", "simple-bus";
+			compatible = "nvidia,tegra186-display";
 			reg = <0x15200000 0x00040000>;
 			resets = <&bpmp TEGRA186_RESET_NVDISPLAY0_MISC>,
 				 <&bpmp TEGRA186_RESET_NVDISPLAY0_WGRP0>,
arch/arm64/boot/dts/nvidia/tegra194.dtsi +1 -1
index 4d6f2127dd4a..3089ebecfbef 100644
@@ -1055,7 +1055,7 @@ host1x@13e00000 {
 			interconnect-names = "dma-mem";
 
 			display-hub@15200000 {
-				compatible = "nvidia,tegra194-display", "simple-bus";
+				compatible = "nvidia,tegra194-display";
 				reg = <0x15200000 0x00040000>;
 				resets = <&bpmp TEGRA194_RESET_NVDISPLAY0_MISC>,
 					 <&bpmp TEGRA194_RESET_NVDISPLAY0_WGRP0>,
Signature · 1 line
2.24.1
#81 lore raw

PATCH 66/73 arm64: tegra: Use standard names for SRAM nodes

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

SRAM nodes should be named sram@<unit-address> to match the bindings.

While at it, also remove the unneeded, custom compatible string for SRAM partition nodes.

---
 arch/arm64/boot/dts/nvidia/tegra186.dtsi | 8 +++-----
 arch/arm64/boot/dts/nvidia/tegra194.dtsi | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)
arch/arm64/boot/dts/nvidia/tegra186.dtsi +3 -5
index 3a41203deba2..d92eea1ddac7 100644
@@ -1262,22 +1262,20 @@ gpu@17000000 {
 		interconnect-names = "dma-mem", "write-0", "read-1", "write-1";
 	};
 
-	sysram@30000000 {
+	sram@30000000 {
 		compatible = "nvidia,tegra186-sysram", "mmio-sram";
 		reg = <0x0 0x30000000 0x0 0x50000>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 		ranges = <0x0 0x0 0x30000000 0x50000>;
 
-		cpu_bpmp_tx: shmem@4e000 {
-			compatible = "nvidia,tegra186-bpmp-shmem";
+		cpu_bpmp_tx: sram@4e000 {
 			reg = <0x4e000 0x1000>;
 			label = "cpu-bpmp-tx";
 			pool;
 		};
 
-		cpu_bpmp_rx: shmem@4f000 {
-			compatible = "nvidia,tegra186-bpmp-shmem";
+		cpu_bpmp_rx: sram@4f000 {
 			reg = <0x4f000 0x1000>;
 			label = "cpu-bpmp-rx";
 			pool;
arch/arm64/boot/dts/nvidia/tegra194.dtsi +3 -5
index 3089ebecfbef..2ecb80e1b09d 100644
@@ -1803,22 +1803,20 @@ pcie_ep@141a0000 {
 		nvidia,aspm-l0s-entrance-latency-us = <3>;
 	};
 
-	sysram@40000000 {
+	sram@40000000 {
 		compatible = "nvidia,tegra194-sysram", "mmio-sram";
 		reg = <0x0 0x40000000 0x0 0x50000>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 		ranges = <0x0 0x0 0x40000000 0x50000>;
 
-		cpu_bpmp_tx: shmem@4e000 {
-			compatible = "nvidia,tegra194-bpmp-shmem";
+		cpu_bpmp_tx: sram@4e000 {
 			reg = <0x4e000 0x1000>;
 			label = "cpu-bpmp-tx";
 			pool;
 		};
 
-		cpu_bpmp_rx: shmem@4f000 {
-			compatible = "nvidia,tegra194-bpmp-shmem";
+		cpu_bpmp_rx: sram@4f000 {
 			reg = <0x4f000 0x1000>;
 			label = "cpu-bpmp-rx";
 			pool;
Signature · 1 line
2.24.1
#82 lore raw

PATCH 67/73 arm64: tegra: Remove unused interrupts from Tegra194 AON GPIO

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The AON GPIO controller on Tegra194 currently only uses a single interrupt, so remove the extra ones.

---
 arch/arm64/boot/dts/nvidia/tegra194.dtsi | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
arch/arm64/boot/dts/nvidia/tegra194.dtsi +1 -4
index 2ecb80e1b09d..e0aa6c74073a 100644
@@ -999,10 +999,7 @@ gpio_aon: gpio@c2f0000 {
 			reg-names = "security", "gpio";
 			reg = <0xc2f0000 0x1000>,
 			      <0xc2f1000 0x1000>;
-			interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
+			interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
 			gpio-controller;
 			#gpio-cells = <2>;
 			interrupt-controller;
Signature · 1 line
2.24.1
#83 lore raw

PATCH 68/73 arm64: tegra: Fix indentation in Tegra194 device tree

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

Properly indent subsequent lines so that they align with the first line.

---
 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 e0aa6c74073a..307f999edbf9 100644
@@ -1669,7 +1669,7 @@ pcie@141a0000 {
 		pinctrl-0 = <&pex_rst_c5_out_state>, <&clkreq_c5_bi_dir_state>;
 
 		clocks = <&bpmp TEGRA194_CLK_PEX1_CORE_5>,
-			<&bpmp TEGRA194_CLK_PEX1_CORE_5M>;
+			 <&bpmp TEGRA194_CLK_PEX1_CORE_5M>;
 		clock-names = "core", "core_m";
 
 		resets = <&bpmp TEGRA194_RESET_PEX1_CORE_5_APB>,
Signature · 1 line
2.24.1
#84 lore raw

PATCH 69/73 arm64: tegra: Rename agic -> interrupt-controller

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

Device tree nodes for interrupt controllers should be named "interrupt- controller", so rename the AGIC accordingly.

---
 arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 2 +-
 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts      | 2 +-
 arch/arm64/boot/dts/nvidia/tegra210.dtsi           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts +1 -1
index 0c0d51c23975..0ccb62606bef 100644
@@ -119,7 +119,7 @@ dma@702e2000 {
 			status = "okay";
 		};
 
-		agic@702f9000 {
+		interrupt-controller@702f9000 {
 			status = "okay";
 		};
 	};
arch/arm64/boot/dts/nvidia/tegra210-smaug.dts +1 -1
index cc0d7b4a5834..f7840e5e069a 100644
@@ -1717,7 +1717,7 @@ dma@702e2000 {
 			status = "okay";
 		};
 
-		agic@702f9000 {
+		interrupt-controller@702f9000 {
 			status = "okay";
 		};
 	};
arch/arm64/boot/dts/nvidia/tegra210.dtsi +1 -1
index 02a02ed1b264..c265211f8a84 100644
@@ -1355,7 +1355,7 @@ adma: dma@702e2000 {
 			status = "disabled";
 		};
 
-		agic: agic@702f9000 {
+		agic: interrupt-controller@702f9000 {
 			compatible = "nvidia,tegra210-agic";
 			#interrupt-cells = <3>;
 			interrupt-controller;
Signature · 1 line
2.24.1
#85 lore raw

PATCH 70/73 arm64: tegra: Various fixes for PMICs

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

Standardize on "pmic" as the node name for the PMIC on Tegra210 systems and use consistent names for pinmux and GPIO hog nodes.

---
 .../arm64/boot/dts/nvidia/tegra210-p2894.dtsi | 31 +++++++++----------
 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 14 ++++-----
 2 files changed, 22 insertions(+), 23 deletions(-)
arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi +15 -16
index 1acb9bb6c7df..41beab626d95 100644
@@ -1328,7 +1328,7 @@ i2c@7000d000 {
 		status = "okay";
 		clock-frequency = <400000>;
 
-		max77620: max77620@3c {
+		pmic: pmic@3c {
 			compatible = "maxim,max77620";
 			reg = <0x3c>;
 			interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
@@ -1343,12 +1343,12 @@ max77620: max77620@3c {
 			pinctrl-0 = <&max77620_default>;
 
 			max77620_default: pinmux@0 {
-				pin_gpio0 {
+				gpio0 {
 					pins = "gpio0";
 					function = "gpio";
 				};
 
-				pin_gpio1 {
+				gpio1 {
 					pins = "gpio1";
 					function = "fps-out";
 					drive-push-pull = <1>;
@@ -1357,34 +1357,33 @@ pin_gpio1 {
 					maxim,active-fps-power-down-slot = <0>;
 				};
 
-				pin_gpio2_3 {
-					pins = "gpio2", "gpio3";
+				gpio2 {
+					pins = "gpio2";
 					function = "fps-out";
 					drive-open-drain = <1>;
 					maxim,active-fps-source = <MAX77620_FPS_SRC_0>;
 				};
 
-				pin_gpio4 {
+				gpio3 {
+					pins = "gpio3";
+					function = "fps-out";
+					drive-open-drain = <1>;
+					maxim,active-fps-source = <MAX77620_FPS_SRC_0>;
+				};
+
+				gpio4 {
 					pins = "gpio4";
 					function = "32k-out1";
 				};
 
-				pin_gpio5_6_7 {
+				gpio5_6_7 {
 					pins = "gpio5", "gpio6", "gpio7";
 					function = "gpio";
 					drive-push-pull = <1>;
 				};
-
-				pin_gpio2 {
-					maxim,active-fps-source = <MAX77620_FPS_SRC_0>;
-				};
-
-				pin_gpio3 {
-					maxim,active-fps-source = <MAX77620_FPS_SRC_0>;
-				};
 			};
 
-			spmic-default-output-high {
+			gpio@0 {
 				gpio-hog;
 				output-high;
 				gpios = <2 GPIO_ACTIVE_HIGH>,
arch/arm64/boot/dts/nvidia/tegra210-smaug.dts +7 -7
index f7840e5e069a..a946c5c31102 100644
@@ -1354,11 +1354,11 @@ max77621_cpu: max77621@1b {
 			maxim,enable-active-discharge;
 			maxim,enable-bias-control;
 			maxim,enable-etr;
-			maxim,enable-gpio = <&max77620 5 0>;
+			maxim,enable-gpio = <&pmic 5 0>;
 			maxim,externally-enable;
 		};
 
-		max77620: max77620@3c {
+		pmic: pmic@3c {
 			compatible = "maxim,max77620";
 			reg = <0x3c>;
 			interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
@@ -1372,8 +1372,8 @@ max77620: max77620@3c {
 			pinctrl-names = "default";
 			pinctrl-0 = <&max77620_default>;
 
-			max77620_default: pinmux@0 {
-				pin_gpio {
+			max77620_default: pinmux {
+				gpio0_1_2_7 {
 					pins = "gpio0", "gpio1", "gpio2", "gpio7";
 					function = "gpio";
 				};
@@ -1383,7 +1383,7 @@ pin_gpio {
 				 * sequence, So it must be sequenced up (automatically
 				 * set by OTP) and down properly.
 				 */
-				pin_gpio3 {
+				gpio3 {
 					pins = "gpio3";
 					function = "fps-out";
 					drive-open-drain = <1>;
@@ -1392,13 +1392,13 @@ pin_gpio3 {
 					maxim,active-fps-power-down-slot = <2>;
 				};
 
-				pin_gpio5_6 {
+				gpio5_6 {
 					pins = "gpio5", "gpio6";
 					function = "gpio";
 					drive-push-pull = <1>;
 				};
 
-				pin_32k {
+				gpio4 {
 					pins = "gpio4";
 					function = "32k-out1";
 				};
Signature · 1 line
2.24.1
#86 lore raw

PATCH 71/73 arm64: tegra: Sort nodes by unit-address on Jetson Nano

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

Move the usb@700d0000 node to the correct place in the device tree, ordered by unit-address.

---
 .../boot/dts/nvidia/tegra210-p3450-0000.dts      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts +8 -8
index beec6aab2157..4eb51e5eef3a 100644
@@ -545,14 +545,6 @@ mmc@700b0000 {
 		vmmc-supply = <&vdd_3v3_sd>;
 	};
 
-	usb@700d0000 {
-		status = "okay";
-		phys = <&micro_b>;
-		phy-names = "usb2-0";
-		avddio-usb-supply = <&vdd_3v3_sys>;
-		hvdd-usb-supply = <&vdd_1v8>;
-	};
-
 	mmc@700b0400 {
 		status = "okay";
 		bus-width = <4>;
@@ -566,6 +558,14 @@ mmc@700b0400 {
 		wakeup-source;
 	};
 
+	usb@700d0000 {
+		status = "okay";
+		phys = <&micro_b>;
+		phy-names = "usb2-0";
+		avddio-usb-supply = <&vdd_3v3_sys>;
+		hvdd-usb-supply = <&vdd_1v8>;
+	};
+
 	clk32k_in: clock@0 {
 		compatible = "fixed-clock";
 		clock-frequency = <32768>;
Signature · 1 line
2.24.1
#87 lore raw

PATCH 72/73 arm64: tegra: Rename cbb@0 to bus@0 on Tegra194

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

The control backbone is a simple-bus and hence its device tree node should be named "bus@<unit-address>" according to the bindings.

---
 .../arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 22 +++++++++----------
 .../boot/dts/nvidia/tegra194-p2972-0000.dts   | 10 ++++-----
 arch/arm64/boot/dts/nvidia/tegra194.dtsi      |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)
arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi +11 -11
index 6f2c0754c870..cefbd0000357 100644
@@ -8,18 +8,18 @@ / {
 	compatible = "nvidia,p2888", "nvidia,tegra194";
 
 	aliases {
-		ethernet0 = "/cbb@0/ethernet@2490000";
-		mmc0 = "/cbb@0/mmc@3460000";
-		mmc1 = "/cbb@0/mmc@3400000";
+		ethernet0 = "/bus@0/ethernet@2490000";
+		mmc0 = "/bus@0/mmc@3460000";
+		mmc1 = "/bus@0/mmc@3400000";
 		serial0 = &tcu;
 		i2c0 = "/bpmp/i2c";
-		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";
+		i2c1 = "/bus@0/i2c@3160000";
+		i2c2 = "/bus@0/i2c@c240000";
+		i2c3 = "/bus@0/i2c@3180000";
+		i2c4 = "/bus@0/i2c@3190000";
+		i2c5 = "/bus@0/i2c@31c0000";
+		i2c6 = "/bus@0/i2c@c250000";
+		i2c7 = "/bus@0/i2c@31e0000";
 	};
 
 	chosen {
@@ -27,7 +27,7 @@ chosen {
 		stdout-path = "serial0:115200n8";
 	};
 
-	cbb@0 {
+	bus@0 {
 		ethernet@2490000 {
 			status = "okay";
 
arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts +5 -5
index 0f9868b6fd6b..90b6ea5467fa 100644
@@ -10,7 +10,7 @@ / {
 	model = "NVIDIA Jetson AGX Xavier Developer Kit";
 	compatible = "nvidia,p2972-0000", "nvidia,tegra194";
 
-	cbb@0 {
+	bus@0 {
 		aconnect@2900000 {
 			status = "okay";
 
@@ -93,10 +93,10 @@ usb3-3 {
 		usb@3610000 {
 			status = "okay";
 
-			phys =	<&{/cbb@0/padctl@3520000/pads/usb2/lanes/usb2-1}>,
-				<&{/cbb@0/padctl@3520000/pads/usb2/lanes/usb2-3}>,
-				<&{/cbb@0/padctl@3520000/pads/usb3/lanes/usb3-0}>,
-				<&{/cbb@0/padctl@3520000/pads/usb3/lanes/usb3-3}>;
+			phys =	<&{/bus@0/padctl@3520000/pads/usb2/lanes/usb2-1}>,
+				<&{/bus@0/padctl@3520000/pads/usb2/lanes/usb2-3}>,
+				<&{/bus@0/padctl@3520000/pads/usb3/lanes/usb3-0}>,
+				<&{/bus@0/padctl@3520000/pads/usb3/lanes/usb3-3}>;
 			phy-names = "usb2-1", "usb2-3", "usb3-0", "usb3-3";
 		};
 
arch/arm64/boot/dts/nvidia/tegra194.dtsi +1 -1
index 307f999edbf9..ea629dae6880 100644
@@ -16,7 +16,7 @@ / {
 	#size-cells = <2>;
 
 	/* control backbone */
-	cbb@0 {
+	bus@0 {
 		compatible = "simple-bus";
 		#address-cells = <1>;
 		#size-cells = <1>;
Signature · 1 line
2.24.1
#88 lore raw

PATCH 73/73 arm64: tegra: Fix order of XUSB controller clocks

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

This is purely to make the json-schema validation tools happy because they cannot deal with string arrays that may be in arbitrary order.

---
 arch/arm64/boot/dts/nvidia/tegra210.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/nvidia/tegra210.dtsi +2 -2
index c265211f8a84..b9c6ba707ef9 100644
@@ -997,8 +997,8 @@ usb@70090000 {
 			 <&tegra_car TEGRA210_CLK_XUSB_HOST_SRC>,
 			 <&tegra_car TEGRA210_CLK_XUSB_FALCON_SRC>,
 			 <&tegra_car TEGRA210_CLK_XUSB_SS>,
-			 <&tegra_car TEGRA210_CLK_XUSB_SS_DIV2>,
 			 <&tegra_car TEGRA210_CLK_XUSB_SS_SRC>,
+			 <&tegra_car TEGRA210_CLK_XUSB_SS_DIV2>,
 			 <&tegra_car TEGRA210_CLK_XUSB_HS_SRC>,
 			 <&tegra_car TEGRA210_CLK_XUSB_FS_SRC>,
 			 <&tegra_car TEGRA210_CLK_PLL_U_480M>,
@@ -1006,7 +1006,7 @@ usb@70090000 {
 			 <&tegra_car TEGRA210_CLK_PLL_E>;
 		clock-names = "xusb_host", "xusb_host_src",
 			      "xusb_falcon_src", "xusb_ss",
-			      "xusb_ss_div2", "xusb_ss_src",
+			      "xusb_ss_src", "xusb_ss_div2",
 			      "xusb_hs_src", "xusb_fs_src",
 			      "pll_u_480m", "clk_m", "pll_e";
 		resets = <&tegra_car 89>, <&tegra_car 156>,
Signature · 1 line
2.24.1