From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2013 04:03:28 +0000 (+1000)
Subject: Merge remote-tracking branch 'mfd/master'
X-Git-Tag: next-20130619~47
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5c1c3737decc3aba9c29190e63551b4afa0f3cbf;p=karo-tx-linux.git

Merge remote-tracking branch 'mfd/master'
---

5c1c3737decc3aba9c29190e63551b4afa0f3cbf
diff --cc arch/arm/boot/dts/am335x-evm.dts
index 814ee037fd51,0fa4c7f9539f..3ad587b13b40
--- a/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 drivers/input/touchscreen/ti_am335x_tsc.c
index 50fb1293874e,0e9f02aeae6b..e1c5300cacfc
--- a/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;
  }