[U-Boot] [PATCH v2] include: usb: Rename USB controller base address mapping

[york sun]

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 at 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