[PATCH 3/3] ARM: S3C24XX: update uart addresses in s3c2416-dt auxdata

Kukjin Kim kgene.kim at samsung.com
Tue Jun 18 13:39:10 EDT 2013


On 06/14/13 07:46, Heiko Stübner wrote:
> Commit 9ee51f01eee8 (tty: serial/samsung: make register definitions global)
> removed the S3C2410_PA_UARTX defines that the newly merged s3c2416 dt
> support still expected.
>
> So update mach-s3c2416-dt.c to use the S3C24XX_PA_UART constant
> until we have support for the common clock framework the the s3c2416-dt.
>
OK, applied.

Thanks,
- Kukjin

> Signed-off-by: Heiko Stuebner<heiko at sntech.de>
> ---
>   arch/arm/mach-s3c24xx/mach-s3c2416-dt.c |    8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c b/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c
> index f5c9072..f50454a 100644
> --- a/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c
> +++ b/arch/arm/mach-s3c24xx/mach-s3c2416-dt.c
> @@ -43,13 +43,13 @@
>    * data from the device tree.
>    */
>   static const struct of_dev_auxdata s3c2416_auxdata_lookup[] __initconst = {
> -	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2410_PA_UART0,
> +	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART,
>   				"s3c2440-uart.0", NULL),
> -	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2410_PA_UART1,
> +	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART + 0x4000,
>   				"s3c2440-uart.1", NULL),
> -	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2410_PA_UART2,
> +	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART + 0x8000,
>   				"s3c2440-uart.2", NULL),
> -	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2443_PA_UART3,
> +	OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART + 0xC000,
>   				"s3c2440-uart.3", NULL),
>   	OF_DEV_AUXDATA("samsung,s3c6410-sdhci", S3C_PA_HSMMC0,
>   				"s3c-sdhci.0", NULL),



More information about the linux-arm-kernel mailing list