| Message ID | 1465306174-25746-1-git-send-email-rajesh.bhagat@nxp.com |
|---|---|
| State | Accepted |
| Commit | 9729dc9565c9c1812efbb630e1db4d54f580363c |
| Delegated to: | York Sun |
| Headers | show |
On 06/07/2016 06:29 AM, Rajesh Bhagat wrote: > Remove Soc specific defines and use generic chasis specific defines > for USB controller base address mapping. > > Signed-off-by: Rajesh Bhagat <rajesh.bhagat@nxp.com> > --- > Changes in v2: > - Rebased patch for latest u-boot <snip> > diff --git a/include/linux/usb/xhci-fsl.h b/include/linux/usb/xhci-fsl.h > index 253eddf..199f366 100644 > --- a/include/linux/usb/xhci-fsl.h > +++ b/include/linux/usb/xhci-fsl.h > @@ -51,22 +51,18 @@ struct fsl_xhci { > struct dwc3 *dwc3_reg; > }; > > -#if defined(CONFIG_LS102XA) > -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS102XA_XHCI_USB1_ADDR > +#if defined(CONFIG_LS102XA) || defined(CONFIG_LS1012A) > +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR > #define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 > #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 > #elif defined(CONFIG_LS2080A) > -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS2080A_XHCI_USB1_ADDR > -#define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_LS2080A_XHCI_USB2_ADDR > -#define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 > -#elif defined(CONFIG_LS1043A) || defined(CONFIG_LS1012A) > -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS1043A_XHCI_USB1_ADDR > -#define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_LS1043A_XHCI_USB2_ADDR > -#define CONFIG_SYS_FSL_XHCI_USB3_ADDR CONFIG_SYS_LS1043A_XHCI_USB3_ADDR > -#elif defined(CONFIG_LS1012A) > -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS1043A_XHCI_USB1_ADDR > -#define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 > +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR > +#define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB2_ADDR > #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 > +#elif defined(CONFIG_LS1043A) > +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR > +#define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB2_ADDR > +#define CONFIG_SYS_FSL_XHCI_USB3_ADDR CONFIG_SYS_XHCI_USB3_ADDR > #endif Do you plan to consolidate the above section? York
> -----Original Message----- > From: york sun > Sent: Thursday, June 16, 2016 9:13 PM > To: Rajesh Bhagat <rajesh.bhagat@nxp.com>; u-boot@lists.denx.de > Cc: Qianyu.Gong@freescale.com; Mingkai.hu@freescale.com; > prabhakar@freescale.com > Subject: Re: [PATCH v2] include: usb: Rename USB controller base address mapping > > On 06/07/2016 06:29 AM, Rajesh Bhagat wrote: > > Remove Soc specific defines and use generic chasis specific defines > > for USB controller base address mapping. > > > > Signed-off-by: Rajesh Bhagat <rajesh.bhagat@nxp.com> > > --- > > Changes in v2: > > - Rebased patch for latest u-boot > > > <snip> > > > diff --git a/include/linux/usb/xhci-fsl.h > > b/include/linux/usb/xhci-fsl.h index 253eddf..199f366 100644 > > --- a/include/linux/usb/xhci-fsl.h > > +++ b/include/linux/usb/xhci-fsl.h > > @@ -51,22 +51,18 @@ struct fsl_xhci { > > struct dwc3 *dwc3_reg; > > }; > > > > -#if defined(CONFIG_LS102XA) > > -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR > > CONFIG_SYS_LS102XA_XHCI_USB1_ADDR > > +#if defined(CONFIG_LS102XA) || defined(CONFIG_LS1012A) #define > > +CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR > > #define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 > > #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 > > #elif defined(CONFIG_LS2080A) > > -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR > > CONFIG_SYS_LS2080A_XHCI_USB1_ADDR -#define > > CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_LS2080A_XHCI_USB2_ADDR > > -#define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 -#elif > > defined(CONFIG_LS1043A) || defined(CONFIG_LS1012A) -#define > > CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS1043A_XHCI_USB1_ADDR > > -#define CONFIG_SYS_FSL_XHCI_USB2_ADDR > > CONFIG_SYS_LS1043A_XHCI_USB2_ADDR -#define > > CONFIG_SYS_FSL_XHCI_USB3_ADDR CONFIG_SYS_LS1043A_XHCI_USB3_ADDR - > #elif > > defined(CONFIG_LS1012A) -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR > > CONFIG_SYS_LS1043A_XHCI_USB1_ADDR -#define > > CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 > > +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR > > +#define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB2_ADDR > > #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 > > +#elif defined(CONFIG_LS1043A) > > +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR > > +#define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB2_ADDR > > +#define CONFIG_SYS_FSL_XHCI_USB3_ADDR CONFIG_SYS_XHCI_USB3_ADDR > > #endif Hello York, > > Do you plan to consolidate the above section? > Do you mean making the macro defines common as below? #define CONFIG_SYS_FSL_XHCI_USB1_ADDR 0 #define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 #if defined(CONFIG_LS102XA) || defined(CONFIG_LS1012A) || defined(CONFIG_LS2080A) || defined(CONFIG_LS2085A) || defined(CONFIG_LS1043A) #undef CONFIG_SYS_FSL_XHCI_USB1_ADDR #define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR #endif #if defined(CONFIG_LS2080A) || defined(CONFIG_LS2085A) || defined(CONFIG_LS1043A) #undef CONFIG_SYS_FSL_XHCI_USB2_ADDR #define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB2_ADDR #endif #if defined(CONFIG_LS1043A) #undef CONFIG_SYS_FSL_XHCI_USB3_ADDR #define CONFIG_SYS_FSL_XHCI_USB3_ADDR CONFIG_SYS_XHCI_USB3_ADDR #endif Best Regards, Rajesh Bhagat > York
On 06/16/2016 08:28 PM, Rajesh Bhagat wrote: > > >> -----Original Message----- >> From: york sun >> Sent: Thursday, June 16, 2016 9:13 PM >> To: Rajesh Bhagat <rajesh.bhagat@nxp.com>; u-boot@lists.denx.de >> Cc: Qianyu.Gong@freescale.com; Mingkai.hu@freescale.com; >> prabhakar@freescale.com >> Subject: Re: [PATCH v2] include: usb: Rename USB controller base address mapping >> >> On 06/07/2016 06:29 AM, Rajesh Bhagat wrote: >>> Remove Soc specific defines and use generic chasis specific defines >>> for USB controller base address mapping. >>> >>> Signed-off-by: Rajesh Bhagat <rajesh.bhagat@nxp.com> >>> --- >>> Changes in v2: >>> - Rebased patch for latest u-boot >> >> >> <snip> >> >>> diff --git a/include/linux/usb/xhci-fsl.h >>> b/include/linux/usb/xhci-fsl.h index 253eddf..199f366 100644 >>> --- a/include/linux/usb/xhci-fsl.h >>> +++ b/include/linux/usb/xhci-fsl.h >>> @@ -51,22 +51,18 @@ struct fsl_xhci { >>> struct dwc3 *dwc3_reg; >>> }; >>> >>> -#if defined(CONFIG_LS102XA) >>> -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR >>> CONFIG_SYS_LS102XA_XHCI_USB1_ADDR >>> +#if defined(CONFIG_LS102XA) || defined(CONFIG_LS1012A) #define >>> +CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR >>> #define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 >>> #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 >>> #elif defined(CONFIG_LS2080A) >>> -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR >>> CONFIG_SYS_LS2080A_XHCI_USB1_ADDR -#define >>> CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_LS2080A_XHCI_USB2_ADDR >>> -#define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 -#elif >>> defined(CONFIG_LS1043A) || defined(CONFIG_LS1012A) -#define >>> CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS1043A_XHCI_USB1_ADDR >>> -#define CONFIG_SYS_FSL_XHCI_USB2_ADDR >>> CONFIG_SYS_LS1043A_XHCI_USB2_ADDR -#define >>> CONFIG_SYS_FSL_XHCI_USB3_ADDR CONFIG_SYS_LS1043A_XHCI_USB3_ADDR - >> #elif >>> defined(CONFIG_LS1012A) -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR >>> CONFIG_SYS_LS1043A_XHCI_USB1_ADDR -#define >>> CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 >>> +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR >>> +#define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB2_ADDR >>> #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 >>> +#elif defined(CONFIG_LS1043A) >>> +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR >>> +#define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB2_ADDR >>> +#define CONFIG_SYS_FSL_XHCI_USB3_ADDR CONFIG_SYS_XHCI_USB3_ADDR >>> #endif > > Hello York, > >> >> Do you plan to consolidate the above section? >> > > Do you mean making the macro defines common as below? > > #define CONFIG_SYS_FSL_XHCI_USB1_ADDR 0 > #define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 > #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 > > #if defined(CONFIG_LS102XA) || defined(CONFIG_LS1012A) || defined(CONFIG_LS2080A) > || defined(CONFIG_LS2085A) || defined(CONFIG_LS1043A) > #undef CONFIG_SYS_FSL_XHCI_USB1_ADDR > #define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR > #endif > > #if defined(CONFIG_LS2080A) || defined(CONFIG_LS2085A) || defined(CONFIG_LS1043A) > #undef CONFIG_SYS_FSL_XHCI_USB2_ADDR > #define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB2_ADDR > #endif > > #if defined(CONFIG_LS1043A) > #undef CONFIG_SYS_FSL_XHCI_USB3_ADDR > #define CONFIG_SYS_FSL_XHCI_USB3_ADDR CONFIG_SYS_XHCI_USB3_ADDR > #endif > No. I mean to replace this section as #ifndef CONFIG_SYS_FSL_XHCI_USB1_ADDR #define CONFIG_SYS_FSL_XHCI_USB1_ADDR 0 #endif #ifndef CONFIG_SYS_FSL_XHCI_USB2_ADD #define CONFIG_SYS_FSL_XHCI_USB2_ADD 0 #endif #ifndef CONFIG_SYS_FSL_XHCI_USB3_ADD #define CONFIG_SYS_FSL_XHCI_USB3_ADD 0 #endif Then you don't need to check SoC macros at all. York
> -----Original Message----- > From: york sun > Sent: Friday, June 17, 2016 9:07 AM > To: Rajesh Bhagat <rajesh.bhagat@nxp.com>; u-boot@lists.denx.de > Cc: Qianyu.Gong@freescale.com; Mingkai.hu@freescale.com; > prabhakar@freescale.com > Subject: Re: [PATCH v2] include: usb: Rename USB controller base address mapping > > On 06/16/2016 08:28 PM, Rajesh Bhagat wrote: > > > > > >> -----Original Message----- > >> From: york sun > >> Sent: Thursday, June 16, 2016 9:13 PM > >> To: Rajesh Bhagat <rajesh.bhagat@nxp.com>; u-boot@lists.denx.de > >> Cc: Qianyu.Gong@freescale.com; Mingkai.hu@freescale.com; > >> prabhakar@freescale.com > >> Subject: Re: [PATCH v2] include: usb: Rename USB controller base > >> address mapping > >> > >> On 06/07/2016 06:29 AM, Rajesh Bhagat wrote: > >>> Remove Soc specific defines and use generic chasis specific defines > >>> for USB controller base address mapping. > >>> > >>> Signed-off-by: Rajesh Bhagat <rajesh.bhagat@nxp.com> > >>> --- > >>> Changes in v2: > >>> - Rebased patch for latest u-boot > >> > >> > >> <snip> > >> > >>> diff --git a/include/linux/usb/xhci-fsl.h > >>> b/include/linux/usb/xhci-fsl.h index 253eddf..199f366 100644 > >>> --- a/include/linux/usb/xhci-fsl.h > >>> +++ b/include/linux/usb/xhci-fsl.h > >>> @@ -51,22 +51,18 @@ struct fsl_xhci { > >>> struct dwc3 *dwc3_reg; > >>> }; > >>> > >>> -#if defined(CONFIG_LS102XA) > >>> -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR > >>> CONFIG_SYS_LS102XA_XHCI_USB1_ADDR > >>> +#if defined(CONFIG_LS102XA) || defined(CONFIG_LS1012A) #define > >>> +CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR > >>> #define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 > >>> #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 > >>> #elif defined(CONFIG_LS2080A) > >>> -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR > >>> CONFIG_SYS_LS2080A_XHCI_USB1_ADDR -#define > >>> CONFIG_SYS_FSL_XHCI_USB2_ADDR > CONFIG_SYS_LS2080A_XHCI_USB2_ADDR > >>> -#define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 -#elif > >>> defined(CONFIG_LS1043A) || defined(CONFIG_LS1012A) -#define > >>> CONFIG_SYS_FSL_XHCI_USB1_ADDR > CONFIG_SYS_LS1043A_XHCI_USB1_ADDR > >>> -#define CONFIG_SYS_FSL_XHCI_USB2_ADDR > >>> CONFIG_SYS_LS1043A_XHCI_USB2_ADDR -#define > >>> CONFIG_SYS_FSL_XHCI_USB3_ADDR > CONFIG_SYS_LS1043A_XHCI_USB3_ADDR - > >> #elif > >>> defined(CONFIG_LS1012A) -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR > >>> CONFIG_SYS_LS1043A_XHCI_USB1_ADDR -#define > >>> CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 > >>> +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR > CONFIG_SYS_XHCI_USB1_ADDR > >>> +#define CONFIG_SYS_FSL_XHCI_USB2_ADDR > CONFIG_SYS_XHCI_USB2_ADDR > >>> #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 > >>> +#elif defined(CONFIG_LS1043A) > >>> +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR > CONFIG_SYS_XHCI_USB1_ADDR > >>> +#define CONFIG_SYS_FSL_XHCI_USB2_ADDR > CONFIG_SYS_XHCI_USB2_ADDR > >>> +#define CONFIG_SYS_FSL_XHCI_USB3_ADDR > CONFIG_SYS_XHCI_USB3_ADDR > >>> #endif > > > > Hello York, > > > >> > >> Do you plan to consolidate the above section? > >> > > > > Do you mean making the macro defines common as below? > > > > #define CONFIG_SYS_FSL_XHCI_USB1_ADDR 0 #define > > CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 #define > CONFIG_SYS_FSL_XHCI_USB3_ADDR > > 0 > > > > #if defined(CONFIG_LS102XA) || defined(CONFIG_LS1012A) || > defined(CONFIG_LS2080A) > > || defined(CONFIG_LS2085A) || defined(CONFIG_LS1043A) #undef > > CONFIG_SYS_FSL_XHCI_USB1_ADDR #define > CONFIG_SYS_FSL_XHCI_USB1_ADDR > > CONFIG_SYS_XHCI_USB1_ADDR #endif > > > > #if defined(CONFIG_LS2080A) || defined(CONFIG_LS2085A) || > > defined(CONFIG_LS1043A) #undef CONFIG_SYS_FSL_XHCI_USB2_ADDR #define > > CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB2_ADDR #endif > > > > #if defined(CONFIG_LS1043A) > > #undef CONFIG_SYS_FSL_XHCI_USB3_ADDR > > #define CONFIG_SYS_FSL_XHCI_USB3_ADDR CONFIG_SYS_XHCI_USB3_ADDR > #endif > > Hello York, > > No. I mean to replace this section as > > #ifndef CONFIG_SYS_FSL_XHCI_USB1_ADDR > #define CONFIG_SYS_FSL_XHCI_USB1_ADDR 0 > #endif > #ifndef CONFIG_SYS_FSL_XHCI_USB2_ADD > #define CONFIG_SYS_FSL_XHCI_USB2_ADD 0 > #endif > #ifndef CONFIG_SYS_FSL_XHCI_USB3_ADD > #define CONFIG_SYS_FSL_XHCI_USB3_ADD 0 > #endif > > Then you don't need to check SoC macros at all. > Actually, we are trying to re-use macros defined in chasis specific files for other platform of same chasis i.e. LS1012A. For example, File: arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h Original: #define CONFIG_SYS_LS1043A_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x01f00000) #define CONFIG_SYS_LS1043A_XHCI_USB2_ADDR (CONFIG_SYS_IMMR + 0x02000000) #define CONFIG_SYS_LS1043A_XHCI_USB3_ADDR (CONFIG_SYS_IMMR + 0x02100000) Proposed (Made macros common): #define CONFIG_SYS_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x01f00000) #define CONFIG_SYS_XHCI_USB2_ADDR (CONFIG_SYS_IMMR + 0x02000000) #define CONFIG_SYS_XHCI_USB3_ADDR (CONFIG_SYS_IMMR + 0x02100000) Now, LS1012A has same address as chasis is same but number of USB controllers in only one. Board specific decision for controller count is take in file include/linux/usb/xhci-fsl.h in above code. Hence, if I take implementation suggested by you I need to use Soc specific flags in file arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h which I was trying to avoid. Best Regards, Rajesh Bhagat > York
On 06/16/2016 08:58 PM, Rajesh Bhagat wrote: > > >> -----Original Message----- >> From: york sun >> Sent: Friday, June 17, 2016 9:07 AM >> To: Rajesh Bhagat <rajesh.bhagat@nxp.com>; u-boot@lists.denx.de >> Cc: Qianyu.Gong@freescale.com; Mingkai.hu@freescale.com; >> prabhakar@freescale.com >> Subject: Re: [PATCH v2] include: usb: Rename USB controller base address mapping >> >> On 06/16/2016 08:28 PM, Rajesh Bhagat wrote: >>> >>> >>>> -----Original Message----- >>>> From: york sun >>>> Sent: Thursday, June 16, 2016 9:13 PM >>>> To: Rajesh Bhagat <rajesh.bhagat@nxp.com>; u-boot@lists.denx.de >>>> Cc: Qianyu.Gong@freescale.com; Mingkai.hu@freescale.com; >>>> prabhakar@freescale.com >>>> Subject: Re: [PATCH v2] include: usb: Rename USB controller base >>>> address mapping >>>> >>>> On 06/07/2016 06:29 AM, Rajesh Bhagat wrote: >>>>> Remove Soc specific defines and use generic chasis specific defines >>>>> for USB controller base address mapping. >>>>> >>>>> Signed-off-by: Rajesh Bhagat <rajesh.bhagat@nxp.com> >>>>> --- >>>>> Changes in v2: >>>>> - Rebased patch for latest u-boot >>>> >>>> >>>> <snip> >>>> >>>>> diff --git a/include/linux/usb/xhci-fsl.h >>>>> b/include/linux/usb/xhci-fsl.h index 253eddf..199f366 100644 >>>>> --- a/include/linux/usb/xhci-fsl.h >>>>> +++ b/include/linux/usb/xhci-fsl.h >>>>> @@ -51,22 +51,18 @@ struct fsl_xhci { >>>>> struct dwc3 *dwc3_reg; >>>>> }; >>>>> >>>>> -#if defined(CONFIG_LS102XA) >>>>> -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR >>>>> CONFIG_SYS_LS102XA_XHCI_USB1_ADDR >>>>> +#if defined(CONFIG_LS102XA) || defined(CONFIG_LS1012A) #define >>>>> +CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR >>>>> #define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 >>>>> #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 >>>>> #elif defined(CONFIG_LS2080A) >>>>> -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR >>>>> CONFIG_SYS_LS2080A_XHCI_USB1_ADDR -#define >>>>> CONFIG_SYS_FSL_XHCI_USB2_ADDR >> CONFIG_SYS_LS2080A_XHCI_USB2_ADDR >>>>> -#define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 -#elif >>>>> defined(CONFIG_LS1043A) || defined(CONFIG_LS1012A) -#define >>>>> CONFIG_SYS_FSL_XHCI_USB1_ADDR >> CONFIG_SYS_LS1043A_XHCI_USB1_ADDR >>>>> -#define CONFIG_SYS_FSL_XHCI_USB2_ADDR >>>>> CONFIG_SYS_LS1043A_XHCI_USB2_ADDR -#define >>>>> CONFIG_SYS_FSL_XHCI_USB3_ADDR >> CONFIG_SYS_LS1043A_XHCI_USB3_ADDR - >>>> #elif >>>>> defined(CONFIG_LS1012A) -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR >>>>> CONFIG_SYS_LS1043A_XHCI_USB1_ADDR -#define >>>>> CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 >>>>> +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR >> CONFIG_SYS_XHCI_USB1_ADDR >>>>> +#define CONFIG_SYS_FSL_XHCI_USB2_ADDR >> CONFIG_SYS_XHCI_USB2_ADDR >>>>> #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 >>>>> +#elif defined(CONFIG_LS1043A) >>>>> +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR >> CONFIG_SYS_XHCI_USB1_ADDR >>>>> +#define CONFIG_SYS_FSL_XHCI_USB2_ADDR >> CONFIG_SYS_XHCI_USB2_ADDR >>>>> +#define CONFIG_SYS_FSL_XHCI_USB3_ADDR >> CONFIG_SYS_XHCI_USB3_ADDR >>>>> #endif >>> >>> Hello York, >>> >>>> >>>> Do you plan to consolidate the above section? >>>> >>> >>> Do you mean making the macro defines common as below? >>> >>> #define CONFIG_SYS_FSL_XHCI_USB1_ADDR 0 #define >>> CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 #define >> CONFIG_SYS_FSL_XHCI_USB3_ADDR >>> 0 >>> >>> #if defined(CONFIG_LS102XA) || defined(CONFIG_LS1012A) || >> defined(CONFIG_LS2080A) >>> || defined(CONFIG_LS2085A) || defined(CONFIG_LS1043A) #undef >>> CONFIG_SYS_FSL_XHCI_USB1_ADDR #define >> CONFIG_SYS_FSL_XHCI_USB1_ADDR >>> CONFIG_SYS_XHCI_USB1_ADDR #endif >>> >>> #if defined(CONFIG_LS2080A) || defined(CONFIG_LS2085A) || >>> defined(CONFIG_LS1043A) #undef CONFIG_SYS_FSL_XHCI_USB2_ADDR #define >>> CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB2_ADDR #endif >>> >>> #if defined(CONFIG_LS1043A) >>> #undef CONFIG_SYS_FSL_XHCI_USB3_ADDR >>> #define CONFIG_SYS_FSL_XHCI_USB3_ADDR CONFIG_SYS_XHCI_USB3_ADDR >> #endif >>> > > Hello York, > >> >> No. I mean to replace this section as >> >> #ifndef CONFIG_SYS_FSL_XHCI_USB1_ADDR >> #define CONFIG_SYS_FSL_XHCI_USB1_ADDR 0 >> #endif >> #ifndef CONFIG_SYS_FSL_XHCI_USB2_ADD >> #define CONFIG_SYS_FSL_XHCI_USB2_ADD 0 >> #endif >> #ifndef CONFIG_SYS_FSL_XHCI_USB3_ADD >> #define CONFIG_SYS_FSL_XHCI_USB3_ADD 0 >> #endif >> >> Then you don't need to check SoC macros at all. >> > > Actually, we are trying to re-use macros defined in chasis specific files for other platform > of same chasis i.e. LS1012A. For example, > > File: arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h > > Original: > #define CONFIG_SYS_LS1043A_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x01f00000) > #define CONFIG_SYS_LS1043A_XHCI_USB2_ADDR (CONFIG_SYS_IMMR + 0x02000000) > #define CONFIG_SYS_LS1043A_XHCI_USB3_ADDR (CONFIG_SYS_IMMR + 0x02100000) > > Proposed (Made macros common): > #define CONFIG_SYS_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x01f00000) > #define CONFIG_SYS_XHCI_USB2_ADDR (CONFIG_SYS_IMMR + 0x02000000) > #define CONFIG_SYS_XHCI_USB3_ADDR (CONFIG_SYS_IMMR + 0x02100000) > > Now, LS1012A has same address as chasis is same but number of USB controllers in only one. > Board specific decision for controller count is take in file include/linux/usb/xhci-fsl.h > in above code. > > Hence, if I take implementation suggested by you I need to use Soc specific flags in file > arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h which I was trying to avoid. > OK. You need to use ifdef somewhere. You can keep it your way. York
> -----Original Message----- > From: york sun > Sent: Monday, June 27, 2016 8:58 PM > To: Rajesh Bhagat <rajesh.bhagat@nxp.com>; u-boot@lists.denx.de > Cc: Qianyu.Gong@freescale.com; Mingkai.hu@freescale.com; > prabhakar@freescale.com > Subject: Re: [PATCH v2] include: usb: Rename USB controller base address mapping > > On 06/16/2016 08:58 PM, Rajesh Bhagat wrote: > > > > > >> -----Original Message----- > >> From: york sun > >> Sent: Friday, June 17, 2016 9:07 AM > >> To: Rajesh Bhagat <rajesh.bhagat@nxp.com>; u-boot@lists.denx.de > >> Cc: Qianyu.Gong@freescale.com; Mingkai.hu@freescale.com; > >> prabhakar@freescale.com > >> Subject: Re: [PATCH v2] include: usb: Rename USB controller base > >> address mapping > >> > >> On 06/16/2016 08:28 PM, Rajesh Bhagat wrote: > >>> > >>> > >>>> -----Original Message----- > >>>> From: york sun > >>>> Sent: Thursday, June 16, 2016 9:13 PM > >>>> To: Rajesh Bhagat <rajesh.bhagat@nxp.com>; u-boot@lists.denx.de > >>>> Cc: Qianyu.Gong@freescale.com; Mingkai.hu@freescale.com; > >>>> prabhakar@freescale.com > >>>> Subject: Re: [PATCH v2] include: usb: Rename USB controller base > >>>> address mapping > >>>> > >>>> On 06/07/2016 06:29 AM, Rajesh Bhagat wrote: > >>>>> Remove Soc specific defines and use generic chasis specific > >>>>> defines for USB controller base address mapping. > >>>>> > >>>>> Signed-off-by: Rajesh Bhagat <rajesh.bhagat@nxp.com> > >>>>> --- > >>>>> Changes in v2: > >>>>> - Rebased patch for latest u-boot > >>>> > >>>> > >>>> <snip> > >>>> > >>>>> diff --git a/include/linux/usb/xhci-fsl.h > >>>>> b/include/linux/usb/xhci-fsl.h index 253eddf..199f366 100644 > >>>>> --- a/include/linux/usb/xhci-fsl.h > >>>>> +++ b/include/linux/usb/xhci-fsl.h > >>>>> @@ -51,22 +51,18 @@ struct fsl_xhci { > >>>>> struct dwc3 *dwc3_reg; > >>>>> }; > >>>>> > >>>>> -#if defined(CONFIG_LS102XA) > >>>>> -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR > >>>>> CONFIG_SYS_LS102XA_XHCI_USB1_ADDR > >>>>> +#if defined(CONFIG_LS102XA) || defined(CONFIG_LS1012A) #define > >>>>> +CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR > >>>>> #define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 > >>>>> #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 > >>>>> #elif defined(CONFIG_LS2080A) > >>>>> -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR > >>>>> CONFIG_SYS_LS2080A_XHCI_USB1_ADDR -#define > >>>>> CONFIG_SYS_FSL_XHCI_USB2_ADDR > >> CONFIG_SYS_LS2080A_XHCI_USB2_ADDR > >>>>> -#define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 -#elif > >>>>> defined(CONFIG_LS1043A) || defined(CONFIG_LS1012A) -#define > >>>>> CONFIG_SYS_FSL_XHCI_USB1_ADDR > >> CONFIG_SYS_LS1043A_XHCI_USB1_ADDR > >>>>> -#define CONFIG_SYS_FSL_XHCI_USB2_ADDR > >>>>> CONFIG_SYS_LS1043A_XHCI_USB2_ADDR -#define > >>>>> CONFIG_SYS_FSL_XHCI_USB3_ADDR > >> CONFIG_SYS_LS1043A_XHCI_USB3_ADDR - > >>>> #elif > >>>>> defined(CONFIG_LS1012A) -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR > >>>>> CONFIG_SYS_LS1043A_XHCI_USB1_ADDR -#define > >>>>> CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 > >>>>> +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR > >> CONFIG_SYS_XHCI_USB1_ADDR > >>>>> +#define CONFIG_SYS_FSL_XHCI_USB2_ADDR > >> CONFIG_SYS_XHCI_USB2_ADDR > >>>>> #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 > >>>>> +#elif defined(CONFIG_LS1043A) > >>>>> +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR > >> CONFIG_SYS_XHCI_USB1_ADDR > >>>>> +#define CONFIG_SYS_FSL_XHCI_USB2_ADDR > >> CONFIG_SYS_XHCI_USB2_ADDR > >>>>> +#define CONFIG_SYS_FSL_XHCI_USB3_ADDR > >> CONFIG_SYS_XHCI_USB3_ADDR > >>>>> #endif > >>> > >>> Hello York, > >>> > >>>> > >>>> Do you plan to consolidate the above section? > >>>> > >>> > >>> Do you mean making the macro defines common as below? > >>> > >>> #define CONFIG_SYS_FSL_XHCI_USB1_ADDR 0 #define > >>> CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 #define > >> CONFIG_SYS_FSL_XHCI_USB3_ADDR > >>> 0 > >>> > >>> #if defined(CONFIG_LS102XA) || defined(CONFIG_LS1012A) || > >> defined(CONFIG_LS2080A) > >>> || defined(CONFIG_LS2085A) || defined(CONFIG_LS1043A) #undef > >>> CONFIG_SYS_FSL_XHCI_USB1_ADDR #define > >> CONFIG_SYS_FSL_XHCI_USB1_ADDR > >>> CONFIG_SYS_XHCI_USB1_ADDR #endif > >>> > >>> #if defined(CONFIG_LS2080A) || defined(CONFIG_LS2085A) || > >>> defined(CONFIG_LS1043A) #undef CONFIG_SYS_FSL_XHCI_USB2_ADDR > #define > >>> CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB2_ADDR #endif > >>> > >>> #if defined(CONFIG_LS1043A) > >>> #undef CONFIG_SYS_FSL_XHCI_USB3_ADDR #define > >>> CONFIG_SYS_FSL_XHCI_USB3_ADDR CONFIG_SYS_XHCI_USB3_ADDR > >> #endif > >>> > > > > Hello York, > > > >> > >> No. I mean to replace this section as > >> > >> #ifndef CONFIG_SYS_FSL_XHCI_USB1_ADDR #define > >> CONFIG_SYS_FSL_XHCI_USB1_ADDR 0 #endif #ifndef > >> CONFIG_SYS_FSL_XHCI_USB2_ADD #define CONFIG_SYS_FSL_XHCI_USB2_ADD > 0 > >> #endif #ifndef CONFIG_SYS_FSL_XHCI_USB3_ADD #define > >> CONFIG_SYS_FSL_XHCI_USB3_ADD 0 #endif > >> > >> Then you don't need to check SoC macros at all. > >> > > > > Actually, we are trying to re-use macros defined in chasis specific > > files for other platform of same chasis i.e. LS1012A. For example, > > > > File: arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h > > > > Original: > > #define CONFIG_SYS_LS1043A_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + > 0x01f00000) > > #define CONFIG_SYS_LS1043A_XHCI_USB2_ADDR (CONFIG_SYS_IMMR + > 0x02000000) > > #define CONFIG_SYS_LS1043A_XHCI_USB3_ADDR (CONFIG_SYS_IMMR + > 0x02100000) > > > > Proposed (Made macros common): > > #define CONFIG_SYS_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + > 0x01f00000) > > #define CONFIG_SYS_XHCI_USB2_ADDR (CONFIG_SYS_IMMR + > 0x02000000) > > #define CONFIG_SYS_XHCI_USB3_ADDR (CONFIG_SYS_IMMR + > 0x02100000) > > > > Now, LS1012A has same address as chasis is same but number of USB controllers in > only one. > > Board specific decision for controller count is take in file > > include/linux/usb/xhci-fsl.h in above code. > > > > Hence, if I take implementation suggested by you I need to use Soc > > specific flags in file arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h which > I was trying to avoid. > > Hello York, > > OK. You need to use ifdef somewhere. You can keep it your way. Are you planning to pick this? > > York Best Regards, Rajesh Bhagat
On 07/08/2016 10:02 PM, Rajesh Bhagat wrote: > >>> > > Hello York, > >> >> OK. You need to use ifdef somewhere. You can keep it your way. > > Are you planning to pick this? > Yes, I will pick it after 07 release. York
On 06/07/2016 06:29 AM, Rajesh Bhagat wrote: > Remove Soc specific defines and use generic chasis specific defines > for USB controller base address mapping. > > Signed-off-by: Rajesh Bhagat <rajesh.bhagat@nxp.com> > --- > Changes in v2: > - Rebased patch for latest u-boot > > .../include/asm/arch-fsl-layerscape/immap_lsch2.h | 6 +++--- > .../include/asm/arch-fsl-layerscape/immap_lsch3.h | 4 ++-- > arch/arm/include/asm/arch-ls102xa/config.h | 6 ++---- > include/linux/usb/xhci-fsl.h | 20 ++++++++------------ > include/usb/ehci-ci.h | 2 +- > 5 files changed, 16 insertions(+), 22 deletions(-) Applied to fsl-qoriq master. Awaiting upstream. Thanks. York
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h index e98e055..0c87c2f 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h @@ -31,9 +31,9 @@ #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR + 0x011c0600) #define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_IMMR + 0x011d0500) #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_IMMR + 0x011d0600) -#define CONFIG_SYS_LS1043A_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x01f00000) -#define CONFIG_SYS_LS1043A_XHCI_USB2_ADDR (CONFIG_SYS_IMMR + 0x02000000) -#define CONFIG_SYS_LS1043A_XHCI_USB3_ADDR (CONFIG_SYS_IMMR + 0x02100000) +#define CONFIG_SYS_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x01f00000) +#define CONFIG_SYS_XHCI_USB2_ADDR (CONFIG_SYS_IMMR + 0x02000000) +#define CONFIG_SYS_XHCI_USB3_ADDR (CONFIG_SYS_IMMR + 0x02100000) #define CONFIG_SYS_PCIE1_ADDR (CONFIG_SYS_IMMR + 0x2400000) #define CONFIG_SYS_PCIE2_ADDR (CONFIG_SYS_IMMR + 0x2500000) #define CONFIG_SYS_PCIE3_ADDR (CONFIG_SYS_IMMR + 0x2600000) diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h index 65b3357..2dc9e5c 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h @@ -51,8 +51,8 @@ #define I2C3_BASE_ADDR (CONFIG_SYS_IMMR + 0x01020000) #define I2C4_BASE_ADDR (CONFIG_SYS_IMMR + 0x01030000) -#define CONFIG_SYS_LS2080A_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x02100000) -#define CONFIG_SYS_LS2080A_XHCI_USB2_ADDR (CONFIG_SYS_IMMR + 0x02110000) +#define CONFIG_SYS_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x02100000) +#define CONFIG_SYS_XHCI_USB2_ADDR (CONFIG_SYS_IMMR + 0x02110000) /* TZ Address Space Controller Definitions */ #define TZASC1_BASE 0x01100000 /* as per CCSR map. */ diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h index 04abec4..67a4311 100644 --- a/arch/arm/include/asm/arch-ls102xa/config.h +++ b/arch/arm/include/asm/arch-ls102xa/config.h @@ -35,13 +35,11 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR + 0x011c0500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR + 0x011d0500) #define CONFIG_SYS_DCU_ADDR (CONFIG_SYS_IMMR + 0x01ce0000) -#define CONFIG_SYS_LS102XA_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x02100000) -#define CONFIG_SYS_LS102XA_USB1_ADDR \ - (CONFIG_SYS_IMMR + CONFIG_SYS_LS102XA_USB1_OFFSET) +#define CONFIG_SYS_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x02100000) +#define CONFIG_SYS_EHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x07600000) #define CONFIG_SYS_FSL_SEC_OFFSET 0x00700000 #define CONFIG_SYS_FSL_JR0_OFFSET 0x00710000 -#define CONFIG_SYS_LS102XA_USB1_OFFSET 0x07600000 #define CONFIG_SYS_TSEC1_OFFSET 0x01d10000 #define CONFIG_SYS_TSEC2_OFFSET 0x01d50000 #define CONFIG_SYS_TSEC3_OFFSET 0x01d90000 diff --git a/include/linux/usb/xhci-fsl.h b/include/linux/usb/xhci-fsl.h index 253eddf..199f366 100644 --- a/include/linux/usb/xhci-fsl.h +++ b/include/linux/usb/xhci-fsl.h @@ -51,22 +51,18 @@ struct fsl_xhci { struct dwc3 *dwc3_reg; }; -#if defined(CONFIG_LS102XA) -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS102XA_XHCI_USB1_ADDR +#if defined(CONFIG_LS102XA) || defined(CONFIG_LS1012A) +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR #define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 #elif defined(CONFIG_LS2080A) -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS2080A_XHCI_USB1_ADDR -#define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_LS2080A_XHCI_USB2_ADDR -#define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 -#elif defined(CONFIG_LS1043A) || defined(CONFIG_LS1012A) -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS1043A_XHCI_USB1_ADDR -#define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_LS1043A_XHCI_USB2_ADDR -#define CONFIG_SYS_FSL_XHCI_USB3_ADDR CONFIG_SYS_LS1043A_XHCI_USB3_ADDR -#elif defined(CONFIG_LS1012A) -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS1043A_XHCI_USB1_ADDR -#define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR +#define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB2_ADDR #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 +#elif defined(CONFIG_LS1043A) +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR +#define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB2_ADDR +#define CONFIG_SYS_FSL_XHCI_USB3_ADDR CONFIG_SYS_XHCI_USB3_ADDR #endif #define FSL_USB_XHCI_ADDR {CONFIG_SYS_FSL_XHCI_USB1_ADDR, \ diff --git a/include/usb/ehci-ci.h b/include/usb/ehci-ci.h index 586d32a..882aed4 100644 --- a/include/usb/ehci-ci.h +++ b/include/usb/ehci-ci.h @@ -160,7 +160,7 @@ #define CONFIG_SYS_FSL_USB1_ADDR CONFIG_SYS_MPC512x_USB1_ADDR #define CONFIG_SYS_FSL_USB2_ADDR 0 #elif defined(CONFIG_LS102XA) -#define CONFIG_SYS_FSL_USB1_ADDR CONFIG_SYS_LS102XA_USB1_ADDR +#define CONFIG_SYS_FSL_USB1_ADDR CONFIG_SYS_EHCI_USB1_ADDR #define CONFIG_SYS_FSL_USB2_ADDR 0 #endif
Remove Soc specific defines and use generic chasis specific defines for USB controller base address mapping. Signed-off-by: Rajesh Bhagat <rajesh.bhagat@nxp.com> --- Changes in v2: - Rebased patch for latest u-boot .../include/asm/arch-fsl-layerscape/immap_lsch2.h | 6 +++--- .../include/asm/arch-fsl-layerscape/immap_lsch3.h | 4 ++-- arch/arm/include/asm/arch-ls102xa/config.h | 6 ++---- include/linux/usb/xhci-fsl.h | 20 ++++++++------------ include/usb/ehci-ci.h | 2 +- 5 files changed, 16 insertions(+), 22 deletions(-)