arm64: layerscape: Move CONFIG_HAS_FSL_XHCI_USB to Kconfig
Subsystems (2)
PATCH v4 1/5 arm64: layerscape: Move CONFIG_HAS_FSL_XHCI_USB to Kconfig
Use Kconfig to select QE-HDLC and USB pin-mux.
---
Change in v4:
Typo correction.
Change in v3:
New patch file.
arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 7 +++++++ include/configs/ls1012afrdm.h | 4 ---- include/configs/ls1012aqds.h | 4 ---- include/configs/ls1012ardb.h | 4 ---- include/configs/ls1021aiot.h | 4 ---- include/configs/ls1021aqds.h | 4 ---- include/configs/ls1021atwr.h | 4 ---- include/configs/ls1043aqds.h | 3 --- include/configs/ls1043ardb.h | 3 --- include/configs/ls1046aqds.h | 3 --- include/configs/ls1046ardb.h | 3 --- include/configs/ls2080aqds.h | 1 - include/configs/ls2080ardb.h | 1 - scripts/config_whitelist.txt | 1 - 14 files changed, 7 insertions(+), 39 deletions(-)
arch/arm/cpu/armv8/fsl-layerscape/Kconfig +7 -0
@@ -489,3 +489,10 @@ config SYS_MC_RSV_MEM_ALIGN config SPL_LDSCRIPT default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARCH_LS1043A || ARCH_LS1046A || ARCH_LS2080A + +config HAS_FSL_XHCI_USB + bool + default y if ARCH_LS1043A || ARCH_LS1046A + help + For some SoC(such as LS1043A and LS1046A), USB and QE-HDLC multiplex use + pins, select it when the pins are assigned to USB.
include/configs/ls1012afrdm.h +0 -4
@@ -34,12 +34,8 @@/* * USB */ -#define CONFIG_HAS_FSL_XHCI_USB - -#ifdef CONFIG_HAS_FSL_XHCI_USB #define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#endif #define CONFIG_CMD_MEMINFO #define CONFIG_CMD_MEMTEST
include/configs/ls1012aqds.h +0 -4
@@ -119,12 +119,8 @@#endif /*XHCI Support - enabled by default*/ -#define CONFIG_HAS_FSL_XHCI_USB - -#ifdef CONFIG_HAS_FSL_XHCI_USB #define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#endif /* MMC */ #ifdef CONFIG_MMC
include/configs/ls1012ardb.h +0 -4
@@ -22,12 +22,8 @@/* * USB */ -#define CONFIG_HAS_FSL_XHCI_USB - -#ifdef CONFIG_HAS_FSL_XHCI_USB #define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#endif /* * I2C IO expander
include/configs/ls1021aiot.h +0 -4
@@ -20,12 +20,8 @@#define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE/* XHCI Support - enabled by default */ -#define CONFIG_HAS_FSL_XHCI_USB - -#ifdef CONFIG_HAS_FSL_XHCI_USB #define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#endif #define CONFIG_SYS_CLK_FREQ 100000000#define CONFIG_DDR_CLK_FREQ 100000000
include/configs/ls1021aqds.h +0 -4
@@ -405,12 +405,8 @@ unsigned long get_board_ddr_clk(void);#endif /*XHCI Support - enabled by default*/ -#define CONFIG_HAS_FSL_XHCI_USB - -#ifdef CONFIG_HAS_FSL_XHCI_USB #define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#endif /* * Video
include/configs/ls1021atwr.h +0 -4
@@ -45,12 +45,8 @@#endif /* XHCI Support - enabled by default */ -#define CONFIG_HAS_FSL_XHCI_USB - -#ifdef CONFIG_HAS_FSL_XHCI_USB #define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#endif #define CONFIG_SYS_CLK_FREQ 100000000#define CONFIG_DDR_CLK_FREQ 100000000
include/configs/ls1043aqds.h +0 -3
@@ -371,11 +371,8 @@ unsigned long get_board_ddr_clk(void);#endif /* USB */ -#define CONFIG_HAS_FSL_XHCI_USB -#ifdef CONFIG_HAS_FSL_XHCI_USB #define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 -#endif /* * Miscellaneous configurable options
include/configs/ls1043ardb.h +0 -3
@@ -281,12 +281,9 @@/* USB */ #ifndef SPL_NO_USB -#define CONFIG_HAS_FSL_XHCI_USB -#ifdef CONFIG_HAS_FSL_XHCI_USB #define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 3#endif -#endif /* SATA */ #ifndef SPL_NO_SATA
include/configs/ls1046aqds.h +0 -3
@@ -137,11 +137,8 @@ unsigned long get_board_ddr_clk(void);#endif /* USB */ -#define CONFIG_HAS_FSL_XHCI_USB -#ifdef CONFIG_HAS_FSL_XHCI_USB #define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 -#endif /* SATA */ #define CONFIG_LIBATA
include/configs/ls1046ardb.h +0 -3
@@ -211,12 +211,9 @@/* USB */ #ifndef SPL_NO_USB -#define CONFIG_HAS_FSL_XHCI_USB -#ifdef CONFIG_HAS_FSL_XHCI_USB #define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 3#endif -#endif /* SATA */ #ifndef SPL_NO_SATA
include/configs/ls2080aqds.h +0 -1
@@ -439,7 +439,6 @@ unsigned long get_board_ddr_clk(void);/* * USB */ -#define CONFIG_HAS_FSL_XHCI_USB #define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
include/configs/ls2080ardb.h +0 -1
@@ -336,7 +336,6 @@ unsigned long get_board_sys_clk(void);/* * USB */ -#define CONFIG_HAS_FSL_XHCI_USB #define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
scripts/config_whitelist.txt +0 -1
@@ -887,7 +887,6 @@ CONFIG_HAS_ETH7 CONFIG_HAS_FEC CONFIG_HAS_FSL_DR_USB CONFIG_HAS_FSL_MPH_USB -CONFIG_HAS_FSL_XHCI_USB CONFIG_HAS_POST CONFIG_HCLK_FREQ CONFIG_HDBOOT
Signature · 1 line
2.14.1
PATCH v4 2/5 usb: host: Move CONFIG_XHCI_FSL to Kconfig
use Kconfig to select xhci accordingly.
---
Change in v4:
Typo correction.
Change in v3:
New patch file.
drivers/usb/host/Kconfig | 6 ++++++ include/configs/ls1012afrdm.h | 1 - include/configs/ls1012aqds.h | 1 - include/configs/ls1012ardb.h | 1 - include/configs/ls1021aiot.h | 1 - include/configs/ls1021aqds.h | 1 - include/configs/ls1021atwr.h | 1 - include/configs/ls1043aqds.h | 1 - include/configs/ls1043ardb.h | 1 - include/configs/ls1046aqds.h | 1 - include/configs/ls1046ardb.h | 1 - include/configs/ls2080aqds.h | 1 - include/configs/ls2080ardb.h | 1 - scripts/config_whitelist.txt | 1 - 14 files changed, 6 insertions(+), 13 deletions(-)
drivers/usb/host/Kconfig +6 -0
@@ -71,6 +71,12 @@ config USB_XHCI_DRA7XX_INDEX Select the DRA7XX xHCI USB index. Current supported values: 0, 1. +config USB_XHCI_FSL + bool "Support for NXP Layerscape on-chip xHCI USB controller" + default y if ARCH_LS1021A || FSL_LSCH3 || FSL_LSCH2 + depends on !SPL_NO_USB + help + Enables support for the on-chip xHCI controller on NXP Layerscape SoCs. endif # USB_XHCI_HCD config USB_EHCI_HCD
include/configs/ls1012afrdm.h +0 -1
@@ -34,7 +34,6 @@/* * USB */ -#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 1#define CONFIG_CMD_MEMINFO
include/configs/ls1012aqds.h +0 -1
@@ -119,7 +119,6 @@#endif /*XHCI Support - enabled by default*/ -#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 1/* MMC */
include/configs/ls1012ardb.h +0 -1
@@ -22,7 +22,6 @@/* * USB */ -#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 1/*
include/configs/ls1021aiot.h +0 -1
@@ -20,7 +20,6 @@#define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE/* XHCI Support - enabled by default */ -#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 1#define CONFIG_SYS_CLK_FREQ 100000000
include/configs/ls1021aqds.h +0 -1
@@ -405,7 +405,6 @@ unsigned long get_board_ddr_clk(void);#endif /*XHCI Support - enabled by default*/ -#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 1/*
include/configs/ls1021atwr.h +0 -1
@@ -45,7 +45,6 @@#endif /* XHCI Support - enabled by default */ -#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 1#define CONFIG_SYS_CLK_FREQ 100000000
include/configs/ls1043aqds.h +0 -1
@@ -371,7 +371,6 @@ unsigned long get_board_ddr_clk(void);#endif /* USB */ -#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 3/*
include/configs/ls1043ardb.h +0 -1
@@ -281,7 +281,6 @@/* USB */ #ifndef SPL_NO_USB -#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 3#endif
include/configs/ls1046aqds.h +0 -1
@@ -137,7 +137,6 @@ unsigned long get_board_ddr_clk(void);#endif /* USB */ -#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 3/* SATA */
include/configs/ls1046ardb.h +0 -1
@@ -211,7 +211,6 @@/* USB */ #ifndef SPL_NO_USB -#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 3#endif
include/configs/ls2080aqds.h +0 -1
@@ -439,7 +439,6 @@ unsigned long get_board_ddr_clk(void);/* * USB */ -#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 2#include <asm/fsl_secure_boot.h>
include/configs/ls2080ardb.h +0 -1
@@ -336,7 +336,6 @@ unsigned long get_board_sys_clk(void);/* * USB */ -#define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 2#undef CONFIG_CMDLINE_EDITING
scripts/config_whitelist.txt +0 -1
@@ -5060,7 +5060,6 @@ CONFIG_USB_TTY CONFIG_USB_TUSB_OMAP_DMA CONFIG_USB_ULPI_TIMEOUT CONFIG_USB_XHCI_EXYNOS -CONFIG_USB_XHCI_FSL CONFIG_USB_XHCI_KEYSTONE CONFIG_USB_XHCI_OMAP CONFIG_USER_LOWLEVEL_INIT
Signature · 1 line
2.14.1
PATCH v4 3/5 arm: layerscape: Remove CONFIG_USB_MAX_CONTROLLER_COUNT
In reply to Ran WangBecause COMFIG_DM_USB has been enabled and will not use it anymore.
---
Change in v4:
Typo correction.
Change in v3:
New patch file.
include/configs/ls1012afrdm.h | 5 ----- include/configs/ls1012aqds.h | 3 --- include/configs/ls1012ardb.h | 4 ---- include/configs/ls1021aiot.h | 3 --- include/configs/ls1021aqds.h | 3 --- include/configs/ls1021atwr.h | 3 --- include/configs/ls1043aqds.h | 3 --- include/configs/ls1043ardb.h | 5 ----- include/configs/ls1046aqds.h | 3 --- include/configs/ls1046ardb.h | 5 ----- include/configs/ls2080aqds.h | 5 ----- include/configs/ls2080ardb.h | 5 ----- 12 files changed, 47 deletions(-)
include/configs/ls1012afrdm.h +0 -5
@@ -31,11 +31,6 @@"kernel_load=0x96000000\0" \ "kernel_size=0x2800000\0" -/* -* USB -*/ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#define CONFIG_CMD_MEMINFO #define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x80000000
include/configs/ls1012aqds.h +0 -3
@@ -118,9 +118,6 @@#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif -/*XHCI Support - enabled by default*/ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -/* MMC */ #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC
include/configs/ls1012ardb.h +0 -4
@@ -19,10 +19,6 @@#define CONFIG_SYS_MEMTEST_START 0x80000000#define CONFIG_SYS_MEMTEST_END 0x9fffffff -/* -* USB -*/ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1/* * I2C IO expander
include/configs/ls1021aiot.h +0 -3
@@ -19,9 +19,6 @@#define CONFIG_SYS_INIT_RAM_ADDR OCRAM_BASE_ADDR#define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE -/* XHCI Support - enabled by default */ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#define CONFIG_SYS_CLK_FREQ 100000000#define CONFIG_DDR_CLK_FREQ 100000000
include/configs/ls1021aqds.h +0 -3
@@ -404,9 +404,6 @@ unsigned long get_board_ddr_clk(void);#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif -/*XHCI Support - enabled by default*/ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -/* * Video */
include/configs/ls1021atwr.h +0 -3
@@ -44,9 +44,6 @@#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif -/* XHCI Support - enabled by default */ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#define CONFIG_SYS_CLK_FREQ 100000000#define CONFIG_DDR_CLK_FREQ 100000000
include/configs/ls1043aqds.h +0 -3
@@ -370,9 +370,6 @@ unsigned long get_board_ddr_clk(void);#endif #endif -/* USB */ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 3 -/* * Miscellaneous configurable options */
include/configs/ls1043ardb.h +0 -5
@@ -279,11 +279,6 @@#endif #endif -/* USB */ -#ifndef SPL_NO_USB -#define CONFIG_USB_MAX_CONTROLLER_COUNT 3 -#endif -/* SATA */ #ifndef SPL_NO_SATA #define CONFIG_LIBATA
include/configs/ls1046aqds.h +0 -3
@@ -136,9 +136,6 @@ unsigned long get_board_ddr_clk(void);#define CFG_LPUART_EN 0x2#endif -/* USB */ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 3 -/* SATA */ #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI
include/configs/ls1046ardb.h +0 -5
@@ -209,11 +209,6 @@#endif #endif -/* USB */ -#ifndef SPL_NO_USB -#define CONFIG_USB_MAX_CONTROLLER_COUNT 3 -#endif -/* SATA */ #ifndef SPL_NO_SATA #define CONFIG_LIBATA
include/configs/ls2080aqds.h +0 -5
@@ -436,11 +436,6 @@ unsigned long get_board_ddr_clk(void);#endif -/* -* USB -*/ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#include <asm/fsl_secure_boot.h> #endif /* __LS2_QDS_H */
include/configs/ls2080ardb.h +0 -5
@@ -333,11 +333,6 @@ unsigned long get_board_sys_clk(void);#define CONFIG_MISC_INIT_R -/* -* USB -*/ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#undef CONFIG_CMDLINE_EDITING#include <config_distro_defaults.h>
Signature · 1 line
2.14.1
PATCH v4 4/5 ls1088ardb: Enable USB command RDB qspi-boot
In reply to Ran Wang---
Change in v4:
Typo correction.
Change in v3:
1.Move HAS_FSL_XHCI_USB and USB_XHCI_FSL define to other patch file.
Change in v2:
1.Adjust USB nodes position in dts to keep them sorted in
unit-address.
2.Move macro CONFIG_HAS_FSL_XHCI_USB and CONFIG_USB_XHCI_FSL
to Kconfig option.
3.Remove CONFIG_USB_MAX_CONTROLLER_COUNT.
Change in 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/linux/usb/xhci-fsl.h | 2 +- 3 files changed, 23 insertions(+), 1 deletion(-)
arch/arm/dts/fsl-ls1088a.dtsi +14 -0
@@ -76,6 +76,20 @@ num-cs = <4>; }; + usb0: usb3 at 3100000 { + compatible = "fsl,layerscape-dwc3"; + reg = <0x0 0x3100000 0x0 0x10000>; + interrupts = <0 80 0x4>; /* Level high type */ + dr_mode = "host"; + }; + + usb1: usb3 at 3110000 { + compatible = "fsl,layerscape-dwc3"; + reg = <0x0 0x3110000 0x0 0x10000>; + interrupts = <0 81 0x4>; /* Level high type */ + dr_mode = "host"; + }; + pcie at 3400000 { compatible = "fsl,ls-pcie", "snps,dw-pcie"; reg = <0x00 0x03400000 0x0 0x80000 /* dbi registers */
configs/ls1088ardb_qspi_defconfig +8 -0
@@ -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
include/linux/usb/xhci-fsl.h +1 -1
@@ -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
Signature · 1 line
2.14.1
PATCH v4 5/5 ls1088aqds: Enable USB command on QDS for qspi-boot
In reply to Ran Wang---
Change in v4:
Typo correction.
Change in v3:
- none
Change in v2:
Remove macro CONFIG_HAS_FSL_XHCI_USB and CONFIG_USB_XHCI_FSL and CONFIG_USB_MAX_CONTROLLER_COUNT from ls1088aqds.h since Kconfig option has covered.
Change in v1:
Rebased to
ba39608 ARM: DRA72x: Add support for detection of DRA71x SR 2.1
configs/ls1088aqds_qspi_defconfig | 8 ++++++++ 1 file changed, 8 insertions(+)
configs/ls1088aqds_qspi_defconfig +8 -0
@@ -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
Signature · 1 line
2.14.1
PATCH v4 1/5 arm64: layerscape: Move CONFIG_HAS_FSL_XHCI_USB to Kconfig
In reply to Ran WangQuoted 11 lines · Ran Wang
Use
Kconfigto select QE-HDLC and USB pin-mux.Signed-off-by Ran Wang <[email protected]>Reviewed-by Bin Meng <[email protected]>---
Change in v4:
Typo correction.Change in v3:
New patch file.
This set is applied to fsl-qoriq master. Thanks.
York