Skip to contentSkip to conversation

arm64: tegra: Wire up pinctrl states for all DPAUX controllers

PATCH In review Thierry Reding 2 participants 5 messages Aug 6, 2020 – Aug 8, 2020

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

PATCH 1/4 arm64: tegra: Wire up pinctrl states for all DPAUX controllers

From: Thierry Reding <[email protected]>

All four DPAUX controllers on Tegra194 control the pin configuration of their companion I2C controllers. Wire up all the pinctrl states for the I2C controllers so that their pins can be correctly muxed when needed.

---
 arch/arm64/boot/dts/nvidia/tegra194.dtsi | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/nvidia/tegra194.dtsi +16 -2
index 1ddf9cb6dbce..94c65ca8345a 100644
@@ -346,6 +346,9 @@ dp_aux_ch1_i2c: i2c@3190000 {
 			clock-names = "div-clk";
 			resets = <&bpmp TEGRA194_RESET_I2C4>;
 			reset-names = "i2c";
+			pinctrl-0 = <&state_dpaux1_i2c>;
+			pinctrl-1 = <&state_dpaux1_off>;
+			pinctrl-names = "i2c", "off";
 			status = "disabled";
 		};
 
@@ -360,10 +363,14 @@ dp_aux_ch0_i2c: i2c@31b0000 {
 			clock-names = "div-clk";
 			resets = <&bpmp TEGRA194_RESET_I2C6>;
 			reset-names = "i2c";
+			pinctrl-0 = <&state_dpaux0_i2c>;
+			pinctrl-1 = <&state_dpaux0_off>;
+			pinctrl-names = "i2c", "off";
 			status = "disabled";
 		};
 
