Skip to contentSkip to conversation

ARM: dts: tegra: apalis-tk1: minor revamp

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

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

v2 cover ARM: dts: tegra: apalis-tk1: minor revamp

This series is a minor overhaul for the Toradex Apalis TK1 system on module.

Changes in v2:
- Add Rob's reviewed-by.
- New patch as suggested by Rob.
- New patch.
- Get rid of fake clocks simple bus as suggested by Rob.
- Change cover-letter subject to indicate minor revamp.
- Drop "[PATCH 02/15] ARM: tegra: apalis-tk1: reorder pcie properties" as requested by Stefan.
- Drop "[PATCH 13/15] ARM: tegra: apalis-tk1: fix pcie switch vendor compatible" in favour of the new "[PATCH v2 26/34] dt-bindings: add broadcom (formerly plx technology) vendor prefix" posted earlier as part of the apalis_t30 revamp v2 as suggested by Stefan.

Marcel Ziswiler (19):
ARM: tegra: apalis-tk1: add local-mac-address property
ARM: tegra: apalis-tk1: reorder host1x/hdmi properties
ARM: tegra: apalis-tk1: reorder padctl properties
ARM: tegra: apalis-tk1: regulator clean-up
ARM: tegra: apalis-tk1: add missing regulators
ARM: tegra: apalis-tk1: drop unused pinmux label
ARM: tegra: apalis-tk1: white-space clean-up
ARM: tegra: apalis-tk1: reorder backlight properties
ARM: tegra: apalis-tk1: add proper emmc vmmc and vqmmc supplies
ARM: tegra: apalis-tk1: enable emmc ddr52 mode
ARM: tegra: apalis-tk1: add toradex,apalis-tk1-v1.2 compatible
ARM: tegra: apalis-tk1: reorder cpu dfll clock properties
ARM: tegra: apalis-tk1: reorder SD card properties
ARM: tegra: apalis-tk1: drop module level model and compatible
ARM: tegra: apalis-tk1: drop obsolete spidev nodes
ARM: tegra: apalis-tk1: replace underscores in node names with dashes
ARM: tegra: apalis-tk1: get rid of fake clocks simple bus
ARM: tegra: apalis-tk1: shorten temperature-sensor node
ARM: tegra: apalis-tk1: drop unused hdmi_ddc label

 Documentation/devicetree/bindings/arm/tegra.txt |   2 +
 arch/arm/boot/dts/tegra124-apalis-eval.dts      |  40 ++-
 arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts |  43 ++-
 arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi     | 452 ++++++++++++------------
 arch/arm/boot/dts/tegra124-apalis.dtsi          | 451 +++++++++++------------
 5 files changed, 508 insertions(+), 480 deletions(-)
Signature · 1 line
2.14.4
#1 lore raw

PATCH v2 1/19 ARM: tegra: apalis-tk1: 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/tegra124-apalis-v1.2.dtsi | 5 +++++
 arch/arm/boot/dts/tegra124-apalis.dtsi      | 5 +++++
 2 files changed, 10 insertions(+)
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi +5 -0
index 573aaa50fff1..09e3641258ae 100644
@@ -42,6 +42,11 @@
 			phys = <&{/padctl@7009f000/pads/pcie/lanes/pcie-2}>;
 			phy-names = "pcie-0";
 			status = "okay";
+
+			pcie@0 {
+				reg = <0 0 0 0 0>;
+				local-mac-address = [00 00 00 00 00 00];
+			};
 		};
 	};
 
arch/arm/boot/dts/tegra124-apalis.dtsi +5 -0
index 0f0d4a4988b9..5e7ae5e92fb8 100644
@@ -77,6 +77,11 @@
 			phys = <&{/padctl@7009f000/pads/pcie/lanes/pcie-2}>;
 			phy-names = "pcie-0";
 			status = "okay";
+
+			pcie@0 {
+				reg = <0 0 0 0 0>;
+				local-mac-address = [00 00 00 00 00 00];
+			};
 		};
 	};
 
Signature · 1 line
2.14.4
#2 lore raw

PATCH v2 2/19 ARM: tegra: apalis-tk1: 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/tegra124-apalis-v1.2.dtsi | 4 ++--
 arch/arm/boot/dts/tegra124-apalis.dtsi      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi +2 -2
index 09e3641258ae..86768ba28d67 100644
@@ -52,11 +52,11 @@
 
 	host1x@50000000 {
 		hdmi@54280000 {
-			pll-supply = <&reg_1v05_avdd_hdmi_pll>;
-			vdd-supply = <&reg_3v3_avdd_hdmi>;
 			nvidia,ddc-i2c-bus = <&hdmi_ddc>;
 			nvidia,hpd-gpio =
 				<&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>;
+			pll-supply = <&reg_1v05_avdd_hdmi_pll>;
+			vdd-supply = <&reg_3v3_avdd_hdmi>;
 		};
 	};
 
arch/arm/boot/dts/tegra124-apalis.dtsi +2 -2
index 5e7ae5e92fb8..2c291d210677 100644
@@ -87,11 +87,11 @@
 
 	host1x@50000000 {
 		hdmi@54280000 {
-			pll-supply = <&reg_1v05_avdd_hdmi_pll>;
-			vdd-supply = <&reg_3v3_avdd_hdmi>;
 			nvidia,ddc-i2c-bus = <&hdmi_ddc>;
 			nvidia,hpd-gpio =
 				<&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>;
+			pll-supply = <&reg_1v05_avdd_hdmi_pll>;
+			vdd-supply = <&reg_3v3_avdd_hdmi>;
 		};
 	};
 
Signature · 1 line
2.14.4
#3 lore raw

PATCH v2 3/19 ARM: tegra: apalis-tk1: reorder padctl properties

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Reorder padctl properties.

---

