Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input updates from Dmitry Torokhov:
 "Updates for the input subsystem.  You will get an new drivers for
  Hyper-V synthetic keyboard and for Neonode zForce touchscreens, plus a
  bunch of driver fixes and cleanups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (49 commits)
  Revert "Input: ALPS - add support for model found on Dell XT2"
  arm: dts: am335x sk: add touchscreen support
  Input: ti_am335x_tsc - fix spelling mistake in TSC/ADC DT binding
  Input: cyttsp4 - replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
  Input: mma8450 - add missing i2c_set_clientdata() in mma8450_probe()
  Input: mpu3050 - add missing i2c_set_clientdata() in mpu3050_probe()
  Input: tnetv107x-keypad - make irqs signed for error handling
  Input: add driver for Neonode zForce based touchscreens
  Input: sh_keysc - enable the driver on all ARM platforms
  Input: remove a redundant max() call
  Input: mousedev - allow disabling even without CONFIG_EXPERT
  Input: allow deselecting serio drivers even without CONFIG_EXPERT
  Input: i8042 - add PNP modaliases
  Input: evdev - fall back to vmalloc for client event buffer
  Input: cypress_ps2 - do not consider data bad if palm is detected
  Input: cypress_ps2 - remove useless cast
  Input: fix PWM-related undefined reference errors
  Input: ALPS - change secondary device's name
  Input: wacom - not all multi-interface devices support touch
  Input: nspire-keypad - add missing clk_disable_unprepare() on error path
  ...

