All of lore.kernel.org
 help / color / mirror / Atom feed
From: ben-linux@fluff.org (Ben Dooks)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/8] S3C64xx: fix USB OTG compilation
Date: Mon, 23 Nov 2009 21:34:10 +0000	[thread overview]
Message-ID: <20091123213410.GH4808@trinity.fluff.org> (raw)
In-Reply-To: <b2e8f9f70911200404u61f42858h6651995113935528@mail.gmail.com>

On Fri, Nov 20, 2009 at 01:04:08PM +0100, Maurus Cuelenaere wrote:
> This adds the S3C_VA_USB_HSPHY mapping.

will apply, not sure whether to try another fixes patch or to
add this to -next.
 
> Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
> ---
>  arch/arm/mach-s3c6400/include/mach/map.h |    4 ++++
>  arch/arm/plat-s3c64xx/cpu.c              |    5 +++++
>  2 files changed, 9 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-s3c6400/include/mach/map.h
> b/arch/arm/mach-s3c6400/include/mach/map.h
> index fc8b223..f3b48f8 100644
> --- a/arch/arm/mach-s3c6400/include/mach/map.h
> +++ b/arch/arm/mach-s3c6400/include/mach/map.h
> @@ -64,6 +64,9 @@
> 
>  #define S3C64XX_PA_USBHOST	(0x74300000)
> 
> +#define S3C64XX_PA_USB_HSPHY	(0x7C100000)
> +#define S3C64XX_VA_USB_HSPHY	S3C_ADDR_CPU(0x00200000)
> +
>  /* place VICs close together */
>  #define S3C_VA_VIC0		(S3C_VA_IRQ + 0x00)
>  #define S3C_VA_VIC1		(S3C_VA_IRQ + 0x10000)
> @@ -79,5 +82,6 @@
>  #define S3C_PA_FB		S3C64XX_PA_FB
>  #define S3C_PA_USBHOST		S3C64XX_PA_USBHOST
>  #define S3C_PA_USB_HSOTG	S3C64XX_PA_USB_HSOTG
> +#define S3C_VA_USB_HSPHY	S3C64XX_VA_USB_HSPHY
> 
>  #endif /* __ASM_ARCH_6400_MAP_H */
> diff --git a/arch/arm/plat-s3c64xx/cpu.c b/arch/arm/plat-s3c64xx/cpu.c
> index b1fdd83..49796d2 100644
> --- a/arch/arm/plat-s3c64xx/cpu.c
> +++ b/arch/arm/plat-s3c64xx/cpu.c
> @@ -107,6 +107,11 @@ static struct map_desc s3c_iodesc[] __initdata = {
>  		.pfn		= __phys_to_pfn(S3C64XX_PA_WATCHDOG),
>  		.length		= SZ_4K,
>  		.type		= MT_DEVICE,
> +	}, {
> +		.virtual	= (unsigned long)S3C_VA_USB_HSPHY,
> +		.pfn		= __phys_to_pfn(S3C64XX_PA_USB_HSPHY),
> +		.length		= SZ_1K,
> +		.type		= MT_DEVICE,
>  	},
>  };
> 
> -- 
> 1.6.5.3
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.

      reply	other threads:[~2009-11-23 21:34 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-20 12:04 [PATCH 5/8] S3C64xx: fix USB OTG compilation Maurus Cuelenaere
2009-11-23 21:34 ` Ben Dooks [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=20091123213410.GH4808@trinity.fluff.org \
    --to=ben-linux@fluff.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.