[PATCH 4/6] ARM: S5PV210: Enable USB HSOTG gadget build

Kukjin Kim kgene.kim at samsung.com
Fri Sep 10 06:33:05 EDT 2010


Marek Szyprowski wrote:
> 
> Add the necessary definitions and mapping information to enable the
> s3c-hsotg gadget to build.
> 
> Signed-off-by: Marek Szyprowski <m.szyprowski at samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park at samsung.com>
> ---
>  arch/arm/mach-s5pv210/cpu.c                   |    5 +++++
>  arch/arm/mach-s5pv210/include/mach/map.h      |    6 ++++++
>  arch/arm/mach-s5pv210/include/mach/regs-sys.h |   19
> +++++++++++++++++++
>  3 files changed, 30 insertions(+), 0 deletions(-)
>  create mode 100644 arch/arm/mach-s5pv210/include/mach/regs-sys.h
> 
> diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
> index c551ab1..6183b55 100644
> --- a/arch/arm/mach-s5pv210/cpu.c
> +++ b/arch/arm/mach-s5pv210/cpu.c
> @@ -84,6 +84,11 @@ static struct map_desc s5pv210_iodesc[] __initdata = {
>  		.pfn		= __phys_to_pfn(S5PV210_PA_SROMC),
>  		.length		= SZ_4K,
>  		.type		= MT_DEVICE,
> +	}, {
> +		.virtual	= (unsigned long)S3C_VA_USB_HSPHY,
> +		.pfn		=__phys_to_pfn(S3C_PA_USB_HSPHY),

It's better to use S5PV210_PA_HSPHY directly without re-mapping.
Because don't need S3C_PA_USB_HSPHY except here.

> +		.length		= SZ_4K,
> +		.type		= MT_DEVICE,
>  	}
>  };
> 
> diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-
> s5pv210/include/mach/map.h
> index bd9afd5..724a428 100644
> --- a/arch/arm/mach-s5pv210/include/mach/map.h
> +++ b/arch/arm/mach-s5pv210/include/mach/map.h
> @@ -73,6 +73,9 @@
> 
>  #define S5PV210_PA_HSMMC(x)	(0xEB000000 + ((x) * 0x100000))
> 
> +#define S5PV210_PA_HSOTG	(0xEC000000)
> +#define S5PV210_PA_HSPHY	(0xEC100000)
> +
>  #define S5PV210_PA_VIC0		(0xF2000000)
>  #define S5PV210_PA_VIC1		(0xF2100000)
>  #define S5PV210_PA_VIC2		(0xF2200000)
> @@ -111,6 +114,9 @@
>  #define S5P_PA_FIMC0		S5PV210_PA_FIMC0
>  #define S5P_PA_FIMC1		S5PV210_PA_FIMC1
>  #define S5P_PA_FIMC2		S5PV210_PA_FIMC2
> +#define S3C_PA_USB_HSOTG	S5PV210_PA_HSOTG

IMHO, would be better if we could define S3C_PA_XXX first than S5P_PA_XXX.

> +#define S3C_PA_USB_HSPHY	S5PV210_PA_HSPHY

As I said, no need re-mapping to S3C_PA_USB_HSPHY.

> +#define S3C_VA_USB_HSPHY	S3C_ADDR(0x02000000)
> 
How about moving definition of VA_ to plat/map-s5p.h or plat/map-base.h?
Yeah, I know in the case of s3c64xx, same address mapping is in mach/map.h.

>  #define SAMSUNG_PA_ADC		S5PV210_PA_ADC
>  #define SAMSUNG_PA_CFCON	S5PV210_PA_CFCON
> diff --git a/arch/arm/mach-s5pv210/include/mach/regs-sys.h
b/arch/arm/mach-
> s5pv210/include/mach/regs-sys.h
> new file mode 100644
> index 0000000..26691d3
> --- /dev/null
> +++ b/arch/arm/mach-s5pv210/include/mach/regs-sys.h
> @@ -0,0 +1,19 @@
> +/* arch/arm/mach-s5pv210/include/mach/regs-sys.h
> + *
> + * Copyright (c) 2010 Samsung Electronics Co., Ltd.
> + *		http://www.samsung.com/
> + *
> + * S5PV210 - System registers definitions
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> +*/
> +
> +#define S5PV210_USB_PHY_CON	(S3C_VA_SYS + 0xE80C)
> +#define S5PV210_USB_PHY0_EN	(1 << 0)
> +#define S5PV210_USB_PHY1_EN	(1 << 1)
> +
> +/* compatibility defines for s3c-hsotg driver */
> +#define S3C64XX_OTHERS		S5PV210_USB_PHY_CON
> +#define S3C64XX_OTHERS_USBMASK	S5PV210_USB_PHY0_EN
> --

Others, ok.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim at samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.




More information about the linux-arm-kernel mailing list