From: nicolas.ferre@atmel•com (Nicolas Ferre)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 1/1] atmel: move ATMEL_MAX_UART to platform_data/atmel.h
Date: Mon, 19 Nov 2012 10:09:52 +0100 [thread overview]
Message-ID: <50A9F760.4050207@atmel.com> (raw)
In-Reply-To: <1353189906-1767-1-git-send-email-plagnioj@jcrosoft.com>
On 11/17/2012 11:05 PM, Jean-Christophe PLAGNIOL-VILLARD :
> use 7 for it as the sam9260 or the sam9g25 have 7 of them DBGU included
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft•com>
> Cc: Nicolas Ferre <nicolas.ferre@atmel•com>
> ---
> arch/arm/mach-at91/include/mach/hardware.h | 3 ---
> arch/avr32/mach-at32ap/include/mach/board.h | 1 -
> include/linux/platform_data/atmel.h | 6 ++++++
> 3 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-at91/include/mach/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h
> index 711a789..a832e07 100644
> --- a/arch/arm/mach-at91/include/mach/hardware.h
> +++ b/arch/arm/mach-at91/include/mach/hardware.h
> @@ -90,9 +90,6 @@
> #define AT91_SRAM_MAX SZ_1M
> #define AT91_VIRT_BASE (AT91_IO_VIRT_BASE - AT91_SRAM_MAX)
>
> -/* Serial ports */
> -#define ATMEL_MAX_UART 7 /* 6 USART3's and one DBGU port (SAM9260) */
> -
> /* External Memory Map */
> #define AT91_CHIPSELECT_0 0x10000000
> #define AT91_CHIPSELECT_1 0x20000000
> diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h
> index dca9345..d485b03 100644
> --- a/arch/avr32/mach-at32ap/include/mach/board.h
> +++ b/arch/avr32/mach-at32ap/include/mach/board.h
> @@ -26,7 +26,6 @@ static inline void __deprecated at32_add_system_devices(void)
>
> }
>
> -#define ATMEL_MAX_UART 4
> extern struct platform_device *atmel_default_console_device;
>
> /* Flags for selecting USART extra pins */
> diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h
> index dbd6d53..59fffa4 100644
> --- a/include/linux/platform_data/atmel.h
> +++ b/include/linux/platform_data/atmel.h
> @@ -19,6 +19,12 @@
> #include <linux/serial.h>
> #include <linux/platform_data/macb.h>
>
> +/*
> + * at91: 6 USART3's and one DBGU port (SAM9260)
Why the "3"?
> + * avr32: 4
> + */
> +#define ATMEL_MAX_UART 7
> +
> /* USB Device */
> struct at91_udc_data {
> int vbus_pin; /* high == host powering us */
>
Ok otherwise. Do not bother, I may change the typo while including it in
at91-fixes pull request...
Acked-by: Nicolas Ferre <nicolas.ferre@atmel•com>
Best regards,
--
Nicolas Ferre
prev parent reply other threads:[~2012-11-19 9:09 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-07 11:12 arm: at91: mach header cleanup Jean-Christophe PLAGNIOL-VILLARD
2012-11-07 11:22 ` [PATCH 01/10] arm: at91: drop machine defconfig Jean-Christophe PLAGNIOL-VILLARD
2012-11-07 11:22 ` [PATCH 02/10] arm: at91: move platfarm_data to include/linux/platform_data/atmel.h Jean-Christophe PLAGNIOL-VILLARD
2012-11-07 12:20 ` Marc Kleine-Budde
2012-11-10 8:42 ` Dmitry Torokhov
2012-11-10 10:54 ` Joachim Eastwood
2012-11-12 14:06 ` Jean-Christophe PLAGNIOL-VILLARD
2012-11-07 11:22 ` [PATCH 03/10] arm: at91 move board.h to arch/arm/mach-at91 Jean-Christophe PLAGNIOL-VILLARD
2012-11-07 11:22 ` [PATCH 04/10] arm: at91 move at91_aic.h " Jean-Christophe PLAGNIOL-VILLARD
2012-11-07 11:22 ` [PATCH 05/10] arn: at91: move at91_tc.h " Jean-Christophe PLAGNIOL-VILLARD
2012-11-12 10:57 ` Nicolas Ferre
2012-11-07 11:22 ` [PATCH 06/10] arm: at91: move board header " Jean-Christophe PLAGNIOL-VILLARD
2012-11-07 11:22 ` [PATCH 07/10] arm: at91: move at91_shdwc.h " Jean-Christophe PLAGNIOL-VILLARD
2012-11-07 11:22 ` [PATCH 08/10] arm: at91: move pit define to the driver Jean-Christophe PLAGNIOL-VILLARD
2012-11-07 11:22 ` [PATCH 09/10] arm: at91: move reset controller header to arm/arm/mach-at91 Jean-Christophe PLAGNIOL-VILLARD
2012-11-07 11:22 ` [PATCH 10/10] arm: at91: move at91rm9200 rtc header in drivers/rtc Jean-Christophe PLAGNIOL-VILLARD
2012-11-12 21:47 ` arm: at91: mach header cleanup Arnd Bergmann
2012-11-17 15:32 ` Joachim Eastwood
2012-11-17 22:02 ` Jean-Christophe PLAGNIOL-VILLARD
2012-11-17 22:05 ` [PATCH 1/1] atmel: move ATMEL_MAX_UART to platform_data/atmel.h Jean-Christophe PLAGNIOL-VILLARD
2012-11-19 9:09 ` Nicolas Ferre [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50A9F760.4050207@atmel.com \
--to=nicolas.ferre@atmel$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox