projects / oweals / u-boot.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
arm: dts: lx2160a: add noted for dpmacs 1, 2, 5-6
[oweals/u-boot.git] / arch / arm / dts / tegra124-apalis.dts
diff --git a/arch/arm/dts/tegra124-apalis.dts b/arch/arm/dts/tegra124-apalis.dts
index 3853a28663c986aa87fe77236780e868d901b26e..08184ab3ac29d0d7901027a6ac5d1cbe93611646 100644 (file)
--- a/arch/arm/dts/tegra124-apalis.dts
+++ b/arch/arm/dts/tegra124-apalis.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Toradex AG
+ * Copyright 2016-2019 Toradex AG
  *
  * This file is dual-licensed: you can use it either under the terms
  * of the GPL or the X11 license, at your option. Note that this dual
@@ -77,7 +77,7 @@
                reg = <0x0 0x80000000 0x0 0x80000000>;
        };
 
-       pcie-controller@01003000 {
+       pcie@1003000 {
                status = "okay";
                avddio-pex-supply = <&vdd_1v05>;
                avdd-pex-pll-supply = <&vdd_1v05>;
@@ -230,19 +230,21 @@
                        };
 
                        /* Apalis GPIO */
-                       ddc_scl_pv4 {
-                               nvidia,pins = "ddc_scl_pv4";
+                       usb_vbus_en0_pn4 {
+                               nvidia,pins = "usb_vbus_en0_pn4";
                                nvidia,function = "rsvd2";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                               nvidia,open-drain = <TEGRA_PIN_DISABLE>;
                        };
-                       ddc_sda_pv5 {
-                               nvidia,pins = "ddc_sda_pv5";
+                       usb_vbus_en1_pn5 {
+                               nvidia,pins = "usb_vbus_en1_pn5";
                                nvidia,function = "rsvd2";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                               nvidia,open-drain = <TEGRA_PIN_DISABLE>;
                        };
                        pex_l0_rst_n_pdd1 {
                                nvidia,pins = "pex_l0_rst_n_pdd1";
@@ -333,40 +335,40 @@
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
                        };
 
-                       /* Apalis I2C2 (DDC) */
-                       gen2_i2c_scl_pt5 {
-                               nvidia,pins = "gen2_i2c_scl_pt5";
-                               nvidia,function = "i2c2";
+                       /* Apalis I2C3 (CAM) */
+                       cam_i2c_scl_pbb1 {
+                               nvidia,pins = "cam_i2c_scl_pbb1";
+                               nvidia,function = "i2c3";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
                        };
-                       gen2_i2c_sda_pt6 {
-                               nvidia,pins = "gen2_i2c_sda_pt6";
-                               nvidia,function = "i2c2";
+                       cam_i2c_sda_pbb2 {
+                               nvidia,pins = "cam_i2c_sda_pbb2";
+                               nvidia,function = "i2c3";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
                        };
 
-                       /* Apalis I2C3 (CAM) */
-                       cam_i2c_scl_pbb1 {
-                               nvidia,pins = "cam_i2c_scl_pbb1";
-                               nvidia,function = "i2c3";
+                       /* Apalis I2C4 (DDC) */
+                       ddc_scl_pv4 {
+                               nvidia,pins = "ddc_scl_pv4";
+                               nvidia,function = "i2c4";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,open-drain = <TEGRA_PIN_ENABLE>;
+                               nvidia,rcv-sel = <TEGRA_PIN_DISABLE>;
                        };
-                       cam_i2c_sda_pbb2 {
-                               nvidia,pins = "cam_i2c_sda_pbb2";
-                               nvidia,function = "i2c3";
+                       ddc_sda_pv5 {
+                               nvidia,pins = "ddc_sda_pv5";
+                               nvidia,function = "i2c4";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
-                               nvidia,open-drain = <TEGRA_PIN_ENABLE>;
+                               nvidia,rcv-sel = <TEGRA_PIN_DISABLE>;
                        };
 
                        /* Apalis MMC1 */
@@ -470,12 +472,12 @@
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
                        };
-                       /* PWM3 active on pu6 being Apalis BKL1_PWM */
+                       /* PWM3 active on pu6 being Apalis BKL1_PWM as well */
                        ph3 {
                                nvidia,pins = "ph3";
-                               nvidia,function = "gmi";
-                               nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
-                               nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                               nvidia,function = "pwm3";
+                               nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                               nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
                        };
 
@@ -736,8 +738,8 @@
                        };
 
                        /* Apalis USBH_EN */
-                       usb_vbus_en1_pn5 {
-                               nvidia,pins = "usb_vbus_en1_pn5";
+                       gen2_i2c_sda_pt6 {
+                               nvidia,pins = "gen2_i2c_sda_pt6";
                                nvidia,function = "rsvd2";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
@@ -755,8 +757,8 @@
                        };
 
                        /* Apalis USBO1_EN */
-                       usb_vbus_en0_pn4 {
-                               nvidia,pins = "usb_vbus_en0_pn4";
+                       gen2_i2c_scl_pt5 {
+                               nvidia,pins = "gen2_i2c_scl_pt5";
                                nvidia,function = "rsvd2";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
@@ -1501,10 +1503,14 @@
                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
                        };
-                       pv0 { /* NC */
+                       /*
+                        * PCB Version Indication: V1.2 and later have GPIO_PV0
+                        * wired to GND, was NC before
+                        */
+                       pv0 {
                                nvidia,pins = "pv0";
                                nvidia,function = "rsvd1";
-                               nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                               nvidia,pull = <TEGRA_PIN_PULL_UP>;
                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
                        };
@@ -1610,17 +1616,13 @@
                status = "okay";
        };
 
-       hdmi_ddc: i2c@7000c400 {
-               clock-frequency = <100000>;
-       };
-
        /*
         * GEN1_I2C: I2C1_SDA/SCL on MXM3 pin 209/211 (e.g. RTC on carrier
         * board)
         */
        i2c@7000c000 {
                status = "okay";
-               clock-frequency = <100000>;
+               clock-frequency = <400000>;
 
                pcie-switch@58 {
                        compatible = "plx,pex8605";
@@ -1634,13 +1636,7 @@
                };
        };
 
-       /*
-        * GEN2_I2C: I2C2_SDA/SCL (DDC) on MXM3 pin 205/207 (e.g. display EDID)
-        */
-       hdmi_ddc: i2c@7000c400 {
-               status = "okay";
-               clock-frequency = <100000>;
-       };
+       /* GEN2_I2C: unused */
 
        /*
         * CAM_I2C: I2C3_SDA/SCL (CAM) on MXM3 pin 201/203 (e.g. camera sensor
@@ -1648,10 +1644,17 @@
         */
        i2c@7000c500 {
                status = "okay";
-               clock-frequency = <100000>;
+               clock-frequency = <400000>;
        };
 
-       /* I2C4 (DDC): unused */
+       /*
+        * I2C4 (DDC): I2C4_SDA/SCL (DDC) on MXM3 pin 205/207
+        * (e.g. display EDID)
+        */
+       hdmi_ddc: i2c@7000c700 {
+               status = "okay";
+               clock-frequency = <10000>;
+       };
 
        /* PWR_I2C: power I2C to audio codec, PMIC and temperature sensor */
        i2c@7000d000 {
@@ -1687,9 +1690,9 @@
                                        bias-pull-up;
                                };
 
-                               gpio1_3_4_5_6 {
-                                       pins = "gpio1", "gpio3", "gpio4",
-                                              "gpio5", "gpio6";
+                               gpio0_1_3_4_5_6 {
+                                       pins = "gpio0", "gpio1", "gpio3",
+                                              "gpio4", "gpio5", "gpio6";
                                        bias-high-impedance;
                                };
                        };
@@ -2116,7 +2119,7 @@
                regulator-name = "VCC_USBO1";
                regulator-min-microvolt = <5000000>;
                regulator-max-microvolt = <5000000>;
-               gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio TEGRA_GPIO(T, 5) GPIO_ACTIVE_HIGH>;
                enable-active-high;
                vin-supply = <&reg_5v0>;
        };
@@ -2127,7 +2130,7 @@
                regulator-name = "VCC_USBH(2A|2C|2D|3|4)";
                regulator-min-microvolt = <5000000>;
                regulator-max-microvolt = <5000000>;
-               gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio TEGRA_GPIO(T, 6) GPIO_ACTIVE_HIGH>;
                enable-active-high;
                vin-supply = <&reg_5v0>;
        };
Unnamed repository; edit this file 'description' to name the repository.