diff --combined arch/arm/boot/dts/am335x-evm.dts
index 9874294,c5b73bc..7e6c64e
--- 1/arch/arm/boot/dts/am335x-evm.dts
--- 2/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@@ -24,6 -24,324 +24,6 @@@
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
  
 -      am33xx_pinmux: pinmux@44e10800 {
 -              pinctrl-names = "default";
 -              pinctrl-0 = <&matrix_keypad_s0 &volume_keys_s0 &clkout2_pin>;
 -
 -              matrix_keypad_s0: matrix_keypad_s0 {
 -                      pinctrl-single,pins = <
 -                              0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)  /* gpmc_a5.gpio1_21 */
 -                              0x58 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)  /* gpmc_a6.gpio1_22 */
 -                              0x64 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_a9.gpio1_25 */
 -                              0x68 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_a10.gpio1_26 */
 -                              0x6c (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_a11.gpio1_27 */
 -                      >;
 -              };
 -
 -              volume_keys_s0: volume_keys_s0 {
 -                      pinctrl-single,pins = <
 -                              0x150 (PIN_INPUT_PULLDOWN | MUX_MODE7)  /* spi0_sclk.gpio0_2 */
 -                              0x154 (PIN_INPUT_PULLDOWN | MUX_MODE7)  /* spi0_d0.gpio0_3 */
 -                      >;
 -              };
 -
 -              i2c0_pins: pinmux_i2c0_pins {
 -                      pinctrl-single,pins = <
 -                              0x188 (PIN_INPUT_PULLUP | MUX_MODE0)    /* i2c0_sda.i2c0_sda */
 -                              0x18c (PIN_INPUT_PULLUP | MUX_MODE0)    /* i2c0_scl.i2c0_scl */
 -                      >;
 -              };
 -
 -              i2c1_pins: pinmux_i2c1_pins {
 -                      pinctrl-single,pins = <
 -                              0x158 (PIN_INPUT_PULLUP | MUX_MODE2)    /* spi0_d1.i2c1_sda */
 -                              0x15c (PIN_INPUT_PULLUP | MUX_MODE2)    /* spi0_cs0.i2c1_scl */
 -                      >;
 -              };
 -
 -              uart0_pins: pinmux_uart0_pins {
 -                      pinctrl-single,pins = <
 -                              0x170 (PIN_INPUT_PULLUP | MUX_MODE0)    /* uart0_rxd.uart0_rxd */
 -                              0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */
 -                      >;
 -              };
 -
 -              clkout2_pin: pinmux_clkout2_pin {
 -                      pinctrl-single,pins = <
 -                              0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
 -                      >;
 -              };
 -
 -              nandflash_pins_s0: nandflash_pins_s0 {
 -                      pinctrl-single,pins = <
 -                              0x0 (PIN_INPUT_PULLUP | MUX_MODE0)      /* gpmc_ad0.gpmc_ad0 */
 -                              0x4 (PIN_INPUT_PULLUP | MUX_MODE0)      /* gpmc_ad1.gpmc_ad1 */
 -                              0x8 (PIN_INPUT_PULLUP | MUX_MODE0)      /* gpmc_ad2.gpmc_ad2 */
 -                              0xc (PIN_INPUT_PULLUP | MUX_MODE0)      /* gpmc_ad3.gpmc_ad3 */
 -                              0x10 (PIN_INPUT_PULLUP | MUX_MODE0)     /* gpmc_ad4.gpmc_ad4 */
 -                              0x14 (PIN_INPUT_PULLUP | MUX_MODE0)     /* gpmc_ad5.gpmc_ad5 */
 -                              0x18 (PIN_INPUT_PULLUP | MUX_MODE0)     /* gpmc_ad6.gpmc_ad6 */
 -                              0x1c (PIN_INPUT_PULLUP | MUX_MODE0)     /* gpmc_ad7.gpmc_ad7 */
 -                              0x70 (PIN_INPUT_PULLUP | MUX_MODE0)     /* gpmc_wait0.gpmc_wait0 */
 -                              0x74 (PIN_INPUT_PULLUP | MUX_MODE7)     /* gpmc_wpn.gpio0_30 */
 -                              0x7c (PIN_OUTPUT | MUX_MODE0)           /* gpmc_csn0.gpmc_csn0  */
 -                              0x90 (PIN_OUTPUT | MUX_MODE0)           /* gpmc_advn_ale.gpmc_advn_ale */
 -                              0x94 (PIN_OUTPUT | MUX_MODE0)           /* gpmc_oen_ren.gpmc_oen_ren */
 -                              0x98 (PIN_OUTPUT | MUX_MODE0)           /* gpmc_wen.gpmc_wen */
 -                              0x9c (PIN_OUTPUT | MUX_MODE0)           /* gpmc_be0n_cle.gpmc_be0n_cle */
 -                      >;
 -              };
 -
 -              ecap0_pins: backlight_pins {
 -                      pinctrl-single,pins = <
 -                              0x164 0x0       /* eCAP0_in_PWM0_out.eCAP0_in_PWM0_out MODE0 */
 -                      >;
 -              };
 -
 -              cpsw_default: cpsw_default {
 -                      pinctrl-single,pins = <
 -                              /* Slave 1 */
 -                              0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txen.rgmii1_tctl */
 -                              0x118 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxdv.rgmii1_rctl */
 -                              0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd3.rgmii1_td3 */
 -                              0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd2.rgmii1_td2 */
 -                              0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_td1 */
 -                              0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_td0 */
 -                              0x12c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txclk.rgmii1_tclk */
 -                              0x130 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxclk.rgmii1_rclk */
 -                              0x134 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxd3.rgmii1_rd3 */
 -                              0x138 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxd2.rgmii1_rd2 */
 -                              0x13c (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxd1.rgmii1_rd1 */
 -                              0x140 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxd0.rgmii1_rd0 */
 -                      >;
 -              };
 -
 -              cpsw_sleep: cpsw_sleep {
 -                      pinctrl-single,pins = <
 -                              /* Slave 1 reset value */
 -                              0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                      >;
 -              };
 -
 -              davinci_mdio_default: davinci_mdio_default {
 -                      pinctrl-single,pins = <
 -                              /* MDIO */
 -                              0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)    /* mdio_data.mdio_data */
 -                              0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0)                   /* mdio_clk.mdio_clk */
 -                      >;
 -              };
 -
 -              davinci_mdio_sleep: davinci_mdio_sleep {
 -                      pinctrl-single,pins = <
 -                              /* MDIO reset value */
 -                              0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                      >;
 -              };
 -      };
 -
 -      ocp {
 -              uart0: serial@44e09000 {
 -                      pinctrl-names = "default";
 -                      pinctrl-0 = <&uart0_pins>;
 -
 -                      status = "okay";
 -              };
 -
 -              i2c0: i2c@44e0b000 {
 -                      pinctrl-names = "default";
 -                      pinctrl-0 = <&i2c0_pins>;
 -
 -                      status = "okay";
 -                      clock-frequency = <400000>;
 -
 -                      tps: tps@2d {
 -                              reg = <0x2d>;
 -                      };
 -              };
 -
 -              musb: usb@47400000 {
 -                      status = "okay";
 -
 -                      control@44e10000 {
 -                              status = "okay";
 -                      };
 -
 -                      usb-phy@47401300 {
 -                              status = "okay";
 -                      };
 -
 -                      usb-phy@47401b00 {
 -                              status = "okay";
 -                      };
 -
 -                      usb@47401000 {
 -                              status = "okay";
 -                      };
 -
 -                      usb@47401800 {
 -                              status = "okay";
 -                              dr_mode = "host";
 -                      };
 -
 -                      dma-controller@07402000  {
 -                              status = "okay";
 -                      };
 -              };
 -
 -              i2c1: i2c@4802a000 {
 -                      pinctrl-names = "default";
 -                      pinctrl-0 = <&i2c1_pins>;
 -
 -                      status = "okay";
 -                      clock-frequency = <100000>;
 -
 -                      lis331dlh: lis331dlh@18 {
 -                              compatible = "st,lis331dlh", "st,lis3lv02d";
 -                              reg = <0x18>;
 -                              Vdd-supply = <&lis3_reg>;
 -                              Vdd_IO-supply = <&lis3_reg>;
 -
 -                              st,click-single-x;
 -                              st,click-single-y;
 -                              st,click-single-z;
 -                              st,click-thresh-x = <10>;
 -                              st,click-thresh-y = <10>;
 -                              st,click-thresh-z = <10>;
 -                              st,irq1-click;
 -                              st,irq2-click;
 -                              st,wakeup-x-lo;
 -                              st,wakeup-x-hi;
 -                              st,wakeup-y-lo;
 -                              st,wakeup-y-hi;
 -                              st,wakeup-z-lo;
 -                              st,wakeup-z-hi;
 -                              st,min-limit-x = <120>;
 -                              st,min-limit-y = <120>;
 -                              st,min-limit-z = <140>;
 -                              st,max-limit-x = <550>;
 -                              st,max-limit-y = <550>;
 -                              st,max-limit-z = <750>;
 -                      };
 -
 -                      tsl2550: tsl2550@39 {
 -                              compatible = "taos,tsl2550";
 -                              reg = <0x39>;
 -                      };
 -
 -                      tmp275: tmp275@48 {
 -                              compatible = "ti,tmp275";
 -                              reg = <0x48>;
 -                      };
 -              };
 -
 -              elm: elm@48080000 {
 -                      status = "okay";
 -              };
 -
 -              epwmss0: epwmss@48300000 {
 -                      status = "okay";
 -
 -                      ecap0: ecap@48300100 {
 -                              status = "okay";
 -                              pinctrl-names = "default";
 -                              pinctrl-0 = <&ecap0_pins>;
 -                      };
 -              };
 -
 -              gpmc: gpmc@50000000 {
 -                      status = "okay";
 -                      pinctrl-names = "default";
 -                      pinctrl-0 = <&nandflash_pins_s0>;
 -                      ranges = <0 0 0x08000000 0x10000000>;   /* CS0: NAND */
 -                      nand@0,0 {
 -                              reg = <0 0 0>; /* CS0, offset 0 */
 -                              nand-bus-width = <8>;
 -                              ti,nand-ecc-opt = "bch8";
 -                              gpmc,device-nand = "true";
 -                              gpmc,device-width = <1>;
 -                              gpmc,sync-clk-ps = <0>;
 -                              gpmc,cs-on-ns = <0>;
 -                              gpmc,cs-rd-off-ns = <44>;
 -                              gpmc,cs-wr-off-ns = <44>;
 -                              gpmc,adv-on-ns = <6>;
 -                              gpmc,adv-rd-off-ns = <34>;
 -                              gpmc,adv-wr-off-ns = <44>;
 -                              gpmc,we-on-ns = <0>;
 -                              gpmc,we-off-ns = <40>;
 -                              gpmc,oe-on-ns = <0>;
 -                              gpmc,oe-off-ns = <54>;
 -                              gpmc,access-ns = <64>;
 -                              gpmc,rd-cycle-ns = <82>;
 -                              gpmc,wr-cycle-ns = <82>;
 -                              gpmc,wait-on-read = "true";
 -                              gpmc,wait-on-write = "true";
 -                              gpmc,bus-turnaround-ns = <0>;
 -                              gpmc,cycle2cycle-delay-ns = <0>;
 -                              gpmc,clk-activation-ns = <0>;
 -                              gpmc,wait-monitoring-ns = <0>;
 -                              gpmc,wr-access-ns = <40>;
 -                              gpmc,wr-data-mux-bus-ns = <0>;
 -
 -                              #address-cells = <1>;
 -                              #size-cells = <1>;
 -                              elm_id = <&elm>;
 -
 -                              /* MTD partition table */
 -                              partition@0 {
 -                                      label = "SPL1";
 -                                      reg = <0x00000000 0x000020000>;
 -                              };
 -
 -                              partition@1 {
 -                                      label = "SPL2";
 -                                      reg = <0x00020000 0x00020000>;
 -                              };
 -
 -                              partition@2 {
 -                                      label = "SPL3";
 -                                      reg = <0x00040000 0x00020000>;
 -                              };
 -
 -                              partition@3 {
 -                                      label = "SPL4";
 -                                      reg = <0x00060000 0x00020000>;
 -                              };
 -
 -                              partition@4 {
 -                                      label = "U-boot";
 -                                      reg = <0x00080000 0x001e0000>;
 -                              };
 -
 -                              partition@5 {
 -                                      label = "environment";
 -                                      reg = <0x00260000 0x00020000>;
 -                              };
 -
 -                              partition@6 {
 -                                      label = "Kernel";
 -                                      reg = <0x00280000 0x00500000>;
 -                              };
 -
 -                              partition@7 {
 -                                      label = "File-System";
 -                                      reg = <0x00780000 0x0F880000>;
 -                              };
 -                      };
 -              };
 -      };
 -
        vbat: fixedregulator@0 {
                compatible = "regulator-fixed";
                regulator-name = "vbat";
@@@ -85,447 -403,10 +85,447 @@@
                brightness-levels = <0 51 53 56 62 75 101 152 255>;
                default-brightness-level = <8>;
        };
 +
 +      panel {
 +              compatible = "ti,tilcdc,panel";
 +              status = "okay";
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&lcd_pins_s0>;
 +              panel-info {
 +                      ac-bias           = <255>;
 +                      ac-bias-intrpt    = <0>;
 +                      dma-burst-sz      = <16>;
 +                      bpp               = <32>;
 +                      fdd               = <0x80>;
 +                      sync-edge         = <0>;
 +                      sync-ctrl         = <1>;
 +                      raster-order      = <0>;
 +                      fifo-th           = <0>;
 +              };
 +
 +              display-timings {
 +                      800x480p62 {
 +                              clock-frequency = <30000000>;
 +                              hactive = <800>;
 +                              vactive = <480>;
 +                              hfront-porch = <39>;
 +                              hback-porch = <39>;
 +                              hsync-len = <47>;
 +                              vback-porch = <29>;
 +                              vfront-porch = <13>;
 +                              vsync-len = <2>;
 +                              hsync-active = <1>;
 +                              vsync-active = <1>;
 +                      };
 +              };
 +      };
 +
 +      sound {
 +              compatible = "ti,da830-evm-audio";
 +              ti,model = "AM335x-EVM";
 +              ti,audio-codec = <&tlv320aic3106>;
 +              ti,mcasp-controller = <&mcasp1>;
 +              ti,codec-clock-rate = <12000000>;
 +              ti,audio-routing =
 +                      "Headphone Jack",       "HPLOUT",
 +                      "Headphone Jack",       "HPROUT",
 +                      "LINE1L",               "Line In",
 +                      "LINE1R",               "Line In";
 +      };
 +};
 +
 +&am33xx_pinmux {
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&matrix_keypad_s0 &volume_keys_s0 &clkout2_pin>;
 +
 +      matrix_keypad_s0: matrix_keypad_s0 {
 +              pinctrl-single,pins = <
 +                      0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)  /* gpmc_a5.gpio1_21 */
 +                      0x58 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)  /* gpmc_a6.gpio1_22 */
 +                      0x64 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_a9.gpio1_25 */
 +                      0x68 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_a10.gpio1_26 */
 +                      0x6c (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_a11.gpio1_27 */
 +              >;
 +      };
 +
 +      volume_keys_s0: volume_keys_s0 {
 +              pinctrl-single,pins = <
 +                      0x150 (PIN_INPUT_PULLDOWN | MUX_MODE7)  /* spi0_sclk.gpio0_2 */
 +                      0x154 (PIN_INPUT_PULLDOWN | MUX_MODE7)  /* spi0_d0.gpio0_3 */
 +              >;
 +      };
 +
 +      i2c0_pins: pinmux_i2c0_pins {
 +              pinctrl-single,pins = <
 +                      0x188 (PIN_INPUT_PULLUP | MUX_MODE0)    /* i2c0_sda.i2c0_sda */
 +                      0x18c (PIN_INPUT_PULLUP | MUX_MODE0)    /* i2c0_scl.i2c0_scl */
 +              >;
 +      };
 +
 +      i2c1_pins: pinmux_i2c1_pins {
 +              pinctrl-single,pins = <
 +                      0x158 (PIN_INPUT_PULLUP | MUX_MODE2)    /* spi0_d1.i2c1_sda */
 +                      0x15c (PIN_INPUT_PULLUP | MUX_MODE2)    /* spi0_cs0.i2c1_scl */
 +              >;
 +      };
 +
 +      uart0_pins: pinmux_uart0_pins {
 +              pinctrl-single,pins = <
 +                      0x170 (PIN_INPUT_PULLUP | MUX_MODE0)    /* uart0_rxd.uart0_rxd */
 +                      0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */
 +              >;
 +      };
 +
 +      clkout2_pin: pinmux_clkout2_pin {
 +              pinctrl-single,pins = <
 +                      0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
 +              >;
 +      };
 +
 +      nandflash_pins_s0: nandflash_pins_s0 {
 +              pinctrl-single,pins = <
 +                      0x0 (PIN_INPUT_PULLUP | MUX_MODE0)      /* gpmc_ad0.gpmc_ad0 */
 +                      0x4 (PIN_INPUT_PULLUP | MUX_MODE0)      /* gpmc_ad1.gpmc_ad1 */
 +                      0x8 (PIN_INPUT_PULLUP | MUX_MODE0)      /* gpmc_ad2.gpmc_ad2 */
 +                      0xc (PIN_INPUT_PULLUP | MUX_MODE0)      /* gpmc_ad3.gpmc_ad3 */
 +                      0x10 (PIN_INPUT_PULLUP | MUX_MODE0)     /* gpmc_ad4.gpmc_ad4 */
 +                      0x14 (PIN_INPUT_PULLUP | MUX_MODE0)     /* gpmc_ad5.gpmc_ad5 */
 +                      0x18 (PIN_INPUT_PULLUP | MUX_MODE0)     /* gpmc_ad6.gpmc_ad6 */
 +                      0x1c (PIN_INPUT_PULLUP | MUX_MODE0)     /* gpmc_ad7.gpmc_ad7 */
 +                      0x70 (PIN_INPUT_PULLUP | MUX_MODE0)     /* gpmc_wait0.gpmc_wait0 */
 +                      0x74 (PIN_INPUT_PULLUP | MUX_MODE7)     /* gpmc_wpn.gpio0_30 */
 +                      0x7c (PIN_OUTPUT | MUX_MODE0)           /* gpmc_csn0.gpmc_csn0  */
 +                      0x90 (PIN_OUTPUT | MUX_MODE0)           /* gpmc_advn_ale.gpmc_advn_ale */
 +                      0x94 (PIN_OUTPUT | MUX_MODE0)           /* gpmc_oen_ren.gpmc_oen_ren */
 +                      0x98 (PIN_OUTPUT | MUX_MODE0)           /* gpmc_wen.gpmc_wen */
 +                      0x9c (PIN_OUTPUT | MUX_MODE0)           /* gpmc_be0n_cle.gpmc_be0n_cle */
 +              >;
 +      };
 +
 +      ecap0_pins: backlight_pins {
 +              pinctrl-single,pins = <
 +                      0x164 0x0       /* eCAP0_in_PWM0_out.eCAP0_in_PWM0_out MODE0 */
 +              >;
 +      };
 +
 +      cpsw_default: cpsw_default {
 +              pinctrl-single,pins = <
 +                      /* Slave 1 */
 +                      0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txen.rgmii1_tctl */
 +                      0x118 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxdv.rgmii1_rctl */
 +                      0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd3.rgmii1_td3 */
 +                      0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd2.rgmii1_td2 */
 +                      0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_td1 */
 +                      0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_td0 */
 +                      0x12c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txclk.rgmii1_tclk */
 +                      0x130 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxclk.rgmii1_rclk */
 +                      0x134 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxd3.rgmii1_rd3 */
 +                      0x138 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxd2.rgmii1_rd2 */
 +                      0x13c (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxd1.rgmii1_rd1 */
 +                      0x140 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxd0.rgmii1_rd0 */
 +              >;
 +      };
 +
 +      cpsw_sleep: cpsw_sleep {
 +              pinctrl-single,pins = <
 +                      /* Slave 1 reset value */
 +                      0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +              >;
 +      };
 +
 +      davinci_mdio_default: davinci_mdio_default {
 +              pinctrl-single,pins = <
 +                      /* MDIO */
 +                      0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)    /* mdio_data.mdio_data */
 +                      0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0)                   /* mdio_clk.mdio_clk */
 +              >;
 +      };
 +
 +      davinci_mdio_sleep: davinci_mdio_sleep {
 +              pinctrl-single,pins = <
 +                      /* MDIO reset value */
 +                      0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +              >;
 +      };
 +
 +      lcd_pins_s0: lcd_pins_s0 {
 +              pinctrl-single,pins = <
 +                      0x20 0x01       /* gpmc_ad8.lcd_data16, OUTPUT | MODE1 */
 +                      0x24 0x01       /* gpmc_ad9.lcd_data17, OUTPUT | MODE1 */
 +                      0x28 0x01       /* gpmc_ad10.lcd_data18, OUTPUT | MODE1 */
 +                      0x2c 0x01       /* gpmc_ad11.lcd_data19, OUTPUT | MODE1 */
 +                      0x30 0x01       /* gpmc_ad12.lcd_data20, OUTPUT | MODE1 */
 +                      0x34 0x01       /* gpmc_ad13.lcd_data21, OUTPUT | MODE1 */
 +                      0x38 0x01       /* gpmc_ad14.lcd_data22, OUTPUT | MODE1 */
 +                      0x3c 0x01       /* gpmc_ad15.lcd_data23, OUTPUT | MODE1 */
 +                      0xa0 0x00       /* lcd_data0.lcd_data0, OUTPUT | MODE0 */
 +                      0xa4 0x00       /* lcd_data1.lcd_data1, OUTPUT | MODE0 */
 +                      0xa8 0x00       /* lcd_data2.lcd_data2, OUTPUT | MODE0 */
 +                      0xac 0x00       /* lcd_data3.lcd_data3, OUTPUT | MODE0 */
 +                      0xb0 0x00       /* lcd_data4.lcd_data4, OUTPUT | MODE0 */
 +                      0xb4 0x00       /* lcd_data5.lcd_data5, OUTPUT | MODE0 */
 +                      0xb8 0x00       /* lcd_data6.lcd_data6, OUTPUT | MODE0 */
 +                      0xbc 0x00       /* lcd_data7.lcd_data7, OUTPUT | MODE0 */
 +                      0xc0 0x00       /* lcd_data8.lcd_data8, OUTPUT | MODE0 */
 +                      0xc4 0x00       /* lcd_data9.lcd_data9, OUTPUT | MODE0 */
 +                      0xc8 0x00       /* lcd_data10.lcd_data10, OUTPUT | MODE0 */
 +                      0xcc 0x00       /* lcd_data11.lcd_data11, OUTPUT | MODE0 */
 +                      0xd0 0x00       /* lcd_data12.lcd_data12, OUTPUT | MODE0 */
 +                      0xd4 0x00       /* lcd_data13.lcd_data13, OUTPUT | MODE0 */
 +                      0xd8 0x00       /* lcd_data14.lcd_data14, OUTPUT | MODE0 */
 +                      0xdc 0x00       /* lcd_data15.lcd_data15, OUTPUT | MODE0 */
 +                      0xe0 0x00       /* lcd_vsync.lcd_vsync, OUTPUT | MODE0 */
 +                      0xe4 0x00       /* lcd_hsync.lcd_hsync, OUTPUT | MODE0 */
 +                      0xe8 0x00       /* lcd_pclk.lcd_pclk, OUTPUT | MODE0 */
 +                      0xec 0x00       /* lcd_ac_bias_en.lcd_ac_bias_en, OUTPUT | MODE0 */
 +              >;
 +      };
 +
 +      am335x_evm_audio_pins: am335x_evm_audio_pins {
 +              pinctrl-single,pins = <
 +                      0x10c (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_rx_dv.mcasp1_aclkx */
 +                      0x110 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_txd3.mcasp1_fsx */
 +                      0x108 (PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* mii1_col.mcasp1_axr2 */
 +                      0x144 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* rmii1_ref_clk.mcasp1_axr3 */
 +              >;
 +      };
 +};
 +
 +&uart0 {
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&uart0_pins>;
 +
 +      status = "okay";
 +};
 +
 +&i2c0 {
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&i2c0_pins>;
 +
 +      status = "okay";
 +      clock-frequency = <400000>;
 +
 +      tps: tps@2d {
 +              reg = <0x2d>;
 +      };
 +};
 +
 +&usb {
 +      status = "okay";
 +
 +      control@44e10000 {
 +              status = "okay";
 +      };
 +
 +      usb-phy@47401300 {
 +              status = "okay";
 +      };
 +
 +      usb-phy@47401b00 {
 +              status = "okay";
 +      };
 +
 +      usb@47401000 {
 +              status = "okay";
 +      };
 +
 +      usb@47401800 {
 +              status = "okay";
 +              dr_mode = "host";
 +      };
 +
 +      dma-controller@07402000  {
 +              status = "okay";
 +      };
 +};
 +
 +&i2c1 {
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&i2c1_pins>;
 +
 +      status = "okay";
 +      clock-frequency = <100000>;
 +
 +      lis331dlh: lis331dlh@18 {
 +              compatible = "st,lis331dlh", "st,lis3lv02d";
 +              reg = <0x18>;
 +              Vdd-supply = <&lis3_reg>;
 +              Vdd_IO-supply = <&lis3_reg>;
 +
 +              st,click-single-x;
 +              st,click-single-y;
 +              st,click-single-z;
 +              st,click-thresh-x = <10>;
 +              st,click-thresh-y = <10>;
 +              st,click-thresh-z = <10>;
 +              st,irq1-click;
 +              st,irq2-click;
 +              st,wakeup-x-lo;
 +              st,wakeup-x-hi;
 +              st,wakeup-y-lo;
 +              st,wakeup-y-hi;
 +              st,wakeup-z-lo;
 +              st,wakeup-z-hi;
 +              st,min-limit-x = <120>;
 +              st,min-limit-y = <120>;
 +              st,min-limit-z = <140>;
 +              st,max-limit-x = <550>;
 +              st,max-limit-y = <550>;
 +              st,max-limit-z = <750>;
 +      };
 +
 +      tsl2550: tsl2550@39 {
 +              compatible = "taos,tsl2550";
 +              reg = <0x39>;
 +      };
 +
 +      tmp275: tmp275@48 {
 +              compatible = "ti,tmp275";
 +              reg = <0x48>;
 +      };
 +
 +      tlv320aic3106: tlv320aic3106@1b {
 +              compatible = "ti,tlv320aic3106";
 +              reg = <0x1b>;
 +              status = "okay";
 +
 +              /* Regulators */
 +              AVDD-supply = <&vaux2_reg>;
 +              IOVDD-supply = <&vaux2_reg>;
 +              DRVDD-supply = <&vaux2_reg>;
 +              DVDD-supply = <&vbat>;
 +      };
 +};
 +
 +&lcdc {
 +      status = "okay";
 +};
 +
 +&elm {
 +      status = "okay";
 +};
 +
 +&epwmss0 {
 +      status = "okay";
 +
 +      ecap0: ecap@48300100 {
 +              status = "okay";
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&ecap0_pins>;
 +      };
 +};
 +
 +&gpmc {
 +      status = "okay";
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&nandflash_pins_s0>;
 +      ranges = <0 0 0x08000000 0x10000000>;   /* CS0: NAND */
 +      nand@0,0 {
 +              reg = <0 0 0>; /* CS0, offset 0 */
 +              nand-bus-width = <8>;
 +              ti,nand-ecc-opt = "bch8";
 +              gpmc,device-nand = "true";
 +              gpmc,device-width = <1>;
 +              gpmc,sync-clk-ps = <0>;
 +              gpmc,cs-on-ns = <0>;
 +              gpmc,cs-rd-off-ns = <44>;
 +              gpmc,cs-wr-off-ns = <44>;
 +              gpmc,adv-on-ns = <6>;
 +              gpmc,adv-rd-off-ns = <34>;
 +              gpmc,adv-wr-off-ns = <44>;
 +              gpmc,we-on-ns = <0>;
 +              gpmc,we-off-ns = <40>;
 +              gpmc,oe-on-ns = <0>;
 +              gpmc,oe-off-ns = <54>;
 +              gpmc,access-ns = <64>;
 +              gpmc,rd-cycle-ns = <82>;
 +              gpmc,wr-cycle-ns = <82>;
 +              gpmc,wait-on-read = "true";
 +              gpmc,wait-on-write = "true";
 +              gpmc,bus-turnaround-ns = <0>;
 +              gpmc,cycle2cycle-delay-ns = <0>;
 +              gpmc,clk-activation-ns = <0>;
 +              gpmc,wait-monitoring-ns = <0>;
 +              gpmc,wr-access-ns = <40>;
 +              gpmc,wr-data-mux-bus-ns = <0>;
 +
 +              #address-cells = <1>;
 +              #size-cells = <1>;
 +              elm_id = <&elm>;
 +
 +              /* MTD partition table */
 +              partition@0 {
 +                      label = "SPL1";
 +                      reg = <0x00000000 0x000020000>;
 +              };
 +
 +              partition@1 {
 +                      label = "SPL2";
 +                      reg = <0x00020000 0x00020000>;
 +              };
 +
 +              partition@2 {
 +                      label = "SPL3";
 +                      reg = <0x00040000 0x00020000>;
 +              };
 +
 +              partition@3 {
 +                      label = "SPL4";
 +                      reg = <0x00060000 0x00020000>;
 +              };
 +
 +              partition@4 {
 +                      label = "U-boot";
 +                      reg = <0x00080000 0x001e0000>;
 +              };
 +
 +              partition@5 {
 +                      label = "environment";
 +                      reg = <0x00260000 0x00020000>;
 +              };
 +
 +              partition@6 {
 +                      label = "Kernel";
 +                      reg = <0x00280000 0x00500000>;
 +              };
 +
 +              partition@7 {
 +                      label = "File-System";
 +                      reg = <0x00780000 0x0F880000>;
 +              };
 +      };
  };
  
  #include "tps65910.dtsi"
  
 +&mcasp1 {
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&am335x_evm_audio_pins>;
 +
 +              status = "okay";
 +
 +              op-mode = <0>;          /* MCASP_IIS_MODE */
 +              tdm-slots = <2>;
 +              /* 4 serializers */
 +              serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
 +                      0 0 1 2
 +              >;
 +              tx-num-evt = <1>;
 +              rx-num-evt = <1>;
 +};
 +
  &tps {
        vcc1-supply = <&vbat>;
        vcc2-supply = <&vbat>;
@@@ -596,8 -477,6 +596,8 @@@
                };
  
                vmmc_reg: regulator@12 {
 +                      regulator-min-microvolt = <1800000>;
 +                      regulator-max-microvolt = <3300000>;
                        regulator-always-on;
                };
        };