Changes in v2: None

 arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 22 +++++++++++-----------
 arch/arm/boot/dts/tegra124-apalis.dtsi      | 22 +++++++++++-----------
 2 files changed, 22 insertions(+), 22 deletions(-)
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi +11 -11
index 86768ba28d67..f6459588d845 100644
@@ -1815,18 +1815,18 @@
 
 				lanes {
 					usb2-0 {
-						nvidia,function = "xusb";
 						status = "okay";
+						nvidia,function = "xusb";
 					};
 
 					usb2-1 {
-						nvidia,function = "xusb";
 						status = "okay";
+						nvidia,function = "xusb";
 					};
 
 					usb2-2 {
-						nvidia,function = "xusb";
 						status = "okay";
+						nvidia,function = "xusb";
 					};
 				};
 			};
@@ -1836,28 +1836,28 @@
 
 				lanes {
 					pcie-0 {
-						nvidia,function = "usb3-ss";
 						status = "okay";
+						nvidia,function = "usb3-ss";
 					};
 
 					pcie-1 {
-						nvidia,function = "usb3-ss";
 						status = "okay";
+						nvidia,function = "usb3-ss";
 					};
 
 					pcie-2 {
-						nvidia,function = "pcie";
 						status = "okay";
+						nvidia,function = "pcie";
 					};
 
 					pcie-3 {
-						nvidia,function = "pcie";
 						status = "okay";
+						nvidia,function = "pcie";
 					};
 
 					pcie-4 {
-						nvidia,function = "pcie";
 						status = "okay";
+						nvidia,function = "pcie";
 					};
 				};
 			};
@@ -1867,8 +1867,8 @@
 
 				lanes {
 					sata-0 {
-						nvidia,function = "sata";
 						status = "okay";
+						nvidia,function = "sata";
 					};
 				};
 			};
@@ -1900,13 +1900,13 @@
 			};
 
 			usb3-0 {
-				nvidia,usb2-companion = <2>;
 				status = "okay";
+				nvidia,usb2-companion = <2>;
 			};
 
 			usb3-1 {
-				nvidia,usb2-companion = <0>;
 				status = "okay";
+				nvidia,usb2-companion = <0>;
 			};
 		};
 	};
arch/arm/boot/dts/tegra124-apalis.dtsi +11 -11
index 2c291d210677..8919213d8312 100644
@@ -1844,18 +1844,18 @@
 
 				lanes {
 					usb2-0 {
-						nvidia,function = "xusb";
 						status = "okay";
+						nvidia,function = "xusb";
 					};
 
 					usb2-1 {
-						nvidia,function = "xusb";
 						status = "okay";
+						nvidia,function = "xusb";
 					};
 
 					usb2-2 {
-						nvidia,function = "xusb";
 						status = "okay";
+						nvidia,function = "xusb";
 					};
 				};
 			};
@@ -1865,28 +1865,28 @@
 
 				lanes {
 					pcie-0 {
-						nvidia,function = "usb3-ss";
 						status = "okay";
+						nvidia,function = "usb3-ss";
 					};
 
 					pcie-1 {
-						nvidia,function = "usb3-ss";
 						status = "okay";
+						nvidia,function = "usb3-ss";
 					};
 
 					pcie-2 {
-						nvidia,function = "pcie";
 						status = "okay";
+						nvidia,function = "pcie";
 					};
 
 					pcie-3 {
-						nvidia,function = "pcie";
 						status = "okay";
+						nvidia,function = "pcie";
 					};
 
 					pcie-4 {
-						nvidia,function = "pcie";
 						status = "okay";
+						nvidia,function = "pcie";
 					};
 				};
 			};
@@ -1896,8 +1896,8 @@
 
 				lanes {
 					sata-0 {
-						nvidia,function = "sata";
 						status = "okay";
+						nvidia,function = "sata";
 					};
 				};
 			};
@@ -1929,13 +1929,13 @@
 			};
 
 			usb3-0 {
-				nvidia,usb2-companion = <2>;
 				status = "okay";
+				nvidia,usb2-companion = <2>;
 			};
 
 			usb3-1 {
-				nvidia,usb2-companion = <0>;
 				status = "okay";
+				nvidia,usb2-companion = <0>;
 			};
 		};
 	};
Signature · 1 line
2.14.4
#4 lore raw

