PHY for 3.15
Subsystems (9)
Hi Greg,
Here's the PULL REQUEST for 3.15 merge window.
More users are starting to use the generic PHY framework including USB and SATA PHY in exynos, USB in sunxi and multi-purpose PHY (currently only SATA) in APM. There is also a patch to adapt USB3 PHY driver (PIPE3) used in OMAP to generic PHY framework and use the same driver for SATA.
It also includes few fixes and cleanups.
Please let me know if you want me to make any changes.
Cheers
Kishon
The following changes since commit cfbf8d4857c26a8a307fb7cd258074c9dcd8c691:
Linux 3.14-rc4 (2014-02-23 17:40:03 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git tags/for_3.15
for you to fetch changes up to 303fd52cda953d14dc82ac82b570761599eb9ab2:
PHY: add APM X-Gene SoC 15Gbps Multi-purpose PHY driver (2014-03-08 12:39:51 +0530)
----------------------------------------------------------------
Add new PHY drivers for SATA and USB in exynos, for USB in sunxi, and a multi-purpose PHY in APM, all adapted to generic PHY framework. Adapted USB3 PHY driver in OMAP to generic PHY driver and also used the same driver for SATA in OMAP. It also includes miscellaneous cleanups and fixes.
----------------------------------------------------------------
Austin Beam (1):
phy: omap-usb2: Provide workaround for USB2PHY false disconnect
George Cherian (2):
phy: omap-usb2: Adapt phy-omap-usb2 for AM437x
phy: omap-usb2: Add different compatible for OMAP5
Hans de Goede (1):
PHY: sunxi: Add driver for sunxi usb phy
Kamil Debski (4):
phy: core: Add an exported of_phy_get function
phy: core: Add devm_of_phy_get to phy-core
phy: Add new Exynos USB 2.0 PHY driver
phy: Add Exynos 5250 support to the Exynos USB 2.0 PHY driver
Kishon Vijay Abraham I (4):
drivers: phy: usb3/pipe3: Adapt pipe3 driver to Generic PHY Framework
usb: phy: omap-usb2: remove *set_suspend* callback from omap-usb2
phy: omap-usb2: move omap_usb.h from linux/usb/ to linux/phy/
phy: rename struct omap_control_usb to struct omap_control_phy
Loc Ho (2):
Documentation: Add APM X-Gene SoC 15Gbps Multi-purpose PHY driver binding documentation
PHY: add APM X-Gene SoC 15Gbps Multi-purpose PHY driver
Roger Quadros (7):
phy: omap-control: update dra7 and am437 usb2 bindings
phy: ti-pipe3: cleanup clock handling
phy: ti-pipe3: Add SATA DPLL support
phy: ti-pipe3: Don't get 'wkupclk' and 'refclk' for SATA PHY
phy: ti-pipe3: streamline PHY operations
phy: ti-pipe3: Fix suspend/resume and module reload
phy: omap: Depend on OMAP_OCP2SCP bus driver
Sachin Kamat (3):
usb: phy: twl4030-usb: Silence checkpatch warnings
usb: phy: twl4030-usb: Remove redundant semicolon
usb: phy: bcm-kona-usb2: Use PTR_ERR_OR_ZERO
Sebastian Hesselbarth (1):
phy: mvebu-sata: prepare new Dove DT Kconfig variable
Sylwester Nawrocki (2):
phy: Select PHY_EXYNOS_MIPI_VIDEO by default for ARCH_EXYNOS
phy: Select PHY_EXYNOS_DP_VIDEO by default for ARCH_EXYNOS
Yuvaraj Kumar C D (1):
PHY: Exynos: Add Exynos5250 SATA PHY driver
.../devicetree/bindings/phy/apm-xgene-phy.txt | 79 +
.../devicetree/bindings/phy/samsung-phy.txt | 54 +
.../devicetree/bindings/phy/sun4i-usb-phy.txt | 26 +
Documentation/devicetree/bindings/usb/usb-phy.txt | 6 +-
Documentation/phy/samsung-usb2.txt | 135 ++
drivers/phy/Kconfig | 107 +-
drivers/phy/Makefile | 9 +
drivers/phy/phy-bcm-kona-usb2.c | 4 +-
drivers/phy/phy-core.c | 76 +-
drivers/phy/phy-exynos4210-usb2.c | 261 +++
drivers/phy/phy-exynos4x12-usb2.c | 328 ++++
drivers/phy/phy-exynos5250-sata.c | 251 +++
drivers/phy/phy-exynos5250-usb2.c | 404 +++++
drivers/{usb => }/phy/phy-omap-control.c | 169 +-
drivers/phy/phy-omap-usb2.c | 131 +-
drivers/phy/phy-samsung-usb2.c | 228 +++
drivers/phy/phy-samsung-usb2.h | 67 +
drivers/phy/phy-sun4i-usb.c | 331 ++++
drivers/phy/phy-ti-pipe3.c | 470 ++++++
drivers/phy/phy-twl4030-usb.c | 6 +-
drivers/phy/phy-xgene.c | 1750 ++++++++++++++++++++
drivers/usb/musb/omap2430.c | 2 +-
drivers/usb/phy/Kconfig | 21 -
drivers/usb/phy/Makefile | 2 -
drivers/usb/phy/phy-omap-usb3.c | 361 ----
drivers/usb/phy/phy-twl6030-usb.c | 2 +-
.../omap_control_usb.h => phy/omap_control_phy.h} | 36 +-
include/linux/{usb => phy}/omap_usb.h | 14 +-
include/linux/phy/phy.h | 15 +
29 files changed, 4797 insertions(+), 548 deletions(-)
create mode 100644 Documentation/devicetree/bindings/phy/apm-xgene-phy.txt
create mode 100644 Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt
create mode 100644 Documentation/phy/samsung-usb2.txt
create mode 100644 drivers/phy/phy-exynos4210-usb2.c
create mode 100644 drivers/phy/phy-exynos4x12-usb2.c
create mode 100644 drivers/phy/phy-exynos5250-sata.c
create mode 100644 drivers/phy/phy-exynos5250-usb2.c
rename drivers/{usb => }/phy/phy-omap-control.c (53%)
create mode 100644 drivers/phy/phy-samsung-usb2.c
create mode 100644 drivers/phy/phy-samsung-usb2.h
create mode 100644 drivers/phy/phy-sun4i-usb.c
create mode 100644 drivers/phy/phy-ti-pipe3.c
create mode 100644 drivers/phy/phy-xgene.c
delete mode 100644 drivers/usb/phy/phy-omap-usb3.c
rename include/linux/{usb/omap_control_usb.h => phy/omap_control_phy.h} (68%)
rename include/linux/{usb => phy}/omap_usb.h (86%)Signature · 1 line
1.7.9.5
PATCH 1/28 usb: phy: twl4030-usb: Silence checkpatch warnings
From: Sachin Kamat <[email protected]>
Silences the following warnings:
WARNING: sizeof *twl should be sizeof(*twl)
WARNING: sizeof *otg should be sizeof(*otg)
--- drivers/phy/phy-twl4030-usb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/phy/phy-twl4030-usb.c +2 -2
@@ -661,7 +661,7 @@ static int twl4030_usb_probe(struct platform_device *pdev)struct phy_provider *phy_provider;struct phy_init_data *init_data =NULL ; - twl =devm_kzalloc (&pdev->dev,sizeof *twl,GFP_KERNEL ); + twl =devm_kzalloc (&pdev->dev,sizeof (*twl),GFP_KERNEL );if (!twl)return -ENOMEM ;
@@ -676,7 +676,7 @@ static int twl4030_usb_probe(struct platform_device *pdev)return -EINVAL ; } - otg =devm_kzalloc (&pdev->dev,sizeof *otg,GFP_KERNEL ); + otg =devm_kzalloc (&pdev->dev,sizeof (*otg),GFP_KERNEL );if (!otg)return -ENOMEM ;
Signature · 1 line
1.7.9.5
PATCH 2/28 usb: phy: twl4030-usb: Remove redundant semicolon
In reply to Kishon Vijay Abraham IFrom: Sachin Kamat <[email protected]>
Semicolon after switch statement is not needed.
--- drivers/phy/phy-twl4030-usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/phy-twl4030-usb.c +1 -1
@@ -338,7 +338,7 @@ static void twl4030_usb_set_mode(struct twl4030_usb *twl, int mode)dev_err (twl->dev,"unsupported T2 transceiver mode %d\n" , mode);break ; - }; + } }static void twl4030_i2c_access (struct twl4030_usb *twl,int on)
Signature · 1 line
1.7.9.5
PATCH 3/28 usb: phy: bcm-kona-usb2: Use PTR_ERR_OR_ZERO
In reply to Kishon Vijay Abraham IFrom: Sachin Kamat <[email protected]>
PTR_ERR_OR_ZERO simplifies the code.
--- drivers/phy/phy-bcm-kona-usb2.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/phy/phy-bcm-kona-usb2.c +1 -3
@@ -128,10 +128,8 @@ static int bcm_kona_usb2_probe(struct platform_device *pdev) phy_provider =devm_of_phy_provider_register (dev, of_phy_simple_xlate); -if (IS_ERR (phy_provider)) -return PTR_ERR (phy_provider); -return 0 ; +return PTR_ERR_OR_ZERO (phy_provider); }static const struct of_device_id bcm_kona_usb2_dt_ids[] = {
Signature · 1 line
1.7.9.5
PATCH 4/28 phy: Select PHY_EXYNOS_MIPI_VIDEO by default for ARCH_EXYNOS
In reply to Kishon Vijay Abraham IFrom: Sylwester Nawrocki <[email protected]>
Instead of requiring user to figure out when PHY_EXYNOS_MIPI_VIDEO needs to be selected select it by default for Exynos SoCs. Also enable it when COMPILE_TEST is selected. If required the MIPI CSIS/DPHY driver can be then disabled or compiled in as module.
--- drivers/phy/Kconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/phy/Kconfig +4 -1
@@ -16,8 +16,11 @@ config GENERIC_PHY framework should select this config. config PHY_EXYNOS_MIPI_VIDEO - depends on HAS_IOMEM tristate "S5P/EXYNOS SoC series MIPI CSI-2/DSI PHY driver" + depends on HAS_IOMEM + depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST + select GENERIC_PHY + default y if ARCH_S5PV210 || ARCH_EXYNOS help Support for MIPI CSI-2 and MIPI DSI DPHY found on Samsung S5P and EXYNOS SoCs.
Signature · 1 line
1.7.9.5
PATCH 5/28 phy: Select PHY_EXYNOS_DP_VIDEO by default for ARCH_EXYNOS
In reply to Kishon Vijay Abraham IFrom: Sylwester Nawrocki <[email protected]>
Instead of requiring user to figure out when PHY_EXYNOS_DP_VIDEO needs to be selected select it by default for Exynos SoCs. Also enable it when COMPILE_TEST is selected. If required the display port PHY driver can be then disabled or compiled in as module.
--- drivers/phy/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
drivers/phy/Kconfig +2 -0
@@ -57,6 +57,8 @@ config TWL4030_USB config PHY_EXYNOS_DP_VIDEO tristate "EXYNOS SoC series Display Port PHY driver" depends on OF + depends on ARCH_EXYNOS || COMPILE_TEST + default ARCH_EXYNOS select GENERIC_PHY help Support for Display Port PHY found on Samsung EXYNOS SoCs.
Signature · 1 line
1.7.9.5
PATCH 6/28 PHY: Exynos: Add Exynos5250 SATA PHY driver
In reply to Kishon Vijay Abraham IFrom: Yuvaraj Kumar C D <[email protected]>
This patch adds the SATA PHY driver for Exynos5250.This driver uses the generic PHY framework to deal with SATA PHY.Exynos5250 SATA PHY comprises of CMU and TRSV blocks which are of I2C register Map.So this driver configures the CMU and TRSV block of exynos5250 SATA PHY using i2c.
--- drivers/phy/Kconfig | 15 +++ drivers/phy/Makefile | 1 + drivers/phy/phy-exynos5250-sata.c | 251 +++++++++++++++++++++++++++++++++++++ 3 files changed, 267 insertions(+) create mode 100644 drivers/phy/phy-exynos5250-sata.c
drivers/phy/Kconfig +15 -0
@@ -70,4 +70,19 @@ config BCM_KONA_USB2_PHY help Enable this to support the Broadcom Kona USB 2.0 PHY. +config PHY_EXYNOS5250_SATA + tristate "Exynos5250 Sata SerDes/PHY driver" + depends on SOC_EXYNOS5250 + depends on HAS_IOMEM + depends on OF + select GENERIC_PHY + select I2C + select I2C_S3C2410 + select MFD_SYSCON + help + Enable this to support SATA SerDes/Phy found on Samsung's + Exynos5250 based SoCs.This SerDes/Phy supports SATA 1.5 Gb/s, + SATA 3.0 Gb/s, SATA 6.0 Gb/s speeds. It supports one SATA host + port to accept one SATA device. + endmenu
drivers/phy/Makefile +1 -0
@@ -9,3 +9,4 @@ obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o obj-$(CONFIG_PHY_MVEBU_SATA) += phy-mvebu-sata.o obj-$(CONFIG_OMAP_USB2) += phy-omap-usb2.o obj-$(CONFIG_TWL4030_USB) += phy-twl4030-usb.o +obj-$(CONFIG_PHY_EXYNOS5250_SATA) += phy-exynos5250-sata.o
drivers/phy/phy-exynos5250-sata.c new file +251 -0
251 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 7/28 PHY: sunxi: Add driver for sunxi usb phy
In reply to Kishon Vijay Abraham IFrom: Hans de Goede <[email protected]>
The Allwinner A1x / A2x SoCs have 2 or 3 usb phys which are all accessed through a single set of registers. Besides this there are also some other phy related bits which need poking, which are per phy, but shared between the ohci and ehci controllers, so these are also controlled from this new phy driver.
--- .../devicetree/bindings/phy/sun4i-usb-phy.txt | 26 ++ drivers/phy/Kconfig | 11 + drivers/phy/Makefile | 1 + drivers/phy/phy-sun4i-usb.c | 331 ++++++++++++++++++++ 4 files changed, 369 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt create mode 100644 drivers/phy/phy-sun4i-usb.c
Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt new file +26 -0
@@ -0,0 +1,26 @@ +Allwinner sun4i USB PHY +----------------------- + +Required properties: +- compatible : should be one of "allwinner,sun4i-a10-usb-phy", + "allwinner,sun5i-a13-usb-phy" or "allwinner,sun7i-a20-usb-phy" +- reg : a list of offset + length pairs +- reg-names : "phy_ctrl", "pmu1" and for sun4i or sun7i "pmu2" +- #phy-cells : from the generic phy bindings, must be 1 +- clocks : phandle + clock specifier for the phy clock +- clock-names : "usb_phy" +- resets : a list of phandle + reset specifier pairs +- reset-names : "usb0_reset", "usb1_reset" and for sun4i or sun7i "usb2_reset" + +Example: + usbphy: phy@0x01c13400 { + #phy-cells = <1>; + compatible = "allwinner,sun4i-a10-usb-phy"; + /* phy base regs, phy1 pmu reg, phy2 pmu reg */ + reg = <0x01c13400 0x10 0x01c14800 0x4 0x01c1c800 0x4>; + reg-names = "phy_ctrl", "pmu1", "pmu2"; + clocks = <&usb_clk 8>; + clock-names = "usb_phy"; + resets = <&usb_clk 1>, <&usb_clk 2>; + reset-names = "usb1_reset", "usb2_reset"; + };
drivers/phy/Kconfig +11 -0
@@ -85,4 +85,15 @@ config PHY_EXYNOS5250_SATA SATA 3.0 Gb/s, SATA 6.0 Gb/s speeds. It supports one SATA host port to accept one SATA device. +config PHY_SUN4I_USB + tristate "Allwinner sunxi SoC USB PHY driver" + depends on ARCH_SUNXI && HAS_IOMEM && OF + select GENERIC_PHY + help + Enable this to support the transceiver that is part of Allwinner + sunxi SoCs. + + This driver controls the entire USB PHY block, both the USB OTG + parts, as well as the 2 regular USB 2 host PHYs. + endmenu
drivers/phy/Makefile +1 -0
@@ -10,3 +10,4 @@ obj-$(CONFIG_PHY_MVEBU_SATA) += phy-mvebu-sata.o obj-$(CONFIG_OMAP_USB2) += phy-omap-usb2.o obj-$(CONFIG_TWL4030_USB) += phy-twl4030-usb.o obj-$(CONFIG_PHY_EXYNOS5250_SATA) += phy-exynos5250-sata.o +obj-$(CONFIG_PHY_SUN4I_USB) += phy-sun4i-usb.o
drivers/phy/phy-sun4i-usb.c new file +331 -0
331 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 8/28 phy: mvebu-sata: prepare new Dove DT Kconfig variable
In reply to Kishon Vijay Abraham IFrom: Sebastian Hesselbarth <[email protected]>
DT-enabled Dove will move over from ARCH_DOVE in mach-dove to MACH_DOVE in mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new DT-only MACH_DOVE Kconfig.
--- drivers/phy/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/Kconfig +1 -1
@@ -27,7 +27,7 @@ config PHY_EXYNOS_MIPI_VIDEO config PHY_MVEBU_SATA def_bool y - depends on ARCH_KIRKWOOD || ARCH_DOVE + depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE depends on OF select GENERIC_PHY
Signature · 1 line
1.7.9.5
PATCH 9/28 drivers: phy: usb3/pipe3: Adapt pipe3 driver to Generic PHY Framework
In reply to Kishon Vijay Abraham IAdapted omap-usb3 PHY driver to Generic PHY Framework and moved phy-omap-usb3 driver in drivers/usb/phy to drivers/phy and also renamed the file to phy-ti-pipe3 since this same driver will be used for SATA PHY and PCIE PHY.
---
drivers/phy/Kconfig | 11 +
drivers/phy/Makefile | 1 +
.../phy/phy-omap-usb3.c => phy/phy-ti-pipe3.c} | 240 ++++++++++++--------
drivers/usb/phy/Kconfig | 11 -
drivers/usb/phy/Makefile | 1 -
5 files changed, 158 insertions(+), 106 deletions(-)
rename drivers/{usb/phy/phy-omap-usb3.c => phy/phy-ti-pipe3.c} (54%)drivers/phy/Kconfig +11 -0
@@ -43,6 +43,17 @@ config OMAP_USB2 The USB OTG controller communicates with the comparator using this driver. +config TI_PIPE3 + tristate "TI PIPE3 PHY Driver" + depends on ARCH_OMAP2PLUS || COMPILE_TEST + select GENERIC_PHY + select OMAP_CONTROL_USB + help + Enable this to support the PIPE3 PHY that is part of TI SOCs. This + driver takes care of all the PHY functionality apart from comparator. + This driver interacts with the "OMAP Control PHY Driver" to power + on/off the PHY. + config TWL4030_USB tristate "TWL4030 USB Transceiver Driver" depends on TWL4030_CORE && REGULATOR_TWL4030 && USB_MUSB_OMAP2PLUS
drivers/phy/Makefile +1 -0
@@ -8,6 +8,7 @@ obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO) += phy-exynos-dp-video.o obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o obj-$(CONFIG_PHY_MVEBU_SATA) += phy-mvebu-sata.o obj-$(CONFIG_OMAP_USB2) += phy-omap-usb2.o +obj-$(CONFIG_TI_PIPE3) += phy-ti-pipe3.o obj-$(CONFIG_TWL4030_USB) += phy-twl4030-usb.o obj-$(CONFIG_PHY_EXYNOS5250_SATA) += phy-exynos5250-sata.o obj-$(CONFIG_PHY_SUN4I_USB) += phy-sun4i-usb.o
drivers/phy/phy-ti-pipe3.c renamed from drivers/usb/phy/phy-omap-usb3.c +146 -94
412 lines not on this page · raw message
drivers/usb/phy/Kconfig +0 -11
@@ -85,17 +85,6 @@ config OMAP_CONTROL_USB power on the USB2 PHY is present in OMAP4 and OMAP5. OMAP5 has an additional register to power on USB3 PHY. -config OMAP_USB3 - tristate "OMAP USB3 PHY Driver" - depends on ARCH_OMAP2PLUS || COMPILE_TEST - select OMAP_CONTROL_USB - select USB_PHY - 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 AM335X_CONTROL_USB tristate
drivers/usb/phy/Makefile +0 -1
@@ -17,7 +17,6 @@ obj-$(CONFIG_OMAP_CONTROL_USB) += phy-omap-control.o obj-$(CONFIG_AM335X_CONTROL_USB) += phy-am335x-control.o obj-$(CONFIG_AM335X_PHY_USB) += phy-am335x.o obj-$(CONFIG_OMAP_OTG) += phy-omap-otg.o -obj-$(CONFIG_OMAP_USB3) += phy-omap-usb3.o obj-$(CONFIG_SAMSUNG_USBPHY) += phy-samsung-usb.o obj-$(CONFIG_SAMSUNG_USB2PHY) += phy-samsung-usb2.o obj-$(CONFIG_SAMSUNG_USB3PHY) += phy-samsung-usb3.o
Signature · 1 line
1.7.9.5
PATCH 10/28 usb: phy: omap-usb2: remove *set_suspend* callback from omap-usb2
In reply to Kishon Vijay Abraham INow that omap-usb2 is adapted to the new generic PHY framework, *set_suspend* ops can be removed from omap-usb2 driver.
--- drivers/phy/phy-omap-usb2.c | 25 ------------------------- 1 file changed, 25 deletions(-)
drivers/phy/phy-omap-usb2.c +0 -25
@@ -98,28 +98,6 @@ static int omap_usb_set_peripheral(struct usb_otg *otg,return 0 ; } -static int omap_usb2_suspend (struct usb_phy *x,int suspend) -{ -struct omap_usb *phy =phy_to_omapusb (x); -int ret; - -if (suspend && !phy->is_suspended) { -omap_control_usb_phy_power (phy->control_dev,0 ); -pm_runtime_put_sync (phy->dev); - phy->is_suspended =1 ; - }else if (!suspend && phy->is_suspended) { - ret =pm_runtime_get_sync (phy->dev); -if (ret <0 ) { -dev_err (phy->dev,"get_sync failed with err %d\n" , ret); -return ret; - } -omap_control_usb_phy_power (phy->control_dev,1 ); - phy->is_suspended =0 ; - } - -return 0 ; -} -static int omap_usb_power_off (struct phy *x) {struct omap_usb *phy =phy_get_drvdata (x);
@@ -173,7 +151,6 @@ static int omap_usb2_probe(struct platform_device *pdev) phy->phy.dev = phy->dev; phy->phy.label ="omap-usb2" ; - phy->phy.set_suspend = omap_usb2_suspend; phy->phy.otg = otg; phy->phy.type =USB_PHY_TYPE_USB2 ;
@@ -190,8 +167,6 @@ static int omap_usb2_probe(struct platform_device *pdev) } phy->control_dev = &control_pdev->dev; - - phy->is_suspended =1 ;omap_control_usb_phy_power (phy->control_dev,0 ); otg->set_host = omap_usb_set_host;
Signature · 1 line
1.7.9.5
PATCH 11/28 phy: omap-usb2: move omap_usb.h from linux/usb/ to linux/phy/
In reply to Kishon Vijay Abraham INo functional change. Moved omap_usb.h from linux/usb/ to linux/phy/. Also removed the unused members of struct omap_usb (after phy-omap-pipe3 started using it's own header file)
---
drivers/phy/phy-omap-usb2.c | 2 +-
drivers/usb/phy/phy-twl6030-usb.c | 2 +-
include/linux/{usb => phy}/omap_usb.h | 3 ---
3 files changed, 2 insertions(+), 5 deletions(-)
rename include/linux/{usb => phy}/omap_usb.h (95%)drivers/phy/phy-omap-usb2.c +1 -1
@@ -21,7 +21,7 @@#include <linux/slab.h> #include <linux/of.h> #include <linux/io.h> -#include <linux/usb/omap_usb.h> +#include <linux/phy/omap_usb.h> #include <linux/usb/phy_companion.h> #include <linux/clk.h> #include <linux/err.h>
drivers/usb/phy/phy-twl6030-usb.c +1 -1
@@ -27,7 +27,7 @@#include <linux/io.h> #include <linux/usb/musb-omap.h> #include <linux/usb/phy_companion.h> -#include <linux/usb/omap_usb.h> +#include <linux/phy/omap_usb.h> #include <linux/i2c/twl.h> #include <linux/regulator/consumer.h> #include <linux/err.h>
include/linux/phy/omap_usb.h renamed from include/linux/usb/omap_usb.h +0 -3
@@ -33,13 +33,10 @@ struct usb_dpll_params {struct omap_usb {struct usb_phy phy;struct phy_companion *comparator; -void __iomem *pll_ctrl_base;struct device *dev;struct device *control_dev;struct clk *wkupclk; -struct clk *sys_clk;struct clk *optclk; -u8 is_suspended:1 ; };#define phy_to_omapusb (x) container_of((x), struct omap_usb, phy)
Signature · 1 line
1.7.9.5
PATCH 12/28 phy: core: Add an exported of_phy_get function
In reply to Kishon Vijay Abraham IFrom: Kamil Debski <[email protected]>
Previously the of_phy_get function took a struct device * and was declared static. It was impossible to call it from another driver and thus it was impossible to get phy defined for a given node. The old function was renamed to _of_phy_get and was left for internal use. of_phy_get function was added and it was exported. The function enables to get a phy for a given device tree node.
--- drivers/phy/phy-core.c | 45 ++++++++++++++++++++++++++++++++++++--------- include/linux/phy/phy.h | 6 ++++++ 2 files changed, 42 insertions(+), 9 deletions(-)
drivers/phy/phy-core.c +36 -9
@@ -274,8 +274,8 @@ int phy_power_off(struct phy *phy)EXPORT_SYMBOL_GPL (phy_power_off);/** -* of_phy_get() - lookup and obtain a reference to a phy by phandle -* @dev: device that requests this phy +* _of_phy_get() - lookup and obtain a reference to a phy by phandle +* @np: device_node for which to get the phy * @index: the index of the phy * * Returns the phy associated with the given phandle value,
@@ -284,20 +284,17 @@ EXPORT_SYMBOL_GPL(phy_power_off);* not yet loaded. This function uses of_xlate call back function provided * while registering the phy_provider to find the phy instance. */ -static struct phy *of_phy_get (struct device *dev,int index) +static struct phy *_of_phy_get (struct device_node *np,int index) {int ret;struct phy_provider *phy_provider;struct phy *phy =NULL ;struct of_phandle_args args; - ret =of_parse_phandle_with_args (dev->of_node,"phys" ,"#phy-cells" , + ret =of_parse_phandle_with_args (np,"phys" ,"#phy-cells" , index, &args); -if (ret) { -dev_dbg (dev,"failed to get phy in %s node\n" , - dev->of_node->full_name); +if (ret)return ERR_PTR (-ENODEV ); - }mutex_lock (&phy_provider_mutex); phy_provider =of_phy_provider_lookup (args.np);
@@ -317,6 +314,36 @@ err0: }/** +* of_phy_get() - lookup and obtain a reference to a phy using a device_node. +* @np: device_node for which to get the phy +* @con_id: name of the phy from device's point of view +* +* Returns the phy driver, after getting a refcount to it; or +* -ENODEV if there is no such phy. The caller is responsible for +* calling phy_put() to release that count. +*/ +struct phy *of_phy_get (struct device_node *np,const char *con_id) +{ +struct phy *phy =NULL ; +int index =0 ; + +if (con_id) + index =of_property_match_string (np,"phy-names" , con_id); + + phy =_of_phy_get (np, index); +if (IS_ERR (phy)) +return phy; + +if (!try_module_get (phy->ops->owner)) +return ERR_PTR (-EPROBE_DEFER ); + +get_device (&phy->dev); + +return phy; +} +EXPORT_SYMBOL_GPL (of_phy_get); + +/** * phy_put() - release the PHY * @phy: the phy returned by phy_get() *
@@ -407,7 +434,7 @@ struct phy *phy_get(struct device *dev, const char *string)if (dev->of_node) { index =of_property_match_string (dev->of_node,"phy-names" , string); - phy =of_phy_get (dev, index); + phy =_of_phy_get (dev->of_node, index); }else { phy =phy_lookup (dev, string); }
include/linux/phy/phy.h +6 -0
@@ -151,6 +151,7 @@ struct phy *devm_phy_get(struct device *dev, const char *string);struct phy *devm_phy_optional_get (struct device *dev,const char *string);void phy_put (struct phy *phy);void devm_phy_put (struct device *dev,struct phy *phy); +struct phy *of_phy_get (struct device_node *np,const char *con_id);struct phy *of_phy_simple_xlate (struct device *dev,struct of_phandle_args *args); struct phy *phy_create(struct device *dev, const struct phy_ops *ops,
@@ -259,6 +260,11 @@ static inline void devm_phy_put(struct device *dev, struct phy *phy) { } +static inline struct phy *of_phy_get (struct device_node *np,const char *con_id) +{ +return ERR_PTR (-ENOSYS ); +} +static inline struct phy *of_phy_simple_xlate (struct device *dev,struct of_phandle_args *args) {
Signature · 1 line
1.7.9.5
PATCH 13/28 phy: core: Add devm_of_phy_get to phy-core
In reply to Kishon Vijay Abraham IFrom: Kamil Debski <[email protected]>
Adding devm_of_phy_get will allow to get phys by supplying a pointer to the struct device_node instead of struct device.
--- drivers/phy/phy-core.c | 31 +++++++++++++++++++++++++++++++ include/linux/phy/phy.h | 9 +++++++++ 2 files changed, 40 insertions(+)
drivers/phy/phy-core.c +31 -0
@@ -526,6 +526,37 @@ struct phy *devm_phy_optional_get(struct device *dev, const char *string)EXPORT_SYMBOL_GPL (devm_phy_optional_get);/** +* devm_of_phy_get() - lookup and obtain a reference to a phy. +* @dev: device that requests this phy +* @np: node containing the phy +* @con_id: name of the phy from device's point of view +* +* Gets the phy using of_phy_get(), and associates a device with it using +* devres. On driver detach, release function is invoked on the devres data, +* then, devres data is freed. +*/ +struct phy *devm_of_phy_get (struct device *dev,struct device_node *np, +const char *con_id) +{ +struct phy **ptr, *phy; + + ptr =devres_alloc (devm_phy_release,sizeof (*ptr),GFP_KERNEL ); +if (!ptr) +return ERR_PTR (-ENOMEM ); + + phy =of_phy_get (np, con_id); +if (!IS_ERR (phy)) { + *ptr = phy; +devres_add (dev, ptr); + }else { +devres_free (ptr); + } + +return phy; +} +EXPORT_SYMBOL_GPL (devm_of_phy_get); + +/** * phy_create() - create a new phy * @dev: device that is creating the new phy * @ops: function pointers for performing phy operations
include/linux/phy/phy.h +9 -0
@@ -149,6 +149,8 @@ struct phy *phy_get(struct device *dev, const char *string);struct phy *phy_optional_get (struct device *dev,const char *string);struct phy *devm_phy_get (struct device *dev,const char *string);struct phy *devm_phy_optional_get (struct device *dev,const char *string); +struct phy *devm_of_phy_get (struct device *dev,struct device_node *np, +const char *con_id);void phy_put (struct phy *phy);void devm_phy_put (struct device *dev,struct phy *phy);struct phy *of_phy_get (struct device_node *np,const char *con_id);
@@ -252,6 +254,13 @@ static inline struct phy *devm_phy_optional_get(struct device *dev,return ERR_PTR (-ENOSYS ); } +static inline struct phy *devm_of_phy_get (struct device *dev, +struct device_node *np, +const char *con_id) +{ +return ERR_PTR (-ENOSYS ); +} +static inline void phy_put (struct phy *phy) { }
Signature · 1 line
1.7.9.5
PATCH 14/28 phy: Add new Exynos USB 2.0 PHY driver
In reply to Kishon Vijay Abraham IFrom: Kamil Debski <[email protected]>
Add a new driver for the Exynos USB 2.0 PHY. The new driver uses the generic PHY framework. The driver includes support for the Exynos 4x10 and 4x12 SoC families.
--- .../devicetree/bindings/phy/samsung-phy.txt | 53 ++++ Documentation/phy/samsung-usb2.txt | 135 ++++++++ drivers/phy/Kconfig | 29 ++ drivers/phy/Makefile | 3 + drivers/phy/phy-exynos4210-usb2.c | 261 ++++++++++++++++ drivers/phy/phy-exynos4x12-usb2.c | 328 ++++++++++++++++++++ drivers/phy/phy-samsung-usb2.c | 222 +++++++++++++ drivers/phy/phy-samsung-usb2.h | 66 ++++ 8 files changed, 1097 insertions(+) create mode 100644 Documentation/phy/samsung-usb2.txt create mode 100644 drivers/phy/phy-exynos4210-usb2.c create mode 100644 drivers/phy/phy-exynos4x12-usb2.c create mode 100644 drivers/phy/phy-samsung-usb2.c create mode 100644 drivers/phy/phy-samsung-usb2.h
Documentation/devicetree/bindings/phy/samsung-phy.txt +53 -0
@@ -20,3 +20,56 @@ Required properties: - compatible : should be "samsung,exynos5250-dp-video-phy"; - reg : offset and length of the Display Port PHY register set; - #phy-cells : from the generic PHY bindings, must be 0; + +Samsung S5P/EXYNOS SoC series USB PHY +------------------------------------------------- + +Required properties: +- compatible : should be one of the listed compatibles: + - "samsung,exynos4210-usb2-phy" + - "samsung,exynos4x12-usb2-phy" +- reg : a list of registers used by phy driver + - first and obligatory is the location of phy modules registers +- samsung,sysreg-phandle - handle to syscon used to control the system registers +- samsung,pmureg-phandle - handle to syscon used to control PMU registers +- #phy-cells : from the generic phy bindings, must be 1; +- clocks and clock-names: + - the "phy" clock is required by the phy module, used as a gate + - the "ref" clock is used to get the rate of the clock provided to the + PHY module + +The first phandle argument in the PHY specifier identifies the PHY, its +meaning is compatible dependent. For the currently supported SoCs (Exynos 4210 +and Exynos 4212) it is as follows: + 0 - USB device ("device"), + 1 - USB host ("host"), + 2 - HSIC0 ("hsic0"), + 3 - HSIC1 ("hsic1"), + +Exynos 4210 and Exynos 4212 use mode switching and require that mode switch +register is supplied. + +Example: + +For Exynos 4412 (compatible with Exynos 4212): + +usbphy: phy@125b0000 { + compatible = "samsung,exynos4x12-usb2-phy"; + reg = <0x125b0000 0x100>; + clocks = <&clock 305>, <&clock 2>; + clock-names = "phy", "ref"; + status = "okay"; + #phy-cells = <1>; + samsung,sysreg-phandle = <&sys_reg>; + samsung,pmureg-phandle = <&pmu_reg>; +}; + +Then the PHY can be used in other nodes such as: + +phy-consumer@12340000 { + phys = <&usbphy 2>; + phy-names = "phy"; +}; + +Refer to DT bindings documentation of particular PHY consumer devices for more +information about required PHYs and the way of specification.
Documentation/phy/samsung-usb2.txt new file +135 -0
135 lines not on this page · raw message
drivers/phy/Kconfig +29 -0
@@ -107,4 +107,33 @@ config PHY_SUN4I_USB This driver controls the entire USB PHY block, both the USB OTG parts, as well as the 2 regular USB 2 host PHYs. +config PHY_SAMSUNG_USB2 + tristate "Samsung USB 2.0 PHY driver" + select GENERIC_PHY + select MFD_SYSCON + help + Enable this to support the Samsung USB 2.0 PHY driver for Samsung + SoCs. This driver provides the interface for USB 2.0 PHY. Support for + particular SoCs has to be enabled in addition to this driver. Number + and type of supported phys depends on the SoC. + +config PHY_EXYNOS4210_USB2 + bool "Support for Exynos 4210" + depends on PHY_SAMSUNG_USB2 + depends on CPU_EXYNOS4210 + help + Enable USB PHY support for Exynos 4210. This option requires that + Samsung USB 2.0 PHY driver is enabled and means that support for this + particular SoC is compiled in the driver. In case of Exynos 4210 four + phys are available - device, host, HSIC0 and HSIC1. + +config PHY_EXYNOS4X12_USB2 + bool "Support for Exynos 4x12" + depends on PHY_SAMSUNG_USB2 + depends on (SOC_EXYNOS4212 || SOC_EXYNOS4412) + help + Enable USB PHY support for Exynos 4x12. This option requires that + Samsung USB 2.0 PHY driver is enabled and means that support for this + particular SoC is compiled in the driver. In case of Exynos 4x12 four + phys are available - device, host, HSIC0 and HSIC1. endmenu
drivers/phy/Makefile +3 -0
@@ -12,3 +12,6 @@ obj-$(CONFIG_TI_PIPE3) += phy-ti-pipe3.o obj-$(CONFIG_TWL4030_USB) += phy-twl4030-usb.o obj-$(CONFIG_PHY_EXYNOS5250_SATA) += phy-exynos5250-sata.o obj-$(CONFIG_PHY_SUN4I_USB) += phy-sun4i-usb.o +obj-$(CONFIG_PHY_SAMSUNG_USB2) += phy-samsung-usb2.o +obj-$(CONFIG_PHY_EXYNOS4210_USB2) += phy-exynos4210-usb2.o +obj-$(CONFIG_PHY_EXYNOS4X12_USB2) += phy-exynos4x12-usb2.o
drivers/phy/phy-exynos4210-usb2.c new file +261 -0
261 lines not on this page · raw message
drivers/phy/phy-exynos4x12-usb2.c new file +328 -0
328 lines not on this page · raw message
drivers/phy/phy-samsung-usb2.c new file +222 -0
222 lines not on this page · raw message
drivers/phy/phy-samsung-usb2.h new file +66 -0
66 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 15/28 phy: Add Exynos 5250 support to the Exynos USB 2.0 PHY driver
In reply to Kishon Vijay Abraham IFrom: Kamil Debski <[email protected]>
Add support for Exynos 5250. This driver is to replace the old USB 2.0 PHY driver.
--- .../devicetree/bindings/phy/samsung-phy.txt | 1 + drivers/phy/Kconfig | 11 + drivers/phy/Makefile | 1 + drivers/phy/phy-exynos5250-usb2.c | 404 ++++++++++++++++++++ drivers/phy/phy-samsung-usb2.c | 6 + drivers/phy/phy-samsung-usb2.h | 1 + 6 files changed, 424 insertions(+) create mode 100644 drivers/phy/phy-exynos5250-usb2.c
Documentation/devicetree/bindings/phy/samsung-phy.txt +1 -0
@@ -28,6 +28,7 @@ Required properties: - compatible : should be one of the listed compatibles: - "samsung,exynos4210-usb2-phy" - "samsung,exynos4x12-usb2-phy" + - "samsung,exynos5250-usb2-phy" - reg : a list of registers used by phy driver - first and obligatory is the location of phy modules registers - samsung,sysreg-phandle - handle to syscon used to control the system registers
drivers/phy/Kconfig +11 -0
@@ -136,4 +136,15 @@ config PHY_EXYNOS4X12_USB2 Samsung USB 2.0 PHY driver is enabled and means that support for this particular SoC is compiled in the driver. In case of Exynos 4x12 four phys are available - device, host, HSIC0 and HSIC1. + +config PHY_EXYNOS5250_USB2 + bool "Support for Exynos 5250" + depends on PHY_SAMSUNG_USB2 + depends on SOC_EXYNOS5250 + help + Enable USB PHY support for Exynos 5250. This option requires that + Samsung USB 2.0 PHY driver is enabled and means that support for this + particular SoC is compiled in the driver. In case of Exynos 5250 four + phys are available - device, host, HSIC0 and HSIC. + endmenu
drivers/phy/Makefile +1 -0
@@ -15,3 +15,4 @@ obj-$(CONFIG_PHY_SUN4I_USB) += phy-sun4i-usb.o obj-$(CONFIG_PHY_SAMSUNG_USB2) += phy-samsung-usb2.o obj-$(CONFIG_PHY_EXYNOS4210_USB2) += phy-exynos4210-usb2.o obj-$(CONFIG_PHY_EXYNOS4X12_USB2) += phy-exynos4x12-usb2.o +obj-$(CONFIG_PHY_EXYNOS5250_USB2) += phy-exynos5250-usb2.o
drivers/phy/phy-exynos5250-usb2.c new file +404 -0
404 lines not on this page · raw message
drivers/phy/phy-samsung-usb2.c +6 -0
@@ -99,6 +99,12 @@ static const struct of_device_id samsung_usb2_phy_of_match[] = { .data = &exynos4x12_usb2_phy_config, },#endif +#ifdef CONFIG_PHY_EXYNOS5250_USB2 + { + .compatible = "samsung,exynos5250-usb2-phy", + .data = &exynos5250_usb2_phy_config, + }, +#endif { }, };
drivers/phy/phy-samsung-usb2.h +1 -0
@@ -63,4 +63,5 @@ struct samsung_usb2_phy_config {extern const struct samsung_usb2_phy_config exynos4210_usb2_phy_config;extern const struct samsung_usb2_phy_config exynos4x12_usb2_phy_config; +extern const struct samsung_usb2_phy_config exynos5250_usb2_phy_config;#endif
Signature · 1 line
1.7.9.5
PATCH 16/28 phy: omap-usb2: Adapt phy-omap-usb2 for AM437x
In reply to Kishon Vijay Abraham IFrom: George Cherian <[email protected]>
Adapt phy-omap-usb2 driver for AM437x.
- Add new comaptible "ti,am437x-usb2" for AM437x
- Pass proper data to differentiate AM437x and others.
- AM437x doesnot support set_vbus and start_srp.
- Also update the Documentation to add new compatible.
--- Documentation/devicetree/bindings/usb/usb-phy.txt | 4 +- drivers/phy/phy-omap-usb2.c | 49 ++++++++++++++++----- include/linux/phy/omap_usb.h | 9 ++++ 3 files changed, 49 insertions(+), 13 deletions(-)
Documentation/devicetree/bindings/usb/usb-phy.txt +3 -1
@@ -3,7 +3,9 @@ USB PHY OMAP USB2 PHY Required properties: - - compatible: Should be "ti,omap-usb2" + - compatible: Should be either of + * "ti,omap-usb2" for OMAP4, OMAP5, DRA7 + * "ti,am437x-usb2" for AM437x - reg : Address and length of the register set for the device. - #phy-cells: determine the number of cells that should be given in the phandle while referencing this phy.
drivers/phy/phy-omap-usb2.c +37 -12
82 lines not on this page · raw message
include/linux/phy/omap_usb.h +9 -0
@@ -39,6 +39,15 @@ struct omap_usb {struct clk *optclk; }; +struct usb_phy_data { +const char *label; +u8 flags; +}; + +/* Driver Flags */ +#define OMAP_USB2_HAS_START_SRP (1 << 0) +#define OMAP_USB2_HAS_SET_VBUS (1 << 1) +#define phy_to_omapusb (x) container_of((x), struct omap_usb, phy)#if defined(CONFIG_OMAP_USB2 ) || defined(CONFIG_OMAP_USB2_MODULE )
Signature · 1 line
1.7.9.5
PATCH 17/28 phy: omap-usb2: Provide workaround for USB2PHY false disconnect
In reply to Kishon Vijay Abraham IFrom: Austin Beam <[email protected]>
Enable the dra7x errata workaround for false disconnect problem with USB2PHY. False disconnects were detected with some of the devices. Reduce the sensitivity of the disconnect logic within the USB2PHY subsystem to enusre these false disconnects are not registered.
[[email protected]]
While at that, pass proper flags for each SoC's. This is a common driver used across OMAP4,OMAP5,DRA7xx and AM437x USB2PHY.
False disconnect workaround is currently applicable for only DRA7x.
Update the Documentation also to add new comaptible.
--- Documentation/devicetree/bindings/usb/usb-phy.txt | 3 +- drivers/phy/phy-omap-usb2.c | 44 +++++++++++++++++++++ include/linux/phy/omap_usb.h | 4 ++ 3 files changed, 50 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/usb/usb-phy.txt +2 -1
@@ -4,7 +4,8 @@ OMAP USB2 PHY Required properties: - compatible: Should be either of - * "ti,omap-usb2" for OMAP4, OMAP5, DRA7 + * "ti,omap-usb2" for OMAP4 and OMAP5 + * "ti,dra7x-usb2" for DRA7 * "ti,am437x-usb2" for AM437x - reg : Address and length of the register set for the device. - #phy-cells: determine the number of cells that should be given in the
drivers/phy/phy-omap-usb2.c +44 -0
81 lines not on this page · raw message
include/linux/phy/omap_usb.h +4 -0
@@ -33,10 +33,13 @@ struct usb_dpll_params {struct omap_usb {struct usb_phy phy;struct phy_companion *comparator; +void __iomem *pll_ctrl_base; +void __iomem *phy_base;struct device *dev;struct device *control_dev;struct clk *wkupclk;struct clk *optclk; +u8 flags; };struct usb_phy_data {
@@ -47,6 +50,7 @@ struct usb_phy_data {/* Driver Flags */ #define OMAP_USB2_HAS_START_SRP (1 << 0)#define OMAP_USB2_HAS_SET_VBUS (1 << 1) +#define OMAP_USB2_CALIBRATE_FALSE_DISCONNECT (1 << 2)#define phy_to_omapusb (x) container_of((x), struct omap_usb, phy)
Signature · 1 line
1.7.9.5
PATCH 18/28 phy: omap-usb2: Add different compatible for OMAP5
In reply to Kishon Vijay Abraham IFrom: George Cherian <[email protected]>
Add a new compatible for OMAP5 since it does not use any of the OTG operations as of now.HAS_SRP and SET_VBUS functionalities are used only for OMAP4.
Update the Documentation also to add new comaptible.
--- Documentation/devicetree/bindings/usb/usb-phy.txt | 3 ++- drivers/phy/phy-omap-usb2.c | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/usb/usb-phy.txt +2 -1
@@ -4,7 +4,8 @@ OMAP USB2 PHY Required properties: - compatible: Should be either of - * "ti,omap-usb2" for OMAP4 and OMAP5 + * "ti,omap-usb2" for OMAP4 + * "ti,omap5-usb2" for OMAP5 * "ti,dra7x-usb2" for DRA7 * "ti,am437x-usb2" for AM437x - reg : Address and length of the register set for the device.
drivers/phy/phy-omap-usb2.c +9 -0
@@ -154,6 +154,11 @@ static const struct usb_phy_data omap_usb2_data = { .flags = OMAP_USB2_HAS_START_SRP | OMAP_USB2_HAS_SET_VBUS, }; +static const struct usb_phy_data omap5_usb2_data = { + .label ="omap5_usb2" , + .flags =0 , +}; +static const struct usb_phy_data dra7x_usb2_data = { .label ="dra7x_usb2" , .flags =OMAP_USB2_CALIBRATE_FALSE_DISCONNECT ,
@@ -170,6 +175,10 @@ static const struct of_device_id omap_usb2_id_table[] = { .data = &omap_usb2_data, }, { + .compatible = "ti,omap5-usb2", + .data = &omap5_usb2_data, + }, + { .compatible = "ti,dra7x-usb2", .data = &dra7x_usb2_data, },
Signature · 1 line
1.7.9.5
PATCH 19/28 phy: rename struct omap_control_usb to struct omap_control_phy
In reply to Kishon Vijay Abraham IRename struct omap_control_usb to struct omap_control_phy since it can be used to control PHY of USB, SATA and PCIE. Also move the driver and include files under *phy* and made the corresponding changes in the users of phy-omap-control.
---
drivers/phy/Kconfig | 14 +-
drivers/phy/Makefile | 1 +
drivers/{usb => }/phy/phy-omap-control.c | 165 ++++++++++----------
drivers/phy/phy-omap-usb2.c | 8 +-
drivers/phy/phy-ti-pipe3.c | 8 +-
drivers/usb/musb/omap2430.c | 2 +-
drivers/usb/phy/Kconfig | 10 --
drivers/usb/phy/Makefile | 1 -
.../omap_control_usb.h => phy/omap_control_phy.h} | 36 ++---
9 files changed, 123 insertions(+), 122 deletions(-)
rename drivers/{usb => }/phy/phy-omap-control.c (55%)
rename include/linux/{usb/omap_control_usb.h => phy/omap_control_phy.h} (68%)drivers/phy/Kconfig +12 -2
@@ -31,12 +31,22 @@ config PHY_MVEBU_SATA depends on OF select GENERIC_PHY +config OMAP_CONTROL_PHY + tristate "OMAP CONTROL PHY Driver" + help + Enable this to add support for the PHY 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/SATA PHY/PCIE PHY + (PIPE3 PHY). + config OMAP_USB2 tristate "OMAP USB2 PHY Driver" depends on ARCH_OMAP2PLUS depends on USB_PHY select GENERIC_PHY - select OMAP_CONTROL_USB + select OMAP_CONTROL_PHY help Enable this to support the transceiver that is part of SOC. This driver takes care of all the PHY functionality apart from comparator.
@@ -47,7 +57,7 @@ config TI_PIPE3 tristate "TI PIPE3 PHY Driver" depends on ARCH_OMAP2PLUS || COMPILE_TEST select GENERIC_PHY - select OMAP_CONTROL_USB + select OMAP_CONTROL_PHY help Enable this to support the PIPE3 PHY that is part of TI SOCs. This driver takes care of all the PHY functionality apart from comparator.
drivers/phy/Makefile +1 -0
@@ -7,6 +7,7 @@ obj-$(CONFIG_BCM_KONA_USB2_PHY) += phy-bcm-kona-usb2.o obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO) += phy-exynos-dp-video.o obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o obj-$(CONFIG_PHY_MVEBU_SATA) += phy-mvebu-sata.o +obj-$(CONFIG_OMAP_CONTROL_PHY) += phy-omap-control.o obj-$(CONFIG_OMAP_USB2) += phy-omap-usb2.o obj-$(CONFIG_TI_PIPE3) += phy-ti-pipe3.o obj-$(CONFIG_TWL4030_USB) += phy-twl4030-usb.o
drivers/phy/phy-omap-control.c renamed from drivers/usb/phy/phy-omap-control.c +83 -82
336 lines not on this page · raw message
drivers/phy/phy-omap-usb2.c +4 -4
@@ -27,7 +27,7 @@#include <linux/err.h> #include <linux/pm_runtime.h> #include <linux/delay.h> -#include <linux/usb/omap_control_usb.h> +#include <linux/phy/omap_control_phy.h> #include <linux/phy/phy.h> #include <linux/of_platform.h>
@@ -105,7 +105,7 @@ static int omap_usb_power_off(struct phy *x) {struct omap_usb *phy =phy_get_drvdata (x); -omap_control_usb_phy_power (phy->control_dev,0 ); +omap_control_phy_power (phy->control_dev,0 );return 0 ; }
@@ -114,7 +114,7 @@ static int omap_usb_power_on(struct phy *x) {struct omap_usb *phy =phy_get_drvdata (x); -omap_control_usb_phy_power (phy->control_dev,1 ); +omap_control_phy_power (phy->control_dev,1 );return 0 ; }
@@ -251,7 +251,7 @@ static int omap_usb2_probe(struct platform_device *pdev) } phy->control_dev = &control_pdev->dev; -omap_control_usb_phy_power (phy->control_dev,0 ); +omap_control_phy_power (phy->control_dev,0 ); otg->set_host = omap_usb_set_host; otg->set_peripheral = omap_usb_set_peripheral;
drivers/phy/phy-ti-pipe3.c +4 -4
@@ -26,7 +26,7 @@#include <linux/io.h> #include <linux/pm_runtime.h> #include <linux/delay.h> -#include <linux/usb/omap_control_usb.h> +#include <linux/phy/omap_control_phy.h> #include <linux/of_platform.h> #define PLL_STATUS 0x00000004
@@ -134,7 +134,7 @@ static int ti_pipe3_power_off(struct phy *x)return -EBUSY ; } -omap_control_usb_phy_power (phy->control_dev,0 ); +omap_control_phy_power (phy->control_dev,0 );return 0 ; }
@@ -232,7 +232,7 @@ static int ti_pipe3_init(struct phy *x)if (ret)return ret; -omap_control_usb_phy_power (phy->control_dev,1 ); +omap_control_phy_power (phy->control_dev,1 );return 0 ; }
@@ -304,7 +304,7 @@ static int ti_pipe3_probe(struct platform_device *pdev) phy->control_dev = &control_pdev->dev; -omap_control_usb_phy_power (phy->control_dev,0 ); +omap_control_phy_power (phy->control_dev,0 );platform_set_drvdata (pdev, phy);pm_runtime_enable (phy->dev);
drivers/usb/musb/omap2430.c +1 -1
@@ -37,7 +37,7 @@#include <linux/err.h> #include <linux/delay.h> #include <linux/usb/musb-omap.h> -#include <linux/usb/omap_control_usb.h> +#include <linux/phy/omap_control_phy.h> #include <linux/of_platform.h> #include "musb_core.h"
drivers/usb/phy/Kconfig +0 -10
@@ -75,16 +75,6 @@ config NOP_USB_XCEIV 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" - depends on ARCH_OMAP2PLUS || COMPILE_TEST - 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 AM335X_CONTROL_USB tristate
drivers/usb/phy/Makefile +0 -1
@@ -13,7 +13,6 @@ obj-$(CONFIG_ISP1301_OMAP) += phy-isp1301-omap.o obj-$(CONFIG_MV_U3D_PHY) += phy-mv-u3d-usb.o obj-$(CONFIG_NOP_USB_XCEIV) += phy-generic.o obj-$(CONFIG_TAHVO_USB) += phy-tahvo.o -obj-$(CONFIG_OMAP_CONTROL_USB) += phy-omap-control.o obj-$(CONFIG_AM335X_CONTROL_USB) += phy-am335x-control.o obj-$(CONFIG_AM335X_PHY_USB) += phy-am335x.o obj-$(CONFIG_OMAP_OTG) += phy-omap-otg.o
include/linux/phy/omap_control_phy.h renamed from include/linux/usb/omap_control_usb.h +18 -18
@@ -1,5 +1,5 @@/* -* omap_control_usb.h - Header file for the USB part of control module. +* omap_control_phy.h - Header file for the PHY part of control module. * * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com * This program is free software; you can redistribute it and/or modify
@@ -16,10 +16,10 @@* */ -#ifndef __OMAP_CONTROL_USB_H__ -#define __OMAP_CONTROL_USB_H__ +#ifndef __OMAP_CONTROL_PHY_H__ +#define __OMAP_CONTROL_PHY_H__ -enum omap_control_usb_type { +enum omap_control_phy_type {OMAP_CTRL_TYPE_OTGHS =1 ,/* Mailbox OTGHS_CONTROL */ OMAP_CTRL_TYPE_USB2 ,/* USB2_PHY, power down in CONTROL_DEV_CONF */ OMAP_CTRL_TYPE_PIPE3, /* PIPE3 PHY, DPLL & seperate Rx/Tx power */
@@ -27,7 +27,7 @@ enum omap_control_usb_type { OMAP_CTRL_TYPE_AM437USB2, /* USB2 PHY, power e.g. AM437x */ }; -struct omap_control_usb { +struct omap_control_phy {struct device *dev;u32 __iomem *otghs_control;
@@ -36,7 +36,7 @@ struct omap_control_usb {struct clk *sys_clk; -enum omap_control_usb_type type; +enum omap_control_phy_type type; };enum omap_control_usb_mode {
@@ -54,14 +54,14 @@ enum omap_control_usb_mode {#define OMAP_CTRL_DEV_SESSEND BIT(3)#define OMAP_CTRL_DEV_IDDIG BIT(4) -#define OMAP_CTRL_USB_PWRCTL_CLK_CMD_MASK 0x003FC000 -#define OMAP_CTRL_USB_PWRCTL_CLK_CMD_SHIFT 0xE +#define OMAP_CTRL_PIPE3_PHY_PWRCTL_CLK_CMD_MASK 0x003FC000 +#define OMAP_CTRL_PIPE3_PHY_PWRCTL_CLK_CMD_SHIFT 0xE -#define OMAP_CTRL_USB_PWRCTL_CLK_FREQ_MASK 0xFFC00000 -#define OMAP_CTRL_USB_PWRCTL_CLK_FREQ_SHIFT 0x16 +#define OMAP_CTRL_PIPE3_PHY_PWRCTL_CLK_FREQ_MASK 0xFFC00000 +#define OMAP_CTRL_PIPE3_PHY_PWRCTL_CLK_FREQ_SHIFT 0x16 -#define OMAP_CTRL_USB3_PHY_TX_RX_POWERON 0x3 -#define OMAP_CTRL_USB3_PHY_TX_RX_POWEROFF 0x0 +#define OMAP_CTRL_PIPE3_PHY_TX_RX_POWERON 0x3 +#define OMAP_CTRL_PIPE3_PHY_TX_RX_POWEROFF 0x0#define OMAP_CTRL_USB2_PHY_PD BIT(28)
@@ -70,13 +70,13 @@ enum omap_control_usb_mode {#define AM437X_CTRL_USB2_OTGVDET_EN BIT(19)#define AM437X_CTRL_USB2_OTGSESSEND_EN BIT(20) -#if IS_ENABLED (CONFIG_OMAP_CONTROL_USB ) -extern void omap_control_usb_phy_power (struct device *dev,int on); -extern void omap_control_usb_set_mode (struct device *dev, -enum omap_control_usb_mode mode); +#if IS_ENABLED (CONFIG_OMAP_CONTROL_PHY ) +void omap_control_phy_power (struct device *dev,int on); +void omap_control_usb_set_mode (struct device *dev, +enum omap_control_usb_mode mode);#else -static inline void omap_control_usb_phy_power (struct device *dev,int on) +static inline void omap_control_phy_power (struct device *dev,int on) { }
@@ -86,4 +86,4 @@ static inline void omap_control_usb_set_mode(struct device *dev, }#endif -#endif /* __OMAP_CONTROL_USB_H__ */ +#endif /* __OMAP_CONTROL_PHY_H__ */
Signature · 1 line
1.7.9.5
PATCH 20/28 phy: omap-control: update dra7 and am437 usb2 bindings
In reply to Kishon Vijay Abraham IFrom: Roger Quadros <[email protected]>
The dra7-usb2 and am437-usb2 bindings have not yet been used. Change them to be more elegant.
--- drivers/phy/phy-omap-control.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/phy/phy-omap-control.c +2 -2
@@ -228,11 +228,11 @@ static const struct of_device_id omap_control_phy_id_table[] = { .data = &pipe3_data, }, { - .compatible = "ti,control-phy-dra7usb2", + .compatible = "ti,control-phy-usb2-dra7", .data = &dra7usb2_data, }, { - .compatible = "ti,control-phy-am437usb2", + .compatible = "ti,control-phy-usb2-am437", .data = &am437usb2_data, }, {},
Signature · 1 line
1.7.9.5
PATCH 21/28 phy: ti-pipe3: cleanup clock handling
In reply to Kishon Vijay Abraham IFrom: Roger Quadros <[email protected]>
As this driver is no longer USB specific, use generic clock names.
- Fix PLL_SD_SHIFT from 9 to 10
- Don't separate prepare/unprepare clock from enable/disable. This ensures optimal power savings.
--- drivers/phy/phy-ti-pipe3.c | 55 ++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 27 deletions(-)
drivers/phy/phy-ti-pipe3.c +28 -27
@@ -45,7 +45,7 @@#define PLL_SELFREQDCO_MASK 0x0000000E#define PLL_SELFREQDCO_SHIFT 0x1#define PLL_SD_MASK 0x0003FC00 -#define PLL_SD_SHIFT 0x9 +#define PLL_SD_SHIFT 10#define SET_PLL_GO 0x1#define PLL_TICOPWDN 0x10000#define PLL_LOCK 0x2
@@ -72,7 +72,7 @@ struct ti_pipe3 {struct device *control_dev;struct clk *wkupclk;struct clk *sys_clk; -struct clk *optclk; +struct clk *refclk; };struct pipe3_dpll_map {
@@ -270,23 +270,21 @@ static int ti_pipe3_probe(struct platform_device *pdev) phy->dev = &pdev->dev; - phy->wkupclk =devm_clk_get (phy->dev,"usb_phy_cm_clk32k" ); + phy->wkupclk =devm_clk_get (phy->dev,"wkupclk" );if (IS_ERR (phy->wkupclk)) { -dev_err (&pdev->dev,"unable to get usb_phy_cm_clk32k\n" ); +dev_err (&pdev->dev,"unable to get wkupclk\n" );return PTR_ERR (phy->wkupclk); } -clk_prepare (phy->wkupclk); - phy->optclk =devm_clk_get (phy->dev,"usb_otg_ss_refclk960m" ); -if (IS_ERR (phy->optclk)) { -dev_err (&pdev->dev,"unable to get usb_otg_ss_refclk960m\n" ); -return PTR_ERR (phy->optclk); + phy->refclk =devm_clk_get (phy->dev,"refclk" ); +if (IS_ERR (phy->refclk)) { +dev_err (&pdev->dev,"unable to get refclk\n" ); +return PTR_ERR (phy->refclk); } -clk_prepare (phy->optclk); - phy->sys_clk =devm_clk_get (phy->dev,"sys_clkin" ); + phy->sys_clk =devm_clk_get (phy->dev,"sysclk" );if (IS_ERR (phy->sys_clk)) { -pr_err ("%s: unable to get sys_clkin\n" , __func__); +dev_err (&pdev->dev,"unable to get sysclk\n" );return -EINVAL ; }
@@ -326,10 +324,6 @@ static int ti_pipe3_probe(struct platform_device *pdev)static int ti_pipe3_remove (struct platform_device *pdev) { -struct ti_pipe3 *phy =platform_get_drvdata (pdev); - -clk_unprepare (phy->wkupclk); -clk_unprepare (phy->optclk);if (!pm_runtime_suspended (&pdev->dev))pm_runtime_put (&pdev->dev);pm_runtime_disable (&pdev->dev);
@@ -343,8 +337,10 @@ static int ti_pipe3_runtime_suspend(struct device *dev) {struct ti_pipe3 *phy =dev_get_drvdata (dev); -clk_disable (phy->wkupclk); -clk_disable (phy->optclk); +if (!IS_ERR (phy->wkupclk)) +clk_disable_unprepare (phy->wkupclk); +if (!IS_ERR (phy->refclk)) +clk_disable_unprepare (phy->refclk);return 0 ; }
@@ -354,22 +350,27 @@ static int ti_pipe3_runtime_resume(struct device *dev)u32 ret =0 ;struct ti_pipe3 *phy =dev_get_drvdata (dev); - ret =clk_enable (phy->optclk); -if (ret) { -dev_err (phy->dev,"Failed to enable optclk %d\n" , ret); - goto err1; +if (!IS_ERR (phy->refclk)) { + ret =clk_prepare_enable (phy->refclk); +if (ret) { +dev_err (phy->dev,"Failed to enable refclk %d\n" , ret); + goto err1; + } } - ret =clk_enable (phy->wkupclk); -if (ret) { -dev_err (phy->dev,"Failed to enable wkupclk %d\n" , ret); - goto err2; +if (!IS_ERR (phy->wkupclk)) { + ret =clk_prepare_enable (phy->wkupclk); +if (ret) { +dev_err (phy->dev,"Failed to enable wkupclk %d\n" , ret); + goto err2; + } }return 0 ; err2: -clk_disable (phy->optclk); +if (!IS_ERR (phy->refclk)) +clk_disable_unprepare (phy->refclk); err1:return ret;
Signature · 1 line
1.7.9.5
PATCH 22/28 phy: ti-pipe3: Add SATA DPLL support
In reply to Kishon Vijay Abraham IFrom: Roger Quadros <[email protected]>
USB and SATA DPLLs need different settings. Provide the SATA DPLL settings and use the proper DPLL settings based on device tree node's compatible_id.
--- drivers/phy/phy-ti-pipe3.c | 76 ++++++++++++++++++++++++++++++++------------ 1 file changed, 55 insertions(+), 21 deletions(-)
drivers/phy/phy-ti-pipe3.c +55 -21
@@ -66,6 +66,11 @@ struct pipe3_dpll_params {u32 mf; }; +struct pipe3_dpll_map { +unsigned long rate; +struct pipe3_dpll_params params; +}; +struct ti_pipe3 {void __iomem *pll_ctrl_base;struct device *dev;
@@ -73,20 +78,27 @@ struct ti_pipe3 {struct clk *wkupclk;struct clk *sys_clk;struct clk *refclk; +struct pipe3_dpll_map *dpll_map; }; -struct pipe3_dpll_map { -unsigned long rate; -struct pipe3_dpll_params params; -}; - -static struct pipe3_dpll_map dpll_map[] = { +static struct pipe3_dpll_map dpll_map_usb[] = { {12000000 , {1250 ,5 ,4 ,20 ,0 } },/* 12 MHz */ {16800000 , {3125 ,20 ,4 ,20 ,0 } },/* 16.8 MHz */ {19200000 , {1172 ,8 ,4 ,20 ,65537 } },/* 19.2 MHz */ {20000000 , {1000 ,7 ,4 ,10 ,0 } },/* 20 MHz */ {26000000 , {1250 ,12 ,4 ,20 ,0 } },/* 26 MHz */ {38400000 , {3125 ,47 ,4 ,20 ,92843 } },/* 38.4 MHz */ + { },/* Terminator */ +}; + +static struct pipe3_dpll_map dpll_map_sata[] = { + {12000000 , {1000 ,7 ,4 ,6 ,0 } },/* 12 MHz */ + {16800000 , {714 ,7 ,4 ,6 ,0 } },/* 16.8 MHz */ + {19200000 , {625 ,7 ,4 ,6 ,0 } },/* 19.2 MHz */ + {20000000 , {600 ,7 ,4 ,6 ,0 } },/* 20 MHz */ + {26000000 , {461 ,7 ,4 ,6 ,0 } },/* 26 MHz */ + {38400000 , {312 ,7 ,4 ,6 ,0 } },/* 38.4 MHz */ + { },/* Terminator */ };static inline u32 ti_pipe3_readl (void __iomem *addr,unsigned offset)
@@ -100,15 +112,20 @@ static inline void ti_pipe3_writel(void __iomem *addr, unsigned offset,__raw_writel (data, addr + offset); } -static struct pipe3_dpll_params *ti_pipe3_get_dpll_params (unsigned long rate) +static struct pipe3_dpll_params *ti_pipe3_get_dpll_params (struct ti_pipe3 *phy) { -int i; +unsigned long rate; +struct pipe3_dpll_map *dpll_map = phy->dpll_map; -for (i =0 ; i <ARRAY_SIZE (dpll_map); i++) { -if (rate == dpll_map[i].rate) -return &dpll_map[i].params; + rate =clk_get_rate (phy->sys_clk); + +for (; dpll_map->rate; dpll_map++) { +if (rate == dpll_map->rate) +return &dpll_map->params; } +dev_err (phy->dev,"No DPLL configuration for %lu Hz SYS CLK\n" , rate); +return NULL ; }
@@ -182,16 +199,11 @@ static void ti_pipe3_dpll_relock(struct ti_pipe3 *phy)static int ti_pipe3_dpll_lock (struct ti_pipe3 *phy) {u32 val; -unsigned long rate;struct pipe3_dpll_params *dpll_params; - rate =clk_get_rate (phy->sys_clk); - dpll_params =ti_pipe3_get_dpll_params (rate); -if (!dpll_params) { -dev_err (phy->dev, -"No DPLL configuration for %lu Hz SYS CLK\n" , rate); + dpll_params =ti_pipe3_get_dpll_params (phy); +if (!dpll_params)return -EINVAL ; - } val =ti_pipe3_readl (phy->pll_ctrl_base,PLL_CONFIGURATION1 ); val &= ~PLL_REGN_MASK ;
@@ -244,6 +256,10 @@ static struct phy_ops ops = { .owner = THIS_MODULE, }; +#ifdef CONFIG_OF +static const struct of_device_id ti_pipe3_id_table[]; +#endif +static int ti_pipe3_probe (struct platform_device *pdev) {struct ti_pipe3 *phy;
@@ -253,8 +269,10 @@ static int ti_pipe3_probe(struct platform_device *pdev)struct device_node *node = pdev->dev.of_node;struct device_node *control_node;struct platform_device *control_pdev; +const struct of_device_id *match; -if (!node) + match =of_match_device (of_match_ptr (ti_pipe3_id_table), &pdev->dev); +if (!match)return -EINVAL ; phy =devm_kzalloc (&pdev->dev,sizeof (*phy),GFP_KERNEL );
@@ -263,6 +281,12 @@ static int ti_pipe3_probe(struct platform_device *pdev)return -ENOMEM ; } + phy->dpll_map = (struct pipe3_dpll_map *)match->data; +if (!phy->dpll_map) { +dev_err (&pdev->dev,"no DPLL data\n" ); +return -EINVAL ; + } + res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"pll_ctrl" ); phy->pll_ctrl_base =devm_ioremap_resource (&pdev->dev, res);if (IS_ERR (phy->pll_ctrl_base))
@@ -388,8 +412,18 @@ static const struct dev_pm_ops ti_pipe3_pm_ops = {#ifdef CONFIG_OF static const struct of_device_id ti_pipe3_id_table[] = { - { .compatible ="ti,phy-usb3" }, - { .compatible ="ti,omap-usb3" }, + { + .compatible ="ti,phy-usb3" , + .data = dpll_map_usb, + }, + { + .compatible ="ti,omap-usb3" , + .data = dpll_map_usb, + }, + { + .compatible ="ti,phy-pipe3-sata" , + .data = dpll_map_sata, + }, {} };MODULE_DEVICE_TABLE (of, ti_pipe3_id_table);
Signature · 1 line
1.7.9.5
PATCH 23/28 phy: ti-pipe3: Don't get 'wkupclk' and 'refclk' for SATA PHY
In reply to Kishon Vijay Abraham IFrom: Roger Quadros <[email protected]>
SATA PHY doesn't need 'wkupclk; and 'refclk' so don't try to get them for SATA PHY.
--- drivers/phy/phy-ti-pipe3.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
drivers/phy/phy-ti-pipe3.c +15 -9
@@ -294,16 +294,22 @@ static int ti_pipe3_probe(struct platform_device *pdev) phy->dev = &pdev->dev; - phy->wkupclk =devm_clk_get (phy->dev,"wkupclk" ); -if (IS_ERR (phy->wkupclk)) { -dev_err (&pdev->dev,"unable to get wkupclk\n" ); -return PTR_ERR (phy->wkupclk); - } +if (!of_device_is_compatible (node,"ti,phy-pipe3-sata" )) { + + phy->wkupclk =devm_clk_get (phy->dev,"wkupclk" ); +if (IS_ERR (phy->wkupclk)) { +dev_err (&pdev->dev,"unable to get wkupclk\n" ); +return PTR_ERR (phy->wkupclk); + } - phy->refclk =devm_clk_get (phy->dev,"refclk" ); -if (IS_ERR (phy->refclk)) { -dev_err (&pdev->dev,"unable to get refclk\n" ); -return PTR_ERR (phy->refclk); + phy->refclk =devm_clk_get (phy->dev,"refclk" ); +if (IS_ERR (phy->refclk)) { +dev_err (&pdev->dev,"unable to get refclk\n" ); +return PTR_ERR (phy->refclk); + } + }else { + phy->wkupclk =ERR_PTR (-ENODEV ); + phy->refclk =ERR_PTR (-ENODEV ); } phy->sys_clk =devm_clk_get (phy->dev,"sysclk" );
Signature · 1 line
1.7.9.5
PATCH 24/28 phy: ti-pipe3: streamline PHY operations
In reply to Kishon Vijay Abraham IFrom: Roger Quadros <[email protected]>
Limit .power_on() and .power_off() to just control the PHY power and not the DPLL. The DPLL will be enabled in .init() and idled in .exit().
Don't reprogram the DPLL if it has been already locked by the bootloader. This fixes a problem with SATA, where it fails if SATA was used by the bootloader.
--- drivers/phy/phy-ti-pipe3.c | 114 ++++++++++++++++++++++++-------------------- 1 file changed, 63 insertions(+), 51 deletions(-)
drivers/phy/phy-ti-pipe3.c +63 -51
@@ -47,7 +47,8 @@#define PLL_SD_MASK 0x0003FC00#define PLL_SD_SHIFT 10#define SET_PLL_GO 0x1 -#define PLL_TICOPWDN 0x10000 +#define PLL_LDOPWDN BIT(15) +#define PLL_TICOPWDN BIT(16)#define PLL_LOCK 0x2#define PLL_IDLE 0x1
@@ -56,7 +57,8 @@* value required for the PIPE3PHY_PLL_CONFIGURATION2.PLL_IDLE status * to be correctly reflected in the PIPE3PHY_PLL_STATUS register. */ -# define PLL_IDLE_TIME 100; +#define PLL_IDLE_TIME 100/* in milliseconds */ +#define PLL_LOCK_TIME 100/* in milliseconds */ struct pipe3_dpll_params {u16 m;
@@ -132,24 +134,6 @@ static struct pipe3_dpll_params *ti_pipe3_get_dpll_params(struct ti_pipe3 *phy)static int ti_pipe3_power_off (struct phy *x) {struct ti_pipe3 *phy =phy_get_drvdata (x); -int val; -int timeout =PLL_IDLE_TIME ; - - val =ti_pipe3_readl (phy->pll_ctrl_base,PLL_CONFIGURATION2 ); - val |=PLL_IDLE ; -ti_pipe3_writel (phy->pll_ctrl_base,PLL_CONFIGURATION2 , val); - -do { - val =ti_pipe3_readl (phy->pll_ctrl_base,PLL_STATUS ); -if (val &PLL_TICOPWDN ) -break ; -udelay (5 ); - }while (--timeout); - -if (!timeout) { -dev_err (phy->dev,"power off failed\n" ); -return -EBUSY ; - }omap_control_phy_power (phy->control_dev,0 );
@@ -159,44 +143,34 @@ static int ti_pipe3_power_off(struct phy *x)static int ti_pipe3_power_on (struct phy *x) {struct ti_pipe3 *phy =phy_get_drvdata (x); -int val; -int timeout =PLL_IDLE_TIME ; - - val =ti_pipe3_readl (phy->pll_ctrl_base,PLL_CONFIGURATION2 ); - val &= ~PLL_IDLE ; -ti_pipe3_writel (phy->pll_ctrl_base,PLL_CONFIGURATION2 , val); -do { - val =ti_pipe3_readl (phy->pll_ctrl_base,PLL_STATUS ); -if (!(val &PLL_TICOPWDN )) -break ; -udelay (5 ); - }while (--timeout); - -if (!timeout) { -dev_err (phy->dev,"power on failed\n" ); -return -EBUSY ; - } +omap_control_phy_power (phy->control_dev,1 );return 0 ; } -static void ti_pipe3_dpll_relock (struct ti_pipe3 *phy) +static int ti_pipe3_dpll_wait_lock (struct ti_pipe3 *phy) {u32 val;unsigned long timeout; -ti_pipe3_writel (phy->pll_ctrl_base,PLL_GO ,SET_PLL_GO ); - - timeout = jiffies +msecs_to_jiffies (20 ); + timeout = jiffies +msecs_to_jiffies (PLL_LOCK_TIME );do { +cpu_relax (); val =ti_pipe3_readl (phy->pll_ctrl_base,PLL_STATUS );if (val &PLL_LOCK )break ; - }while (!WARN_ON (time_after (jiffies, timeout))); + }while (!time_after (jiffies, timeout)); + +if (!(val &PLL_LOCK )) { +dev_err (phy->dev,"DPLL failed to lock\n" ); +return -EBUSY ; + } + +return 0 ; } -static int ti_pipe3_dpll_lock (struct ti_pipe3 *phy) +static int ti_pipe3_dpll_program (struct ti_pipe3 *phy) {u32 val;struct pipe3_dpll_params *dpll_params;
@@ -230,27 +204,65 @@ static int ti_pipe3_dpll_lock(struct ti_pipe3 *phy) val |= dpll_params->sd <<PLL_SD_SHIFT ;ti_pipe3_writel (phy->pll_ctrl_base,PLL_CONFIGURATION3 , val); -ti_pipe3_dpll_relock (phy); +ti_pipe3_writel (phy->pll_ctrl_base,PLL_GO ,SET_PLL_GO ); -return 0 ; +return ti_pipe3_dpll_wait_lock (phy); }static int ti_pipe3_init (struct phy *x) {struct ti_pipe3 *phy =phy_get_drvdata (x); -int ret; +u32 val; +int ret =0 ; - ret =ti_pipe3_dpll_lock (phy); -if (ret) -return ret; +/* Bring it out of IDLE if it is IDLE */ + val =ti_pipe3_readl (phy->pll_ctrl_base,PLL_CONFIGURATION2 ); +if (val &PLL_IDLE ) { + val &= ~PLL_IDLE ; +ti_pipe3_writel (phy->pll_ctrl_base,PLL_CONFIGURATION2 , val); + ret =ti_pipe3_dpll_wait_lock (phy); + } -omap_control_phy_power (phy->control_dev,1 ); +/* Program the DPLL only if not locked */ + val =ti_pipe3_readl (phy->pll_ctrl_base,PLL_STATUS ); +if (!(val &PLL_LOCK )) +if (ti_pipe3_dpll_program (phy)) +return -EINVAL ; -return 0 ; +return ret; } +static int ti_pipe3_exit (struct phy *x) +{ +struct ti_pipe3 *phy =phy_get_drvdata (x); +u32 val; +unsigned long timeout; + +/* Put DPLL in IDLE mode */ + val =ti_pipe3_readl (phy->pll_ctrl_base,PLL_CONFIGURATION2 ); + val |=PLL_IDLE ; +ti_pipe3_writel (phy->pll_ctrl_base,PLL_CONFIGURATION2 , val); + +/* wait for LDO and Oscillator to power down */ + timeout = jiffies +msecs_to_jiffies (PLL_IDLE_TIME ); +do { +cpu_relax (); + val =ti_pipe3_readl (phy->pll_ctrl_base,PLL_STATUS ); +if ((val &PLL_TICOPWDN ) && (val &PLL_LDOPWDN )) +break ; + }while (!time_after (jiffies, timeout)); + +if (!(val &PLL_TICOPWDN ) || !(val &PLL_LDOPWDN )) { +dev_err (phy->dev,"Failed to power down: PLL_STATUS 0x%x\n" , + val); +return -EBUSY ; + } + +return 0 ; +}static struct phy_ops ops = { .init = ti_pipe3_init, + .exit = ti_pipe3_exit, .power_on = ti_pipe3_power_on, .power_off = ti_pipe3_power_off, .owner =THIS_MODULE ,
Signature · 1 line
1.7.9.5
PATCH 25/28 phy: ti-pipe3: Fix suspend/resume and module reload
In reply to Kishon Vijay Abraham IFrom: Roger Quadros <[email protected]>
Due to Errata i783, SATA breaks if its DPLL is idled. The recommeded workaround to issue a softreset to the SATA controller doesn't seem to work. Here we just prevent SATA DPLL from Idling and hence avoid the issue altogether.
--- drivers/phy/phy-ti-pipe3.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/phy/phy-ti-pipe3.c +4 -0
@@ -238,6 +238,10 @@ static int ti_pipe3_exit(struct phy *x)u32 val;unsigned long timeout; +/* SATA DPLL can't be powered down due to Errata i783 */ +if (of_device_is_compatible (phy->dev->of_node,"ti,phy-pipe3-sata" )) +return 0 ; +/* Put DPLL in IDLE mode */ val =ti_pipe3_readl (phy->pll_ctrl_base,PLL_CONFIGURATION2 ); val |=PLL_IDLE ;
Signature · 1 line
1.7.9.5
PATCH 26/28 phy: omap: Depend on OMAP_OCP2SCP bus driver
In reply to Kishon Vijay Abraham IFrom: Roger Quadros <[email protected]>
The OMAP_USB2 and OMAP_PIPE3 PHY devices will not be detected if the OMAP_OCP2SCP bus driver is not present. Make them depend on it.
--- drivers/phy/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
drivers/phy/Kconfig +2 -0
@@ -47,6 +47,7 @@ config OMAP_USB2 depends on USB_PHY select GENERIC_PHY select OMAP_CONTROL_PHY + depends on OMAP_OCP2SCP help Enable this to support the transceiver that is part of SOC. This driver takes care of all the PHY functionality apart from comparator.
@@ -58,6 +59,7 @@ config TI_PIPE3 depends on ARCH_OMAP2PLUS || COMPILE_TEST select GENERIC_PHY select OMAP_CONTROL_PHY + depends on OMAP_OCP2SCP help Enable this to support the PIPE3 PHY that is part of TI SOCs. This driver takes care of all the PHY functionality apart from comparator.
Signature · 1 line
1.7.9.5
PATCH 27/28 Documentation: Add APM X-Gene SoC 15Gbps Multi-purpose PHY driver binding documentation
In reply to Kishon Vijay Abraham IFrom: Loc Ho <[email protected]>
This patch adds the APM X-Gene SoC 15Gbps Multi-purpose PHY driver binding documentation.
--- .../devicetree/bindings/phy/apm-xgene-phy.txt | 79 ++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/apm-xgene-phy.txt
Documentation/devicetree/bindings/phy/apm-xgene-phy.txt new file +79 -0
@@ -0,0 +1,79 @@ +* APM X-Gene 15Gbps Multi-purpose PHY nodes + +PHY nodes are defined to describe on-chip 15Gbps Multi-purpose PHY. Each +PHY (pair of lanes) has its own node. + +Required properties: +- compatible : Shall be "apm,xgene-phy". +- reg : PHY memory resource is the SDS PHY access resource. +- #phy-cells : Shall be 1 as it expects one argument for setting + the mode of the PHY. Possible values are 0 (SATA), + 1 (SGMII), 2 (PCIe), 3 (USB), and 4 (XFI). + +Optional properties: +- status : Shall be "ok" if enabled or "disabled" if disabled. + Default is "ok". +- clocks : Reference to the clock entry. +- apm,tx-eye-tuning : Manual control to fine tune the capture of the serial + bit lines from the automatic calibrated position. + Two set of 3-tuple setting for each (up to 3) + supported link speed on the host. Range from 0 to + 127 in unit of one bit period. Default is 10. +- apm,tx-eye-direction : Eye tuning manual control direction. 0 means sample + data earlier than the nominal sampling point. 1 means + sample data later than the nominal sampling point. + Two set of 3-tuple setting for each (up to 3) + supported link speed on the host. Default is 0. +- apm,tx-boost-gain : Frequency boost AC (LSB 3-bit) and DC (2-bit) + gain control. Two set of 3-tuple setting for each + (up to 3) supported link speed on the host. Range is + between 0 to 31 in unit of dB. Default is 3. +- apm,tx-amplitude : Amplitude control. Two set of 3-tuple setting for + each (up to 3) supported link speed on the host. + Range is between 0 to 199500 in unit of uV. + Default is 199500 uV. +- apm,tx-pre-cursor1 : 1st pre-cursor emphasis taps control. Two set of + 3-tuple setting for each (up to 3) supported link + speed on the host. Range is 0 to 273000 in unit of + uV. Default is 0. +- apm,tx-pre-cursor2 : 2st pre-cursor emphasis taps control. Two set of + 3-tuple setting for each (up to 3) supported link + speed on the host. Range is 0 to 127400 in unit uV. + Default is 0x0. +- apm,tx-post-cursor : Post-cursor emphasis taps control. Two set of + 3-tuple setting for Gen1, Gen2, and Gen3. Range is + between 0 to 0x1f in unit of 18.2mV. Default is 0xf. +- apm,tx-speed : Tx operating speed. One set of 3-tuple for each + supported link speed on the host. + 0 = 1-2Gbps + 1 = 2-4Gbps (1st tuple default) + 2 = 4-8Gbps + 3 = 8-15Gbps (2nd tuple default) + 4 = 2.5-4Gbps + 5 = 4-5Gbps + 6 = 5-6Gbps + 7 = 6-16Gbps (3rd tuple default) + +NOTE: PHY override parameters are board specific setting. + +Example: + phy1: phy@1f21a000 { + compatible = "apm,xgene-phy"; + reg = <0x0 0x1f21a000 0x0 0x100>; + #phy-cells = <1>; + status = "disabled"; + }; + + phy2: phy@1f22a000 { + compatible = "apm,xgene-phy"; + reg = <0x0 0x1f22a000 0x0 0x100>; + #phy-cells = <1>; + status = "ok"; + }; + + phy3: phy@1f23a000 { + compatible = "apm,xgene-phy"; + reg = <0x0 0x1f23a000 0x0 0x100>; + #phy-cells = <1>; + status = "ok"; + };
Signature · 1 line
1.7.9.5
PATCH 28/28 PHY: add APM X-Gene SoC 15Gbps Multi-purpose PHY driver
In reply to Kishon Vijay Abraham IFrom: Loc Ho <[email protected]>
This patch adds support for the APM X-Gene SoC 15Gbps Multi-purpose PHY. This is the physical layer interface for the corresponding host controller. Currently, only external clock and Gen3 SATA mode are supported.
--- drivers/phy/Kconfig | 7 + drivers/phy/Makefile | 1 + drivers/phy/phy-xgene.c | 1750 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1758 insertions(+) create mode 100644 drivers/phy/phy-xgene.c
drivers/phy/Kconfig +7 -0
@@ -159,4 +159,11 @@ config PHY_EXYNOS5250_USB2 particular SoC is compiled in the driver. In case of Exynos 5250 four phys are available - device, host, HSIC0 and HSIC. +config PHY_XGENE + tristate "APM X-Gene 15Gbps PHY support" + depends on HAS_IOMEM && OF && (ARM64 || COMPILE_TEST) + select GENERIC_PHY + help + This option enables support for APM X-Gene SoC multi-purpose PHY. + endmenu
drivers/phy/Makefile +1 -0
@@ -17,3 +17,4 @@ obj-$(CONFIG_PHY_SAMSUNG_USB2) += phy-samsung-usb2.o obj-$(CONFIG_PHY_EXYNOS4210_USB2) += phy-exynos4210-usb2.o obj-$(CONFIG_PHY_EXYNOS4X12_USB2) += phy-exynos4x12-usb2.o obj-$(CONFIG_PHY_EXYNOS5250_USB2) += phy-exynos5250-usb2.o +obj-$(CONFIG_PHY_XGENE) += phy-xgene.o
drivers/phy/phy-xgene.c new file +1750 -0
1,750 lines not on this page · raw message
Signature · 1 line
1.7.9.5
Greg KH
maintainerQuoted 18 lines · Kishon Vijay Abraham I
Hi Greg,
Here's the PULL REQUEST for 3.15 merge window.
More users are starting to use the generic PHY framework including USB and SATA PHY in exynos, USB in sunxi and multi-purpose PHY (currently only SATA) in APM. There is also a patch to adapt USB3 PHY driver (PIPE3) used in OMAP to generic PHY framework and use the same driver for SATA.
It also includes few fixes and cleanups.Please let me know if you want me to make any changes.
Cheers
KishonThe following changes since commit
cfbf8d4857c26a8a307fb7cd258074c9dcd8c691:Linux 3.14-rc4 (2014-02-23 17:40:03 -0800)
Quoted 7 lines
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.gittags/for_3.15for you to fetch changes up to
303fd52cda953d14dc82ac82b570761599eb9ab2:PHY: add APM X-Gene SoC 15Gbps Multi-purpose PHY driver (2014-03-08 12:39:51 +0530)
When merging this with my usb-next tree, I get the following merge
issue, which I don't know how to resolve:
CONFLICT (modify/delete): Documentation/devicetree/bindings/usb/usb-phy.txt deleted in HEAD and modified in a0100026249158ec7aae606b553efae7cb37f616. Version a0100026249158ec7aae606b553efae7cb37f616 of Documentation/devicetree/bindings/usb/usb-phy.txt left in tree.
Any suggestions as to what I should do here?
thanks,
greg k-h
Hi Greg,
Quoted 25 lines · Greg KH
Quoted 24 lines · Kishon Vijay Abraham I
Hi Greg,
Here's the PULL REQUEST for 3.15 merge window.
More users are starting to use the generic PHY framework including USB and SATA PHY in exynos, USB in sunxi and multi-purpose PHY (currently only SATA) in APM. There is also a patch to adapt USB3 PHY driver (PIPE3) used in OMAP to generic PHY framework and use the same driver for SATA.
It also includes few fixes and cleanups.Please let me know if you want me to make any changes.
Cheers
KishonThe following changes since commit
cfbf8d4857c26a8a307fb7cd258074c9dcd8c691:Linux 3.14-rc4 (2014-02-23 17:40:03 -0800)are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.gittags/for_3.15for you to fetch changes up to
303fd52cda953d14dc82ac82b570761599eb9ab2:
Quoted 7 lines
Quoted 1 line
PHY: add APM X-Gene SoC 15Gbps Multi-purpose PHY driver (2014-03-08 12:39:51 +0530)When merging this with my usb-next tree, I get the following merge
issue, which I don't know how to resolve:
CONFLICT (modify/delete):Documentation/devicetree/bindings/usb/usb-phy.txtdeleted in HEAD and modified ina0100026249158ec7aae606b553efae7cb37f616. Versiona0100026249158ec7aae606b553efae7cb37f616ofDocumentation/devicetree/bindings/usb/usb-phy.txtleft in tree.Any suggestions as to what I should do here?
There were 3 patches that modified usb-phy.txt but the file was moved to phy/ti-phy.txt in balbi's branch. I've resent the patches that modified this file and have also updated tags/for_3.15.
Let me know If I have to resend the PULL request.
Sorry for the hassle.
Thanks
Kishon
Greg KH
maintainerQuoted 34 lines · Kishon Vijay Abraham I
Hi Greg,
Quoted 31 lines · Greg KH
Quoted 18 lines · Kishon Vijay Abraham I
Hi Greg,
Here's the PULL REQUEST for 3.15 merge window.
More users are starting to use the generic PHY framework including USB and SATA PHY in exynos, USB in sunxi and multi-purpose PHY (currently only SATA) in APM. There is also a patch to adapt USB3 PHY driver (PIPE3) used in OMAP to generic PHY framework and use the same driver for SATA.
It also includes few fixes and cleanups.Please let me know if you want me to make any changes.
Cheers
KishonThe following changes since commit
cfbf8d4857c26a8a307fb7cd258074c9dcd8c691:Linux 3.14-rc4 (2014-02-23 17:40:03 -0800)Quoted 7 lines
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.gittags/for_3.15for you to fetch changes up to
303fd52cda953d14dc82ac82b570761599eb9ab2:PHY: add APM X-Gene SoC 15Gbps Multi-purpose PHY driver (2014-03-08 12:39:51 +0530)When merging this with my usb-next tree, I get the following merge
issue, which I don't know how to resolve:
CONFLICT (modify/delete):Documentation/devicetree/bindings/usb/usb-phy.txtdeleted in HEAD and modified ina0100026249158ec7aae606b553efae7cb37f616. Versiona0100026249158ec7aae606b553efae7cb37f616ofDocumentation/devicetree/bindings/usb/usb-phy.txtleft in tree.
Quoted 7 lines
Quoted 1 line
Any suggestions as to what I should do here?
There were 3 patches that modified usb-phy.txt but the file was moved to
phy/ti-phy.txtin balbi's branch. I've resent the patches that modified this file and have also updated tags/for_3.15.Let me know If I have to resend the PULL request.
Please do, because I want to see the updated diffstat that I am supposed to be receiving.
thanks,
greg k-h
PATCH v2 16/28 phy: omap-usb2: Adapt phy-omap-usb2 for AM437x
In reply to Kishon Vijay Abraham IFrom: George Cherian <[email protected]>
Adapt phy-omap-usb2 driver for AM437x.
- Add new comaptible "ti,am437x-usb2" for AM437x
- Pass proper data to differentiate AM437x and others.
- AM437x doesnot support set_vbus and start_srp.
---
Changes from v1:
removed the Documentation since the name of the file got modified in usb tree.
drivers/phy/phy-omap-usb2.c | 49 +++++++++++++++++++++++++++++++----------- include/linux/phy/omap_usb.h | 9 ++++++++ 2 files changed, 46 insertions(+), 12 deletions(-)
drivers/phy/phy-omap-usb2.c +37 -12
@@ -122,6 +122,31 @@ static struct phy_ops ops = { .owner = THIS_MODULE, }; +#ifdef CONFIG_OF +static const struct usb_phy_data omap_usb2_data = { + .label ="omap_usb2" , + .flags =OMAP_USB2_HAS_START_SRP |OMAP_USB2_HAS_SET_VBUS , +}; + +static const struct usb_phy_data am437x_usb2_data = { + .label ="am437x_usb2" , + .flags =0 , +}; + +static const struct of_device_id omap_usb2_id_table[] = { + { + .compatible ="ti,omap-usb2" , + .data = &omap_usb2_data, + }, + { + .compatible ="ti,am437x-usb2" , + .data = &am437x_usb2_data, + }, + {}, +}; +MODULE_DEVICE_TABLE (of, omap_usb2_id_table); +#endif +static int omap_usb2_probe (struct platform_device *pdev) {struct omap_usb *phy;
@@ -131,10 +156,16 @@ static int omap_usb2_probe(struct platform_device *pdev)struct device_node *node = pdev->dev.of_node;struct device_node *control_node;struct platform_device *control_pdev; +const struct of_device_id *of_id; +struct usb_phy_data *phy_data; + + of_id =of_match_device (of_match_ptr (omap_usb2_id_table), &pdev->dev); -if (!node) +if (!of_id)return -EINVAL ; + phy_data = (struct usb_phy_data *)of_id->data; + phy =devm_kzalloc (&pdev->dev,sizeof (*phy),GFP_KERNEL );if (!phy) {dev_err (&pdev->dev,"unable to allocate memory for USB2 PHY\n" );
@@ -150,7 +181,7 @@ static int omap_usb2_probe(struct platform_device *pdev) phy->dev = &pdev->dev; phy->phy.dev = phy->dev; - phy->phy.label ="omap-usb2" ; + phy->phy.label = phy_data->label; phy->phy.otg = otg; phy->phy.type =USB_PHY_TYPE_USB2 ;
@@ -171,8 +202,10 @@ static int omap_usb2_probe(struct platform_device *pdev) otg->set_host = omap_usb_set_host; otg->set_peripheral = omap_usb_set_peripheral; - otg->set_vbus = omap_usb_set_vbus; - otg->start_srp = omap_usb_start_srp; +if (phy_data->flags &OMAP_USB2_HAS_SET_VBUS ) + otg->set_vbus = omap_usb_set_vbus; +if (phy_data->flags &OMAP_USB2_HAS_START_SRP ) + otg->start_srp = omap_usb_start_srp; otg->phy = &phy->phy;platform_set_drvdata (pdev, phy);
@@ -272,14 +305,6 @@ static const struct dev_pm_ops omap_usb2_pm_ops = {#define DEV_PM_OPS NULL#endif -#ifdef CONFIG_OF -static const struct of_device_id omap_usb2_id_table[] = { - { .compatible ="ti,omap-usb2" }, - {} -}; -MODULE_DEVICE_TABLE (of, omap_usb2_id_table); -#endif -static struct platform_driver omap_usb2_driver = { .probe = omap_usb2_probe, .remove = omap_usb2_remove,
include/linux/phy/omap_usb.h +9 -0
@@ -39,6 +39,15 @@ struct omap_usb {struct clk *optclk; }; +struct usb_phy_data { +const char *label; +u8 flags; +}; + +/* Driver Flags */ +#define OMAP_USB2_HAS_START_SRP (1 << 0) +#define OMAP_USB2_HAS_SET_VBUS (1 << 1) +#define phy_to_omapusb (x) container_of((x), struct omap_usb, phy)#if defined(CONFIG_OMAP_USB2 ) || defined(CONFIG_OMAP_USB2_MODULE )
Signature · 1 line
1.7.9.5
PATCH v2 17/28 phy: omap-usb2: Provide workaround for USB2PHY false disconnect
From: Austin Beam <[email protected]>
Enable the dra7x errata workaround for false disconnect problem with USB2PHY. False disconnects were detected with some of the devices. Reduce the sensitivity of the disconnect logic within the USB2PHY subsystem to enusre these false disconnects are not registered.
[[email protected]]
While at that, pass proper flags for each SoC's. This is a common driver used across OMAP4,OMAP5,DRA7xx and AM437x USB2PHY.
False disconnect workaround is currently applicable for only DRA7x.
---
Changes from v1:
removed the Documentation since the name of the file got modified in usb tree.
drivers/phy/phy-omap-usb2.c | 44 ++++++++++++++++++++++++++++++++++++++++++ include/linux/phy/omap_usb.h | 4 ++++ 2 files changed, 48 insertions(+)
drivers/phy/phy-omap-usb2.c +44 -0
@@ -31,6 +31,9 @@#include <linux/phy/phy.h> #include <linux/of_platform.h> +#define USB2PHY_DISCON_BYP_LATCH (1 << 31) +#define USB2PHY_ANA_CONFIG1 0x4c +/** * omap_usb2_set_comparator - links the comparator present in the sytem with * this phy
@@ -116,7 +119,30 @@ static int omap_usb_power_on(struct phy *x)return 0 ; } +static int omap_usb_init (struct phy *x) +{ +struct omap_usb *phy =phy_get_drvdata (x); +u32 val; + +if (phy->flags &OMAP_USB2_CALIBRATE_FALSE_DISCONNECT ) { +/* +* +* Reduce the sensitivity of internal PHY by enabling the +* DISCON_BYP_LATCH of the USB2PHY_ANA_CONFIG1 register. This +* resolves issues with certain devices which can otherwise +* be prone to false disconnects. +* +*/ + val =omap_usb_readl (phy->phy_base,USB2PHY_ANA_CONFIG1 ); + val |=USB2PHY_DISCON_BYP_LATCH ; +omap_usb_writel (phy->phy_base,USB2PHY_ANA_CONFIG1 , val); + } + +return 0 ; +} +static struct phy_ops ops = { + .init = omap_usb_init, .power_on = omap_usb_power_on, .power_off = omap_usb_power_off, .owner =THIS_MODULE ,
@@ -128,6 +154,11 @@ static const struct usb_phy_data omap_usb2_data = { .flags = OMAP_USB2_HAS_START_SRP | OMAP_USB2_HAS_SET_VBUS, }; +static const struct usb_phy_data dra7x_usb2_data = { + .label ="dra7x_usb2" , + .flags =OMAP_USB2_CALIBRATE_FALSE_DISCONNECT , +}; +static const struct usb_phy_data am437x_usb2_data = { .label ="am437x_usb2" , .flags =0 ,
@@ -139,6 +170,10 @@ static const struct of_device_id omap_usb2_id_table[] = { .data = &omap_usb2_data, }, { + .compatible = "ti,dra7x-usb2", + .data = &dra7x_usb2_data, + }, + { .compatible = "ti,am437x-usb2", .data = &am437x_usb2_data, },
@@ -151,6 +186,7 @@ static int omap_usb2_probe(struct platform_device *pdev) {struct omap_usb *phy;struct phy *generic_phy; +struct resource *res;struct phy_provider *phy_provider;struct usb_otg *otg;struct device_node *node = pdev->dev.of_node;
@@ -185,6 +221,14 @@ static int omap_usb2_probe(struct platform_device *pdev) phy->phy.otg = otg; phy->phy.type =USB_PHY_TYPE_USB2 ; +if (phy_data->flags &OMAP_USB2_CALIBRATE_FALSE_DISCONNECT ) { + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + phy->phy_base =devm_ioremap_resource (&pdev->dev, res); +if (!phy->phy_base) +return -ENOMEM ; + phy->flags |=OMAP_USB2_CALIBRATE_FALSE_DISCONNECT ; + } + control_node =of_parse_phandle (node,"ctrl-module" ,0 );if (!control_node) {dev_err (&pdev->dev,"Failed to get control device phandle\n" );
include/linux/phy/omap_usb.h +4 -0
@@ -33,10 +33,13 @@ struct usb_dpll_params {struct omap_usb {struct usb_phy phy;struct phy_companion *comparator; +void __iomem *pll_ctrl_base; +void __iomem *phy_base;struct device *dev;struct device *control_dev;struct clk *wkupclk;struct clk *optclk; +u8 flags; };struct usb_phy_data {
@@ -47,6 +50,7 @@ struct usb_phy_data {/* Driver Flags */ #define OMAP_USB2_HAS_START_SRP (1 << 0)#define OMAP_USB2_HAS_SET_VBUS (1 << 1) +#define OMAP_USB2_CALIBRATE_FALSE_DISCONNECT (1 << 2)#define phy_to_omapusb (x) container_of((x), struct omap_usb, phy)
Signature · 1 line
1.7.9.5
PATCH v2 18/28 phy: omap-usb2: Add different compatible for OMAP5
In reply to Kishon Vijay Abraham IFrom: George Cherian <[email protected]>
Add a new compatible for OMAP5 since it does not use any of the OTG operations as of now.HAS_SRP and SET_VBUS functionalities are used only for OMAP4.
---
Changes from v1:
removed the Documentation since the name of the file got modified in usb tree.
drivers/phy/phy-omap-usb2.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/phy/phy-omap-usb2.c +9 -0
@@ -154,6 +154,11 @@ static const struct usb_phy_data omap_usb2_data = { .flags = OMAP_USB2_HAS_START_SRP | OMAP_USB2_HAS_SET_VBUS, }; +static const struct usb_phy_data omap5_usb2_data = { + .label ="omap5_usb2" , + .flags =0 , +}; +static const struct usb_phy_data dra7x_usb2_data = { .label ="dra7x_usb2" , .flags =OMAP_USB2_CALIBRATE_FALSE_DISCONNECT ,
@@ -170,6 +175,10 @@ static const struct of_device_id omap_usb2_id_table[] = { .data = &omap_usb2_data, }, { + .compatible = "ti,omap5-usb2", + .data = &omap5_usb2_data, + }, + { .compatible = "ti,dra7x-usb2", .data = &dra7x_usb2_data, },
Signature · 1 line
1.7.9.5