]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
arm: tegra: vcm30_t124: Create the MCM dtsi file
authorVipin Kumar <vipink@nvidia.com>
Tue, 22 Jul 2014 14:05:13 +0000 (19:35 +0530)
committerSandeep Trasi <strasi@nvidia.com>
Wed, 23 Jul 2014 17:59:53 +0000 (10:59 -0700)
This patch creates a dtsi file for vcm30t124 mcm which would then be
included in all board files using this mcm

Also move the dummy regulator to vcm30t124 dtsi

bug 1527003

Change-Id: I9dd6e4ddab8aca0a792df1c02c6966baa837bb5a
Signed-off-by: Vipin Kumar <vipink@nvidia.com>
Reviewed-on: http://git-master/r/441062
Reviewed-by: Sandeep Trasi <strasi@nvidia.com>
arch/arm/boot/dts/tegra124-p2360.dts
arch/arm/boot/dts/tegra124-platforms/tegra124-vcm30t124-fixed-reg.dtsi [moved from arch/arm/boot/dts/tegra124-platforms/tegra124-vcm30t124-fixed.dtsi with 81% similarity]
arch/arm/boot/dts/tegra124-vcm30_t124-vm_1.dts
arch/arm/boot/dts/tegra124-vcm30_t124-vm_2.dts
arch/arm/boot/dts/tegra124-vcm30_t124.dts
arch/arm/boot/dts/tegra124-vcm30_t124.dtsi [new file with mode: 0644]

index 9951e8e26a1e308184f23c794061194c6f6a0669..b24447107ec74d8a7eb47a4ac55310266d483c07 100644 (file)
@@ -21,7 +21,7 @@
  /dts-v1/;
 
 #include "tegra124.dtsi"
-#include <tegra124-platforms/tegra124-vcm30t124-fixed.dtsi>
+#include "tegra124-vcm30_t124.dtsi"
 
 / {
        model = "NVIDIA Tegra124 p2360";
@@ -90,7 +90,7 @@
                built-in;
                ddr-clk-limit = <51000000>;
                max-clk-limit = <200000000>;
-               vmmc-supply = <&vmmc>;
+               vmmc-supply = <&vmmc_dummy>;
                pll_source = "pll_m", "pll_p";
                status = "okay";
        };
similarity index 81%
rename from arch/arm/boot/dts/tegra124-platforms/tegra124-vcm30t124-fixed.dtsi
rename to arch/arm/boot/dts/tegra124-platforms/tegra124-vcm30t124-fixed-reg.dtsi
index 6a9e4de4c38b8392d410ef41506fcc5dfeb68c36..84188f099f1fbcef6d15a91bc5deadbce41225f8 100644 (file)
@@ -5,14 +5,12 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               vmmc: regulator@0 {
+               vmmc_dummy: regulator@0 {
                        compatible = "regulator-fixed";
-                       regulator-name = "vmmc-reg";
+                       regulator-name = "vmmc-dummy";
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
                        regulator-always-on;
-
                };
-
        };
 };
index c761bbd25920185f3e7b4d19a72c9dbb6dbb0bb6..1b6cac6d05662acc54a9662695656a3e16ed1824 100644 (file)
 
  /dts-v1/;
 
-#include "tegra124.dtsi"
+#include "tegra124-vcm30_t124.dtsi"
 #include <tegra124-platforms/tegra124-vcm30-t124-gpio-default.dtsi>
 #include <tegra124-platforms/tegra124-vcm30-t124-pinmux.dtsi>