PATCH v2 4/19 ARM: tegra: apalis-tk1: 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/tegra124-apalis-v1.2.dtsi | 100 ++++++++++++++--------------
 arch/arm/boot/dts/tegra124-apalis.dtsi      | 100 ++++++++++++++--------------
 2 files changed, 100 insertions(+), 100 deletions(-)
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi +50 -50
index f6459588d845..13aa8c797d42 100644
@@ -21,13 +21,13 @@
 
 	pcie@1003000 {
 		status = "okay";
-		avddio-pex-supply = <&vdd_1v05>;
-		avdd-pex-pll-supply = <&vdd_1v05>;
-		avdd-pll-erefe-supply = <&avdd_1v05>;
-		dvddio-pex-supply = <&vdd_1v05>;
-		hvdd-pex-pll-e-supply = <&reg_3v3>;
-		hvdd-pex-supply = <&reg_3v3>;
-		vddio-pex-ctl-supply = <&reg_3v3>;
+		avddio-pex-supply = <&reg_1v05_vdd>;
+		avdd-pex-pll-supply = <&reg_1v05_vdd>;
+		avdd-pll-erefe-supply = <&reg_1v05_avdd>;
+		dvddio-pex-supply = <&reg_1v05_vdd>;
+		hvdd-pex-pll-e-supply = <&reg_module_3v3>;
+		hvdd-pex-supply = <&reg_module_3v3>;
+		vddio-pex-ctl-supply = <&reg_module_3v3>;
 
 		/* Apalis PCIe (additional lane Apalis type specific) */
 		pci@1,0 {
@@ -65,7 +65,7 @@
 		 * Node left disabled on purpose - the bootloader will enable
 		 * it after having set the VPR up
 		 */
-		vdd-supply = <&vdd_gpu>;
+		vdd-supply = <&reg_vdd_gpu>;
 	};
 
 	pinmux: pinmux@70000868 {
@@ -1565,8 +1565,8 @@
 		sgtl5000: codec@a {
 			compatible = "fsl,sgtl5000";
 			reg = <0x0a>;
-			VDDA-supply = <&reg_3v3>;
-			VDDIO-supply = <&vddio_1v8>;
+			VDDA-supply = <&reg_module_3v3>;
+			VDDIO-supply = <&reg_1v8_vddio>;
 			clocks = <&tegra_car TEGRA124_CLK_EXTERN1>;
 		};
 
@@ -1598,18 +1598,18 @@
 			};
 
 			regulators {
-				vsup-sd2-supply = <&reg_3v3>;
-				vsup-sd3-supply = <&reg_3v3>;
-				vsup-sd4-supply = <&reg_3v3>;
-				vsup-sd5-supply = <&reg_3v3>;
-				vin-ldo0-supply = <&vddio_ddr_1v35>;
-				vin-ldo1-6-supply = <&reg_3v3>;
-				vin-ldo2-5-7-supply = <&vddio_1v8>;
-				vin-ldo3-4-supply = <&reg_3v3>;
-				vin-ldo9-10-supply = <&reg_3v3>;
-				vin-ldo11-supply = <&reg_3v3>;
-
-				vdd_cpu: sd0 {
+				vsup-sd2-supply = <&reg_module_3v3>;
+				vsup-sd3-supply = <&reg_module_3v3>;
+				vsup-sd4-supply = <&reg_module_3v3>;
+				vsup-sd5-supply = <&reg_module_3v3>;
+				vin-ldo0-supply = <&reg_1v35_vddio_ddr>;
+				vin-ldo1-6-supply = <&reg_module_3v3>;
+				vin-ldo2-5-7-supply = <&reg_1v8_vddio>;
+				vin-ldo3-4-supply = <&reg_module_3v3>;
+				vin-ldo9-10-supply = <&reg_module_3v3>;
+				vin-ldo11-supply = <&reg_module_3v3>;
+
+				reg_vdd_cpu: sd0 {
 					regulator-name = "+VDD_CPU_AP";
 					regulator-min-microvolt = <700000>;
 					regulator-max-microvolt = <1400000>;
@@ -1631,7 +1631,7 @@
 					ams,ext-control = <1>;
 				};
 
-				vddio_ddr_1v35: sd2 {
+				reg_1v35_vddio_ddr: sd2 {
 					regulator-name =
 						"+V1.35_VDDIO_DDR(sd2)";
 					regulator-min-microvolt = <1350000>;
@@ -1649,13 +1649,13 @@
 					regulator-boot-on;
 				};
 
-				vdd_1v05: sd4 {
+				reg_1v05_vdd: sd4 {
 					regulator-name = "+V1.05";
 					regulator-min-microvolt = <1050000>;
 					regulator-max-microvolt = <1050000>;
 				};
 
-				vddio_1v8: sd5 {
+				reg_1v8_vddio: sd5 {
 					regulator-name = "+V1.8";
 					regulator-min-microvolt = <1800000>;
 					regulator-max-microvolt = <1800000>;
@@ -1663,7 +1663,7 @@
 					regulator-always-on;
 				};
 
-				vdd_gpu: sd6 {
+				reg_vdd_gpu: sd6 {
 					regulator-name = "+VDD_GPU_AP";
 					regulator-min-microvolt = <650000>;
 					regulator-max-microvolt = <1200000>;
@@ -1673,7 +1673,7 @@
 					regulator-always-on;
 				};
 
-				avdd_1v05: ldo0 {
+				reg_1v05_avdd: ldo0 {
 					regulator-name = "+V1.05_AVDD";
 					regulator-min-microvolt = <1050000>;
 					regulator-max-microvolt = <1050000>;
@@ -1785,9 +1785,9 @@
 	sata@70020000 {
 		phys = <&{/padctl@7009f000/pads/sata/lanes/sata-0}>;
 		phy-names = "sata-0";
-		avdd-supply = <&vdd_1v05>;
-		hvdd-supply = <&reg_3v3>;
-		vddio-supply = <&vdd_1v05>;
+		avdd-supply = <&reg_1v05_vdd>;
+		hvdd-supply = <&reg_module_3v3>;
+		vddio-supply = <&reg_1v05_vdd>;
 	};
 
 	usb@70090000 {
@@ -1798,14 +1798,14 @@
 		       <&{/padctl@7009f000/pads/usb2/lanes/usb2-2}>,
 		       <&{/padctl@7009f000/pads/pcie/lanes/pcie-0}>;
 		phy-names = "usb2-0", "usb3-1", "usb2-1", "usb2-2", "usb3-0";
-		avddio-pex-supply = <&vdd_1v05>;
-		avdd-pll-erefe-supply = <&avdd_1v05>;
-		avdd-pll-utmip-supply = <&vddio_1v8>;
-		avdd-usb-ss-pll-supply = <&vdd_1v05>;
-		avdd-usb-supply = <&reg_3v3>;
-		dvddio-pex-supply = <&vdd_1v05>;
-		hvdd-usb-ss-pll-e-supply = <&reg_3v3>;
-		hvdd-usb-ss-supply = <&reg_3v3>;
+		avddio-pex-supply = <&reg_1v05_vdd>;
+		avdd-pll-erefe-supply = <&reg_1v05_avdd>;
+		avdd-pll-utmip-supply = <&reg_1v8_vddio>;
+		avdd-usb-ss-pll-supply = <&reg_1v05_vdd>;
+		avdd-usb-supply = <&reg_module_3v3>;
+		dvddio-pex-supply = <&reg_1v05_vdd>;
+		hvdd-usb-ss-pll-e-supply = <&reg_module_3v3>;
+		hvdd-usb-ss-supply = <&reg_module_3v3>;
 	};
 
 	padctl@7009f000 {
@@ -1921,7 +1921,7 @@
 	/* CPU DFLL clock */
 	clock@70110000 {
 		status = "okay";
-		vdd-cpu-supply = <&vdd_cpu>;
+		vdd-cpu-supply = <&reg_vdd_cpu>;
 		nvidia,i2c-fs-rate = <400000>;
 	};
 
@@ -1946,7 +1946,7 @@
 
 	cpus {
 		cpu@0 {
-			vdd-cpu-supply = <&vdd_cpu>;
+			vdd-cpu-supply = <&reg_vdd_cpu>;
 		};
 	};
 
@@ -1956,7 +1956,7 @@
 		regulator-min-microvolt = <1050000>;
 		regulator-max-microvolt = <1050000>;
 		gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
-		vin-supply = <&vdd_1v05>;
+		vin-supply = <&reg_1v05_vdd>;
 	};
 
 	reg_3v3_mxm: regulator-3v3-mxm {
@@ -1968,7 +1968,15 @@
 		regulator-boot-on;
 	};
 
-	reg_3v3: regulator-3v3 {
+	reg_3v3_avdd_hdmi: regulator-3v3-avdd-hdmi {
+		compatible = "regulator-fixed";
+		regulator-name = "+V3.3_AVDD_HDMI";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&reg_1v05_vdd>;
+	};
+
+	reg_module_3v3: regulator-module-3v3 {
 		compatible = "regulator-fixed";
 		regulator-name = "+V3.3";
 		regulator-min-microvolt = <3300000>;
@@ -1981,14 +1989,6 @@
 		vin-supply = <&reg_3v3_mxm>;
 	};
 
-	reg_3v3_avdd_hdmi: regulator-3v3-avdd-hdmi {
-		compatible = "regulator-fixed";
-		regulator-name = "+V3.3_AVDD_HDMI";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		vin-supply = <&vdd_1v05>;
-	};
-
 	sound {
 		compatible = "toradex,tegra-audio-sgtl5000-apalis_tk1",
 			     "nvidia,tegra-audio-sgtl5000";
arch/arm/boot/dts/tegra124-apalis.dtsi +50 -50

195 lines not on this page · raw message

Signature · 1 line
2.14.4
#5 lore raw

PATCH v2 5/19 ARM: tegra: apalis-tk1: 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
- TMP451 temperature sensor vcc supply being reg_module_3v3
- usb3-0 vbus supply being reg_usbh_vbus
- usb3-1 vbus supply being reg_usbo1_vbus
- carrier board HDMI supply being reg_5v0
- carrier board sata target 5v supply being reg_5v0
- carrier board sata target 12v supply being reg_12v0
- carrier board reg_3v3 actually being backlight power supply

---

Changes in v2: None

 arch/arm/boot/dts/tegra124-apalis-eval.dts      | 18 ++++++++++++++++++
 arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 18 ++++++++++++++++++
 arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi     | 14 +++++++++++++-
 arch/arm/boot/dts/tegra124-apalis.dtsi          | 14 +++++++++++++-
 4 files changed, 62 insertions(+), 2 deletions(-)
arch/arm/boot/dts/tegra124-apalis-eval.dts +18 -0
index a6ad759dddb4..c2e918d345de 100644
@@ -72,6 +72,7 @@
 	host1x@50000000 {
 		hdmi@54280000 {
 			status = "okay";
+			hdmi-supply = <&reg_5v0>;
 		};
 	};
 
@@ -164,6 +165,8 @@
 	/* Apalis Serial ATA */
 	sata@70020000 {
 		status = "okay";
+		target-5v-supply = <&reg_5v0>;
+		target-12v-supply = <&reg_12v0>;
 	};
 
 	hda@70030000 {
@@ -230,6 +233,7 @@
 		default-brightness-level = <6>;
 		/* BKL1_ON */
 		enable-gpios = <&gpio TEGRA_GPIO(BB, 5) GPIO_ACTIVE_HIGH>;
+		power-supply = <&reg_3v3>;
 	};
 
 	gpio-keys {
@@ -244,6 +248,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";
@@ -251,6 +262,13 @@
 		regulator-max-microvolt = <5000000>;
 	};
 
+	reg_12v0: regulator-12v0 {
+		compatible = "regulator-fixed";
+		regulator-name = "12V_SW";
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
+	};
+
 	/* USBO1_EN */
 	reg_usbo1_vbus: regulator-usbo1-vbus {
 		compatible = "regulator-fixed";
arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts +18 -0
index 8a8d5fa0ecd1..eebcc013771e 100644
@@ -36,6 +36,7 @@
 	host1x@50000000 {
 		hdmi@54280000 {
 			status = "okay";
+			hdmi-supply = <&reg_5v0>;
 		};
 	};
 
@@ -129,6 +130,8 @@
 	/* Apalis Serial ATA */
 	sata@70020000 {
 		status = "okay";
+		target-5v-supply = <&reg_5v0>;
+		target-12v-supply = <&reg_12v0>;
 	};
 
 	hda@70030000 {
@@ -195,6 +198,7 @@
 		default-brightness-level = <6>;
 		/* BKL1_ON */
 		enable-gpios = <&gpio TEGRA_GPIO(BB, 5) GPIO_ACTIVE_HIGH>;
+		power-supply = <&reg_3v3>;
 	};
 
 	gpio-keys {
@@ -209,6 +213,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";
@@ -216,6 +227,13 @@
 		regulator-max-microvolt = <5000000>;
 	};
 
+	reg_12v0: regulator-12v0 {
+		compatible = "regulator-fixed";
+		regulator-name = "12V_SW";
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
+	};
+
 	/* USBO1_EN */
 	reg_usbo1_vbus: regulator-usbo1-vbus {
 		compatible = "regulator-fixed";
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi +13 -1
index 13aa8c797d42..00d5308c993f 100644
@@ -1565,7 +1565,8 @@
 		sgtl5000: codec@a {
 			compatible = "fsl,sgtl5000";
 			reg = <0x0a>;
-			VDDA-supply = <&reg_module_3v3>;
+			VDDA-supply = <&reg_module_3v3_audio>;
+			VDDD-supply = <&reg_1v8_vddio>;
 			VDDIO-supply = <&reg_1v8_vddio>;
 			clocks = <&tegra_car TEGRA124_CLK_EXTERN1>;
 		};
@@ -1754,6 +1755,7 @@
 			interrupt-parent = <&gpio>;
 			interrupts = <TEGRA_GPIO(I, 6) IRQ_TYPE_LEVEL_LOW>;
 			#thermal-sensor-cells = <1>;
+			vcc-supply = <&reg_module_3v3>;
 		};
 	};
 
@@ -1902,11 +1904,13 @@
 			usb3-0 {
 				status = "okay";
 				nvidia,usb2-companion = <2>;
+				vbus-supply = <&reg_usbh_vbus>;
 			};
 
 			usb3-1 {
 				status = "okay";
 				nvidia,usb2-companion = <0>;
+				vbus-supply = <&reg_usbo1_vbus>;
 			};
 		};
 	};
@@ -1989,6 +1993,14 @@
 		vin-supply = <&reg_3v3_mxm>;
 	};
 
+	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-apalis_tk1",
 			     "nvidia,tegra-audio-sgtl5000";
arch/arm/boot/dts/tegra124-apalis.dtsi +13 -1
index 40c6ca2d1385..65a88d314fd2 100644
@@ -1594,7 +1594,8 @@
 		sgtl5000: codec@a {
 			compatible = "fsl,sgtl5000";
 			reg = <0x0a>;
-			VDDA-supply = <&reg_module_3v3>;
+			VDDA-supply = <&reg_module_3v3_audio>;
+			VDDD-supply = <&reg_1v8_vddio>;
 			VDDIO-supply = <&reg_1v8_vddio>;
 			clocks = <&tegra_car TEGRA124_CLK_EXTERN1>;
 		};
@@ -1783,6 +1784,7 @@
 			interrupt-parent = <&gpio>;
 			interrupts = <TEGRA_GPIO(I, 6) IRQ_TYPE_LEVEL_LOW>;
 			#thermal-sensor-cells = <1>;
+			vcc-supply = <&reg_module_3v3>;
 		};
 	};
 
@@ -1931,11 +1933,13 @@
 			usb3-0 {
 				status = "okay";
 				nvidia,usb2-companion = <2>;
+				vbus-supply = <&reg_usbh_vbus>;
 			};
 
 			usb3-1 {
 				status = "okay";
 				nvidia,usb2-companion = <0>;
+				vbus-supply = <&reg_usbo1_vbus>;
 			};
 		};
 	};
@@ -2018,6 +2022,14 @@
 		vin-supply = <&reg_3v3_mxm>;
 	};
 
+	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-apalis_tk1",
 			     "nvidia,tegra-audio-sgtl5000";
Signature · 1 line
2.14.4
#6 lore raw

PATCH v2 6/19 ARM: tegra: apalis-tk1: drop unused pinmux label

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Drop unused pinmux label.

---

Changes in v2: None

 arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 2 +-
 arch/arm/boot/dts/tegra124-apalis.dtsi      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi +1 -1
index 00d5308c993f..aaedc83a11bc 100644
@@ -68,7 +68,7 @@
 		vdd-supply = <&reg_vdd_gpu>;
 	};
 
-	pinmux: pinmux@70000868 {
+	pinmux@70000868 {
 		pinctrl-names = "default";
 		pinctrl-0 = <&state_default>;
 
arch/arm/boot/dts/tegra124-apalis.dtsi +1 -1
index 65a88d314fd2..208411692bdc 100644
@@ -103,7 +103,7 @@
 		vdd-supply = <&reg_vdd_gpu>;
 	};
 
-	pinmux: pinmux@70000868 {
+	pinmux@70000868 {
 		pinctrl-names = "default";
 		pinctrl-0 = <&state_default>;
 
Signature · 1 line
2.14.4
#7 lore raw

PATCH v2 7/19 ARM: tegra: apalis-tk1: 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/tegra124-apalis-v1.2.dtsi | 3 ---
 arch/arm/boot/dts/tegra124-apalis.dtsi      | 3 ---
 2 files changed, 6 deletions(-)
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi +0 -3
index aaedc83a11bc..14114bc43e38 100644
@@ -1881,7 +1881,6 @@
 			usb2-0 {
 				status = "okay";
 				mode = "otg";
-
 				vbus-supply = <&reg_usbo1_vbus>;
 			};
 
@@ -1889,7 +1888,6 @@
 			usb2-1 {
 				status = "okay";
 				mode = "host";
-
 				vbus-supply = <&reg_usbh_vbus>;
 			};
 
@@ -1897,7 +1895,6 @@
 			usb2-2 {
 				status = "okay";
 				mode = "host";
-
 				vbus-supply = <&reg_usbh_vbus>;
 			};
 
arch/arm/boot/dts/tegra124-apalis.dtsi +0 -3
index 208411692bdc..955adebc9e90 100644
@@ -1910,7 +1910,6 @@
 			usb2-0 {
 				status = "okay";
 				mode = "otg";
-
 				vbus-supply = <&reg_usbo1_vbus>;
 			};
 
@@ -1918,7 +1917,6 @@
 			usb2-1 {
 				status = "okay";
 				mode = "host";
-
 				vbus-supply = <&reg_usbh_vbus>;
 			};
 
@@ -1926,7 +1924,6 @@
 			usb2-2 {
 				status = "okay";
 				mode = "host";
-
 				vbus-supply = <&reg_usbh_vbus>;
 			};
 
Signature · 1 line
2.14.4
#8 lore raw

PATCH v2 8/19 ARM: tegra: apalis-tk1: reorder backlight properties

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Reorder backlight properties.

---

Changes in v2: None

 arch/arm/boot/dts/tegra124-apalis-eval.dts      | 2 +-
 arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/tegra124-apalis-eval.dts +1 -1
index c2e918d345de..d9805fc97f5e 100644
@@ -228,12 +228,12 @@
 
 	backlight: backlight {
 		compatible = "pwm-backlight";
-		pwms = <&pwm 3 5000000>; /* BKL1_PWM */
 		brightness-levels = <255 231 223 207 191 159 127 0>;
 		default-brightness-level = <6>;
 		/* BKL1_ON */
 		enable-gpios = <&gpio TEGRA_GPIO(BB, 5) GPIO_ACTIVE_HIGH>;
 		power-supply = <&reg_3v3>;
+		pwms = <&pwm 3 5000000>; /* BKL1_PWM */
 	};
 
 	gpio-keys {
arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts +1 -1
index eebcc013771e..aafaf2c3e195 100644
@@ -193,12 +193,12 @@
 
 	backlight: backlight {
 		compatible = "pwm-backlight";
-		pwms = <&pwm 3 5000000>; /* BKL1_PWM */
 		brightness-levels = <255 231 223 207 191 159 127 0>;
 		default-brightness-level = <6>;
 		/* BKL1_ON */
 		enable-gpios = <&gpio TEGRA_GPIO(BB, 5) GPIO_ACTIVE_HIGH>;
 		power-supply = <&reg_3v3>;
+		pwms = <&pwm 3 5000000>; /* BKL1_PWM */
 	};
 
 	gpio-keys {
Signature · 1 line
2.14.4
#9 lore raw

PATCH v2 9/19 ARM: tegra: apalis-tk1: 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/tegra124-apalis-v1.2.dtsi | 2 ++
 arch/arm/boot/dts/tegra124-apalis.dtsi      | 2 ++
 2 files changed, 4 insertions(+)
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi +2 -0
index 14114bc43e38..3408317c0f00 100644
@@ -1917,6 +1917,8 @@
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
+		vmmc-supply = <&reg_module_3v3>; /* VCC */
+		vqmmc-supply = <&reg_1v8_vddio>; /* VCCQ */
 	};
 
 	/* CPU DFLL clock */
arch/arm/boot/dts/tegra124-apalis.dtsi +2 -0
index 955adebc9e90..ba6fc2e51b2d 100644
@@ -1946,6 +1946,8 @@
 		status = "okay";
 		bus-width = <8>;
 		non-removable;
+		vmmc-supply = <&reg_module_3v3>; /* VCC */
+		vqmmc-supply = <&reg_1v8_vddio>; /* VCCQ */
 	};
 
 	/* CPU DFLL clock */
Signature · 1 line
2.14.4
#10 lore raw

PATCH v2 10/19 ARM: tegra: apalis-tk1: 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@apalis-tk1-mainline:~# cat /sys/kernel/debug/mmc2/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@apalis-tk1-mainline:~# hdparm -t /dev/mmcblk2

/dev/mmcblk2:
Timing buffered disk reads: 256 MB in 3.02 seconds = 84.83 MB/sec

---

Changes in v2: None

 arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 1 +
 arch/arm/boot/dts/tegra124-apalis.dtsi      | 1 +
 2 files changed, 2 insertions(+)
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi +1 -0
index 3408317c0f00..37e443e21ce6 100644
@@ -1919,6 +1919,7 @@
 		non-removable;
 		vmmc-supply = <&reg_module_3v3>; /* VCC */
 		vqmmc-supply = <&reg_1v8_vddio>; /* VCCQ */
+		mmc-ddr-1_8v;
 	};
 
 	/* CPU DFLL clock */
arch/arm/boot/dts/tegra124-apalis.dtsi +1 -0
index ba6fc2e51b2d..f76580f6cc80 100644
@@ -1948,6 +1948,7 @@
 		non-removable;
 		vmmc-supply = <&reg_module_3v3>; /* VCC */
 		vqmmc-supply = <&reg_1v8_vddio>; /* VCCQ */
+		mmc-ddr-1_8v;
 	};
 
 	/* CPU DFLL clock */
Signature · 1 line
2.14.4
#11 lore raw

PATCH v2 11/19 ARM: tegra: apalis-tk1: add toradex,apalis-tk1-v1.2 compatible

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Add toradex,apalis-tk1-v1.2 compatible.

---

Changes in v2:
- Add Rob's reviewed-by.

 Documentation/devicetree/bindings/arm/tegra.txt | 2 ++
 arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/arm/tegra.txt +2 -0
index 1073a5e66122..1c90cb32da19 100644
@@ -51,6 +51,8 @@ board-specific compatible values:
   toradex,apalis_t30-v1.1-eval
   toradex,apalis-tk1
   toradex,apalis-tk1-eval
+  toradex,apalis-tk1-v1.2
+  toradex,apalis-tk1-v1.2-eval
   toradex,colibri_t20-512
   toradex,colibri_t30
   toradex,colibri_t30-eval-v3
arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts +2 -1
index aafaf2c3e195..89783fe76f65 100644
@@ -11,7 +11,8 @@
 / {
 	model = "Toradex Apalis TK1 on Apalis Evaluation Board";
 	compatible = "toradex,apalis-tk1-v1.2-eval", "toradex,apalis-tk1-eval",
-		     "toradex,apalis-tk1", "nvidia,tegra124";
+		     "toradex,apalis-tk1-v1.2", "toradex,apalis-tk1",
+		     "nvidia,tegra124";
 
 	aliases {
 		rtc0 = "/i2c@7000c000/rtc@68";
Signature · 1 line
2.14.4
#12 lore raw

PATCH v2 12/19 ARM: tegra: apalis-tk1: reorder cpu dfll clock properties

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Reorder CPU DFLL clock properties.

---

Changes in v2: None

 arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 2 +-
 arch/arm/boot/dts/tegra124-apalis.dtsi      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi +1 -1
index 37e443e21ce6..07dd208296d3 100644
@@ -1925,8 +1925,8 @@
 	/* CPU DFLL clock */
 	clock@70110000 {
 		status = "okay";
-		vdd-cpu-supply = <&reg_vdd_cpu>;
 		nvidia,i2c-fs-rate = <400000>;
+		vdd-cpu-supply = <&reg_vdd_cpu>;
 	};
 
 	ahub@70300000 {
arch/arm/boot/dts/tegra124-apalis.dtsi +1 -1
index f76580f6cc80..fe10c5180768 100644
@@ -1954,8 +1954,8 @@
 	/* CPU DFLL clock */
 	clock@70110000 {
 		status = "okay";
-		vdd-cpu-supply = <&reg_vdd_cpu>;
 		nvidia,i2c-fs-rate = <400000>;
+		vdd-cpu-supply = <&reg_vdd_cpu>;
 	};
 
 	ahub@70300000 {
Signature · 1 line
2.14.4
#13 lore raw

PATCH v2 13/19 ARM: tegra: apalis-tk1: reorder SD card properties

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Reorder SD card properties.

---

Changes in v2: None

 arch/arm/boot/dts/tegra124-apalis-eval.dts      | 4 ++--
 arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/tegra124-apalis-eval.dts +2 -2
index d9805fc97f5e..08f60636441d 100644
@@ -180,18 +180,18 @@
 	/* Apalis MMC1 */
 	sdhci@700b0000 {
 		status = "okay";
+		bus-width = <4>;
 		/* MMC1_CD# */
 		cd-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_LOW>;
-		bus-width = <4>;
 		vqmmc-supply = <&vddio_sdmmc1>;
 	};
 
 	/* Apalis SD1 */
 	sdhci@700b0400 {
 		status = "okay";
+		bus-width = <4>;
 		/* SD1_CD# */
 		cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
-		bus-width = <4>;
 		vqmmc-supply = <&vddio_sdmmc3>;
 	};
 
arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts +2 -2
index 89783fe76f65..97c56e82c51d 100644
@@ -146,18 +146,18 @@
 	/* Apalis MMC1 */
 	sdhci@700b0000 {
 		status = "okay";
+		bus-width = <4>;
 		/* MMC1_CD# */
 		cd-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_LOW>;
-		bus-width = <4>;
 		vqmmc-supply = <&vddio_sdmmc1>;
 	};
 
 	/* Apalis SD1 */
 	sdhci@700b0400 {
 		status = "okay";
+		bus-width = <4>;
 		/* SD1_CD# */
 		cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
-		bus-width = <4>;
 		vqmmc-supply = <&vddio_sdmmc3>;
 	};
 
Signature · 1 line
2.14.4
#14 lore raw

PATCH v2 14/19 ARM: tegra: apalis-tk1: 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/tegra124-apalis-v1.2.dtsi | 4 ----
 arch/arm/boot/dts/tegra124-apalis.dtsi      | 3 ---
 2 files changed, 7 deletions(-)
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi +0 -4
index 07dd208296d3..e70994518c70 100644
@@ -11,10 +11,6 @@
  * Compatible for Revisions 2GB: V1.2A
  */
 / {
-	model = "Toradex Apalis TK1";
-	compatible = "toradex,apalis-tk1-v1.2", "toradex,apalis-tk1",
-		     "nvidia,tegra124";
-
 	memory@80000000 {
 		reg = <0x0 0x80000000 0x0 0x80000000>;
 	};
arch/arm/boot/dts/tegra124-apalis.dtsi +0 -3
index fe10c5180768..b1a05c37106d 100644
@@ -47,9 +47,6 @@
  * Compatible for Revisions 2GB: V1.0A, V1.0B, V1.1A
  */
 / {
-	model = "Toradex Apalis TK1";
-	compatible = "toradex,apalis-tk1", "nvidia,tegra124";
-
 	memory@80000000 {
 		reg = <0x0 0x80000000 0x0 0x80000000>;
 	};
Signature · 1 line
2.14.4
#15 lore raw

PATCH v2 15/19 ARM: tegra: apalis-tk1: drop obsolete spidev nodes

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Drop obsolete spidev device tree nodes 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/tegra124-apalis-eval.dts      | 12 ------------
 arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 12 ------------
 2 files changed, 24 deletions(-)
arch/arm/boot/dts/tegra124-apalis-eval.dts +0 -12
index 08f60636441d..2710eb79b63e 100644
@@ -142,24 +142,12 @@
 	spi@7000d400 {
 		status = "okay";
 		spi-max-frequency = <50000000>;
-
-		spidev0: spidev@0 {
-			compatible = "spidev";
-			reg = <0>;
-			spi-max-frequency = <50000000>;
-		};
 	};
 
 	/* SPI4: Apalis SPI2 */
 	spi@7000da00 {
 		status = "okay";
 		spi-max-frequency = <50000000>;
-
-		spidev1: spidev@0 {
-			compatible = "spidev";
-			reg = <0>;
-			spi-max-frequency = <50000000>;
-		};
 	};
 
 	/* Apalis Serial ATA */
arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts +0 -12
index 97c56e82c51d..574780250031 100644
@@ -108,24 +108,12 @@
 	spi@7000d400 {
 		status = "okay";
 		spi-max-frequency = <50000000>;
-
-		spidev0: spidev@0 {
-			compatible = "spidev";
-			reg = <0>;
-			spi-max-frequency = <50000000>;
-		};
 	};
 
 	/* SPI4: Apalis SPI2 */
 	spi@7000da00 {
 		status = "okay";
 		spi-max-frequency = <50000000>;
-
-		spidev1: spidev@0 {
-			compatible = "spidev";
-			reg = <0>;
-			spi-max-frequency = <50000000>;
-		};
 	};
 
 	/* Apalis Serial ATA */
Signature · 1 line
2.14.4
#16 lore raw

PATCH v2 16/19 ARM: tegra: apalis-tk1: replace underscores in node names with dashes

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

As underscores in node names are not recommended replace them all where possible with dashes.

---

Changes in v2:
- New patch.

 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     | 290 ++++++++++++------------
 arch/arm/boot/dts/tegra124-apalis.dtsi          | 290 ++++++++++++------------
 4 files changed, 292 insertions(+), 292 deletions(-)
arch/arm/boot/dts/tegra124-apalis-eval.dts +1 -1
index 2710eb79b63e..0b4ac640e54f 100644
@@ -282,7 +282,7 @@
 
 &gpio {
 	/* Apalis GPIO7 MXM3 pin 15 PLX PEX 8605 PCIe Switch Reset */
-	pex_perst_n {
+	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 574780250031..799382d04bba 100644
@@ -248,7 +248,7 @@
 
 &gpio {
 	/* Apalis GPIO7 MXM3 pin 15 PLX PEX 8605 PCIe Switch Reset */
-	pex_perst_n {
+	pex-perst-n {
 		gpio-hog;
 		gpios = <TEGRA_GPIO(DD, 1) GPIO_ACTIVE_HIGH>;
 		output-high;
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi +145 -145

1,160 lines not on this page · raw message

arch/arm/boot/dts/tegra124-apalis.dtsi +145 -145

1,160 lines not on this page · raw message

Signature · 1 line
2.14.4
#17 lore raw

PATCH v2 17/19 ARM: tegra: apalis-tk1: 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/tegra124-apalis-v1.2.dtsi | 15 ++++-----------
 arch/arm/boot/dts/tegra124-apalis.dtsi      | 15 ++++-----------
 2 files changed, 8 insertions(+), 22 deletions(-)
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi +4 -11
index 6d36521448ce..7fe61f1baadd 100644
@@ -1931,17 +1931,10 @@
 		};
 	};
 
-	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: osc3 {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <32768>;
 	};
 
 	cpus {
arch/arm/boot/dts/tegra124-apalis.dtsi +4 -11
index a8f1306b5cd7..62af3dc97ede 100644
@@ -1961,17 +1961,10 @@
 		};
 	};
 
-	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: osc3 {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <32768>;
 	};
 
 	cpus {
Signature · 1 line
2.14.4
#18 lore raw

PATCH v2 18/19 ARM: tegra: apalis-tk1: shorten temperature-sensor node

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Shorten temperature-sensor node to just temp-sensor as suggested in the binding documentation.

---

Changes in v2:
- New patch.

 arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 2 +-
 arch/arm/boot/dts/tegra124-apalis.dtsi      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi +1 -1
index 7fe61f1baadd..367eb8c86098 100644
@@ -1745,7 +1745,7 @@
 		 * TMP451 temperature sensor
 		 * Note: THERM_N directly connected to AS3722 PMIC THERM
 		 */
-		temperature-sensor@4c {
+		temp-sensor@4c {
 			compatible = "ti,tmp451";
 			reg = <0x4c>;
 			interrupt-parent = <&gpio>;
arch/arm/boot/dts/tegra124-apalis.dtsi +1 -1
index 62af3dc97ede..13c93cd507d8 100644
@@ -1775,7 +1775,7 @@
 		 * TMP451 temperature sensor
 		 * Note: THERM_N directly connected to AS3722 PMIC THERM
 		 */
-		temperature-sensor@4c {
+		temp-sensor@4c {
 			compatible = "ti,tmp451";
 			reg = <0x4c>;
 			interrupt-parent = <&gpio>;
Signature · 1 line
2.14.4
#19 lore raw

PATCH v2 19/19 ARM: tegra: apalis-tk1: drop unused hdmi_ddc label

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Drop unused hdmi_ddc label.

---

Changes in v2:
- New patch.

 arch/arm/boot/dts/tegra124-apalis-eval.dts      | 2 +-
 arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/tegra124-apalis-eval.dts +1 -1
index 0b4ac640e54f..eaee10ef6512 100644
@@ -123,7 +123,7 @@
 	/*
 	 * GEN2_I2C: I2C2_SDA/SCL (DDC) on MXM3 pin 205/207 (e.g. display EDID)
 	 */
-	hdmi_ddc: i2c@7000c400 {
+	i2c@7000c400 {
 		status = "okay";
 	};
 
arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts +1 -1
index 799382d04bba..7961eb4bd803 100644
@@ -100,7 +100,7 @@
 	 * I2C4 (DDC): I2C4_SDA/SCL (DDC) on MXM3 pin 205/207
 	 * (e.g. display EDID)
 	 */
-	hdmi_ddc: i2c@7000c700 {
+	i2c@7000c700 {
 		status = "okay";
 	};
 
Signature · 1 line
2.14.4
#20 lore raw
In reply to Marcel Ziswiler
Quoted 37 lines · Marcel Ziswiler

This series is a minor overhaul for the Toradex Apalis TK1 system on module.

Changes in v2:
- Add Rob's reviewed-by.
- New patch as suggested by Rob.
- New patch.
- Get rid of fake clocks simple bus as suggested by Rob.
- Change cover-letter subject to indicate minor revamp.
- Drop "[PATCH 02/15] ARM: tegra: apalis-tk1: reorder pcie properties" as requested by Stefan.
- Drop "[PATCH 13/15] ARM: tegra: apalis-tk1: fix pcie switch vendor compatible" in favour of the new "[PATCH v2 26/34] dt-bindings: add broadcom (formerly plx technology) vendor prefix" posted earlier as part of the apalis_t30 revamp v2 as suggested by Stefan.

Marcel Ziswiler (19):
ARM: tegra: apalis-tk1: add local-mac-address property
ARM: tegra: apalis-tk1: reorder host1x/hdmi properties
ARM: tegra: apalis-tk1: reorder padctl properties
ARM: tegra: apalis-tk1: regulator clean-up
ARM: tegra: apalis-tk1: add missing regulators
ARM: tegra: apalis-tk1: drop unused pinmux label
ARM: tegra: apalis-tk1: white-space clean-up
ARM: tegra: apalis-tk1: reorder backlight properties
ARM: tegra: apalis-tk1: add proper emmc vmmc and vqmmc supplies
ARM: tegra: apalis-tk1: enable emmc ddr52 mode
ARM: tegra: apalis-tk1: add toradex,apalis-tk1-v1.2 compatible
ARM: tegra: apalis-tk1: reorder cpu dfll clock properties
ARM: tegra: apalis-tk1: reorder SD card properties
ARM: tegra: apalis-tk1: drop module level model and compatible
ARM: tegra: apalis-tk1: drop obsolete spidev nodes
ARM: tegra: apalis-tk1: replace underscores in node names with dashes
ARM: tegra: apalis-tk1: get rid of fake clocks simple bus
ARM: tegra: apalis-tk1: shorten temperature-sensor node
ARM: tegra: apalis-tk1: drop unused hdmi_ddc label

Quoted 6 lines
 Documentation/devicetree/bindings/arm/tegra.txt |   2 +
 arch/arm/boot/dts/tegra124-apalis-eval.dts      |  40 ++-
 arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts |  43 ++-
 arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi     | 452 ++++++++++++------------
 arch/arm/boot/dts/tegra124-apalis.dtsi          | 451 +++++++++++------------
 5 files changed, 508 insertions(+), 480 deletions(-)

Applied, thanks.

Thierry