Skip to contentSkip to conversation

ARM: dts: tegra: colibri_t30: major revamp

PATCH Applied Marcel Ziswiler 2 participants 36 messages Sep 1, 2018 – Sep 26, 2018

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

v2 cover ARM: dts: tegra: colibri_t30: major revamp

This series is a major overhaul for the Toradex Colibri T30 system on module.

Changes in v2:
- Also move serial UART "nvidia,tegra30-hsuart" compatible to module level device trees.
- Also replace underscores in node names with dashes.
- Also replace underscores in UART annotations with dashes.
- When running some more tests I realized that the reg-addr should really be 0x3f. Fix this.
- Get rid of fake clocks simple bus as suggested by Rob.
- Drop "[PATCH 01/26] ARM: tegra: colibri_t30: enable broken-hpi on emmc" which should already be handled by the broken-hpi quirk as pointed out by Dmitry. If I would find more eMMC parts which exhibit the issue I will add them to the quirk as a separate patch.
- New patch as suggested by Rob.
- New patch.

Marcel Ziswiler (34):
ARM: tegra: colibri_t30: add local-mac-address property
ARM: tegra: colibri_t30: reorder host1x/hdmi properties
ARM: tegra: colibri_t30: regulator clean-up
ARM: tegra: colibri_t30: add missing regulators
ARM: tegra: colibri_t30: annotate uarts and move compatible to board
ARM: tegra: colibri_t30: white-space clean-up
ARM: tegra: colibri_t30: move dr_mode property from phy to controller
ARM: tegra: colibri_t30: reorder backlight properties
ARM: tegra: colibri_t30: drop pwmleds
ARM: tegra: colibri_t30: pinmux clean-up
ARM: tegra: colibri_t30: add missing pinmux
ARM: tegra: colibri_t30: use proper irq-gpio for stmpe811
ARM: tegra: colibri_t30: further lm95245 temperature sensor annotation
ARM: tegra: colibri_t30: add i2c-thermtrip
ARM: tegra: colibri_t30: add proper emmc vmmc and vqmmc supplies
ARM: tegra: colibri_t30: enable emmc ddr52 mode
ARM: tegra: colibri_t30: get rid of fake clocks simple bus
ARM: tegra: colibri_t30: line break long compatible property line
ARM: tegra: colibri_t30: move input include to carrier board
ARM: tegra: colibri_t30: remove unused nvidia,is-wired property
ARM: tegra: colibri_t30: add gpio hog to unreset usb ethernet chip
ARM: tegra: colibri_t30: enable hda over hdmi
ARM: tegra: colibri_t30: annotate sd card detect
ARM: tegra: colibri_t30: annotate ehci instance 1
ARM: tegra: colibri_t30: update compatibility comment
ARM: tegra: colibri_t30: drop module level model and compatible
ARM: tegra: colibri_t30: drop obsolete spidev node
ARM: tegra: colibri_t30: rename hdmiddc to hdmi_ddc
ARM: tegra: colibri_t30: rename tps65911@2d, stmpe811@41 and

    tps62362@60

ARM: tegra: colibri_t30: fix mcp2515 can controller interrupt polarity
ARM: tegra: colibri_t30: remove unused mcp2515 can0 label
ARM: tegra: colibri_t30: add mcp2515 vdd and xceiver supplies
ARM: tegra: colibri_t30: annotate unused i2c busses
ARM: tegra: colibri_t30: annotate power I2C being on-module

 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 130 ++---
 arch/arm/boot/dts/tegra30-colibri.dtsi        | 780 +++++++++++++++++++++-----
 2 files changed, 706 insertions(+), 204 deletions(-)
Signature · 1 line
2.14.4
#1 lore raw

PATCH v2 1/34 ARM: tegra: colibri_t30: add local-mac-address property

From: Marcel Ziswiler <[email protected]>

Add empty local-mac-address property to be filled in by boot loader (e.g. U-Boot).

---

Changes in v2: None

 arch/arm/boot/dts/tegra30-colibri.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)
arch/arm/boot/dts/tegra30-colibri.dtsi +7 -0
index 526ed71cf7a3..a392b65a0b64 100644
@@ -437,6 +437,13 @@
 	/* EHCI instance 1: USB2_DP/N -> AX88772B */
 	usb@7d004000 {
 		status = "okay";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		asix@1 {
+			reg = <1>;
+			local-mac-address = [00 00 00 00 00 00];
+		};
 	};
 
 	usb-phy@7d004000 {
Signature · 1 line
2.14.4
#2 lore raw

PATCH v2 2/34 ARM: tegra: colibri_t30: reorder host1x/hdmi properties

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Reorder Host1x/HDMI properties.

---

Changes in v2: None

 arch/arm/boot/dts/tegra30-colibri.dtsi | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
arch/arm/boot/dts/tegra30-colibri.dtsi +3 -4
index a392b65a0b64..48c41a36b4dc 100644
@@ -16,12 +16,11 @@
 
 	host1x@50000000 {
 		hdmi@54280000 {
-			vdd-supply = <&avdd_hdmi_3v3_reg>;
-			pll-supply = <&avdd_hdmi_pll_1v8_reg>;
-
+			nvidia,ddc-i2c-bus = <&hdmiddc>;
 			nvidia,hpd-gpio =
 				<&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>;
-			nvidia,ddc-i2c-bus = <&hdmiddc>;
+			pll-supply = <&avdd_hdmi_pll_1v8_reg>;
+			vdd-supply = <&avdd_hdmi_3v3_reg>;
 		};
 	};
 
Signature · 1 line
2.14.4
#3 lore raw

PATCH v2 3/34 ARM: tegra: colibri_t30: regulator clean-up

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Just cosmetic regulator clean-up.

---

Changes in v2: None

 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts |  52 +++++------
 arch/arm/boot/dts/tegra30-colibri.dtsi        | 126 +++++++++++---------------
 2 files changed, 78 insertions(+), 100 deletions(-)
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +23 -29
index 16e1f387aa6d..5eb665d89435 100644
@@ -105,7 +105,7 @@
 	usb-phy@7d000000 {
 		status = "okay";
 		dr_mode = "otg";
-		vbus-supply = <&usbc_vbus_reg>;
+		vbus-supply = <&reg_usbc_vbus>;
 	};
 
 	/* EHCI instance 2: USB3_DP/N -> USBH_P/N */
@@ -115,7 +115,7 @@
 
 	usb-phy@7d008000 {
 		status = "okay";
-		vbus-supply = <&usbh_vbus_reg>;
+		vbus-supply = <&reg_usbh_vbus>;
 	};
 
 	backlight: backlight {
@@ -181,34 +181,28 @@
 		};
 	};
 
-	regulators {
-		sys_5v0_reg: regulator@1 {
-			compatible = "regulator-fixed";
-			reg = <1>;
-			regulator-name = "5v0";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			regulator-always-on;
-		};
+	reg_5v0: regulator-5v0 {
+		compatible = "regulator-fixed";
+		regulator-name = "5V_SW";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+	};
 
-		usbc_vbus_reg: regulator@2 {
-			compatible = "regulator-fixed";
-			reg = <2>;
-			regulator-name = "usbc_vbus";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			vin-supply = <&sys_5v0_reg>;
-		};
+	reg_usbc_vbus: regulator-usbc-vbus {
+		compatible = "regulator-fixed";
+		regulator-name = "VCC_USB5";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&reg_5v0>;
+	};
 
-		/* USBH_PEN */
-		usbh_vbus_reg: regulator@3 {
-			compatible = "regulator-fixed";
-			reg = <3>;
-			regulator-name = "usbh_vbus";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
-			vin-supply = <&sys_5v0_reg>;
-		};
+	/* USBH_PEN resp. USB_P_EN */
+	reg_usbh_vbus: regulator-usbh-vbus {
+		compatible = "regulator-fixed";
+		regulator-name = "VCC_USB[1-4]";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
+		vin-supply = <&reg_5v0>;
 	};
 };
arch/arm/boot/dts/tegra30-colibri.dtsi +55 -71

208 lines not on this page · raw message

Signature · 1 line
2.14.4
#4 lore raw

PATCH v2 4/34 ARM: tegra: colibri_t30: add missing regulators

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Add missing regulators:
- reg_module_3v3_audio being VDDA supply of SGTL5000
- VDDD supply of SGTL5000 actually being reg_1v8_vio
- reg_lan_v_bus being USB Ethernet chip vbus supply
- carrier board HDMI supply being reg_5v0
- carrier board reg_3v3 actually being backlight and panel power supply