-#include <tegra124-platforms/tegra124-vcm30t124-fixed.dtsi>
 
 
 / {
        #address-cells = <2>;
        #size-cells = <2>;
 
-       chosen {
-               nvidia,tegra-hypervisor-mode;
-       };
-
-       i2c@7000c400 {
-               nvidia,clock-always-on;
-       };
-
         serial@70006000 {
-                compatible = "nvidia,tegra114-hsuart";
                 status = "okay";
         };
 
         serial@70006040 {
-                compatible = "nvidia,tegra114-hsuart";
                 status = "okay";
         };
 
         serial@70006300 {
-                compatible = "nvidia,tegra114-hsuart";
                 status = "okay";
         };
 
        spi@7000d400 {
                status = "okay";
-               spi@0 {
-                       compatible = "spidev";
-                       reg = <0>;
-                       spi-max-frequency = <25000000>;
-                       /* spi-cpha;
-                        * spi-cpol;
-                        * spi-cs-high;
-                        */
-               };
        };
 
        spi@7000d600 {
                status = "okay";
-               spi@0 {
-                       compatible = "spidev";
-                       reg = <0>;
-                       spi-max-frequency = <25000000>;
-               };
        };
 
        spi@7000d800 {
                status = "okay";
-               spi@0 {
-                       compatible = "spidev";
-                       reg = <0>;
-                       spi-max-frequency = <25000000>;
-               };
        };
 
        spi@7000dc00 {
                status = "okay";
-               spi@0 {
-                       compatible = "spidev";
-                       reg = <0>;
-                       spi-max-frequency = <25000000>;
-               };
        };
 
        ahub {
        };
 
        pcie-controller {
-               nvidia,port0_status = <1>;
-               nvidia,port1_status = <1>;
                status = "okay";
        };
 
        sata@0x70020000 {
                status = "okay";
-               nvidia,enable-sata-port;
        };
 
        sdhci@700b0600 {
-               tap-delay = <0x4>;
-               trim-delay = <0x4>;
-               ddr-trim-delay = <0x4>;
-               mmc-ocr-mask = <0>;
-               uhs_mask = <0x20>;
-               bus-width = <8>;
-               built-in;
-               ddr-clk-limit = <51000000>;
-               max-clk-limit = <200000000>;
-               pll_source = "pll_m", "pll_p";
-               vmmc-supply = <&vmmc>;
                status = "okay";
        };
 
        sdhci@700b0200 {
-               tap-delay = <0x1>;
-               trim-delay = <0x3>;
-               ddr-trim-delay = <0x3>;
-               mmc-ocr-mask = <0>;
-               uhs_mask = <0x20>;
-               built-in;
-               ddr-clk-limit = <30000000>;
-               max-clk-limit = <51000000>;
-               pll_source = "pll_m", "pll_p";
-               vmmc-supply = <&vmmc>;
                status = "disabled";
        };
 
        sdhci@700b0400 {
-               cd-gpios = <&gpio 133 0>;
-               wp-gpios = <&gpio 132 0>;
-               tap-delay = <0>;
-               trim-delay = <3>;
-               mmc-ocr-mask = <3>;
-               uhs_mask = <0x2F>;
-               bus-width = <4>;
-               max-clk-limit = <50000000>;
-               pll_source = "pll_m", "pll_p";
-               vmmc-supply = <&vmmc>;
                status = "okay";
        };
 
index 7dbc8f1dd160e41ced637a48c99115cb26ef7027..c77fd1e9e9b1d91686b9086eec662c2fd2384f0f 100644 (file)
 
  /dts-v1/;
 
-#include "tegra124.dtsi"
+#include "tegra124-vcm30_t124.dtsi"
 #include <tegra124-platforms/tegra124-vcm30-t124-gpio-default.dtsi>
 #include <tegra124-platforms/tegra124-vcm30-t124-pinmux.dtsi>
-#include <tegra124-platforms/tegra124-vcm30t124-fixed.dtsi>
 
 
 / {
        #address-cells = <2>;
        #size-cells = <2>;
 
-       chosen {
-               nvidia,tegra-hypervisor-mode;
-       };
-
-       i2c@7000c400 {
-               nvidia,clock-always-on;
-       };
-
-
         serial@70006000 {
-                compatible = "nvidia,tegra114-hsuart";
                 status = "disabled";
         };
 
         serial@70006040 {
-                compatible = "nvidia,tegra114-hsuart";
                 status = "disabled";
         };
 
         serial@70006300 {
-                compatible = "nvidia,tegra114-hsuart";
                 status = "disabled";
         };
 
        spi@7000d400 {
                status = "disabled";
-               spi@0 {
-                       compatible = "spidev";
-                       reg = <0>;
-                       spi-max-frequency = <25000000>;
-                       /* spi-cpha;
-                        * spi-cpol;
-                        * spi-cs-high;
-                        */
-               };
        };
 
        spi@7000d600 {
                status = "disabled";
-               spi@0 {
-                       compatible = "spidev";
-                       reg = <0>;
-                       spi-max-frequency = <25000000>;
-               };
        };
 
        spi@7000d800 {
                status = "disabled";
-               spi@0 {
-                       compatible = "spidev";
-                       reg = <0>;
-                       spi-max-frequency = <25000000>;
-               };
        };
 
        spi@7000dc00 {
                status = "disabled";
-               spi@0 {
-                       compatible = "spidev";
-                       reg = <0>;
-                       spi-max-frequency = <25000000>;
-               };
        };
 
        ahub {
        };
 
        pcie-controller {
-               nvidia,port0_status = <1>;
-               nvidia,port1_status = <1>;
                status = "disabled";
        };
 
        sata@0x70020000 {
                status = "disabled";
-               nvidia,enable-sata-port;
        };
 
        sdhci@700b0600 {
-               tap-delay = <0x4>;
-               trim-delay = <0x4>;
-               ddr-trim-delay = <0x4>;
-               mmc-ocr-mask = <0>;
-               uhs_mask = <0x20>;
-               bus-width = <8>;
-               built-in;
-               ddr-clk-limit = <51000000>;
-               max-clk-limit = <200000000>;
-               vmmc-supply = <&vmmc>;
-               pll_source = "pll_m", "pll_p";
                status = "disabled";
        };
 
        sdhci@700b0200 {
-               tap-delay = <0x1>;
-               trim-delay = <0x3>;
-               ddr-trim-delay = <0x3>;
-               mmc-ocr-mask = <0>;
-               uhs_mask = <0x20>;
-               built-in;
-               ddr-clk-limit = <30000000>;
-               max-clk-limit = <51000000>;
-               vmmc-supply = <&vmmc>;
-               pll_source = "pll_m", "pll_p";
                status = "okay";
        };
 
        sdhci@700b0400 {
-               cd-gpios = <&gpio 133 0>;
-               wp-gpios = <&gpio 132 0>;
-               tap-delay = <0>;
-               trim-delay = <3>;
-               mmc-ocr-mask = <3>;
-               uhs_mask = <0x2F>;
-               bus-width = <4>;
-               max-clk-limit = <50000000>;
-               vmmc-supply = <&vmmc>;
-               pll_source = "pll_m", "pll_p";
                status = "disabled";
        };
 
index 72ecdb2ff12618dd474cf5cccddbb53f793ab0f6..9efd7a64e5b994f01ad9f620569811422c561ca9 100644 (file)
 
  /dts-v1/;
 
-#include "tegra124.dtsi"
+#include "tegra124-vcm30_t124.dtsi"
 #include <tegra124-platforms/tegra124-vcm30-t124-gpio-default.dtsi>
 #include <tegra124-platforms/tegra124-vcm30-t124-pinmux.dtsi>
-#include <tegra124-platforms/tegra124-vcm30t124-fixed.dtsi>
 #include <panel-a-edp-1080p-14-0.dtsi>
 #include <tegra124-platforms/tegra124-vcm30-t124-hdmi.dtsi>
 
        #address-cells = <2>;
        #size-cells = <2>;
 
-       chosen {
-               nvidia,tegra-hypervisor-mode;
-       };
-
        host1x {
                sor {
                        status = "okay";
                                };
                        };
                };
+
                dpaux {
                        status = "okay";
                };
+
                /* tegradc.0 */
                dc@54200000 {
-                       status = "okay";
                        nvidia,dc-flags = <TEGRA_DC_FLAG_ENABLED>;
                        nvidia,emc-clk-rate = <204000000>;
                        nvidia,fb-bpp = <32>; /* bits per pixel */
                        nvidia,cmu-enable = <1>;
+                       status = "okay";
                };
+
                /* tegradc.1 */
                dc@54240000 {
-                       status = "okay";
                        nvidia,emc-clk-rate = <300000000>;
                        nvidia,fb-bpp = <32>; /* bits per pixel */
+                       status = "okay";
                };
        };
 
        };
 
        serial@70006000 {
-               compatible = "nvidia,tegra114-hsuart";
                status = "okay";
        };
 
        serial@70006040 {
-               compatible = "nvidia,tegra114-hsuart";
                status = "okay";
        };
 
        serial@70006300 {
-               compatible = "nvidia,tegra114-hsuart";
                status = "okay";
        };
 
        spi@7000d400 {
                status = "okay";
-               spi@0 {
-                       compatible = "spidev";
-                       reg = <0>;
-                       spi-max-frequency = <25000000>;
-                       /* spi-cpha;
-                        * spi-cpol;
-                        * spi-cs-high;
-                        */
-               };
        };
 
        spi@7000d600 {
                status = "okay";
-               spi@0 {
-                       compatible = "spidev";
-                       reg = <0>;
-                       spi-max-frequency = <25000000>;
-               };
        };
 
        spi@7000d800 {
                status = "okay";
-               spi@0 {
-                       compatible = "spidev";
-                       reg = <0>;
-                       spi-max-frequency = <25000000>;
-               };
        };
 
        spi@7000dc00 {
                status = "okay";
-               spi@0 {
-                       compatible = "spidev";
-                       reg = <0>;
-                       spi-max-frequency = <25000000>;
-               };
        };
 
        xusb@70090000 {
-               nvidia,gpio_ss1_sata = <0>;
-
-               /*
-                * BIT0 - BIT7 : SS ports
-                * BIT8 - BIT15 : USB2 UTMI ports
-                * BIT16 - BIT23 : HSIC ports
-                * BIT24 - BIT31 : ULPI ports
-                * XXXX XXXP XXXX XXHH XXXX XUUU XXXX XXSS
-                */
-               nvidia,portmap = <0x402>; /* SSP1, USB2P2 */
-               /* XXXX .. XSSS XSSS */
-               nvidia,ss_portmap = <0x20>; /* SSP1 on USB2P2 */
-
-               /*
-                * BIT 2 (0/1): PCIE-0/SSP0
-                * BIT 1 (0/1): PCIE-1/SSP1
-                * BIT 0 (0/1): SATA/SSP1
-                */
-               nvidia,lane_owner = <0x2>; /* PCIE-0, SSP1 and SATA */
-               nvidia,ulpicap = <0>; /* No ulpi support */
                status = "okay";
        };
 
        };
 
        pcie-controller {
-               nvidia,port0_status = <1>;
-               nvidia,port1_status = <1>;
                status = "okay";
        };
 
        sata@0x70020000 {
                status = "okay";
-               nvidia,enable-sata-port;
        };
 
        sdhci@700b0600 {
-               tap-delay = <0x4>;
-               trim-delay = <0x4>;
-               ddr-trim-delay = <0x4>;
-               mmc-ocr-mask = <0>;
-               uhs_mask = <0x40>;
-               bus-width = <8>;
-               built-in;
-               ddr-clk-limit = <51000000>;
-               max-clk-limit = <200000000>;
-               vmmc-supply = <&vmmc>;
-               pll_source = "pll_m", "pll_p";
                status = "okay";
        };
 
        sdhci@700b0200 {
-               tap-delay = <0x1>;
-               trim-delay = <0x3>;
-               ddr-trim-delay = <0x3>;
-               mmc-ocr-mask = <0>;
-               uhs_mask = <0x20>;
-               built-in;
-               ddr-clk-limit = <30000000>;
-               max-clk-limit = <51000000>;
-               pll_source = "pll_m", "pll_p";
-               vmmc-supply = <&vmmc>;
                status = "okay";
        };
 
        sdhci@700b0400 {
-               cd-gpios = <&gpio 133 0>;
-               wp-gpios = <&gpio 132 0>;
-               tap-delay = <0>;
-               trim-delay = <3>;
-               mmc-ocr-mask = <3>;
-               uhs_mask = <0x28>;
-               bus-width = <4>;
-               max-clk-limit = <204000000>;
-               pll_source = "pll_m", "pll_p";
-               vmmc-supply = <&vmmc>;
                status = "okay";
        };
