Skip to contentSkip to conversation

phy: for 4.2 -rc

GIT PULL New Kishon Vijay Abraham I 2 participants 5 messages Aug 4, 2015 – Aug 5, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Hi Greg,

Got a couple of more fixes for this -rc cycle. One fixes a compiler error when the driver is built as module and the other fixes a SATA lockup. The fix also requires a dts patch which I've included in this series after Tony's ACK. Please find the pull request below and consider merging in this -rc cycle.

Let me know If I have to modify something.

Cheers
Kishon

The following changes since commit dcb54fcb3483862e993abdae99cec22fb3ae4099:

phy: berlin-usb: fix divider for BG2 (2015-07-15 20:02:09 +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.2-rc6

for you to fetch changes up to 257d5d9a9f19ee6c6801589c74791d5422c374e9:

ARM: dts: dra7: Add syscon-pllreset syscon to SATA PHY (2015-08-04 21:11:50 +0530)

----------------------------------------------------------------
phy: for 4.2-rc6

*) Fix compiler error when sun4i usb phy driver is built as module *) Fix SATA Lockup issue in dra7 SoC

----------------------------------------------------------------
Hans de Goede (1):
phy-sun4i-usb: Add missing EXPORT_SYMBOL_GPL for sun4i_usb_phy_set_squelch_detect

Roger Quadros (2):
phy: ti-pipe3: i783 workaround for SATA lockup after dpll unlock/relock
ARM: dts: dra7: Add syscon-pllreset syscon to SATA PHY

 Documentation/devicetree/bindings/phy/ti-phy.txt |   16 ++++++
 arch/arm/boot/dts/dra7.dtsi                      |    1 +
 drivers/phy/phy-sun4i-usb.c                      |    1 +
 drivers/phy/phy-ti-pipe3.c                       |   61 +++++++++++++++++++---
 4 files changed, 73 insertions(+), 6 deletions(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/3 phy-sun4i-usb: Add missing EXPORT_SYMBOL_GPL for sun4i_usb_phy_set_squelch_detect

From: Hans de Goede <[email protected]>

sun4i_usb_phy_set_squelch_detect is used by other code, which may be built as a module, so it should be exported.

---
 drivers/phy/phy-sun4i-usb.c |    1 +
 1 file changed, 1 insertion(+)
drivers/phy/phy-sun4i-usb.c +1 -0
index e17c539..2dad7e8 100644
@@ -212,6 +212,7 @@ void sun4i_usb_phy_set_squelch_detect(struct phy *_phy, bool enabled)
 
 	sun4i_usb_phy_write(phy, PHY_SQUELCH_DETECT, enabled ? 0 : 2, 2);
 }
+EXPORT_SYMBOL_GPL(sun4i_usb_phy_set_squelch_detect);
 
 static struct phy_ops sun4i_usb_phy_ops = {
 	.init		= sun4i_usb_phy_init,
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 2/3 phy: ti-pipe3: i783 workaround for SATA lockup after dpll unlock/relock

In reply to Kishon Vijay Abraham I

From: Roger Quadros <[email protected]>

SATA_PLL_SOFT_RESET bit of CTRL_CORE_SMA_SW_0 must be toggled between a SATA DPLL unlock and re-lock to prevent SATA lockup.

Introduce a new DT parameter 'syscon-pllreset' to provide the syscon regmap access to this register which sits in the control module.

If the register is not provided we fallback to the old behaviour i.e. SATA DPLL refclk will not be disabled and we prevent SoC low power states.

---
 Documentation/devicetree/bindings/phy/ti-phy.txt |   16 ++++++
 drivers/phy/phy-ti-pipe3.c                       |   61 +++++++++++++++++++---
 2 files changed, 71 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/phy/ti-phy.txt +16 -0
index 305e3df..9cf9446 100644
@@ -82,6 +82,9 @@ Optional properties:
  - 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'.
+ - 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.
 
 This is usually a subnode of ocp2scp to which it is connected.
 
@@ -100,3 +103,16 @@ usb3phy@4a084400 {
 			"sysclk",
 			"refclk";
 };
+
+sata_phy: phy@4A096000 {
+	compatible = "ti,phy-pipe3-sata";
+	reg = <0x4A096000 0x80>, /* phy_rx */
+	      <0x4A096400 0x64>, /* phy_tx */
+	      <0x4A096800 0x40>; /* pll_ctrl */
+	reg-names = "phy_rx", "phy_tx", "pll_ctrl";
+	ctrl-module = <&omap_control_sata>;
+	clocks = <&sys_clkin1>, <&sata_ref_clk>;
+	clock-names = "sysclk", "refclk";
+	syscon-pllreset = <&scm_conf 0x3fc>;
+	#phy-cells = <0>;
+};
drivers/phy/phy-ti-pipe3.c +55 -6

111 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#3 lore raw

PATCH 3/3 ARM: dts: dra7: Add syscon-pllreset syscon to SATA PHY

In reply to Kishon Vijay Abraham I

From: Roger Quadros <[email protected]>

This register is required to be passed to the SATA PHY driver to workaround errata i783 (SATA Lockup After SATA DPLL Unlock/Relock).

---
 arch/arm/boot/dts/dra7.dtsi |    1 +
 1 file changed, 1 insertion(+)
arch/arm/boot/dts/dra7.dtsi +1 -0
index 8f1e25b..4a0718c 100644
@@ -1140,6 +1140,7 @@
 				ctrl-module = <&omap_control_sata>;
 				clocks = <&sys_clkin1>, <&sata_ref_clk>;
 				clock-names = "sysclk", "refclk";
+				syscon-pllreset = <&scm_conf 0x3fc>;
 				#phy-cells = <0>;
 			};
 
Signature · 1 line
1.7.9.5
#4 lore raw
In reply to Kishon Vijay Abraham I
Quoted 13 lines · Kishon Vijay Abraham I

Hi Greg,

Got a couple of more fixes for this -rc cycle. One fixes a compiler error when the driver is built as module and the other fixes a SATA lockup. The fix also requires a dts patch which I've included in this series after Tony's ACK. Please find the pull request below and consider merging in this -rc cycle.

Let me know If I have to modify something.

Cheers
Kishon

Quoted 7 lines

The following changes since commit dcb54fcb3483862e993abdae99cec22fb3ae4099:

phy: berlin-usb: fix divider for BG2 (2015-07-15 20:02:09 +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.2-rc6

Pulled and pushed out, thanks.

greg k-h