---

Changes in v2: None

 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 10 ++++++++++
 arch/arm/boot/dts/tegra30-colibri.dtsi        | 21 ++++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +10 -0
index 5eb665d89435..1c057b285153 100644
@@ -29,6 +29,7 @@
 		};
 		hdmi@54280000 {
 			status = "okay";
+			hdmi-supply = <&reg_5v0>;
 		};
 	};
 
@@ -127,6 +128,7 @@
 		default-brightness-level = <6>;
 		/* BL_ON */
 		enable-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
+		power-supply = <&reg_3v3>;
 	};
 
 	clocks {
@@ -159,6 +161,7 @@
 		compatible = "edt,et057090dhu", "simple-panel";
 
 		backlight = <&backlight>;
+		power-supply = <&reg_3v3>;
 	};
 
 	pwmleds {
@@ -181,6 +184,13 @@
 		};
 	};
 
+	reg_3v3: regulator-3v3 {
+		compatible = "regulator-fixed";
+		regulator-name = "3.3V_SW";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+	};
+
 	reg_5v0: regulator-5v0 {
 		compatible = "regulator-fixed";
 		regulator-name = "5V_SW";
arch/arm/boot/dts/tegra30-colibri.dtsi +20 -1
index 4d7ed25bd594..dc54eb734f64 100644
@@ -229,7 +229,8 @@
 		sgtl5000: codec@a {
 			compatible = "fsl,sgtl5000";
 			reg = <0x0a>;
-			VDDA-supply = <&reg_module_3v3>;
+			VDDA-supply = <&reg_module_3v3_audio>;
+			VDDD-supply = <&reg_1v8_vio>;
 			VDDIO-supply = <&reg_module_3v3>;
 			clocks = <&tegra_car TEGRA30_CLK_EXTERN1>;
 		};
@@ -442,6 +443,7 @@
 	usb-phy@7d004000 {
 		status = "okay";
 		nvidia,is-wired = <1>;
+		vbus-supply = <&reg_lan_v_bus>;
 	};
 
 	clocks {
@@ -485,6 +487,15 @@
 		regulator-always-on;
 	};
 
+	reg_lan_v_bus: regulator-lan-v-bus {
+		compatible = "regulator-fixed";
+		regulator-name = "LAN_V_BUS";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		enable-active-high;
+		gpio = <&gpio TEGRA_GPIO(DD, 2) GPIO_ACTIVE_HIGH>;
+	};
+
 	reg_module_3v3: regulator-module-3v3 {
 		compatible = "regulator-fixed";
 		regulator-name = "+V3.3";
@@ -493,6 +504,14 @@
 		regulator-always-on;
 	};
 
+	reg_module_3v3_audio: regulator-module-3v3-audio {
+		compatible = "regulator-fixed";
+		regulator-name = "+V3.3_AUDIO_AVDD_S";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+	};
+
 	sound {
 		compatible = "toradex,tegra-audio-sgtl5000-colibri_t30",
 			     "nvidia,tegra-audio-sgtl5000";
Signature · 1 line
2.14.4
#5 lore raw

PATCH v2 5/34 ARM: tegra: colibri_t30: annotate uarts and move compatible to board

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Annotate UARTs and move the serial UART "nvidia,tegra30-hsuart" compatible definitions from the carrier board to the module level device trees. One could still override this in a custom carrier board device tree if required.

---

Changes in v2:
- Also move serial UART "nvidia,tegra30-hsuart" compatible to module level device trees.

 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 5 +++--
 arch/arm/boot/dts/tegra30-colibri.dtsi        | 8 ++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +3 -2
index 1c057b285153..682ea4ffce83 100644
@@ -33,17 +33,18 @@
 		};
 	};
 
+	/* Colibri UART-A */
 	serial@70006000 {
 		status = "okay";
 	};
 
+	/* Colibri UART-C */
 	serial@70006040 {
-		compatible = "nvidia,tegra30-hsuart";
 		status = "okay";
 	};
 
+	/* Colibri UART-B */
 	serial@70006300 {
-		compatible = "nvidia,tegra30-hsuart";
 		status = "okay";
 	};
 
arch/arm/boot/dts/tegra30-colibri.dtsi +8 -0
index dc54eb734f64..a9b9db0a87f8 100644
@@ -213,6 +213,14 @@
 		};
 	};
 
+	serial@70006040 {
+		compatible = "nvidia,tegra30-hsuart";
+	};
+
+	serial@70006300 {
+		compatible = "nvidia,tegra30-hsuart";
+	};
+
 	hdmiddc: i2c@7000c700 {
 		clock-frequency = <10000>;
 	};
Signature · 1 line
2.14.4
#6 lore raw

PATCH v2 6/34 ARM: tegra: colibri_t30: white-space clean-up

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

White-space clean-up.

---

Changes in v2: None

 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +3 -2
index 682ea4ffce83..ff321964d225 100644
@@ -27,6 +27,7 @@
 				nvidia,panel = <&panel>;
 			};
 		};
