Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754722AbbG1Hd2 (ORCPT ); Tue, 28 Jul 2015 03:33:28 -0400 Received: from eusmtp01.atmel.com ([212.144.249.243]:21881 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751698AbbG1Hd1 (ORCPT ); Tue, 28 Jul 2015 03:33:27 -0400 Message-ID: <55B73004.2070401@atmel.com> Date: Tue, 28 Jul 2015 09:32:20 +0200 From: Nicolas Ferre Organization: atmel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: Alexandre Belloni CC: Jean-Christophe Plagniol-Villard , Boris Brezillon , , Subject: Re: [PATCH 2/2] ARM: at91/dt: sama5d4: move ADC pinctrl to board device trees References: <1434959149-4067-1-git-send-email-alexandre.belloni@free-electrons.com> <1434959149-4067-2-git-send-email-alexandre.belloni@free-electrons.com> In-Reply-To: <1434959149-4067-2-git-send-email-alexandre.belloni@free-electrons.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.161.30.18] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2841 Lines: 84 Le 22/06/2015 09:45, Alexandre Belloni a ?crit : > The ADC pinctrl is board specific, move it to the board device trees. > > Signed-off-by: Alexandre Belloni To the series: Acked-by: Nicolas Ferre > --- > arch/arm/boot/dts/at91-sama5d4_xplained.dts | 9 +++++++++ > arch/arm/boot/dts/at91-sama5d4ek.dts | 9 +++++++++ > arch/arm/boot/dts/sama5d4.dtsi | 9 --------- > 3 files changed, 18 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/boot/dts/at91-sama5d4_xplained.dts b/arch/arm/boot/dts/at91-sama5d4_xplained.dts > index c740e1a2a3a5..50033760df93 100644 > --- a/arch/arm/boot/dts/at91-sama5d4_xplained.dts > +++ b/arch/arm/boot/dts/at91-sama5d4_xplained.dts > @@ -123,6 +123,15 @@ > }; > > adc0: adc@fc034000 { > + pinctrl-names = "default"; > + pinctrl-0 = < > + /* external trigger conflicts with USBA_VBUS */ > + &pinctrl_adc0_ad0 > + &pinctrl_adc0_ad1 > + &pinctrl_adc0_ad2 > + &pinctrl_adc0_ad3 > + &pinctrl_adc0_ad4 > + >; > atmel,adc-vref = <3300>; > status = "okay"; > }; > diff --git a/arch/arm/boot/dts/at91-sama5d4ek.dts b/arch/arm/boot/dts/at91-sama5d4ek.dts > index 89ef4a540db5..202891b4c1b7 100644 > --- a/arch/arm/boot/dts/at91-sama5d4ek.dts > +++ b/arch/arm/boot/dts/at91-sama5d4ek.dts > @@ -99,6 +99,15 @@ > }; > > adc0: adc@fc034000 { > + pinctrl-names = "default"; > + pinctrl-0 = < > + /* external trigger conflicts with USBA_VBUS */ > + &pinctrl_adc0_ad0 > + &pinctrl_adc0_ad1 > + &pinctrl_adc0_ad2 > + &pinctrl_adc0_ad3 > + &pinctrl_adc0_ad4 > + >; > /* The vref depends on JP22 of EK. If connect 1-2 then use 3.3V. connect 2-3 use 3.0V */ > atmel,adc-vref = <3300>; > /*atmel,adc-ts-wires = <4>;*/ /* Set up ADC touch screen */ > diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi > index ca1e52989a29..04779fe1c70b 100644 > --- a/arch/arm/boot/dts/sama5d4.dtsi > +++ b/arch/arm/boot/dts/sama5d4.dtsi > @@ -1078,15 +1078,6 @@ > compatible = "atmel,at91sam9x5-adc"; > reg = <0xfc034000 0x100>; > interrupts = <44 IRQ_TYPE_LEVEL_HIGH 5>; > - pinctrl-names = "default"; > - pinctrl-0 = < > - /* external trigger is conflict with USBA_VBUS */ > - &pinctrl_adc0_ad0 > - &pinctrl_adc0_ad1 > - &pinctrl_adc0_ad2 > - &pinctrl_adc0_ad3 > - &pinctrl_adc0_ad4 > - >; > clocks = <&adc_clk>, > <&adc_op_clk>; > clock-names = "adc_clk", "adc_op_clk"; > -- Nicolas Ferre -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/