-		gen7_i2c: i2c@31c0000 {
+		/* shares pads with dpaux2 */
+		dp_aux_ch2_i2c: i2c@31c0000 {
 			compatible = "nvidia,tegra194-i2c";
 			reg = <0x031c0000 0x10000>;
 			interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
@@ -373,10 +380,14 @@ gen7_i2c: i2c@31c0000 {
 			clock-names = "div-clk";
 			resets = <&bpmp TEGRA194_RESET_I2C7>;
 			reset-names = "i2c";
+			pinctrl-0 = <&state_dpaux2_i2c>;
+			pinctrl-1 = <&state_dpaux2_off>;
+			pinctrl-names = "i2c", "off";
 			status = "disabled";
 		};
 
-		gen9_i2c: i2c@31e0000 {
+		/* shares pads with dpaux3 */
+		dp_aux_ch3_i2c: i2c@31e0000 {
 			compatible = "nvidia,tegra194-i2c";
 			reg = <0x031e0000 0x10000>;
 			interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
@@ -386,6 +397,9 @@ gen9_i2c: i2c@31e0000 {
 			clock-names = "div-clk";
 			resets = <&bpmp TEGRA194_RESET_I2C9>;
 			reset-names = "i2c";
+			pinctrl-0 = <&state_dpaux3_i2c>;
+			pinctrl-1 = <&state_dpaux3_off>;
+			pinctrl-names = "i2c", "off";
 			status = "disabled";
 		};
 
Signature · 1 line
2.27.0
#1 lore raw

PATCH 2/4 arm64: tegra: Add VBUS supply for micro USB port on Jetson Nano

From: Thierry Reding <[email protected]>

The VBUS supply for the micro USB port on Jetson Nano is derived from the main system supply and always on. Describe in nevertheless to fix warnings during boot.

---
 arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 12 ++++++++++++
 1 file changed, 12 insertions(+)
arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts +12 -0
index 195a43e2356b..d34338b63c90 100644
@@ -541,6 +541,8 @@ usb2-0 {
 				mode = "peripheral";
 				usb-role-switch;
 
+				vbus-supply = <&vdd_5v0_usb>;
+
 				connector {
 					compatible = "gpio-usb-b-connector",
 						     "usb-b-connector";
@@ -843,4 +845,14 @@ avdd_io_edp_1v05: regulator@7 {
 
 		vin-supply = <&avdd_1v05_pll>;
 	};
+
+	vdd_5v0_usb: regulator@8 {
+		compatible = "regulator-fixed";
+
+		regulator-name = "VDD_5V_USB";
+		regulator-min-microvolt = <50000000>;
+		regulator-max-microvolt = <50000000>;
+
+		vin-supply = <&vdd_5v0_sys>;
+	};
 };
Signature · 1 line
2.27.0
#2 lore raw

Re: [PATCH 2/4] arm64: tegra: Add VBUS supply for micro USB port on Jetson Nano

Quoted 3 lines · Thierry Reding

The VBUS supply for the micro USB port on Jetson Nano is derived from the main system supply and always on. Describe in nevertheless to fix warnings during boot.

[...]

arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts usb2-0 { · line 544

Quoted 7 lines
arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts +1 -0
@@ -541,6 +541,8 @@ usb2-0 {
 				mode = "peripheral";
 				usb-role-switch;
 
+				vbus-supply = <&vdd_5v0_usb>;

[...]

If it's not controllable then this is equivalent to setting vdd_5v0_sys here, isn't it?

Best Regards,
Michał Mirosław

#3 lore raw

PATCH 3/4 arm64: tegra: Disable SD card write-protection on Jetson Nano

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

There is no GPIO hooked up to the write-protection pin of the SD slot. Make sure to describe this properly in device tree to avoid errors or warnings being emitted by the operating system.

---
 arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts +1 -0
index d34338b63c90..c55716c336c1 100644
@@ -576,6 +576,7 @@ mmc@700b0000 {
 		bus-width = <4>;
 
 		cd-gpios = <&gpio TEGRA_GPIO(Z, 1) GPIO_ACTIVE_LOW>;
+		disable-wp;
 
 		vqmmc-supply = <&vddio_sdmmc>;
 		vmmc-supply = <&vdd_3v3_sd>;
Signature · 1 line
2.27.0
#4 lore raw

PATCH 4/4 arm64: tegra: Describe display controller outputs for Tegra210

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

Both display controllers can drive both DSI and both SOR outputs on Tegra210. Describe this in device tree so that the operating system doesn't have to guess.

---
 arch/arm64/boot/dts/nvidia/tegra210.dtsi | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/nvidia/tegra210.dtsi +6 -4
index 829f786af133..27d4e3f134ca 100644
@@ -194,6 +194,7 @@ dc@54200000 {
 
 			iommus = <&mc TEGRA_SWGROUP_DC>;
 
+			nvidia,outputs = <&dsia &dsib &sor0 &sor1>;
 			nvidia,head = <0>;
 		};
 
@@ -208,10 +209,11 @@ dc@54240000 {
 
 			iommus = <&mc TEGRA_SWGROUP_DCB>;
 
+			nvidia,outputs = <&dsia &dsib &sor0 &sor1>;
 			nvidia,head = <1>;
 		};
 
-		dsi@54300000 {
+		dsia: dsi@54300000 {
 			compatible = "nvidia,tegra210-dsi";
 			reg = <0x0 0x54300000 0x0 0x00040000>;
 			clocks = <&tegra_car TEGRA210_CLK_DSIA>,
@@ -248,7 +250,7 @@ nvjpg@54380000 {
 			status = "disabled";
 		};
 
-		dsi@54400000 {
+		dsib: dsi@54400000 {
 			compatible = "nvidia,tegra210-dsi";
 			reg = <0x0 0x54400000 0x0 0x00040000>;
 			clocks = <&tegra_car TEGRA210_CLK_DSIB>,
@@ -284,7 +286,7 @@ tsec@54500000 {
 			status = "disabled";
 		};
 
-		sor@54540000 {
+		sor0: sor@54540000 {
 			compatible = "nvidia,tegra210-sor";
 			reg = <0x0 0x54540000 0x0 0x00040000>;
 			interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
@@ -304,7 +306,7 @@ sor@54540000 {
 			status = "disabled";
 		};
 
-		sor@54580000 {
+		sor1: sor@54580000 {
 			compatible = "nvidia,tegra210-sor1";
 			reg = <0x0 0x54580000 0x0 0x00040000>;
 			interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.27.0