]> Git Repo - linux.git/commitdiff
Merge branch 'drivers/mmc' into next/dt2
authorArnd Bergmann <[email protected]>
Mon, 14 May 2012 20:35:04 +0000 (22:35 +0200)
committerArnd Bergmann <[email protected]>
Tue, 15 May 2012 11:44:11 +0000 (13:44 +0200)
Changes in the dt2 branch move stuff around that gets changed
in the drivers/mmc branch. I chose a non-obvious resolution by
adding the new bus-width property into all the tegra sdhci device
nodes.

Conflicts:
arch/arm/boot/dts/tegra-cardhu.dts
arch/arm/boot/dts/tegra-harmony.dts
arch/arm/boot/dts/tegra-ventana.dts

Signed-off-by: Arnd Bergmann <[email protected]>
1  2 
arch/arm/boot/dts/imx53-smd.dts
arch/arm/boot/dts/imx6q-arm2.dts
arch/arm/boot/dts/tegra-cardhu.dts
arch/arm/boot/dts/tegra-harmony.dts
arch/arm/boot/dts/tegra-paz00.dts
arch/arm/boot/dts/tegra-seaboard.dts
arch/arm/boot/dts/tegra-trimslice.dts
arch/arm/boot/dts/tegra-ventana.dts
drivers/mmc/host/sdhci-esdhc-imx.c

