Merge remote-tracking branch 'mfd/master'

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/am335x-evm.dts
index 814ee037fd51fbb9a81774b2c4ba5e23fda6ae3a,0fa4c7f9539f98dc240b45d041dd5a301f15d21f..3ad587b13b408844232db1dff092d0061f6b9eff
--- 1/arch/arm/boot/dts/am335x-evm.dts
--- 2/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@@ -244,5 -243,18 +244,19 @@@
  
  &cpsw_emac1 {
        phy_id = <&davinci_mdio>, <1>;
 +      phy-mode = "rgmii-txid";
  };
+ 
+ &tscadc {
+       status = "okay";
+       tsc {
+               ti,wires = <4>;
+               ti,x-plate-resistance = <200>;
+               ti,coordiante-readouts = <5>;
+               ti,wire-config = <0x00 0x11 0x22 0x33>;
+       };
+ 
+       adc {
+               ti,adc-channels = <4 5 6 7>;
+       };
+ };

diff --cc arch/arm/boot/dts/am33xx.dtsi
Simple merge

diff --cc drivers/input/touchscreen/ti_am335x_tsc.c
index 50fb1293874e56053435f55a312b7e869ddfb6f8,0e9f02aeae6b3cdcd7a17de0fddb974ac11fade4..e1c5300cacfc2044f83175dccffd864a8bd01fbc
--- 1/drivers/input/touchscreen/ti_am335x_tsc.c
--- 2/drivers/input/touchscreen/ti_am335x_tsc.c
+++ b/drivers/input/touchscreen/ti_am335x_tsc.c
@@@ -334,8 -438,14 +438,13 @@@ static int titsc_remove(struct platform
  
        free_irq(ts_dev->irq, ts_dev);
  
+       /* total steps followed by the enable mask */
+       steps = 2 * ts_dev->coordinate_readouts + 2;
+       steps = (1 << steps) - 1;
+       am335x_tsc_se_clr(ts_dev->mfd_tscadc, steps);
+ 
        input_unregister_device(ts_dev->input);
  
 -      platform_set_drvdata(pdev, NULL);
        kfree(ts_dev);
        return 0;
  }

diff --cc drivers/mfd/ab8500-gpadc.c
Simple merge

diff --cc drivers/watchdog/Kconfig
Simple merge

diff --cc include/linux/mfd/wm8994/pdata.h
Simple merge