arm64: l4t: move dt-override to top DT file

Move dt-override property to top DT file.
Base DT file to be used by platforms not
using dt-override property.

Also update Copyrigt header.

Bug 200075459

Change-Id: Icf009a9556ad82e80a8bfe6c359dac1e64960793
Signed-off-by: Shreshtha SAHU <ssahu@nvidia.com>
Reviewed-on: http://git-master/r/715173
GVS: Gerrit_Virtual_Submit
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>

diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
index 908dd09cceb10bb031e3397000adba6c5db0fc5e..56d24c87625d32e7340d357943af87516cf9a846 100644 (file)
--- a/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@ -44,6 +44,7 @@ dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-e-e2581-0031-a00-00.dtb
 dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-e-e2581-0031-a01-00.dtb
 dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-e-e2581-0131-a00-00.dtb
 dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-e-e2581-0131-a01-00.dtb
+dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-jetson-e-base-p2595-0000-a00.dtb
 dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-jetson-e-p2595-0000-a00-00.dtb
 dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-a00-00.dtb
 dtb-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra186-sim-cl33823014.dtb

diff --git a/arch/arm64/boot/dts/tegra210-jetson-e-base-p2595-0000-a00.dts b/arch/arm64/boot/dts/tegra210-jetson-e-base-p2595-0000-a00.dts
index 69c10ccebf3b5b6dd55b19189e34ca11c293f125..513014c09335caf776dd7f8b85f18abc0e04401b 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-jetson-e-base-p2595-0000-a00.dts
+++ b/arch/arm64/boot/dts/tegra210-jetson-e-base-p2595-0000-a00.dts
@@ -12,10 +12,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
  */
 
 /dts-v1/;
@@ -321,14 +317,12 @@
                nvidia,port-otg;
                nvidia,charging-supported;
                #extcon-cells = <1>;
-               status = "disabled";
-               dt-override-status-odm-data = <0x01000000 0x00000000>;
+               status = "okay";
        };
 
         otg@7d000000 {
                #extcon-cells = <1>;
-               status = "disabled";
-               dt-override-status-odm-data = <0x01000000 0x00000000>;
+               status = "okay";
        };
 
        xusb_pad_ctl: padctl@0 { /* Put common control config here */
@@ -352,14 +346,12 @@
                nvidia,portmap = <0x0108>;
                #extcon-cells = <1>;
                status = "disabled";
-               dt-override-status-odm-data = <0x01000000 0x01000000>;
        };
 
        xotg {
                #extcon-cells = <1>;
                nvidia,common_padctl = <&xusb_pad_ctl>;
                status = "disabled";
-               dt-override-status-odm-data = <0x01000000 0x01000000>;
        };
 
        gpio-keys {

diff --git a/arch/arm64/boot/dts/tegra210-jetson-e-p2595-0000-a00-00.dts b/arch/arm64/boot/dts/tegra210-jetson-e-p2595-0000-a00-00.dts
index 38404ba5fb232da353179e99352a2a673646b618..abd6515c4cbd895e3ae45cde4d64529390dce6c6 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-jetson-e-p2595-0000-a00-00.dts
+++ b/arch/arm64/boot/dts/tegra210-jetson-e-p2595-0000-a00-00.dts
@@ -12,10 +12,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
  */
 
 #include "tegra210-jetson-e-base-p2595-0000-a00.dts"
@@ -29,4 +25,28 @@
        #address-cells = <2>;
        #size-cells = <2>;
 
+       udc@7d000000 {
+               #extcon-cells = <1>;
+               status = "disabled";
+               dt-override-status-odm-data = <0x01000000 0x00000000>;
+       };
+
+        otg@7d000000 {
+               #extcon-cells = <1>;
+               status = "disabled";
+               dt-override-status-odm-data = <0x01000000 0x00000000>;
+       };
+
+       xudc@700d0000 {
+               #extcon-cells = <1>;
+               status = "disabled";
+               dt-override-status-odm-data = <0x01000000 0x01000000>;
+       };
+
+       xotg {
+               #extcon-cells = <1>;
+               status = "disabled";
+               dt-override-status-odm-data = <0x01000000 0x01000000>;
+       };
+
 };