[U-Boot,1/2] ls1088ardb: Enable USB command RDB qspi-boot

Message ID 1505288964-15071-1-git-send-email-Ashish.Kumar@nxp.com
State New
Delegated to: York Sun
Headers show
Series
  • [U-Boot,1/2] ls1088ardb: Enable USB command RDB qspi-boot
Related show

Commit Message

Ashish Kumar Sept. 13, 2017, 7:49 a.m.
Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
Signed-off-by: Amrita Kumari <amrita.kumari@nxp.com>
---

v1:
Rebased to 
ba39608 ARM: DRA72x: Add support for detection of DRA71x SR 2.1

 arch/arm/dts/fsl-ls1088a.dtsi     | 14 ++++++++++++++
 configs/ls1088ardb_qspi_defconfig |  8 ++++++++
 include/configs/ls1088ardb.h      |  5 +++++
 include/linux/usb/xhci-fsl.h      |  2 +-
 4 files changed, 28 insertions(+), 1 deletion(-)

Comments

Bin Meng Sept. 13, 2017, 8:43 a.m. | #1
On Wed, Sep 13, 2017 at 3:49 PM, Ashish Kumar <Ashish.Kumar@nxp.com> wrote:
> Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
> Signed-off-by: Amrita Kumari <amrita.kumari@nxp.com>
> ---
>
> v1:
> Rebased to
> ba39608 ARM: DRA72x: Add support for detection of DRA71x SR 2.1
>
>  arch/arm/dts/fsl-ls1088a.dtsi     | 14 ++++++++++++++
>  configs/ls1088ardb_qspi_defconfig |  8 ++++++++
>  include/configs/ls1088ardb.h      |  5 +++++
>  include/linux/usb/xhci-fsl.h      |  2 +-
>  4 files changed, 28 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/dts/fsl-ls1088a.dtsi b/arch/arm/dts/fsl-ls1088a.dtsi
> index d943a9e..46ac475 100644
> --- a/arch/arm/dts/fsl-ls1088a.dtsi
> +++ b/arch/arm/dts/fsl-ls1088a.dtsi
> @@ -123,4 +123,18 @@
>                 ranges = <0x81000000 0x0 0x00000000 0x30 0x00020000 0x0 0x00010000   /* downstream I/O */
>                           0x82000000 0x0 0x40000000 0x30 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
>         };
> +
> +       usb0: usb3@3100000 {
> +               compatible = "fsl,layerscape-dwc3";
> +               reg = <0x0 0x3100000 0x0 0x10000>;
> +               interrupts = <0 80 0x4>; /* Level high type */
> +               dr_mode = "host";
> +       };
> +
> +       usb1: usb3@3110000 {
> +               compatible = "fsl,layerscape-dwc3";
> +               reg = <0x0 0x3110000 0x0 0x10000>;
> +               interrupts = <0 81 0x4>; /* Level high type */
> +               dr_mode = "host";
> +       };
>  };
> diff --git a/configs/ls1088ardb_qspi_defconfig b/configs/ls1088ardb_qspi_defconfig
> index 2d5a134..3034f50 100644
> --- a/configs/ls1088ardb_qspi_defconfig
> +++ b/configs/ls1088ardb_qspi_defconfig
> @@ -31,3 +31,11 @@ CONFIG_FSL_DSPI=y
>  CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
>  # CONFIG_DISPLAY_BOARDINFO is not set
>  CONFIG_FSL_LS_PPA=y
> +CONFIG_USB=y
> +CONFIG_USB_GADGET=y
> +CONFIG_CMD_USB=y
> +CONFIG_DM_USB=y
> +CONFIG_USB_XHCI_HCD=y
> +CONFIG_USB_XHCI_DWC3=y
> +CONFIG_USB_DWC3=y
> +CONFIG_USB_STORAGE=y
> diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
> index 3223278..47ee527 100644
> --- a/include/configs/ls1088ardb.h
> +++ b/include/configs/ls1088ardb.h
> @@ -296,6 +296,11 @@
>  #define CONFIG_PHY_GIGE
>  #endif
>
> +/*  USB  */
> +#define CONFIG_HAS_FSL_XHCI_USB
> +#define CONFIG_USB_XHCI_FSL

Please convert this as a Kconfig option.

> +#define CONFIG_USB_MAX_CONTROLLER_COUNT                2

CONFIG_USB_MAX_CONTROLLER_COUNT is not used anywhere in DM USB. Please remove.

> +
>  /*  MMC  */
>  #ifdef CONFIG_MMC
>  #define CONFIG_FSL_ESDHC
> diff --git a/include/linux/usb/xhci-fsl.h b/include/linux/usb/xhci-fsl.h
> index bd54089..a916afb 100644
> --- a/include/linux/usb/xhci-fsl.h
> +++ b/include/linux/usb/xhci-fsl.h
> @@ -58,7 +58,7 @@ struct fsl_xhci {
>  #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_ARCH_LS2080A)
> +#elif defined(CONFIG_ARCH_LS2080A) || defined(CONFIG_ARCH_LS1088A)
>  #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
> --

Regards,
Bin

Patch

diff --git a/arch/arm/dts/fsl-ls1088a.dtsi b/arch/arm/dts/fsl-ls1088a.dtsi
index d943a9e..46ac475 100644
--- a/arch/arm/dts/fsl-ls1088a.dtsi
+++ b/arch/arm/dts/fsl-ls1088a.dtsi
@@ -123,4 +123,18 @@ 
 		ranges = <0x81000000 0x0 0x00000000 0x30 0x00020000 0x0 0x00010000   /* downstream I/O */
 			  0x82000000 0x0 0x40000000 0x30 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
 	};
+
+	usb0: usb3@3100000 {
+		compatible = "fsl,layerscape-dwc3";
+		reg = <0x0 0x3100000 0x0 0x10000>;
+		interrupts = <0 80 0x4>; /* Level high type */
+		dr_mode = "host";
+	};
+
+	usb1: usb3@3110000 {
+		compatible = "fsl,layerscape-dwc3";
+		reg = <0x0 0x3110000 0x0 0x10000>;
+		interrupts = <0 81 0x4>; /* Level high type */
+		dr_mode = "host";
+	};
 };
diff --git a/configs/ls1088ardb_qspi_defconfig b/configs/ls1088ardb_qspi_defconfig
index 2d5a134..3034f50 100644
--- a/configs/ls1088ardb_qspi_defconfig
+++ b/configs/ls1088ardb_qspi_defconfig
@@ -31,3 +31,11 @@  CONFIG_FSL_DSPI=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_FSL_LS_PPA=y
+CONFIG_USB=y
+CONFIG_USB_GADGET=y
+CONFIG_CMD_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_STORAGE=y
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index 3223278..47ee527 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -296,6 +296,11 @@ 
 #define CONFIG_PHY_GIGE
 #endif
 
+/*  USB  */
+#define CONFIG_HAS_FSL_XHCI_USB
+#define CONFIG_USB_XHCI_FSL
+#define CONFIG_USB_MAX_CONTROLLER_COUNT		2
+
 /*  MMC  */
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC
diff --git a/include/linux/usb/xhci-fsl.h b/include/linux/usb/xhci-fsl.h
index bd54089..a916afb 100644
--- a/include/linux/usb/xhci-fsl.h
+++ b/include/linux/usb/xhci-fsl.h
@@ -58,7 +58,7 @@  struct fsl_xhci {
 #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_ARCH_LS2080A)
+#elif defined(CONFIG_ARCH_LS2080A) || defined(CONFIG_ARCH_LS1088A)
 #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