[PATCH 0/1] ARM: AT91: drivers: cleanup patches from Arnd Bergmann

[PATCH 0/1] ARM: AT91: drivers: cleanup patches from Arnd Bergmann

[Alan Ott]

Hello,

I'm helping Arnd Bergmann get some of his cleanup patches upstream. This
covers the AT91 related drivers.

Thanks,

Alan.

Arnd Bergmann (1):
  ata: AT91 ata driver requires specific platforms

 drivers/ata/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

[PATCH 1/1] ata: AT91 ata driver requires specific platforms

[Alan Ott]

From: Arnd Bergmann <arnd@arndb.de>

This driver uses registers defined in a per-soc header file.
Since not every soc in the at91 platform defines those, make
the Kconfig option dependent on specifically the socs that
do.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Alan Ott <alan@signal11.us>
---
 drivers/ata/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 6bdedd7..16c6b78 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -731,6 +731,7 @@ config PATA_AT32
 config PATA_AT91
 	tristate "PATA support for AT91SAM9260"
 	depends on ARM && ARCH_AT91
+	depends on ARCH_AT91SAM9260 || ARCH_AT91SAM9G20 || ARCH_AT91SAM9261 ||  ARCH_AT91SAM9G10 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45 || ARCH_AT91CAP9
 	help
 	  This option enables support for IDE devices on the Atmel AT91SAM9260 SoC.
 
-- 
1.7.0.4

Re: [PATCH 1/1] ata: AT91 ata driver requires specific platforms

[Ben Dooks]

On Sat, Mar 10, 2012 at 01:54:12PM -0500, Alan Ott wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> This driver uses registers defined in a per-soc header file.
> Since not every soc in the at91 platform defines those, make
> the Kconfig option dependent on specifically the socs that
> do.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Alan Ott <alan@signal11.us>
> ---
>  drivers/ata/Kconfig |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
> index 6bdedd7..16c6b78 100644
> --- a/drivers/ata/Kconfig
> +++ b/drivers/ata/Kconfig
> @@ -731,6 +731,7 @@ config PATA_AT32
>  config PATA_AT91
>  	tristate "PATA support for AT91SAM9260"
>  	depends on ARM && ARCH_AT91
> +	depends on ARCH_AT91SAM9260 || ARCH_AT91SAM9G20 || ARCH_AT91SAM9261 ||  ARCH_AT91SAM9G10 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45 || ARCH_AT91CAP9
>  	help

How about adding an AT91_HAS_PATA kconfig and having the arch/arm/... Kconfig
select it as necessary. It will avoid future fun when another device comes
out.

-- 
Ben Dooks, ben@fluff.org, http://www.fluff.org/ben/

Large Hadron Colada: A large Pina Colada that makes the universe disappear.

[PATCH v2 0/2] ata: AT91 ata driver requires specific platforms

[Alan Ott]

Based on suggestions from Ben Dooks, This patch now adds an AT91_HAS_PATA
kconfig item and the AT91 CPUs which have PATA now select it. The
AT91 PATA driver how depends on this kconfig item.

Ben, let me know if this is what you had in mind.


Alan Ott (2):
  ARM: AT91: Add parameter for AT91_HAS_PATA
  ata: AT91 ata driver requires AT91_HAS_PATA

 arch/arm/mach-at91/Kconfig |   11 +++++++++++
 drivers/ata/Kconfig        |    1 +
 2 files changed, 12 insertions(+), 0 deletions(-)

[PATCH v2 0/2] ata: AT91 ata driver requires specific platforms

[Alan Ott]

Based on suggestions from Ben Dooks, This patch now adds an AT91_HAS_PATA
kconfig item and the AT91 CPUs which have PATA now select it. The
AT91 PATA driver how depends on this kconfig item.

Ben, let me know if this is what you had in mind.


Alan Ott (2):
  ARM: AT91: Add parameter for AT91_HAS_PATA
  ata: AT91 ata driver requires AT91_HAS_PATA

 arch/arm/mach-at91/Kconfig |   11 +++++++++++
 drivers/ata/Kconfig        |    1 +
 2 files changed, 12 insertions(+), 0 deletions(-)

[PATCH v2 1/2] ARM: AT91: Add parameter for AT91_HAS_PATA

[Alan Ott]

Not all at91 chips have PATA, this parameter will identify which
chips do. The determining of which chips support PATA was done
by Arnd Bergmann.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Alan Ott <alan@signal11.us>
CC: Ben Dooks <ben-linux@fluff.org>
---
 arch/arm/mach-at91/Kconfig |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 71feb00..9eeeabe 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -24,6 +24,9 @@ config AT91_SAM9_ALT_RESET
 config AT91_SAM9G45_RESET
 	bool
 