@@@ -630,7 -509,7 +630,7 @@@
        tsc {
                ti,wires = <4>;
                ti,x-plate-resistance = <200>;
-               ti,coordiante-readouts = <5>;
+               ti,coordinate-readouts = <5>;
                ti,wire-config = <0x00 0x11 0x22 0x33>;
        };
  
@@@ -638,17 -517,3 +638,17 @@@
                ti,adc-channels = <4 5 6 7>;
        };
  };
 +
 +&mmc1 {
 +      status = "okay";
 +      vmmc-supply = <&vmmc_reg>;
 +      bus-width = <4>;
 +};
 +
 +&sham {
 +      status = "okay";
 +};
 +
 +&aes {
 +      status = "okay";
 +};

diff --combined arch/arm/boot/dts/am335x-evmsk.dts
index 03febf8,d7c2c0c..4718ec4
--- 1/arch/arm/boot/dts/am335x-evmsk.dts
--- 2/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@@ -31,6 -31,210 +31,6 @@@
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
  
 -      am33xx_pinmux: pinmux@44e10800 {
 -              pinctrl-names = "default";
 -              pinctrl-0 = <&gpio_keys_s0 &clkout2_pin>;
 -
 -              user_leds_s0: user_leds_s0 {
 -                      pinctrl-single,pins = <
 -                              0x10 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)  /* gpmc_ad4.gpio1_4 */
 -                              0x14 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)  /* gpmc_ad5.gpio1_5 */
 -                              0x18 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)  /* gpmc_ad6.gpio1_6 */
 -                              0x1c (PIN_OUTPUT_PULLDOWN | MUX_MODE7)  /* gpmc_ad7.gpio1_7 */
 -                      >;
 -              };
 -
 -              gpio_keys_s0: gpio_keys_s0 {
 -                      pinctrl-single,pins = <
 -                              0x94 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_oen_ren.gpio2_3 */
 -                              0x90 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_advn_ale.gpio2_2 */
 -                              0x70 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_wait0.gpio0_30 */
 -                              0x9c (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_ben0_cle.gpio2_5 */
 -                      >;
 -              };
 -
 -              i2c0_pins: pinmux_i2c0_pins {
 -                      pinctrl-single,pins = <
 -                              0x188 (PIN_INPUT_PULLUP | MUX_MODE0)    /* i2c0_sda.i2c0_sda */
 -                              0x18c (PIN_INPUT_PULLUP | MUX_MODE0)    /* i2c0_scl.i2c0_scl */
 -                      >;
 -              };
 -
 -              uart0_pins: pinmux_uart0_pins {
 -                      pinctrl-single,pins = <
 -                              0x170 (PIN_INPUT_PULLUP | MUX_MODE0)    /* uart0_rxd.uart0_rxd */
 -                              0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)         /* uart0_txd.uart0_txd */
 -                      >;
 -              };
 -
 -              clkout2_pin: pinmux_clkout2_pin {
 -                      pinctrl-single,pins = <
 -                              0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)         /* xdma_event_intr1.clkout2 */
 -                      >;
 -              };
 -
 -              ecap2_pins: backlight_pins {
 -                      pinctrl-single,pins = <
 -                              0x19c 0x4       /* mcasp0_ahclkr.ecap2_in_pwm2_out MODE4 */
 -                      >;
 -              };
 -
 -              cpsw_default: cpsw_default {
 -                      pinctrl-single,pins = <
 -                              /* Slave 1 */
 -                              0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txen.rgmii1_tctl */
 -                              0x118 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxdv.rgmii1_rctl */
 -                              0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd3.rgmii1_td3 */
 -                              0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd2.rgmii1_td2 */
 -                              0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_td1 */
 -                              0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_td0 */
 -                              0x12c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txclk.rgmii1_tclk */
 -                              0x130 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxclk.rgmii1_rclk */
 -                              0x134 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxd3.rgmii1_rd3 */
 -                              0x138 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxd2.rgmii1_rd2 */
 -                              0x13c (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxd1.rgmii1_rd1 */
 -                              0x140 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxd0.rgmii1_rd0 */
 -
 -                              /* Slave 2 */
 -                              0x40 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)  /* gpmc_a0.rgmii2_tctl */
 -                              0x44 (PIN_INPUT_PULLDOWN | MUX_MODE2)   /* gpmc_a1.rgmii2_rctl */
 -                              0x48 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)  /* gpmc_a2.rgmii2_td3 */
 -                              0x4c (PIN_OUTPUT_PULLDOWN | MUX_MODE2)  /* gpmc_a3.rgmii2_td2 */
 -                              0x50 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)  /* gpmc_a4.rgmii2_td1 */
 -                              0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)  /* gpmc_a5.rgmii2_td0 */
 -                              0x58 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)  /* gpmc_a6.rgmii2_tclk */
 -                              0x5c (PIN_INPUT_PULLDOWN | MUX_MODE2)   /* gpmc_a7.rgmii2_rclk */
 -                              0x60 (PIN_INPUT_PULLDOWN | MUX_MODE2)   /* gpmc_a8.rgmii2_rd3 */
 -                              0x64 (PIN_INPUT_PULLDOWN | MUX_MODE2)   /* gpmc_a9.rgmii2_rd2 */
 -                              0x68 (PIN_INPUT_PULLDOWN | MUX_MODE2)   /* gpmc_a10.rgmii2_rd1 */
 -                              0x6c (PIN_INPUT_PULLDOWN | MUX_MODE2)   /* gpmc_a11.rgmii2_rd0 */
 -                      >;
 -              };
 -
 -              cpsw_sleep: cpsw_sleep {
 -                      pinctrl-single,pins = <
 -                              /* Slave 1 reset value */
 -                              0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -
 -                              /* Slave 2 reset value*/
 -                              0x40 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x44 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x48 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x4c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x50 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x54 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x58 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x5c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x60 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x64 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x68 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x6c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                      >;
 -              };
 -
 -              davinci_mdio_default: davinci_mdio_default {
 -                      pinctrl-single,pins = <
 -                              /* MDIO */
 -                              0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)    /* mdio_data.mdio_data */
 -                              0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0)                   /* mdio_clk.mdio_clk */
 -                      >;
 -              };
 -
 -              davinci_mdio_sleep: davinci_mdio_sleep {
 -                      pinctrl-single,pins = <
 -                              /* MDIO reset value */
 -                              0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                              0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 -                      >;
 -              };
 -      };
 -
 -      ocp {
 -              uart0: serial@44e09000 {
 -                      pinctrl-names = "default";
 -                      pinctrl-0 = <&uart0_pins>;
 -
 -                      status = "okay";
 -              };
 -
 -              i2c0: i2c@44e0b000 {
 -                      pinctrl-names = "default";
 -                      pinctrl-0 = <&i2c0_pins>;
 -
 -                      status = "okay";
 -                      clock-frequency = <400000>;
 -
 -                      tps: tps@2d {
 -                              reg = <0x2d>;
 -                      };
 -
 -                      lis331dlh: lis331dlh@18 {
 -                              compatible = "st,lis331dlh", "st,lis3lv02d";
 -                              reg = <0x18>;
 -                              Vdd-supply = <&lis3_reg>;
 -                              Vdd_IO-supply = <&lis3_reg>;
 -
 -                              st,click-single-x;
 -                              st,click-single-y;
 -                              st,click-single-z;
 -                              st,click-thresh-x = <10>;
 -                              st,click-thresh-y = <10>;
 -                              st,click-thresh-z = <10>;
 -                              st,irq1-click;
 -                              st,irq2-click;
 -                              st,wakeup-x-lo;
 -                              st,wakeup-x-hi;
 -                              st,wakeup-y-lo;
 -                              st,wakeup-y-hi;
 -                              st,wakeup-z-lo;
 -                              st,wakeup-z-hi;
 -                              st,min-limit-x = <120>;
 -                              st,min-limit-y = <120>;
 -                              st,min-limit-z = <140>;
 -                              st,max-limit-x = <550>;
 -                              st,max-limit-y = <550>;
 -                              st,max-limit-z = <750>;
 -                      };
 -              };
 -
 -              musb: usb@47400000 {
 -                      status = "okay";
 -
 -                      control@44e10000 {
 -                              status = "okay";
 -                      };
 -
 -                      usb-phy@47401300 {
 -                              status = "okay";
 -                      };
 -
 -                      usb@47401000 {
 -                              status = "okay";
 -                      };
 -              };
 -
 -              epwmss2: epwmss@48304000 {
 -                      status = "okay";
 -
 -                      ecap2: ecap@48304100 {
 -                              status = "okay";
 -                              pinctrl-names = "default";
 -                              pinctrl-0 = <&ecap2_pins>;
 -                      };
 -              };
 -      };
 -
        vbat: fixedregulator@0 {
                compatible = "regulator-fixed";
                regulator-name = "vbat";
@@@ -115,240 -319,6 +115,240 @@@
                brightness-levels = <0 58 61 66 75 90 125 170 255>;
                default-brightness-level = <8>;
        };
 +
 +      sound {
 +              compatible = "ti,da830-evm-audio";
 +              ti,model = "AM335x-EVMSK";
 +              ti,audio-codec = <&tlv320aic3106>;
 +              ti,mcasp-controller = <&mcasp1>;
 +              ti,codec-clock-rate = <24576000>;
 +              ti,audio-routing =
 +                      "Headphone Jack",       "HPLOUT",
 +                      "Headphone Jack",       "HPROUT";
 +      };
 +};
 +
 +&am33xx_pinmux {
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&gpio_keys_s0 &clkout2_pin>;
 +
 +      user_leds_s0: user_leds_s0 {
 +              pinctrl-single,pins = <
 +                      0x10 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)  /* gpmc_ad4.gpio1_4 */
 +                      0x14 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)  /* gpmc_ad5.gpio1_5 */
 +                      0x18 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)  /* gpmc_ad6.gpio1_6 */
 +                      0x1c (PIN_OUTPUT_PULLDOWN | MUX_MODE7)  /* gpmc_ad7.gpio1_7 */
 +              >;
 +      };
 +
 +      gpio_keys_s0: gpio_keys_s0 {
 +              pinctrl-single,pins = <
 +                      0x94 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_oen_ren.gpio2_3 */
 +                      0x90 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_advn_ale.gpio2_2 */
 +                      0x70 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_wait0.gpio0_30 */
 +                      0x9c (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_ben0_cle.gpio2_5 */
 +              >;
 +      };
 +
 +      i2c0_pins: pinmux_i2c0_pins {
 +              pinctrl-single,pins = <
 +                      0x188 (PIN_INPUT_PULLUP | MUX_MODE0)    /* i2c0_sda.i2c0_sda */
 +                      0x18c (PIN_INPUT_PULLUP | MUX_MODE0)    /* i2c0_scl.i2c0_scl */
 +              >;
 +      };
 +
 +      uart0_pins: pinmux_uart0_pins {
 +              pinctrl-single,pins = <
 +                      0x170 (PIN_INPUT_PULLUP | MUX_MODE0)    /* uart0_rxd.uart0_rxd */
 +                      0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)         /* uart0_txd.uart0_txd */
 +              >;
 +      };
 +
 +      clkout2_pin: pinmux_clkout2_pin {
 +              pinctrl-single,pins = <
 +                      0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)         /* xdma_event_intr1.clkout2 */
 +              >;
 +      };
 +
 +      ecap2_pins: backlight_pins {
 +              pinctrl-single,pins = <
 +                      0x19c 0x4       /* mcasp0_ahclkr.ecap2_in_pwm2_out MODE4 */
 +              >;
 +      };
 +
 +      cpsw_default: cpsw_default {
 +              pinctrl-single,pins = <
 +                      /* Slave 1 */
 +                      0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txen.rgmii1_tctl */
 +                      0x118 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxdv.rgmii1_rctl */
 +                      0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd3.rgmii1_td3 */
 +                      0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd2.rgmii1_td2 */
 +                      0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_td1 */
 +                      0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_td0 */
 +                      0x12c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txclk.rgmii1_tclk */
 +                      0x130 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxclk.rgmii1_rclk */
 +                      0x134 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxd3.rgmii1_rd3 */
 +                      0x138 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxd2.rgmii1_rd2 */
 +                      0x13c (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxd1.rgmii1_rd1 */
 +                      0x140 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxd0.rgmii1_rd0 */
 +
 +                      /* Slave 2 */
 +                      0x40 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)  /* gpmc_a0.rgmii2_tctl */
 +                      0x44 (PIN_INPUT_PULLDOWN | MUX_MODE2)   /* gpmc_a1.rgmii2_rctl */
 +                      0x48 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)  /* gpmc_a2.rgmii2_td3 */
 +                      0x4c (PIN_OUTPUT_PULLDOWN | MUX_MODE2)  /* gpmc_a3.rgmii2_td2 */
 +                      0x50 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)  /* gpmc_a4.rgmii2_td1 */
 +                      0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)  /* gpmc_a5.rgmii2_td0 */
 +                      0x58 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)  /* gpmc_a6.rgmii2_tclk */
 +                      0x5c (PIN_INPUT_PULLDOWN | MUX_MODE2)   /* gpmc_a7.rgmii2_rclk */
 +                      0x60 (PIN_INPUT_PULLDOWN | MUX_MODE2)   /* gpmc_a8.rgmii2_rd3 */
 +                      0x64 (PIN_INPUT_PULLDOWN | MUX_MODE2)   /* gpmc_a9.rgmii2_rd2 */
 +                      0x68 (PIN_INPUT_PULLDOWN | MUX_MODE2)   /* gpmc_a10.rgmii2_rd1 */
 +                      0x6c (PIN_INPUT_PULLDOWN | MUX_MODE2)   /* gpmc_a11.rgmii2_rd0 */
 +              >;
 +      };
 +
 +      cpsw_sleep: cpsw_sleep {
 +              pinctrl-single,pins = <
 +                      /* Slave 1 reset value */
 +                      0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +
 +                      /* Slave 2 reset value*/
 +                      0x40 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x44 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x48 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x4c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x50 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x54 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x58 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x5c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x60 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x64 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x68 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x6c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +              >;
 +      };
 +
 +      davinci_mdio_default: davinci_mdio_default {
 +              pinctrl-single,pins = <
 +                      /* MDIO */
 +                      0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)    /* mdio_data.mdio_data */
 +                      0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0)                   /* mdio_clk.mdio_clk */
 +              >;
 +      };
 +
 +      davinci_mdio_sleep: davinci_mdio_sleep {
 +              pinctrl-single,pins = <
 +                      /* MDIO reset value */
 +                      0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +                      0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
 +              >;
 +      };
 +
 +      mcasp1_pins: mcasp1_pins {
 +              pinctrl-single,pins = <
 +                      0x10c (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_crs.mcasp1_aclkx */
 +                      0x110 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_rxerr.mcasp1_fsx */
 +                      0x108 (PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* mii1_col.mcasp1_axr2 */
 +                      0x144 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* rmii1_ref_clk.mcasp1_axr3 */
 +              >;
 +      };
 +};
 +
 +&uart0 {
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&uart0_pins>;
 +
 +      status = "okay";
 +};
 +
 +&i2c0 {
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&i2c0_pins>;
 +
 +      status = "okay";
 +      clock-frequency = <400000>;
 +
 +      tps: tps@2d {
 +              reg = <0x2d>;
 +      };
 +
 +      lis331dlh: lis331dlh@18 {
 +              compatible = "st,lis331dlh", "st,lis3lv02d";
 +              reg = <0x18>;
 +              Vdd-supply = <&lis3_reg>;
 +              Vdd_IO-supply = <&lis3_reg>;
 +
 +              st,click-single-x;
 +              st,click-single-y;
 +              st,click-single-z;
 +              st,click-thresh-x = <10>;
 +              st,click-thresh-y = <10>;
 +              st,click-thresh-z = <10>;
 +              st,irq1-click;
 +              st,irq2-click;
 +              st,wakeup-x-lo;
 +              st,wakeup-x-hi;
 +              st,wakeup-y-lo;
 +              st,wakeup-y-hi;
 +              st,wakeup-z-lo;
 +              st,wakeup-z-hi;
 +              st,min-limit-x = <120>;
 +              st,min-limit-y = <120>;
 +              st,min-limit-z = <140>;
 +              st,max-limit-x = <550>;
 +              st,max-limit-y = <550>;
 +              st,max-limit-z = <750>;
 +      };
 +
 +      tlv320aic3106: tlv320aic3106@1b {
 +              compatible = "ti,tlv320aic3106";
 +              reg = <0x1b>;
 +              status = "okay";
 +
 +              /* Regulators */
 +              AVDD-supply = <&vaux2_reg>;
 +              IOVDD-supply = <&vaux2_reg>;
 +              DRVDD-supply = <&vaux2_reg>;
 +              DVDD-supply = <&vbat>;
 +      };
 +};
 +
 +&usb {
 +      status = "okay";
 +
 +      control@44e10000 {
 +              status = "okay";
 +      };
 +
 +      usb-phy@47401300 {
 +              status = "okay";
 +      };
 +
 +      usb@47401000 {
 +              status = "okay";
 +      };
 +};
 +
 +&epwmss2 {
 +      status = "okay";
 +
 +      ecap2: ecap@48304100 {
 +              status = "okay";
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&ecap2_pins>;
 +      };
  };
  
  #include "tps65910.dtsi"
@@@ -423,8 -393,6 +423,8 @@@
                };
  
                vmmc_reg: regulator@12 {
 +                      regulator-min-microvolt = <1800000>;
 +                      regulator-max-microvolt = <3300000>;
                        regulator-always-on;
                };
        };
