| Message ID | 1370950268-7224-15-git-send-email-bigeasy@linutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 6/11/2013 5:01 PM, Sebastian Andrzej Siewior wrote: > From: "Patil, Rachna" <rachna@ti.com> > > Add support for core multifunctional device along > with its clients touchscreen and ADC. > > [ panto@antoniou-consulting.com : make sure status is > set to 'disabled' in dtsi file. ] > > Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com> > Signed-off-by: Patil, Rachna <rachna@ti.com> > Signed-off-by: Felipe Balbi <balbi@ti.com> > [bigeasy: add 'status = "okay"'] > Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> > --- > arch/arm/boot/dts/am335x-evm.dts | 14 ++++++++++++++ > arch/arm/boot/dts/am33xx.dtsi | 18 ++++++++++++++++++ > 2 files changed, 32 insertions(+) > diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi > index 1460d9b..4ad7797 100644 > --- a/arch/arm/boot/dts/am33xx.dtsi > +++ b/arch/arm/boot/dts/am33xx.dtsi > @@ -404,6 +404,24 @@ > ti,hwmods = "wkup_m3"; > }; > > + tscadc: tscadc@44e0d000 { > + compatible = "ti,am3359-tscadc"; > + reg = <0x44e0d000 0x1000>; > + interrupt-parent = <&intc>; interrupt-parent can be dropped since it will be inherited from parent. Thanks, Sekhar -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 07/04/2013 03:49 PM, Sekhar Nori wrote: >> diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi >> index 1460d9b..4ad7797 100644 >> --- a/arch/arm/boot/dts/am33xx.dtsi >> +++ b/arch/arm/boot/dts/am33xx.dtsi >> @@ -404,6 +404,24 @@ >> ti,hwmods = "wkup_m3"; >> }; >> >> + tscadc: tscadc@44e0d000 { >> + compatible = "ti,am3359-tscadc"; >> + reg = <0x44e0d000 0x1000>; >> + interrupt-parent = <&intc>; > > interrupt-parent can be dropped since it will be inherited from parent. That is true. I prepare a patch for that after the merge window. > > Thanks, > Sekhar Sebastian -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index 0423298..26fea97 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -244,3 +244,17 @@ &cpsw_emac1 { phy_id = <&davinci_mdio>, <1>; }; + +&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>; + }; +}; diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index 1460d9b..4ad7797 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -404,6 +404,24 @@ ti,hwmods = "wkup_m3"; }; + tscadc: tscadc@44e0d000 { + compatible = "ti,am3359-tscadc"; + reg = <0x44e0d000 0x1000>; + interrupt-parent = <&intc>; + interrupts = <16>; + ti,hwmods = "adc_tsc"; + status = "disabled"; + + tsc { + compatible = "ti,am3359-tsc"; + }; + am335x_adc: adc { + #io-channel-cells = <1>; + compatible = "ti,am3359-adc"; + }; + + }; + gpmc: gpmc@50000000 { compatible = "ti,am3352-gpmc"; ti,hwmods = "gpmc";