+config AT91_HAS_PATA
+	bool
+
 menu "Atmel AT91 System-on-Chip"
 
 choice
@@ -46,6 +49,7 @@ config ARCH_AT91SAM9260
 	select HAVE_AT91_USART5
 	select HAVE_NET_MACB
 	select AT91_SAM9_ALT_RESET
+	select AT91_HAS_PATA
 
 config ARCH_AT91SAM9261
 	bool "AT91SAM9261"
@@ -54,6 +58,7 @@ config ARCH_AT91SAM9261
 	select HAVE_FB_ATMEL
 	select HAVE_AT91_DBGU0
 	select AT91_SAM9_ALT_RESET
+	select AT91_HAS_PATA
 
 config ARCH_AT91SAM9G10
 	bool "AT91SAM9G10"
@@ -62,6 +67,7 @@ config ARCH_AT91SAM9G10
 	select HAVE_AT91_DBGU0
 	select HAVE_FB_ATMEL
 	select AT91_SAM9_ALT_RESET
+	select AT91_HAS_PATA
 
 config ARCH_AT91SAM9263
 	bool "AT91SAM9263"
@@ -71,6 +77,7 @@ config ARCH_AT91SAM9263
 	select HAVE_NET_MACB
 	select HAVE_AT91_DBGU1
 	select AT91_SAM9_ALT_RESET
+	select AT91_HAS_PATA
 
 config ARCH_AT91SAM9RL
 	bool "AT91SAM9RL"
@@ -80,6 +87,7 @@ config ARCH_AT91SAM9RL
 	select HAVE_FB_ATMEL
 	select HAVE_AT91_DBGU0
 	select AT91_SAM9_ALT_RESET
+	select AT91_HAS_PATA
 
 config ARCH_AT91SAM9G20
 	bool "AT91SAM9G20"
@@ -91,6 +99,7 @@ config ARCH_AT91SAM9G20
 	select HAVE_AT91_USART5
 	select HAVE_NET_MACB
 	select AT91_SAM9_ALT_RESET
+	select AT91_HAS_PATA
 
 config ARCH_AT91SAM9G45
 	bool "AT91SAM9G45"
@@ -101,6 +110,7 @@ config ARCH_AT91SAM9G45
 	select HAVE_NET_MACB
 	select HAVE_AT91_DBGU1
 	select AT91_SAM9G45_RESET
+	select AT91_HAS_PATA
 
 config ARCH_AT91CAP9
 	bool "AT91CAP9"
@@ -110,6 +120,7 @@ config ARCH_AT91CAP9
 	select HAVE_NET_MACB
 	select HAVE_AT91_DBGU1
 	select AT91_SAM9G45_RESET
+	select AT91_HAS_PATA
 
 config ARCH_AT91X40
 	bool "AT91x40"
-- 
1.7.0.4

[PATCH v2 1/2] ARM: AT91: Add parameter for AT91_HAS_PATA

[Alan Ott]

Not all at91 chips have PATA, this parameter will identify which
chips do. The determining of which chips support PATA was done
by Arnd Bergmann.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Alan Ott <alan@signal11.us>
CC: Ben Dooks <ben-linux@fluff.org>
---
 arch/arm/mach-at91/Kconfig |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 71feb00..9eeeabe 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -24,6 +24,9 @@ config AT91_SAM9_ALT_RESET
 config AT91_SAM9G45_RESET
 	bool
 
+config AT91_HAS_PATA
+	bool
+
 menu "Atmel AT91 System-on-Chip"
 
 choice
@@ -46,6 +49,7 @@ config ARCH_AT91SAM9260
 	select HAVE_AT91_USART5
 	select HAVE_NET_MACB
 	select AT91_SAM9_ALT_RESET
+	select AT91_HAS_PATA
 
 config ARCH_AT91SAM9261
 	bool "AT91SAM9261"
@@ -54,6 +58,7 @@ config ARCH_AT91SAM9261
 	select HAVE_FB_ATMEL
 	select HAVE_AT91_DBGU0
 	select AT91_SAM9_ALT_RESET
+	select AT91_HAS_PATA
 
 config ARCH_AT91SAM9G10
 	bool "AT91SAM9G10"
@@ -62,6 +67,7 @@ config ARCH_AT91SAM9G10
 	select HAVE_AT91_DBGU0
 	select HAVE_FB_ATMEL
 	select AT91_SAM9_ALT_RESET
+	select AT91_HAS_PATA
 
 config ARCH_AT91SAM9263
 	bool "AT91SAM9263"