@@@ -452,36 -420,12 +452,46 @@@
        phy-mode = "rgmii-txid";
  };
  
 +&mmc1 {
 +      status = "okay";
 +      vmmc-supply = <&vmmc_reg>;
 +      bus-width = <4>;
 +};
 +
 +&sham {
 +      status = "okay";
 +};
 +
 +&aes {
 +      status = "okay";
 +};
 +
 +&gpio0 {
 +      ti,no-reset-on-init;
 +};
 +
 +&mcasp1 {
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&mcasp1_pins>;
 +
 +              status = "okay";
 +
 +              op-mode = <0>;          /* MCASP_IIS_MODE */
 +              tdm-slots = <2>;
 +              /* 4 serializers */
 +              serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
 +                      0 0 1 2
 +              >;
 +              tx-num-evt = <1>;
 +              rx-num-evt = <1>;
 +};
++
+ &tscadc {
+       status = "okay";
+       tsc {
+               ti,wires = <4>;
+               ti,x-plate-resistance = <200>;
+               ti,coordinate-readouts = <5>;
+               ti,wire-config = <0x00 0x11 0x22 0x33>;
+       };
+ };

diff --combined drivers/input/serio/Kconfig
index 1de1e5f,5a96acb..8541f94
--- 1/drivers/input/serio/Kconfig
--- 2/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@@ -2,7 -2,7 +2,7 @@@
  # Input core configuration
  #
  config SERIO
