diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 14:14:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 14:14:29 -0400 |
| commit | b3345d7c57d70e6cb6749af25cdbe80515582e99 (patch) | |
| tree | 04cce706bc7e944ad1fb257108a8ae735948f97f /drivers/phy/Kconfig | |
| parent | 44c916d58b9ef1f2c4aec2def57fa8289c716a60 (diff) | |
| parent | c2fff85e21818952aa0ee5778926beee6c03e579 (diff) | |
Merge tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC platform changes from Olof Johansson:
"This is the bulk of new SoC enablement and other platform changes for
3.17:
- Samsung S5PV210 has been converted to DT and multiplatform
- Clock drivers and bindings for some of the lower-end i.MX 1/2
platforms
- Kirkwood, one of the popular Marvell platforms, is folded into the
mvebu platform code, removing mach-kirkwood
- Hwmod data for TI AM43xx and DRA7 platforms
- More additions of Renesas shmobile platform support
- Removal of plat-samsung contents that can be removed with S5PV210
being multiplatform/DT-enabled and the other two old platforms
being removed
New platforms (most with only basic support right now):
- Hisilicon X5HD2 settop box chipset is introduced
- Mediatek MT6589 (mobile chipset) is introduced
- Broadcom BCM7xxx settop box chipset is introduced
+ as usual a lot other pieces all over the platform code"
* tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (240 commits)
ARM: hisi: remove smp from machine descriptor
power: reset: move hisilicon reboot code
ARM: dts: Add hix5hd2-dkb dts file.
ARM: debug: Rename Hi3716 to HIX5HD2
ARM: hisi: enable hix5hd2 SoC
ARM: hisi: add ARCH_HISI
MAINTAINERS: add entry for Broadcom ARM STB architecture
ARM: brcmstb: select GISB arbiter and interrupt drivers
ARM: brcmstb: add infrastructure for ARM-based Broadcom STB SoCs
ARM: configs: enable SMP in bcm_defconfig
ARM: add SMP support for Broadcom mobile SoCs
Documentation: arm: misc updates to Marvell EBU SoC status
Documentation: arm: add URLs to public datasheets for the Marvell Armada XP SoC
ARM: mvebu: fix build without platforms selected
ARM: mvebu: add cpuidle support for Armada 38x
ARM: mvebu: add cpuidle support for Armada 370
cpuidle: mvebu: add Armada 38x support
cpuidle: mvebu: add Armada 370 support
cpuidle: mvebu: rename the driver from armada-370-xp to mvebu-v7
ARM: mvebu: export the SCU address
...
Diffstat (limited to 'drivers/phy/Kconfig')
| -rw-r--r-- | drivers/phy/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig index cc97c897945a..d1f5fc924c93 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig | |||
| @@ -159,6 +159,16 @@ config PHY_SAMSUNG_USB2 | |||
| 159 | for particular PHYs will be enabled based on the SoC type in addition | 159 | for particular PHYs will be enabled based on the SoC type in addition |
| 160 | to this driver. | 160 | to this driver. |
| 161 | 161 | ||
| 162 | config PHY_S5PV210_USB2 | ||
| 163 | bool "Support for S5PV210" | ||
| 164 | depends on PHY_SAMSUNG_USB2 | ||
| 165 | depends on ARCH_S5PV210 | ||
| 166 | help | ||
| 167 | Enable USB PHY support for S5PV210. This option requires that Samsung | ||
| 168 | USB 2.0 PHY driver is enabled and means that support for this | ||
| 169 | particular SoC is compiled in the driver. In case of S5PV210 two phys | ||
| 170 | are available - device and host. | ||
| 171 | |||
| 162 | config PHY_EXYNOS4210_USB2 | 172 | config PHY_EXYNOS4210_USB2 |
| 163 | bool | 173 | bool |
| 164 | depends on PHY_SAMSUNG_USB2 | 174 | depends on PHY_SAMSUNG_USB2 |