@@ -71,6 +77,7 @@ config ARCH_AT91SAM9263
 	select HAVE_NET_MACB
 	select HAVE_AT91_DBGU1
 	select AT91_SAM9_ALT_RESET
+	select AT91_HAS_PATA
 
 config ARCH_AT91SAM9RL
 	bool "AT91SAM9RL"
@@ -80,6 +87,7 @@ config ARCH_AT91SAM9RL
 	select HAVE_FB_ATMEL
 	select HAVE_AT91_DBGU0
 	select AT91_SAM9_ALT_RESET
+	select AT91_HAS_PATA
 
 config ARCH_AT91SAM9G20
 	bool "AT91SAM9G20"
@@ -91,6 +99,7 @@ config ARCH_AT91SAM9G20
 	select HAVE_AT91_USART5
 	select HAVE_NET_MACB
 	select AT91_SAM9_ALT_RESET
+	select AT91_HAS_PATA
 
 config ARCH_AT91SAM9G45
 	bool "AT91SAM9G45"
@@ -101,6 +110,7 @@ config ARCH_AT91SAM9G45
 	select HAVE_NET_MACB
 	select HAVE_AT91_DBGU1
 	select AT91_SAM9G45_RESET
+	select AT91_HAS_PATA
 
 config ARCH_AT91CAP9
 	bool "AT91CAP9"
@@ -110,6 +120,7 @@ config ARCH_AT91CAP9
 	select HAVE_NET_MACB
 	select HAVE_AT91_DBGU1
 	select AT91_SAM9G45_RESET
+	select AT91_HAS_PATA
 
 config ARCH_AT91X40
 	bool "AT91x40"
-- 
1.7.0.4

[PATCH v2 2/2] ata: AT91 ata driver requires AT91_HAS_PATA

[Alan Ott]

This driver uses registers defined in a per-soc header file.
Since not every soc in the at91 platform defines those, make
the Kconfig option dependent on those which define
AT91_HAS_PATA.

This is based on a patch by Arnd Bergmann.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Alan Ott <alan@signal11.us>
CC: Ben Dooks <ben-linux@fluff.org>
---
 drivers/ata/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 6bdedd7..fdb8c90 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -731,6 +731,7 @@ config PATA_AT32
 config PATA_AT91
 	tristate "PATA support for AT91SAM9260"
 	depends on ARM && ARCH_AT91
+	depends on AT91_HAS_PATA
 	help
 	  This option enables support for IDE devices on the Atmel AT91SAM9260 SoC.
 
-- 
1.7.0.4

Re: [PATCH v2 2/2] ata: AT91 ata driver requires AT91_HAS_PATA

[Sergei Shtylyov]

Hello.

On 11-03-2012 1:39, Alan Ott wrote:

> This driver uses registers defined in a per-soc header file.
> Since not every soc in the at91 platform defines those, make
> the Kconfig option dependent on those which define
> AT91_HAS_PATA.

> This is based on a patch by Arnd Bergmann.

> Signed-off-by: Arnd Bergmann<arnd@arndb.de>
> Signed-off-by: Alan Ott<alan@signal11.us>
> CC: Ben Dooks<ben-linux@fluff.org>
> ---
>   drivers/ata/Kconfig |    1 +
>   1 files changed, 1 insertions(+), 0 deletions(-)

> diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
> index 6bdedd7..fdb8c90 100644
> --- a/drivers/ata/Kconfig
> +++ b/drivers/ata/Kconfig
> @@ -731,6 +731,7 @@ config PATA_AT32
>   config PATA_AT91
>   	tristate "PATA support for AT91SAM9260"
>   	depends on ARM && ARCH_AT91

    Is this line still needed?

> +	depends on AT91_HAS_PATA
>   	help
>   	  This option enables support for IDE devices on the Atmel AT91SAM9260 SoC.

WBR, Sergei

Re: [PATCH v2 1/2] ARM: AT91: Add parameter for AT91_HAS_PATA

[Jean-Christophe PLAGNIOL-VILLARD]

On 16:38 Sat 10 Mar     , Alan Ott wrote:
> Not all at91 chips have PATA, this parameter will identify which
> chips do. The determining of which chips support PATA was done
> by Arnd Bergmann.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Alan Ott <alan@signal11.us>
> CC: Ben Dooks <ben-linux@fluff.org>
> ---
>  arch/arm/mach-at91/Kconfig |   11 +++++++++++
>  1 files changed, 11 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
> index 71feb00..9eeeabe 100644
> --- a/arch/arm/mach-at91/Kconfig
> +++ b/arch/arm/mach-at91/Kconfig
> @@ -24,6 +24,9 @@ config AT91_SAM9_ALT_RESET
>  config AT91_SAM9G45_RESET
>  	bool
>  
> +config AT91_HAS_PATA
> +	bool
what is the need for this?