-       tristate "Serial I/O support" if EXPERT || !X86
+       tristate "Serial I/O support"
        default y
        help
          Say Yes here if you have any input device that uses serial I/O to
@@@ -19,9 -19,9 +19,9 @@@
  if SERIO
  
  config SERIO_I8042
-       tristate "i8042 PC Keyboard controller" if EXPERT || !X86
+       tristate "i8042 PC Keyboard controller"
        default y
 -      depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \
 +      depends on !PARISC && (!ARM || FOOTBRIDGE_HOST) && \
                   (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !S390 && \
                   !ARC
        help
@@@ -170,7 -170,7 +170,7 @@@ config SERIO_MACEPS
          module will be called maceps2.
  
  config SERIO_LIBPS2
-       tristate "PS/2 driver library" if EXPERT
+       tristate "PS/2 driver library"
        depends on SERIO_I8042 || SERIO_I8042=n
        help
          Say Y here if you are using a driver for device connected
@@@ -266,4 -266,14 +266,14 @@@ config SERIO_OLPC_APS
          To compile this driver as a module, choose M here: the module will
          be called olpc_apsp.
  
+ config HYPERV_KEYBOARD
+       tristate "Microsoft Synthetic Keyboard driver"
+       depends on HYPERV
+       default HYPERV
+       help
+         Select this option to enable the Hyper-V Keyboard driver.
+ 
+         To compile this driver as a module, choose M here: the module will
+         be called hyperv_keyboard.
+ 
  endif

diff --combined drivers/input/touchscreen/ti_am335x_tsc.c
index 24e625c,ad75642..68beada
--- 1/drivers/input/touchscreen/ti_am335x_tsc.c
--- 2/drivers/input/touchscreen/ti_am335x_tsc.c
+++ b/drivers/input/touchscreen/ti_am335x_tsc.c
@@@ -52,7 -52,6 +52,7 @@@ struct titsc 
        u32                     config_inp[4];
        u32                     bit_xp, bit_xn, bit_yp, bit_yn;
        u32                     inp_xp, inp_xn, inp_yp, inp_yn;
 +      u32                     step_mask;
  };
  
  static unsigned int titsc_readl(struct titsc *ts, unsigned int reg)
