On 26/02/2014 at 17:29:50 +0100, Ludovic Desroches wrote : > From: Ludovic Desroches <[email protected]> > > Touchscreen support for at91_adc has been introduced so we can get rid of > atmel_tsadcc. > > Signed-off-by: Ludovic Desroches <[email protected]>
Acked-by: Alexandre Belloni <[email protected]> > --- > arch/arm/boot/dts/sama5d3.dtsi | 14 +------------- > arch/arm/boot/dts/sama5d3xdm.dtsi | 7 +++---- > 2 files changed, 4 insertions(+), 17 deletions(-) > > diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi > index 3d5faf8..26d7ed5 100644 > --- a/arch/arm/boot/dts/sama5d3.dtsi > +++ b/arch/arm/boot/dts/sama5d3.dtsi > @@ -239,7 +239,7 @@ > }; > > adc0: adc@f8018000 { > - compatible = "atmel,at91sam9260-adc"; > + compatible = "atmel,at91sam9x5-adc"; > reg = <0xf8018000 0x100>; > interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>; > pinctrl-names = "default"; > @@ -295,18 +295,6 @@ > }; > }; > > - tsadcc: tsadcc@f8018000 { > - compatible = "atmel,at91sam9x5-tsadcc"; > - reg = <0xf8018000 0x4000>; > - interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>; > - atmel,tsadcc_clock = <300000>; > - atmel,filtering_average = <0x03>; > - atmel,pendet_debounce = <0x08>; > - atmel,pendet_sensitivity = <0x02>; > - atmel,ts_sample_hold_time = <0x0a>; > - status = "disabled"; > - }; > - > i2c2: i2c@f801c000 { > compatible = "atmel,at91sam9x5-i2c"; > reg = <0xf801c000 0x4000>; > diff --git a/arch/arm/boot/dts/sama5d3xdm.dtsi > b/arch/arm/boot/dts/sama5d3xdm.dtsi > index f9bdde5..0b8f5d1 100644 > --- a/arch/arm/boot/dts/sama5d3xdm.dtsi > +++ b/arch/arm/boot/dts/sama5d3xdm.dtsi > @@ -23,10 +23,9 @@ > }; > > adc0: adc@f8018000 { > - status = "disabled"; > - }; > - > - tsadcc: tsadcc@f8018000 { > + atmel,adc-clock-rate = <1000000>; > + atmel,adc-ts-wires = <4>; > + atmel,adc-ts-pressure-threshold = <10000>; > status = "okay"; > }; > > -- > 1.7.9.5 > > > _______________________________________________ > linux-arm-kernel mailing list > [email protected] > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
signature.asc
Description: Digital signature