As we switch to DT, I don't want to track the soc list in the Kconfig anymore
if the soc support the PATA will be describe in the DT

Best Regards,
J.

[PATCH v2 1/2] ARM: AT91: Add parameter for AT91_HAS_PATA

[Jean-Christophe PLAGNIOL-VILLARD]

On 16:38 Sat 10 Mar     , Alan Ott wrote:
> Not all at91 chips have PATA, this parameter will identify which
> chips do. The determining of which chips support PATA was done
> by Arnd Bergmann.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Alan Ott <alan@signal11.us>
> CC: Ben Dooks <ben-linux@fluff.org>
> ---
>  arch/arm/mach-at91/Kconfig |   11 +++++++++++
>  1 files changed, 11 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
> index 71feb00..9eeeabe 100644
> --- a/arch/arm/mach-at91/Kconfig
> +++ b/arch/arm/mach-at91/Kconfig
> @@ -24,6 +24,9 @@ config AT91_SAM9_ALT_RESET
>  config AT91_SAM9G45_RESET
>  	bool
>  
> +config AT91_HAS_PATA
> +	bool
what is the need for this?

As we switch to DT, I don't want to track the soc list in the Kconfig anymore
if the soc support the PATA will be describe in the DT

Best Regards,
J.

Re: [PATCH v2 1/2] ARM: AT91: Add parameter for AT91_HAS_PATA

[Arnd Bergmann]

On Sunday 11 March 2012, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > 
> > diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
> > index 71feb00..9eeeabe 100644
> > --- a/arch/arm/mach-at91/Kconfig
> > +++ b/arch/arm/mach-at91/Kconfig
> > @@ -24,6 +24,9 @@ config AT91_SAM9_ALT_RESET
> >  config AT91_SAM9G45_RESET
> >       bool
> >  
> > +config AT91_HAS_PATA
> > +     bool
> what is the need for this?
> 
> As we switch to DT, I don't want to track the soc list in the Kconfig anymore
> if the soc support the PATA will be describe in the DT
> 

When I originally wrote the patch, I was hitting build errors when trying
to enable the at91 pata driver on socs that don't have the right declarations
in their headers. If that has been resolved in a better way already, this
patch can be dropped.

	Arnd

[PATCH v2 1/2] ARM: AT91: Add parameter for AT91_HAS_PATA

[Arnd Bergmann]

On Sunday 11 March 2012, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > 
> > diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
> > index 71feb00..9eeeabe 100644
> > --- a/arch/arm/mach-at91/Kconfig
> > +++ b/arch/arm/mach-at91/Kconfig
> > @@ -24,6 +24,9 @@ config AT91_SAM9_ALT_RESET
> >  config AT91_SAM9G45_RESET
> >       bool
> >  
> > +config AT91_HAS_PATA
> > +     bool
> what is the need for this?
> 
> As we switch to DT, I don't want to track the soc list in the Kconfig anymore
> if the soc support the PATA will be describe in the DT
> 

When I originally wrote the patch, I was hitting build errors when trying
to enable the at91 pata driver on socs that don't have the right declarations
in their headers. If that has been resolved in a better way already, this
patch can be dropped.

	Arnd

Re: [PATCH v2 2/2] ata: AT91 ata driver requires AT91_HAS_PATA

[Jeff Garzik]

On 03/10/2012 04:39 PM, Alan Ott wrote:
> This driver uses registers defined in a per-soc header file.
> Since not every soc in the at91 platform defines those, make
> the Kconfig option dependent on those which define
> AT91_HAS_PATA.
>
> This is based on a patch by Arnd Bergmann.
>
> Signed-off-by: Arnd Bergmann<arnd@arndb.de>
> Signed-off-by: Alan Ott<alan@signal11.us>
> CC: Ben Dooks<ben-linux@fluff.org>
> ---
>   drivers/ata/Kconfig |    1 +
>   1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
> index 6bdedd7..fdb8c90 100644
> --- a/drivers/ata/Kconfig
> +++ b/drivers/ata/Kconfig
> @@ -731,6 +731,7 @@ config PATA_AT32
>   config PATA_AT91
>   	tristate "PATA support for AT91SAM9260"
>   	depends on ARM&&  ARCH_AT91
> +	depends on AT91_HAS_PATA
>   	help

Acked-by: Jeff Garzik <jgarzik@redhat.com>