Merge branch 'pm-linux-3.8.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux...
authorDan Murphy <dmurphy@ti.com>
Mon, 15 Apr 2013 14:04:50 +0000 (09:04 -0500)
committerDan Murphy <dmurphy@ti.com>
Mon, 15 Apr 2013 14:04:50 +0000 (09:04 -0500)
TI-Feature: power_management
TI-Tree: git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree.git
TI-Branch: pm-linux-3.8.y

* 'pm-linux-3.8.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree:
  ARM: DTS: OMAP5-uevm: pull-up Palmas MSECURE line
  ARM/dts: omap5-sevm: Enable palmas on i2c1 bus

Conflicts:
arch/arm/boot/dts/omap5-sevm.dts
arch/arm/boot/dts/omap5-uevm.dts

Signed-off-by: Dan Murphy <dmurphy@ti.com>
1  2 
arch/arm/boot/dts/omap5-sevm.dts
arch/arm/boot/dts/omap5-uevm.dts

index 74f88e53c9623247aad930abcc9119ce0ba516b9,daf18fa5c6320a382434b70de2eeab0edc428395..2bdbd68d0f4386e0d9b91a9d2c4db5c418b54a82
  };
  
  /include/ "palmas.dtsi"
 +
 +&mcspi1 {
 +
 +};
 +
 +&mcspi2 {
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&mcspi2_pins>;
 +};
 +
 +&mcspi3 {
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&mcspi3_pins>;
 +};
 +
 +&mcspi4 {
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&mcspi4_pins>;
 +};
 +
 +/include/ "twl6040.dtsi"
 +
 +&dsi1 {
 +      lcd {
 +              compatible = "ti,lg4591";
 +
 +              lanes = <
 +                      0       /* clk + */
 +                      1       /* clk - */
 +                      2       /* data1 + */
 +                      3       /* data1 - */
 +                      4       /* data2 + */
 +                      5       /* data2 - */
 +                      6       /* data3 + */
 +                      7       /* data3 - */
 +                      8       /* data4 + */
 +                      9       /* data4 - */
 +              >;
 +
 +              vdds_foo-supply = <&ldo2_reg>;
 +
 +              gpios = <&gpio6 23 0>;  /* 183, reset */
 +      };
 +};
 +
 +&hdmi {
 +      tpd12s015: tpd12s015 {
 +              compatible = "ti,tpd12s015";
 +
 +              gpios = <&tca6424a 0 0>,        /* TCA6424A P01, CT_CP_HDP */
 +                      <&tca6424a 1 0>,        /* TCA6424A P00, LS_OE*/
 +                      <&gpio7 1 0>;           /* 193, HPD */
 +
 +              hdmi-monitor {
 +                      compatible = "ti,hdmi_panel";
 +              };
 +
 +      };
 +};
index db6289f0d374dfd119dbd25b0034d1af281ebb97,78c5769c6a75df698c6a65c537a698b4892cf94c..2865b4f3a5e0c34d0d0b39438d2ddee179d64498
                        &dmic_pins
                        &mcbsp1_pins
                        &mcbsp2_pins
 +                      &usbhost_pins
 +                      &dss_hdmi_pins
 +                      &tpd12s015_pins
 +                      &tca6424a_pins