index a3529afc4d20f8a300624635f2a1651fc5ef22b7,139138a556b043c25d842c3d5c08f5be7aeec907..08091029168e9bf9d224a1101b458f60c9e847dc
        model = "Freescale i.MX53 Smart Mobile Reference Design Board";
        compatible = "fsl,imx53-smd", "fsl,imx53";
  
 -      chosen {
 -              bootargs = "console=ttymxc0,115200 root=/dev/mmcblk0p3 rootwait";
 -      };
 -
        memory {
                reg = <0x70000000 0x40000000>;
        };
                                };
  
                                esdhc@50008000 { /* ESDHC2 */
-                                       fsl,card-wired;
+                                       non-removable;
                                        status = "okay";
                                };
  
 -                              uart3: uart@5000c000 {
 +                              uart3: serial@5000c000 {
                                        fsl,uart-has-rtscts;
                                        status = "okay";
                                };
@@@ -72,7 -76,7 +72,7 @@@
                                };
  
                                esdhc@50020000 { /* ESDHC3 */
-                                       fsl,card-wired;
+                                       non-removable;
                                        status = "okay";
                                };
                        };
                                reg = <0x53fa8000 0x4000>;
                        };
  
 -                      uart1: uart@53fbc000 {
 +                      uart1: serial@53fbc000 {
                                status = "okay";
                        };
  
 -                      uart2: uart@53fc0000 {
 +                      uart2: serial@53fc0000 {
                                status = "okay";
                        };
                };
                                };
                        };
  
 -                      fec@63fec000 {
 +                      ethernet@63fec000 {
                                phy-mode = "rmii";
                                phy-reset-gpios = <&gpio7 6 0>;
                                status = "okay";
index 97893f5cab92908da14106762c16ec76d247f253,d2eaf521c9fd7ae7f5faafcbce609a6254413e76..db4c6096c562eaea2415570934b4cd7fad4a981a
        model = "Freescale i.MX6 Quad Armadillo2 Board";
        compatible = "fsl,imx6q-arm2", "fsl,imx6q";
  
 -      chosen {
 -              bootargs = "console=ttymxc0,115200 root=/dev/mmcblk3p3 rootwait";
 -      };
 -
        memory {
                reg = <0x10000000 0x80000000>;
        };
  
        soc {
                aips-bus@02100000 { /* AIPS2 */
 -                      enet@02188000 {
 +                      ethernet@02188000 {
                                phy-mode = "rgmii";
 -                              local-mac-address = [00 04 9F 01 1B 61];
                                status = "okay";
                        };
  
                                cd-gpios = <&gpio6 11 0>;
                                wp-gpios = <&gpio6 14 0>;
                                vmmc-supply = <&reg_3p3v>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&pinctrl_usdhc3_1>;
                                status = "okay";
                        };
  
                        usdhc@0219c000 { /* uSDHC4 */
-                               fsl,card-wired;
+                               non-removable;
                                vmmc-supply = <&reg_3p3v>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&pinctrl_usdhc4_1>;
                                status = "okay";
                        };
  
 -                      uart4: uart@021f0000 {
 +                      uart4: serial@021f0000 {
                                status = "okay";
                        };
                };
index e14bb450c3289000966c10326a06087d91ed13f3,67c6511f6372a8b8dee4f527e8e58b1dfc375f79..36321bceec46beb8ae812bc1ff5e80f2db45fab0
        compatible = "nvidia,cardhu", "nvidia,tegra30";
  
        memory {
 -              reg = < 0x80000000 0x40000000 >;
 +              reg = <0x80000000 0x40000000>;
        };
  
 -      serial@70006000 {
 -              clock-frequency = < 408000000 >;
 -      };
 -
 -      serial@70006040 {
 -              status = "disable";
 -      };
 -
 -      serial@70006200 {
 -              status = "disable";
 +      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@70006300 {
 -              status = "disable";
 -      };
 -
 -      serial@70006400 {
 -              status = "disable";
 +      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@78000200 {
 -              status = "disable";
 -      };
 -
 -      sdhci@78000400 {
 -              status = "disable";
 -      };
 -
 -      sdhci@78000400 {
 +      sdhci@78000600 {
 +              status = "okay";
                support-8bit;
+               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 6bcdad34d2e75fbbbdc2ccde56329ad26749d0e0,e9cae68861deefb0a96e1340da5b389a57fdc1ab..7de701365fce6b9e6594e16491ad97da9cfa75fb
        model = "NVIDIA Tegra2 Harmony evaluation board";
        compatible = "nvidia,harmony", "nvidia,tegra20";
  
 -      memory@0 {
 -              reg = < 0x00000000 0x40000000 >;
 +      memory {
 +              reg = <0x00000000 0x40000000>;
        };
  
 -      pmc@7000f400 {
 -              nvidia,invert-interrupt;
 +      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 >;
 +                      interrupts = <187 0x04>;
  
                        gpio-controller;
                        #gpio-cells = <2>;
  
                        micdet-cfg = <0>;
                        micdet-delay = <100>;
 -                      gpio-cfg = < 0xffffffff 0xffffffff 0 0xffffffff 0xffffffff >;
 +                      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>;
        };
  
 -      i2s@70002a00 {
 -              status = "disable";
 +      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 */
 +              support-8bit;
++              bus-width = <8>;
        };
  
        sound {
                nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */
                nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
        };
 -
 -      serial@70006000 {
 -              status = "disable";
 -      };
 -
 -      serial@70006040 {
 -              status = "disable";
 -      };
 -
 -      serial@70006200 {
 -              status = "disable";
 -      };
 -
 -      serial@70006300 {
 -              clock-frequency = < 216000000 >;
 -      };
 -
 -      serial@70006400 {
 -              status = "disable";
 -      };
 -
 -      sdhci@c8000000 {
 -              status = "disable";
 -      };
 -
 -      sdhci@c8000200 {
 -              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@c8000400 {
 -              status = "disable";
 -      };
 -
 -      sdhci@c8000600 {
 -              cd-gpios = <&gpio 58 0>; /* gpio PH2 */
 -              wp-gpios = <&gpio 59 0>; /* gpio PH3 */
 -              power-gpios = <&gpio 70 0>; /* gpio PI6 */
 -              support-8bit;
 -              bus-width = <8>;
 -      };
  };
index cb366f0c6ffe6f20a4eaf5ff387b485fae01d337,03d3d7994da77a43eede865906ed26ecfc61d2b6..bfeb117d5aea639bdd0f8949796593b4d881da26
        model = "Toshiba AC100 / Dynabook AZ";
        compatible = "compal,paz00", "nvidia,tegra20";
  
 -      memory@0 {
 +      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 {
        };
  
        i2c@7000c400 {
 +              status = "okay";
                clock-frequency = <400000>;
        };
  
 -      i2c@7000c500 {
 -              status = "disable";
 -      };
 -
 -      nvec@7000c500 {
 -              #address-cells = <1>;
 -              #size-cells = <0>;
 +      nvec {
                compatible = "nvidia,nvec";
 -              reg = <0x7000C500 0x100>;
 +              reg = <0x7000c500 0x100>;
                interrupts = <0 92 0x04>;
 +              #address-cells = <1>;
 +              #size-cells = <0>;
                clock-frequency = <80000>;
 -              request-gpios = <&gpio 170 0>;
 +              request-gpios = <&gpio 170 0>; /* gpio PV2 */
                slave-addr = <138>;
        };
  
        i2c@7000d000 {
 +              status = "okay";
                clock-frequency = <400000>;
  
                adt7461@4c {
                };
        };
  
 -      i2s@70002a00 {
 -              status = "disable";
 -      };
 -
 -      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 */
 -      };
 -
 -      serial@70006000 {
 -              clock-frequency = <216000000>;
 +      usb@c5000000 {
 +              status = "okay";
        };
  
 -      serial@70006040 {
 -              status = "disable";
 +      usb@c5004000 {
 +              status = "okay";
 +              nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
        };
  
 -      serial@70006200 {
 -              clock-frequency = <216000000>;
 -      };
 -
 -      serial@70006300 {
 -              status = "disable";
 -      };
 -
 -      serial@70006400 {
 -              status = "disable";
 +      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@c8000200 {
 -              status = "disable";
 -      };
 -
 -      sdhci@c8000400 {
 -              status = "disable";
 -      };
 -
        sdhci@c8000600 {
 +              status = "okay";
                support-8bit;
+               bus-width = <8>;
        };
  
        gpio-keys {
  
                wifi {
                        label = "wifi-led";
 -                      gpios = <&gpio 24 0>;
 +                      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 */
 +      };
  };
index 21b586e41e97f0450e091dceedc7296ff3784119,8decf722997339f7c9ed80e967bb02c4c26c02f0..89cb7f2acd92cfa9ebbe8ceb8bb18823d62ceeeb
        compatible = "nvidia,seaboard", "nvidia,tegra20";
  
        memory {
 -              device_type = "memory";
 -              reg = < 0x00000000 0x40000000 >;
 +              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 >;
 +                      interrupts = <187 0x04>;
  
                        gpio-controller;
                        #gpio-cells = <2>;
  
                        micdet-cfg = <0>;
                        micdet-delay = <100>;
 -                      gpio-cfg = < 0xffffffff 0xffffffff 0 0xffffffff 0xffffffff >;
 +                      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 {
 -              clock-frequency = <400000>;
 +              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>;
  
 -              adt7461@4c {
 -                      compatible = "adt7461";
 +              temperature-sensor@4c {
 +                      compatible = "nct1008";
                        reg = <0x4c>;
                };
 -      };
 -
 -      i2s@70002a00 {
 -              status = "disable";
 -      };
 -
 -      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 */
 -      };
 -
 -      serial@70006000 {
 -              status = "disable";
 -      };
  
 -      serial@70006040 {
 -              status = "disable";
 +              magnetometer@c {
 +                      compatible = "ak8975";
 +                      reg = <0xc>;
 +                      interrupt-parent = <&gpio>;
 +                      interrupts = <109 0x04>; /* gpio PN5 */
 +              };
        };
  
 -      serial@70006200 {
 -              status = "disable";
 -      };
 +      emc {
 +              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>;
 +              };
  
 -      serial@70006300 {
 -              clock-frequency = < 216000000 >;
 +              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>;
 +              };
        };
  
 -      serial@70006400 {
 -              status = "disable";
 +      usb@c5000000 {
 +              status = "okay";
 +              nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */
 +              dr_mode = "otg";
        };
  
 -      sdhci@c8000000 {
 -              status = "disable";
 +      usb@c5004000 {
 +              status = "okay";
 +              nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
        };
  
 -      sdhci@c8000200 {
 -              status = "disable";
 +      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";
                support-8bit;
+               bus-width = <8>;
        };
  
 -      usb@c5000000 {
 -              nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */
 -              dr_mode = "otg";
 -      };
 -
        gpio-keys {
                compatible = "gpio-keys";
  
                };
        };
  
 -      emc@7000f400 {
 -              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 >;
 -              };
 +      sound {
 +              compatible = "nvidia,tegra-audio-wm8903-seaboard",
 +                           "nvidia,tegra-audio-wm8903";
 +              nvidia,model = "NVIDIA Tegra Seaboard";
  
 -              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 >;
 -              };
 +              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 */
        };
  };
index 6fc52afa9431e82364b6a294cdc5f64f473636b1,252476867b54a6804a0c63f484ed4766698c3787..9de5636023f69694d39bf4196f1bca180e7ebb43
        model = "Compulab TrimSlice board";
        compatible = "compulab,trimslice", "nvidia,tegra20";
  
 -      memory@0 {
 -              reg = < 0x00000000 0x40000000 >;
 +      memory {
 +              reg = <0x00000000 0x40000000>;
        };
  
 -      i2c@7000c000 {
 -              clock-frequency = <400000>;
 -      };
 +      pinmux {
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&state_default>;
  
 -      i2c@7000c400 {
 -              clock-frequency = <400000>;
 +              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>;
 +                      };
 +              };
        };
  
 -      i2c@7000c500 {
 -              clock-frequency = <400000>;
 +      i2s@70002800 {
 +              status = "okay";
        };
  
 -      i2c@7000d000 {
 -              status = "disable";
 +      serial@70006000 {
 +              status = "okay";
 +              clock-frequency = <216000000>;
        };
  
 -      i2s@70002800 {
 -              status = "disable";
 +      i2c@7000c000 {
 +              status = "okay";
 +              clock-frequency = <400000>;
        };
  
 -      i2s@70002a00 {
 -              status = "disable";
 +      i2c@7000c400 {
 +              status = "okay";
 +              clock-frequency = <400000>;
        };
  
 -      das@70000c00 {
 -              status = "disable";
 -      };
 +      i2c@7000c500 {
 +              status = "okay";
 +              clock-frequency = <400000>;
  
 -      serial@70006000 {
 -              clock-frequency = < 216000000 >;
 -      };
 +              codec: codec@1a {
 +                      compatible = "ti,tlv320aic23";
 +                      reg = <0x1a>;
 +              };
  
 -      serial@70006040 {
 -              status = "disable";
 +              rtc@56 {
 +                      compatible = "emmicro,em3027";
 +                      reg = <0x56>;
 +              };
        };
  
 -      serial@70006200 {
 -              status = "disable";
 +      usb@c5000000 {
 +              status = "okay";
        };
  
 -      serial@70006300 {
 -              status = "disable";
 +      usb@c5004000 {
 +              nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
        };
  
 -      serial@70006400 {
 -              status = "disable";
 +      usb@c5008000 {
 +              status = "okay";
        };
  
        sdhci@c8000000 {
 -              status = "disable";
 -      };
 -
 -      sdhci@c8000200 {
 -              status = "disable";
 +              status = "okay";
++              bus-width = <4>;
        };
  
 -      sdhci@c8000400 {
 -              status = "disable";
 +      sdhci@c8000600 {
 +              status = "okay";
 +              cd-gpios = <&gpio 121 0>; /* gpio PP1 */
 +              wp-gpios = <&gpio 122 0>; /* gpio PP2 */
++              bus-width = <4>;
        };
  
 -      sdhci@c8000600 {
 -              cd-gpios = <&gpio 121 0>;
 -              wp-gpios = <&gpio 122 0>;
 +      sound {
 +              compatible = "nvidia,tegra-audio-trimslice";
 +              nvidia,i2s-controller = <&tegra_i2s1>;
 +              nvidia,audio-codec = <&codec>;
        };
  };
index 15d8fdbe21f228439f8d5baf23bb777a64f9c2f1,29e54c7a3657c8248229db9b75a92cfd62363d9c..445343b0fbdd7bc7eedbd989196bac17f7ffc383
        compatible = "nvidia,ventana", "nvidia,tegra20";
  
        memory {
 -              reg = < 0x00000000 0x40000000 >;
 +              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 >;
 +                      interrupts = <187 0x04>;
  
                        gpio-controller;
                        #gpio-cells = <2>;
  
                        micdet-cfg = <0>;
                        micdet-delay = <100>;
 -                      gpio-cfg = < 0xffffffff 0xffffffff 0 0xffffffff 0xffffffff >;
 +                      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>;
        };
  
 -      i2s@70002a00 {
 -              status = "disable";
 +      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";
 +              support-8bit;
++              bus-width = <8>;
        };
  
        sound {
  
                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,int-mic-en-gpios = <&gpio 184 0>; /* gpio PX0 */
                nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
        };
 -
 -      serial@70006000 {
 -              status = "disable";
 -      };
 -
 -      serial@70006040 {
 -              status = "disable";
 -      };
 -
 -      serial@70006200 {
 -              status = "disable";
 -      };
 -
 -      serial@70006300 {
 -              clock-frequency = < 216000000 >;
 -      };
 -
 -      serial@70006400 {
 -              status = "disable";
 -      };
 -
 -      sdhci@c8000000 {
 -              status = "disable";
 -      };
 -
 -      sdhci@c8000200 {
 -              status = "disable";
 -      };
 -
 -      sdhci@c8000400 {
 -              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 {
 -              support-8bit;
 -              bus-width = <8>;
 -      };
  };
index 6b0e3f33ede3f758614e31ac201268dd9bdc4fa1,0d2b082f22466717fb974d7c1714db53217299d7..ebbe984e5d002c5dfe98d7215309676a8a183789
@@@ -24,7 -24,6 +24,7 @@@
  #include <linux/of.h>
  #include <linux/of_device.h>
  #include <linux/of_gpio.h>
 +#include <linux/pinctrl/consumer.h>
  #include <mach/esdhc.h>
  #include "sdhci-pltfm.h"
  #include "sdhci-esdhc.h"
@@@ -69,11 -68,7 +69,11 @@@ struct pltfm_imx_data 
        int flags;
        u32 scratchpad;
        enum imx_esdhc_type devtype;
 +      struct pinctrl *pinctrl;
        struct esdhc_platform_data boarddata;
 +      struct clk *clk_ipg;
 +      struct clk *clk_ahb;
 +      struct clk *clk_per;
  };
  
  static struct platform_device_id imx_esdhc_devtype[] = {
@@@ -407,7 -402,7 +407,7 @@@ sdhci_esdhc_imx_probe_dt(struct platfor
        if (!np)
                return -ENODEV;
  
-       if (of_get_property(np, "fsl,card-wired", NULL))
+       if (of_get_property(np, "non-removable", NULL))
                boarddata->cd_type = ESDHC_CD_PERMANENT;
  
        if (of_get_property(np, "fsl,cd-controller", NULL))
@@@ -442,6 -437,7 +442,6 @@@ static int __devinit sdhci_esdhc_imx_pr
        struct sdhci_pltfm_host *pltfm_host;
        struct sdhci_host *host;
        struct esdhc_platform_data *boarddata;
 -      struct clk *clk;
        int err;
        struct pltfm_imx_data *imx_data;
  
        imx_data->devtype = pdev->id_entry->driver_data;
        pltfm_host->priv = imx_data;
  
 -      clk = clk_get(mmc_dev(host->mmc), NULL);
 -      if (IS_ERR(clk)) {
 -              dev_err(mmc_dev(host->mmc), "clk err\n");
 -              err = PTR_ERR(clk);
 +      imx_data->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
 +      if (IS_ERR(imx_data->clk_ipg)) {
 +              err = PTR_ERR(imx_data->clk_ipg);
                goto err_clk_get;
        }
 -      clk_prepare_enable(clk);
 -      pltfm_host->clk = clk;
 +
 +      imx_data->clk_ahb = devm_clk_get(&pdev->dev, "ahb");
 +      if (IS_ERR(imx_data->clk_ahb)) {
 +              err = PTR_ERR(imx_data->clk_ahb);
 +              goto err_clk_get;
 +      }
 +
 +      imx_data->clk_per = devm_clk_get(&pdev->dev, "per");
 +      if (IS_ERR(imx_data->clk_per)) {
 +              err = PTR_ERR(imx_data->clk_per);
 +              goto err_clk_get;
 +      }
 +
 +      pltfm_host->clk = imx_data->clk_per;
 +
 +      clk_prepare_enable(imx_data->clk_per);
 +      clk_prepare_enable(imx_data->clk_ipg);
 +      clk_prepare_enable(imx_data->clk_ahb);
 +
 +      imx_data->pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
 +      if (IS_ERR(imx_data->pinctrl)) {
 +              err = PTR_ERR(imx_data->pinctrl);
 +              goto pin_err;
 +      }
  
        host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
  
@@@ -583,10 -558,8 +583,10 @@@ no_card_detect_irq
                gpio_free(boarddata->wp_gpio);
  no_card_detect_pin:
  no_board_data:
 -      clk_disable_unprepare(pltfm_host->clk);
 -      clk_put(pltfm_host->clk);
 +pin_err:
 +      clk_disable_unprepare(imx_data->clk_per);
 +      clk_disable_unprepare(imx_data->clk_ipg);
 +      clk_disable_unprepare(imx_data->clk_ahb);
  err_clk_get:
        kfree(imx_data);
  err_imx_data:
@@@ -612,10 -585,8 +612,10 @@@ static int __devexit sdhci_esdhc_imx_re
                gpio_free(boarddata->cd_gpio);
        }
  
 -      clk_disable_unprepare(pltfm_host->clk);
 -      clk_put(pltfm_host->clk);
 +      clk_disable_unprepare(imx_data->clk_per);
 +      clk_disable_unprepare(imx_data->clk_ipg);
 +      clk_disable_unprepare(imx_data->clk_ahb);
 +
        kfree(imx_data);
  
        sdhci_pltfm_free(pdev);
This page took 0.154723 seconds and 4 git commands to generate.