+
        bluedroid_pm {
                compatible = "nvidia,tegra-bluedroid_pm";
                id = <0>;
diff --git a/arch/arm/boot/dts/tegra124-vcm30_t124.dtsi b/arch/arm/boot/dts/tegra124-vcm30_t124.dtsi
new file mode 100644 (file)
index 0000000..ff4fa51
--- /dev/null
@@ -0,0 +1,168 @@
+/*
+ * arch/arm/boot/dts/tegra124-vcm30_t124.dtsi
+ *
+ * Copyright (c) 2014, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * 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 "tegra124.dtsi"
+#include <tegra124-platforms/tegra124-vcm30t124-fixed-reg.dtsi>
+
+/ {
+       #address-cells = <2>;
+       #size-cells = <2>;
+
+       chosen {
+               nvidia,tegra-hypervisor-mode;
+       };
+
+       i2c@7000c400 {
+               nvidia,clock-always-on;
+       };
+
+       serial@70006000 {
+               compatible = "nvidia,tegra114-hsuart";
+               status = "disabled";
+       };
+
+       serial@70006040 {
+               compatible = "nvidia,tegra114-hsuart";
+               status = "disabled";
+       };
+
+       serial@70006300 {
+               compatible = "nvidia,tegra114-hsuart";
+               status = "disabled";
+       };
+
+       spi@7000d400 {
+               status = "disabled";
+               spi@0 {
+                       compatible = "spidev";
+                       reg = <0>;
+                       spi-max-frequency = <25000000>;
+                       /* spi-cpha;
+                        * spi-cpol;
+                        * spi-cs-high;
+                        */
+               };
+       };
+
+       spi@7000d600 {
+               status = "disabled";
+               spi@0 {
+                       compatible = "spidev";
+                       reg = <0>;
+                       spi-max-frequency = <25000000>;
+               };
+       };
+
+       spi@7000d800 {
+               status = "disabled";
+               spi@0 {
+                       compatible = "spidev";
+                       reg = <0>;
+                       spi-max-frequency = <25000000>;
+               };
+       };
+
+       spi@7000dc00 {
+               status = "disabled";
+               spi@0 {
+                       compatible = "spidev";
+                       reg = <0>;
+                       spi-max-frequency = <25000000>;
+               };
+       };
+
+       xusb@70090000 {
+               status = "disabled";
+               nvidia,gpio_ss1_sata = <0>;
+
+               /*
+                * BIT0 - BIT7 : SS ports
+                * BIT8 - BIT15 : USB2 UTMI ports
+                * BIT16 - BIT23 : HSIC ports
+                * BIT24 - BIT31 : ULPI ports
+                * XXXX XXXP XXXX XXHH XXXX XUUU XXXX XXSS
+                */
+               nvidia,portmap = <0x402>; /* SSP1, USB2P2 */
+               /* XXXX .. XSSS XSSS */
+               nvidia,ss_portmap = <0x20>; /* SSP1 on USB2P2 */
+
+               /*
+                * BIT 2 (0/1): PCIE-0/SSP0
+                * BIT 1 (0/1): PCIE-1/SSP1
+                * BIT 0 (0/1): SATA/SSP1
+                */
+               nvidia,lane_owner = <0x2>; /* PCIE-0, SSP1 and SATA */
+               nvidia,ulpicap = <0>; /* No ulpi support */
+       };
+
+       pcie-controller {
+               nvidia,port0_status = <1>;
+               nvidia,port1_status = <1>;
+               status = "disabled";
+       };
+
+       sata@0x70020000 {
+               nvidia,enable-sata-port;
+               status = "disabled";
+       };
+
+       sdhci@700b0600 {
+               tap-delay = <0x4>;
+               trim-delay = <0x4>;
+               ddr-trim-delay = <0x4>;
+               mmc-ocr-mask = <0>;
+               uhs_mask = <0x40>;
+               bus-width = <8>;
+               built-in;
+               ddr-clk-limit = <51000000>;
+               max-clk-limit = <200000000>;
+               pll_source = "pll_m", "pll_p";
+               vmmc-supply = <&vmmc_dummy>;
+               status = "disabled";
+       };
+
+       sdhci@700b0200 {
+               tap-delay = <0x1>;
+               trim-delay = <0x3>;
+               ddr-trim-delay = <0x3>;
+               mmc-ocr-mask = <0>;
+               uhs_mask = <0x20>;
+               built-in;
+               ddr-clk-limit = <30000000>;
+               max-clk-limit = <51000000>;
+               pll_source = "pll_m", "pll_p";
+               vmmc-supply = <&vmmc_dummy>;
+               status = "disabled";
+       };
+
+       sdhci@700b0400 {
+               cd-gpios = <&gpio 133 0>;
+               wp-gpios = <&gpio 132 0>;
+               tap-delay = <0>;
+               trim-delay = <3>;
+               mmc-ocr-mask = <3>;
+               uhs_mask = <0x28>;
+               bus-width = <4>;
+               max-clk-limit = <204000000>;
+               pll_source = "pll_m", "pll_p";
+               vmmc-supply = <&vmmc_dummy>;
+               status = "disabled";
+       };
+};