This series is a minor overhaul for the Toradex Apalis TK1 system on
module.
Marcel Ziswiler (15):
ARM: tegra: apalis-tk1: add local-mac-address property
ARM: tegra: apalis-tk1: reorder pcie properties
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: fix pcie switch vendor compatible
ARM: tegra: apalis-tk1: reorder cpu dfll clock properties
ARM: tegra: apalis-tk1: reorder SD card properties
Documentation/devicetree/bindings/arm/tegra.txt | 2 +
arch/arm/boot/dts/tegra124-apalis-eval.dts | 26 ++++-
arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 29 ++++-
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 143 +++++++++++++-----------
arch/arm/boot/dts/tegra124-apalis.dtsi | 143 +++++++++++++-----------
5 files changed, 208 insertions(+), 135 deletions(-)
--
2.14.4
From: Marcel Ziswiler <[email protected]>
Reorder Host1x/HDMI properties.
Signed-off-by: Marcel Ziswiler <[email protected]>
---
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(-)
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
index cb7e53c86408..9ea65723c40c 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -52,11 +52,11 @@
host1x@50000000 {
hdmi@54280000 {
- pll-supply = <®_1v05_avdd_hdmi_pll>;
- vdd-supply = <®_3v3_avdd_hdmi>;
nvidia,ddc-i2c-bus = <&hdmi_ddc>;
nvidia,hpd-gpio =
<&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>;
+ pll-supply = <®_1v05_avdd_hdmi_pll>;
+ vdd-supply = <®_3v3_avdd_hdmi>;
};
};
diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
index d73ee974648a..69ca362c1ef3 100644
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -87,11 +87,11 @@
host1x@50000000 {
hdmi@54280000 {
- pll-supply = <®_1v05_avdd_hdmi_pll>;
- vdd-supply = <®_3v3_avdd_hdmi>;
nvidia,ddc-i2c-bus = <&hdmi_ddc>;
nvidia,hpd-gpio =
<&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>;
+ pll-supply = <®_1v05_avdd_hdmi_pll>;
+ vdd-supply = <®_3v3_avdd_hdmi>;
};
};
--
2.14.4
From: Marcel Ziswiler <[email protected]>
Just cosmetic regulator clean-up.
Signed-off-by: Marcel Ziswiler <[email protected]>
---
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(-)
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
index fe74dd73a572..8323fddceed8 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -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 = <®_3v3>;
- hvdd-pex-supply = <®_3v3>;
- vddio-pex-ctl-supply = <®_3v3>;
+ avddio-pex-supply = <®_1v05_vdd>;
+ avdd-pex-pll-supply = <®_1v05_vdd>;
+ avdd-pll-erefe-supply = <®_1v05_avdd>;
+ dvddio-pex-supply = <®_1v05_vdd>;
+ hvdd-pex-pll-e-supply = <®_module_3v3>;
+ hvdd-pex-supply = <®_module_3v3>;
+ vddio-pex-ctl-supply = <®_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 = <®_vdd_gpu>;
};
pinmux: pinmux@70000868 {
@@ -1565,8 +1565,8 @@
sgtl5000: codec@a {
compatible = "fsl,sgtl5000";
reg = <0x0a>;
- VDDA-supply = <®_3v3>;
- VDDIO-supply = <&vddio_1v8>;
+ VDDA-supply = <®_module_3v3>;
+ VDDIO-supply = <®_1v8_vddio>;
clocks = <&tegra_car TEGRA124_CLK_EXTERN1>;
};
@@ -1598,18 +1598,18 @@
};
regulators {
- vsup-sd2-supply = <®_3v3>;
- vsup-sd3-supply = <®_3v3>;
- vsup-sd4-supply = <®_3v3>;
- vsup-sd5-supply = <®_3v3>;
- vin-ldo0-supply = <&vddio_ddr_1v35>;
- vin-ldo1-6-supply = <®_3v3>;
- vin-ldo2-5-7-supply = <&vddio_1v8>;
- vin-ldo3-4-supply = <®_3v3>;
- vin-ldo9-10-supply = <®_3v3>;
- vin-ldo11-supply = <®_3v3>;
-
- vdd_cpu: sd0 {
+ vsup-sd2-supply = <®_module_3v3>;
+ vsup-sd3-supply = <®_module_3v3>;
+ vsup-sd4-supply = <®_module_3v3>;
+ vsup-sd5-supply = <®_module_3v3>;
+ vin-ldo0-supply = <®_1v35_vddio_ddr>;
+ vin-ldo1-6-supply = <®_module_3v3>;
+ vin-ldo2-5-7-supply = <®_1v8_vddio>;
+ vin-ldo3-4-supply = <®_module_3v3>;
+ vin-ldo9-10-supply = <®_module_3v3>;
+ vin-ldo11-supply = <®_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 = <®_3v3>;
- vddio-supply = <&vdd_1v05>;
+ avdd-supply = <®_1v05_vdd>;
+ hvdd-supply = <®_module_3v3>;
+ vddio-supply = <®_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 = <®_3v3>;
- dvddio-pex-supply = <&vdd_1v05>;
- hvdd-usb-ss-pll-e-supply = <®_3v3>;
- hvdd-usb-ss-supply = <®_3v3>;
+ avddio-pex-supply = <®_1v05_vdd>;
+ avdd-pll-erefe-supply = <®_1v05_avdd>;
+ avdd-pll-utmip-supply = <®_1v8_vddio>;
+ avdd-usb-ss-pll-supply = <®_1v05_vdd>;
+ avdd-usb-supply = <®_module_3v3>;
+ dvddio-pex-supply = <®_1v05_vdd>;
+ hvdd-usb-ss-pll-e-supply = <®_module_3v3>;
+ hvdd-usb-ss-supply = <®_module_3v3>;
};
padctl@7009f000 {
@@ -1921,7 +1921,7 @@
/* CPU DFLL clock */
clock@70110000 {
status = "okay";
- vdd-cpu-supply = <&vdd_cpu>;
+ vdd-cpu-supply = <®_vdd_cpu>;
nvidia,i2c-fs-rate = <400000>;
};
@@ -1946,7 +1946,7 @@
cpus {
cpu@0 {
- vdd-cpu-supply = <&vdd_cpu>;
+ vdd-cpu-supply = <®_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 = <®_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 = <®_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 = <®_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";
diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
index 3fc41e25b5e8..4ad14c7a64db 100644
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -56,13 +56,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 = <®_3v3>;
- hvdd-pex-supply = <®_3v3>;
- vddio-pex-ctl-supply = <®_3v3>;
+ avddio-pex-supply = <®_1v05_vdd>;
+ avdd-pex-pll-supply = <®_1v05_vdd>;
+ avdd-pll-erefe-supply = <®_1v05_avdd>;
+ dvddio-pex-supply = <®_1v05_vdd>;
+ hvdd-pex-pll-e-supply = <®_module_3v3>;
+ hvdd-pex-supply = <®_module_3v3>;
+ vddio-pex-ctl-supply = <®_module_3v3>;
/* Apalis PCIe (additional lane Apalis type specific) */
pci@1,0 {
@@ -100,7 +100,7 @@
* Node left disabled on purpose - the bootloader will enable
* it after having set the VPR up
*/
- vdd-supply = <&vdd_gpu>;
+ vdd-supply = <®_vdd_gpu>;
};
pinmux: pinmux@70000868 {
@@ -1594,8 +1594,8 @@
sgtl5000: codec@a {
compatible = "fsl,sgtl5000";
reg = <0x0a>;
- VDDA-supply = <®_3v3>;
- VDDIO-supply = <&vddio_1v8>;
+ VDDA-supply = <®_module_3v3>;
+ VDDIO-supply = <®_1v8_vddio>;
clocks = <&tegra_car TEGRA124_CLK_EXTERN1>;
};
@@ -1627,18 +1627,18 @@
};
regulators {
- vsup-sd2-supply = <®_3v3>;
- vsup-sd3-supply = <®_3v3>;
- vsup-sd4-supply = <®_3v3>;
- vsup-sd5-supply = <®_3v3>;
- vin-ldo0-supply = <&vddio_ddr_1v35>;
- vin-ldo1-6-supply = <®_3v3>;
- vin-ldo2-5-7-supply = <&vddio_1v8>;
- vin-ldo3-4-supply = <®_3v3>;
- vin-ldo9-10-supply = <®_3v3>;
- vin-ldo11-supply = <®_3v3>;
-
- vdd_cpu: sd0 {
+ vsup-sd2-supply = <®_module_3v3>;
+ vsup-sd3-supply = <®_module_3v3>;
+ vsup-sd4-supply = <®_module_3v3>;
+ vsup-sd5-supply = <®_module_3v3>;
+ vin-ldo0-supply = <®_1v35_vddio_ddr>;
+ vin-ldo1-6-supply = <®_module_3v3>;
+ vin-ldo2-5-7-supply = <®_1v8_vddio>;
+ vin-ldo3-4-supply = <®_module_3v3>;
+ vin-ldo9-10-supply = <®_module_3v3>;
+ vin-ldo11-supply = <®_module_3v3>;
+
+ reg_vdd_cpu: sd0 {
regulator-name = "+VDD_CPU_AP";
regulator-min-microvolt = <700000>;
regulator-max-microvolt = <1400000>;
@@ -1660,7 +1660,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>;
@@ -1678,13 +1678,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>;
@@ -1692,7 +1692,7 @@
regulator-always-on;
};
- vdd_gpu: sd6 {
+ reg_vdd_gpu: sd6 {
regulator-name = "+VDD_GPU_AP";
regulator-min-microvolt = <650000>;
regulator-max-microvolt = <1200000>;
@@ -1702,7 +1702,7 @@
regulator-always-on;
};
- avdd_1v05: ldo0 {
+ reg_1v05_avdd: ldo0 {
regulator-name = "+V1.05_AVDD";
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <1050000>;
@@ -1814,9 +1814,9 @@
sata@70020000 {
phys = <&{/padctl@7009f000/pads/sata/lanes/sata-0}>;
phy-names = "sata-0";
- avdd-supply = <&vdd_1v05>;
- hvdd-supply = <®_3v3>;
- vddio-supply = <&vdd_1v05>;
+ avdd-supply = <®_1v05_vdd>;
+ hvdd-supply = <®_module_3v3>;
+ vddio-supply = <®_1v05_vdd>;
};
usb@70090000 {
@@ -1827,14 +1827,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 = <®_3v3>;
- dvddio-pex-supply = <&vdd_1v05>;
- hvdd-usb-ss-pll-e-supply = <®_3v3>;
- hvdd-usb-ss-supply = <®_3v3>;
+ avddio-pex-supply = <®_1v05_vdd>;
+ avdd-pll-erefe-supply = <®_1v05_avdd>;
+ avdd-pll-utmip-supply = <®_1v8_vddio>;
+ avdd-usb-ss-pll-supply = <®_1v05_vdd>;
+ avdd-usb-supply = <®_module_3v3>;
+ dvddio-pex-supply = <®_1v05_vdd>;
+ hvdd-usb-ss-pll-e-supply = <®_module_3v3>;
+ hvdd-usb-ss-supply = <®_module_3v3>;
};
padctl@7009f000 {
@@ -1950,7 +1950,7 @@
/* CPU DFLL clock */
clock@70110000 {
status = "okay";
- vdd-cpu-supply = <&vdd_cpu>;
+ vdd-cpu-supply = <®_vdd_cpu>;
nvidia,i2c-fs-rate = <400000>;
};
@@ -1975,7 +1975,7 @@
cpus {
cpu@0 {
- vdd-cpu-supply = <&vdd_cpu>;
+ vdd-cpu-supply = <®_vdd_cpu>;
};
};
@@ -1985,7 +1985,7 @@
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <1050000>;
gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
- vin-supply = <&vdd_1v05>;
+ vin-supply = <®_1v05_vdd>;
};
reg_3v3_mxm: regulator-3v3-mxm {
@@ -1997,7 +1997,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 = <®_1v05_vdd>;
+ };
+
+ reg_module_3v3: regulator-module-3v3 {
compatible = "regulator-fixed";
regulator-name = "+V3.3";
regulator-min-microvolt = <3300000>;
@@ -2010,14 +2018,6 @@
vin-supply = <®_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";
--
2.14.4
From: Marcel Ziswiler <[email protected]>
White-space clean-up.
Signed-off-by: Marcel Ziswiler <[email protected]>
---
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 3 ---
arch/arm/boot/dts/tegra124-apalis.dtsi | 3 ---
2 files changed, 6 deletions(-)
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
index 866946d683d4..8ea696c91341 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -1881,7 +1881,6 @@
usb2-0 {
status = "okay";
mode = "otg";
-
vbus-supply = <®_usbo1_vbus>;
};
@@ -1889,7 +1888,6 @@
usb2-1 {
status = "okay";
mode = "host";
-
vbus-supply = <®_usbh_vbus>;
};
@@ -1897,7 +1895,6 @@
usb2-2 {
status = "okay";
mode = "host";
-
vbus-supply = <®_usbh_vbus>;
};
diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
index 2cf5d02afbbc..ab63e5653d73 100644
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -1910,7 +1910,6 @@
usb2-0 {
status = "okay";
mode = "otg";
-
vbus-supply = <®_usbo1_vbus>;
};
@@ -1918,7 +1917,6 @@
usb2-1 {
status = "okay";
mode = "host";
-
vbus-supply = <®_usbh_vbus>;
};
@@ -1926,7 +1924,6 @@
usb2-2 {
status = "okay";
mode = "host";
-
vbus-supply = <®_usbh_vbus>;
};
--
2.14.4
From: Marcel Ziswiler <[email protected]>
PLX got bought by Broadcom therefore fix device tree compatible string
vendor which silences the following checkpatch.pl warning:
WARNING: DT compatible string vendor "plx" appears un-documented
-- check ./Documentation/devicetree/bindings/vendor-prefixes.txt
Signed-off-by: Marcel Ziswiler <[email protected]>
---
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(-)
diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts b/arch/arm/boot/dts/tegra124-apalis-eval.dts
index d9805fc97f5e..84ab7dc9febb 100644
--- a/arch/arm/boot/dts/tegra124-apalis-eval.dts
+++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts
@@ -109,7 +109,7 @@
clock-frequency = <400000>;
pcie-switch@58 {
- compatible = "plx,pex8605";
+ compatible = "brcm,pex8605";
reg = <0x58>;
};
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
index 89783fe76f65..5319f88d3cab 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
@@ -74,7 +74,7 @@
clock-frequency = <400000>;
pcie-switch@58 {
- compatible = "plx,pex8605";
+ compatible = "brcm,pex8605";
reg = <0x58>;
};
--
2.14.4
From: Marcel Ziswiler <[email protected]>
Reorder SD card properties.
Signed-off-by: Marcel Ziswiler <[email protected]>
---
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(-)
diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts b/arch/arm/boot/dts/tegra124-apalis-eval.dts
index 84ab7dc9febb..7d32e402a0f1 100644
--- a/arch/arm/boot/dts/tegra124-apalis-eval.dts
+++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts
@@ -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>;
};
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
index 5319f88d3cab..91d54d14f527 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
@@ -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>;
};
--
2.14.4
From: Marcel Ziswiler <[email protected]>
Reorder CPU DFLL clock properties.
Signed-off-by: Marcel Ziswiler <[email protected]>
---
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(-)
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
index 13486fe407d2..0837af1bf658 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -1925,8 +1925,8 @@
/* CPU DFLL clock */
clock@70110000 {
status = "okay";
- vdd-cpu-supply = <®_vdd_cpu>;
nvidia,i2c-fs-rate = <400000>;
+ vdd-cpu-supply = <®_vdd_cpu>;
};
ahub@70300000 {
diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
index 77ca508d755e..18e9e9e8b474 100644
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -1954,8 +1954,8 @@
/* CPU DFLL clock */
clock@70110000 {
status = "okay";
- vdd-cpu-supply = <®_vdd_cpu>;
nvidia,i2c-fs-rate = <400000>;
+ vdd-cpu-supply = <®_vdd_cpu>;
};
ahub@70300000 {
--
2.14.4
From: Marcel Ziswiler <[email protected]>
Reorder PCIe properties.
Signed-off-by: Marcel Ziswiler <[email protected]>
---
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(-)
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
index 09e3641258ae..cb7e53c86408 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -39,9 +39,9 @@
/* I210 Gigabit Ethernet Controller (On-module) */
pci@2,0 {
+ status = "okay";
phys = <&{/padctl@7009f000/pads/pcie/lanes/pcie-2}>;
phy-names = "pcie-0";
- status = "okay";
pcie@0 {
reg = <0 0 0 0 0>;
diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
index 5e7ae5e92fb8..d73ee974648a 100644
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -74,9 +74,9 @@
/* I210 Gigabit Ethernet Controller (On-module) */
pci@2,0 {
+ status = "okay";
phys = <&{/padctl@7009f000/pads/pcie/lanes/pcie-2}>;
phy-names = "pcie-0";
- status = "okay";
pcie@0 {
reg = <0 0 0 0 0>;
--
2.14.4
From: Marcel Ziswiler <[email protected]>
Add toradex,apalis-tk1-v1.2 compatible.
Signed-off-by: Marcel Ziswiler <[email protected]>
---
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(-)
diff --git a/Documentation/devicetree/bindings/arm/tegra.txt b/Documentation/devicetree/bindings/arm/tegra.txt
index 1073a5e66122..1c90cb32da19 100644
--- a/Documentation/devicetree/bindings/arm/tegra.txt
+++ b/Documentation/devicetree/bindings/arm/tegra.txt
@@ -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
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
index aafaf2c3e195..89783fe76f65 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
@@ -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";
--
2.14.4
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
Signed-off-by: Marcel Ziswiler <[email protected]>
---
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 1 +
arch/arm/boot/dts/tegra124-apalis.dtsi | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
index 6c255cb70339..13486fe407d2 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -1919,6 +1919,7 @@
non-removable;
vmmc-supply = <®_module_3v3>; /* VCC */
vqmmc-supply = <®_1v8_vddio>; /* VCCQ */
+ mmc-ddr-1_8v;
};
/* CPU DFLL clock */
diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
index 72253d918ebd..77ca508d755e 100644
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -1948,6 +1948,7 @@
non-removable;
vmmc-supply = <®_module_3v3>; /* VCC */
vqmmc-supply = <®_1v8_vddio>; /* VCCQ */
+ mmc-ddr-1_8v;
};
/* CPU DFLL clock */
--
2.14.4
From: Marcel Ziswiler <[email protected]>
Add proper eMMC vmmc and vqmmc supplies e.g. fixing signalling voltage.
Signed-off-by: Marcel Ziswiler <[email protected]>
---
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 2 ++
arch/arm/boot/dts/tegra124-apalis.dtsi | 2 ++
2 files changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
index 8ea696c91341..6c255cb70339 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -1917,6 +1917,8 @@
status = "okay";
bus-width = <8>;
non-removable;
+ vmmc-supply = <®_module_3v3>; /* VCC */
+ vqmmc-supply = <®_1v8_vddio>; /* VCCQ */
};
/* CPU DFLL clock */
diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
index ab63e5653d73..72253d918ebd 100644
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -1946,6 +1946,8 @@
status = "okay";
bus-width = <8>;
non-removable;
+ vmmc-supply = <®_module_3v3>; /* VCC */
+ vqmmc-supply = <®_1v8_vddio>; /* VCCQ */
};
/* CPU DFLL clock */
--
2.14.4
From: Marcel Ziswiler <[email protected]>
Drop unused pinmux label.
Signed-off-by: Marcel Ziswiler <[email protected]>
---
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(-)
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
index a8dcf960e44f..866946d683d4 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -68,7 +68,7 @@
vdd-supply = <®_vdd_gpu>;
};
- pinmux: pinmux@70000868 {
+ pinmux@70000868 {
pinctrl-names = "default";
pinctrl-0 = <&state_default>;
diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
index b2aca71f96e7..2cf5d02afbbc 100644
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -103,7 +103,7 @@
vdd-supply = <®_vdd_gpu>;
};
- pinmux: pinmux@70000868 {
+ pinmux@70000868 {
pinctrl-names = "default";
pinctrl-0 = <&state_default>;
--
2.14.4
From: Marcel Ziswiler <[email protected]>
Reorder backlight properties.
Signed-off-by: Marcel Ziswiler <[email protected]>
---
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(-)
diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts b/arch/arm/boot/dts/tegra124-apalis-eval.dts
index c2e918d345de..d9805fc97f5e 100644
--- a/arch/arm/boot/dts/tegra124-apalis-eval.dts
+++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts
@@ -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 = <®_3v3>;
+ pwms = <&pwm 3 5000000>; /* BKL1_PWM */
};
gpio-keys {
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
index eebcc013771e..aafaf2c3e195 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
@@ -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 = <®_3v3>;
+ pwms = <&pwm 3 5000000>; /* BKL1_PWM */
};
gpio-keys {
--
2.14.4
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
Signed-off-by: Marcel Ziswiler <[email protected]>
---
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(-)
diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts b/arch/arm/boot/dts/tegra124-apalis-eval.dts
index a6ad759dddb4..c2e918d345de 100644
--- a/arch/arm/boot/dts/tegra124-apalis-eval.dts
+++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts
@@ -72,6 +72,7 @@
host1x@50000000 {
hdmi@54280000 {
status = "okay";
+ hdmi-supply = <®_5v0>;
};
};
@@ -164,6 +165,8 @@
/* Apalis Serial ATA */
sata@70020000 {
status = "okay";
+ target-5v-supply = <®_5v0>;
+ target-12v-supply = <®_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 = <®_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";
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
index 8a8d5fa0ecd1..eebcc013771e 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
@@ -36,6 +36,7 @@
host1x@50000000 {
hdmi@54280000 {
status = "okay";
+ hdmi-supply = <®_5v0>;
};
};
@@ -129,6 +130,8 @@
/* Apalis Serial ATA */
sata@70020000 {
status = "okay";
+ target-5v-supply = <®_5v0>;
+ target-12v-supply = <®_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 = <®_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";
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
index 8323fddceed8..a8dcf960e44f 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -1565,7 +1565,8 @@
sgtl5000: codec@a {
compatible = "fsl,sgtl5000";
reg = <0x0a>;
- VDDA-supply = <®_module_3v3>;
+ VDDA-supply = <®_module_3v3_audio>;
+ VDDD-supply = <®_1v8_vddio>;
VDDIO-supply = <®_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 = <®_module_3v3>;
};
};
@@ -1902,11 +1904,13 @@
usb3-0 {
status = "okay";
nvidia,usb2-companion = <2>;
+ vbus-supply = <®_usbh_vbus>;
};
usb3-1 {
status = "okay";
nvidia,usb2-companion = <0>;
+ vbus-supply = <®_usbo1_vbus>;
};
};
};
@@ -1989,6 +1993,14 @@
vin-supply = <®_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";
diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
index 4ad14c7a64db..b2aca71f96e7 100644
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -1594,7 +1594,8 @@
sgtl5000: codec@a {
compatible = "fsl,sgtl5000";
reg = <0x0a>;
- VDDA-supply = <®_module_3v3>;
+ VDDA-supply = <®_module_3v3_audio>;
+ VDDD-supply = <®_1v8_vddio>;
VDDIO-supply = <®_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 = <®_module_3v3>;
};
};
@@ -1931,11 +1933,13 @@
usb3-0 {
status = "okay";
nvidia,usb2-companion = <2>;
+ vbus-supply = <®_usbh_vbus>;
};
usb3-1 {
status = "okay";
nvidia,usb2-companion = <0>;
+ vbus-supply = <®_usbo1_vbus>;
};
};
};
@@ -2018,6 +2022,14 @@
vin-supply = <®_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";
--
2.14.4
From: Marcel Ziswiler <[email protected]>
Reorder padctl properties.
Signed-off-by: Marcel Ziswiler <[email protected]>
---
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(-)
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
index 9ea65723c40c..fe74dd73a572 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -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>;
};
};
};
diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
index 69ca362c1ef3..3fc41e25b5e8 100644
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -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>;
};
};
};
--
2.14.4
From: Marcel Ziswiler <[email protected]>
Add empty local-mac-address property to be filled in by boot loader
(e.g. U-Boot).
Signed-off-by: Marcel Ziswiler <[email protected]>
---
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 5 +++++
arch/arm/boot/dts/tegra124-apalis.dtsi | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
index 573aaa50fff1..09e3641258ae 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -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];
+ };
};
};
diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
index 0f0d4a4988b9..5e7ae5e92fb8 100644
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -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];
+ };
};
};
--
2.14.4
Sorry, I meant to write "minor revamp" in the subject line here as
Apalis TK1 was already in quite good a shape but this are still some
worthy improvements (;-p).
On Tue, 2018-07-24 at 12:42 +0200, Marcel Ziswiler wrote:
> This series is a minor overhaul for the Toradex Apalis TK1 system on
> module.
>
> Marcel Ziswiler (15):
> ARM: tegra: apalis-tk1: add local-mac-address property
> ARM: tegra: apalis-tk1: reorder pcie properties
> 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: fix pcie switch vendor compatible
> ARM: tegra: apalis-tk1: reorder cpu dfll clock properties
> ARM: tegra: apalis-tk1: reorder SD card properties
>
> Documentation/devicetree/bindings/arm/tegra.txt | 2 +
> arch/arm/boot/dts/tegra124-apalis-eval.dts | 26 ++++-
> arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 29 ++++-
> arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 143 +++++++++++++-
> ----------
> arch/arm/boot/dts/tegra124-apalis.dtsi | 143 +++++++++++++-
> ----------
> 5 files changed, 208 insertions(+), 135 deletions(-)
On Tuesday, 24 July 2018 15:24:34 MSK Marcel Ziswiler wrote:
> Sorry, I meant to write "minor revamp" in the subject line here as
> Apalis TK1 was already in quite good a shape but this are still some
> worthy improvements (;-p).
>
> On Tue, 2018-07-24 at 12:42 +0200, Marcel Ziswiler wrote:
>
Marcel,
All your emails that are sent from "toradex.com" are treated as spam by Gmail
because "This message has a from address in toradex.com but has failed
toradex.com's required tests for authentication.", is there anything you could
do to fix that?
On Tue, 2018-07-24 at 15:44 +0300, Dmitry Osipenko wrote:
> On Tuesday, 24 July 2018 15:24:34 MSK Marcel Ziswiler wrote:
> > Sorry, I meant to write "minor revamp" in the subject line here as
> > Apalis TK1 was already in quite good a shape but this are still
> > some
> > worthy improvements (;-p).
> >
> > On Tue, 2018-07-24 at 12:42 +0200, Marcel Ziswiler wrote:
> >
>
> Marcel,
>
> All your emails that are sent from "toradex.com" are treated as spam
> by Gmail
> because "This message has a from address in toradex.com but has
> failed
> toradex.com's required tests for authentication.", is there anything
> you could
> do to fix that?
Hi Dmitry
Hm, unfortunately, Toradex was an M$ only shop when I joined more then
7 years ago and so far I was unable to convince our IT to switch to
some grown up email system. Therefore, I am stuck with Exchange, Office
365 or whatever M$ nowadays seem to call it. Anyway, I really thought
sending from Android or Evolution via their resp. Exchange connectors
would properly do SPF, DKIM and even DMARC. I just confirmed this when
sending something to my gmail address and doing "Show original".
Since Linus himself pointed out any of my patches ending up in his spam
folder I do send them via my private email which while not having any
advanced security configured should still be valid. Moving it to a
fully secure configuration including DNSSEC and stuff is still pending
on my side.
Can you please tell me which exact email it is that you got this
reported on so I may further investigate what is going on?
Cheers
Marcel
On Tuesday, 24 July 2018 17:16:33 MSK Marcel Ziswiler wrote:
> On Tue, 2018-07-24 at 15:44 +0300, Dmitry Osipenko wrote:
>
> > On Tuesday, 24 July 2018 15:24:34 MSK Marcel Ziswiler wrote:
> >
> > > Sorry, I meant to write "minor revamp" in the subject line here as
> > > Apalis TK1 was already in quite good a shape but this are still
> > > some
> > > worthy improvements (;-p).
> > >
> > > On Tue, 2018-07-24 at 12:42 +0200, Marcel Ziswiler wrote:
> > >
> >
> >
> > Marcel,
> >
> > All your emails that are sent from "toradex.com" are treated as spam
> > by Gmail
> > because "This message has a from address in toradex.com but has
> > failed
> > toradex.com's required tests for authentication.", is there anything
> > you could
> > do to fix that?
>
>
> Hi Dmitry
>
> Hm, unfortunately, Toradex was an M$ only shop when I joined more then
> 7 years ago and so far I was unable to convince our IT to switch to
> some grown up email system. Therefore, I am stuck with Exchange, Office
> 365 or whatever M$ nowadays seem to call it. Anyway, I really thought
> sending from Android or Evolution via their resp. Exchange connectors
> would properly do SPF, DKIM and even DMARC. I just confirmed this when
> sending something to my gmail address and doing "Show original".
>
> Since Linus himself pointed out any of my patches ending up in his spam
> folder I do send them via my private email which while not having any
> advanced security configured should still be valid. Moving it to a
> fully secure configuration including DNSSEC and stuff is still pending
> on my side.
>
> Can you please tell me which exact email it is that you got this
> reported on so I may further investigate what is going on?
This email from you looks okay. Unfortunately all of your previous emails from
"toradex.com" were getting into the spam folder.
On Tue, 2018-07-24 at 17:31 +0300, Dmitry Osipenko wrote:
> On Tuesday, 24 July 2018 17:16:33 MSK Marcel Ziswiler wrote:
> > On Tue, 2018-07-24 at 15:44 +0300, Dmitry Osipenko wrote:
> >
> > > On Tuesday, 24 July 2018 15:24:34 MSK Marcel Ziswiler wrote:
> > >
> > > > Sorry, I meant to write "minor revamp" in the subject line here
> > > > as
> > > > Apalis TK1 was already in quite good a shape but this are still
> > > > some
> > > > worthy improvements (;-p).
> > > >
> > > > On Tue, 2018-07-24 at 12:42 +0200, Marcel Ziswiler wrote:
> > > >
> > >
> > >
> > > Marcel,
> > >
> > > All your emails that are sent from "toradex.com" are treated as
> > > spam
> > > by Gmail
> > > because "This message has a from address in toradex.com but has
> > > failed
> > > toradex.com's required tests for authentication.", is there
> > > anything
> > > you could
> > > do to fix that?
> >
> >
> > Hi Dmitry
> >
> > Hm, unfortunately, Toradex was an M$ only shop when I joined more
> > then
> > 7 years ago and so far I was unable to convince our IT to switch to
> > some grown up email system. Therefore, I am stuck with Exchange,
> > Office
> > 365 or whatever M$ nowadays seem to call it. Anyway, I really
> > thought
> > sending from Android or Evolution via their resp. Exchange
> > connectors
> > would properly do SPF, DKIM and even DMARC. I just confirmed this
> > when
> > sending something to my gmail address and doing "Show original".
> >
> > Since Linus himself pointed out any of my patches ending up in his
> > spam
> > folder I do send them via my private email which while not having
> > any
> > advanced security configured should still be valid. Moving it to a
> > fully secure configuration including DNSSEC and stuff is still
> > pending
> > on my side.
> >
> > Can you please tell me which exact email it is that you got this
> > reported on so I may further investigate what is going on?
>
> This email from you looks okay. Unfortunately all of your previous
> emails from
> "toradex.com" were getting into the spam folder.
You sure they were from "toradex.com"? The patches should have been
coming from "ziswiler.com" resp. "perfora.net".
On Tuesday, 24 July 2018 17:45:01 MSK Marcel Ziswiler wrote:
> On Tue, 2018-07-24 at 17:31 +0300, Dmitry Osipenko wrote:
>
> > On Tuesday, 24 July 2018 17:16:33 MSK Marcel Ziswiler wrote:
> >
> > > On Tue, 2018-07-24 at 15:44 +0300, Dmitry Osipenko wrote:
> > >
> > >
> > > > On Tuesday, 24 July 2018 15:24:34 MSK Marcel Ziswiler wrote:
> > > >
> > > >
> > > > > Sorry, I meant to write "minor revamp" in the subject line here
> > > > > as
> > > > > Apalis TK1 was already in quite good a shape but this are still
> > > > > some
> > > > > worthy improvements (;-p).
> > > > >
> > > > > On Tue, 2018-07-24 at 12:42 +0200, Marcel Ziswiler wrote:
> > > > >
> > > >
> > > >
> > > >
> > > > Marcel,
> > > >
> > > > All your emails that are sent from "toradex.com" are treated as
> > > > spam
> > > > by Gmail
> > > > because "This message has a from address in toradex.com but has
> > > > failed
> > > > toradex.com's required tests for authentication.", is there
> > > > anything
> > > > you could
> > > > do to fix that?
> > >
> > >
> > >
> > > Hi Dmitry
> > >
> > > Hm, unfortunately, Toradex was an M$ only shop when I joined more
> > > then
> > > 7 years ago and so far I was unable to convince our IT to switch to
> > > some grown up email system. Therefore, I am stuck with Exchange,
> > > Office
> > > 365 or whatever M$ nowadays seem to call it. Anyway, I really
> > > thought
> > > sending from Android or Evolution via their resp. Exchange
> > > connectors
> > > would properly do SPF, DKIM and even DMARC. I just confirmed this
> > > when
> > > sending something to my gmail address and doing "Show original".
> > >
> > > Since Linus himself pointed out any of my patches ending up in his
> > > spam
> > > folder I do send them via my private email which while not having
> > > any
> > > advanced security configured should still be valid. Moving it to a
> > > fully secure configuration including DNSSEC and stuff is still
> > > pending
> > > on my side.
> > >
> > > Can you please tell me which exact email it is that you got this
> > > reported on so I may further investigate what is going on?
> >
> >
> > This email from you looks okay. Unfortunately all of your previous
> > emails from
> > "toradex.com" were getting into the spam folder.
>
>
> You sure they were from "toradex.com"? The patches should have been
> coming from "ziswiler.com" resp. "perfora.net".
The patches from "ziswiler.com" are fine, only your emails specifically from
"toradex.com" had an issue. Looks like you've resolved it now.
On 07/24/2018 10:48 AM, Dmitry Osipenko wrote:
> On Tuesday, 24 July 2018 17:45:01 MSK Marcel Ziswiler wrote:
>> On Tue, 2018-07-24 at 17:31 +0300, Dmitry Osipenko wrote:
>>
>>> On Tuesday, 24 July 2018 17:16:33 MSK Marcel Ziswiler wrote:
>>>
>>>> On Tue, 2018-07-24 at 15:44 +0300, Dmitry Osipenko wrote:
>>>>
>>>>
>>>>> On Tuesday, 24 July 2018 15:24:34 MSK Marcel Ziswiler wrote:
>>>>>
>>>>>
>>>>>> Sorry, I meant to write "minor revamp" in the subject line here
>>>>>> as
>>>>>> Apalis TK1 was already in quite good a shape but this are still
>>>>>> some
>>>>>> worthy improvements (;-p).
>>>>>>
>>>>>> On Tue, 2018-07-24 at 12:42 +0200, Marcel Ziswiler wrote:
>>>>>>
>>>>>
>>>>>
>>>>>
>>>>> Marcel,
>>>>>
>>>>> All your emails that are sent from "toradex.com" are treated as
>>>>> spam
>>>>> by Gmail
>>>>> because "This message has a from address in toradex.com but has
>>>>> failed
>>>>> toradex.com's required tests for authentication.", is there
>>>>> anything
>>>>> you could
>>>>> do to fix that?
>>>>
>>>>
>>>>
>>>> Hi Dmitry
>>>>
>>>> Hm, unfortunately, Toradex was an M$ only shop when I joined more
>>>> then
>>>> 7 years ago and so far I was unable to convince our IT to switch to
>>>> some grown up email system. Therefore, I am stuck with Exchange,
>>>> Office
>>>> 365 or whatever M$ nowadays seem to call it. Anyway, I really
>>>> thought
>>>> sending from Android or Evolution via their resp. Exchange
>>>> connectors
>>>> would properly do SPF, DKIM and even DMARC. I just confirmed this
>>>> when
>>>> sending something to my gmail address and doing "Show original".
>>>>
>>>> Since Linus himself pointed out any of my patches ending up in his
>>>> spam
>>>> folder I do send them via my private email which while not having
>>>> any
>>>> advanced security configured should still be valid. Moving it to a
>>>> fully secure configuration including DNSSEC and stuff is still
>>>> pending
>>>> on my side.
>>>>
>>>> Can you please tell me which exact email it is that you got this
>>>> reported on so I may further investigate what is going on?
>>>
>>>
>>> This email from you looks okay. Unfortunately all of your previous
>>> emails from
>>> "toradex.com" were getting into the spam folder.
>>
>>
>> You sure they were from "toradex.com"? The patches should have been
>> coming from "ziswiler.com" resp. "perfora.net".
>
> The patches from "ziswiler.com" are fine, only your emails specifically from
> "toradex.com" had an issue. Looks like you've resolved it now.
>
Dmitry,
Gmail normally suspends flagging emails as spam from addresses you
respond to.
It may pick up again though, so I would add toradex.com to your allow list.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
On Tuesday, 24 July 2018 18:47:41 MSK Peter Geis wrote:
> On 07/24/2018 10:48 AM, Dmitry Osipenko wrote:
> > On Tuesday, 24 July 2018 17:45:01 MSK Marcel Ziswiler wrote:
> >> On Tue, 2018-07-24 at 17:31 +0300, Dmitry Osipenko wrote:
> >>> On Tuesday, 24 July 2018 17:16:33 MSK Marcel Ziswiler wrote:
> >>>> On Tue, 2018-07-24 at 15:44 +0300, Dmitry Osipenko wrote:
> >>>>> On Tuesday, 24 July 2018 15:24:34 MSK Marcel Ziswiler wrote:
> >>>>>> Sorry, I meant to write "minor revamp" in the subject line here
> >>>>>> as
> >>>>>> Apalis TK1 was already in quite good a shape but this are still
> >>>>>> some
> >>>>>> worthy improvements (;-p).
> >>>>>
> >>>>>> On Tue, 2018-07-24 at 12:42 +0200, Marcel Ziswiler wrote:
> >>>>> Marcel,
> >>>>>
> >>>>> All your emails that are sent from "toradex.com" are treated as
> >>>>> spam
> >>>>> by Gmail
> >>>>> because "This message has a from address in toradex.com but has
> >>>>> failed
> >>>>> toradex.com's required tests for authentication.", is there
> >>>>> anything
> >>>>> you could
> >>>>> do to fix that?
> >>>>
> >>>> Hi Dmitry
> >>>>
> >>>> Hm, unfortunately, Toradex was an M$ only shop when I joined more
> >>>> then
> >>>> 7 years ago and so far I was unable to convince our IT to switch to
> >>>> some grown up email system. Therefore, I am stuck with Exchange,
> >>>> Office
> >>>> 365 or whatever M$ nowadays seem to call it. Anyway, I really
> >>>> thought
> >>>> sending from Android or Evolution via their resp. Exchange
> >>>> connectors
> >>>> would properly do SPF, DKIM and even DMARC. I just confirmed this
> >>>> when
> >>>> sending something to my gmail address and doing "Show original".
> >>>>
> >>>> Since Linus himself pointed out any of my patches ending up in his
> >>>> spam
> >>>> folder I do send them via my private email which while not having
> >>>> any
> >>>> advanced security configured should still be valid. Moving it to a
> >>>> fully secure configuration including DNSSEC and stuff is still
> >>>> pending
> >>>> on my side.
> >>>>
> >>>> Can you please tell me which exact email it is that you got this
> >>>> reported on so I may further investigate what is going on?
> >>>
> >>> This email from you looks okay. Unfortunately all of your previous
> >>> emails from
> >>> "toradex.com" were getting into the spam folder.
> >>
> >> You sure they were from "toradex.com"? The patches should have been
> >> coming from "ziswiler.com" resp. "perfora.net".
> >
> > The patches from "ziswiler.com" are fine, only your emails specifically
> > from "toradex.com" had an issue. Looks like you've resolved it now.
>
> Dmitry,
> Gmail normally suspends flagging emails as spam from addresses you
> respond to.
> It may pick up again though, so I would add toradex.com to your allow list.
Yes, probably I could add a custom filter for the domain name. But It is not
really a problem for me, I just wanted to point Marcel at it.
On 24.07.2018 12:42, Marcel Ziswiler wrote:
> From: Marcel Ziswiler <[email protected]>
>
> Reorder PCIe properties.
Hm, first vs. last property, as far as I can tell there is no official
recommendation. Maybe Rob can comment on that?
Most device trees put status last, also the base device trees
tegra30.dtsi/tegra124.dtsi. So I think in this case we should go with
last property (before subnodes).
--
Stefan
>
> Signed-off-by: Marcel Ziswiler <[email protected]>
>
> ---
>
> 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(-)
>
> diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
> b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
> index 09e3641258ae..cb7e53c86408 100644
> --- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
> +++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
> @@ -39,9 +39,9 @@
>
> /* I210 Gigabit Ethernet Controller (On-module) */
> pci@2,0 {
> + status = "okay";
> phys = <&{/padctl@7009f000/pads/pcie/lanes/pcie-2}>;
> phy-names = "pcie-0";
> - status = "okay";
>
> pcie@0 {
> reg = <0 0 0 0 0>;
> diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi
> b/arch/arm/boot/dts/tegra124-apalis.dtsi
> index 5e7ae5e92fb8..d73ee974648a 100644
> --- a/arch/arm/boot/dts/tegra124-apalis.dtsi
> +++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
> @@ -74,9 +74,9 @@
>
> /* I210 Gigabit Ethernet Controller (On-module) */
> pci@2,0 {
> + status = "okay";
> phys = <&{/padctl@7009f000/pads/pcie/lanes/pcie-2}>;
> phy-names = "pcie-0";
> - status = "okay";
>
> pcie@0 {
> reg = <0 0 0 0 0>;
On 24.07.2018 12:43, Marcel Ziswiler wrote:
> From: Marcel Ziswiler <[email protected]>
>
> PLX got bought by Broadcom therefore fix device tree compatible string
> vendor which silences the following checkpatch.pl warning:
>
> WARNING: DT compatible string vendor "plx" appears un-documented
> -- check ./Documentation/devicetree/bindings/vendor-prefixes.txt
This seems to be not the only instance, there are other places where plx
prefix is used. There are 8 instances in total, 4 ARM (in fact all
Toradex device trees) and 4 PowerPC.
One device is already documented in
Documentation/devicetree/bindings/trivial-devices.txt:
plx,pex8648 48-Lane, 12-Port PCI Express Gen 2 (5.0 GT/s)
Switch
I suggest to just add plx as a valid vendor prefix by adding plx to
Documentation/devicetree/bindings/vendor-prefixes.txt:
plx Broadcom Corporation (formerly PLX Technology)
--
Stefan
>
> Signed-off-by: Marcel Ziswiler <[email protected]>
>
> ---
>
> 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(-)
>
> diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts
> b/arch/arm/boot/dts/tegra124-apalis-eval.dts
> index d9805fc97f5e..84ab7dc9febb 100644
> --- a/arch/arm/boot/dts/tegra124-apalis-eval.dts
> +++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts
> @@ -109,7 +109,7 @@
> clock-frequency = <400000>;
>
> pcie-switch@58 {
> - compatible = "plx,pex8605";
> + compatible = "brcm,pex8605";
> reg = <0x58>;
> };
>
> diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
> b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
> index 89783fe76f65..5319f88d3cab 100644
> --- a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
> +++ b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
> @@ -74,7 +74,7 @@
> clock-frequency = <400000>;
>
> pcie-switch@58 {
> - compatible = "plx,pex8605";
> + compatible = "brcm,pex8605";
> reg = <0x58>;
> };
On Tue, Jul 24, 2018 at 12:43:06PM +0200, Marcel Ziswiler wrote:
> From: Marcel Ziswiler <[email protected]>
>
> Add toradex,apalis-tk1-v1.2 compatible.
>
> Signed-off-by: Marcel Ziswiler <[email protected]>
>
> ---
>
> 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(-)
Reviewed-by: Rob Herring <[email protected]>