Patchwork [U-Boot] powerpc/83xx: Define USB1 and USB2 base addr for MPC834x

login
register
mail settings
Submitter ramneek mehresh
Date Oct. 19, 2013, 2:03 p.m.
Message ID <1382191384-1935-1-git-send-email-ramneek.mehresh@freescale.com>
Download mbox | patch
Permalink /patch/284875/
State Accepted
Delegated to: York Sun
Headers show

Comments

ramneek mehresh - Oct. 19, 2013, 2:03 p.m.
Define base addresse for both MPH(USB1) and DR(USB2) controllers
for MPC834x socs

Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
---
 arch/powerpc/include/asm/immap_83xx.h | 5 +++++
 1 file changed, 5 insertions(+)
York Sun - Oct. 21, 2013, 4:21 p.m.
Kim,

I can take this in if you ack it.

York


On 10/19/2013 07:03 AM, Ramneek Mehresh wrote:
> Define base addresse for both MPH(USB1) and DR(USB2) controllers
> for MPC834x socs
> 
> Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
> ---
>  arch/powerpc/include/asm/immap_83xx.h | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/arch/powerpc/include/asm/immap_83xx.h b/arch/powerpc/include/asm/immap_83xx.h
> index 3c86ff6..289f7ca 100644
> --- a/arch/powerpc/include/asm/immap_83xx.h
> +++ b/arch/powerpc/include/asm/immap_83xx.h
> @@ -763,6 +763,7 @@ typedef struct immap {
>  	u8			res7[0xC0000];
>  } immap_t;
>  
> +#ifndef	CONFIG_MPC834x
>  #ifdef CONFIG_HAS_FSL_MPH_USB
>  #define CONFIG_SYS_MPC83xx_USB1_OFFSET  0x22000	/* use the MPH controller */
>  #define CONFIG_SYS_MPC83xx_USB2_OFFSET	0
> @@ -770,6 +771,10 @@ typedef struct immap {
>  #define CONFIG_SYS_MPC83xx_USB1_OFFSET	0
>  #define CONFIG_SYS_MPC83xx_USB2_OFFSET  0x23000	/* use the DR controller */
>  #endif
> +#else
> +#define CONFIG_SYS_MPC83xx_USB1_OFFSET	0x22000
> +#define CONFIG_SYS_MPC83xx_USB2_OFFSET  0x23000
> +#endif
>  
>  #elif defined(CONFIG_MPC8313)
>  typedef struct immap {
>
York Sun - Nov. 13, 2013, 10:45 p.m.
On Oct 19, 2013, at 7:03 AM, Ramneek Mehresh wrote:

> Define base addresse for both MPH(USB1) and DR(USB2) controllers
> for MPC834x socs
> 
> Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>


Applied to u-boot-mpc85xx/master.

York

Patch

diff --git a/arch/powerpc/include/asm/immap_83xx.h b/arch/powerpc/include/asm/immap_83xx.h
index 3c86ff6..289f7ca 100644
--- a/arch/powerpc/include/asm/immap_83xx.h
+++ b/arch/powerpc/include/asm/immap_83xx.h
@@ -763,6 +763,7 @@  typedef struct immap {
 	u8			res7[0xC0000];
 } immap_t;
 
+#ifndef	CONFIG_MPC834x
 #ifdef CONFIG_HAS_FSL_MPH_USB
 #define CONFIG_SYS_MPC83xx_USB1_OFFSET  0x22000	/* use the MPH controller */
 #define CONFIG_SYS_MPC83xx_USB2_OFFSET	0
@@ -770,6 +771,10 @@  typedef struct immap {
 #define CONFIG_SYS_MPC83xx_USB1_OFFSET	0
 #define CONFIG_SYS_MPC83xx_USB2_OFFSET  0x23000	/* use the DR controller */
 #endif
+#else
+#define CONFIG_SYS_MPC83xx_USB1_OFFSET	0x22000
+#define CONFIG_SYS_MPC83xx_USB2_OFFSET  0x23000
+#endif
 
 #elif defined(CONFIG_MPC8313)
 typedef struct immap {