ARM: dt: tegra: rename board files to match SoC
authorStephen Warren <swarren@nvidia.com>
Mon, 11 Jun 2012 22:25:07 +0000 (16:25 -0600)
committerStephen Warren <swarren@nvidia.com>
Wed, 20 Jun 2012 18:30:10 +0000 (12:30 -0600)
Most ARM ${board}.dts files are already named ${soc}-${board}.dts. This
change modifies the Tegra board files to be named the same way for
consistency.

Once a related change is made in U-Boot, this will cause both U-Boot and
the kernel to use the same names for the .dts files and SoC identifiers,
thus allowing U-Boot's recently added "soc" and "board" environment
variables to be used to construct the name of Tegra .dtb files, and hence
allow board-generic U-Boot bootcmd scripts to be written.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
13 files changed:
arch/arm/boot/dts/tegra-cardhu.dts [deleted file]
arch/arm/boot/dts/tegra-harmony.dts [deleted file]
arch/arm/boot/dts/tegra-paz00.dts [deleted file]
arch/arm/boot/dts/tegra-seaboard.dts [deleted file]
arch/arm/boot/dts/tegra-trimslice.dts [deleted file]
arch/arm/boot/dts/tegra-ventana.dts [deleted file]
arch/arm/boot/dts/tegra20-harmony.dts [new file with mode: 0644]
arch/arm/boot/dts/tegra20-paz00.dts [new file with mode: 0644]
arch/arm/boot/dts/tegra20-seaboard.dts [new file with mode: 0644]
arch/arm/boot/dts/tegra20-trimslice.dts [new file with mode: 0644]
arch/arm/boot/dts/tegra20-ventana.dts [new file with mode: 0644]
arch/arm/boot/dts/tegra30-cardhu.dts [new file with mode: 0644]
arch/arm/mach-tegra/Makefile.boot

