Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1284073 > unrolled thread

[PATCH] ARM: at91: fix pinctrl driver selection

Started byAlexandre Belloni <alexandre.belloni@free-electrons.com>
First post2015-12-04 18:30 +0100
Last post2015-12-04 19:20 +0100
Articles 3 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH] ARM: at91: fix pinctrl driver selection Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2015-12-04 18:30 +0100
    Re: [PATCH] ARM: at91: fix pinctrl driver selection Sudeep Holla <sudeep.holla@arm.com> - 2015-12-04 18:40 +0100
      Re: [PATCH] ARM: at91: fix pinctrl driver selection Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2015-12-04 19:20 +0100

#1284073 — [PATCH] ARM: at91: fix pinctrl driver selection

FromAlexandre Belloni <alexandre.belloni@free-electrons.com>
Date2015-12-04 18:30 +0100
Subject[PATCH] ARM: at91: fix pinctrl driver selection
Message-ID<qC2lc-5GD-13@gated-at.bofh.it>
From: Ludovic Desroches <ludovic.desroches@atmel.com>

Move the selection of the pinctrl driver to SoC family level since we
have two pinctrl drivers. It is useless to select one which is not
compatible with the SoC.

[abelloni: fixed pm.c when only sama2d2 is selected]
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 arch/arm/mach-at91/Kconfig | 6 +++++-
 arch/arm/mach-at91/pm.c    | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 92673006e55c..28656c2b54a0 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -4,7 +4,6 @@ menuconfig ARCH_AT91
 	select ARCH_REQUIRE_GPIOLIB
 	select COMMON_CLK_AT91
 	select PINCTRL
-	select PINCTRL_AT91
 	select SOC_BUS
 
 if ARCH_AT91
@@ -17,6 +16,7 @@ config SOC_SAMA5D2
 	select HAVE_AT91_USB_CLK
 	select HAVE_AT91_H32MX
 	select HAVE_AT91_GENERATED_CLK
+	select PINCTRL_AT91PIO4
 	help
 	  Select this if ou are using one of Atmel's SAMA5D2 family SoC.
 
@@ -27,6 +27,7 @@ config SOC_SAMA5D3
 	select HAVE_AT91_UTMI
 	select HAVE_AT91_SMD
 	select HAVE_AT91_USB_CLK
+	select PINCTRL_AT91
 	help
 	  Select this if you are using one of Atmel's SAMA5D3 family SoC.
 	  This support covers SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35, SAMA5D36.
@@ -40,6 +41,7 @@ config SOC_SAMA5D4
 	select HAVE_AT91_SMD
 	select HAVE_AT91_USB_CLK
 	select HAVE_AT91_H32MX
+	select PINCTRL_AT91
 	help
 	  Select this if you are using one of Atmel's SAMA5D4 family SoC.
 
@@ -50,6 +52,7 @@ config SOC_AT91RM9200
 	select CPU_ARM920T
 	select HAVE_AT91_USB_CLK
 	select MIGHT_HAVE_PCI
+	select PINCTRL_AT91
 	select SOC_SAM_V4_V5
 	select SRAM if PM
 	help
@@ -65,6 +68,7 @@ config SOC_AT91SAM9
 	select HAVE_AT91_UTMI
 	select HAVE_FB_ATMEL
 	select MEMORY
+	select PINCTRL_AT91
 	select SOC_SAM_V4_V5
 	select SRAM if PM
 	help
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 80e277cfcc8b..01cbb17e6f6b 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -41,8 +41,10 @@
  * implementation should be moved down into the pinctrl driver and get
  * called as part of the generic suspend/resume path.
  */
+#ifdef PINCTRL_AT91
 extern void at91_pinctrl_gpio_suspend(void);
 extern void at91_pinctrl_gpio_resume(void);
+#endif
 
 static struct {
 	unsigned long uhp_udp_mask;
@@ -151,8 +153,9 @@ static void at91_pm_suspend(suspend_state_t state)
 
 static int at91_pm_enter(suspend_state_t state)
 {
+#ifdef PINCTRL_AT91
 	at91_pinctrl_gpio_suspend();
-
+#endif
 	switch (state) {
 	/*
 	 * Suspend-to-RAM is like STANDBY plus slow clock mode, so
@@ -192,7 +195,9 @@ static int at91_pm_enter(suspend_state_t state)
 error:
 	target_state = PM_SUSPEND_ON;
 
+#ifdef PINCTRL_AT91
 	at91_pinctrl_gpio_resume();
+#endif
 	return 0;
 }
 
-- 
2.5.0

--
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/

[toc] | [next] | [standalone]

#1284083

FromSudeep Holla <sudeep.holla@arm.com>
Date2015-12-04 18:40 +0100
Message-ID<qC2uS-5Kw-33@gated-at.bofh.it>
In reply to#1284073

On 04/12/15 17:18, Alexandre Belloni wrote:
> From: Ludovic Desroches <ludovic.desroches@atmel.com>
>
> Move the selection of the pinctrl driver to SoC family level since we
> have two pinctrl drivers. It is useless to select one which is not
> compatible with the SoC.
>
> [abelloni: fixed pm.c when only sama2d2 is selected]
> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
>   arch/arm/mach-at91/Kconfig | 6 +++++-
>   arch/arm/mach-at91/pm.c    | 7 ++++++-
>   2 files changed, 11 insertions(+), 2 deletions(-)
>

[...]

> diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
> index 80e277cfcc8b..01cbb17e6f6b 100644
> --- a/arch/arm/mach-at91/pm.c
> +++ b/arch/arm/mach-at91/pm.c
> @@ -41,8 +41,10 @@
>    * implementation should be moved down into the pinctrl driver and get
>    * called as part of the generic suspend/resume path.
>    */
> +#ifdef PINCTRL_AT91

Accidentally glanced at this patch when my mail client got hung at this
patch :), I think you mean CONFIG_PINCTRL_AT91 here and later below.

--
Regards,
Sudeep
--
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/

[toc] | [prev] | [next] | [standalone]

#1284137

FromAlexandre Belloni <alexandre.belloni@free-electrons.com>
Date2015-12-04 19:20 +0100
Message-ID<qC37B-6ec-25@gated-at.bofh.it>
In reply to#1284083
On 04/12/2015 at 17:33:37 +0000, Sudeep Holla wrote :
> 
> 
> On 04/12/15 17:18, Alexandre Belloni wrote:
> >From: Ludovic Desroches <ludovic.desroches@atmel.com>
> >
> >Move the selection of the pinctrl driver to SoC family level since we
> >have two pinctrl drivers. It is useless to select one which is not
> >compatible with the SoC.
> >
> >[abelloni: fixed pm.c when only sama2d2 is selected]
> >Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
> >Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> >Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> >---
> >  arch/arm/mach-at91/Kconfig | 6 +++++-
> >  arch/arm/mach-at91/pm.c    | 7 ++++++-
> >  2 files changed, 11 insertions(+), 2 deletions(-)
> >
> 
> [...]
> 
> >diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
> >index 80e277cfcc8b..01cbb17e6f6b 100644
> >--- a/arch/arm/mach-at91/pm.c
> >+++ b/arch/arm/mach-at91/pm.c
> >@@ -41,8 +41,10 @@
> >   * implementation should be moved down into the pinctrl driver and get
> >   * called as part of the generic suspend/resume path.
> >   */
> >+#ifdef PINCTRL_AT91
> 
> Accidentally glanced at this patch when my mail client got hung at this
> patch :), I think you mean CONFIG_PINCTRL_AT91 here and later below.
> 


Raah, sure. Thanks!
> --
> Regards,
> Sudeep

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
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/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web