@@@ -197,8 -196,7 +197,8 @@@ static void titsc_step_config(struct ti
  
        /* The steps1 … end and bit 0 for TS_Charge */
        stepenable = (1 << (end_step + 2)) - 1;
 -      am335x_tsc_se_set(ts_dev->mfd_tscadc, stepenable);
 +      ts_dev->step_mask = stepenable;
 +      am335x_tsc_se_set(ts_dev->mfd_tscadc, ts_dev->step_mask);
  }
  
  static void titsc_read_coordinates(struct titsc *ts_dev,
@@@ -262,10 -260,6 +262,10 @@@ static irqreturn_t titsc_irq(int irq, v
        unsigned int fsm;
  
        status = titsc_readl(ts_dev, REG_IRQSTATUS);
 +      /*
 +       * ADC and touchscreen share the IRQ line.
 +       * FIFO1 interrupts are used by ADC. Handle FIFO0 IRQs here only
 +       */
        if (status & IRQENB_FIFO0THRES) {
  
                titsc_read_coordinates(ts_dev, &x, &y, &z1, &z2);
@@@ -322,7 -316,7 +322,7 @@@
  
        if (irqclr) {
                titsc_writel(ts_dev, REG_IRQSTATUS, irqclr);
 -              am335x_tsc_se_update(ts_dev->mfd_tscadc);
 +              am335x_tsc_se_set(ts_dev->mfd_tscadc, ts_dev->step_mask);
                return IRQ_HANDLED;
        }
        return IRQ_NONE;
@@@ -354,8 -348,15 +354,15 @@@ static int titsc_parse_dt(struct platfo
        if (err < 0)
                return err;
  
-       err = of_property_read_u32(node, "ti,coordiante-readouts",
+       /*
+        * Try with the new binding first. If it fails, try again with
+        * bogus, miss-spelled version.
+        */
+       err = of_property_read_u32(node, "ti,coordinate-readouts",
                        &ts_dev->coordinate_readouts);
+       if (err < 0)
+               err = of_property_read_u32(node, "ti,coordiante-readouts",
+                               &ts_dev->coordinate_readouts);
        if (err < 0)
                return err;
  
@@@ -395,7 -396,7 +402,7 @@@ static int titsc_probe(struct platform_
        }
  
        err = request_irq(ts_dev->irq, titsc_irq,
 -                        0, pdev->dev.driver->name, ts_dev);
 +                        IRQF_SHARED, pdev->dev.driver->name, ts_dev);
        if (err) {
                dev_err(&pdev->dev, "failed to allocate irq.\n");
                goto err_free_mem;
@@@ -511,7 -512,7 +518,7 @@@ static struct platform_driver ti_tsc_dr
                .name   = "TI-am335x-tsc",
                .owner  = THIS_MODULE,
                .pm     = TITSC_PM_OPS,
-               .of_match_table = of_match_ptr(ti_tsc_dt_ids),
+               .of_match_table = ti_tsc_dt_ids,
        },
  };
  module_platform_driver(ti_tsc_driver);