phy: for 4.5 merge window
Subsystems (7)
Hi Greg,
Please find the pull request for 4.5 merge window below. This should be my final pull request for 2015 unless you want me to change something ;-)
It adds two new PHY drivers, deprecates phy-omap-control driver (it was in my TO-DO for sometime), and other miscellaneous phy driver improvements and fixes.
Let me know if you want me to modify something.
Merry Christmas and Happy Newyear!
Cheers
Kishon
The following changes since commit 708744628ba96ed4dfcac74a985eb66ad551f164:
phy: core: Get a refcount to phy in devm_of_phy_get_by_index() (2015-12-07 18:44:02 +0530)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git tags/phy-for-4.5
for you to fetch changes up to 9955a7835bf376e12482583958b2661f501b868b:
phy: omap-usb2: use *syscon* framework API to power on/off the PHY (2015-12-21 14:26:28 +0530)
----------------------------------------------------------------
phy: for 4.5
*) new PHY driver for hi6220 usb and rcar gen3 usb2
*) deprecate phy-omap-control driver. phy-omap-control driver was added
when there was no proper infrastructure for doing control module initialization. The phy-omap-control driver is not an 'actual' PHY driver and it was just a hack to do PHY related control module initialization. Now with SYSCON framework in the kernel, control module setttings can be done using APIs provided by syscon.
*) usbphy-internal pll creates the needed 480MHz and is also a
supply-clock back to the core clock-controller in Rockchip SoCs. This is now modeled as a real clock.
*) calibrate mt65xx usb3 PHY for better eye diagram and receiver
sensitivity.
*) Miscellaneous cleanups.
----------------------------------------------------------------
Chunfeng Yun (2):
phy: phy-mt65xx-usb3: fix test fail of HS receiver sensitivity
phy: phy-mt65xx-usb3: improve HS eye diagram
Hans de Goede (1):
phy-sun4i-usb: Use of_match_node to get model specific config data
Heiko Stuebner (5):
phy: rockchip-usb: fix clock get-put mismatch
phy: rockchip-usb: introduce a common data-struct for the device
phy: rockchip-usb: move per-phy init into a separate function
phy: rockchip-usb: add compatible values for rk3066a and rk3188
phy: rockchip-usb: expose the phy-internal PLLs
Jaedon Shin (3):
phy: phy_brcmstb_sata: remove duplicate definitions
phy: phy_brcmstb_sata: add data for phy version
phy: phy_brcmstb_sata: add support for MIPS-based platforms
Jisheng Zhang (2):
phy: berlin-usb: remove non-necessary header files
phy: berlin-usb: don't set device's driver_data
Kishon Vijay Abraham I (9):
phy: ti-pipe3: introduce local struct device* in probe
phy: ti-pipe3: move clk initialization to a separate function
phy: ti-pipe3: move sysctrl initialization to a separate function
phy: ti-pipe3: move mem resource initialization to a separate
function
phy: ti-pipe3: use ti_pipe3_power_off to power off the PHY during
probe
phy: ti-pipe3: use *syscon* framework API to power on/off the PHY
phy: ti-pipe3: use *syscon* framework API to set PCS value of the PHY
phy: omap-usb2: use omap_usb_power_off to power off the PHY during
probe
phy: omap-usb2: use *syscon* framework API to power on/off the PHY
Reinder de Haan (1):
phy-sun4i-usb: Add support for the host usb-phys found on the H3 SoC
Yoshihiro Shimoda (4):
phy: rcar-gen3-usb2: Add R-Car Gen3 USB2 PHY driver
phy: rcar-gen3-usb2: change the mode to OTG on the combined channel
phy: rcar-gen3-usb2: add runtime ID/VBUS pin detection
MAINTAINERS: add Renesas usb2 phy driver
Zhangfei Gao (1):
phy: add phy-hi6220-usb
.../bindings/phy/brcm,brcmstb-sata-phy.txt | 1 + .../devicetree/bindings/phy/phy-hi6220-usb.txt | 16 + .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 39 ++ .../devicetree/bindings/phy/rockchip-usb-phy.txt | 6 +- .../devicetree/bindings/phy/sun4i-usb-phy.txt | 1 + Documentation/devicetree/bindings/phy/ti-phy.txt | 20 +- MAINTAINERS | 6 + drivers/phy/Kconfig | 20 +- drivers/phy/Makefile | 2 + drivers/phy/phy-berlin-usb.c | 3 - drivers/phy/phy-brcmstb-sata.c | 47 ++- drivers/phy/phy-hi6220-usb.c | 168 +++++++++ drivers/phy/phy-mt65xx-usb3.c | 106 +++++- drivers/phy/phy-omap-usb2.c | 94 ++++- drivers/phy/phy-rcar-gen3-usb2.c | 378 ++++++++++++++++++++ drivers/phy/phy-rockchip-usb.c | 287 +++++++++++---- drivers/phy/phy-sun4i-usb.c | 158 +++++--- drivers/phy/phy-ti-pipe3.c | 302 +++++++++++----- include/linux/phy/omap_usb.h | 23 ++ 19 files changed, 1439 insertions(+), 238 deletions(-) create mode 100644 Documentation/devicetree/bindings/phy/phy-hi6220-usb.txt create mode 100644 Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt create mode 100644 drivers/phy/phy-hi6220-usb.c create mode 100644 drivers/phy/phy-rcar-gen3-usb2.c
Signature · 1 line
1.7.9.5
PATCH 1/28 phy: rcar-gen3-usb2: Add R-Car Gen3 USB2 PHY driver
From: Yoshihiro Shimoda <[email protected]>
This patch adds support for R-Car generation 3 USB2 PHY driver. This SoC has 3 EHCI/OHCI channels, and the channel 0 is shared with the HSUSB (USB2.0 peripheral) device. And each channel has independent registers about the PHYs.
So, the purpose of this driver is:
1) initializes some registers of SoC specific to use the {ehci,ohci}-platform driver.
2) detects id pin to select host or peripheral on the channel 0.
For now, this driver only supports 1) above.
--- .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 37 ++++ drivers/phy/Kconfig | 7 + drivers/phy/Makefile | 1 + drivers/phy/phy-rcar-gen3-usb2.c | 217 ++++++++++++++++++++ 4 files changed, 262 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt create mode 100644 drivers/phy/phy-rcar-gen3-usb2.c
Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt new file +37 -0
@@ -0,0 +1,37 @@ +* Renesas R-Car generation 3 USB 2.0 PHY + +This file provides information on what the device node for the R-Car generation +3 USB 2.0 PHY contains. + +Required properties: +- compatible: "renesas,usb2-phy-r8a7795" if the device is a part of an R8A7795 + SoC. +- reg: offset and length of the partial USB 2.0 Host register block. +- reg-names: must be "usb2_host". +- clocks: clock phandle and specifier pair(s). +- #phy-cells: see phy-bindings.txt in the same directory, must be <0>. + +Optional properties: +To use a USB channel where USB 2.0 Host and HSUSB (USB 2.0 Peripheral) are +combined, the device tree node should set HSUSB properties to reg and reg-names +properties. This is because HSUSB has registers to select USB 2.0 host or +peripheral at that channel: +- reg: offset and length of the partial HSUSB register block. +- reg-names: must be "hsusb". + +Example (R-Car H3): + + usb-phy@ee080200 { + compatible = "renesas,usb2-phy-r8a7795"; + reg = <0 0xee080200 0 0x700>, <0 0xe6590100 0 0x100>; + reg-names = "usb2_host", "hsusb"; + clocks = <&mstp7_clks R8A7795_CLK_EHCI0>, + <&mstp7_clks R8A7795_CLK_HSUSB>; + }; + + usb-phy@ee0a0200 { + compatible = "renesas,usb2-phy-r8a7795"; + reg = <0 0xee0a0200 0 0x700>; + reg-names = "usb2_host"; + clocks = <&mstp7_clks R8A7795_CLK_EHCI0>; + };
drivers/phy/Kconfig +7 -0
@@ -118,6 +118,13 @@ config PHY_RCAR_GEN2 help Support for USB PHY found on Renesas R-Car generation 2 SoCs. +config PHY_RCAR_GEN3_USB2 + tristate "Renesas R-Car generation 3 USB 2.0 PHY driver" + depends on OF && ARCH_SHMOBILE + select GENERIC_PHY + help + Support for USB 2.0 PHY found on Renesas R-Car generation 3 SoCs. + config OMAP_CONTROL_PHY tristate "OMAP CONTROL PHY Driver" depends on ARCH_OMAP2PLUS || COMPILE_TEST
drivers/phy/Makefile +1 -0
@@ -17,6 +17,7 @@ obj-$(CONFIG_PHY_MVEBU_SATA) += phy-mvebu-sata.o obj-$(CONFIG_PHY_MIPHY28LP) += phy-miphy28lp.o obj-$(CONFIG_PHY_MIPHY365X) += phy-miphy365x.o obj-$(CONFIG_PHY_RCAR_GEN2) += phy-rcar-gen2.o +obj-$(CONFIG_PHY_RCAR_GEN3_USB2) += phy-rcar-gen3-usb2.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
drivers/phy/phy-rcar-gen3-usb2.c new file +217 -0
217 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 2/28 phy: rcar-gen3-usb2: change the mode to OTG on the combined channel
In reply to Kishon Vijay Abraham IFrom: Yoshihiro Shimoda <[email protected]>
To use the channel 0 of R-Car gen3 as periperal mode, This patch changes the mode to OTG instead of HOST. Then, this driver needs to set some registers to enable host mode and detects ID pin and VBUS pin at phy_init() timing.
For now, the channel 0 can be used as host mode only.
--- drivers/phy/phy-rcar-gen3-usb2.c | 124 +++++++++++++++++++++++++++++++++++++- 1 file changed, 122 insertions(+), 2 deletions(-)
drivers/phy/phy-rcar-gen3-usb2.c +122 -2
@@ -24,6 +24,10 @@#define USB2_USBCTR 0x00c#define USB2_SPD_RSM_TIMSET 0x10c#define USB2_OC_TIMSET 0x110 +#define USB2_COMMCTRL 0x600 +#define USB2_VBCTRL 0x60c +#define USB2_LINECTRL1 0x610 +#define USB2_ADPCTRL 0x630/* INT_ENABLE */ #define USB2_INT_ENABLE_USBH_INTB_EN BIT(2)
@@ -41,6 +45,24 @@/* OC_TIMSET */ #define USB2_OC_TIMSET_INIT 0x000209ab +/* COMMCTRL */ +#define USB2_COMMCTRL_OTG_PERI BIT(31)/* 1 = Peripheral mode */ + +/* VBCTRL */ +#define USB2_VBCTRL_DRVVBUSSEL BIT(8) + +/* LINECTRL1 */ +#define USB2_LINECTRL1_DPRPD_EN BIT(19) +#define USB2_LINECTRL1_DP_RPD BIT(18) +#define USB2_LINECTRL1_DMRPD_EN BIT(17) +#define USB2_LINECTRL1_DM_RPD BIT(16) + +/* ADPCTRL */ +#define USB2_ADPCTRL_OTGSESSVLD BIT(20) +#define USB2_ADPCTRL_IDDIG BIT(19) +#define USB2_ADPCTRL_IDPULLUP BIT(5)/* 1 = ID sampling is enabled */ +#define USB2_ADPCTRL_DRVVBUS BIT(4) +/******* HSUSB registers (original offset is +0x100) *******/ #define HSUSB_LPSTS 0x02#define HSUSB_UGCTRL2 0x84
@@ -66,6 +88,102 @@ struct rcar_gen3_chan {struct phy *phy; }; +static void rcar_gen3_set_host_mode (struct rcar_gen3_chan *ch,int host) +{ +void __iomem *usb2_base = ch->usb2.base; +u32 val =readl (usb2_base +USB2_COMMCTRL ); + +dev_vdbg (&ch->phy->dev,"%s: %08x, %d\n" , __func__, val, host); +if (host) + val &= ~USB2_COMMCTRL_OTG_PERI ; +else + val |=USB2_COMMCTRL_OTG_PERI ; +writel (val, usb2_base +USB2_COMMCTRL ); +} + +static void rcar_gen3_set_linectrl (struct rcar_gen3_chan *ch,int dp,int dm) +{ +void __iomem *usb2_base = ch->usb2.base; +u32 val =readl (usb2_base +USB2_LINECTRL1 ); + +dev_vdbg (&ch->phy->dev,"%s: %08x, %d, %d\n" , __func__, val, dp, dm); + val &= ~(USB2_LINECTRL1_DP_RPD |USB2_LINECTRL1_DM_RPD ); +if (dp) + val |=USB2_LINECTRL1_DP_RPD ; +if (dm) + val |=USB2_LINECTRL1_DM_RPD ; +writel (val, usb2_base +USB2_LINECTRL1 ); +} + +static void rcar_gen3_enable_vbus_ctrl (struct rcar_gen3_chan *ch,int vbus) +{ +void __iomem *usb2_base = ch->usb2.base; +u32 val =readl (usb2_base +USB2_ADPCTRL ); + +dev_vdbg (&ch->phy->dev,"%s: %08x, %d\n" , __func__, val, vbus); +if (vbus) + val |=USB2_ADPCTRL_DRVVBUS ; +else + val &= ~USB2_ADPCTRL_DRVVBUS ; +writel (val, usb2_base +USB2_ADPCTRL ); +} + +static void rcar_gen3_init_for_host (struct rcar_gen3_chan *ch) +{ +rcar_gen3_set_linectrl (ch,1 ,1 ); +rcar_gen3_set_host_mode (ch,1 ); +rcar_gen3_enable_vbus_ctrl (ch,1 ); +} + +static void rcar_gen3_init_for_peri (struct rcar_gen3_chan *ch) +{ +rcar_gen3_set_linectrl (ch,0 ,1 ); +rcar_gen3_set_host_mode (ch,0 ); +rcar_gen3_enable_vbus_ctrl (ch,0 ); +} + +static bool rcar_gen3_check_vbus (struct rcar_gen3_chan *ch) +{ +return !!(readl (ch->usb2.base +USB2_ADPCTRL ) & +USB2_ADPCTRL_OTGSESSVLD ); +} + +static bool rcar_gen3_check_id (struct rcar_gen3_chan *ch) +{ +return !!(readl (ch->usb2.base +USB2_ADPCTRL ) &USB2_ADPCTRL_IDDIG ); +} + +static void rcar_gen3_device_recognition (struct rcar_gen3_chan *ch) +{ +bool is_host = true; + +/* B-device? */ +if (rcar_gen3_check_id (ch) &&rcar_gen3_check_vbus (ch)) + is_host = false; + +if (is_host) +rcar_gen3_init_for_host (ch); +else +rcar_gen3_init_for_peri (ch); +} + +static void rcar_gen3_init_otg (struct rcar_gen3_chan *ch) +{ +void __iomem *usb2_base = ch->usb2.base; +u32 val; + + val =readl (usb2_base +USB2_VBCTRL ); +writel (val |USB2_VBCTRL_DRVVBUSSEL , usb2_base +USB2_VBCTRL ); + val =readl (usb2_base +USB2_ADPCTRL ); +writel (val |USB2_ADPCTRL_IDPULLUP , usb2_base +USB2_ADPCTRL ); + val =readl (usb2_base +USB2_LINECTRL1 ); +rcar_gen3_set_linectrl (ch,0 ,0 ); +writel (val |USB2_LINECTRL1_DPRPD_EN |USB2_LINECTRL1_DMRPD_EN , + usb2_base +USB2_LINECTRL1 ); + +rcar_gen3_device_recognition (ch); +} +static int rcar_gen3_phy_usb2_init (struct phy *p) {struct rcar_gen3_chan *channel =phy_get_drvdata (p);
@@ -80,11 +198,13 @@ static int rcar_gen3_phy_usb2_init(struct phy *p)/* Initialize HSUSB part */ if (hsusb_base) { -/* TODO: support "OTG" mode */ val =readl (hsusb_base +HSUSB_UGCTRL2 ); val = (val & ~HSUSB_UGCTRL2_USB0SEL ) | -HSUSB_UGCTRL2_USB0SEL_HOST ; +HSUSB_UGCTRL2_USB0SEL_OTG ;writel (val &HSUSB_UGCTRL2_MASK , hsusb_base +HSUSB_UGCTRL2 ); + +/* Initialize otg part */ +rcar_gen3_init_otg (channel); }return 0 ;
Signature · 1 line
1.7.9.5
PATCH 3/28 phy: rcar-gen3-usb2: add runtime ID/VBUS pin detection
In reply to Kishon Vijay Abraham IFrom: Yoshihiro Shimoda <[email protected]>
This patch adds support for runtime ID/VBUS pin detection if the channel 0 of R-Car gen3 is used. So, we are able to use the channel as both host and peripheral.
--- .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 2 + drivers/phy/phy-rcar-gen3-usb2.c | 43 +++++++++++++++++++- 2 files changed, 44 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt +2 -0
@@ -18,6 +18,7 @@ properties. This is because HSUSB has registers to select USB 2.0 host or peripheral at that channel: - reg: offset and length of the partial HSUSB register block. - reg-names: must be "hsusb". +- interrupts: interrupt specifier for the PHY. Example (R-Car H3):
@@ -25,6 +26,7 @@ Example (R-Car H3): compatible = "renesas,usb2-phy-r8a7795"; reg = <0 0xee080200 0 0x700>, <0 0xe6590100 0 0x100>; reg-names = "usb2_host", "hsusb"; + interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp7_clks R8A7795_CLK_EHCI0>, <&mstp7_clks R8A7795_CLK_HSUSB>; };
drivers/phy/phy-rcar-gen3-usb2.c +42 -1
89 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 4/28 MAINTAINERS: add Renesas usb2 phy driver
In reply to Kishon Vijay Abraham IFrom: Yoshihiro Shimoda <[email protected]>
Add Renesas usb2 phy driver to maintainer entry.
--- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+)
MAINTAINERS +6 -0
@@ -8928,6 +8928,12 @@ F: drivers/rpmsg/ F: Documentation/rpmsg.txt F: include/linux/rpmsg.h +RENESAS USB2 PHY DRIVER +M: Yoshihiro Shimoda <[email protected]> +L: [email protected] +S: Maintained +F: drivers/phy/phy-rcar-gen3-usb2.c + RESET CONTROLLER FRAMEWORK M: Philipp Zabel <[email protected]> S: Maintained
Signature · 1 line
1.7.9.5
PATCH 5/28 phy: phy-mt65xx-usb3: fix test fail of HS receiver sensitivity
In reply to Kishon Vijay Abraham IFrom: Chunfeng Yun <[email protected]>
when use the default value 8 of RG_USB20_SQTH, the HS receiver sensitivity test of HQA will fail, set it as 2 to fix up the issue.
--- drivers/phy/phy-mt65xx-usb3.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/phy/phy-mt65xx-usb3.c +5 -2
@@ -49,6 +49,8 @@#define PA6_RG_U2_ISO_EN BIT(31)#define PA6_RG_U2_BC11_SW_EN BIT(23)#define PA6_RG_U2_OTG_VBUSCMP_EN BIT(20) +#define PA6_RG_U2_SQTH GENMASK(3, 0) +#define PA6_RG_U2_SQTH_VAL (x) (0xf & (x))#define U3P_U2PHYACR4 (SSUSB_SIFSLV_U2PHY_COM_BASE + 0x0020)#define P2C_RG_USB20_GPIO_CTL BIT(9)
@@ -165,9 +167,10 @@ static void phy_instance_init(struct mt65xx_u3phy *u3phy,writel (tmp, port_base +U3P_U2PHYDTM0 ); } -/* DP/DM BC1.1 path Disable */ tmp =readl (port_base +U3P_USBPHYACR6 ); - tmp &= ~PA6_RG_U2_BC11_SW_EN ; + tmp &= ~PA6_RG_U2_BC11_SW_EN ;/* DP/DM BC1.1 path Disable */ + tmp &= ~PA6_RG_U2_SQTH ; + tmp |=PA6_RG_U2_SQTH_VAL (2 );writel (tmp, port_base +U3P_USBPHYACR6 ); tmp =readl (port_base +U3P_U3PHYA_DA_REG0 );
Signature · 1 line
1.7.9.5
PATCH 6/28 phy: phy-mt65xx-usb3: improve HS eye diagram
In reply to Kishon Vijay Abraham IFrom: Chunfeng Yun <[email protected]>
calibrate HS slew rate and switch 100uA current to SSUSB to improve HS eye diagram of HQA test.
--- drivers/phy/phy-mt65xx-usb3.c | 99 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 96 insertions(+), 3 deletions(-)
drivers/phy/phy-mt65xx-usb3.c +96 -3
@@ -17,6 +17,7 @@#include <linux/clk.h> #include <linux/delay.h> #include <linux/io.h> +#include <linux/iopoll.h> #include <linux/module.h> #include <linux/of_address.h> #include <linux/phy/phy.h>
@@ -27,6 +28,7 @@* relative to USB3_SIF2_BASE base address */ #define SSUSB_SIFSLV_SPLLC 0x0000 +#define SSUSB_SIFSLV_U2FREQ 0x0100/* offsets of sub-segment in each port registers */ #define SSUSB_SIFSLV_U2PHY_COM_BASE 0x0000
@@ -41,6 +43,7 @@#define PA2_RG_SIF_U2PLL_FORCE_EN BIT(18)#define U3P_USBPHYACR5 (SSUSB_SIFSLV_U2PHY_COM_BASE + 0x0014) +#define PA5_RG_U2_HSTX_SRCAL_EN BIT(15)#define PA5_RG_U2_HSTX_SRCTRL GENMASK(14, 12)#define PA5_RG_U2_HSTX_SRCTRL_VAL (x) ((0x7 & (x)) << 12)#define PA5_RG_U2_HS_100U_U3_EN BIT(11)
@@ -113,6 +116,24 @@#define XC3_RG_U3_XTAL_RX_PWD BIT(9)#define XC3_RG_U3_FRC_XTAL_RX_PWD BIT(8) +#define U3P_U2FREQ_FMCR0 (SSUSB_SIFSLV_U2FREQ + 0x00) +#define P2F_RG_MONCLK_SEL GENMASK(27, 26) +#define P2F_RG_MONCLK_SEL_VAL (x) ((0x3 & (x)) << 26) +#define P2F_RG_FREQDET_EN BIT(24) +#define P2F_RG_CYCLECNT GENMASK(23, 0) +#define P2F_RG_CYCLECNT_VAL (x) ((P2F_RG_CYCLECNT) & (x)) + +#define U3P_U2FREQ_VALUE (SSUSB_SIFSLV_U2FREQ + 0x0c) + +#define U3P_U2FREQ_FMMONR1 (SSUSB_SIFSLV_U2FREQ + 0x10) +#define P2F_USB_FM_VALID BIT(0) +#define P2F_RG_FRCK_EN BIT(8) + +#define U3P_REF_CLK 26/* MHZ */ +#define U3P_SLEW_RATE_COEF 28 +#define U3P_SR_COEF_DIVISOR 1000 +#define U3P_FM_DET_CYCLE_CNT 1024 +struct mt65xx_phy_instance {struct phy *phy;void __iomem *port_base;
@@ -128,6 +149,77 @@ struct mt65xx_u3phy {int nphys; }; +static void hs_slew_rate_calibrate (struct mt65xx_u3phy *u3phy, +struct mt65xx_phy_instance *instance) +{ +void __iomem *sif_base = u3phy->sif_base; +int calibration_val; +int fm_out; +u32 tmp; + +/* enable USB ring oscillator */ + tmp =readl (instance->port_base +U3P_USBPHYACR5 ); + tmp |=PA5_RG_U2_HSTX_SRCAL_EN ; +writel (tmp, instance->port_base +U3P_USBPHYACR5 ); +udelay (1 ); + +/*enable free run clock */ + tmp =readl (sif_base +U3P_U2FREQ_FMMONR1 ); + tmp |=P2F_RG_FRCK_EN ; +writel (tmp, sif_base +U3P_U2FREQ_FMMONR1 ); + +/* set cycle count as 1024, and select u2 channel */ + tmp =readl (sif_base +U3P_U2FREQ_FMCR0 ); + tmp &= ~(P2F_RG_CYCLECNT |P2F_RG_MONCLK_SEL ); + tmp |=P2F_RG_CYCLECNT_VAL (U3P_FM_DET_CYCLE_CNT ); + tmp |=P2F_RG_MONCLK_SEL_VAL (instance->index); +writel (tmp, sif_base +U3P_U2FREQ_FMCR0 ); + +/* enable frequency meter */ + tmp =readl (sif_base +U3P_U2FREQ_FMCR0 ); + tmp |=P2F_RG_FREQDET_EN ; +writel (tmp, sif_base +U3P_U2FREQ_FMCR0 ); + +/* ignore return value */ +readl_poll_timeout (sif_base +U3P_U2FREQ_FMMONR1 , tmp, + (tmp &P2F_USB_FM_VALID ),10 ,200 ); + + fm_out =readl (sif_base +U3P_U2FREQ_VALUE ); + +/* disable frequency meter */ + tmp =readl (sif_base +U3P_U2FREQ_FMCR0 ); + tmp &= ~P2F_RG_FREQDET_EN ; +writel (tmp, sif_base +U3P_U2FREQ_FMCR0 ); + +/*disable free run clock */ + tmp =readl (sif_base +U3P_U2FREQ_FMMONR1 ); + tmp &= ~P2F_RG_FRCK_EN ; +writel (tmp, sif_base +U3P_U2FREQ_FMMONR1 ); + +if (fm_out) { +/* ( 1024 / FM_OUT ) x reference clock frequency x 0.028 */ + tmp =U3P_FM_DET_CYCLE_CNT *U3P_REF_CLK *U3P_SLEW_RATE_COEF ; + tmp /= fm_out; + calibration_val =DIV_ROUND_CLOSEST (tmp,U3P_SR_COEF_DIVISOR ); + }else { +/* if FM detection fail, set default value */ + calibration_val =4 ; + } +dev_dbg (u3phy->dev,"phy:%d, fm_out:%d, calib:%d\n" , + instance->index, fm_out, calibration_val); + +/* set HS slew rate */ + tmp =readl (instance->port_base +U3P_USBPHYACR5 ); + tmp &= ~PA5_RG_U2_HSTX_SRCTRL ; + tmp |=PA5_RG_U2_HSTX_SRCTRL_VAL (calibration_val); +writel (tmp, instance->port_base +U3P_USBPHYACR5 ); + +/* disable USB ring oscillator */ + tmp =readl (instance->port_base +U3P_USBPHYACR5 ); + tmp &= ~PA5_RG_U2_HSTX_SRCAL_EN ; +writel (tmp, instance->port_base +U3P_USBPHYACR5 ); +} +static void phy_instance_init (struct mt65xx_u3phy *u3phy,struct mt65xx_phy_instance *instance) {
@@ -226,9 +318,9 @@ static void phy_instance_power_on(struct mt65xx_u3phy *u3phy, tmp |=XC3_RG_U3_XTAL_RX_PWD |XC3_RG_U3_FRC_XTAL_RX_PWD ;writel (tmp, u3phy->sif_base +U3P_XTALCTL3 ); -/* [mt8173]disable Change 100uA current from SSUSB */ +/* [mt8173]switch 100uA current to SSUSB */ tmp =readl (port_base +U3P_USBPHYACR5 ); - tmp &= ~PA5_RG_U2_HS_100U_U3_EN ; + tmp |=PA5_RG_U2_HS_100U_U3_EN ;writel (tmp, port_base +U3P_USBPHYACR5 ); }
@@ -273,7 +365,7 @@ static void phy_instance_power_off(struct mt65xx_u3phy *u3phy,writel (tmp, port_base +U3P_USBPHYACR6 );if (!index) { -/* (also disable)Change 100uA current switch to USB2.0 */ +/* switch 100uA current back to USB2.0 */ tmp =readl (port_base +U3P_USBPHYACR5 ); tmp &= ~PA5_RG_U2_HS_100U_U3_EN ;writel (tmp, port_base +U3P_USBPHYACR5 );
@@ -343,6 +435,7 @@ static int mt65xx_phy_power_on(struct phy *phy)struct mt65xx_u3phy *u3phy =dev_get_drvdata (phy->dev.parent);phy_instance_power_on (u3phy, instance); +hs_slew_rate_calibrate (u3phy, instance);return 0 ; }
Signature · 1 line
1.7.9.5
PATCH 7/28 phy-sun4i-usb: Use of_match_node to get model specific config data
In reply to Kishon Vijay Abraham IFrom: Hans de Goede <[email protected]>
Use of_match_node instead of calling of_device_is_compatible a ton of times to get model specific config data.
--- drivers/phy/phy-sun4i-usb.c | 121 ++++++++++++++++++++++++++++--------------- 1 file changed, 79 insertions(+), 42 deletions(-)
drivers/phy/phy-sun4i-usb.c +79 -42
@@ -32,6 +32,7 @@#include <linux/mutex.h> #include <linux/of.h> #include <linux/of_address.h> +#include <linux/of_device.h> #include <linux/of_gpio.h> #include <linux/phy/phy.h> #include <linux/phy/phy-sun4i-usb.h>
@@ -88,12 +89,23 @@#define DEBOUNCE_TIME msecs_to_jiffies(50)#define POLL_TIME msecs_to_jiffies(250) +enum sun4i_usb_phy_type { + sun4i_a10_phy, + sun8i_a33_phy, +}; + +struct sun4i_usb_phy_cfg { +int num_phys; +enum sun4i_usb_phy_type type; +u32 disc_thresh; +u8 phyctl_offset; +bool dedicated_clocks; +}; +struct sun4i_usb_phy_data {void __iomem *base; +const struct sun4i_usb_phy_cfg *cfg;struct mutex mutex; -int num_phys; -u32 disc_thresh; -bool has_a33_phyctl;struct sun4i_usb_phy {struct phy *phy;void __iomem *pmu;
@@ -159,17 +171,14 @@ static void sun4i_usb_phy_write(struct sun4i_usb_phy *phy, u32 addr, u32 data, {struct sun4i_usb_phy_data *phy_data =to_sun4i_usb_phy_data (phy);u32 temp, usbc_bit =BIT (phy->index *2 ); -void *phyctl; +void *phyctl = phy_data->base + phy_data->cfg->phyctl_offset;int i;mutex_lock (&phy_data->mutex); -if (phy_data->has_a33_phyctl) { - phyctl = phy_data->base +REG_PHYCTL_A33 ; +if (phy_data->cfg->type == sun8i_a33_phy) {/* A33 needs us to set phyctl to 0 explicitly */ writel (0 , phyctl); - }else { - phyctl = phy_data->base +REG_PHYCTL_A10 ; }for (i =0 ; i < len; i++) {
@@ -249,7 +258,8 @@ static int sun4i_usb_phy_init(struct phy *_phy)sun4i_usb_phy_write (phy,PHY_TX_AMPLITUDE_TUNE ,0x14 ,5 );/* Disconnect threshold adjustment */ -sun4i_usb_phy_write (phy,PHY_DISCON_TH_SEL , data->disc_thresh,2 ); +sun4i_usb_phy_write (phy,PHY_DISCON_TH_SEL , + data->cfg->disc_thresh,2 );sun4i_usb_phy_passby (phy,1 );
@@ -476,7 +486,7 @@ static struct phy *sun4i_usb_phy_xlate(struct device *dev, {struct sun4i_usb_phy_data *data =dev_get_drvdata (dev); -if (args->args[0 ] >= data->num_phys) +if (args->args[0 ] >= data->cfg->num_phys)return ERR_PTR (-ENODEV );return data->phys[args->args[0 ]].phy;
@@ -511,7 +521,6 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct device_node *np = dev->of_node;struct phy_provider *phy_provider; -bool dedicated_clocks;struct resource *res;int i, ret;
@@ -522,29 +531,9 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)mutex_init (&data->mutex);INIT_DELAYED_WORK (&data->detect, sun4i_usb_phy0_id_vbus_det_scan);dev_set_drvdata (dev, data); - -if (of_device_is_compatible (np,"allwinner,sun5i-a13-usb-phy" ) || -of_device_is_compatible (np,"allwinner,sun8i-a23-usb-phy" ) || -of_device_is_compatible (np,"allwinner,sun8i-a33-usb-phy" )) - data->num_phys =2 ; -else - data->num_phys =3 ; - -if (of_device_is_compatible (np,"allwinner,sun5i-a13-usb-phy" ) || -of_device_is_compatible (np,"allwinner,sun7i-a20-usb-phy" )) - data->disc_thresh =2 ; -else - data->disc_thresh =3 ; - -if (of_device_is_compatible (np,"allwinner,sun6i-a31-usb-phy" ) || -of_device_is_compatible (np,"allwinner,sun8i-a23-usb-phy" ) || -of_device_is_compatible (np,"allwinner,sun8i-a33-usb-phy" )) - dedicated_clocks = true; -else - dedicated_clocks = false; - -if (of_device_is_compatible (np,"allwinner,sun8i-a33-usb-phy" )) - data->has_a33_phyctl = true; + data->cfg =of_device_get_match_data (dev); +if (!data->cfg) +return -EINVAL ; res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"phy_ctrl" ); data->base =devm_ioremap_resource (dev, res);
@@ -590,7 +579,7 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev) } } -for (i =0 ; i < data->num_phys; i++) { +for (i =0 ; i < data->cfg->num_phys; i++) {struct sun4i_usb_phy *phy = data->phys + i;char name[16 ];
@@ -602,7 +591,7 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev) phy->vbus =NULL ; } -if (dedicated_clocks) +if (data->cfg->dedicated_clocks)snprintf (name,sizeof (name),"usb%d_phy" , i);else strlcpy (name,"usb_phy" ,sizeof (name));
@@ -689,13 +678,61 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)return 0 ; } +static const struct sun4i_usb_phy_cfg sun4i_a10_cfg = { + .num_phys =3 , + .type = sun4i_a10_phy, + .disc_thresh =3 , + .phyctl_offset =REG_PHYCTL_A10 , + .dedicated_clocks = false, +}; + +static const struct sun4i_usb_phy_cfg sun5i_a13_cfg = { + .num_phys =2 , + .type = sun4i_a10_phy, + .disc_thresh =2 , + .phyctl_offset =REG_PHYCTL_A10 , + .dedicated_clocks = false, +}; + +static const struct sun4i_usb_phy_cfg sun6i_a31_cfg = { + .num_phys =3 , + .type = sun4i_a10_phy, + .disc_thresh =3 , + .phyctl_offset =REG_PHYCTL_A10 , + .dedicated_clocks = true, +}; + +static const struct sun4i_usb_phy_cfg sun7i_a20_cfg = { + .num_phys =3 , + .type = sun4i_a10_phy, + .disc_thresh =2 , + .phyctl_offset =REG_PHYCTL_A10 , + .dedicated_clocks = false, +}; + +static const struct sun4i_usb_phy_cfg sun8i_a23_cfg = { + .num_phys =2 , + .type = sun4i_a10_phy, + .disc_thresh =3 , + .phyctl_offset =REG_PHYCTL_A10 , + .dedicated_clocks = true, +}; + +static const struct sun4i_usb_phy_cfg sun8i_a33_cfg = { + .num_phys =2 , + .type = sun8i_a33_phy, + .disc_thresh =3 , + .phyctl_offset =REG_PHYCTL_A33 , + .dedicated_clocks = true, +}; +static const struct of_device_id sun4i_usb_phy_of_match[] = { - { .compatible ="allwinner,sun4i-a10-usb-phy" }, - { .compatible ="allwinner,sun5i-a13-usb-phy" }, - { .compatible ="allwinner,sun6i-a31-usb-phy" }, - { .compatible ="allwinner,sun7i-a20-usb-phy" }, - { .compatible ="allwinner,sun8i-a23-usb-phy" }, - { .compatible ="allwinner,sun8i-a33-usb-phy" }, + { .compatible ="allwinner,sun4i-a10-usb-phy" , .data = &sun4i_a10_cfg }, + { .compatible ="allwinner,sun5i-a13-usb-phy" , .data = &sun5i_a13_cfg }, + { .compatible ="allwinner,sun6i-a31-usb-phy" , .data = &sun6i_a31_cfg }, + { .compatible ="allwinner,sun7i-a20-usb-phy" , .data = &sun7i_a20_cfg }, + { .compatible ="allwinner,sun8i-a23-usb-phy" , .data = &sun8i_a23_cfg }, + { .compatible ="allwinner,sun8i-a33-usb-phy" , .data = &sun8i_a33_cfg }, { }, };MODULE_DEVICE_TABLE (of, sun4i_usb_phy_of_match);
Signature · 1 line
1.7.9.5
PATCH 8/28 phy-sun4i-usb: Add support for the host usb-phys found on the H3 SoC
In reply to Kishon Vijay Abraham IFrom: Reinder de Haan <[email protected]>
Note this commit only adds support for phys 1-3, phy 0, the otg phy, is not yet (fully) supported after this commit.
--- .../devicetree/bindings/phy/sun4i-usb-phy.txt | 1 + drivers/phy/phy-sun4i-usb.c | 41 +++++++++++++++----- 2 files changed, 33 insertions(+), 9 deletions(-)
Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt +1 -0
@@ -9,6 +9,7 @@ Required properties: * allwinner,sun7i-a20-usb-phy * allwinner,sun8i-a23-usb-phy * allwinner,sun8i-a33-usb-phy + * allwinner,sun8i-h3-usb-phy - reg : a list of offset + length pairs - reg-names : * "phy_ctrl"
drivers/phy/phy-sun4i-usb.c +32 -9
85 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 9/28 phy: add phy-hi6220-usb
In reply to Kishon Vijay Abraham IFrom: Zhangfei Gao <[email protected]>
Support hi6220 use phy for HiKey board
--- .../devicetree/bindings/phy/phy-hi6220-usb.txt | 16 ++ drivers/phy/Kconfig | 9 ++ drivers/phy/Makefile | 1 + drivers/phy/phy-hi6220-usb.c | 168 ++++++++++++++++++++ 4 files changed, 194 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/phy-hi6220-usb.txt create mode 100644 drivers/phy/phy-hi6220-usb.c
Documentation/devicetree/bindings/phy/phy-hi6220-usb.txt new file +16 -0
@@ -0,0 +1,16 @@ +Hisilicon hi6220 usb PHY +----------------------- + +Required properties: +- compatible: should be "hisilicon,hi6220-usb-phy" +- #phy-cells: must be 0 +- hisilicon,peripheral-syscon: phandle of syscon used to control phy. +Refer to phy/phy-bindings.txt for the generic PHY binding properties + +Example: + usb_phy: usbphy { + compatible = "hisilicon,hi6220-usb-phy"; + #phy-cells = <0>; + phy-supply = <&fixed_5v_hub>; + hisilicon,peripheral-syscon = <&sys_ctrl>; + };
drivers/phy/Kconfig +9 -0
@@ -222,6 +222,15 @@ config PHY_MT65XX_USB3 for mt65xx SoCs. it supports two usb2.0 ports and one usb3.0 port. +config PHY_HI6220_USB + tristate "hi6220 USB PHY support" + select GENERIC_PHY + select MFD_SYSCON + help + Enable this to support the HISILICON HI6220 USB PHY. + + To compile this driver as a module, choose M here. + config PHY_SUN4I_USB tristate "Allwinner sunxi SoC USB PHY driver" depends on ARCH_SUNXI && HAS_IOMEM && OF
drivers/phy/Makefile +1 -0
@@ -24,6 +24,7 @@ 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_HIX5HD2_SATA) += phy-hix5hd2-sata.o +obj-$(CONFIG_PHY_HI6220_USB) += phy-hi6220-usb.o obj-$(CONFIG_PHY_MT65XX_USB3) += phy-mt65xx-usb3.o obj-$(CONFIG_PHY_SUN4I_USB) += phy-sun4i-usb.o obj-$(CONFIG_PHY_SUN9I_USB) += phy-sun9i-usb.o
drivers/phy/phy-hi6220-usb.c new file +168 -0
168 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 10/28 phy: rockchip-usb: fix clock get-put mismatch
In reply to Kishon Vijay Abraham IFrom: Heiko Stuebner <[email protected]>
Currently the phy driver only gets the optional clock reference but never puts it again, neither during error handling nor on remove. Fix that by moving the clk_put to a devm-action that gets called at the right time when all other devm actions are done.
--- drivers/phy/phy-rockchip-usb.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/phy/phy-rockchip-usb.c +12 -0
@@ -90,6 +90,14 @@ static const struct phy_ops ops = { .owner = THIS_MODULE, }; +static void rockchip_usb_phy_action (void *data) +{ +struct rockchip_usb_phy *rk_phy = data; + +if (rk_phy->clk) +clk_put (rk_phy->clk); +} +static int rockchip_usb_phy_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;
@@ -123,6 +131,10 @@ static int rockchip_usb_phy_probe(struct platform_device *pdev) rk_phy->reg_offset = reg_offset; rk_phy->reg_base = grf; + err =devm_add_action (dev, rockchip_usb_phy_action, rk_phy); +if (err) +return err; + rk_phy->clk =of_clk_get_by_name (child,"phyclk" );if (IS_ERR (rk_phy->clk)) rk_phy->clk =NULL ;
Signature · 1 line
1.7.9.5
PATCH 11/28 phy: rockchip-usb: introduce a common data-struct for the device
In reply to Kishon Vijay Abraham IFrom: Heiko Stuebner <[email protected]>
This introduces a common struct that holds data belonging to the umbrella device that contains all the phys and that we want to use later.
--- drivers/phy/phy-rockchip-usb.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-)
drivers/phy/phy-rockchip-usb.c +19 -7
@@ -36,9 +36,14 @@#define SIDDQ_ON BIT(13)#define SIDDQ_OFF (0 << 13) +struct rockchip_usb_phy_base { +struct device *dev; +struct regmap *reg_base; +}; +struct rockchip_usb_phy { +struct rockchip_usb_phy_base *base;unsigned int reg_offset; -struct regmap *reg_base;struct clk *clk;struct phy *phy; };
@@ -46,7 +51,7 @@ struct rockchip_usb_phy {static int rockchip_usb_phy_power (struct rockchip_usb_phy *phy,bool siddq) { -return regmap_write (phy->reg_base, phy->reg_offset, +return regmap_write (phy->base->reg_base, phy->reg_offset,SIDDQ_WRITE_ENA | (siddq ?SIDDQ_ON :SIDDQ_OFF )); }
@@ -101,17 +106,23 @@ static void rockchip_usb_phy_action(void *data)static int rockchip_usb_phy_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev; +struct rockchip_usb_phy_base *phy_base;struct rockchip_usb_phy *rk_phy;struct phy_provider *phy_provider;struct device_node *child; -struct regmap *grf;unsigned int reg_offset;int err; - grf =syscon_regmap_lookup_by_phandle (dev->of_node,"rockchip,grf" ); -if (IS_ERR (grf)) { + phy_base =devm_kzalloc (dev,sizeof (*phy_base),GFP_KERNEL ); +if (!phy_base) +return -ENOMEM ; + + phy_base->dev = dev; + phy_base->reg_base =syscon_regmap_lookup_by_phandle (dev->of_node, +"rockchip,grf" ); +if (IS_ERR (phy_base->reg_base)) {dev_err (&pdev->dev,"Missing rockchip,grf property\n" ); -return PTR_ERR (grf); +return PTR_ERR (phy_base->reg_base); }for_each_available_child_of_node (dev->of_node, child) {
@@ -121,6 +132,8 @@ static int rockchip_usb_phy_probe(struct platform_device *pdev) goto put_child; } + rk_phy->base = phy_base; +if (of_property_read_u32 (child,"reg" , ®_offset)) {dev_err (dev,"missing reg property in node %s\n" , child->name);
@@ -129,7 +142,6 @@ static int rockchip_usb_phy_probe(struct platform_device *pdev) } rk_phy->reg_offset = reg_offset; - rk_phy->reg_base = grf; err =devm_add_action (dev, rockchip_usb_phy_action, rk_phy);if (err)
Signature · 1 line
1.7.9.5
PATCH 12/28 phy: rockchip-usb: move per-phy init into a separate function
In reply to Kishon Vijay Abraham IFrom: Heiko Stuebner <[email protected]>
This unclutters the loop in probe a lot and makes current (and future) error handling easier to read.
--- drivers/phy/phy-rockchip-usb.c | 83 +++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 40 deletions(-)
drivers/phy/phy-rockchip-usb.c +43 -40
@@ -103,14 +103,52 @@ static void rockchip_usb_phy_action(void *data)clk_put (rk_phy->clk); } +static int rockchip_usb_phy_init (struct rockchip_usb_phy_base *base, +struct device_node *child) +{ +struct rockchip_usb_phy *rk_phy; +unsigned int reg_offset; +int err; + + rk_phy =devm_kzalloc (base->dev,sizeof (*rk_phy),GFP_KERNEL ); +if (!rk_phy) +return -ENOMEM ; + + rk_phy->base = base; + +if (of_property_read_u32 (child,"reg" , ®_offset)) { +dev_err (base->dev,"missing reg property in node %s\n" , + child->name); +return -EINVAL ; + } + + rk_phy->reg_offset = reg_offset; + + err =devm_add_action (base->dev, rockchip_usb_phy_action, rk_phy); +if (err) +return err; + + rk_phy->clk =of_clk_get_by_name (child,"phyclk" ); +if (IS_ERR (rk_phy->clk)) + rk_phy->clk =NULL ; + + rk_phy->phy =devm_phy_create (base->dev, child, &ops); +if (IS_ERR (rk_phy->phy)) { +dev_err (base->dev,"failed to create PHY\n" ); +return PTR_ERR (rk_phy->phy); + } +phy_set_drvdata (rk_phy->phy, rk_phy); + +/* only power up usb phy when it use, so disable it when init*/ +return rockchip_usb_phy_power (rk_phy,1 ); +} +static int rockchip_usb_phy_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;struct rockchip_usb_phy_base *phy_base; -struct rockchip_usb_phy *rk_phy;struct phy_provider *phy_provider;struct device_node *child; -unsigned int reg_offset;int err; phy_base =devm_kzalloc (dev,sizeof (*phy_base),GFP_KERNEL );
@@ -126,50 +164,15 @@ static int rockchip_usb_phy_probe(struct platform_device *pdev) }for_each_available_child_of_node (dev->of_node, child) { - rk_phy =devm_kzalloc (dev,sizeof (*rk_phy),GFP_KERNEL ); -if (!rk_phy) { - err = -ENOMEM ; - goto put_child; - } - - rk_phy->base = phy_base; - -if (of_property_read_u32 (child,"reg" , ®_offset)) { -dev_err (dev,"missing reg property in node %s\n" , - child->name); - err = -EINVAL ; - goto put_child; - } - - rk_phy->reg_offset = reg_offset; - - err =devm_add_action (dev, rockchip_usb_phy_action, rk_phy); -if (err) + err =rockchip_usb_phy_init (phy_base, child); +if (err) { +of_node_put (child);return err; - - rk_phy->clk =of_clk_get_by_name (child,"phyclk" ); -if (IS_ERR (rk_phy->clk)) - rk_phy->clk =NULL ; - - rk_phy->phy =devm_phy_create (dev, child, &ops); -if (IS_ERR (rk_phy->phy)) { -dev_err (dev,"failed to create PHY\n" ); - err =PTR_ERR (rk_phy->phy); - goto put_child; } -phy_set_drvdata (rk_phy->phy, rk_phy); - -/* only power up usb phy when it use, so disable it when init*/ - err =rockchip_usb_phy_power (rk_phy,1 ); -if (err) - goto put_child; } phy_provider =devm_of_phy_provider_register (dev, of_phy_simple_xlate);return PTR_ERR_OR_ZERO (phy_provider); -put_child: -of_node_put (child); -return err; }static const struct of_device_id rockchip_usb_phy_dt_ids[] = {
Signature · 1 line
1.7.9.5
PATCH 13/28 phy: rockchip-usb: add compatible values for rk3066a and rk3188
In reply to Kishon Vijay Abraham IFrom: Heiko Stuebner <[email protected]>
We need custom handling for these two socs in the driver shortly, so add the necessary compatible values to binding and driver.
--- .../devicetree/bindings/phy/rockchip-usb-phy.txt | 5 ++++- drivers/phy/phy-rockchip-usb.c | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt +4 -1
@@ -1,7 +1,10 @@ ROCKCHIP USB2 PHY Required properties: - - compatible: rockchip,rk3288-usb-phy + - compatible: matching the soc type, one of + "rockchip,rk3066a-usb-phy" + "rockchip,rk3188-usb-phy" + "rockchip,rk3288-usb-phy" - rockchip,grf : phandle to the syscon managing the "general register files" - #address-cells: should be 1
drivers/phy/phy-rockchip-usb.c +2 -0
@@ -176,6 +176,8 @@ static int rockchip_usb_phy_probe(struct platform_device *pdev) }static const struct of_device_id rockchip_usb_phy_dt_ids[] = { + { .compatible ="rockchip,rk3066a-usb-phy" }, + { .compatible ="rockchip,rk3188-usb-phy" }, { .compatible ="rockchip,rk3288-usb-phy" }, {} };
Signature · 1 line
1.7.9.5
PATCH 14/28 phy: rockchip-usb: expose the phy-internal PLLs
In reply to Kishon Vijay Abraham IFrom: Heiko Stuebner <[email protected]>
The USB phys on Rockchip SoCs contain their own internal PLLs to create the 480MHz needed. Additionally this PLL output is also fed back into the core clock-controller as possible source for clocks like the GPU or others.
Until now this was modelled incorrectly with a "virtual" factor clock in the clock controller. The one big caveat is that if we turn off the usb phy via the siddq signal, all analog components get turned off, including the PLLs. It is therefore possible that a source clock gets disabled without the clock driver ever knowing, possibly making the system hang.
Therefore register the phy-plls as real clocks that the clock driver can then reference again normally, making the clock hirarchy finally reflect the actual hardware.
The phy-ops get converted to simply turning that new clock on and off which in turn controls the siddq signal of the phy.
Through this the driver gains handling for platform-specific data, to handle the phy->clock name association.
--- .../devicetree/bindings/phy/rockchip-usb-phy.txt | 1 + drivers/phy/phy-rockchip-usb.c | 188 +++++++++++++++++--- 2 files changed, 162 insertions(+), 27 deletions(-)
Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt +1 -0
@@ -24,6 +24,7 @@ required properties: Optional Properties: - clocks : phandle + clock specifier for the phy clocks - clock-names: string, clock name, must be "phyclk" +- #clock-cells: for users of the phy-pll, should be 0 Example:
drivers/phy/phy-rockchip-usb.c +161 -27
286 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 15/28 phy: phy_brcmstb_sata: remove duplicate definitions
In reply to Kishon Vijay Abraham IFrom: Jaedon Shin <[email protected]>
Remove duplicate definitions.
--- drivers/phy/phy-brcmstb-sata.c | 2 -- 1 file changed, 2 deletions(-)
drivers/phy/phy-brcmstb-sata.c +0 -2
@@ -26,8 +26,6 @@#define SATA_MDIO_BANK_OFFSET 0x23c#define SATA_MDIO_REG_OFFSET (ofs) ((ofs) * 4) -#define SATA_MDIO_REG_SPACE_SIZE 0x1000 -#define SATA_MDIO_REG_LENGTH 0x1f00#define MAX_PORTS 2
Signature · 1 line
1.7.9.5
PATCH 16/28 phy: phy_brcmstb_sata: add data for phy version
In reply to Kishon Vijay Abraham IFrom: Jaedon Shin <[email protected]>
Add data for phy version, and the default value of version is using the BRCM_SATA_PHY_28NM.
--- drivers/phy/phy-brcmstb-sata.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)
drivers/phy/phy-brcmstb-sata.c +20 -3
@@ -30,7 +30,11 @@#define MAX_PORTS 2/* Register offset between PHYs in PCB space */ -#define SATA_MDIO_REG_SPACE_SIZE 0x1000 +#define SATA_MDIO_REG_28NM_SPACE_SIZE 0x1000 + +enum brcm_sata_phy_version { +BRCM_SATA_PHY_28NM , +};struct brcm_sata_port {int portnum;
@@ -42,6 +46,7 @@ struct brcm_sata_port {struct brcm_sata_phy {struct device *dev;void __iomem *phy_base; +enum brcm_sata_phy_version version;struct brcm_sata_port phys[MAX_PORTS ]; };
@@ -64,8 +69,12 @@ enum sata_mdio_phy_regs_28nm {static inline void __iomem *brcm_sata_phy_base (struct brcm_sata_port *port) {struct brcm_sata_phy *priv = port->phy_priv; +u32 offset; -return priv->phy_base + (port->portnum *SATA_MDIO_REG_SPACE_SIZE ); +if (priv->version ==BRCM_SATA_PHY_28NM ) + offset =SATA_MDIO_REG_28NM_SPACE_SIZE ; + +return priv->phy_base + (port->portnum * offset); } static void brcm_sata_mdio_wr(void __iomem *addr, u32 bank, u32 ofs,
@@ -126,7 +135,8 @@ static const struct phy_ops phy_ops_28nm = { };static const struct of_device_id brcm_sata_phy_of_match[] = { - { .compatible ="brcm,bcm7445-sata-phy" }, + { .compatible ="brcm,bcm7445-sata-phy" , + .data = (void *)BRCM_SATA_PHY_28NM }, {}, };MODULE_DEVICE_TABLE (of, brcm_sata_phy_of_match);
@@ -135,6 +145,7 @@ static int brcm_sata_phy_probe(struct platform_device *pdev) {struct device *dev = &pdev->dev;struct device_node *dn = dev->of_node, *child; +const struct of_device_id *of_id;struct brcm_sata_phy *priv;struct resource *res;struct phy_provider *provider;
@@ -154,6 +165,12 @@ static int brcm_sata_phy_probe(struct platform_device *pdev)if (IS_ERR (priv->phy_base))return PTR_ERR (priv->phy_base); + of_id =of_match_node (brcm_sata_phy_of_match, dn); +if (of_id) + priv->version = (enum brcm_sata_phy_version )of_id->data; +else + priv->version =BRCM_SATA_PHY_28NM ; +for_each_available_child_of_node (dn, child) {unsigned int id;struct brcm_sata_port *port;
Signature · 1 line
1.7.9.5
PATCH 17/28 phy: phy_brcmstb_sata: add support for MIPS-based platforms
In reply to Kishon Vijay Abraham IFrom: Jaedon Shin <[email protected]>
The BCM7xxx ARM-based and MIPS-based platforms share a similar hardware block for AHCI SATA3.
This new compatible string, "brcm,bcm7425-sata-phy", may be used for most MIPS-based platforms of 40nm process technology.
--- .../bindings/phy/brcm,brcmstb-sata-phy.txt | 1 + drivers/phy/Kconfig | 4 ++-- drivers/phy/phy-brcmstb-sata.c | 24 +++++++++++++++----- 3 files changed, 21 insertions(+), 8 deletions(-)
Documentation/devicetree/bindings/phy/brcm,brcmstb-sata-phy.txt +1 -0
@@ -2,6 +2,7 @@ Required properties: - compatible: should be one or more of + "brcm,bcm7425-sata-phy" "brcm,bcm7445-sata-phy" "brcm,phy-sata3" - address-cells: should be 1
drivers/phy/Kconfig +2 -2
@@ -390,11 +390,11 @@ config PHY_TUSB1210 config PHY_BRCMSTB_SATA tristate "Broadcom STB SATA PHY driver" - depends on ARCH_BRCMSTB + depends on ARCH_BRCMSTB || BMIPS_GENERIC depends on OF select GENERIC_PHY help - Enable this to support the SATA3 PHY on 28nm Broadcom STB SoCs. + Enable this to support the SATA3 PHY on 28nm or 40nm Broadcom STB SoCs. Likely useful only with CONFIG_SATA_BRCMSTB enabled. config PHY_CYGNUS_PCIE
drivers/phy/phy-brcmstb-sata.c +18 -6
@@ -32,8 +32,14 @@/* Register offset between PHYs in PCB space */ #define SATA_MDIO_REG_28NM_SPACE_SIZE 0x1000 +/* The older SATA PHY registers duplicated per port registers within the map, +* rather than having a separate map per port. +*/ +#define SATA_MDIO_REG_40NM_SPACE_SIZE 0x10 +enum brcm_sata_phy_version {BRCM_SATA_PHY_28NM , +BRCM_SATA_PHY_40NM , };struct brcm_sata_port {
@@ -51,7 +57,7 @@ struct brcm_sata_phy {struct brcm_sata_port phys[MAX_PORTS ]; }; -enum sata_mdio_phy_regs_28nm { +enum sata_mdio_phy_regs {PLL_REG_BANK_0 =0x50 ,PLL_REG_BANK_0_PLLCONTROL_0 =0x81 ,
@@ -69,10 +75,14 @@ enum sata_mdio_phy_regs_28nm {static inline void __iomem *brcm_sata_phy_base (struct brcm_sata_port *port) {struct brcm_sata_phy *priv = port->phy_priv; -u32 offset; +u32 offset =0 ;if (priv->version ==BRCM_SATA_PHY_28NM ) offset =SATA_MDIO_REG_28NM_SPACE_SIZE ; +else if (priv->version ==BRCM_SATA_PHY_40NM ) + offset =SATA_MDIO_REG_40NM_SPACE_SIZE ; +else +dev_err (priv->dev,"invalid phy version\n" );return priv->phy_base + (port->portnum * offset); }
@@ -93,7 +103,7 @@ static void brcm_sata_mdio_wr(void __iomem *addr, u32 bank, u32 ofs,#define FMAX_VAL_DEFAULT 0x3df#define FMAX_VAL_SSC 0x83 -static void brcm_sata_cfg_ssc_28nm (struct brcm_sata_port *port) +static void brcm_sata_cfg_ssc (struct brcm_sata_port *port) {void __iomem *base =brcm_sata_phy_base (port);struct brcm_sata_phy *priv = port->phy_priv;
@@ -124,12 +134,12 @@ static int brcm_sata_phy_init(struct phy *phy) {struct brcm_sata_port *port =phy_get_drvdata (phy); -brcm_sata_cfg_ssc_28nm (port); +brcm_sata_cfg_ssc (port);return 0 ; } -static const struct phy_ops phy_ops_28nm = { +static const struct phy_ops phy_ops = { .init = brcm_sata_phy_init, .owner =THIS_MODULE , };
@@ -137,6 +147,8 @@ static const struct phy_ops phy_ops_28nm = {static const struct of_device_id brcm_sata_phy_of_match[] = { { .compatible ="brcm,bcm7445-sata-phy" , .data = (void *)BRCM_SATA_PHY_28NM }, + { .compatible ="brcm,bcm7425-sata-phy" , + .data = (void *)BRCM_SATA_PHY_40NM }, {}, };MODULE_DEVICE_TABLE (of, brcm_sata_phy_of_match);
@@ -196,7 +208,7 @@ static int brcm_sata_phy_probe(struct platform_device *pdev) port = &priv->phys[id]; port->portnum = id; port->phy_priv = priv; - port->phy =devm_phy_create (dev, child, &phy_ops_28nm); + port->phy =devm_phy_create (dev, child, &phy_ops); port->ssc_en =of_property_read_bool (child,"brcm,enable-ssc" );if (IS_ERR (port->phy)) {dev_err (dev,"failed to create PHY\n" );
Signature · 1 line
1.7.9.5
PATCH 18/28 phy: berlin-usb: remove non-necessary header files
In reply to Kishon Vijay Abraham IFrom: Jisheng Zhang <[email protected]>
We don't need gpio related header files, so remove them.
--- drivers/phy/phy-berlin-usb.c | 2 -- 1 file changed, 2 deletions(-)
drivers/phy/phy-berlin-usb.c +0 -2
@@ -9,11 +9,9 @@* warranty of any kind, whether express or implied. */ -#include <linux/gpio.h> #include <linux/io.h> #include <linux/module.h> #include <linux/of_device.h> -#include <linux/of_gpio.h> #include <linux/phy/phy.h> #include <linux/platform_device.h> #include <linux/reset.h>
Signature · 1 line
1.7.9.5
PATCH 19/28 phy: berlin-usb: don't set device's driver_data
In reply to Kishon Vijay Abraham IFrom: Jisheng Zhang <[email protected]>
After commit 739ae3452d0e ("phy: berlin-usb: Set drvdata for phy and use it"), we get the address of priv by phy_get_drvdata(), so there's no need to set device's driver_data any more. This patch removes the call of platform_set_drvdata().
--- drivers/phy/phy-berlin-usb.c | 1 - 1 file changed, 1 deletion(-)
drivers/phy/phy-berlin-usb.c +0 -1
@@ -193,7 +193,6 @@ static int phy_berlin_usb_probe(struct platform_device *pdev)return PTR_ERR (phy); } -platform_set_drvdata (pdev, priv);phy_set_drvdata (phy, priv); phy_provider =
Signature · 1 line
1.7.9.5
PATCH 20/28 phy: ti-pipe3: introduce local struct device* in probe
In reply to Kishon Vijay Abraham INo functional change. Introduce local struct device pointer in probe and replace using &pdev->dev/phy->dev with the local device pointer. This is in preparation to split ti_pipe3_probe and add separate functions for getting mem resource, getting sysctrl and getting clocks.
--- drivers/phy/phy-ti-pipe3.c | 54 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-)
drivers/phy/phy-ti-pipe3.c +27 -27
@@ -319,40 +319,41 @@ static int ti_pipe3_probe(struct platform_device *pdev)struct platform_device *control_pdev;const struct of_device_id *match;struct clk *clk; +struct device *dev = &pdev->dev; - phy =devm_kzalloc (&pdev->dev,sizeof (*phy),GFP_KERNEL ); + phy =devm_kzalloc (dev,sizeof (*phy),GFP_KERNEL );if (!phy)return -ENOMEM ; - phy->dev = &pdev->dev; + phy->dev = dev;if (!of_device_is_compatible (node,"ti,phy-pipe3-pcie" )) { - match =of_match_device (ti_pipe3_id_table, &pdev->dev); + match =of_match_device (ti_pipe3_id_table, dev);if (!match)return -EINVAL ; phy->dpll_map = (struct pipe3_dpll_map *)match->data;if (!phy->dpll_map) { -dev_err (&pdev->dev,"no DPLL data\n" ); +dev_err (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); + phy->pll_ctrl_base =devm_ioremap_resource (dev, res);if (IS_ERR (phy->pll_ctrl_base))return PTR_ERR (phy->pll_ctrl_base); - phy->sys_clk =devm_clk_get (phy->dev,"sysclk" ); + phy->sys_clk =devm_clk_get (dev,"sysclk" );if (IS_ERR (phy->sys_clk)) { -dev_err (&pdev->dev,"unable to get sysclk\n" ); +dev_err (dev,"unable to get sysclk\n" );return -EINVAL ; } } - phy->refclk =devm_clk_get (phy->dev,"refclk" ); + phy->refclk =devm_clk_get (dev,"refclk" );if (IS_ERR (phy->refclk)) { -dev_err (&pdev->dev,"unable to get refclk\n" ); +dev_err (dev,"unable to get refclk\n" );/* older DTBs have missing refclk in SATA PHY * so don't bail out in case of SATA PHY. */
@@ -361,9 +362,9 @@ static int ti_pipe3_probe(struct platform_device *pdev) }if (!of_device_is_compatible (node,"ti,phy-pipe3-sata" )) { - phy->wkupclk =devm_clk_get (phy->dev,"wkupclk" ); + phy->wkupclk =devm_clk_get (dev,"wkupclk" );if (IS_ERR (phy->wkupclk)) { -dev_err (&pdev->dev,"unable to get wkupclk\n" ); +dev_err (dev,"unable to get wkupclk\n" );return PTR_ERR (phy->wkupclk); } }else {
@@ -371,14 +372,14 @@ static int ti_pipe3_probe(struct platform_device *pdev) phy->dpll_reset_syscon =syscon_regmap_lookup_by_phandle (node,"syscon-pllreset" );if (IS_ERR (phy->dpll_reset_syscon)) { -dev_info (&pdev->dev, +dev_info (dev,"can't get syscon-pllreset, sata dpll won't idle\n" ); phy->dpll_reset_syscon =NULL ; }else {if (of_property_read_u32_index (node,"syscon-pllreset" ,1 , &phy->dpll_reset_reg)) { -dev_err (&pdev->dev, +dev_err (dev,"couldn't get pllreset reg. offset\n" );return -EINVAL ; }
@@ -387,30 +388,30 @@ static int ti_pipe3_probe(struct platform_device *pdev)if (of_device_is_compatible (node,"ti,phy-pipe3-pcie" )) { - clk =devm_clk_get (phy->dev,"dpll_ref" ); + clk =devm_clk_get (dev,"dpll_ref" );if (IS_ERR (clk)) { -dev_err (&pdev->dev,"unable to get dpll ref clk\n" ); +dev_err (dev,"unable to get dpll ref clk\n" );return PTR_ERR (clk); }clk_set_rate (clk,1500000000 ); - clk =devm_clk_get (phy->dev,"dpll_ref_m2" ); + clk =devm_clk_get (dev,"dpll_ref_m2" );if (IS_ERR (clk)) { -dev_err (&pdev->dev,"unable to get dpll ref m2 clk\n" ); +dev_err (dev,"unable to get dpll ref m2 clk\n" );return PTR_ERR (clk); }clk_set_rate (clk,100000000 ); - clk =devm_clk_get (phy->dev,"phy-div" ); + clk =devm_clk_get (dev,"phy-div" );if (IS_ERR (clk)) { -dev_err (&pdev->dev,"unable to get phy-div clk\n" ); +dev_err (dev,"unable to get phy-div clk\n" );return PTR_ERR (clk); }clk_set_rate (clk,100000000 ); - phy->div_clk =devm_clk_get (phy->dev,"div-clk" ); + phy->div_clk =devm_clk_get (dev,"div-clk" );if (IS_ERR (phy->div_clk)) { -dev_err (&pdev->dev,"unable to get div-clk\n" ); +dev_err (dev,"unable to get div-clk\n" );return PTR_ERR (phy->div_clk); } }else {
@@ -419,13 +420,13 @@ static int ti_pipe3_probe(struct platform_device *pdev) control_node =of_parse_phandle (node,"ctrl-module" ,0 );if (!control_node) { -dev_err (&pdev->dev,"Failed to get control device phandle\n" ); +dev_err (dev,"Failed to get control device phandle\n" );return -EINVAL ; } control_pdev =of_find_device_by_node (control_node);if (!control_pdev) { -dev_err (&pdev->dev,"Failed to get control device\n" ); +dev_err (dev,"Failed to get control device\n" );return -EINVAL ; }
@@ -434,7 +435,7 @@ static int ti_pipe3_probe(struct platform_device *pdev)omap_control_phy_power (phy->control_dev,0 );platform_set_drvdata (pdev, phy); -pm_runtime_enable (phy->dev); +pm_runtime_enable (dev);/* * Prevent auto-disable of refclk for SATA PHY due to Errata i783
@@ -446,13 +447,12 @@ static int ti_pipe3_probe(struct platform_device *pdev) } } - generic_phy =devm_phy_create (phy->dev,NULL , &ops); + generic_phy =devm_phy_create (dev,NULL , &ops);if (IS_ERR (generic_phy))return PTR_ERR (generic_phy);phy_set_drvdata (generic_phy, phy); - phy_provider =devm_of_phy_provider_register (phy->dev, - of_phy_simple_xlate); + phy_provider =devm_of_phy_provider_register (dev, of_phy_simple_xlate);if (IS_ERR (phy_provider))return PTR_ERR (phy_provider);
Signature · 1 line
1.7.9.5
PATCH 21/28 phy: ti-pipe3: move clk initialization to a separate function
In reply to Kishon Vijay Abraham INo functional change. Moved clock initialization done in probe to a separate function as part of cleaning up ti_pipe3_probe.
--- drivers/phy/phy-ti-pipe3.c | 127 +++++++++++++++++++++++++------------------- 1 file changed, 72 insertions(+), 55 deletions(-)
drivers/phy/phy-ti-pipe3.c +72 -55
@@ -308,48 +308,11 @@ static const struct phy_ops ops = {static const struct of_device_id ti_pipe3_id_table[]; -static int ti_pipe3_probe (struct platform_device *pdev) +static int ti_pipe3_get_clk (struct ti_pipe3 *phy) { -struct ti_pipe3 *phy; -struct phy *generic_phy; -struct phy_provider *phy_provider; -struct resource *res; -struct device_node *node = pdev->dev.of_node; -struct device_node *control_node; -struct platform_device *control_pdev; -const struct of_device_id *match;struct clk *clk; -struct device *dev = &pdev->dev; - - phy =devm_kzalloc (dev,sizeof (*phy),GFP_KERNEL ); -if (!phy) -return -ENOMEM ; - - phy->dev = dev; - -if (!of_device_is_compatible (node,"ti,phy-pipe3-pcie" )) { - match =of_match_device (ti_pipe3_id_table, dev); -if (!match) -return -EINVAL ; - - phy->dpll_map = (struct pipe3_dpll_map *)match->data; -if (!phy->dpll_map) { -dev_err (dev,"no DPLL data\n" ); -return -EINVAL ; - } - - res =platform_get_resource_byname (pdev,IORESOURCE_MEM , -"pll_ctrl" ); - phy->pll_ctrl_base =devm_ioremap_resource (dev, res); -if (IS_ERR (phy->pll_ctrl_base)) -return PTR_ERR (phy->pll_ctrl_base); - - phy->sys_clk =devm_clk_get (dev,"sysclk" ); -if (IS_ERR (phy->sys_clk)) { -dev_err (dev,"unable to get sysclk\n" ); -return -EINVAL ; - } - } +struct device *dev = phy->dev; +struct device_node *node = dev->of_node; phy->refclk =devm_clk_get (dev,"refclk" );if (IS_ERR (phy->refclk)) {
@@ -369,25 +332,17 @@ static int ti_pipe3_probe(struct platform_device *pdev) } }else { phy->wkupclk =ERR_PTR (-ENODEV ); - phy->dpll_reset_syscon =syscon_regmap_lookup_by_phandle (node, -"syscon-pllreset" ); -if (IS_ERR (phy->dpll_reset_syscon)) { -dev_info (dev, -"can't get syscon-pllreset, sata dpll won't idle\n" ); - phy->dpll_reset_syscon =NULL ; - }else { -if (of_property_read_u32_index (node, -"syscon-pllreset" ,1 , - &phy->dpll_reset_reg)) { -dev_err (dev, -"couldn't get pllreset reg. offset\n" ); -return -EINVAL ; - } + } + +if (!of_device_is_compatible (node,"ti,phy-pipe3-pcie" )) { + phy->sys_clk =devm_clk_get (dev,"sysclk" ); +if (IS_ERR (phy->sys_clk)) { +dev_err (dev,"unable to get sysclk\n" ); +return -EINVAL ; } }if (of_device_is_compatible (node,"ti,phy-pipe3-pcie" )) { - clk =devm_clk_get (dev,"dpll_ref" );if (IS_ERR (clk)) {dev_err (dev,"unable to get dpll ref clk\n" );
@@ -418,6 +373,68 @@ static int ti_pipe3_probe(struct platform_device *pdev) phy->div_clk =ERR_PTR (-ENODEV ); } +return 0 ; +} + +static int ti_pipe3_probe (struct platform_device *pdev) +{ +struct ti_pipe3 *phy; +struct phy *generic_phy; +struct phy_provider *phy_provider; +struct resource *res; +struct device_node *node = pdev->dev.of_node; +struct device_node *control_node; +struct platform_device *control_pdev; +const struct of_device_id *match; +struct device *dev = &pdev->dev; +int ret; + + phy =devm_kzalloc (dev,sizeof (*phy),GFP_KERNEL ); +if (!phy) +return -ENOMEM ; + + phy->dev = dev; + +if (!of_device_is_compatible (node,"ti,phy-pipe3-pcie" )) { + match =of_match_device (ti_pipe3_id_table, dev); +if (!match) +return -EINVAL ; + + phy->dpll_map = (struct pipe3_dpll_map *)match->data; +if (!phy->dpll_map) { +dev_err (dev,"no DPLL data\n" ); +return -EINVAL ; + } + + res =platform_get_resource_byname (pdev,IORESOURCE_MEM , +"pll_ctrl" ); + phy->pll_ctrl_base =devm_ioremap_resource (dev, res); +if (IS_ERR (phy->pll_ctrl_base)) +return PTR_ERR (phy->pll_ctrl_base); + } + +if (of_device_is_compatible (node,"ti,phy-pipe3-sata" )) { + phy->dpll_reset_syscon =syscon_regmap_lookup_by_phandle (node, +"syscon-pllreset" ); +if (IS_ERR (phy->dpll_reset_syscon)) { +dev_info (dev, +"can't get syscon-pllreset, sata dpll won't idle\n" ); + phy->dpll_reset_syscon =NULL ; + }else { +if (of_property_read_u32_index (node, +"syscon-pllreset" ,1 , + &phy->dpll_reset_reg)) { +dev_err (dev, +"couldn't get pllreset reg. offset\n" ); +return -EINVAL ; + } + } + } + + ret =ti_pipe3_get_clk (phy); +if (ret) +return ret; + control_node =of_parse_phandle (node,"ctrl-module" ,0 );if (!control_node) {dev_err (dev,"Failed to get control device phandle\n" );
Signature · 1 line
1.7.9.5
PATCH 22/28 phy: ti-pipe3: move sysctrl initialization to a separate function
In reply to Kishon Vijay Abraham INo functional change. Moved sysctrl initialization done in probe to a separate function as part of cleaning up ti_pipe3_probe.
--- drivers/phy/phy-ti-pipe3.c | 78 +++++++++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 33 deletions(-)
drivers/phy/phy-ti-pipe3.c +45 -33
@@ -376,6 +376,48 @@ static int ti_pipe3_get_clk(struct ti_pipe3 *phy)return 0 ; } +static int ti_pipe3_get_sysctrl (struct ti_pipe3 *phy) +{ +struct device *dev = phy->dev; +struct device_node *node = dev->of_node; +struct device_node *control_node; +struct platform_device *control_pdev; + + control_node =of_parse_phandle (node,"ctrl-module" ,0 ); +if (!control_node) { +dev_err (dev,"Failed to get control device phandle\n" ); +return -EINVAL ; + } + + control_pdev =of_find_device_by_node (control_node); +if (!control_pdev) { +dev_err (dev,"Failed to get control device\n" ); +return -EINVAL ; + } + + phy->control_dev = &control_pdev->dev; + +if (of_device_is_compatible (node,"ti,phy-pipe3-sata" )) { + phy->dpll_reset_syscon =syscon_regmap_lookup_by_phandle (node, +"syscon-pllreset" ); +if (IS_ERR (phy->dpll_reset_syscon)) { +dev_info (dev, +"can't get syscon-pllreset, sata dpll won't idle\n" ); + phy->dpll_reset_syscon =NULL ; + }else { +if (of_property_read_u32_index (node, +"syscon-pllreset" ,1 , + &phy->dpll_reset_reg)) { +dev_err (dev, +"couldn't get pllreset reg. offset\n" ); +return -EINVAL ; + } + } + } + +return 0 ; +} +static int ti_pipe3_probe (struct platform_device *pdev) {struct ti_pipe3 *phy;
@@ -383,8 +425,6 @@ static int ti_pipe3_probe(struct platform_device *pdev)struct phy_provider *phy_provider;struct resource *res;struct device_node *node = pdev->dev.of_node; -struct device_node *control_node; -struct platform_device *control_pdev;const struct of_device_id *match;struct device *dev = &pdev->dev;int ret;
@@ -413,42 +453,14 @@ static int ti_pipe3_probe(struct platform_device *pdev)return PTR_ERR (phy->pll_ctrl_base); } -if (of_device_is_compatible (node,"ti,phy-pipe3-sata" )) { - phy->dpll_reset_syscon =syscon_regmap_lookup_by_phandle (node, -"syscon-pllreset" ); -if (IS_ERR (phy->dpll_reset_syscon)) { -dev_info (dev, -"can't get syscon-pllreset, sata dpll won't idle\n" ); - phy->dpll_reset_syscon =NULL ; - }else { -if (of_property_read_u32_index (node, -"syscon-pllreset" ,1 , - &phy->dpll_reset_reg)) { -dev_err (dev, -"couldn't get pllreset reg. offset\n" ); -return -EINVAL ; - } - } - } + ret =ti_pipe3_get_sysctrl (phy); +if (ret) +return ret; ret =ti_pipe3_get_clk (phy);if (ret)return ret; - control_node =of_parse_phandle (node,"ctrl-module" ,0 ); -if (!control_node) { -dev_err (dev,"Failed to get control device phandle\n" ); -return -EINVAL ; - } - - control_pdev =of_find_device_by_node (control_node); -if (!control_pdev) { -dev_err (dev,"Failed to get control device\n" ); -return -EINVAL ; - } - - phy->control_dev = &control_pdev->dev; -omap_control_phy_power (phy->control_dev,0 );platform_set_drvdata (pdev, phy);
Signature · 1 line
1.7.9.5
PATCH 23/28 phy: ti-pipe3: move mem resource initialization to a separate function
In reply to Kishon Vijay Abraham INo functional change. Moved mem resource initialization done in probe to a separate function as part of cleaning up ti_pipe3_probe.
--- drivers/phy/phy-ti-pipe3.c | 52 ++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 19 deletions(-)
drivers/phy/phy-ti-pipe3.c +33 -19
@@ -418,14 +418,42 @@ static int ti_pipe3_get_sysctrl(struct ti_pipe3 *phy)return 0 ; } +static int ti_pipe3_get_pll_base (struct ti_pipe3 *phy) +{ +struct resource *res; +const struct of_device_id *match; +struct device *dev = phy->dev; +struct device_node *node = dev->of_node; +struct platform_device *pdev =to_platform_device (dev); + +if (of_device_is_compatible (node,"ti,phy-pipe3-pcie" )) +return 0 ; + + match =of_match_device (ti_pipe3_id_table, dev); +if (!match) +return -EINVAL ; + + phy->dpll_map = (struct pipe3_dpll_map *)match->data; +if (!phy->dpll_map) { +dev_err (dev,"no DPLL data\n" ); +return -EINVAL ; + } + + res =platform_get_resource_byname (pdev,IORESOURCE_MEM , +"pll_ctrl" ); + phy->pll_ctrl_base =devm_ioremap_resource (dev, res); +if (IS_ERR (phy->pll_ctrl_base)) +return PTR_ERR (phy->pll_ctrl_base); + +return 0 ; +} +static int ti_pipe3_probe (struct platform_device *pdev) {struct ti_pipe3 *phy;struct phy *generic_phy;struct phy_provider *phy_provider; -struct resource *res;struct device_node *node = pdev->dev.of_node; -const struct of_device_id *match;struct device *dev = &pdev->dev;int ret;
@@ -435,23 +463,9 @@ static int ti_pipe3_probe(struct platform_device *pdev) phy->dev = dev; -if (!of_device_is_compatible (node,"ti,phy-pipe3-pcie" )) { - match =of_match_device (ti_pipe3_id_table, dev); -if (!match) -return -EINVAL ; - - phy->dpll_map = (struct pipe3_dpll_map *)match->data; -if (!phy->dpll_map) { -dev_err (dev,"no DPLL data\n" ); -return -EINVAL ; - } - - res =platform_get_resource_byname (pdev,IORESOURCE_MEM , -"pll_ctrl" ); - phy->pll_ctrl_base =devm_ioremap_resource (dev, res); -if (IS_ERR (phy->pll_ctrl_base)) -return PTR_ERR (phy->pll_ctrl_base); - } + ret =ti_pipe3_get_pll_base (phy); +if (ret) +return ret; ret =ti_pipe3_get_sysctrl (phy);if (ret)
Signature · 1 line
1.7.9.5
PATCH 24/28 phy: ti-pipe3: use ti_pipe3_power_off to power off the PHY during probe
In reply to Kishon Vijay Abraham INo functional change. Previously omap_control_phy_power() was used to power off the PHY during probe. But once PIPE3 driver is adapted to use syscon, omap_control_phy_power() cannot be used. Hence used ti_pipe3_power_off to power off the PHY.
--- drivers/phy/phy-ti-pipe3.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/phy/phy-ti-pipe3.c +3 -2
@@ -475,8 +475,6 @@ static int ti_pipe3_probe(struct platform_device *pdev)if (ret)return ret; -omap_control_phy_power (phy->control_dev,0 ); -platform_set_drvdata (pdev, phy);pm_runtime_enable (dev);
@@ -495,6 +493,9 @@ static int ti_pipe3_probe(struct platform_device *pdev)return PTR_ERR (generic_phy);phy_set_drvdata (generic_phy, phy); + +ti_pipe3_power_off (generic_phy); + phy_provider =devm_of_phy_provider_register (dev, of_phy_simple_xlate);if (IS_ERR (phy_provider))return PTR_ERR (phy_provider);
Signature · 1 line
1.7.9.5
PATCH 25/28 phy: ti-pipe3: use *syscon* framework API to power on/off the PHY
In reply to Kishon Vijay Abraham IDeprecate using phy-omap-control driver to power on/off the PHY and use *syscon* framework to do the same.
--- Documentation/devicetree/bindings/phy/ti-phy.txt | 10 ++- drivers/phy/phy-ti-pipe3.c | 88 ++++++++++++++++++---- 2 files changed, 81 insertions(+), 17 deletions(-)
Documentation/devicetree/bindings/phy/ti-phy.txt +8 -2
@@ -77,8 +77,6 @@ Required properties: * "div-clk" - apll clock Optional properties: - - ctrl-module : phandle of the control module used by PHY driver to power on - the PHY. - id: If there are multiple instance of the same type, in order to differentiate between each instance "id" can be used (e.g., multi-lane PCIe PHY). If "id" is not provided, it is set to default value of '1'.
@@ -86,6 +84,14 @@ Optional properties: CTRL_CORE_SMA_SW_0 register and register offset to the CTRL_CORE_SMA_SW_0 register that contains the SATA_PLL_SOFT_RESET bit. Only valid for sata_phy. +Deprecated properties: + - ctrl-module : phandle of the control module used by PHY driver to power on + the PHY. + +Recommended properies: + - syscon-phy-power : phandle/offset pair. Phandle to the system control + module and the register offset to power on/off the PHY. + This is usually a subnode of ocp2scp to which it is connected. usb3phy@4a084400 {
drivers/phy/phy-ti-pipe3.c +73 -15
133 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 26/28 phy: ti-pipe3: use *syscon* framework API to set PCS value of the PHY
In reply to Kishon Vijay Abraham IDeprecate using phy-omap-control driver to set PCS value of the PHY and start using *syscon* API to do the same.
--- Documentation/devicetree/bindings/phy/ti-phy.txt | 2 ++ drivers/phy/phy-ti-pipe3.c | 34 ++++++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/phy/ti-phy.txt +2 -0
@@ -83,6 +83,8 @@ Optional properties: - syscon-pllreset: Handle to system control region that contains the CTRL_CORE_SMA_SW_0 register and register offset to the CTRL_CORE_SMA_SW_0 register that contains the SATA_PLL_SOFT_RESET bit. Only valid for sata_phy. + - syscon-pcs : phandle/offset pair. Phandle to the system control module and the + register offset to write the PCS delay value. Deprecated properties: - ctrl-module : phandle of the control module used by PHY driver to power on
drivers/phy/phy-ti-pipe3.c +32 -2
@@ -65,6 +65,9 @@#define PIPE3_PHY_TX_RX_POWERON 0x3#define PIPE3_PHY_TX_RX_POWEROFF 0x0 +#define PCIE_PCS_MASK 0xFF0000 +#define PCIE_PCS_DELAY_COUNT_SHIFT 0x10 +/* * This is an Empirical value that works, need to confirm the actual * value required for the PIPE3PHY_PLL_CONFIGURATION2.PLL_IDLE status
@@ -96,9 +99,11 @@ struct ti_pipe3 {struct clk *div_clk;struct pipe3_dpll_map *dpll_map;struct regmap *phy_power_syscon;/* ctrl. reg. acces */ +struct regmap *pcs_syscon;/* ctrl. reg. acces */ struct regmap *dpll_reset_syscon;/* ctrl. reg. acces */ unsigned int dpll_reset_reg;/* reg. index within syscon */ unsigned int power_reg;/* power reg. index within syscon */ +unsigned int pcie_pcs_reg;/* pcs reg. index in syscon */ bool sata_refclk_enabled; };
@@ -269,8 +274,15 @@ static int ti_pipe3_init(struct phy *x)* 18-1804. */ if (of_device_is_compatible (phy->dev->of_node,"ti,phy-pipe3-pcie" )) { -omap_control_pcie_pcs (phy->control_dev,0x96 ); -return 0 ; +if (!phy->pcs_syscon) { +omap_control_pcie_pcs (phy->control_dev,0x96 ); +return 0 ; + } + + val =0x96 <<OMAP_CTRL_PCIE_PCS_DELAY_COUNT_SHIFT ; + ret =regmap_update_bits (phy->pcs_syscon, phy->pcie_pcs_reg, +PCIE_PCS_MASK , val); +return ret; }/* Bring it out of IDLE if it is IDLE */
@@ -455,6 +467,24 @@ static int ti_pipe3_get_sysctrl(struct ti_pipe3 *phy) phy->control_dev = &control_pdev->dev; } +if (of_device_is_compatible (node,"ti,phy-pipe3-pcie" )) { + phy->pcs_syscon =syscon_regmap_lookup_by_phandle (node, +"syscon-pcs" ); +if (IS_ERR (phy->pcs_syscon)) { +dev_dbg (dev, +"can't get syscon-pcs, using omap control\n" ); + phy->pcs_syscon =NULL ; + }else { +if (of_property_read_u32_index (node, +"syscon-pcs" ,1 , + &phy->pcie_pcs_reg)) { +dev_err (dev, +"couldn't get pcie pcs reg. offset\n" ); +return -EINVAL ; + } + } + } +if (of_device_is_compatible (node,"ti,phy-pipe3-sata" )) { phy->dpll_reset_syscon =syscon_regmap_lookup_by_phandle (node,"syscon-pllreset" );
Signature · 1 line
1.7.9.5
PATCH 27/28 phy: omap-usb2: use omap_usb_power_off to power off the PHY during probe
In reply to Kishon Vijay Abraham INo functional change. Previously omap_control_phy_power() was used to power off the PHY during probe. But once phy-omap-usb2 driver is adapted to use syscon, omap_control_phy_power() cannot be used. Hence used omap_usb_power_off to power off the PHY.
--- drivers/phy/phy-omap-usb2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/phy-omap-usb2.c +1 -1
@@ -241,7 +241,6 @@ static int omap_usb2_probe(struct platform_device *pdev) } phy->control_dev = &control_pdev->dev; -omap_control_phy_power (phy->control_dev,0 ); otg->set_host = omap_usb_set_host; otg->set_peripheral = omap_usb_set_peripheral;
@@ -261,6 +260,7 @@ static int omap_usb2_probe(struct platform_device *pdev) }phy_set_drvdata (generic_phy, phy); +omap_usb_power_off (generic_phy); phy_provider =devm_of_phy_provider_register (phy->dev, of_phy_simple_xlate);
Signature · 1 line
1.7.9.5
PATCH 28/28 phy: omap-usb2: use *syscon* framework API to power on/off the PHY
In reply to Kishon Vijay Abraham IDeprecate using phy-omap-control driver to power on/off the PHY, and use *syscon* framework to do the same. This handles powering on/off the PHY for the USB2 PHYs used in various TI SoCs.
--- Documentation/devicetree/bindings/phy/ti-phy.txt | 8 +- drivers/phy/phy-omap-usb2.c | 92 ++++++++++++++++++---- include/linux/phy/omap_usb.h | 23 ++++++ 3 files changed, 105 insertions(+), 18 deletions(-)
Documentation/devicetree/bindings/phy/ti-phy.txt +7 -1
@@ -31,6 +31,8 @@ OMAP USB2 PHY Required properties: - compatible: Should be "ti,omap-usb2" + Should be "ti,dra7x-usb2-phy2" for the 2nd instance of USB2 PHY + in DRA7x - 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.
@@ -40,10 +42,14 @@ Required properties: * "wkupclk" - wakeup clock. * "refclk" - reference clock (optional). -Optional properties: +Deprecated properties: - ctrl-module : phandle of the control module used by PHY driver to power on the PHY. +Recommended properies: +- syscon-phy-power : phandle/offset pair. Phandle to the system control + module and the register offset to power on/off the PHY. + This is usually a subnode of ocp2scp to which it is connected. usb2phy@4a0ad080 {
drivers/phy/phy-omap-usb2.c +75 -17
156 lines not on this page · raw message
include/linux/phy/omap_usb.h +23 -0
@@ -30,6 +30,12 @@ struct usb_dpll_params {u32 mf; }; +enum omap_usb_phy_type { +TYPE_USB2 ,/* USB2_PHY, power down in CONTROL_DEV_CONF */ +TYPE_DRA7USB2 ,/* USB2 PHY, power and power_aux e.g. DRA7 */ +TYPE_AM437USB2 ,/* USB2 PHY, power e.g. AM437x */ +}; +struct omap_usb {struct usb_phy phy;struct phy_companion *comparator;
@@ -40,11 +46,20 @@ struct omap_usb {struct clk *wkupclk;struct clk *optclk;u8 flags; +enum omap_usb_phy_type type; +struct regmap *syscon_phy_power;/* ctrl. reg. acces */ +unsigned int power_reg;/* power reg. index within syscon */ +u32 mask; +u32 power_on; +u32 power_off; };struct usb_phy_data {const char *label;u8 flags; +u32 mask; +u32 power_on; +u32 power_off; };/* Driver Flags */
@@ -52,6 +67,14 @@ struct usb_phy_data {#define OMAP_USB2_HAS_SET_VBUS (1 << 1)#define OMAP_USB2_CALIBRATE_FALSE_DISCONNECT (1 << 2) +#define OMAP_DEV_PHY_PD BIT(0) +#define OMAP_USB2_PHY_PD BIT(28) + +#define AM437X_USB2_PHY_PD BIT(0) +#define AM437X_USB2_OTG_PD BIT(1) +#define AM437X_USB2_OTGVDET_EN BIT(19) +#define AM437X_USB2_OTGSESSEND_EN BIT(20) +#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
Quoted 17 lines · Kishon Vijay Abraham I
Hi Greg,
Please find the pull request for 4.5 merge window below. This should be my final pull request for 2015 unless you want me to change something ;-)
It adds two new PHY drivers, deprecates phy-omap-control driver (it was in my TO-DO for sometime), and other miscellaneous phy driver improvements and fixes.
Let me know if you want me to modify something.
Merry Christmas and Happy Newyear!
Cheers
Kishon
Quoted 7 lines
The following changes since commit
708744628ba96ed4dfcac74a985eb66ad551f164:phy: core: Get a refcount to phy in
devm_of_phy_get_by_index()(2015-12-07 18:44:02 +0530)are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.gittags/phy-for-4.5
Pulled and pushed out, thanks.
greg k-h