From 790de5c0798f51c607b39f85fe86cf5734969abc Mon Sep 17 00:00:00 2001 From: make shi Date: Fri, 20 Jul 2012 10:43:09 +0800 Subject: [PATCH] ENGR00215520-01 Mx6:USB host: USB Host1 modulization - Add USB_EHCI_ARC_H1 configuration to imx6_defconfig and imx6s_defconfig, the default configuration is selected as "y" - add related USB_EHCI_ARC_H1 configuration to Makefile - add related USB_EHCI_ARC_H1 configuration to Kconfig Signed-off-by: make shi --- arch/arm/configs/imx6_defconfig | 1 + arch/arm/configs/imx6s_defconfig | 1 + arch/arm/mach-mx6/Kconfig | 4 ++++ arch/arm/mach-mx6/Makefile | 3 ++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig index e032e6cc3de3..181cf312d2b4 100644 --- a/arch/arm/configs/imx6_defconfig +++ b/arch/arm/configs/imx6_defconfig @@ -1938,6 +1938,7 @@ CONFIG_USB_OTG=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ARC=y CONFIG_USB_EHCI_ARC_OTG=y +CONFIG_USB_EHCI_ARC_H1=y # CONFIG_USB_EHCI_ARC_HSIC is not set # CONFIG_USB_STATIC_IRAM is not set CONFIG_USB_EHCI_ROOT_HUB_TT=y diff --git a/arch/arm/configs/imx6s_defconfig b/arch/arm/configs/imx6s_defconfig index 78efc6b7563e..04c445e3258b 100644 --- a/arch/arm/configs/imx6s_defconfig +++ b/arch/arm/configs/imx6s_defconfig @@ -1924,6 +1924,7 @@ CONFIG_USB_OTG=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ARC=y CONFIG_USB_EHCI_ARC_OTG=y +CONFIG_USB_EHCI_ARC_H1=y # CONFIG_USB_EHCI_ARC_HSIC is not set # CONFIG_USB_STATIC_IRAM is not set CONFIG_USB_EHCI_ROOT_HUB_TT=y diff --git a/arch/arm/mach-mx6/Kconfig b/arch/arm/mach-mx6/Kconfig index 5c60c560f03a..08875a60a31c 100644 --- a/arch/arm/mach-mx6/Kconfig +++ b/arch/arm/mach-mx6/Kconfig @@ -218,6 +218,10 @@ config IMX_PCIE bool "PCI Express support" select PCI +config USB_EHCI_ARC_H1 + tristate "USB Host 1 support" + depends on USB_EHCI_ARC + config MX6_INTER_LDO_BYPASS bool "Internal LDO in MX6Q/DL bypass" depends on REGULATOR_PFUZE100 && CPU_FREQ_IMX && ARCH_MX6 diff --git a/arch/arm/mach-mx6/Makefile b/arch/arm/mach-mx6/Makefile index 03ae8ddfc75d..24dae23dd089 100644 --- a/arch/arm/mach-mx6/Makefile +++ b/arch/arm/mach-mx6/Makefile @@ -3,7 +3,7 @@ # # Object file lists. -obj-y := cpu.o mm.o system.o devices.o dummy_gpio.o irq.o bus_freq.o usb_dr.o usb_h1.o usb_h2.o usb_h3.o \ +obj-y := cpu.o mm.o system.o devices.o dummy_gpio.o irq.o bus_freq.o usb_dr.o usb_h2.o usb_h3.o\ pm.o cpu_op-mx6.o mx6_wfi.o mx6_fec.o mx6_anatop_regulator.o cpu_regulator-mx6.o \ mx6_mmdc.o mx6_ddr_freq.o @@ -16,3 +16,4 @@ obj-$(CONFIG_MACH_MX6Q_SABREAUTO) += board-mx6q_sabreauto.o mx6q_sabreauto_pmic_ obj-$(CONFIG_SMP) += plat_hotplug.o platsmp.o headsmp.o obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o obj-$(CONFIG_IMX_PCIE) += pcie.o +obj-$(CONFIG_USB_EHCI_ARC_H1) += usb_h1.o \ No newline at end of file -- 2.39.5