diff --git a/arch/arm/boot/dts/tegra-cardhu.dts b/arch/arm/boot/dts/tegra-cardhu.dts
deleted file mode 100644 (file)
index c169bce..0000000
+++ /dev/null
@@ -1,171 +0,0 @@
-/dts-v1/;
-
-/include/ "tegra30.dtsi"
-
-/ {
-       model = "NVIDIA Tegra30 Cardhu evaluation board";
-       compatible = "nvidia,cardhu", "nvidia,tegra30";
-
-       memory {
-               reg = <0x80000000 0x40000000>;
-       };
-
-       pinmux {
-               pinctrl-names = "default";
-               pinctrl-0 = <&state_default>;
-
-               state_default: pinmux {
-                       sdmmc1_clk_pz0 {
-                               nvidia,pins = "sdmmc1_clk_pz0";
-                               nvidia,function = "sdmmc1";
-                               nvidia,pull = <0>;
-                               nvidia,tristate = <0>;
-                       };
-                       sdmmc1_cmd_pz1 {
-                               nvidia,pins =   "sdmmc1_cmd_pz1",
-                                               "sdmmc1_dat0_py7",
-                                               "sdmmc1_dat1_py6",
-                                               "sdmmc1_dat2_py5",
-                                               "sdmmc1_dat3_py4";
-                               nvidia,function = "sdmmc1";
-                               nvidia,pull = <2>;
-                               nvidia,tristate = <0>;
-                       };
-                       sdmmc4_clk_pcc4 {
-                               nvidia,pins =   "sdmmc4_clk_pcc4",
-                                               "sdmmc4_rst_n_pcc3";
-                               nvidia,function = "sdmmc4";
-                               nvidia,pull = <0>;
-                               nvidia,tristate = <0>;
-                       };
-                       sdmmc4_dat0_paa0 {
-                               nvidia,pins =   "sdmmc4_dat0_paa0",
-                                               "sdmmc4_dat1_paa1",
-                                               "sdmmc4_dat2_paa2",
-                                               "sdmmc4_dat3_paa3",
-                                               "sdmmc4_dat4_paa4",
-                                               "sdmmc4_dat5_paa5",
-                                               "sdmmc4_dat6_paa6",
-                                               "sdmmc4_dat7_paa7";
-                               nvidia,function = "sdmmc4";
-                               nvidia,pull = <2>;
-                               nvidia,tristate = <0>;
-                       };
-                       dap2_fs_pa2 {
-                               nvidia,pins =   "dap2_fs_pa2",
-                                               "dap2_sclk_pa3",
-                                               "dap2_din_pa4",
-                                               "dap2_dout_pa5";
-                               nvidia,function = "i2s1";
-                               nvidia,pull = <0>;
-                               nvidia,tristate = <0>;
-                       };
-               };
-       };
-
-       serial@70006000 {
-               status = "okay";
-               clock-frequency = <408000000>;
-       };
-
-       i2c@7000c000 {
-               status = "okay";
-               clock-frequency = <100000>;
-       };
-
-       i2c@7000c400 {
-               status = "okay";
-               clock-frequency = <100000>;
-       };
-
-       i2c@7000c500 {
-               status = "okay";
-               clock-frequency = <100000>;
-
-               /* ALS and Proximity sensor */
-               isl29028@44 {
-                       compatible = "isil,isl29028";
-                       reg = <0x44>;
-                       interrupt-parent = <&gpio>;
-                       interrupts = <88 0x04>; /*gpio PL0 */
-               };
-       };
-
-       i2c@7000c700 {
-               status = "okay";
-               clock-frequency = <100000>;
-       };
-
-       i2c@7000d000 {
-               status = "okay";
-               clock-frequency = <100000>;
-
-               wm8903: wm8903@1a {
-                       compatible = "wlf,wm8903";
-                       reg = <0x1a>;
-                       interrupt-parent = <&gpio>;
-                       interrupts = <179 0x04>; /* gpio PW3 */
-
-                       gpio-controller;
-                       #gpio-cells = <2>;
-
-                       micdet-cfg = <0>;
-                       micdet-delay = <100>;
-                       gpio-cfg = <0xffffffff 0xffffffff 0 0xffffffff 0xffffffff>;
-               };
-
-               tps62361 {
-                       compatible = "ti,tps62361";
-                       reg = <0x60>;
-
-                       regulator-name = "tps62361-vout";
-                       regulator-min-microvolt = <500000>;
-                       regulator-max-microvolt = <1500000>;
-                       regulator-boot-on;
-                       regulator-always-on;
-                       ti,vsel0-state-high;
-                       ti,vsel1-state-high;
-               };
-       };
-
-       ahub {
-               i2s@70080400 {
-                       status = "okay";
-               };
-       };
-
-       sdhci@78000000 {
-               status = "okay";
-               cd-gpios = <&gpio 69 0>; /* gpio PI5 */
-               wp-gpios = <&gpio 155 0>; /* gpio PT3 */
-               power-gpios = <&gpio 31 0>; /* gpio PD7 */
-               bus-width = <4>;
-       };
-
-       sdhci@78000600 {
-               status = "okay";
-               bus-width = <8>;
-       };
-
-       sound {
-               compatible = "nvidia,tegra-audio-wm8903-cardhu",
-                            "nvidia,tegra-audio-wm8903";
-               nvidia,model = "NVIDIA Tegra Cardhu";
-
-               nvidia,audio-routing =
-                       "Headphone Jack", "HPOUTR",
-                       "Headphone Jack", "HPOUTL",
-                       "Int Spk", "ROP",
-                       "Int Spk", "RON",
-                       "Int Spk", "LOP",
-                       "Int Spk", "LON",
-                       "Mic Jack", "MICBIAS",
-                       "IN1L", "Mic Jack";
-
-               nvidia,i2s-controller = <&tegra_i2s1>;
-               nvidia,audio-codec = <&wm8903>;
-
-               nvidia,spkr-en-gpios = <&wm8903 2 0>;
-               nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
-       };
-};
diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts
deleted file mode 100644 (file)
index f146dbf..0000000
+++ /dev/null
@@ -1,336 +0,0 @@
-/dts-v1/;
-
-/include/ "tegra20.dtsi"
-
-/ {
-       model = "NVIDIA Tegra2 Harmony evaluation board";
-       compatible = "nvidia,harmony", "nvidia,tegra20";
-
-       memory {
-               reg = <0x00000000 0x40000000>;
-       };
-
-       pinmux {
-               pinctrl-names = "default";
-               pinctrl-0 = <&state_default>;
-
-               state_default: pinmux {
-                       ata {
-                               nvidia,pins = "ata";
-                               nvidia,function = "ide";
-                       };
-                       atb {
-                               nvidia,pins = "atb", "gma", "gme";
-                               nvidia,function = "sdio4";
-                       };
-                       atc {
-                               nvidia,pins = "atc";
-                               nvidia,function = "nand";
-                       };
-                       atd {
-                               nvidia,pins = "atd", "ate", "gmb", "gmd", "gpu",
-                                       "spia", "spib", "spic";
-                               nvidia,function = "gmi";
-                       };
-                       cdev1 {
-                               nvidia,pins = "cdev1";
-                               nvidia,function = "plla_out";
-                       };
-                       cdev2 {
-                               nvidia,pins = "cdev2";
-                               nvidia,function = "pllp_out4";
-                       };
-                       crtp {
-                               nvidia,pins = "crtp";
-                               nvidia,function = "crt";
-                       };
-                       csus {
-                               nvidia,pins = "csus";
-                               nvidia,function = "vi_sensor_clk";
-                       };
-                       dap1 {
-                               nvidia,pins = "dap1";
-                               nvidia,function = "dap1";
-                       };
-                       dap2 {
-                               nvidia,pins = "dap2";
-                               nvidia,function = "dap2";
-                       };
-                       dap3 {
-                               nvidia,pins = "dap3";
-                               nvidia,function = "dap3";
-                       };
-                       dap4 {
-                               nvidia,pins = "dap4";
-                               nvidia,function = "dap4";
-                       };
-                       ddc {
-                               nvidia,pins = "ddc";
-                               nvidia,function = "i2c2";
-                       };
-                       dta {
-                               nvidia,pins = "dta", "dtd";
-                               nvidia,function = "sdio2";
-                       };
-                       dtb {
-                               nvidia,pins = "dtb", "dtc", "dte";
-                               nvidia,function = "rsvd1";
-                       };
-                       dtf {
-                               nvidia,pins = "dtf";
-                               nvidia,function = "i2c3";
-                       };
-                       gmc {
-                               nvidia,pins = "gmc";
-                               nvidia,function = "uartd";
-                       };
-                       gpu7 {
-                               nvidia,pins = "gpu7";
-                               nvidia,function = "rtck";
-                       };
-                       gpv {
-                               nvidia,pins = "gpv", "slxa", "slxk";
-                               nvidia,function = "pcie";
-                       };
-                       hdint {
-                               nvidia,pins = "hdint", "pta";
-                               nvidia,function = "hdmi";
-                       };
-                       i2cp {
-                               nvidia,pins = "i2cp";
-                               nvidia,function = "i2cp";
-                       };
-                       irrx {
-                               nvidia,pins = "irrx", "irtx";
-                               nvidia,function = "uarta";
-                       };
-                       kbca {
-                               nvidia,pins = "kbca", "kbcb", "kbcc", "kbcd",
-                                       "kbce", "kbcf";
-                               nvidia,function = "kbc";
-                       };
-                       lcsn {
-                               nvidia,pins = "lcsn", "ld0", "ld1", "ld2",
-                                       "ld3", "ld4", "ld5", "ld6", "ld7",
-                                       "ld8", "ld9", "ld10", "ld11", "ld12",
-                                       "ld13", "ld14", "ld15", "ld16", "ld17",
-                                       "ldc", "ldi", "lhp0", "lhp1", "lhp2",
-                                       "lhs", "lm0", "lm1", "lpp", "lpw0",
-                                       "lpw1", "lpw2", "lsc0", "lsc1", "lsck",
-                                       "lsda", "lsdi", "lspi", "lvp0", "lvp1",
-                                       "lvs";
-                               nvidia,function = "displaya";
-                       };
-                       owc {
-                               nvidia,pins = "owc", "spdi", "spdo", "uac";
-                               nvidia,function = "rsvd2";
-                       };
-                       pmc {
-                               nvidia,pins = "pmc";
-                               nvidia,function = "pwr_on";
-                       };
-                       rm {
-                               nvidia,pins = "rm";
-                               nvidia,function = "i2c1";
-                       };
-                       sdb {
-                               nvidia,pins = "sdb", "sdc", "sdd";
-                               nvidia,function = "pwm";
-                       };
-                       sdio1 {
-                               nvidia,pins = "sdio1";
-                               nvidia,function = "sdio1";
-                       };
-                       slxc {
-                               nvidia,pins = "slxc", "slxd";
-                               nvidia,function = "spdif";
-                       };
-                       spid {
-                               nvidia,pins = "spid", "spie", "spif";
-                               nvidia,function = "spi1";
-                       };
-                       spig {
-                               nvidia,pins = "spig", "spih";
-                               nvidia,function = "spi2_alt";
-                       };
-                       uaa {
-                               nvidia,pins = "uaa", "uab", "uda";
-                               nvidia,function = "ulpi";
-                       };
-                       uad {
-                               nvidia,pins = "uad";
-                               nvidia,function = "irda";
-                       };
-                       uca {
-                               nvidia,pins = "uca", "ucb";
-                               nvidia,function = "uartc";
-                       };
-                       conf_ata {
-                               nvidia,pins = "ata", "atb", "atc", "atd", "ate",
-                                       "cdev1", "cdev2", "dap1", "dtb", "gma",
-                                       "gmb", "gmc", "gmd", "gme", "gpu7",
-                                       "gpv", "i2cp", "pta", "rm", "slxa",
-                                       "slxk", "spia", "spib", "uac";
-                               nvidia,pull = <0>;
-                               nvidia,tristate = <0>;
-                       };
-                       conf_ck32 {
-                               nvidia,pins = "ck32", "ddrc", "pmca", "pmcb",
-                                       "pmcc", "pmcd", "pmce", "xm2c", "xm2d";
-                               nvidia,pull = <0>;
-                       };
-                       conf_csus {
-                               nvidia,pins = "csus", "spid", "spif";
-                               nvidia,pull = <1>;
-                               nvidia,tristate = <1>;
-                       };
-                       conf_crtp {
-                               nvidia,pins = "crtp", "dap2", "dap3", "dap4",
-                                       "dtc", "dte", "dtf", "gpu", "sdio1",
-                                       "slxc", "slxd", "spdi", "spdo", "spig",
-                                       "uda";
-                               nvidia,pull = <0>;
-                               nvidia,tristate = <1>;
-                       };
-                       conf_ddc {
-                               nvidia,pins = "ddc", "dta", "dtd", "kbca",
-                                       "kbcb", "kbcc", "kbcd", "kbce", "kbcf",
-                                       "sdc";
-                               nvidia,pull = <2>;
-                               nvidia,tristate = <0>;
-                       };
-                       conf_hdint {
-                               nvidia,pins = "hdint", "lcsn", "ldc", "lm1",
-                                       "lpw1", "lsc1", "lsck", "lsda", "lsdi",
-                                       "lvp0", "owc", "sdb";
-                               nvidia,tristate = <1>;
-                       };
-                       conf_irrx {
-                               nvidia,pins = "irrx", "irtx", "sdd", "spic",
-                                       "spie", "spih", "uaa", "uab", "uad",
-                                       "uca", "ucb";
-                               nvidia,pull = <2>;
-                               nvidia,tristate = <1>;
-                       };
-                       conf_lc {
-                               nvidia,pins = "lc", "ls";
-                               nvidia,pull = <2>;
-                       };
-                       conf_ld0 {
-                               nvidia,pins = "ld0", "ld1", "ld2", "ld3", "ld4",
-                                       "ld5", "ld6", "ld7", "ld8", "ld9",
-                                       "ld10", "ld11", "ld12", "ld13", "ld14",
-                                       "ld15", "ld16", "ld17", "ldi", "lhp0",
-                                       "lhp1", "lhp2", "lhs", "lm0", "lpp",
-                                       "lpw0", "lpw2", "lsc0", "lspi", "lvp1",
-                                       "lvs", "pmc";
-                               nvidia,tristate = <0>;
-                       };
-                       conf_ld17_0 {
-                               nvidia,pins = "ld17_0", "ld19_18", "ld21_20",
-                                       "ld23_22";
-                               nvidia,pull = <1>;
-                       };
-               };
-       };
-
-       i2s@70002800 {
-               status = "okay";
-       };
-
-       serial@70006300 {
-               status = "okay";
-               clock-frequency = <216000000>;
-       };
-
-       i2c@7000c000 {
-               status = "okay";
-               clock-frequency = <400000>;
-
-               wm8903: wm8903@1a {
-                       compatible = "wlf,wm8903";
-                       reg = <0x1a>;
-                       interrupt-parent = <&gpio>;
-                       interrupts = <187 0x04>;
-
-                       gpio-controller;
-                       #gpio-cells = <2>;
-
-                       micdet-cfg = <0>;
-                       micdet-delay = <100>;
-                       gpio-cfg = <0xffffffff 0xffffffff 0 0xffffffff 0xffffffff>;
-               };
-       };
-
-       i2c@7000c400 {
-               status = "okay";
-               clock-frequency = <400000>;
-       };
-
-       i2c@7000c500 {
-               status = "okay";
-               clock-frequency = <400000>;
-       };
-
-       i2c@7000d000 {
-               status = "okay";
-               clock-frequency = <400000>;
-       };
-
-       pmc {
-               nvidia,invert-interrupt;
-       };
-
-       usb@c5000000 {
-               status = "okay";
-       };
-
-       usb@c5004000 {
-               status = "okay";
-               nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
-       };
-
-       usb@c5008000 {
-               status = "okay";
-       };
-
-       sdhci@c8000200 {
-               status = "okay";
-               cd-gpios = <&gpio 69 0>; /* gpio PI5 */
-               wp-gpios = <&gpio 57 0>; /* gpio PH1 */
-               power-gpios = <&gpio 155 0>; /* gpio PT3 */
-               bus-width = <4>;
-       };
-
-       sdhci@c8000600 {
-               status = "okay";
-               cd-gpios = <&gpio 58 0>; /* gpio PH2 */
-               wp-gpios = <&gpio 59 0>; /* gpio PH3 */
-               power-gpios = <&gpio 70 0>; /* gpio PI6 */
-               bus-width = <8>;
-       };
-
-       sound {
-               compatible = "nvidia,tegra-audio-wm8903-harmony",
-                            "nvidia,tegra-audio-wm8903";
-               nvidia,model = "NVIDIA Tegra Harmony";
-
-               nvidia,audio-routing =
-                       "Headphone Jack", "HPOUTR",
-                       "Headphone Jack", "HPOUTL",
-                       "Int Spk", "ROP",
-                       "Int Spk", "RON",
-                       "Int Spk", "LOP",
-                       "Int Spk", "LON",
-                       "Mic Jack", "MICBIAS",
-                       "IN1L", "Mic Jack";
-
-               nvidia,i2s-controller = <&tegra_i2s1>;
-               nvidia,audio-codec = <&wm8903>;
-
-               nvidia,spkr-en-gpios = <&wm8903 2 0>;
-               nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
-               nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */
-               nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
-       };
-};
diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts
deleted file mode 100644 (file)
index 684a9e1..0000000
+++ /dev/null
@@ -1,347 +0,0 @@
-/dts-v1/;
-
-/include/ "tegra20.dtsi"
-
-/ {
-       model = "Toshiba AC100 / Dynabook AZ";
-       compatible = "compal,paz00", "nvidia,tegra20";
-
-       memory {
-               reg = <0x00000000 0x20000000>;
-       };
-
-       pinmux {
-               pinctrl-names = "default";
-               pinctrl-0 = <&state_default>;
-
-               state_default: pinmux {
-                       ata {
-                               nvidia,pins = "ata", "atc", "atd", "ate",
-                                       "dap2", "gmb", "gmc", "gmd", "spia",
-                                       "spib", "spic", "spid", "spie";
-                               nvidia,function = "gmi";
-                       };
-                       atb {
-                               nvidia,pins = "atb", "gma", "gme";
-                               nvidia,function = "sdio4";
-                       };
-                       cdev1 {
-                               nvidia,pins = "cdev1";
-                               nvidia,function = "plla_out";
-                       };
-                       cdev2 {
-                               nvidia,pins = "cdev2";
-                               nvidia,function = "pllp_out4";
-                       };
-                       crtp {
-                               nvidia,pins = "crtp";
-                               nvidia,function = "crt";
-                       };
-                       csus {
-                               nvidia,pins = "csus";
-                               nvidia,function = "pllc_out1";
-                       };
-                       dap1 {
-                               nvidia,pins = "dap1";
-                               nvidia,function = "dap1";
-                       };
-                       dap3 {
-                               nvidia,pins = "dap3";
-                               nvidia,function = "dap3";
-                       };
-                       dap4 {
-                               nvidia,pins = "dap4";
-                               nvidia,function = "dap4";
-                       };
-                       ddc {
-                               nvidia,pins = "ddc";
-                               nvidia,function = "i2c2";
-                       };
-                       dta {
-                               nvidia,pins = "dta", "dtb", "dtc", "dtd", "dte";
-                               nvidia,function = "rsvd1";
-                       };
-                       dtf {
-                               nvidia,pins = "dtf";
-                               nvidia,function = "i2c3";
-                       };
-                       gpu {
-                               nvidia,pins = "gpu", "sdb", "sdd";
-                               nvidia,function = "pwm";
-                       };
-                       gpu7 {
-                               nvidia,pins = "gpu7";
-                               nvidia,function = "rtck";
-                       };
-                       gpv {
-                               nvidia,pins = "gpv", "slxa", "slxk";
-                               nvidia,function = "pcie";
-                       };
-                       hdint {
-                               nvidia,pins = "hdint", "pta";
-                               nvidia,function = "hdmi";
-                       };
-                       i2cp {
-                               nvidia,pins = "i2cp";
-                               nvidia,function = "i2cp";
-                       };
-                       irrx {
-                               nvidia,pins = "irrx", "irtx";
-                               nvidia,function = "uarta";
-                       };
-                       kbca {
-                               nvidia,pins = "kbca", "kbcc", "kbce", "kbcf";
-                               nvidia,function = "kbc";
-                       };
-                       kbcb {
-                               nvidia,pins = "kbcb", "kbcd";
-                               nvidia,function = "sdio2";
-                       };
-                       lcsn {
-                               nvidia,pins = "lcsn", "ld0", "ld1", "ld2",
-                                       "ld3", "ld4", "ld5", "ld6", "ld7",
-                                       "ld8", "ld9", "ld10", "ld11", "ld12",
-                                       "ld13", "ld14", "ld15", "ld16", "ld17",
-                                       "ldc", "ldi", "lhp0", "lhp1", "lhp2",
-                                       "lhs", "lm0", "lm1", "lpp", "lpw0",
-                                       "lpw1", "lpw2", "lsc0", "lsc1", "lsck",
-                                       "lsda", "lsdi", "lspi", "lvp0", "lvp1",
-                                       "lvs";
-                               nvidia,function = "displaya";
-                       };
-                       owc {
-                               nvidia,pins = "owc";
-                               nvidia,function = "owr";
-                       };
-                       pmc {
-                               nvidia,pins = "pmc";
-                               nvidia,function = "pwr_on";
-                       };
-                       rm {
-                               nvidia,pins = "rm";
-                               nvidia,function = "i2c1";
-                       };
-                       sdc {
-                               nvidia,pins = "sdc";
-                               nvidia,function = "twc";
-                       };
-                       sdio1 {
-                               nvidia,pins = "sdio1";
-                               nvidia,function = "sdio1";
-                       };
-                       slxc {
-                               nvidia,pins = "slxc", "slxd";
-                               nvidia,function = "spi4";
-                       };
-                       spdi {
-                               nvidia,pins = "spdi", "spdo";
-                               nvidia,function = "rsvd2";
-                       };
-                       spif {
-                               nvidia,pins = "spif", "uac";
-                               nvidia,function = "rsvd4";
-                       };
-                       spig {
-                               nvidia,pins = "spig", "spih";
-                               nvidia,function = "spi2_alt";
-                       };
-                       uaa {
-                               nvidia,pins = "uaa", "uab", "uda";
-                               nvidia,function = "ulpi";
-                       };
-                       uad {
-                               nvidia,pins = "uad";
-                               nvidia,function = "spdif";
-                       };
-                       uca {
-                               nvidia,pins = "uca", "ucb";
-                               nvidia,function = "uartc";
-                       };
-                       conf_ata {
-                               nvidia,pins = "ata", "atb", "atc", "atd", "ate",
-                                       "cdev1", "cdev2", "dap1", "dap2", "dtf",
-                                       "gma", "gmb", "gmc", "gmd", "gme",
-                                       "gpu", "gpu7", "gpv", "i2cp", "pta",
-                                       "rm", "sdio1", "slxk", "spdo", "uac",
-                                       "uda";
-                               nvidia,pull = <0>;
-                               nvidia,tristate = <0>;
-                       };
-                       conf_ck32 {
-                               nvidia,pins = "ck32", "ddrc", "pmca", "pmcb",
-                                       "pmcc", "pmcd", "pmce", "xm2c", "xm2d";
-                               nvidia,pull = <0>;
-                       };
-                       conf_crtp {
-                               nvidia,pins = "crtp", "dap3", "dap4", "dtb",
-                                       "dtc", "dte", "slxa", "slxc", "slxd",
-                                       "spdi";
-                               nvidia,pull = <0>;
-                               nvidia,tristate = <1>;
-                       };
-                       conf_csus {
-                               nvidia,pins = "csus", "spia", "spib", "spid",
-                                       "spif";
-                               nvidia,pull = <1>;
-                               nvidia,tristate = <1>;
-                       };
-                       conf_ddc {
-                               nvidia,pins = "ddc", "irrx", "irtx", "kbca",
-                                       "kbcb", "kbcc", "kbcd", "kbce", "kbcf",
-                                       "spic", "spig", "uaa", "uab";
-                               nvidia,pull = <2>;
-                               nvidia,tristate = <0>;
-                       };
-                       conf_dta {
-                               nvidia,pins = "dta", "dtd", "owc", "sdc", "sdd",
-                                       "spie", "spih", "uad", "uca", "ucb";
-                               nvidia,pull = <2>;
-                               nvidia,tristate = <1>;
-                       };
-                       conf_hdint {
-                               nvidia,pins = "hdint", "ld0", "ld1", "ld2",
-                                       "ld3", "ld4", "ld5", "ld6", "ld7",
-                                       "ld8", "ld9", "ld10", "ld11", "ld12",
-                                       "ld13", "ld14", "ld15", "ld16", "ld17",
-                                       "ldc", "ldi", "lhs", "lsc0", "lspi",
-                                       "lvs", "pmc";
-                               nvidia,tristate = <0>;
-                       };
-                       conf_lc {
-                               nvidia,pins = "lc", "ls";
-                               nvidia,pull = <2>;
-                       };
-                       conf_lcsn {
-                               nvidia,pins = "lcsn", "lhp0", "lhp1", "lhp2",
-                                       "lm0", "lm1", "lpp", "lpw0", "lpw1",
-                                       "lpw2", "lsc1", "lsck", "lsda", "lsdi",
-                                       "lvp0", "lvp1", "sdb";
-                               nvidia,tristate = <1>;
-                       };
-                       conf_ld17_0 {
-                               nvidia,pins = "ld17_0", "ld19_18", "ld21_20",
-                                       "ld23_22";
-                               nvidia,pull = <1>;
-                       };
-               };
-       };
-
-       i2s@70002800 {
-               status = "okay";
-       };
-
-       serial@70006000 {
-               status = "okay";
-               clock-frequency = <216000000>;
-       };
-
-       serial@70006200 {
-               status = "okay";
-               clock-frequency = <216000000>;
-       };
-
-       i2c@7000c000 {
-               status = "okay";
-               clock-frequency = <400000>;
-
-               alc5632: alc5632@1e {
-                       compatible = "realtek,alc5632";
-                       reg = <0x1e>;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-               };
-       };
-
-       i2c@7000c400 {
-               status = "okay";
-               clock-frequency = <400000>;
-       };
-
-       nvec {
-               compatible = "nvidia,nvec";
-               reg = <0x7000c500 0x100>;
-               interrupts = <0 92 0x04>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               clock-frequency = <80000>;
-               request-gpios = <&gpio 170 0>; /* gpio PV2 */
-               slave-addr = <138>;
-       };
-
-       i2c@7000d000 {
-               status = "okay";
-               clock-frequency = <400000>;
-
-               adt7461@4c {
-                       compatible = "adi,adt7461";
-                       reg = <0x4c>;
-               };
-       };
-
-       usb@c5000000 {
-               status = "okay";
-       };
-
-       usb@c5004000 {
-               status = "okay";
-               nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
-       };
-
-       usb@c5008000 {
-               status = "okay";
-       };
-
-       sdhci@c8000000 {
-               status = "okay";
-               cd-gpios = <&gpio 173 0>; /* gpio PV5 */
-               wp-gpios = <&gpio 57 0>;  /* gpio PH1 */
-               power-gpios = <&gpio 169 0>; /* gpio PV1 */
-               bus-width = <4>;
-       };
-
-       sdhci@c8000600 {
-               status = "okay";
-               bus-width = <8>;
-       };
-
-       gpio-keys {
-               compatible = "gpio-keys";
-
-               power {
-                       label = "Power";
-                       gpios = <&gpio 79 1>; /* gpio PJ7, active low */
-                       linux,code = <116>; /* KEY_POWER */
-                       gpio-key,wakeup;
-               };
-       };
-
-       gpio-leds {
-               compatible = "gpio-leds";
-
-               wifi {
-                       label = "wifi-led";
-                       gpios = <&gpio 24 0>; /* gpio PD0 */
-                       linux,default-trigger = "rfkill0";
-               };
-       };
-
-       sound {
-               compatible = "nvidia,tegra-audio-alc5632-paz00",
-                       "nvidia,tegra-audio-alc5632";
-
-               nvidia,model = "Compal PAZ00";
-
-               nvidia,audio-routing =
-                       "Int Spk", "SPKOUT",
-                       "Int Spk", "SPKOUTN",
-                       "Headset Mic", "MICBIAS1",
-                       "MIC1", "Headset Mic",
-                       "Headset Stereophone", "HPR",
-                       "Headset Stereophone", "HPL",
-                       "DMICDAT", "Digital Mic";
-
-               nvidia,audio-codec = <&alc5632>;
-               nvidia,i2s-controller = <&tegra_i2s1>;
-               nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
-       };
-};
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
deleted file mode 100644 (file)
index b797901..0000000
+++ /dev/null
@@ -1,444 +0,0 @@
-/dts-v1/;
-
-/include/ "tegra20.dtsi"
-
-/ {
-       model = "NVIDIA Seaboard";
-       compatible = "nvidia,seaboard", "nvidia,tegra20";
-
-       memory {
-               reg = <0x00000000 0x40000000>;
-       };
-
-       pinmux {
-               pinctrl-names = "default";
-               pinctrl-0 = <&state_default>;
-
-               state_default: pinmux {
-                       ata {
-                               nvidia,pins = "ata";
-                               nvidia,function = "ide";
-                       };
-                       atb {
-                               nvidia,pins = "atb", "gma", "gme";
-                               nvidia,function = "sdio4";
-                       };
-                       atc {
-                               nvidia,pins = "atc";
-                               nvidia,function = "nand";
-                       };
-                       atd {
-                               nvidia,pins = "atd", "ate", "gmb", "spia",
-                                       "spib", "spic";
-                               nvidia,function = "gmi";
-                       };
-                       cdev1 {
-                               nvidia,pins = "cdev1";
-                               nvidia,function = "plla_out";
-                       };
-                       cdev2 {
-                               nvidia,pins = "cdev2";
-                               nvidia,function = "pllp_out4";
-                       };
-                       crtp {
-                               nvidia,pins = "crtp", "lm1";
-                               nvidia,function = "crt";
-                       };
-                       csus {
-                               nvidia,pins = "csus";
-                               nvidia,function = "vi_sensor_clk";
-                       };
-                       dap1 {
-                               nvidia,pins = "dap1";
-                               nvidia,function = "dap1";
-                       };
-                       dap2 {
-                               nvidia,pins = "dap2";
-                               nvidia,function = "dap2";
-                       };
-                       dap3 {
-                               nvidia,pins = "dap3";
-                               nvidia,function = "dap3";
-                       };
-                       dap4 {
-                               nvidia,pins = "dap4";
-                               nvidia,function = "dap4";
-                       };
-                       ddc {
-                               nvidia,pins = "ddc", "owc", "spdi", "spdo",
-                                       "uac";
-                               nvidia,function = "rsvd2";
-                       };
-                       dta {
-                               nvidia,pins = "dta", "dtb", "dtc", "dtd", "dte";
-                               nvidia,function = "vi";
-                       };
-                       dtf {
-                               nvidia,pins = "dtf";
-                               nvidia,function = "i2c3";
-                       };
-                       gmc {
-                               nvidia,pins = "gmc";
-                               nvidia,function = "uartd";
-                       };
-                       gmd {
-                               nvidia,pins = "gmd";
-                               nvidia,function = "sflash";
-                       };
-                       gpu {
-                               nvidia,pins = "gpu";
-                               nvidia,function = "pwm";
-                       };
-                       gpu7 {
-                               nvidia,pins = "gpu7";
-                               nvidia,function = "rtck";
-                       };
-                       gpv {
-                               nvidia,pins = "gpv", "slxa", "slxk";
-                               nvidia,function = "pcie";
-                       };
-                       hdint {
-                               nvidia,pins = "hdint", "lpw0", "lpw2", "lsc1",
-                                       "lsck", "lsda";
-                               nvidia,function = "hdmi";
-                       };
-                       i2cp {
-                               nvidia,pins = "i2cp";
-                               nvidia,function = "i2cp";
-                       };
-                       irrx {
-                               nvidia,pins = "irrx", "irtx";
-                               nvidia,function = "uartb";
-                       };
-                       kbca {
-                               nvidia,pins = "kbca", "kbcb", "kbcc", "kbcd",
-                                       "kbce", "kbcf";
-                               nvidia,function = "kbc";
-                       };
-                       lcsn {
-                               nvidia,pins = "lcsn", "ldc", "lm0", "lpw1",
-                                       "lsdi", "lvp0";
-                               nvidia,function = "rsvd4";
-                       };
-                       ld0 {
-                               nvidia,pins = "ld0", "ld1", "ld2", "ld3", "ld4",
-                                       "ld5", "ld6", "ld7", "ld8", "ld9",
-                                       "ld10", "ld11", "ld12", "ld13", "ld14",
-                                       "ld15", "ld16", "ld17", "ldi", "lhp0",
-                                       "lhp1", "lhp2", "lhs", "lpp", "lsc0",
-                                       "lspi", "lvp1", "lvs";
-                               nvidia,function = "displaya";
-                       };
-                       pmc {
-                               nvidia,pins = "pmc";
-                               nvidia,function = "pwr_on";
-                       };
-                       pta {
-                               nvidia,pins = "pta";
-                               nvidia,function = "i2c2";
-                       };
-                       rm {
-                               nvidia,pins = "rm";
-                               nvidia,function = "i2c1";
-                       };
-                       sdb {
-                               nvidia,pins = "sdb", "sdc", "sdd";
-                               nvidia,function = "sdio3";
-                       };
-                       sdio1 {
-                               nvidia,pins = "sdio1";
-                               nvidia,function = "sdio1";
-                       };
-                       slxc {
-                               nvidia,pins = "slxc", "slxd";
-                               nvidia,function = "spdif";
-                       };
-                       spid {
-                               nvidia,pins = "spid", "spie", "spif";
-                               nvidia,function = "spi1";
-                       };
-                       spig {
-                               nvidia,pins = "spig", "spih";
-                               nvidia,function = "spi2_alt";
-                       };
-                       uaa {
-                               nvidia,pins = "uaa", "uab", "uda";
-                               nvidia,function = "ulpi";
-                       };
-                       uad {
-                               nvidia,pins = "uad";
-                               nvidia,function = "irda";
-                       };
-                       uca {
-                               nvidia,pins = "uca", "ucb";
-                               nvidia,function = "uartc";
-                       };
-                       conf_ata {
-                               nvidia,pins = "ata", "atb", "atc", "atd",
-                                       "cdev1", "cdev2", "dap1", "dap2",
-                                       "dap4", "dtf", "gma", "gmc", "gmd",
-                                       "gme", "gpu", "gpu7", "i2cp", "irrx",
-                                       "irtx", "pta", "rm", "sdc", "sdd",
-                                       "slxd", "slxk", "spdi", "spdo", "uac",
-                                       "uad", "uca", "ucb", "uda";
-                               nvidia,pull = <0>;
-                               nvidia,tristate = <0>;
-                       };
-                       conf_ate {
-                               nvidia,pins = "ate", "csus", "dap3", "ddc",
-                                       "gpv", "owc", "slxc", "spib", "spid",
-                                       "spie";
-                               nvidia,pull = <0>;
-                               nvidia,tristate = <1>;
-                       };
-                       conf_ck32 {
-                               nvidia,pins = "ck32", "ddrc", "pmca", "pmcb",
-                                       "pmcc", "pmcd", "pmce", "xm2c", "xm2d";
-                               nvidia,pull = <0>;
-                       };
-                       conf_crtp {
-                               nvidia,pins = "crtp", "gmb", "slxa", "spia",
-                                       "spig", "spih";
-                               nvidia,pull = <2>;
-                               nvidia,tristate = <1>;
-                       };
-                       conf_dta {
-                               nvidia,pins = "dta", "dtb", "dtc", "dtd";
-                               nvidia,pull = <1>;
-                               nvidia,tristate = <0>;
-                       };
-                       conf_dte {
-                               nvidia,pins = "dte", "spif";
-                               nvidia,pull = <1>;
-                               nvidia,tristate = <1>;
-                       };
-                       conf_hdint {
-                               nvidia,pins = "hdint", "lcsn", "ldc", "lm1",
-                                       "lpw1", "lsc1", "lsck", "lsda", "lsdi",
-                                       "lvp0";
-                               nvidia,tristate = <1>;
-                       };
-                       conf_kbca {
-                               nvidia,pins = "kbca", "kbcb", "kbcc", "kbcd",
-                                       "kbce", "kbcf", "sdio1", "spic", "uaa",
-                                       "uab";
-                               nvidia,pull = <2>;
-                               nvidia,tristate = <0>;
-                       };
-                       conf_lc {
-                               nvidia,pins = "lc", "ls";
-                               nvidia,pull = <2>;
-                       };
-                       conf_ld0 {
-                               nvidia,pins = "ld0", "ld1", "ld2", "ld3", "ld4",
-                                       "ld5", "ld6", "ld7", "ld8", "ld9",
-                                       "ld10", "ld11", "ld12", "ld13", "ld14",
-                                       "ld15", "ld16", "ld17", "ldi", "lhp0",
-                                       "lhp1", "lhp2", "lhs", "lm0", "lpp",
-                                       "lpw0", "lpw2", "lsc0", "lspi", "lvp1",
-                                       "lvs", "pmc", "sdb";
-                               nvidia,tristate = <0>;
-                       };
-                       conf_ld17_0 {
-                               nvidia,pins = "ld17_0", "ld19_18", "ld21_20",
-                                       "ld23_22";
-                               nvidia,pull = <1>;
-                       };
-                       drive_sdio1 {
-                               nvidia,pins = "drive_sdio1";
-                               nvidia,high-speed-mode = <0>;
-                               nvidia,schmitt = <0>;
-                               nvidia,low-power-mode = <3>;
-                               nvidia,pull-down-strength = <31>;
-                               nvidia,pull-up-strength = <31>;
-                               nvidia,slew-rate-rising = <3>;
-                               nvidia,slew-rate-falling = <3>;
-                       };
-               };
-       };
-
-       i2s@70002800 {
-               status = "okay";
-       };
-
-       serial@70006300 {
-               status = "okay";
-               clock-frequency = <216000000>;
-       };
-
-       i2c@7000c000 {
-               status = "okay";
-               clock-frequency = <400000>;
-
-               wm8903: wm8903@1a {
-                       compatible = "wlf,wm8903";
-                       reg = <0x1a>;
-                       interrupt-parent = <&gpio>;
-                       interrupts = <187 0x04>;
-
-                       gpio-controller;
-                       #gpio-cells = <2>;
-
-                       micdet-cfg = <0>;
-                       micdet-delay = <100>;
-                       gpio-cfg = <0xffffffff 0xffffffff 0 0xffffffff 0xffffffff>;
-               };
-
-               /* ALS and proximity sensor */
-               isl29018@44 {
-                       compatible = "isil,isl29018";
-                       reg = <0x44>;
-                       interrupt-parent = <&gpio>;
-                       interrupts = <202 0x04>; /* GPIO PZ2 */
-               };
-
-               gyrometer@68 {
-                       compatible = "invn,mpu3050";
-                       reg = <0x68>;
-                       interrupt-parent = <&gpio>;
-                       interrupts = <204 0x04>; /* gpio PZ4 */
-               };
-       };
-
-       i2c@7000c400 {
-               status = "okay";
-               clock-frequency = <100000>;
-
-               smart-battery@b {
-                       compatible = "ti,bq20z75", "smart-battery-1.1";
-                       reg = <0xb>;
-                       ti,i2c-retry-count = <2>;
-                       ti,poll-retry-count = <10>;
-               };
-       };
-
-       i2c@7000c500 {
-               status = "okay";
-               clock-frequency = <400000>;
-       };
-
-       i2c@7000d000 {
-               status = "okay";
-               clock-frequency = <400000>;
-
-               temperature-sensor@4c {
-                       compatible = "nct1008";
-                       reg = <0x4c>;
-               };
-
-               magnetometer@c {
-                       compatible = "ak8975";
-                       reg = <0xc>;
-                       interrupt-parent = <&gpio>;
-                       interrupts = <109 0x04>; /* gpio PN5 */
-               };
-       };
-
-       memory-controller@0x7000f400 {
-               emc-table@190000 {
-                       reg = <190000>;
-                       compatible = "nvidia,tegra20-emc-table";
-                       clock-frequency = <190000>;
-                       nvidia,emc-registers = <0x0000000c 0x00000026
-                               0x00000009 0x00000003 0x00000004 0x00000004
-                               0x00000002 0x0000000c 0x00000003 0x00000003
-                               0x00000002 0x00000001 0x00000004 0x00000005
-                               0x00000004 0x00000009 0x0000000d 0x0000059f
-                               0x00000000 0x00000003 0x00000003 0x00000003
-                               0x00000003 0x00000001 0x0000000b 0x000000c8
-                               0x00000003 0x00000007 0x00000004 0x0000000f
-                               0x00000002 0x00000000 0x00000000 0x00000002
-                               0x00000000 0x00000000 0x00000083 0xa06204ae
-                               0x007dc010 0x00000000 0x00000000 0x00000000
-                               0x00000000 0x00000000 0x00000000 0x00000000>;
-               };
-
-               emc-table@380000 {
-                       reg = <380000>;
-                       compatible = "nvidia,tegra20-emc-table";
-                       clock-frequency = <380000>;
-                       nvidia,emc-registers = <0x00000017 0x0000004b
-                               0x00000012 0x00000006 0x00000004 0x00000005
-                               0x00000003 0x0000000c 0x00000006 0x00000006
-                               0x00000003 0x00000001 0x00000004 0x00000005
-                               0x00000004 0x00000009 0x0000000d 0x00000b5f
-                               0x00000000 0x00000003 0x00000003 0x00000006
-                               0x00000006 0x00000001 0x00000011 0x000000c8
-                               0x00000003 0x0000000e 0x00000007 0x0000000f
-                               0x00000002 0x00000000 0x00000000 0x00000002
-                               0x00000000 0x00000000 0x00000083 0xe044048b
-                               0x007d8010 0x00000000 0x00000000 0x00000000
-                               0x00000000 0x00000000 0x00000000 0x00000000>;
-               };
-       };
-
-       usb@c5000000 {
-               status = "okay";
-               nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */
-               dr_mode = "otg";
-       };
-
-       usb@c5004000 {
-               status = "okay";
-               nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
-       };
-
-       usb@c5008000 {
-               status = "okay";
-       };
-
-       sdhci@c8000400 {
-               status = "okay";
-               cd-gpios = <&gpio 69 0>; /* gpio PI5 */
-               wp-gpios = <&gpio 57 0>; /* gpio PH1 */
-               power-gpios = <&gpio 70 0>; /* gpio PI6 */
-               bus-width = <4>;
-       };
-
-       sdhci@c8000600 {
-               status = "okay";
-               bus-width = <8>;
-       };
-
-       gpio-keys {
-               compatible = "gpio-keys";
-
-               power {
-                       label = "Power";
-                       gpios = <&gpio 170 1>; /* gpio PV2, active low */
-                       linux,code = <116>; /* KEY_POWER */
-                       gpio-key,wakeup;
-               };
-
-               lid {
-                       label = "Lid";
-                       gpios = <&gpio 23 0>; /* gpio PC7 */
-                       linux,input-type = <5>; /* EV_SW */
-                       linux,code = <0>; /* SW_LID */
-                       debounce-interval = <1>;
-                       gpio-key,wakeup;
-               };
-       };
-
-       sound {
-               compatible = "nvidia,tegra-audio-wm8903-seaboard",
-                            "nvidia,tegra-audio-wm8903";
-               nvidia,model = "NVIDIA Tegra Seaboard";
-
-               nvidia,audio-routing =
-                       "Headphone Jack", "HPOUTR",
-                       "Headphone Jack", "HPOUTL",
-                       "Int Spk", "ROP",
-                       "Int Spk", "RON",
-                       "Int Spk", "LOP",
-                       "Int Spk", "LON",
-                       "Mic Jack", "MICBIAS",
-                       "IN1R", "Mic Jack";
-
-               nvidia,i2s-controller = <&tegra_i2s1>;
-               nvidia,audio-codec = <&wm8903>;
-
-               nvidia,spkr-en-gpios = <&wm8903 2 0>;
-               nvidia,hp-det-gpios = <&gpio 185 0>; /* gpio PX1 */
-       };
-};
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts
deleted file mode 100644 (file)
index 9de5636..0000000
+++ /dev/null
@@ -1,306 +0,0 @@
-/dts-v1/;
-
-/include/ "tegra20.dtsi"
-
-/ {
-       model = "Compulab TrimSlice board";
-       compatible = "compulab,trimslice", "nvidia,tegra20";
-
-       memory {
-               reg = <0x00000000 0x40000000>;
-       };
-
-       pinmux {
-               pinctrl-names = "default";
-               pinctrl-0 = <&state_default>;
-
-               state_default: pinmux {
-                       ata {
-                               nvidia,pins = "ata";
-                               nvidia,function = "ide";
-                       };
-                       atb {
-                               nvidia,pins = "atb", "gma";
-                               nvidia,function = "sdio4";
-                       };
-                       atc {
-                               nvidia,pins = "atc", "gmb";
-                               nvidia,function = "nand";
-                       };
-                       atd {
-                               nvidia,pins = "atd", "ate", "gme", "pta";
-                               nvidia,function = "gmi";
-                       };
-                       cdev1 {
-                               nvidia,pins = "cdev1";
-                               nvidia,function = "plla_out";
-                       };
-                       cdev2 {
-                               nvidia,pins = "cdev2";
-                               nvidia,function = "pllp_out4";
-                       };
-                       crtp {
-                               nvidia,pins = "crtp";
-                               nvidia,function = "crt";
-                       };
-                       csus {
-                               nvidia,pins = "csus";
-                               nvidia,function = "vi_sensor_clk";
-                       };
-                       dap1 {
-                               nvidia,pins = "dap1";
-                               nvidia,function = "dap1";
-                       };
-                       dap2 {
-                               nvidia,pins = "dap2";
-                               nvidia,function = "dap2";
-                       };
-                       dap3 {
-                               nvidia,pins = "dap3";
-                               nvidia,function = "dap3";
-                       };
-                       dap4 {
-                               nvidia,pins = "dap4";
-                               nvidia,function = "dap4";
-                       };
-                       ddc {
-                               nvidia,pins = "ddc";
-                               nvidia,function = "i2c2";
-                       };
-                       dta {
-                               nvidia,pins = "dta", "dtb", "dtc", "dtd", "dte";
-                               nvidia,function = "vi";
-                       };
-                       dtf {
-                               nvidia,pins = "dtf";
-                               nvidia,function = "i2c3";
-                       };
-                       gmc {
-                               nvidia,pins = "gmc", "gmd";
-                               nvidia,function = "sflash";
-                       };
-                       gpu {
-                               nvidia,pins = "gpu";
-                               nvidia,function = "uarta";
-                       };
-                       gpu7 {
-                               nvidia,pins = "gpu7";
-                               nvidia,function = "rtck";
-                       };
-                       gpv {
-                               nvidia,pins = "gpv", "slxa", "slxk";
-                               nvidia,function = "pcie";
-                       };
-                       hdint {
-                               nvidia,pins = "hdint";
-                               nvidia,function = "hdmi";
-                       };
-                       i2cp {
-                               nvidia,pins = "i2cp";
-                               nvidia,function = "i2cp";
-                       };
-                       irrx {
-                               nvidia,pins = "irrx", "irtx";
-                               nvidia,function = "uartb";
-                       };
-                       kbca {
-                               nvidia,pins = "kbca", "kbcb", "kbcc", "kbcd",
-                                       "kbce", "kbcf";
-                               nvidia,function = "kbc";
-                       };
-                       lcsn {
-                               nvidia,pins = "lcsn", "ld0", "ld1", "ld2",
-                                       "ld3", "ld4", "ld5", "ld6", "ld7",
-                                       "ld8", "ld9", "ld10", "ld11", "ld12",
-                                       "ld13", "ld14", "ld15", "ld16", "ld17",
-                                       "ldc", "ldi", "lhp0", "lhp1", "lhp2",
-                                       "lhs", "lm0", "lm1", "lpp", "lpw0",
-                                       "lpw1", "lpw2", "lsc0", "lsc1", "lsck",
-                                       "lsda", "lsdi", "lspi", "lvp0", "lvp1",
-                                       "lvs";
-                               nvidia,function = "displaya";
-                       };
-                       owc {
-                               nvidia,pins = "owc", "uac";
-                               nvidia,function = "rsvd2";
-                       };
-                       pmc {
-                               nvidia,pins = "pmc";
-                               nvidia,function = "pwr_on";
-                       };
-                       rm {
-                               nvidia,pins = "rm";
-                               nvidia,function = "i2c1";
-                       };
-                       sdb {
-                               nvidia,pins = "sdb", "sdc", "sdd";
-                               nvidia,function = "pwm";
-                       };
-                       sdio1 {
-                               nvidia,pins = "sdio1";
-                               nvidia,function = "sdio1";
-                       };
-                       slxc {
-                               nvidia,pins = "slxc", "slxd";
-                               nvidia,function = "sdio3";
-                       };
-                       spdi {
-                               nvidia,pins = "spdi", "spdo";
-                               nvidia,function = "spdif";
-                       };
-                       spia {
-                               nvidia,pins = "spia", "spib", "spic";
-                               nvidia,function = "spi2";
-                       };
-                       spid {
-                               nvidia,pins = "spid", "spie", "spif";
-                               nvidia,function = "spi1";
-                       };
-                       spig {
-                               nvidia,pins = "spig", "spih";
-                               nvidia,function = "spi2_alt";
-                       };
-                       uaa {
-                               nvidia,pins = "uaa", "uab", "uda";
-                               nvidia,function = "ulpi";
-                       };
-                       uad {
-                               nvidia,pins = "uad";
-                               nvidia,function = "irda";
-                       };
-                       uca {
-                               nvidia,pins = "uca", "ucb";
-                               nvidia,function = "uartc";
-                       };
-                       conf_ata {
-                               nvidia,pins = "ata", "atc", "atd", "ate",
-                                       "crtp", "dap2", "dap3", "dap4", "dta",
-                                       "dtb", "dtc", "dtd", "dte", "gmb",
-                                       "gme", "i2cp", "pta", "slxc", "slxd",
-                                       "spdi", "spdo", "uda";
-                               nvidia,pull = <0>;
-                               nvidia,tristate = <1>;
-                       };
-                       conf_atb {
-                               nvidia,pins = "atb", "cdev1", "cdev2", "dap1",
-                                       "gma", "gmc", "gmd", "gpu", "gpu7",
-                                       "gpv", "sdio1", "slxa", "slxk", "uac";
-                               nvidia,pull = <0>;
-                               nvidia,tristate = <0>;
-                       };
-                       conf_ck32 {
-                               nvidia,pins = "ck32", "ddrc", "pmca", "pmcb",
-                                       "pmcc", "pmcd", "pmce", "xm2c", "xm2d";
-                               nvidia,pull = <0>;
-                       };
-                       conf_csus {
-                               nvidia,pins = "csus", "spia", "spib",
-                                       "spid", "spif";
-                               nvidia,pull = <1>;
-                               nvidia,tristate = <1>;
-                       };
-                       conf_ddc {
-                               nvidia,pins = "ddc", "dtf", "rm", "sdc", "sdd";
-                               nvidia,pull = <2>;
-                               nvidia,tristate = <0>;
-                       };
-                       conf_hdint {
-                               nvidia,pins = "hdint", "lcsn", "ldc", "lm1",
-                                       "lpw1", "lsc1", "lsck", "lsda", "lsdi",
-                                       "lvp0", "pmc";
-                               nvidia,tristate = <1>;
-                       };
-                       conf_irrx {
-                               nvidia,pins = "irrx", "irtx", "kbca", "kbcb",
-                                       "kbcc", "kbcd", "kbce", "kbcf", "owc",
-                                       "spic", "spie", "spig", "spih", "uaa",
-                                       "uab", "uad", "uca", "ucb";
-                               nvidia,pull = <2>;
-                               nvidia,tristate = <1>;
-                       };
-                       conf_lc {
-                               nvidia,pins = "lc", "ls";
-                               nvidia,pull = <2>;
-                       };
-                       conf_ld0 {
-                               nvidia,pins = "ld0", "ld1", "ld2", "ld3", "ld4",
-                                       "ld5", "ld6", "ld7", "ld8", "ld9",
-                                       "ld10", "ld11", "ld12", "ld13", "ld14",
-                                       "ld15", "ld16", "ld17", "ldi", "lhp0",
-                                       "lhp1", "lhp2", "lhs", "lm0", "lpp",
-                                       "lpw0", "lpw2", "lsc0", "lspi", "lvp1",
-                                       "lvs", "sdb";
-                               nvidia,tristate = <0>;
-                       };
-                       conf_ld17_0 {
-                               nvidia,pins = "ld17_0", "ld19_18", "ld21_20",
-                                       "ld23_22";
-                               nvidia,pull = <1>;
-                       };
-               };
-       };
-
-       i2s@70002800 {
-               status = "okay";
-       };
-
-       serial@70006000 {
-               status = "okay";
-               clock-frequency = <216000000>;
-       };
-
-       i2c@7000c000 {
-               status = "okay";
-               clock-frequency = <400000>;
-       };
-
-       i2c@7000c400 {
-               status = "okay";
-               clock-frequency = <400000>;
-       };
-
-       i2c@7000c500 {
-               status = "okay";
-               clock-frequency = <400000>;
-
-               codec: codec@1a {
-                       compatible = "ti,tlv320aic23";
-                       reg = <0x1a>;
-               };
-
-               rtc@56 {
-                       compatible = "emmicro,em3027";
-                       reg = <0x56>;
-               };
-       };
-
-       usb@c5000000 {
-               status = "okay";
-       };
-
-       usb@c5004000 {
-               nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
-       };
-
-       usb@c5008000 {
-               status = "okay";
-       };
-
-       sdhci@c8000000 {
-               status = "okay";
-               bus-width = <4>;
-       };
-
-       sdhci@c8000600 {
-               status = "okay";
-               cd-gpios = <&gpio 121 0>; /* gpio PP1 */
-               wp-gpios = <&gpio 122 0>; /* gpio PP2 */
-               bus-width = <4>;
-       };
-
-       sound {
-               compatible = "nvidia,tegra-audio-trimslice";
-               nvidia,i2s-controller = <&tegra_i2s1>;
-               nvidia,audio-codec = <&codec>;
-       };
-};
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
deleted file mode 100644 (file)
index be90544..0000000
+++ /dev/null
@@ -1,343 +0,0 @@
-/dts-v1/;
-
-/include/ "tegra20.dtsi"
-
-/ {
-       model = "NVIDIA Tegra2 Ventana evaluation board";
-       compatible = "nvidia,ventana", "nvidia,tegra20";
-
-       memory {
-               reg = <0x00000000 0x40000000>;
-       };
-
-       pinmux {
-               pinctrl-names = "default";
-               pinctrl-0 = <&state_default>;
-
-               state_default: pinmux {
-                       ata {
-                               nvidia,pins = "ata";
-                               nvidia,function = "ide";
-                       };
-                       atb {
-                               nvidia,pins = "atb", "gma", "gme";
-                               nvidia,function = "sdio4";
-                       };
-                       atc {
-                               nvidia,pins = "atc";
-                               nvidia,function = "nand";
-                       };
-                       atd {
-                               nvidia,pins = "atd", "ate", "gmb", "spia",
-                                       "spib", "spic";
-                               nvidia,function = "gmi";
-                       };
-                       cdev1 {
-                               nvidia,pins = "cdev1";
-                               nvidia,function = "plla_out";
-                       };
-                       cdev2 {
-                               nvidia,pins = "cdev2";
-                               nvidia,function = "pllp_out4";
-                       };
-                       crtp {
-                               nvidia,pins = "crtp", "lm1";
-                               nvidia,function = "crt";
-                       };
-                       csus {
-                               nvidia,pins = "csus";
-                               nvidia,function = "vi_sensor_clk";
-                       };
-                       dap1 {
-                               nvidia,pins = "dap1";
-                               nvidia,function = "dap1";
-                       };
-                       dap2 {
-                               nvidia,pins = "dap2";
-                               nvidia,function = "dap2";
-                       };
-                       dap3 {
-                               nvidia,pins = "dap3";
-                               nvidia,function = "dap3";
-                       };
-                       dap4 {
-                               nvidia,pins = "dap4";
-                               nvidia,function = "dap4";
-                       };
-                       ddc {
-                               nvidia,pins = "ddc", "owc", "spdi", "spdo",
-                                       "uac";
-                               nvidia,function = "rsvd2";
-                       };
-                       dta {
-                               nvidia,pins = "dta", "dtb", "dtc", "dtd", "dte";
-                               nvidia,function = "vi";
-                       };
-                       dtf {
-                               nvidia,pins = "dtf";
-                               nvidia,function = "i2c3";
-                       };
-                       gmc {
-                               nvidia,pins = "gmc";
-                               nvidia,function = "uartd";
-                       };
-                       gmd {
-                               nvidia,pins = "gmd";
-                               nvidia,function = "sflash";
-                       };
-                       gpu {
-                               nvidia,pins = "gpu";
-                               nvidia,function = "pwm";
-                       };
-                       gpu7 {
-                               nvidia,pins = "gpu7";
-                               nvidia,function = "rtck";
-                       };
-                       gpv {
-                               nvidia,pins = "gpv", "slxa", "slxk";
-                               nvidia,function = "pcie";
-                       };
-                       hdint {
-                               nvidia,pins = "hdint", "pta";
-                               nvidia,function = "hdmi";
-                       };
-                       i2cp {
-                               nvidia,pins = "i2cp";
-                               nvidia,function = "i2cp";
-                       };
-                       irrx {
-                               nvidia,pins = "irrx", "irtx";
-                               nvidia,function = "uartb";
-                       };
-                       kbca {
-                               nvidia,pins = "kbca", "kbcb", "kbcc", "kbcd",
-                                       "kbce", "kbcf";
-                               nvidia,function = "kbc";
-                       };
-                       lcsn {
-                               nvidia,pins = "lcsn", "ldc", "lm0", "lpw1",
-                                       "lsdi", "lvp0";
-                               nvidia,function = "rsvd4";
-                       };
-                       ld0 {
-                               nvidia,pins = "ld0", "ld1", "ld2", "ld3", "ld4",
-                                       "ld5", "ld6", "ld7", "ld8", "ld9",
-                                       "ld10", "ld11", "ld12", "ld13", "ld14",
-                                       "ld15", "ld16", "ld17", "ldi", "lhp0",
-                                       "lhp1", "lhp2", "lhs", "lpp", "lpw0",
-                                       "lpw2", "lsc0", "lsc1", "lsck", "lsda",
-                                       "lspi", "lvp1", "lvs";
-                               nvidia,function = "displaya";
-                       };
-                       pmc {
-                               nvidia,pins = "pmc";
-                               nvidia,function = "pwr_on";
-                       };
-                       rm {
-                               nvidia,pins = "rm";
-                               nvidia,function = "i2c1";
-                       };
-                       sdb {
-                               nvidia,pins = "sdb", "sdc", "sdd", "slxc";
-                               nvidia,function = "sdio3";
-                       };
-                       sdio1 {
-                               nvidia,pins = "sdio1";
-                               nvidia,function = "sdio1";
-                       };
-                       slxd {
-                               nvidia,pins = "slxd";
-                               nvidia,function = "spdif";
-                       };
-                       spid {
-                               nvidia,pins = "spid", "spie", "spif";
-                               nvidia,function = "spi1";
-                       };
-                       spig {
-                               nvidia,pins = "spig", "spih";
-                               nvidia,function = "spi2_alt";
-                       };
-                       uaa {
-                               nvidia,pins = "uaa", "uab", "uda";
-                               nvidia,function = "ulpi";
-                       };
-                       uad {
-                               nvidia,pins = "uad";
-                               nvidia,function = "irda";
-                       };
-                       uca {
-                               nvidia,pins = "uca", "ucb";
-                               nvidia,function = "uartc";
-                       };
-                       conf_ata {
-                               nvidia,pins = "ata", "atb", "atc", "atd",
-                                       "cdev1", "cdev2", "dap1", "dap2",
-                                       "dap4", "ddc", "dtf", "gma", "gmc",
-                                       "gme", "gpu", "gpu7", "i2cp", "irrx",
-                                       "irtx", "pta", "rm", "sdc", "sdd",
-                                       "slxc", "slxd", "slxk", "spdi", "spdo",
-                                       "uac", "uad", "uca", "ucb", "uda";
-                               nvidia,pull = <0>;
-                               nvidia,tristate = <0>;
-                       };
-                       conf_ate {
-                               nvidia,pins = "ate", "csus", "dap3", "gmd",
-                                       "gpv", "owc", "spia", "spib", "spic",
-                                       "spid", "spie", "spig";
-                               nvidia,pull = <0>;
-                               nvidia,tristate = <1>;
-                       };
-                       conf_ck32 {
-                               nvidia,pins = "ck32", "ddrc", "pmca", "pmcb",
-                                       "pmcc", "pmcd", "pmce", "xm2c", "xm2d";
-                               nvidia,pull = <0>;
-                       };
-                       conf_crtp {
-                               nvidia,pins = "crtp", "gmb", "slxa", "spih";
-                               nvidia,pull = <2>;
-                               nvidia,tristate = <1>;
-                       };
-                       conf_dta {
-                               nvidia,pins = "dta", "dtb", "dtc", "dtd";
-                               nvidia,pull = <1>;
-                               nvidia,tristate = <0>;
-                       };
-                       conf_dte {
-                               nvidia,pins = "dte", "spif";
-                               nvidia,pull = <1>;
-                               nvidia,tristate = <1>;
-                       };
-                       conf_hdint {
-                               nvidia,pins = "hdint", "lcsn", "ldc", "lm1",
-                                       "lpw1", "lsck", "lsda", "lsdi", "lvp0";
-                               nvidia,tristate = <1>;
-                       };
-                       conf_kbca {
-                               nvidia,pins = "kbca", "kbcb", "kbcc", "kbcd",
-                                       "kbce", "kbcf", "sdio1", "uaa", "uab";
-                               nvidia,pull = <2>;
-                               nvidia,tristate = <0>;
-                       };
-                       conf_lc {
-                               nvidia,pins = "lc", "ls";
-                               nvidia,pull = <2>;
-                       };
-                       conf_ld0 {
-                               nvidia,pins = "ld0", "ld1", "ld2", "ld3", "ld4",
-                                       "ld5", "ld6", "ld7", "ld8", "ld9",
-                                       "ld10", "ld11", "ld12", "ld13", "ld14",
-                                       "ld15", "ld16", "ld17", "ldi", "lhp0",
-                                       "lhp1", "lhp2", "lhs", "lm0", "lpp",
-                                       "lpw0", "lpw2", "lsc0", "lsc1", "lspi",
-                                       "lvp1", "lvs", "pmc", "sdb";
-                               nvidia,tristate = <0>;
-                       };
-                       conf_ld17_0 {
-                               nvidia,pins = "ld17_0", "ld19_18", "ld21_20",
-                                       "ld23_22";
-                               nvidia,pull = <1>;
-                       };
-               };
-       };
-
-       i2s@70002800 {
-               status = "okay";
-       };
-
-       serial@70006300 {
-               status = "okay";
-               clock-frequency = <216000000>;
-       };
-
-       i2c@7000c000 {
-               status = "okay";
-               clock-frequency = <400000>;
-
-               wm8903: wm8903@1a {
-                       compatible = "wlf,wm8903";
-                       reg = <0x1a>;
-                       interrupt-parent = <&gpio>;
-                       interrupts = <187 0x04>;
-
-                       gpio-controller;
-                       #gpio-cells = <2>;
-
-                       micdet-cfg = <0>;
-                       micdet-delay = <100>;
-                       gpio-cfg = <0xffffffff 0xffffffff 0 0xffffffff 0xffffffff>;
-               };
-
-               /* ALS and proximity sensor */
-               isl29018@44 {
-                       compatible = "isil,isl29018";
-                       reg = <0x44>;
-                       interrupt-parent = <&gpio>;
-                       interrupts = <202 0x04>; /*gpio PZ2 */
-               };
-       };
-
-       i2c@7000c400 {
-               status = "okay";
-               clock-frequency = <400000>;
-       };
-
-       i2c@7000c500 {
-               status = "okay";
-               clock-frequency = <400000>;
-       };
-
-       i2c@7000d000 {
-               status = "okay";
-               clock-frequency = <400000>;
-       };
-
-       usb@c5000000 {
-               status = "okay";
-       };
-
-       usb@c5004000 {
-               status = "okay";
-               nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
-       };
-
-       usb@c5008000 {
-               status = "okay";
-       };
-
-       sdhci@c8000400 {
-               status = "okay";
-               cd-gpios = <&gpio 69 0>; /* gpio PI5 */
-               wp-gpios = <&gpio 57 0>; /* gpio PH1 */
-               power-gpios = <&gpio 70 0>; /* gpio PI6 */
-               bus-width = <4>;
-       };
-
-       sdhci@c8000600 {
-               status = "okay";
-               bus-width = <8>;
-       };
-
-       sound {
-               compatible = "nvidia,tegra-audio-wm8903-ventana",
-                            "nvidia,tegra-audio-wm8903";
-               nvidia,model = "NVIDIA Tegra Ventana";
-
-               nvidia,audio-routing =
-                       "Headphone Jack", "HPOUTR",
-                       "Headphone Jack", "HPOUTL",
-                       "Int Spk", "ROP",
-                       "Int Spk", "RON",
-                       "Int Spk", "LOP",
-                       "Int Spk", "LON",
-                       "Mic Jack", "MICBIAS",
-                       "IN1L", "Mic Jack";
-
-               nvidia,i2s-controller = <&tegra_i2s1>;
-               nvidia,audio-codec = <&wm8903>;
-
-               nvidia,spkr-en-gpios = <&wm8903 2 0>;
-               nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
-               nvidia,int-mic-en-gpios = <&gpio 184 0>; /* gpio PX0 */
-               nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
-       };
-};
diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
new file mode 100644 (file)
index 0000000..f146dbf
--- /dev/null
@@ -0,0 +1,336 @@
+/dts-v1/;
+
+/include/ "tegra20.dtsi"
+
+/ {
+       model = "NVIDIA Tegra2 Harmony evaluation board";
+       compatible = "nvidia,harmony", "nvidia,tegra20";
+
+       memory {
+               reg = <0x00000000 0x40000000>;
+       };
+
+       pinmux {
+               pinctrl-names = "default";
+               pinctrl-0 = <&state_default>;
+
+               state_default: pinmux {
+                       ata {
+                               nvidia,pins = "ata";
+                               nvidia,function = "ide";
+                       };
+                       atb {
+                               nvidia,pins = "atb", "gma", "gme";
+                               nvidia,function = "sdio4";
+                       };
+                       atc {
+                               nvidia,pins = "atc";
+                               nvidia,function = "nand";
+                       };
+                       atd {
+                               nvidia,pins = "atd", "ate", "gmb", "gmd", "gpu",
+                                       "spia", "spib", "spic";
+                               nvidia,function = "gmi";
+                       };
+                       cdev1 {
+                               nvidia,pins = "cdev1";
+                               nvidia,function = "plla_out";
+                       };
+                       cdev2 {
+                               nvidia,pins = "cdev2";
+                               nvidia,function = "pllp_out4";
+                       };
+                       crtp {
+                               nvidia,pins = "crtp";
+                               nvidia,function = "crt";
+                       };
+                       csus {
+                               nvidia,pins = "csus";
+                               nvidia,function = "vi_sensor_clk";
+                       };
+                       dap1 {
+                               nvidia,pins = "dap1";
+                               nvidia,function = "dap1";
+                       };
+                       dap2 {
+                               nvidia,pins = "dap2";
+                               nvidia,function = "dap2";
+                       };
+                       dap3 {
+                               nvidia,pins = "dap3";
+                               nvidia,function = "dap3";
+                       };
+                       dap4 {
+                               nvidia,pins = "dap4";
+                               nvidia,function = "dap4";
+                       };
+                       ddc {
+                               nvidia,pins = "ddc";
+                               nvidia,function = "i2c2";
+                       };
+                       dta {
+                               nvidia,pins = "dta", "dtd";
+                               nvidia,function = "sdio2";
+                       };
+                       dtb {
+                               nvidia,pins = "dtb", "dtc", "dte";
+                               nvidia,function = "rsvd1";
+                       };
+                       dtf {
+                               nvidia,pins = "dtf";
+                               nvidia,function = "i2c3";
+                       };
+                       gmc {
+                               nvidia,pins = "gmc";
+                               nvidia,function = "uartd";
+                       };
+                       gpu7 {
+                               nvidia,pins = "gpu7";
+                               nvidia,function = "rtck";
+                       };
+                       gpv {
+                               nvidia,pins = "gpv", "slxa", "slxk";
+                               nvidia,function = "pcie";
+                       };
+                       hdint {
+                               nvidia,pins = "hdint", "pta";
+                               nvidia,function = "hdmi";
+                       };
+                       i2cp {
+                               nvidia,pins = "i2cp";
+                               nvidia,function = "i2cp";
+                       };
+                       irrx {
+                               nvidia,pins = "irrx", "irtx";
+                               nvidia,function = "uarta";
+                       };
+                       kbca {
+                               nvidia,pins = "kbca", "kbcb", "kbcc", "kbcd",
+                                       "kbce", "kbcf";
+                               nvidia,function = "kbc";
+                       };
+                       lcsn {
+                               nvidia,pins = "lcsn", "ld0", "ld1", "ld2",
+                                       "ld3", "ld4", "ld5", "ld6", "ld7",
+                                       "ld8", "ld9", "ld10", "ld11", "ld12",
+                                       "ld13", "ld14", "ld15", "ld16", "ld17",
+                                       "ldc", "ldi", "lhp0", "lhp1", "lhp2",
+                                       "lhs", "lm0", "lm1", "lpp", "lpw0",
+                                       "lpw1", "lpw2", "lsc0", "lsc1", "lsck",
+                                       "lsda", "lsdi", "lspi", "lvp0", "lvp1",
+                                       "lvs";
+                               nvidia,function = "displaya";
+                       };
+                       owc {
+                               nvidia,pins = "owc", "spdi", "spdo", "uac";
+                               nvidia,function = "rsvd2";
+                       };
+                       pmc {
+                               nvidia,pins = "pmc";
+                               nvidia,function = "pwr_on";
+                       };
+                       rm {
+                               nvidia,pins = "rm";
+                               nvidia,function = "i2c1";
+                       };
+                       sdb {
+                               nvidia,pins = "sdb", "sdc", "sdd";
+                               nvidia,function = "pwm";
+                       };
+                       sdio1 {
+                               nvidia,pins = "sdio1";
+                               nvidia,function = "sdio1";
+                       };
+                       slxc {
+                               nvidia,pins = "slxc", "slxd";
+                               nvidia,function = "spdif";
+                       };
+                       spid {
+                               nvidia,pins = "spid", "spie", "spif";
+                               nvidia,function = "spi1";
+                       };
+                       spig {
+                               nvidia,pins = "spig", "spih";
+                               nvidia,function = "spi2_alt";
+                       };
+                       uaa {
+                               nvidia,pins = "uaa", "uab", "uda";
+                               nvidia,function = "ulpi";
+                       };
+                       uad {
+                               nvidia,pins = "uad";
+                               nvidia,function = "irda";
+                       };
+                       uca {
+                               nvidia,pins = "uca", "ucb";
+                               nvidia,function = "uartc";
+                       };
+                       conf_ata {
+                               nvidia,pins = "ata", "atb", "atc", "atd", "ate",
+                                       "cdev1", "cdev2", "dap1", "dtb", "gma",
+                                       "gmb", "gmc", "gmd", "gme", "gpu7",
+                                       "gpv", "i2cp", "pta", "rm", "slxa",
+                                       "slxk", "spia", "spib", "uac";
+                               nvidia,pull = <0>;
+                               nvidia,tristate = <0>;
+                       };
+                       conf_ck32 {
+                               nvidia,pins = "ck32", "ddrc", "pmca", "pmcb",
+                                       "pmcc", "pmcd", "pmce", "xm2c", "xm2d";
+                               nvidia,pull = <0>;
+                       };
+                       conf_csus {
+                               nvidia,pins = "csus", "spid", "spif";
+                               nvidia,pull = <1>;
+                               nvidia,tristate = <1>;
+                       };
+                       conf_crtp {
+                               nvidia,pins = "crtp", "dap2", "dap3", "dap4",
+                                       "dtc", "dte", "dtf", "gpu", "sdio1",
+                                       "slxc", "slxd", "spdi", "spdo", "spig",
+                                       "uda";
+                               nvidia,pull = <0>;
+                               nvidia,tristate = <1>;
+                       };
+                       conf_ddc {
+                               nvidia,pins = "ddc", "dta", "dtd", "kbca",
+                                       "kbcb", "kbcc", "kbcd", "kbce", "kbcf",
+                                       "sdc";
+                               nvidia,pull = <2>;
+                               nvidia,tristate = <0>;
+                       };
+                       conf_hdint {
+                               nvidia,pins = "hdint", "lcsn", "ldc", "lm1",
+                                       "lpw1", "lsc1", "lsck", "lsda", "lsdi",
+                                       "lvp0", "owc", "sdb";
+                               nvidia,tristate = <1>;
+                       };
+                       conf_irrx {
+                               nvidia,pins = "irrx", "irtx", "sdd", "spic",
+                                       "spie", "spih", "uaa", "uab", "uad",
+                                       "uca", "ucb";
+                               nvidia,pull = <2>;
+                               nvidia,tristate = <1>;
+                       };
+                       conf_lc {
+                               nvidia,pins = "lc", "ls";
+                               nvidia,pull = <2>;
+                       };
+                       conf_ld0 {
+                               nvidia,pins = "ld0", "ld1", "ld2", "ld3", "ld4",
+                                       "ld5", "ld6", "ld7", "ld8", "ld9",
+                                       "ld10", "ld11", "ld12", "ld13", "ld14",
+                                       "ld15", "ld16", "ld17", "ldi", "lhp0",
+                                       "lhp1", "lhp2", "lhs", "lm0", "lpp",
+                                       "lpw0", "lpw2", "lsc0", "lspi", "lvp1",
+                                       "lvs", "pmc";
+                               nvidia,tristate = <0>;
+                       };
+                       conf_ld17_0 {
+                               nvidia,pins = "ld17_0", "ld19_18", "ld21_20",
+                                       "ld23_22";
+                               nvidia,pull = <1>;
+                       };
+               };
+       };
+
+       i2s@70002800 {
+               status = "okay";
+       };
+
+       serial@70006300 {
+               status = "okay";
+               clock-frequency = <216000000>;
+       };
+
+       i2c@7000c000 {
+               status = "okay";
+               clock-frequency = <400000>;
+
+               wm8903: wm8903@1a {
+                       compatible = "wlf,wm8903";
+                       reg = <0x1a>;
+                       interrupt-parent = <&gpio>;
+                       interrupts = <187 0x04>;
+
+                       gpio-controller;
+                       #gpio-cells = <2>;
+
+                       micdet-cfg = <0>;
+                       micdet-delay = <100>;
+                       gpio-cfg = <0xffffffff 0xffffffff 0 0xffffffff 0xffffffff>;
+               };
+       };
+
+       i2c@7000c400 {
+               status = "okay";
+               clock-frequency = <400000>;
+       };
+
+       i2c@7000c500 {
+               status = "okay";
+               clock-frequency = <400000>;
+       };
+
+       i2c@7000d000 {
+               status = "okay";
+               clock-frequency = <400000>;
+       };
+
+       pmc {
+               nvidia,invert-interrupt;
+       };
+
+       usb@c5000000 {
+               status = "okay";
+       };
+
+       usb@c5004000 {
+               status = "okay";
+               nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
+       };
+
+       usb@c5008000 {
+               status = "okay";
+       };
+
+       sdhci@c8000200 {
+               status = "okay";
+               cd-gpios = <&gpio 69 0>; /* gpio PI5 */
+               wp-gpios = <&gpio 57 0>; /* gpio PH1 */
+               power-gpios = <&gpio 155 0>; /* gpio PT3 */
+               bus-width = <4>;
+       };
+
+       sdhci@c8000600 {
+               status = "okay";
+               cd-gpios = <&gpio 58 0>; /* gpio PH2 */
+               wp-gpios = <&gpio 59 0>; /* gpio PH3 */
+               power-gpios = <&gpio 70 0>; /* gpio PI6 */
+               bus-width = <8>;
+       };
+
+       sound {
+               compatible = "nvidia,tegra-audio-wm8903-harmony",
+                            "nvidia,tegra-audio-wm8903";
+               nvidia,model = "NVIDIA Tegra Harmony";
+
+               nvidia,audio-routing =
+                       "Headphone Jack", "HPOUTR",
+                       "Headphone Jack", "HPOUTL",
+                       "Int Spk", "ROP",
+                       "Int Spk", "RON",
+                       "Int Spk", "LOP",
+                       "Int Spk", "LON",
+                       "Mic Jack", "MICBIAS",
+                       "IN1L", "Mic Jack";
+
+               nvidia,i2s-controller = <&tegra_i2s1>;
+               nvidia,audio-codec = <&wm8903>;
+
+               nvidia,spkr-en-gpios = <&wm8903 2 0>;
+               nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
+               nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */
+               nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
+       };
+};
diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
new file mode 100644 (file)
index 0000000..684a9e1
--- /dev/null
@@ -0,0 +1,347 @@
+/dts-v1/;
+
+/include/ "tegra20.dtsi"
+
+/ {
+       model = "Toshiba AC100 / Dynabook AZ";
+       compatible = "compal,paz00", "nvidia,tegra20";
+
+       memory {
+               reg = <0x00000000 0x20000000>;
+       };
+
+       pinmux {
+               pinctrl-names = "default";
+               pinctrl-0 = <&state_default>;
+
+               state_default: pinmux {
+                       ata {
+                               nvidia,pins = "ata", "atc", "atd", "ate",
+                                       "dap2", "gmb", "gmc", "gmd", "spia",
+                                       "spib", "spic", "spid", "spie";
+                               nvidia,function = "gmi";
+                       };
+                       atb {
+                               nvidia,pins = "atb", "gma", "gme";
+                               nvidia,function = "sdio4";
+                       };
+                       cdev1 {
+                               nvidia,pins = "cdev1";
+                               nvidia,function = "plla_out";
+                       };
+                       cdev2 {
+                               nvidia,pins = "cdev2";
+                               nvidia,function = "pllp_out4";
+                       };
+                       crtp {
+                               nvidia,pins = "crtp";
+                               nvidia,function = "crt";
+                       };
+                       csus {
+                               nvidia,pins = "csus";
+                               nvidia,function = "pllc_out1";
+                       };
+                       dap1 {
+                               nvidia,pins = "dap1";
+                               nvidia,function = "dap1";
+                       };
+                       dap3 {
+                               nvidia,pins = "dap3";
+                               nvidia,function = "dap3";
+                       };
+                       dap4 {
+                               nvidia,pins = "dap4";
+                               nvidia,function = "dap4";
+                       };
+                       ddc {
+                               nvidia,pins = "ddc";
+                               nvidia,function = "i2c2";
+                       };
+                       dta {
+                               nvidia,pins = "dta", "dtb", "dtc", "dtd", "dte";
+                               nvidia,function = "rsvd1";
+                       };
+                       dtf {
+                               nvidia,pins = "dtf";
+                               nvidia,function = "i2c3";
+                       };
+                       gpu {
+                               nvidia,pins = "gpu", "sdb", "sdd";
+                               nvidia,function = "pwm";
+                       };
+                       gpu7 {
+                               nvidia,pins = "gpu7";
+                               nvidia,function = "rtck";
+                       };
+                       gpv {
+                               nvidia,pins = "gpv", "slxa", "slxk";
+                               nvidia,function = "pcie";
+                       };
+                       hdint {
+                               nvidia,pins = "hdint", "pta";
+                               nvidia,function = "hdmi";
+                       };
+                       i2cp {
+                               nvidia,pins = "i2cp";
+                               nvidia,function = "i2cp";
+                       };
+                       irrx {
+                               nvidia,pins = "irrx", "irtx";
+                               nvidia,function = "uarta";
+                       };
+                       kbca {
+                               nvidia,pins = "kbca", "kbcc", "kbce", "kbcf";
+                               nvidia,function = "kbc";
+                       };
+                       kbcb {
+                               nvidia,pins = "kbcb", "kbcd";
+                               nvidia,function = "sdio2";
+                       };
+                       lcsn {
+                               nvidia,pins = "lcsn", "ld0", "ld1", "ld2",
+                                       "ld3", "ld4", "ld5", "ld6", "ld7",
+                                       "ld8", "ld9", "ld10", "ld11", "ld12",
+                                       "ld13", "ld14", "ld15", "ld16", "ld17",
+                                       "ldc", "ldi", "lhp0", "lhp1", "lhp2",
+                                       "lhs", "lm0", "lm1", "lpp", "lpw0",
+                                       "lpw1", "lpw2", "lsc0", "lsc1", "lsck",
+                                       "lsda", "lsdi", "lspi", "lvp0", "lvp1",
+                                       "lvs";
+                               nvidia,function = "displaya";
+                       };
+                       owc {
+                               nvidia,pins = "owc";
+                               nvidia,function = "owr";
+                       };
+                       pmc {
+                               nvidia,pins = "pmc";
+                               nvidia,function = "pwr_on";
+                       };
+                       rm {
+                               nvidia,pins = "rm";
+                               nvidia,function = "i2c1";
+                       };
+                       sdc {
+                               nvidia,pins = "sdc";
+                               nvidia,function = "twc";
+                       };
+                       sdio1 {
+                               nvidia,pins = "sdio1";
+                               nvidia,function = "sdio1";
+                       };
+                       slxc {
+                               nvidia,pins = "slxc", "slxd";
+                               nvidia,function = "spi4";
+                       };
+                       spdi {
+                               nvidia,pins = "spdi", "spdo";
+                               nvidia,function = "rsvd2";
+                       };
+                       spif {
+                               nvidia,pins = "spif", "uac";
+                               nvidia,function = "rsvd4";
+                       };
+                       spig {
+                               nvidia,pins = "spig", "spih";
+                               nvidia,function = "spi2_alt";
+                       };
+                       uaa {
+                               nvidia,pins = "uaa", "uab", "uda";
+                               nvidia,function = "ulpi";
+                       };
+                       uad {
+                               nvidia,pins = "uad";
+                               nvidia,function = "spdif";
+                       };
+                       uca {
+                               nvidia,pins = "uca", "ucb";
+                               nvidia,function = "uartc";
+                       };
+                       conf_ata {
+                               nvidia,pins = "ata", "atb", "atc", "atd", "ate",
+                                       "cdev1", "cdev2", "dap1", "dap2", "dtf",
+                                       "gma", "gmb", "gmc", "gmd", "gme",
+                                       "gpu", "gpu7", "gpv", "i2cp", "pta",
+                                       "rm", "sdio1", "slxk", "spdo", "uac",
+                                       "uda";
+                               nvidia,pull = <0>;
+                               nvidia,tristate = <0>;
+                       };
+                       conf_ck32 {
+                               nvidia,pins = "ck32", "ddrc", "pmca", "pmcb",
+                                       "pmcc", "pmcd", "pmce", "xm2c", "xm2d";
+                               nvidia,pull = <0>;
+                       };
+                       conf_crtp {
+                               nvidia,pins = "crtp", "dap3", "dap4", "dtb",
+                                       "dtc", "dte", "slxa", "slxc", "slxd",
+                                       "spdi";
+                               nvidia,pull = <0>;
+                               nvidia,tristate = <1>;
+                       };
+                       conf_csus {
+                               nvidia,pins = "csus", "spia", "spib", "spid",
+                                       "spif";
+                               nvidia,pull = <1>;
+                               nvidia,tristate = <1>;
+                       };
+                       conf_ddc {
+                               nvidia,pins = "ddc", "irrx", "irtx", "kbca",
+                                       "kbcb", "kbcc", "kbcd", "kbce", "kbcf",
+                                       "spic", "spig", "uaa", "uab";
+                               nvidia,pull = <2>;
+                               nvidia,tristate = <0>;
+                       };
+                       conf_dta {
+                               nvidia,pins = "dta", "dtd", "owc", "sdc", "sdd",
+                                       "spie", "spih", "uad", "uca", "ucb";
+                               nvidia,pull = <2>;
+                               nvidia,tristate = <1>;
+                       };
+                       conf_hdint {
+                               nvidia,pins = "hdint", "ld0", "ld1", "ld2",
+                                       "ld3", "ld4", "ld5", "ld6", "ld7",
+                                       "ld8", "ld9", "ld10", "ld11", "ld12",
+                                       "ld13", "ld14", "ld15", "ld16", "ld17",
+                                       "ldc", "ldi", "lhs", "lsc0", "lspi",
+                                       "lvs", "pmc";
+                               nvidia,tristate = <0>;
+                       };
+                       conf_lc {
+                               nvidia,pins = "lc", "ls";
+                               nvidia,pull = <2>;
+                       };
+                       conf_lcsn {
+                               nvidia,pins = "lcsn", "lhp0", "lhp1", "lhp2",
+                                       "lm0", "lm1", "lpp", "lpw0", "lpw1",
+                                       "lpw2", "lsc1", "lsck", "lsda", "lsdi",
+                                       "lvp0", "lvp1", "sdb";
+                               nvidia,tristate = <1>;
+                       };
+                       conf_ld17_0 {
+                               nvidia,pins = "ld17_0", "ld19_18", "ld21_20",
+                                       "ld23_22";
+                               nvidia,pull = <1>;
+                       };
+               };
+       };
+
+       i2s@70002800 {
+               status = "okay";
+       };
+
+       serial@70006000 {
+               status = "okay";
+               clock-frequency = <216000000>;
+       };
+
+       serial@70006200 {
+               status = "okay";
+               clock-frequency = <216000000>;
+       };
+
+       i2c@7000c000 {
+               status = "okay";
+               clock-frequency = <400000>;
+
+               alc5632: alc5632@1e {
+                       compatible = "realtek,alc5632";
+                       reg = <0x1e>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+               };
+       };
+
+       i2c@7000c400 {
+               status = "okay";
+               clock-frequency = <400000>;
+       };
+
+       nvec {
+               compatible = "nvidia,nvec";
+               reg = <0x7000c500 0x100>;
+               interrupts = <0 92 0x04>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               clock-frequency = <80000>;
+               request-gpios = <&gpio 170 0>; /* gpio PV2 */
+               slave-addr = <138>;
+       };
+
+       i2c@7000d000 {
+               status = "okay";
+               clock-frequency = <400000>;
+
+               adt7461@4c {
+                       compatible = "adi,adt7461";
+                       reg = <0x4c>;
+               };
+       };
+
+       usb@c5000000 {
+               status = "okay";
+       };
+
+       usb@c5004000 {
+               status = "okay";
+               nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
+       };
+
+       usb@c5008000 {
+               status = "okay";
+       };
+
+       sdhci@c8000000 {
+               status = "okay";
+               cd-gpios = <&gpio 173 0>; /* gpio PV5 */
+               wp-gpios = <&gpio 57 0>;  /* gpio PH1 */
+               power-gpios = <&gpio 169 0>; /* gpio PV1 */
+               bus-width = <4>;
+       };
+
+       sdhci@c8000600 {
+               status = "okay";
+               bus-width = <8>;
+       };
+
+       gpio-keys {
+               compatible = "gpio-keys";
+
+               power {
+                       label = "Power";
+                       gpios = <&gpio 79 1>; /* gpio PJ7, active low */
+                       linux,code = <116>; /* KEY_POWER */
+                       gpio-key,wakeup;
+               };
+       };
+
+       gpio-leds {
+               compatible = "gpio-leds";
+
+               wifi {
+                       label = "wifi-led";
+                       gpios = <&gpio 24 0>; /* gpio PD0 */
+                       linux,default-trigger = "rfkill0";
+               };
+       };
+
+       sound {
+               compatible = "nvidia,tegra-audio-alc5632-paz00",
+                       "nvidia,tegra-audio-alc5632";
+
+               nvidia,model = "Compal PAZ00";
+
+               nvidia,audio-routing =
+                       "Int Spk", "SPKOUT",
+                       "Int Spk", "SPKOUTN",
+                       "Headset Mic", "MICBIAS1",
+                       "MIC1", "Headset Mic",
+                       "Headset Stereophone", "HPR",
+                       "Headset Stereophone", "HPL",
+                       "DMICDAT", "Digital Mic";
+
+               nvidia,audio-codec = <&alc5632>;
+               nvidia,i2s-controller = <&tegra_i2s1>;
+               nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
+       };
+};
diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
new file mode 100644 (file)
index 0000000..b797901
--- /dev/null
@@ -0,0 +1,444 @@
+/dts-v1/;
+
+/include/ "tegra20.dtsi"
+
+/ {
+       model = "NVIDIA Seaboard";
+       compatible = "nvidia,seaboard", "nvidia,tegra20";
+
+       memory {
+               reg = <0x00000000 0x40000000>;
+       };
+
+       pinmux {
+               pinctrl-names = "default";
+               pinctrl-0 = <&state_default>;
+
+               state_default: pinmux {
+                       ata {
+                               nvidia,pins = "ata";
+                               nvidia,function = "ide";
+                       };
+                       atb {
+                               nvidia,pins = "atb", "gma", "gme";
+                               nvidia,function = "sdio4";
+                       };
+                       atc {
+                               nvidia,pins = "atc";
+                               nvidia,function = "nand";
+                       };
+                       atd {
+                               nvidia,pins = "atd", "ate", "gmb", "spia",
+                                       "spib", "spic";
+                               nvidia,function = "gmi";
+                       };
+                       cdev1 {
+                               nvidia,pins = "cdev1";
+                               nvidia,function = "plla_out";
+                       };
+                       cdev2 {
+                               nvidia,pins = "cdev2";
+                               nvidia,function = "pllp_out4";
+                       };
+                       crtp {
+                               nvidia,pins = "crtp", "lm1";
+                               nvidia,function = "crt";
+                       };
+                       csus {
+                               nvidia,pins = "csus";
+                               nvidia,function = "vi_sensor_clk";
+                       };
+                       dap1 {
+                               nvidia,pins = "dap1";
+                               nvidia,function = "dap1";
+                       };
+                       dap2 {
+                               nvidia,pins = "dap2";
+                               nvidia,function = "dap2";
+                       };
+                       dap3 {
+                               nvidia,pins = "dap3";
+                               nvidia,function = "dap3";
+                       };
+                       dap4 {
+                               nvidia,pins = "dap4";
+                               nvidia,function = "dap4";
+                       };
+                       ddc {
+                               nvidia,pins = "ddc", "owc", "spdi", "spdo",
+                                       "uac";
+                               nvidia,function = "rsvd2";
+                       };
+                       dta {
+                               nvidia,pins = "dta", "dtb", "dtc", "dtd", "dte";
+                               nvidia,function = "vi";
+                       };
+                       dtf {
+                               nvidia,pins = "dtf";
+                               nvidia,function = "i2c3";
+                       };
+                       gmc {
+                               nvidia,pins = "gmc";
+                               nvidia,function = "uartd";
+                       };
+                       gmd {
+                               nvidia,pins = "gmd";
+                               nvidia,function = "sflash";
+                       };
+                       gpu {
+                               nvidia,pins = "gpu";
+                               nvidia,function = "pwm";
+                       };
+                       gpu7 {
+                               nvidia,pins = "gpu7";
+                               nvidia,function = "rtck";
+                       };
+                       gpv {
+                               nvidia,pins = "gpv", "slxa", "slxk";
+                               nvidia,function = "pcie";
+                       };
+                       hdint {
+                               nvidia,pins = "hdint", "lpw0", "lpw2", "lsc1",
+                                       "lsck", "lsda";
+                               nvidia,function = "hdmi";
+                       };
+                       i2cp {
+                               nvidia,pins = "i2cp";
+                               nvidia,function = "i2cp";
+                       };
+                       irrx {
+                               nvidia,pins = "irrx", "irtx";
+                               nvidia,function = "uartb";
+                       };
+                       kbca {
+                               nvidia,pins = "kbca", "kbcb", "kbcc", "kbcd",
+                                       "kbce", "kbcf";
+                               nvidia,function = "kbc";
+                       };
+                       lcsn {
+                               nvidia,pins = "lcsn", "ldc", "lm0", "lpw1",
+                                       "lsdi", "lvp0";
+                               nvidia,function = "rsvd4";
+                       };
+                       ld0 {
+                               nvidia,pins = "ld0", "ld1", "ld2", "ld3", "ld4",
+                                       "ld5", "ld6", "ld7", "ld8", "ld9",
+                                       "ld10", "ld11", "ld12", "ld13", "ld14",
+                                       "ld15", "ld16", "ld17", "ldi", "lhp0",
+                                       "lhp1", "lhp2", "lhs", "lpp", "lsc0",
+                                       "lspi", "lvp1", "lvs";
+                               nvidia,function = "displaya";
+                       };
+                       pmc {
+                               nvidia,pins = "pmc";
+                               nvidia,function = "pwr_on";
+                       };
+                       pta {
+                               nvidia,pins = "pta";
+                               nvidia,function = "i2c2";
+                       };
+                       rm {
+                               nvidia,pins = "rm";
+                               nvidia,function = "i2c1";
+                       };
+                       sdb {
+                               nvidia,pins = "sdb", "sdc", "sdd";
+                               nvidia,function = "sdio3";
+                       };
+                       sdio1 {
+                               nvidia,pins = "sdio1";
+                               nvidia,function = "sdio1";
+                       };
+                       slxc {
+                               nvidia,pins = "slxc", "slxd";
+                               nvidia,function = "spdif";
+                       };
+                       spid {
+                               nvidia,pins = "spid", "spie", "spif";
+                               nvidia,function = "spi1";
+                       };
+                       spig {
+                               nvidia,pins = "spig", "spih";
+                               nvidia,function = "spi2_alt";
+                       };
+                       uaa {
+                               nvidia,pins = "uaa", "uab", "uda";
+                               nvidia,function = "ulpi";
+                       };
+                       uad {
+                               nvidia,pins = "uad";
+                               nvidia,function = "irda";
+                       };
+                       uca {
+                               nvidia,pins = "uca", "ucb";
+                               nvidia,function = "uartc";
+                       };
+                       conf_ata {
+                               nvidia,pins = "ata", "atb", "atc", "atd",
+                                       "cdev1", "cdev2", "dap1", "dap2",
+                                       "dap4", "dtf", "gma", "gmc", "gmd",
+                                       "gme", "gpu", "gpu7", "i2cp", "irrx",
+                                       "irtx", "pta", "rm", "sdc", "sdd",
+                                       "slxd", "slxk", "spdi", "spdo", "uac",
+                                       "uad", "uca", "ucb", "uda";
+                               nvidia,pull = <0>;
+                               nvidia,tristate = <0>;
+                       };
+                       conf_ate {
+                               nvidia,pins = "ate", "csus", "dap3", "ddc",
+                                       "gpv", "owc", "slxc", "spib", "spid",
+                                       "spie";
+                               nvidia,pull = <0>;
+                               nvidia,tristate = <1>;
+                       };
+                       conf_ck32 {
+                               nvidia,pins = "ck32", "ddrc", "pmca", "pmcb",
+                                       "pmcc", "pmcd", "pmce", "xm2c", "xm2d";
+                               nvidia,pull = <0>;
+                       };
+                       conf_crtp {
+                               nvidia,pins = "crtp", "gmb", "slxa", "spia",
+                                       "spig", "spih";
+                               nvidia,pull = <2>;
+                               nvidia,tristate = <1>;
+                       };
+                       conf_dta {
+                               nvidia,pins = "dta", "dtb", "dtc", "dtd";
+                               nvidia,pull = <1>;
+                               nvidia,tristate = <0>;
+                       };
+                       conf_dte {
+                               nvidia,pins = "dte", "spif";
+                               nvidia,pull = <1>;
+                               nvidia,tristate = <1>;
+                       };
+                       conf_hdint {
+                               nvidia,pins = "hdint", "lcsn", "ldc", "lm1",
+                                       "lpw1", "lsc1", "lsck", "lsda", "lsdi",
+                                       "lvp0";
+                               nvidia,tristate = <1>;
+                       };
+                       conf_kbca {
+                               nvidia,pins = "kbca", "kbcb", "kbcc", "kbcd",
+                                       "kbce", "kbcf", "sdio1", "spic", "uaa",
+                                       "uab";
+                               nvidia,pull = <2>;
+                               nvidia,tristate = <0>;
+                       };
+                       conf_lc {
+                               nvidia,pins = "lc", "ls";
+                               nvidia,pull = <2>;
+                       };
+                       conf_ld0 {
+                               nvidia,pins = "ld0", "ld1", "ld2", "ld3", "ld4",
+                                       "ld5", "ld6", "ld7", "ld8", "ld9",
+                                       "ld10", "ld11", "ld12", "ld13", "ld14",
+                                       "ld15", "ld16", "ld17", "ldi", "lhp0",
+                                       "lhp1", "lhp2", "lhs", "lm0", "lpp",
+                                       "lpw0", "lpw2", "lsc0", "lspi", "lvp1",
+                                       "lvs", "pmc", "sdb";
+                               nvidia,tristate = <0>;
+                       };
+                       conf_ld17_0 {
+                               nvidia,pins = "ld17_0", "ld19_18", "ld21_20",
+                                       "ld23_22";
+                               nvidia,pull = <1>;
+                       };
+                       drive_sdio1 {
+                               nvidia,pins = "drive_sdio1";
+                               nvidia,high-speed-mode = <0>;
+                               nvidia,schmitt = <0>;
+                               nvidia,low-power-mode = <3>;
+                               nvidia,pull-down-strength = <31>;
+                               nvidia,pull-up-strength = <31>;
+                               nvidia,slew-rate-rising = <3>;
+                               nvidia,slew-rate-falling = <3>;
+                       };
+               };
+       };
+
+       i2s@70002800 {
+               status = "okay";
+       };
+
+       serial@70006300 {
+               status = "okay";
+               clock-frequency = <216000000>;
+       };
+
+       i2c@7000c000 {
+               status = "okay";
+               clock-frequency = <400000>;
+
+               wm8903: wm8903@1a {
+                       compatible = "wlf,wm8903";
+                       reg = <0x1a>;
+                       interrupt-parent = <&gpio>;
+                       interrupts = <187 0x04>;
+
+                       gpio-controller;
+                       #gpio-cells = <2>;
+
+                       micdet-cfg = <0>;
+                       micdet-delay = <100>;
+                       gpio-cfg = <0xffffffff 0xffffffff 0 0xffffffff 0xffffffff>;
+               };
+
+               /* ALS and proximity sensor */
+               isl29018@44 {
+                       compatible = "isil,isl29018";
+                       reg = <0x44>;
+                       interrupt-parent = <&gpio>;
+                       interrupts = <202 0x04>; /* GPIO PZ2 */
+               };
+
+               gyrometer@68 {
+                       compatible = "invn,mpu3050";
+                       reg = <0x68>;
+                       interrupt-parent = <&gpio>;
+                       interrupts = <204 0x04>; /* gpio PZ4 */
+               };
+       };
+
+       i2c@7000c400 {
+               status = "okay";
+               clock-frequency = <100000>;
+
+               smart-battery@b {
+                       compatible = "ti,bq20z75", "smart-battery-1.1";
+                       reg = <0xb>;
+                       ti,i2c-retry-count = <2>;
+                       ti,poll-retry-count = <10>;
+               };
+       };
+
+       i2c@7000c500 {
+               status = "okay";
+               clock-frequency = <400000>;
+       };
+
+       i2c@7000d000 {
+               status = "okay";
+               clock-frequency = <400000>;
+
+               temperature-sensor@4c {
+                       compatible = "nct1008";
+                       reg = <0x4c>;
+               };
+
+               magnetometer@c {
+                       compatible = "ak8975";
+                       reg = <0xc>;
+                       interrupt-parent = <&gpio>;
+                       interrupts = <109 0x04>; /* gpio PN5 */
+               };
+       };
+
+       memory-controller@0x7000f400 {
+               emc-table@190000 {
+                       reg = <190000>;
+                       compatible = "nvidia,tegra20-emc-table";
+                       clock-frequency = <190000>;
+                       nvidia,emc-registers = <0x0000000c 0x00000026
+                               0x00000009 0x00000003 0x00000004 0x00000004
+                               0x00000002 0x0000000c 0x00000003 0x00000003
+                               0x00000002 0x00000001 0x00000004 0x00000005
+                               0x00000004 0x00000009 0x0000000d 0x0000059f
+                               0x00000000 0x00000003 0x00000003 0x00000003
+                               0x00000003 0x00000001 0x0000000b 0x000000c8
+                               0x00000003 0x00000007 0x00000004 0x0000000f
+                               0x00000002 0x00000000 0x00000000 0x00000002
+                               0x00000000 0x00000000 0x00000083 0xa06204ae
+                               0x007dc010 0x00000000 0x00000000 0x00000000
+                               0x00000000 0x00000000 0x00000000 0x00000000>;
+               };
+
+               emc-table@380000 {
+                       reg = <380000>;
+                       compatible = "nvidia,tegra20-emc-table";
+                       clock-frequency = <380000>;
+                       nvidia,emc-registers = <0x00000017 0x0000004b
+                               0x00000012 0x00000006 0x00000004 0x00000005
+                               0x00000003 0x0000000c 0x00000006 0x00000006
+                               0x00000003 0x00000001 0x00000004 0x00000005
+                               0x00000004 0x00000009 0x0000000d 0x00000b5f
+                               0x00000000 0x00000003 0x00000003 0x00000006
+                               0x00000006 0x00000001 0x00000011 0x000000c8
+                               0x00000003 0x0000000e 0x00000007 0x0000000f
+                               0x00000002 0x00000000 0x00000000 0x00000002
+                               0x00000000 0x00000000 0x00000083 0xe044048b
+                               0x007d8010 0x00000000 0x00000000 0x00000000
+                               0x00000000 0x00000000 0x00000000 0x00000000>;
+               };
+       };
+
+       usb@c5000000 {
+               status = "okay";
+               nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */
+               dr_mode = "otg";
+       };
+
+       usb@c5004000 {
+               status = "okay";
+               nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
+       };
+
+       usb@c5008000 {
+               status = "okay";
+       };
+
+       sdhci@c8000400 {
+               status = "okay";
+               cd-gpios = <&gpio 69 0>; /* gpio PI5 */
+               wp-gpios = <&gpio 57 0>; /* gpio PH1 */
+               power-gpios = <&gpio 70 0>; /* gpio PI6 */
+               bus-width = <4>;
+       };
+
+       sdhci@c8000600 {
+               status = "okay";
+               bus-width = <8>;
+       };
+
+       gpio-keys {
+               compatible = "gpio-keys";
+
+               power {
+                       label = "Power";
+                       gpios = <&gpio 170 1>; /* gpio PV2, active low */
+                       linux,code = <116>; /* KEY_POWER */
+                       gpio-key,wakeup;
+               };
+
+               lid {
+                       label = "Lid";
+                       gpios = <&gpio 23 0>; /* gpio PC7 */
+                       linux,input-type = <5>; /* EV_SW */
+                       linux,code = <0>; /* SW_LID */
+                       debounce-interval = <1>;
+                       gpio-key,wakeup;
+               };
+       };
+
+       sound {
+               compatible = "nvidia,tegra-audio-wm8903-seaboard",
+                            "nvidia,tegra-audio-wm8903";
+               nvidia,model = "NVIDIA Tegra Seaboard";
+
+               nvidia,audio-routing =
+                       "Headphone Jack", "HPOUTR",
+                       "Headphone Jack", "HPOUTL",
+                       "Int Spk", "ROP",
+                       "Int Spk", "RON",
+                       "Int Spk", "LOP",
+                       "Int Spk", "LON",
+                       "Mic Jack", "MICBIAS",
+                       "IN1R", "Mic Jack";
+
+               nvidia,i2s-controller = <&tegra_i2s1>;
+               nvidia,audio-codec = <&wm8903>;
+
+               nvidia,spkr-en-gpios = <&wm8903 2 0>;
+               nvidia,hp-det-gpios = <&gpio 185 0>; /* gpio PX1 */
+       };
+};
diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
new file mode 100644 (file)
index 0000000..9de5636
--- /dev/null
@@ -0,0 +1,306 @@
+/dts-v1/;
+
+/include/ "tegra20.dtsi"
+
+/ {
+       model = "Compulab TrimSlice board";
+       compatible = "compulab,trimslice", "nvidia,tegra20";
+
+       memory {
+               reg = <0x00000000 0x40000000>;
+       };
+
+       pinmux {
+               pinctrl-names = "default";
+               pinctrl-0 = <&state_default>;
+
+               state_default: pinmux {
+                       ata {
+                               nvidia,pins = "ata";
+                               nvidia,function = "ide";
+                       };
+                       atb {
+                               nvidia,pins = "atb", "gma";
+                               nvidia,function = "sdio4";
+                       };
+                       atc {
+                               nvidia,pins = "atc", "gmb";
+                               nvidia,function = "nand";
+                       };
+                       atd {
+                               nvidia,pins = "atd", "ate", "gme", "pta";
+                               nvidia,function = "gmi";
+                       };
+                       cdev1 {
+                               nvidia,pins = "cdev1";
+                               nvidia,function = "plla_out";
+                       };
+                       cdev2 {
+                               nvidia,pins = "cdev2";
+                               nvidia,function = "pllp_out4";
+                       };
+                       crtp {
+                               nvidia,pins = "crtp";
+                               nvidia,function = "crt";
+                       };
+                       csus {
+                               nvidia,pins = "csus";
+                               nvidia,function = "vi_sensor_clk";
+                       };
+                       dap1 {
+                               nvidia,pins = "dap1";
+                               nvidia,function = "dap1";
+                       };
+                       dap2 {
+                               nvidia,pins = "dap2";
+                               nvidia,function = "dap2";
+                       };
+                       dap3 {
+                               nvidia,pins = "dap3";
+                               nvidia,function = "dap3";
+                       };
+                       dap4 {
+                               nvidia,pins = "dap4";
+                               nvidia,function = "dap4";
+                       };
+                       ddc {
+                               nvidia,pins = "ddc";
+                               nvidia,function = "i2c2";
+                       };
+                       dta {
+                               nvidia,pins = "dta", "dtb", "dtc", "dtd", "dte";
+                               nvidia,function = "vi";
+                       };
+                       dtf {
+                               nvidia,pins = "dtf";
+                               nvidia,function = "i2c3";
+                       };
+                       gmc {
+                               nvidia,pins = "gmc", "gmd";
+                               nvidia,function = "sflash";
+                       };
+                       gpu {
+                               nvidia,pins = "gpu";
+                               nvidia,function = "uarta";
+                       };
+                       gpu7 {
+                               nvidia,pins = "gpu7";
+                               nvidia,function = "rtck";
+                       };
+                       gpv {
+                               nvidia,pins = "gpv", "slxa", "slxk";
+                               nvidia,function = "pcie";
+                       };
+                       hdint {
+                               nvidia,pins = "hdint";
+                               nvidia,function = "hdmi";
+                       };
+                       i2cp {
+                               nvidia,pins = "i2cp";
+                               nvidia,function = "i2cp";
+                       };
+                       irrx {
+                               nvidia,pins = "irrx", "irtx";
+                               nvidia,function = "uartb";
+                       };
+                       kbca {
+                               nvidia,pins = "kbca", "kbcb", "kbcc", "kbcd",
+                                       "kbce", "kbcf";
+                               nvidia,function = "kbc";
+                       };
+                       lcsn {
+                               nvidia,pins = "lcsn", "ld0", "ld1", "ld2",
+                                       "ld3", "ld4", "ld5", "ld6", "ld7",
+                                       "ld8", "ld9", "ld10", "ld11", "ld12",
+                                       "ld13", "ld14", "ld15", "ld16", "ld17",
+                                       "ldc", "ldi", "lhp0", "lhp1", "lhp2",
+                                       "lhs", "lm0", "lm1", "lpp", "lpw0",
+                                       "lpw1", "lpw2", "lsc0", "lsc1", "lsck",
+                                       "lsda", "lsdi", "lspi", "lvp0", "lvp1",
+                                       "lvs";
+                               nvidia,function = "displaya";
+                       };
+                       owc {
+                               nvidia,pins = "owc", "uac";
+                               nvidia,function = "rsvd2";
+                       };
+                       pmc {
+                               nvidia,pins = "pmc";
+                               nvidia,function = "pwr_on";
+                       };
+                       rm {
+                               nvidia,pins = "rm";
+                               nvidia,function = "i2c1";
+                       };
+                       sdb {
+                               nvidia,pins = "sdb", "sdc", "sdd";
+                               nvidia,function = "pwm";
+                       };
+                       sdio1 {
+                               nvidia,pins = "sdio1";
+                               nvidia,function = "sdio1";
+                       };
+                       slxc {
+                               nvidia,pins = "slxc", "slxd";
+                               nvidia,function = "sdio3";
+                       };
+                       spdi {
+                               nvidia,pins = "spdi", "spdo";
+                               nvidia,function = "spdif";
+                       };
+                       spia {
+                               nvidia,pins = "spia", "spib", "spic";
+                               nvidia,function = "spi2";
+                       };
+                       spid {
+                               nvidia,pins = "spid", "spie", "spif";
+                               nvidia,function = "spi1";
+                       };
+                       spig {
+                               nvidia,pins = "spig", "spih";
+                               nvidia,function = "spi2_alt";
+                       };
+                       uaa {
+                               nvidia,pins = "uaa", "uab", "uda";
+                               nvidia,function = "ulpi";
+                       };
+                       uad {
+                               nvidia,pins = "uad";
+                               nvidia,function = "irda";
+                       };
+                       uca {
+                               nvidia,pins = "uca", "ucb";
+                               nvidia,function = "uartc";
+                       };
+                       conf_ata {
+                               nvidia,pins = "ata", "atc", "atd", "ate",
+                                       "crtp", "dap2", "dap3", "dap4", "dta",
+                                       "dtb", "dtc", "dtd", "dte", "gmb",
+                                       "gme", "i2cp", "pta", "slxc", "slxd",
+                                       "spdi", "spdo", "uda";
+                               nvidia,pull = <0>;
+                               nvidia,tristate = <1>;
+                       };
+                       conf_atb {
+                               nvidia,pins = "atb", "cdev1", "cdev2", "dap1",
+                                       "gma", "gmc", "gmd", "gpu", "gpu7",
+                                       "gpv", "sdio1", "slxa", "slxk", "uac";
+                               nvidia,pull = <0>;
+                               nvidia,tristate = <0>;
+                       };
+                       conf_ck32 {
+                               nvidia,pins = "ck32", "ddrc", "pmca", "pmcb",
+                                       "pmcc", "pmcd", "pmce", "xm2c", "xm2d";
+                               nvidia,pull = <0>;
+                       };
+                       conf_csus {
+                               nvidia,pins = "csus", "spia", "spib",
+                                       "spid", "spif";
+                               nvidia,pull = <1>;
+                               nvidia,tristate = <1>;
+                       };
+                       conf_ddc {
+                               nvidia,pins = "ddc", "dtf", "rm", "sdc", "sdd";
+                               nvidia,pull = <2>;
+                               nvidia,tristate = <0>;
+                       };
+                       conf_hdint {
+                               nvidia,pins = "hdint", "lcsn", "ldc", "lm1",
+                                       "lpw1", "lsc1", "lsck", "lsda", "lsdi",
+                                       "lvp0", "pmc";
+                               nvidia,tristate = <1>;
+                       };
+                       conf_irrx {
+                               nvidia,pins = "irrx", "irtx", "kbca", "kbcb",
+                                       "kbcc", "kbcd", "kbce", "kbcf", "owc",
+                                       "spic", "spie", "spig", "spih", "uaa",
+                                       "uab", "uad", "uca", "ucb";
+                               nvidia,pull = <2>;
+                               nvidia,tristate = <1>;
+                       };
+                       conf_lc {
+                               nvidia,pins = "lc", "ls";
+                               nvidia,pull = <2>;
+                       };
+                       conf_ld0 {
+                               nvidia,pins = "ld0", "ld1", "ld2", "ld3", "ld4",
+                                       "ld5", "ld6", "ld7", "ld8", "ld9",
+                                       "ld10", "ld11", "ld12", "ld13", "ld14",
+                                       "ld15", "ld16", "ld17", "ldi", "lhp0",
+                                       "lhp1", "lhp2", "lhs", "lm0", "lpp",
+                                       "lpw0", "lpw2", "lsc0", "lspi", "lvp1",
+                                       "lvs", "sdb";
+                               nvidia,tristate = <0>;
+                       };
+                       conf_ld17_0 {
+                               nvidia,pins = "ld17_0", "ld19_18", "ld21_20",
+                                       "ld23_22";
+                               nvidia,pull = <1>;
+                       };
+               };
+       };
+
+       i2s@70002800 {
+               status = "okay";
+       };
+
+       serial@70006000 {
+               status = "okay";
+               clock-frequency = <216000000>;
+       };
+
+       i2c@7000c000 {
+               status = "okay";
+               clock-frequency = <400000>;
+       };
+
+       i2c@7000c400 {
+               status = "okay";
+               clock-frequency = <400000>;
+       };
+
+       i2c@7000c500 {
+               status = "okay";
+               clock-frequency = <400000>;
+
+               codec: codec@1a {
+                       compatible = "ti,tlv320aic23";
+                       reg = <0x1a>;
+               };
+
+               rtc@56 {
+                       compatible = "emmicro,em3027";
+                       reg = <0x56>;
+               };
+       };
+
+       usb@c5000000 {
+               status = "okay";
+       };
+
+       usb@c5004000 {
+               nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
+       };
+
+       usb@c5008000 {
+               status = "okay";
+       };
+
+       sdhci@c8000000 {
+               status = "okay";
+               bus-width = <4>;
+       };
+
+       sdhci@c8000600 {
+               status = "okay";
+               cd-gpios = <&gpio 121 0>; /* gpio PP1 */
+               wp-gpios = <&gpio 122 0>; /* gpio PP2 */
+               bus-width = <4>;
+       };
+
+       sound {
+               compatible = "nvidia,tegra-audio-trimslice";
+               nvidia,i2s-controller = <&tegra_i2s1>;
+               nvidia,audio-codec = <&codec>;
+       };
+};
diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts
new file mode 100644 (file)
index 0000000..be90544
--- /dev/null
@@ -0,0 +1,343 @@
+/dts-v1/;
+
+/include/ "tegra20.dtsi"
+
+/ {
+       model = "NVIDIA Tegra2 Ventana evaluation board";
+       compatible = "nvidia,ventana", "nvidia,tegra20";
+
+       memory {
+               reg = <0x00000000 0x40000000>;
+       };
+
+       pinmux {
+               pinctrl-names = "default";
+               pinctrl-0 = <&state_default>;
+
+               state_default: pinmux {
+                       ata {
+                               nvidia,pins = "ata";
+                               nvidia,function = "ide";
+                       };
+                       atb {
+                               nvidia,pins = "atb", "gma", "gme";
+                               nvidia,function = "sdio4";
+                       };
+                       atc {
+                               nvidia,pins = "atc";
+                               nvidia,function = "nand";
+                       };
+                       atd {
+                               nvidia,pins = "atd", "ate", "gmb", "spia",
+                                       "spib", "spic";
+                               nvidia,function = "gmi";
+                       };
+                       cdev1 {
+                               nvidia,pins = "cdev1";
+                               nvidia,function = "plla_out";
+                       };
+                       cdev2 {
+                               nvidia,pins = "cdev2";
+                               nvidia,function = "pllp_out4";
+                       };
+                       crtp {
+                               nvidia,pins = "crtp", "lm1";
+                               nvidia,function = "crt";
+                       };
+                       csus {
+                               nvidia,pins = "csus";
+                               nvidia,function = "vi_sensor_clk";
+                       };
+                       dap1 {
+                               nvidia,pins = "dap1";
+                               nvidia,function = "dap1";
+                       };
+                       dap2 {
+                               nvidia,pins = "dap2";
+                               nvidia,function = "dap2";
+                       };
+                       dap3 {
+                               nvidia,pins = "dap3";
+                               nvidia,function = "dap3";
+                       };
+                       dap4 {
+                               nvidia,pins = "dap4";
+                               nvidia,function = "dap4";
+                       };
+                       ddc {
+                               nvidia,pins = "ddc", "owc", "spdi", "spdo",
+                                       "uac";
+                               nvidia,function = "rsvd2";
+                       };
+                       dta {
+                               nvidia,pins = "dta", "dtb", "dtc", "dtd", "dte";
+                               nvidia,function = "vi";
+                       };
+                       dtf {
+                               nvidia,pins = "dtf";
+                               nvidia,function = "i2c3";
+                       };
+                       gmc {
+                               nvidia,pins = "gmc";
+                               nvidia,function = "uartd";
+                       };
+                       gmd {
+                               nvidia,pins = "gmd";
+                               nvidia,function = "sflash";
+                       };
+                       gpu {
+                               nvidia,pins = "gpu";
+                               nvidia,function = "pwm";
+                       };
+                       gpu7 {
+                               nvidia,pins = "gpu7";
+                               nvidia,function = "rtck";
+                       };
+                       gpv {
+                               nvidia,pins = "gpv", "slxa", "slxk";
+                               nvidia,function = "pcie";
+                       };
+                       hdint {
+                               nvidia,pins = "hdint", "pta";
+                               nvidia,function = "hdmi";
+                       };
+                       i2cp {
+                               nvidia,pins = "i2cp";
+                               nvidia,function = "i2cp";
+                       };
+                       irrx {
+                               nvidia,pins = "irrx", "irtx";
+                               nvidia,function = "uartb";
+                       };
+                       kbca {
+                               nvidia,pins = "kbca", "kbcb", "kbcc", "kbcd",
+                                       "kbce", "kbcf";
+                               nvidia,function = "kbc";
+                       };
+                       lcsn {
+                               nvidia,pins = "lcsn", "ldc", "lm0", "lpw1",
+                                       "lsdi", "lvp0";
+                               nvidia,function = "rsvd4";
+                       };
+                       ld0 {
+                               nvidia,pins = "ld0", "ld1", "ld2", "ld3", "ld4",
+                                       "ld5", "ld6", "ld7", "ld8", "ld9",
+                                       "ld10", "ld11", "ld12", "ld13", "ld14",
+                                       "ld15", "ld16", "ld17", "ldi", "lhp0",
+                                       "lhp1", "lhp2", "lhs", "lpp", "lpw0",
+                                       "lpw2", "lsc0", "lsc1", "lsck", "lsda",
+                                       "lspi", "lvp1", "lvs";
+                               nvidia,function = "displaya";
+                       };
+                       pmc {
+                               nvidia,pins = "pmc";
+                               nvidia,function = "pwr_on";
+                       };
+                       rm {
+                               nvidia,pins = "rm";
+                               nvidia,function = "i2c1";
+                       };
+                       sdb {
+                               nvidia,pins = "sdb", "sdc", "sdd", "slxc";
+                               nvidia,function = "sdio3";
+                       };
+                       sdio1 {
+                               nvidia,pins = "sdio1";
+                               nvidia,function = "sdio1";
+                       };
+                       slxd {
+                               nvidia,pins = "slxd";
+                               nvidia,function = "spdif";
+                       };
+                       spid {
+                               nvidia,pins = "spid", "spie", "spif";
+                               nvidia,function = "spi1";
+                       };
+                       spig {
+                               nvidia,pins = "spig", "spih";
+                               nvidia,function = "spi2_alt";
+                       };
+                       uaa {
+                               nvidia,pins = "uaa", "uab", "uda";
+                               nvidia,function = "ulpi";
+                       };
+                       uad {
+                               nvidia,pins = "uad";
+                               nvidia,function = "irda";
+                       };
+                       uca {
+                               nvidia,pins = "uca", "ucb";
+                               nvidia,function = "uartc";
+                       };
+                       conf_ata {
+                               nvidia,pins = "ata", "atb", "atc", "atd",
+                                       "cdev1", "cdev2", "dap1", "dap2",
+                                       "dap4", "ddc", "dtf", "gma", "gmc",
+                                       "gme", "gpu", "gpu7", "i2cp", "irrx",
+                                       "irtx", "pta", "rm", "sdc", "sdd",
+                                       "slxc", "slxd", "slxk", "spdi", "spdo",
+                                       "uac", "uad", "uca", "ucb", "uda";
+                               nvidia,pull = <0>;
+                               nvidia,tristate = <0>;
+                       };
+                       conf_ate {
+                               nvidia,pins = "ate", "csus", "dap3", "gmd",
+                                       "gpv", "owc", "spia", "spib", "spic",
+                                       "spid", "spie", "spig";
+                               nvidia,pull = <0>;
+                               nvidia,tristate = <1>;
+                       };
+                       conf_ck32 {
+                               nvidia,pins = "ck32", "ddrc", "pmca", "pmcb",
+                                       "pmcc", "pmcd", "pmce", "xm2c", "xm2d";
+                               nvidia,pull = <0>;
+                       };
+                       conf_crtp {
+                               nvidia,pins = "crtp", "gmb", "slxa", "spih";
+                               nvidia,pull = <2>;
+                               nvidia,tristate = <1>;
+                       };
+                       conf_dta {
+                               nvidia,pins = "dta", "dtb", "dtc", "dtd";
+                               nvidia,pull = <1>;
+                               nvidia,tristate = <0>;
+                       };
+                       conf_dte {
+                               nvidia,pins = "dte", "spif";
+                               nvidia,pull = <1>;
+                               nvidia,tristate = <1>;
+                       };
+                       conf_hdint {
+                               nvidia,pins = "hdint", "lcsn", "ldc", "lm1",
+                                       "lpw1", "lsck", "lsda", "lsdi", "lvp0";
+                               nvidia,tristate = <1>;
+                       };
+                       conf_kbca {
+                               nvidia,pins = "kbca", "kbcb", "kbcc", "kbcd",
+                                       "kbce", "kbcf", "sdio1", "uaa", "uab";
+                               nvidia,pull = <2>;
+                               nvidia,tristate = <0>;
+                       };
+                       conf_lc {
+                               nvidia,pins = "lc", "ls";
+                               nvidia,pull = <2>;
+                       };
+                       conf_ld0 {
+                               nvidia,pins = "ld0", "ld1", "ld2", "ld3", "ld4",
+                                       "ld5", "ld6", "ld7", "ld8", "ld9",
+                                       "ld10", "ld11", "ld12", "ld13", "ld14",
+                                       "ld15", "ld16", "ld17", "ldi", "lhp0",
+                                       "lhp1", "lhp2", "lhs", "lm0", "lpp",
+                                       "lpw0", "lpw2", "lsc0", "lsc1", "lspi",
+                                       "lvp1", "lvs", "pmc", "sdb";
+                               nvidia,tristate = <0>;
+                       };
+                       conf_ld17_0 {
+                               nvidia,pins = "ld17_0", "ld19_18", "ld21_20",
+                                       "ld23_22";
+                               nvidia,pull = <1>;
+                       };
+               };
+       };
+
+       i2s@70002800 {
+               status = "okay";
+       };
+
+       serial@70006300 {
+               status = "okay";
+               clock-frequency = <216000000>;
+       };
+
+       i2c@7000c000 {
+               status = "okay";
+               clock-frequency = <400000>;
+
+               wm8903: wm8903@1a {
+                       compatible = "wlf,wm8903";
+                       reg = <0x1a>;
+                       interrupt-parent = <&gpio>;
+                       interrupts = <187 0x04>;
+
+                       gpio-controller;
+                       #gpio-cells = <2>;
+
+                       micdet-cfg = <0>;
+                       micdet-delay = <100>;
+                       gpio-cfg = <0xffffffff 0xffffffff 0 0xffffffff 0xffffffff>;
+               };
+
+               /* ALS and proximity sensor */
+               isl29018@44 {
+                       compatible = "isil,isl29018";
+                       reg = <0x44>;
+                       interrupt-parent = <&gpio>;
+                       interrupts = <202 0x04>; /*gpio PZ2 */
+               };
+       };
+
+       i2c@7000c400 {
+               status = "okay";
+               clock-frequency = <400000>;
+       };
+
+       i2c@7000c500 {
+               status = "okay";
+               clock-frequency = <400000>;
+       };
+
+       i2c@7000d000 {
+               status = "okay";
+               clock-frequency = <400000>;
+       };
+
+       usb@c5000000 {
+               status = "okay";
+       };
+
+       usb@c5004000 {
+               status = "okay";
+               nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
+       };
+
+       usb@c5008000 {
+               status = "okay";
+       };
+
+       sdhci@c8000400 {
+               status = "okay";
+               cd-gpios = <&gpio 69 0>; /* gpio PI5 */
+               wp-gpios = <&gpio 57 0>; /* gpio PH1 */
+               power-gpios = <&gpio 70 0>; /* gpio PI6 */
+               bus-width = <4>;
+       };
+
+       sdhci@c8000600 {
+               status = "okay";
+               bus-width = <8>;
+       };
+
+       sound {
+               compatible = "nvidia,tegra-audio-wm8903-ventana",
+                            "nvidia,tegra-audio-wm8903";
+               nvidia,model = "NVIDIA Tegra Ventana";
+
+               nvidia,audio-routing =
+                       "Headphone Jack", "HPOUTR",
+                       "Headphone Jack", "HPOUTL",
+                       "Int Spk", "ROP",
+                       "Int Spk", "RON",
+                       "Int Spk", "LOP",
+                       "Int Spk", "LON",
+                       "Mic Jack", "MICBIAS",
+                       "IN1L", "Mic Jack";
+
+               nvidia,i2s-controller = <&tegra_i2s1>;
+               nvidia,audio-codec = <&wm8903>;
+
+               nvidia,spkr-en-gpios = <&wm8903 2 0>;
+               nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
+               nvidia,int-mic-en-gpios = <&gpio 184 0>; /* gpio PX0 */
+               nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
+       };
+};
diff --git a/arch/arm/boot/dts/tegra30-cardhu.dts b/arch/arm/boot/dts/tegra30-cardhu.dts
new file mode 100644 (file)
index 0000000..c169bce
--- /dev/null
@@ -0,0 +1,171 @@
+/dts-v1/;
+
+/include/ "tegra30.dtsi"
+
+/ {
+       model = "NVIDIA Tegra30 Cardhu evaluation board";
+       compatible = "nvidia,cardhu", "nvidia,tegra30";
+
+       memory {
+               reg = <0x80000000 0x40000000>;
+       };
+
+       pinmux {
+               pinctrl-names = "default";
+               pinctrl-0 = <&state_default>;
+
+               state_default: pinmux {
+                       sdmmc1_clk_pz0 {
+                               nvidia,pins = "sdmmc1_clk_pz0";
+                               nvidia,function = "sdmmc1";
+                               nvidia,pull = <0>;
+                               nvidia,tristate = <0>;
+                       };
+                       sdmmc1_cmd_pz1 {
+                               nvidia,pins =   "sdmmc1_cmd_pz1",
+                                               "sdmmc1_dat0_py7",
+                                               "sdmmc1_dat1_py6",
+                                               "sdmmc1_dat2_py5",
+                                               "sdmmc1_dat3_py4";
+                               nvidia,function = "sdmmc1";
+                               nvidia,pull = <2>;
+                               nvidia,tristate = <0>;
+                       };
+                       sdmmc4_clk_pcc4 {
+                               nvidia,pins =   "sdmmc4_clk_pcc4",
+                                               "sdmmc4_rst_n_pcc3";
+                               nvidia,function = "sdmmc4";
+                               nvidia,pull = <0>;
+                               nvidia,tristate = <0>;
+                       };
+                       sdmmc4_dat0_paa0 {
+                               nvidia,pins =   "sdmmc4_dat0_paa0",
+                                               "sdmmc4_dat1_paa1",
+                                               "sdmmc4_dat2_paa2",
+                                               "sdmmc4_dat3_paa3",
+                                               "sdmmc4_dat4_paa4",
+                                               "sdmmc4_dat5_paa5",
+                                               "sdmmc4_dat6_paa6",
+                                               "sdmmc4_dat7_paa7";
+                               nvidia,function = "sdmmc4";
+                               nvidia,pull = <2>;
+                               nvidia,tristate = <0>;
+                       };
+                       dap2_fs_pa2 {
+                               nvidia,pins =   "dap2_fs_pa2",
+                                               "dap2_sclk_pa3",
+                                               "dap2_din_pa4",
+                                               "dap2_dout_pa5";
+                               nvidia,function = "i2s1";
+                               nvidia,pull = <0>;
+                               nvidia,tristate = <0>;
+                       };
+               };
+       };
+
+       serial@70006000 {
+               status = "okay";
+               clock-frequency = <408000000>;
+       };
+
+       i2c@7000c000 {
+               status = "okay";
+               clock-frequency = <100000>;
+       };
+
+       i2c@7000c400 {
+               status = "okay";
+               clock-frequency = <100000>;
+       };
+
+       i2c@7000c500 {
+               status = "okay";
+               clock-frequency = <100000>;
+
+               /* ALS and Proximity sensor */
+               isl29028@44 {
+                       compatible = "isil,isl29028";
+                       reg = <0x44>;
+                       interrupt-parent = <&gpio>;
+                       interrupts = <88 0x04>; /*gpio PL0 */
+               };
+       };
+
+       i2c@7000c700 {
+               status = "okay";
+               clock-frequency = <100000>;
+       };
+
+       i2c@7000d000 {
+               status = "okay";
+               clock-frequency = <100000>;
+
+               wm8903: wm8903@1a {
+                       compatible = "wlf,wm8903";
+                       reg = <0x1a>;
+                       interrupt-parent = <&gpio>;
+                       interrupts = <179 0x04>; /* gpio PW3 */
+
+                       gpio-controller;
+                       #gpio-cells = <2>;
+
+                       micdet-cfg = <0>;
+                       micdet-delay = <100>;
+                       gpio-cfg = <0xffffffff 0xffffffff 0 0xffffffff 0xffffffff>;
+               };
+
+               tps62361 {
+                       compatible = "ti,tps62361";
+                       reg = <0x60>;
+
+                       regulator-name = "tps62361-vout";
+                       regulator-min-microvolt = <500000>;
+                       regulator-max-microvolt = <1500000>;
+                       regulator-boot-on;
+                       regulator-always-on;
+                       ti,vsel0-state-high;
+                       ti,vsel1-state-high;
+               };
+       };
+
+       ahub {
+               i2s@70080400 {
+                       status = "okay";
+               };
+       };
+
+       sdhci@78000000 {
+               status = "okay";
+               cd-gpios = <&gpio 69 0>; /* gpio PI5 */
+               wp-gpios = <&gpio 155 0>; /* gpio PT3 */
+               power-gpios = <&gpio 31 0>; /* gpio PD7 */
+               bus-width = <4>;
+       };
+
+       sdhci@78000600 {
+               status = "okay";
+               bus-width = <8>;
+       };
+
+       sound {
+               compatible = "nvidia,tegra-audio-wm8903-cardhu",
+                            "nvidia,tegra-audio-wm8903";
+               nvidia,model = "NVIDIA Tegra Cardhu";
+
+               nvidia,audio-routing =
+                       "Headphone Jack", "HPOUTR",
+                       "Headphone Jack", "HPOUTL",
+                       "Int Spk", "ROP",
+                       "Int Spk", "RON",
+                       "Int Spk", "LOP",
+                       "Int Spk", "LON",
+                       "Mic Jack", "MICBIAS",
+                       "IN1L", "Mic Jack";
+
+               nvidia,i2s-controller = <&tegra_i2s1>;
+               nvidia,audio-codec = <&wm8903>;
+
+               nvidia,spkr-en-gpios = <&wm8903 2 0>;
+               nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
+       };
+};
index 9a82094092d72221e987f603496d93a683da2931..8040345bd9711d563b444304a7de1eedc104f81f 100644 (file)
@@ -2,9 +2,9 @@ zreladdr-$(CONFIG_ARCH_TEGRA_2x_SOC)    += 0x00008000
 params_phys-$(CONFIG_ARCH_TEGRA_2x_SOC)        := 0x00000100
 initrd_phys-$(CONFIG_ARCH_TEGRA_2x_SOC)        := 0x00800000
 
-dtb-$(CONFIG_MACH_HARMONY) += tegra-harmony.dtb
-dtb-$(CONFIG_MACH_PAZ00) += tegra-paz00.dtb
-dtb-$(CONFIG_MACH_SEABOARD) += tegra-seaboard.dtb
-dtb-$(CONFIG_MACH_TRIMSLICE) += tegra-trimslice.dtb
-dtb-$(CONFIG_MACH_VENTANA) += tegra-ventana.dtb
-dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra-cardhu.dtb
+dtb-$(CONFIG_MACH_HARMONY) += tegra20-harmony.dtb
+dtb-$(CONFIG_MACH_PAZ00) += tegra20-paz00.dtb
+dtb-$(CONFIG_MACH_SEABOARD) += tegra20-seaboard.dtb
+dtb-$(CONFIG_MACH_TRIMSLICE) += tegra20-trimslice.dtb
+dtb-$(CONFIG_MACH_VENTANA) += tegra20-ventana.dtb
+dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30-cardhu.dtb