+                       &palmas_pins
        >;
  
        twl6040_pins: pinmux_twl6040_pins {
                >;
        };
  
 +      usbhost_pins: pinmux_usbhost_pins {
 +              pinctrl-single,pins = <
 +                      0x84 0x100      /* usbb2_hsic_strobe INPUT | MODE 0 */
 +                      0x86 0x100      /* usbb2_hsic_data INPUT | MODE 0 */
 +
 +                      0x19e 0x100     /* usbb3_hsic_strobe INPUT | MODE 0 */
 +                      0x1a0 0x100     /* usbb3_hsic_data INPUT | MODE 0 */
 +
 +                      0x70 0x6        /* gpio3_80 OUTPUT | MODE 6 HUB_NRESET */
 +                      0x6e 0x6        /* gpio3_79 OUTPUT | MODE 6 ETH_NRESET */
 +              >;
 +      };
 +
 +      dss_hdmi_pins: pinmux_dss_hdmi_pins {
 +              pinctrl-single,pins = <
 +                      0x0fc 0x118     /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */
 +                      0x100 0x100     /* hdmi_scl.hdmi_scl INPUT | MODE 0 */
 +                      0x102 0x100     /* hdmi_sda.hdmi_sda INPUT | MODE 0 */
 +              >;
 +      };
 +
 +      tpd12s015_pins: pinmux_tpd12s015_pins {
 +              pinctrl-single,pins = <
 +                      0x0fe 0x116     /* hdmi_hpd.gpio7_193 INPUT PULLDOWN | MODE6 */
 +              >;
 +      };
 +
 +      tca6424a_pins: pinmux_tca6424a_pins {
 +              pinctrl-single,pins = <
 +                      0x186 0x100     /* i2c5_scl.i2c5_scl INPUT | MODE0 */
 +                      0x188 0x100     /* i2c5_sda.i2c5_sda INPUT | MODE0 */
 +              >;
 +      };
 +
 +      uart1_pins: pinmux_uart1_pins {
 +              pinctrl-single,pins = <
 +                      0x60 0x0        /* uart1_tx.uart1_cts MODE0 */
 +                      0x62 0x118      /* uart1_tx.uart1_cts INPUT | PULLUP | MODE0 */
 +                      0x64 0x118      /* uart1_rx.uart1_rts INPUT | PULLUP | MODE0 */
 +                      0x66 0          /* uart1_rx.uart1_rts MODE0 */
 +              >;
 +      };
 +
 +      uart3_pins: pinmux_uart3_pins {
 +              pinctrl-single,pins = <
 +                      0x19a 0x0       /* uart3_rts_irsd.uart3_tx_irtx MODE0 */
 +                      0x19c 0x118     /* uart3_rx_irrx.uart3_usbb3_hsic INPUT | PULLUP | MODE0 */
 +              >;
 +      };
 +
 +      uart5_pins: pinmux_uart5_pins {
 +              pinctrl-single,pins = <
 +                      0x170 0x118     /* uart5_rx.uart5_rx INPUT | PULLUP | MODE0 */
 +                      0x172 0x0       /* uart5_tx.uart5_tx MODE0 */
 +                      0x174 0x118     /* uart5_cts.uart5_rts INPUT | PULLUP | MODE0 */
 +                      0x176 0x0       /* uart5_cts.uart5_rts MODE0 */
 +              >;
 +      };
 +
 +      mcspi2_pins: pinmux_mcspi2_pins {
 +              pinctrl-single,pins = <
 +                      0xbc 0x100      /*  MCSPI2_CLK INPUTENABLE | MODE0 */
 +                      0xbe 0x100      /*  MCSPI2_SIMO INPUTENABLE | MODE0 */
 +                      0xc0 0x118      /*  MCSPI2_SOMI PULLUP | INPUTENABLE | MODE0*/
 +                      0xc2 0x0        /*  MCSPI2_CS MODE0*/
 +              >;
 +      };
 +
 +      mcspi3_pins: pinmux_mcspi3_pins {
 +              pinctrl-single,pins = <
 +                      0x78 0x101      /*  MCSPI2_SOMI INPUTENABLE | MODE1 */
 +                      0x7a 0x101      /*  MCSPI2_CS INPUTENABLE | MODE1 */
 +                      0x7c 0x101      /*  MCSPI2_SIMO INPUTENABLE | MODE1 */
 +                      0x7e 0x101      /*  MCSPI2_CLK INPUTENABLE | MODE1 */
 +              >;
 +      };
 +
 +      mcspi4_pins: pinmux_mcspi4_pins {
 +              pinctrl-single,pins = <
 +                      0x164 0x101     /*  MCSPI2_CLK INPUTENABLE | MODE1 */
 +                      0x168 0x101     /*  MCSPI2_SIMO INPUTENABLE | MODE1 */
 +                      0x16a 0x101     /*  MCSPI2_SOMI INPUTENABLE | MODE1 */
 +                      0x16c 0x101     /*  MCSPI2_CS INPUTENABLE | MODE1 */
 +                >;
 +      };
++
+       palmas_pins: pinmux_palmas_pins {
+               pinctrl-single,pins = <
+                       0x140 0x11f     /* MSLEEP INPUT | PULLUP | MODE7 */
+               >;
+       };
  };
  
 +&omap5_pmx_wkup {
 +      pinctrl-names = "default";
 +      pinctrl-0 = <
 +                      &usbhost_wkup_pins
 +      >;
 +
 +      usbhost_wkup_pins: pinmux_usbhost_wkup_pins {
 +              pinctrl-single,pins = <
 +                      0x1A 0x0        /* fref_clk1_out OUTPUT | MODE 7 for USB hub clk */
 +              >;
 +      };
 +};
 +
  &mmc1 {
        vmmc-supply = <&vmmcsd_fixed>;
        bus-width = <4>;