+
 		hdmi@54280000 {
 			status = "okay";
 			hdmi-supply = <&reg_5v0>;
@@ -76,6 +77,7 @@
 	spi@7000d400 {
 		status = "okay";
 		spi-max-frequency = <25000000>;
+
 		can0: can@0 {
 			compatible = "microchip,mcp2515";
 			reg = <0>;
@@ -84,6 +86,7 @@
 			interrupts = <TEGRA_GPIO(S, 0) IRQ_TYPE_EDGE_RISING>;
 			spi-max-frequency = <10000000>;
 		};
+
 		spidev0: spi@1 {
 			compatible = "spidev";
 			reg = <1>;
@@ -122,7 +125,6 @@
 
 	backlight: backlight {
 		compatible = "pwm-backlight";
-
 		/* PWM<A> */
 		pwms = <&pwm 0 5000000>;
 		brightness-levels = <255 128 64 32 16 8 4 0>;
@@ -160,7 +162,6 @@
 		 * edt,et070080dh6: EDT 7.0" LCD TFT
 		 */
 		compatible = "edt,et057090dhu", "simple-panel";
-
 		backlight = <&backlight>;
 		power-supply = <&reg_3v3>;
 	};
Signature · 1 line
2.14.4
#7 lore raw

PATCH v2 7/34 ARM: tegra: colibri_t30: move dr_mode property from phy to controller

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Move dr_mode property from USB PHY node to controller.

---

Changes in v2: None

 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +1 -1
index ff321964d225..709ff95a1614 100644
@@ -105,11 +105,11 @@
 	/* EHCI instance 0: USB1_DP/N -> USBC_P/N */
 	usb@7d000000 {
 		status = "okay";
+		dr_mode = "otg";
 	};
 
 	usb-phy@7d000000 {
 		status = "okay";
-		dr_mode = "otg";
 		vbus-supply = <&reg_usbc_vbus>;
 	};
 
Signature · 1 line
2.14.4
#8 lore raw

PATCH v2 8/34 ARM: tegra: colibri_t30: reorder backlight properties

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Reorder backlight properties.

---

Changes in v2: None

 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +1 -2
index 709ff95a1614..8c492daac165 100644
@@ -125,13 +125,12 @@
 
 	backlight: backlight {
 		compatible = "pwm-backlight";
-		/* PWM<A> */
-		pwms = <&pwm 0 5000000>;
 		brightness-levels = <255 128 64 32 16 8 4 0>;
 		default-brightness-level = <6>;
 		/* BL_ON */
 		enable-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
 		power-supply = <&reg_3v3>;
+		pwms = <&pwm 0 5000000>; /* PWM<A> */
 	};
 
 	clocks {
Signature · 1 line
2.14.4
#9 lore raw

PATCH v2 9/34 ARM: tegra: colibri_t30: drop pwmleds

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Drop pwmleds in favour of using regular PWMs.

---

Changes in v2: None

 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 20 --------------------
 1 file changed, 20 deletions(-)
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +0 -20
index 8c492daac165..2aaf87ba0c42 100644
@@ -165,26 +165,6 @@
 		power-supply = <&reg_3v3>;
 	};
 
-	pwmleds {
-		compatible = "pwm-leds";
-
-		pwmb {
-			label = "PWM<B>";
-			pwms = <&pwm 1 19600>;
-			max-brightness = <255>;
-		};
-		pwmc {
-			label = "PWM<C>";
-			pwms = <&pwm 2 19600>;
-			max-brightness = <255>;
-		};
-		pwmd {
-			label = "PWM<D>";
-			pwms = <&pwm 3 19600>;
-			max-brightness = <255>;
-		};
-	};
-
 	reg_3v3: regulator-3v3 {
 		compatible = "regulator-fixed";
 		regulator-name = "3.3V_SW";
Signature · 1 line
2.14.4
#10 lore raw

PATCH v2 10/34 ARM: tegra: colibri_t30: pinmux clean-up

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Clean-up pinmuxing:
- white-space clean-up
- explicitly disable LCD_M1 in favour of LCD_DE on L_BIAS
- explicitly disable multiplexed SSPFRM and SSPTXD
- get rid of nvidia,lock property
- add missing eMMC sdmmc4_cmd_pt7 and explicitly enable input
- explicitly disable lcd_dc1_pd2 (e.g. LM95245 I2C address pin)
- annotate TOUCH_PEN_INT# being on-module
- As underscores in node names are not recommended replace them all where possible with dashes.
- Replace underscores in UART annotations (e.g. UART_A) with dashes (e.g. UART-A) to be more in-line with our Colibri standard.

---

Changes in v2:
- Also replace underscores in node names with dashes.
- Also replace underscores in UART annotations with dashes.

 arch/arm/boot/dts/tegra30-colibri.dtsi | 72 ++++++++++++++++++----------------
 1 file changed, 38 insertions(+), 34 deletions(-)
arch/arm/boot/dts/tegra30-colibri.dtsi +38 -34
index a9b9db0a87f8..6bedb69be553 100644
@@ -30,18 +30,18 @@
 
 		state_default: pinmux {
 			/* Analogue Audio (On-module) */
-			clk1_out_pw4 {
+			clk1-out-pw4 {
 				nvidia,pins = "clk1_out_pw4";
 				nvidia,function = "extperiph1";
 				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
 				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
 			};
-			dap3_fs_pp0 {
-				nvidia,pins =	"dap3_fs_pp0",
-						"dap3_sclk_pp3",
-						"dap3_din_pp1",
-						"dap3_dout_pp2";
+			dap3-fs-pp0 {
+				nvidia,pins = "dap3_fs_pp0",
+					      "dap3_sclk_pp3",
+					      "dap3_din_pp1",
+					      "dap3_dout_pp2";
 				nvidia,function = "i2s2";
 				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
@@ -56,7 +56,7 @@
 			};
 
 			/* Colibri Backlight PWM<A> */
-			sdmmc3_dat3_pb4 {
+			sdmmc3-dat3-pb4 {
 				nvidia,pins = "sdmmc3_dat3_pb4";
 				nvidia,function = "pwm0";
 				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
@@ -64,7 +64,7 @@
 			};
 
 			/* Colibri CAN_INT */
-			kb_row8_ps0 {
+			kb-row8-ps0 {
 				nvidia,pins = "kb_row8_ps0";
 				nvidia,function = "kbc";
 				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
@@ -74,24 +74,24 @@
 
 			/*
 			 * Colibri L_BIAS, LCD_M1 is muxed with LCD_DE
-			 * todays display need DE, disable LCD_M1
+			 * today's display need DE, disable LCD_M1
 			 */
-			lcd_m1_pw1 {
+			lcd-m1-pw1 {
 				nvidia,pins = "lcd_m1_pw1";
 				nvidia,function = "rsvd3";
-				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
-				nvidia,tristate = <TEGRA_PIN_DISABLE>;
-				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+				nvidia,tristate = <TEGRA_PIN_ENABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
 			};
 
 			/* Colibri MMC */
-			kb_row10_ps2 {
+			kb-row10-ps2 {
 				nvidia,pins = "kb_row10_ps2";
 				nvidia,function = "sdmmc2";
 				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
 			};
-			kb_row11_ps3 {
+			kb-row11-ps3 {
 				nvidia,pins = "kb_row11_ps3",
 					      "kb_row12_ps4",
 					      "kb_row13_ps5",
@@ -103,7 +103,7 @@
 			};
 
 			/* Colibri SSP */
-			ulpi_clk_py0 {
+			ulpi-clk-py0 {
 				nvidia,pins = "ulpi_clk_py0",
 					      "ulpi_dir_py1",
 					      "ulpi_nxt_py2",
@@ -112,16 +112,18 @@
 				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
 			};
-			sdmmc3_dat6_pd3 {
+			/* Multiplexed SSPFRM, SSPTXD and therefore disabled */
+			sdmmc3-dat6-pd3 {
 				nvidia,pins = "sdmmc3_dat6_pd3",
 					      "sdmmc3_dat7_pd4";
 				nvidia,function = "spdif";
-				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
 				nvidia,tristate = <TEGRA_PIN_ENABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
 			};
 
-			/* Colibri UART_A */
-			ulpi_data0 {
+			/* Colibri UART-A */
+			ulpi-data0 {
 				nvidia,pins = "ulpi_data0_po1",
 					      "ulpi_data1_po2",
 					      "ulpi_data2_po3",
@@ -135,8 +137,8 @@
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
 			};
 
-			/* Colibri UART_B */
-			gmi_a16_pj7 {
+			/* Colibri UART-B */
+			gmi-a16-pj7 {
 				nvidia,pins = "gmi_a16_pj7",
 					      "gmi_a17_pb0",
 					      "gmi_a18_pb1",
@@ -146,8 +148,8 @@
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
 			};
 
-			/* Colibri UART_C */
-			uart2_rxd {
+			/* Colibri UART-C */
+			uart2-rxd {
 				nvidia,pins = "uart2_rxd_pc3",
 					      "uart2_txd_pc2";
 				nvidia,function = "uartb";
@@ -155,15 +157,17 @@
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
 			};
 
-			/* eMMC */
-			sdmmc4_clk_pcc4 {
+			/* eMMC (On-module) */
+			sdmmc4-clk-pcc4 {
 				nvidia,pins = "sdmmc4_clk_pcc4",
+					      "sdmmc4_cmd_pt7",
 					      "sdmmc4_rst_n_pcc3";
 				nvidia,function = "sdmmc4";
 				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
 			};
-			sdmmc4_dat0_paa0 {
+			sdmmc4-dat0-paa0 {
 				nvidia,pins = "sdmmc4_dat0_paa0",
 					      "sdmmc4_dat1_paa1",
 					      "sdmmc4_dat2_paa2",
@@ -175,17 +179,17 @@
 				nvidia,function = "sdmmc4";
 				nvidia,pull = <TEGRA_PIN_PULL_UP>;
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
 			};
 
 			/* Power I2C (On-module) */
-			pwr_i2c_scl_pz6 {
+			pwr-i2c-scl-pz6 {
 				nvidia,pins = "pwr_i2c_scl_pz6",
 					      "pwr_i2c_sda_pz7";
 				nvidia,function = "i2cpwr";
 				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
 				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-				nvidia,lock = <TEGRA_PIN_DISABLE>;
 				nvidia,open-drain = <TEGRA_PIN_ENABLE>;
 			};
 
@@ -194,15 +198,15 @@
 			 * temperature sensor therefore requires disabling for
 			 * now
 			 */
-			lcd_dc1_pd2 {
+			lcd-dc1-pd2 {
 				nvidia,pins = "lcd_dc1_pd2";
 				nvidia,function = "rsvd3";
-				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
-				nvidia,tristate = <TEGRA_PIN_DISABLE>;
-				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+				nvidia,tristate = <TEGRA_PIN_ENABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
 			};
 
-			/* TOUCH_PEN_INT# */
+			/* TOUCH_PEN_INT# (On-module) */
 			pv0 {
 				nvidia,pins = "pv0";
 				nvidia,function = "rsvd1";
Signature · 1 line
2.14.4
#11 lore raw

PATCH v2 11/34 ARM: tegra: colibri_t30: add missing pinmux

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Explicitly mux all T30 SoC balls now:
- Colibri Address/Data Bus (GMI)
- Colibri DDC
- Colibri EXT_IO*
- Colibri GPIO
- Colibri HOTPLUG_DETECT (HDMI)
- Colibri I2C
- Colibri LCD (L_* resp. LDD<*>)
- Colibri MMC_CD
- Colibri nRESET_OUT
- Colibri Parallel Camera (Optional)
- Colibri PWM<B>, <C>, <D>
- Colibri VGA
- Colibri USBC_DET
- Colibri USBH_PEN
- Colibri USBH_OC
- on-module AX88772B LAN control signals
- Colibri nBATT_FAULT(SENSE) and nVDD_FAULT(SENSE
- not connected and therefore disabled signals

---

Changes in v2:
- Replace underscores in node names with dashes.

 arch/arm/boot/dts/tegra30-colibri.dtsi | 486 +++++++++++++++++++++++++++++++++
 1 file changed, 486 insertions(+)
arch/arm/boot/dts/tegra30-colibri.dtsi +486 -0
index 6bedb69be553..197605d99425 100644
@@ -47,6 +47,156 @@
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
 			};
 
+			/* Colibri Address/Data Bus (GMI) */
+			gmi-ad0-pg0 {
+				nvidia,pins = "gmi_ad0_pg0",
+					      "gmi_ad2_pg2",
+					      "gmi_ad3_pg3",
+					      "gmi_ad4_pg4",
+					      "gmi_ad5_pg5",
+					      "gmi_ad6_pg6",
+					      "gmi_ad7_pg7",
+					      "gmi_ad8_ph0",
+					      "gmi_ad9_ph1",
+					      "gmi_ad10_ph2",
+					      "gmi_ad11_ph3",
+					      "gmi_ad12_ph4",
+					      "gmi_ad13_ph5",
+					      "gmi_ad14_ph6",
+					      "gmi_ad15_ph7",
+					      "gmi_adv_n_pk0",
+					      "gmi_clk_pk1",
+					      "gmi_cs4_n_pk2",
+					      "gmi_cs2_n_pk3",
+					      "gmi_iordy_pi5",
+					      "gmi_oe_n_pi1",
+					      "gmi_wait_pi7",
+					      "gmi_wr_n_pi0",
+					      "dap1_fs_pn0",
+					      "dap1_din_pn1",
+					      "dap1_dout_pn2",
+					      "dap1_sclk_pn3",
+					      "dap2_fs_pa2",
+					      "dap2_sclk_pa3",
+					      "dap2_din_pa4",
+					      "dap2_dout_pa5",
+					      "spi1_sck_px5",
+					      "spi1_mosi_px4",
+					      "spi1_cs0_n_px6",
+					      "spi2_cs0_n_px3",
+					      "spi2_miso_px1",
+					      "spi2_mosi_px0",
+					      "spi2_sck_px2",
+					      "uart2_cts_n_pj5",
+					      "uart2_rts_n_pj6";
+				nvidia,function = "gmi";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+			};
+			/* Further pins may be used as GPIOs */
+			dap4-din-pp5 {
+				nvidia,pins = "dap4_din_pp5",
+					      "dap4_dout_pp6",
+					      "dap4_fs_pp4",
+					      "dap4_sclk_pp7",
+					      "pbb7",
+					      "sdmmc1_clk_pz0",
+					      "sdmmc1_cmd_pz1",
+					      "sdmmc1_dat0_py7",
+					      "sdmmc1_dat1_py6",
+					      "sdmmc1_dat3_py4",
+					      "uart3_cts_n_pa1",
+					      "uart3_txd_pw6",
+					      "uart3_rxd_pw7";
+				nvidia,function = "rsvd2";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+			};
+			lcd-d18-pm2 {
+				nvidia,pins = "lcd_d18_pm2",
+					      "lcd_d19_pm3",
+					      "lcd_d20_pm4",
+					      "lcd_d21_pm5",
+					      "lcd_d22_pm6",
+					      "lcd_d23_pm7",
+					      "lcd_dc0_pn6",
+					      "pex_l2_clkreq_n_pcc7";
+				nvidia,function = "rsvd3";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+			};
+			lcd-cs0-n-pn4 {
+				nvidia,pins = "lcd_cs0_n_pn4",
+					      "lcd_sdin_pz2",
+					      "pu0",
+					      "pu1",
+					      "pu2",
+					      "pu3",
+					      "pu4",
+					      "pu5",
+					      "pu6",
+					      "spi1_miso_px7",
+					      "uart3_rts_n_pc0";
+				nvidia,function = "rsvd4";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+			};
+			lcd-pwr0-pb2 {
+				nvidia,pins = "lcd_pwr0_pb2",
+					      "lcd_sck_pz4",
+					      "lcd_sdout_pn5",
+					      "lcd_wr_n_pz3";
+				nvidia,function = "hdcp";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+			};
+			pbb4 {
+				nvidia,pins = "pbb4",
+					      "pbb5",
+					      "pbb6";
+				nvidia,function = "displayb";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+			};
+			/* Multiplexed RDnWR and therefore disabled */
+			lcd-cs1-n-pw0 {
+				nvidia,pins = "lcd_cs1_n_pw0";
+				nvidia,function = "rsvd4";
+				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+				nvidia,tristate = <TEGRA_PIN_ENABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+			};
+			/* Multiplexed GMI_CLK and therefore disabled */
+			owr {
+				nvidia,pins = "owr";
+				nvidia,function = "rsvd3";
+				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+				nvidia,tristate = <TEGRA_PIN_ENABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+			};
+			/* Tri-stating GMI_WR_N on nPWE SODIMM pin 99 */
+			sdmmc3-dat4-pd1 {
+				nvidia,pins = "sdmmc3_dat4_pd1";
+				nvidia,function = "sdmmc3";
+				nvidia,pull = <TEGRA_PIN_PULL_UP>;
+				nvidia,tristate = <TEGRA_PIN_ENABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+			};
+			/* Not tri-stating GMI_WR_N on RDnWR SODIMM pin 93 */
+			sdmmc3-dat5-pd0 {
+				nvidia,pins = "sdmmc3_dat5_pd0";
+				nvidia,function = "sdmmc3";
+				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+				nvidia,tristate = <TEGRA_PIN_ENABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+			};
+
 			/* Colibri BL_ON */
 			pv2 {
 				nvidia,pins = "pv2";
@@ -72,6 +222,113 @@
 				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
 			};
 
+			/* Colibri DDC */
+			ddc-scl-pv4 {
+				nvidia,pins = "ddc_scl_pv4",
+					      "ddc_sda_pv5";
+				nvidia,function = "i2c4";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+			};
+
+			/* Colibri EXT_IO* */
+			gen2-i2c-scl-pt5 {
+				nvidia,pins = "gen2_i2c_scl_pt5",
+					      "gen2_i2c_sda_pt6";
+				nvidia,function = "rsvd4";
+				nvidia,open-drain = <TEGRA_PIN_DISABLE>;
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+			};
+			spdif-in-pk6 {
+				nvidia,pins =	"spdif_in_pk6";
+				nvidia,function = "hda";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+			};
+
+			/* Colibri GPIO */
+			clk2-out-pw5 {
+				nvidia,pins = "clk2_out_pw5",
+					      "pcc2",
+					      "pv3",
+					      "sdmmc1_dat2_py5";
+				nvidia,function = "rsvd2";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+			};
+			lcd-pwr1-pc1 {
+				nvidia,pins = "lcd_pwr1_pc1",
+					      "pex_l1_clkreq_n_pdd6",
+					      "pex_l1_rst_n_pdd5";
+				nvidia,function = "rsvd3";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+			};
+			pv1 {
+				nvidia,pins = "pv1",
+					      "sdmmc3_dat0_pb7",
+					      "sdmmc3_dat1_pb6";
+				nvidia,function = "rsvd1";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+			};
+
+			/* Colibri HOTPLUG_DETECT (HDMI) */
+			hdmi-int-pn7 {
+				nvidia,pins = "hdmi_int_pn7";
+				nvidia,function = "hdmi";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_ENABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+			};
+
+			/* Colibri I2C */
+			gen1-i2c-scl-pc4 {
+				nvidia,pins = "gen1_i2c_scl_pc4",
+					      "gen1_i2c_sda_pc5";
+				nvidia,function = "i2c1";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+				nvidia,open-drain = <TEGRA_PIN_ENABLE>;
+			};
+
+			/* Colibri LCD (L_* resp. LDD<*>) */
+			lcd-d0-pe0 {
+				nvidia,pins = "lcd_d0_pe0",
+					      "lcd_d1_pe1",
+					      "lcd_d2_pe2",
+					      "lcd_d3_pe3",
+					      "lcd_d4_pe4",
+					      "lcd_d5_pe5",
+					      "lcd_d6_pe6",
+					      "lcd_d7_pe7",
+					      "lcd_d8_pf0",
+					      "lcd_d9_pf1",
+					      "lcd_d10_pf2",
+					      "lcd_d11_pf3",
+					      "lcd_d12_pf4",
+					      "lcd_d13_pf5",
+					      "lcd_d14_pf6",
+					      "lcd_d15_pf7",
+					      "lcd_d16_pm0",
+					      "lcd_d17_pm1",
+					      "lcd_de_pj1",
+					      "lcd_hsync_pj3",
+					      "lcd_pclk_pb3",
+					      "lcd_vsync_pj4";
+				nvidia,function = "displaya";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+			};
 			/*
 			 * Colibri L_BIAS, LCD_M1 is muxed with LCD_DE
 			 * today's display need DE, disable LCD_M1
@@ -101,6 +358,105 @@
 				nvidia,pull = <TEGRA_PIN_PULL_UP>;
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
 			};
+			/* Colibri MMC_CD */
+			gmi-wp-n-pc7 {
+				nvidia,pins = "gmi_wp_n_pc7";
+				nvidia,function = "rsvd1";
+				nvidia,pull = <TEGRA_PIN_PULL_UP>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+			};
+			/* Multiplexed and therefore disabled */
+			cam-mclk-pcc0 {
+				nvidia,pins =	"cam_mclk_pcc0";
+				nvidia,function = "vi_alt3";
+				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+				nvidia,tristate = <TEGRA_PIN_ENABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+			};
+			cam-i2c-scl-pbb1 {
+				nvidia,pins = "cam_i2c_scl_pbb1",
+					      "cam_i2c_sda_pbb2";
+				nvidia,function = "rsvd3";
+				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+				nvidia,tristate = <TEGRA_PIN_ENABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+				nvidia,open-drain = <TEGRA_PIN_DISABLE>;
+			};
+			pbb0 {
+				nvidia,pins = "pbb0",
+					      "pcc1";
+				nvidia,function = "rsvd2";
+				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+				nvidia,tristate = <TEGRA_PIN_ENABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+			};
+			pbb3 {
+				nvidia,pins = "pbb3";
+				nvidia,function = "displayb";
+				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+				nvidia,tristate = <TEGRA_PIN_ENABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+			};
+
+			/* Colibri nRESET_OUT */
+			gmi-rst-n-pi4 {
+				nvidia,pins = "gmi_rst_n_pi4";
+				nvidia,function = "gmi";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+			};
+
+			/*
+			 * Colibri Parallel Camera (Optional)
+			 * pins multiplexed with others and therefore disabled
+			 */
+			vi-vsync-pd6 {
+				nvidia,pins = "vi_d0_pt4",
+					      "vi_d1_pd5",
+					      "vi_d2_pl0",
+					      "vi_d3_pl1",
+					      "vi_d4_pl2",
+					      "vi_d5_pl3",
+					      "vi_d6_pl4",
+					      "vi_d7_pl5",
+					      "vi_d8_pl6",
+					      "vi_d9_pl7",
+					      "vi_d10_pt2",
+					      "vi_d11_pt3",
+					      "vi_hsync_pd7",
+					      "vi_mclk_pt1",
+					      "vi_pclk_pt0",
+					      "vi_vsync_pd6";
+				nvidia,function = "vi";
+				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+				nvidia,tristate = <TEGRA_PIN_ENABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+			};
+
+			/* Colibri PWM<B> */
+			sdmmc3-dat2-pb5 {
+				nvidia,pins = "sdmmc3_dat2_pb5";
+				nvidia,function = "pwm1";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+			};
+
+			/* Colibri PWM<C> */
+			sdmmc3-clk-pa6 {
+				nvidia,pins = "sdmmc3_clk_pa6";
+				nvidia,function = "pwm2";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+			};
+
+			/* Colibri PWM<D> */
+			sdmmc3-cmd-pa7 {
+				nvidia,pins = "sdmmc3_cmd_pa7";
+				nvidia,function = "pwm3";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+			};
 
 			/* Colibri SSP */
 			ulpi-clk-py0 {
@@ -157,6 +513,42 @@
 				nvidia,tristate = <TEGRA_PIN_DISABLE>;
 			};
 
+			/* Colibri USBC_DET */
+			spdif-out-pk5 {
+				nvidia,pins =	"spdif_out_pk5";
+				nvidia,function = "rsvd2";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+			};
+
+			/* Colibri USBH_PEN */
+			spi2-cs1-n-pw2 {
+				nvidia,pins = "spi2_cs1_n_pw2";
+				nvidia,function = "spi2_alt";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+			};
+
+			/* Colibri USBH_OC */
+			spi2-cs2-n-pw3, {
+				nvidia,pins = "spi2_cs2_n_pw3";
+				nvidia,function = "spi2_alt";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+			};
+
+			/* Colibri VGA not supported and therefore disabled */
+			crt-hsync-pv6 {
+				nvidia,pins = "crt_hsync_pv6",
+					      "crt_vsync_pv7";
+				nvidia,function = "rsvd2";
+				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+				nvidia,tristate = <TEGRA_PIN_ENABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+			};
+
 			/* eMMC (On-module) */
 			sdmmc4-clk-pcc4 {
 				nvidia,pins = "sdmmc4_clk_pcc4",
@@ -182,6 +574,100 @@
 				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
 			};
 
+			/* LAN_EXT_WAKEUP#, LAN_PME (On-module) */
+			pex-l0-rst-n-pdd1 {
+				nvidia,pins = "pex_l0_rst_n_pdd1",
+					      "pex_wake_n_pdd3";
+				nvidia,function = "rsvd3";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+			};
+			/* LAN_V_BUS, LAN_RESET# (On-module) */
+			pex-l0-clkreq-n-pdd2 {
+				nvidia,pins = "pex_l0_clkreq_n_pdd2",
+					      "pex_l0_prsnt_n_pdd0";
+				nvidia,function = "rsvd3";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+			};
+
+			/* nBATT_FAULT(SENSE), nVDD_FAULT(SENSE) */
+			pex-l2-rst-n-pcc6 {
+				nvidia,pins = "pex_l2_rst_n_pcc6",
+					      "pex_l2_prsnt_n_pdd7";
+				nvidia,function = "rsvd3";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+			};
+
+			/* Not connected and therefore disabled */
+			clk1-req-pee2 {
+				nvidia,pins = "clk1_req_pee2",
+					      "pex_l1_prsnt_n_pdd4";
+				nvidia,function = "rsvd3";
+				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+				nvidia,tristate = <TEGRA_PIN_ENABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+			};
+			clk2-req-pcc5 {
+				nvidia,pins = "clk2_req_pcc5",
+					      "clk3_out_pee0",
+					      "clk3_req_pee1",
+					      "clk_32k_out_pa0",
+					      "hdmi_cec_pee3",
+					      "sys_clk_req_pz5";
+				nvidia,function = "rsvd2";
+				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+				nvidia,tristate = <TEGRA_PIN_ENABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+			};
+			gmi-dqs-pi2 {
+				nvidia,pins = "gmi_dqs_pi2",
+					      "kb_col2_pq2",
+					      "kb_col3_pq3",
+					      "kb_col4_pq4",
+					      "kb_col5_pq5",
+					      "kb_row4_pr4";
+				nvidia,function = "rsvd4";
+				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+				nvidia,tristate = <TEGRA_PIN_ENABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+			};
+			kb-col0-pq0 {
+				nvidia,pins = "kb_col0_pq0",
+					      "kb_col1_pq1",
+					      "kb_col6_pq6",
+					      "kb_col7_pq7",
+					      "kb_row5_pr5",
+					      "kb_row6_pr6",
+					      "kb_row7_pr7",
+					      "kb_row9_ps1";
+				nvidia,function = "kbc";
+				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+				nvidia,tristate = <TEGRA_PIN_ENABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+			};
+			kb-row0-pr0 {
+				nvidia,pins = "kb_row0_pr0",
+					      "kb_row1_pr1",
+					      "kb_row2_pr2",
+					      "kb_row3_pr3";
+				nvidia,function = "rsvd3";
+				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+				nvidia,tristate = <TEGRA_PIN_ENABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+			};
+			lcd-pwr2-pc6 {
+				nvidia,pins = "lcd_pwr2_pc6";
+				nvidia,function = "hdcp";
+				nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+				nvidia,tristate = <TEGRA_PIN_ENABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+			};
+
 			/* Power I2C (On-module) */
 			pwr-i2c-scl-pz6 {
 				nvidia,pins = "pwr_i2c_scl_pz6",
Signature · 1 line
2.14.4
#12 lore raw

PATCH v2 12/34 ARM: tegra: colibri_t30: use proper irq-gpio for stmpe811

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Use proper irq-gpio for stmpe811 touch controller.

---

Changes in v2: None

 arch/arm/boot/dts/tegra30-colibri.dtsi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm/boot/dts/tegra30-colibri.dtsi +1 -2
index 197605d99425..3a5151dc8483 100644
@@ -844,8 +844,7 @@
 		stmpe811@41 {
 			compatible = "st,stmpe811";
 			reg = <0x41>;
-			interrupts = <TEGRA_GPIO(V, 0) IRQ_TYPE_LEVEL_LOW>;
-			interrupt-parent = <&gpio>;
+			irq-gpio = <&gpio TEGRA_GPIO(V, 0) IRQ_TYPE_LEVEL_LOW>;
 			interrupt-controller;
 			id = <0>;
 			blocks = <0x5>;
Signature · 1 line
2.14.4
#13 lore raw

PATCH v2 13/34 ARM: tegra: colibri_t30: further lm95245 temperature sensor annotation

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Further LM95245 temperature sensor annotation.

---

Changes in v2: None

 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 3a5151dc8483..73ff098612a2 100644
@@ -878,7 +878,7 @@
 
 		/*
 		 * LM95245 temperature sensor
-		 * Note: OVERT_N directly connected to PMIC PWRDN
+		 * Note: OVERT1# directly connected to TPS65911 PMIC PWRDN
 		 */
 		temp-sensor@4c {
 			compatible = "national,lm95245";
Signature · 1 line
2.14.4
#14 lore raw

PATCH v2 14/34 ARM: tegra: colibri_t30: add i2c-thermtrip

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Add i2c-thermtrip which would set the DEV_OFF bit in the DCDC control register of the TPS65911 PMIC.

---

Changes in v2:
- When running some more tests I realized that the reg-addr should really be 0x3f. Fix this.

 arch/arm/boot/dts/tegra30-colibri.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/boot/dts/tegra30-colibri.dtsi +8 -0
index 73ff098612a2..670edd5e4754 100644
@@ -910,6 +910,14 @@
 		nvidia,core-pwr-off-time = <0>;
 		nvidia,core-power-req-active-high;
 		nvidia,sys-clock-req-active-high;
+
+		/* Set DEV_OFF bit in DCDC control register of TPS65911 PMIC */
+		i2c-thermtrip {
+			nvidia,i2c-controller-id = <4>;
+			nvidia,bus-addr = <0x2d>;
+			nvidia,reg-addr = <0x3f>;
+			nvidia,reg-data = <0x1>;
+		};
 	};
 
 	ahub@70080000 {
Signature · 1 line
2.14.4
#15 lore raw

PATCH v2 15/34 ARM: tegra: colibri_t30: add proper emmc vmmc and vqmmc supplies

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Add proper eMMC vmmc and vqmmc supplies e.g. fixing signalling voltage.

---

Changes in v2: None

 arch/arm/boot/dts/tegra30-colibri.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/boot/dts/tegra30-colibri.dtsi +2 -0
index 670edd5e4754..c5cb05f78604 100644
@@ -931,6 +931,8 @@
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
+		vmmc-supply = <&reg_module_3v3>; /* VCC */
+		vqmmc-supply = <&reg_1v8_vio>; /* VCCQ */
 	};
 
 	/* EHCI instance 1: USB2_DP/N -> AX88772B */
Signature · 1 line
2.14.4
#16 lore raw

PATCH v2 16/34 ARM: tegra: colibri_t30: enable emmc ddr52 mode

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Add mmc-ddr-1_8v property enabling eMMC DDR52 mode.

root@colibri-t30:~# cat /sys/kernel/debug/mmc1/ios
clock:          52000000 Hz
actual clock:   52000000 Hz
vdd:            21 (3.3 ~ 3.4 V)
bus mode:       2 (push-pull)
chip select:    0 (don't care)
power mode:     2 (on)
bus width:      3 (8 bits)
timing spec:    8 (mmc DDR52)
signal voltage: 1 (1.80 V)
driver type:    0 (driver type B)
root@colibri-t30:~# hdparm -t /dev/mmcblk1

/dev/mmcblk1:
Timing buffered disk reads: 222 MB in 3.00 seconds = 73.92 MB/sec

---

Changes in v2: None

 arch/arm/boot/dts/tegra30-colibri.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/boot/dts/tegra30-colibri.dtsi +1 -0
index c5cb05f78604..95b6444a6f05 100644
@@ -933,6 +933,7 @@
 		non-removable;
 		vmmc-supply = <&reg_module_3v3>; /* VCC */
 		vqmmc-supply = <&reg_1v8_vio>; /* VCCQ */
+		mmc-ddr-1_8v;
 	};
 
 	/* EHCI instance 1: USB2_DP/N -> AX88772B */
Signature · 1 line
2.14.4
#17 lore raw

PATCH v2 17/34 ARM: tegra: colibri_t30: get rid of fake clocks simple bus

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Get rid of the fake clocks simple bus and use node names as per the actual schematics.

---

Changes in v2:
- Get rid of fake clocks simple bus as suggested by Rob.

 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 12 ++++--------
 arch/arm/boot/dts/tegra30-colibri.dtsi        | 15 ++++-----------
 2 files changed, 8 insertions(+), 19 deletions(-)
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +4 -8
index 2aaf87ba0c42..bcdaeedcbea2 100644
@@ -133,14 +133,10 @@
 		pwms = <&pwm 0 5000000>; /* PWM<A> */
 	};
 
-	clocks {
-		clk16m: clk@1 {
-			compatible = "fixed-clock";
-			reg = <1>;
-			#clock-cells = <0>;
-			clock-frequency = <16000000>;
-			clock-output-names = "clk16m";
-		};
+	clk16m: osc3 {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <16000000>;
 	};
 
 	gpio-keys {
arch/arm/boot/dts/tegra30-colibri.dtsi +4 -11
index 95b6444a6f05..4fcdc93ae687 100644
@@ -954,17 +954,10 @@
 		vbus-supply = <&reg_lan_v_bus>;
 	};
 
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		clk32k_in: clk@0 {
-			compatible = "fixed-clock";
-			reg = <0>;
-			#clock-cells = <0>;
-			clock-frequency = <32768>;
-		};
+	clk32k_in: xtal1 {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <32768>;
 	};
 
 	reg_1v8_avdd_hdmi_pll: regulator-1v8-avdd-hdmi-pll {
Signature · 1 line
2.14.4
#18 lore raw

PATCH v2 18/34 ARM: tegra: colibri_t30: line break long compatible property line

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Line break long compatible property line.

---

Changes in v2: None

 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +2 -1
index bcdaeedcbea2..d8ee7edb24cf 100644
@@ -5,7 +5,8 @@
 
 / {
 	model = "Toradex Colibri T30 on Colibri Evaluation Board";
-	compatible = "toradex,colibri_t30-eval-v3", "toradex,colibri_t30", "nvidia,tegra30";
+	compatible = "toradex,colibri_t30-eval-v3", "toradex,colibri_t30",
+		     "nvidia,tegra30";
 
 	aliases {
 		rtc0 = "/i2c@7000c000/rtc@68";
Signature · 1 line
2.14.4
#19 lore raw

PATCH v2 19/34 ARM: tegra: colibri_t30: move input include to carrier board

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Move input include to carrier board.

---

Changes in v2: None

 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 1 +
 arch/arm/boot/dts/tegra30-colibri.dtsi        | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +1 -0
index d8ee7edb24cf..16f5e6af68b9 100644
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
+#include <dt-bindings/input/input.h>
 #include "tegra30-colibri.dtsi"
 
 / {
arch/arm/boot/dts/tegra30-colibri.dtsi +0 -1
index 4fcdc93ae687..0d8b0f319c6f 100644
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0
-#include <dt-bindings/input/input.h>
 #include "tegra30.dtsi"
 
 /*
Signature · 1 line
2.14.4
#20 lore raw

PATCH v2 20/34 ARM: tegra: colibri_t30: remove unused nvidia,is-wired property

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Remove unused nvidia,is-wired property.

---

Changes in v2: None

 arch/arm/boot/dts/tegra30-colibri.dtsi | 1 -
 1 file changed, 1 deletion(-)
arch/arm/boot/dts/tegra30-colibri.dtsi +0 -1
index 0d8b0f319c6f..eb36ae3038a7 100644
@@ -949,7 +949,6 @@
 
 	usb-phy@7d004000 {
 		status = "okay";
-		nvidia,is-wired = <1>;
 		vbus-supply = <&reg_lan_v_bus>;
 	};
 
Signature · 1 line
2.14.4
#21 lore raw

PATCH v2 21/34 ARM: tegra: colibri_t30: add gpio hog to unreset usb ethernet chip

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Add GPIO hog to unreset ASIX AX88772B USB Ethernet chip.

---

Changes in v2:
- Replace underscores in node names with dashes.

 arch/arm/boot/dts/tegra30-colibri.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)
arch/arm/boot/dts/tegra30-colibri.dtsi +9 -0
index eb36ae3038a7..aff94707b3fa 100644
@@ -1027,3 +1027,12 @@
 		clock-names = "pll_a", "pll_a_out0", "mclk";
 	};
 };
+
+&gpio {
+	lan-reset-n {
+		gpio-hog;
+		gpios = <TEGRA_GPIO(DD, 0) GPIO_ACTIVE_HIGH>;
+		output-high;
+		line-name = "LAN_RESET#";
+	};
+};
Signature · 1 line
2.14.4
#22 lore raw

PATCH v2 22/34 ARM: tegra: colibri_t30: enable hda over hdmi

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Enable HDA over HDMI.

---

Changes in v2: None

 arch/arm/boot/dts/tegra30-colibri.dtsi | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm/boot/dts/tegra30-colibri.dtsi +4 -0
index aff94707b3fa..1337674c530c 100644
@@ -919,6 +919,10 @@
 		};
 	};
 
+	hda@70030000 {
+		status = "okay";
+	};
+
 	ahub@70080000 {
 		i2s@70080500 {
 			status = "okay";
Signature · 1 line
2.14.4
#23 lore raw

PATCH v2 23/34 ARM: tegra: colibri_t30: annotate sd card detect

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Annotate SD card detect.

---

Changes in v2: None

 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +1 -1
index 16f5e6af68b9..aca4cd786442 100644
@@ -100,7 +100,7 @@
 	sdhci@78000200 {
 		status = "okay";
 		bus-width = <4>;
-		cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>;
+		cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */
 		no-1-8-v;
 	};
 
Signature · 1 line
2.14.4
#24 lore raw

PATCH v2 24/34 ARM: tegra: colibri_t30: annotate ehci instance 1

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Annotate EHCI instance 1 (USB2_DP/N) connecting to ASIX AX88772B USB to Ethernet chip being on-module.

---

Changes in v2: None

 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 1337674c530c..7a4e454a1960 100644
@@ -939,7 +939,7 @@
 		mmc-ddr-1_8v;
 	};
 
-	/* EHCI instance 1: USB2_DP/N -> AX88772B */
+	/* EHCI instance 1: USB2_DP/N -> AX88772B (On-module) */
 	usb@7d004000 {
 		status = "okay";
 		#address-cells = <1>;
Signature · 1 line
2.14.4
#25 lore raw

PATCH v2 25/34 ARM: tegra: colibri_t30: update compatibility comment

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Update compatibility comment.

---

Changes in v2: None

 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 7a4e454a1960..9bd7034b8e66 100644
@@ -3,7 +3,7 @@
 
 /*
  * Toradex Colibri T30 Module Device Tree
- * Compatible for Revisions V1.1B, V1.1C, V1.1D, V1.1E; IT: V1.1A
+ * Compatible for Revisions V1.1B, V1.1C, V1.1D, V1.1E, V1.1F; IT: V1.1A, V1.1B
  */
 / {
 	model = "Toradex Colibri T30";
Signature · 1 line
2.14.4
#26 lore raw

PATCH v2 26/34 ARM: tegra: colibri_t30: drop module level model and compatible

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Drop model and compatible nodes from the module level device tree as they get overridden by the carrier board device tree anyway.

---

Changes in v2:
- New patch as suggested by Rob.

 arch/arm/boot/dts/tegra30-colibri.dtsi | 3 ---
 1 file changed, 3 deletions(-)
arch/arm/boot/dts/tegra30-colibri.dtsi +0 -3
index 9bd7034b8e66..f4aee43402d1 100644
@@ -6,9 +6,6 @@
  * Compatible for Revisions V1.1B, V1.1C, V1.1D, V1.1E, V1.1F; IT: V1.1A, V1.1B
  */
 / {
-	model = "Toradex Colibri T30";
-	compatible = "toradex,colibri_t30", "nvidia,tegra30";
-
 	memory@80000000 {
 		reg = <0x80000000 0x40000000>;
 	};
Signature · 1 line
2.14.4
#27 lore raw

PATCH v2 27/34 ARM: tegra: colibri_t30: drop obsolete spidev node

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Drop obsolete spidev device tree node as nowadays one should do this by binding the spidev driver to specific instances/chip selects at runtime.

---

Changes in v2:
- New patch.

 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 6 ------
 1 file changed, 6 deletions(-)
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +0 -6
index aca4cd786442..c08e09908578 100644
@@ -88,12 +88,6 @@
 			interrupts = <TEGRA_GPIO(S, 0) IRQ_TYPE_EDGE_RISING>;
 			spi-max-frequency = <10000000>;
 		};
-
-		spidev0: spi@1 {
-			compatible = "spidev";
-			reg = <1>;
-			spi-max-frequency = <25000000>;
-		};
 	};
 
 	/* SD/MMC */
Signature · 1 line
2.14.4
#28 lore raw

PATCH v2 28/34 ARM: tegra: colibri_t30: rename hdmiddc to hdmi_ddc

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Rename hdmiddc to hdmi_ddc to be more in-line with other device trees.

---

Changes in v2:
- New patch.

 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +-
 arch/arm/boot/dts/tegra30-colibri.dtsi        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +1 -1
index c08e09908578..49771ea379ed 100644
@@ -71,7 +71,7 @@
 	};
 
 	/* DDC_CLOCK/DATA on X3 pin 15/16 (e.g. display EDID) */
-	hdmiddc: i2c@7000c700 {
+	i2c@7000c700 {
 		status = "okay";
 	};
 
arch/arm/boot/dts/tegra30-colibri.dtsi +2 -2
index f4aee43402d1..03047d2bba9d 100644
@@ -12,7 +12,7 @@
 
 	host1x@50000000 {
 		hdmi@54280000 {
-			nvidia,ddc-i2c-bus = <&hdmiddc>;
+			nvidia,ddc-i2c-bus = <&hdmi_ddc>;
 			nvidia,hpd-gpio =
 				<&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>;
 			pll-supply = <&reg_1v8_avdd_hdmi_pll>;
@@ -707,7 +707,7 @@
 		compatible = "nvidia,tegra30-hsuart";
 	};
 
-	hdmiddc: i2c@7000c700 {
+	hdmi_ddc: i2c@7000c700 {
 		clock-frequency = <10000>;
 	};
 
Signature · 1 line
2.14.4
#29 lore raw

PATCH v2 29/34 ARM: tegra: colibri_t30: rename tps65911@2d, stmpe811@41 and tps62362@60

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Rename a few nodes using more common names:
- rename tps65911@2d to pmic@2d
- rename stmpe811@41 to touchscreen@41
- rename tps62362@60 to regulator@60

---

Changes in v2:
- New patch as suggested by Rob.

 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +-
 arch/arm/boot/dts/tegra30-colibri.dtsi        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +1 -1
index 49771ea379ed..c63ef3aedb7a 100644
@@ -11,7 +11,7 @@
 
 	aliases {
 		rtc0 = "/i2c@7000c000/rtc@68";
-		rtc1 = "/i2c@7000d000/tps65911@2d";
+		rtc1 = "/i2c@7000d000/pmic@2d";
 		rtc2 = "/rtc@7000e000";
 		serial0 = &uarta;
 		serial1 = &uartb;
arch/arm/boot/dts/tegra30-colibri.dtsi +3 -3
index 03047d2bba9d..e32702a4ab10 100644
@@ -729,7 +729,7 @@
 			clocks = <&tegra_car TEGRA30_CLK_EXTERN1>;
 		};
 
-		pmic: tps65911@2d {
+		pmic: pmic@2d {
 			compatible = "ti,tps65911";
 			reg = <0x2d>;
 
@@ -837,7 +837,7 @@
 		};
 
 		/* STMPE811 touch screen controller */
-		stmpe811@41 {
+		touchscreen@41 {
 			compatible = "st,stmpe811";
 			reg = <0x41>;
 			irq-gpio = <&gpio TEGRA_GPIO(V, 0) IRQ_TYPE_LEVEL_LOW>;
@@ -882,7 +882,7 @@
 		};
 
 		/* SW: +V1.2_VDD_CORE */
-		tps62362@60 {
+		regulator@60 {
 			compatible = "ti,tps62362";
 			reg = <0x60>;
 
Signature · 1 line
2.14.4
#30 lore raw

PATCH v2 30/34 ARM: tegra: colibri_t30: fix mcp2515 can controller interrupt polarity

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Fix the MCP2515 SPI CAN controller interrupt polarity which according to its datasheet defaults to low-active aka falling edge.

---

Changes in v2:
- New patch.

 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +2 -1
index c63ef3aedb7a..ee0a3e5df5b8 100644
@@ -85,7 +85,8 @@
 			reg = <0>;
 			clocks = <&clk16m>;
 			interrupt-parent = <&gpio>;
-			interrupts = <TEGRA_GPIO(S, 0) IRQ_TYPE_EDGE_RISING>;
+			/* CAN_INT */
+			interrupts = <TEGRA_GPIO(S, 0) IRQ_TYPE_EDGE_FALLING>;
 			spi-max-frequency = <10000000>;
 		};
 	};
Signature · 1 line
2.14.4
#31 lore raw

PATCH v2 31/34 ARM: tegra: colibri_t30: remove unused mcp2515 can0 label

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Get rid of the unused MCP2515 SPI CAN controller can0 label.

---

Changes in v2:
- New patch.

 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +1 -1
index ee0a3e5df5b8..618a4b3b6bc8 100644
@@ -80,7 +80,7 @@
 		status = "okay";
 		spi-max-frequency = <25000000>;
 
-		can0: can@0 {
+		can@0 {
 			compatible = "microchip,mcp2515";
 			reg = <0>;
 			clocks = <&clk16m>;
Signature · 1 line
2.14.4
#32 lore raw

PATCH v2 32/34 ARM: tegra: colibri_t30: add mcp2515 vdd and xceiver supplies

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Add the MCP2515 SPI CAN controller's vdd-supply being the regular carrier board's reg_3v3 and xceiver-supply being reg_5v0.

---

Changes in v2: None

 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +2 -0
index 618a4b3b6bc8..9985d0a91f69 100644
@@ -88,6 +88,8 @@
 			/* CAN_INT */
 			interrupts = <TEGRA_GPIO(S, 0) IRQ_TYPE_EDGE_FALLING>;
 			spi-max-frequency = <10000000>;
+			vdd-supply = <&reg_3v3>;
+			xceiver-supply = <&reg_5v0>;
 		};
 	};
 
Signature · 1 line
2.14.4
#33 lore raw

PATCH v2 33/34 ARM: tegra: colibri_t30: annotate unused i2c busses

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Both GEN2_I2C as well as CAM_I2C (I2C3) are unused in our design.

---

Changes in v2: None

 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +4 -0
index 9985d0a91f69..5965150ecdd2 100644
@@ -70,6 +70,10 @@
 		};
 	};
 
+	/* GEN2_I2C: unused */
+
+	/* CAM_I2C (I2C3): unused */
+
 	/* DDC_CLOCK/DATA on X3 pin 15/16 (e.g. display EDID) */
 	i2c@7000c700 {
 		status = "okay";
Signature · 1 line
2.14.4
#34 lore raw

PATCH v2 34/34 ARM: tegra: colibri_t30: annotate power I2C being on-module

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

The power I2C bus aka PWR_I2C which connects to the audio codec, PMIC, temperature sensor and touch screen controller is really on-module only.

---

Changes in v2: None

 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 e32702a4ab10..35af03ca9e90 100644
@@ -713,7 +713,7 @@
 
 	/*
 	 * PWR_I2C: power I2C to audio codec, PMIC, temperature sensor and
-	 * touch screen controller
+	 * touch screen controller (On-module)
 	 */
 	i2c@7000d000 {
 		status = "okay";
Signature · 1 line
2.14.4
#35 lore raw
In reply to Marcel Ziswiler
Quoted 55 lines · Marcel Ziswiler

This series is a major overhaul for the Toradex Colibri T30 system on module.

Changes in v2:
- Also move serial UART "nvidia,tegra30-hsuart" compatible to module level device trees.
- Also replace underscores in node names with dashes.
- Also replace underscores in UART annotations with dashes.
- When running some more tests I realized that the reg-addr should really be 0x3f. Fix this.
- Get rid of fake clocks simple bus as suggested by Rob.
- Drop "[PATCH 01/26] ARM: tegra: colibri_t30: enable broken-hpi on emmc" which should already be handled by the broken-hpi quirk as pointed out by Dmitry. If I would find more eMMC parts which exhibit the issue I will add them to the quirk as a separate patch.
- New patch as suggested by Rob.
- New patch.

Marcel Ziswiler (34):
ARM: tegra: colibri_t30: add local-mac-address property
ARM: tegra: colibri_t30: reorder host1x/hdmi properties
ARM: tegra: colibri_t30: regulator clean-up
ARM: tegra: colibri_t30: add missing regulators
ARM: tegra: colibri_t30: annotate uarts and move compatible to board
ARM: tegra: colibri_t30: white-space clean-up
ARM: tegra: colibri_t30: move dr_mode property from phy to controller
ARM: tegra: colibri_t30: reorder backlight properties
ARM: tegra: colibri_t30: drop pwmleds
ARM: tegra: colibri_t30: pinmux clean-up
ARM: tegra: colibri_t30: add missing pinmux
ARM: tegra: colibri_t30: use proper irq-gpio for stmpe811
ARM: tegra: colibri_t30: further lm95245 temperature sensor annotation
ARM: tegra: colibri_t30: add i2c-thermtrip
ARM: tegra: colibri_t30: add proper emmc vmmc and vqmmc supplies
ARM: tegra: colibri_t30: enable emmc ddr52 mode
ARM: tegra: colibri_t30: get rid of fake clocks simple bus
ARM: tegra: colibri_t30: line break long compatible property line
ARM: tegra: colibri_t30: move input include to carrier board
ARM: tegra: colibri_t30: remove unused nvidia,is-wired property
ARM: tegra: colibri_t30: add gpio hog to unreset usb ethernet chip
ARM: tegra: colibri_t30: enable hda over hdmi
ARM: tegra: colibri_t30: annotate sd card detect
ARM: tegra: colibri_t30: annotate ehci instance 1
ARM: tegra: colibri_t30: update compatibility comment
ARM: tegra: colibri_t30: drop module level model and compatible
ARM: tegra: colibri_t30: drop obsolete spidev node
ARM: tegra: colibri_t30: rename hdmiddc to hdmi_ddc
ARM: tegra: colibri_t30: rename tps65911@2d, stmpe811@41 and

    tps62362@60

ARM: tegra: colibri_t30: fix mcp2515 can controller interrupt polarity
ARM: tegra: colibri_t30: remove unused mcp2515 can0 label
ARM: tegra: colibri_t30: add mcp2515 vdd and xceiver supplies
ARM: tegra: colibri_t30: annotate unused i2c busses
ARM: tegra: colibri_t30: annotate power I2C being on-module

Quoted 3 lines
 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 130 ++---
 arch/arm/boot/dts/tegra30-colibri.dtsi        | 780 +++++++++++++++++++++-----
 2 files changed, 706 insertions(+), 204 deletions(-)

Applied, thanks.

Thierry