mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 01:51:53 +00:00
3883cbb6c1
These changes are all to SoC-specific code, a total of 33 branches on 17 platforms were pulled into this. Like last time, Renesas sh-mobile is now the platform with the most changes, followed by OMAP and EXYNOS. Two new platforms, TI Keystone and Rockchips RK3xxx are added in this branch, both containing almost no platform specific code at all, since they are using generic subsystem interfaces for clocks, pinctrl, interrupts etc. The device drivers are getting merged through the respective subsystem maintainer trees. One more SoC (u300) is now multiplatform capable and several others (shmobile, exynos, msm, integrator, kirkwood, clps711x) are moving towards that goal with this series but need more work. Also noteworthy is the work on PCI here, which is traditionally part of the SoC specific code. With the changes done by Thomas Petazzoni, we can now more easily have PCI host controller drivers as loadable modules and keep them separate from the platform code in drivers/pci/host. This has already led to the discovery that three platforms (exynos, spear and imx) are actually using an identical PCIe host controller and will be able to share a driver once support for spear and imx is added. Conflicts: * asm/glue-proc.h has one CPU type getting added that conflicts with another addition in 3.10-rc7 * Simple context changes in arch/arm/Makefile and arch/arm/Kconfig -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAUdLnpmCrR//JCVInAQLoFRAAyatR+MhVFwc91cO7yDw/mz81RO1V9jEd QMufoWi0BRfBsubqxnGlb510EEMTz7gxdrlYPILYNr8TqR+lNGhjKt2FQAjN3q2O IBvu4x8C+xcxnMNbkCnTQRxP/ziK6yCI6e7enQhwuMuJwvsnJtGbsqKi5ODMw6x0 o5EQmIdj5NhhSJqJZPCmWsKbx100TH1UwaEnhNl0DSaFj51n3bVRrK6Nxce10GWZ HsS1/a63lq/YZLkwfUEvgin/PU9Jx5jMmqhlp3bZjG+f1ItdzJF+9IgS248vCIi2 ystzWCH88Kh69UFcYFfCjeZe8H45XcP+Zykd8WC0DvF/a7Hwk5KTKE/ciT6RPRxb rkWW5EwjqZL9w9cU3rUHWtSVenayQMMEmCfksadr1AExyCrhPqfs9RINyBs2lK5a q2bdSFbXZsNzSyL+3yQAfChvRo1/2FdlFVQy+oVUCActV7L77Y7y6jl+b2qzFsSu xMKwvC/1vDXTvOnGk6A/qJu7yrHpqJrvw1eI+wnMswNBl7lCTgyyHnr5y8S092jI KU4hmSxsYP+y13HmKy4ewPy9DYJYBTSdReKfEFo79Dx8eqySAWjHFL/OPRqhCUYS kBq0eZpVZO7tJnHRaRz8n93wIYzb1UOhhgVwxdjPZF9L4d/jzh1BCv0OBWv8IXCu uWLAi92lL24= =0r9S -----END PGP SIGNATURE----- Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC specific changes from Arnd Bergmann: "These changes are all to SoC-specific code, a total of 33 branches on 17 platforms were pulled into this. Like last time, Renesas sh-mobile is now the platform with the most changes, followed by OMAP and EXYNOS. Two new platforms, TI Keystone and Rockchips RK3xxx are added in this branch, both containing almost no platform specific code at all, since they are using generic subsystem interfaces for clocks, pinctrl, interrupts etc. The device drivers are getting merged through the respective subsystem maintainer trees. One more SoC (u300) is now multiplatform capable and several others (shmobile, exynos, msm, integrator, kirkwood, clps711x) are moving towards that goal with this series but need more work. Also noteworthy is the work on PCI here, which is traditionally part of the SoC specific code. With the changes done by Thomas Petazzoni, we can now more easily have PCI host controller drivers as loadable modules and keep them separate from the platform code in drivers/pci/host. This has already led to the discovery that three platforms (exynos, spear and imx) are actually using an identical PCIe host controller and will be able to share a driver once support for spear and imx is added." * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (480 commits) ARM: integrator: let pciv3 use mem/premem from device tree ARM: integrator: set local side PCI addresses right ARM: dts: Add pcie controller node for exynos5440-ssdk5440 ARM: dts: Add pcie controller node for Samsung EXYNOS5440 SoC ARM: EXYNOS: Enable PCIe support for Exynos5440 pci: Add PCIe driver for Samsung Exynos ARM: OMAP5: voltagedomain data: remove temporary OMAP4 voltage data ARM: keystone: Move CPU bringup code to dedicated asm file ARM: multiplatform: always pick one CPU type ARM: imx: select syscon for IMX6SL ARM: keystone: select ARM_ERRATA_798181 only for SMP ARM: imx: Synertronixx scb9328 needs to select SOC_IMX1 ARM: OMAP2+: AM43x: resolve SMP related build error dmaengine: edma: enable build for AM33XX ARM: edma: Add EDMA crossbar event mux support ARM: edma: Add DT and runtime PM support to the private EDMA API dmaengine: edma: Add TI EDMA device tree binding arm: add basic support for Rockchip RK3066a boards arm: add debug uarts for rockchip rk29xx and rk3xxx series arm: Add basic clocks for Rockchip rk3066a SoCs ...
214 lines
7.0 KiB
Plaintext
214 lines
7.0 KiB
Plaintext
#
|
|
# Physical Layer USB driver configuration
|
|
#
|
|
menuconfig USB_PHY
|
|
bool "USB Physical Layer drivers"
|
|
help
|
|
Most USB controllers have the physical layer signalling part
|
|
(commonly called a PHY) built in. However, dual-role devices
|
|
(a.k.a. USB on-the-go) which support being USB master or slave
|
|
with the same connector often use an external PHY.
|
|
|
|
The drivers in this submenu add support for such PHY devices.
|
|
They are not needed for standard master-only (or the vast
|
|
majority of slave-only) USB interfaces.
|
|
|
|
If you're not sure if this applies to you, it probably doesn't;
|
|
say N here.
|
|
|
|
if USB_PHY
|
|
|
|
#
|
|
# USB Transceiver Drivers
|
|
#
|
|
config AB8500_USB
|
|
tristate "AB8500 USB Transceiver Driver"
|
|
depends on AB8500_CORE
|
|
help
|
|
Enable this to support the USB OTG transceiver in AB8500 chip.
|
|
This transceiver supports high and full speed devices plus,
|
|
in host mode, low speed.
|
|
|
|
config FSL_USB2_OTG
|
|
bool "Freescale USB OTG Transceiver Driver"
|
|
depends on USB_EHCI_FSL && USB_FSL_USB2 && PM_RUNTIME
|
|
select USB_OTG
|
|
help
|
|
Enable this to support Freescale USB OTG transceiver.
|
|
|
|
config ISP1301_OMAP
|
|
tristate "Philips ISP1301 with OMAP OTG"
|
|
depends on I2C && ARCH_OMAP_OTG
|
|
help
|
|
If you say yes here you get support for the Philips ISP1301
|
|
USB-On-The-Go transceiver working with the OMAP OTG controller.
|
|
The ISP1301 is a full speed USB transceiver which is used in
|
|
products including H2, H3, and H4 development boards for Texas
|
|
Instruments OMAP processors.
|
|
|
|
This driver can also be built as a module. If so, the module
|
|
will be called isp1301_omap.
|
|
|
|
config MV_U3D_PHY
|
|
bool "Marvell USB 3.0 PHY controller Driver"
|
|
depends on CPU_MMP3
|
|
help
|
|
Enable this to support Marvell USB 3.0 phy controller for Marvell
|
|
SoC.
|
|
|
|
config NOP_USB_XCEIV
|
|
tristate "NOP USB Transceiver Driver"
|
|
help
|
|
This driver is to be used by all the usb transceiver which are either
|
|
built-in with usb ip or which are autonomous and doesn't require any
|
|
phy programming such as ISP1x04 etc.
|
|
|
|
config OMAP_CONTROL_USB
|
|
tristate "OMAP CONTROL USB Driver"
|
|
help
|
|
Enable this to add support for the USB part present in the control
|
|
module. This driver has API to power on the USB2 PHY and to write to
|
|
the mailbox. The mailbox is present only in omap4 and the register to
|
|
power on the USB2 PHY is present in OMAP4 and OMAP5. OMAP5 has an
|
|
additional register to power on USB3 PHY.
|
|
|
|
config OMAP_USB2
|
|
tristate "OMAP USB2 PHY Driver"
|
|
depends on ARCH_OMAP2PLUS
|
|
select OMAP_CONTROL_USB
|
|
help
|
|
Enable this to support the transceiver that is part of SOC. This
|
|
driver takes care of all the PHY functionality apart from comparator.
|
|
The USB OTG controller communicates with the comparator using this
|
|
driver.
|
|
|
|
config OMAP_USB3
|
|
tristate "OMAP USB3 PHY Driver"
|
|
select OMAP_CONTROL_USB
|
|
help
|
|
Enable this to support the USB3 PHY that is part of SOC. This
|
|
driver takes care of all the PHY functionality apart from comparator.
|
|
This driver interacts with the "OMAP Control USB Driver" to power
|
|
on/off the PHY.
|
|
|
|
config SAMSUNG_USBPHY
|
|
tristate
|
|
help
|
|
Enable this to support Samsung USB phy helper driver for Samsung SoCs.
|
|
This driver provides common interface to interact, for Samsung USB 2.0 PHY
|
|
driver and later for Samsung USB 3.0 PHY driver.
|
|
|
|
config SAMSUNG_USB2PHY
|
|
tristate "Samsung USB 2.0 PHY controller Driver"
|
|
select SAMSUNG_USBPHY
|
|
help
|
|
Enable this to support Samsung USB 2.0 (High Speed) PHY controller
|
|
driver for Samsung SoCs.
|
|
|
|
config SAMSUNG_USB3PHY
|
|
tristate "Samsung USB 3.0 PHY controller Driver"
|
|
select SAMSUNG_USBPHY
|
|
help
|
|
Enable this to support Samsung USB 3.0 (Super Speed) phy controller
|
|
for samsung SoCs.
|
|
|
|
config TWL4030_USB
|
|
tristate "TWL4030 USB Transceiver Driver"
|
|
depends on TWL4030_CORE && REGULATOR_TWL4030 && USB_MUSB_OMAP2PLUS
|
|
help
|
|
Enable this to support the USB OTG transceiver on TWL4030
|
|
family chips (including the TWL5030 and TPS659x0 devices).
|
|
This transceiver supports high and full speed devices plus,
|
|
in host mode, low speed.
|
|
|
|
config TWL6030_USB
|
|
tristate "TWL6030 USB Transceiver Driver"
|
|
depends on TWL4030_CORE && OMAP_USB2 && USB_MUSB_OMAP2PLUS
|
|
help
|
|
Enable this to support the USB OTG transceiver on TWL6030
|
|
family chips. This TWL6030 transceiver has the VBUS and ID GND
|
|
and OTG SRP events capabilities. For all other transceiver functionality
|
|
UTMI PHY is embedded in OMAP4430. The internal PHY configurations APIs
|
|
are hooked to this driver through platform_data structure.
|
|
The definition of internal PHY APIs are in the mach-omap2 layer.
|
|
|
|
config USB_GPIO_VBUS
|
|
tristate "GPIO based peripheral-only VBUS sensing 'transceiver'"
|
|
depends on GPIOLIB
|
|
help
|
|
Provides simple GPIO VBUS sensing for controllers with an
|
|
internal transceiver via the usb_phy interface, and
|
|
optionally control of a D+ pullup GPIO as well as a VBUS
|
|
current limit regulator.
|
|
|
|
config USB_ISP1301
|
|
tristate "NXP ISP1301 USB transceiver support"
|
|
depends on USB || USB_GADGET
|
|
depends on I2C
|
|
help
|
|
Say Y here to add support for the NXP ISP1301 USB transceiver driver.
|
|
This chip is typically used as USB transceiver for USB host, gadget
|
|
and OTG drivers (to be selected separately).
|
|
|
|
To compile this driver as a module, choose M here: the
|
|
module will be called isp1301.
|
|
|
|
config USB_MSM_OTG
|
|
tristate "OTG support for Qualcomm on-chip USB controller"
|
|
depends on (USB || USB_GADGET) && ARCH_MSM
|
|
help
|
|
Enable this to support the USB OTG transceiver on MSM chips. It
|
|
handles PHY initialization, clock management, and workarounds
|
|
required after resetting the hardware and power management.
|
|
This driver is required even for peripheral only or host only
|
|
mode configurations.
|
|
This driver is not supported on boards like trout which
|
|
has an external PHY.
|
|
|
|
config USB_MV_OTG
|
|
tristate "Marvell USB OTG support"
|
|
depends on USB_EHCI_MV && USB_MV_UDC && PM_RUNTIME
|
|
select USB_OTG
|
|
help
|
|
Say Y here if you want to build Marvell USB OTG transciever
|
|
driver in kernel (including PXA and MMP series). This driver
|
|
implements role switch between EHCI host driver and gadget driver.
|
|
|
|
To compile this driver as a module, choose M here.
|
|
|
|
config USB_MXS_PHY
|
|
tristate "Freescale MXS USB PHY support"
|
|
depends on ARCH_MXC || ARCH_MXS
|
|
select STMP_DEVICE
|
|
help
|
|
Enable this to support the Freescale MXS USB PHY.
|
|
|
|
MXS Phy is used by some of the i.MX SoCs, for example imx23/28/6x.
|
|
|
|
config USB_RCAR_PHY
|
|
tristate "Renesas R-Car USB PHY support"
|
|
depends on USB || USB_GADGET
|
|
help
|
|
Say Y here to add support for the Renesas R-Car USB common PHY driver.
|
|
This chip is typically used as USB PHY for USB host, gadget.
|
|
This driver supports R8A7778 and R8A7779.
|
|
|
|
To compile this driver as a module, choose M here: the
|
|
module will be called phy-rcar-usb.
|
|
|
|
config USB_ULPI
|
|
bool "Generic ULPI Transceiver Driver"
|
|
depends on ARM
|
|
help
|
|
Enable this to support ULPI connected USB OTG transceivers which
|
|
are likely found on embedded boards.
|
|
|
|
config USB_ULPI_VIEWPORT
|
|
bool
|
|
depends on USB_ULPI
|
|
help
|
|
Provides read/write operations to the ULPI phy register set for
|
|
controllers with a viewport register (e.g. Chipidea/ARC controllers).
|
|
|
|
endif # USB_PHY
|