Add Armada 3700 COMPHY support

Fix the SATA IP memory area which is only 0x178 bytes long (from Marvell A3700 specification). Actually, starting from the offset 0xe0178, there is an area dedicated to the COMPHY driver.

Suggested-by Grzegorz Jaszczyk <[email protected]>

Signed-off-by Miquel Raynal <[email protected]>

---
 arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm64/boot/dts/marvell/armada-37xx.dtsi +1 -1

index 4472bcd8f9fb..e7405931f381 100644
@@ -358,7 +358,7 @@
 
 			sata: sata@e0000 {
 				compatible = "marvell,armada-3700-ahci";
-				reg = <0xe0000 0x2000>;
+				reg = <0xe0000 0x178>;
 				interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
 				status = "disabled";
 			};

Signature · 1 line

2.19.1

Describe the A3700 COMPHY node. It has three PHYs that can be configured as follow:
* PCIe or GbE
* USB3 or GbE
* SATA or USB3
Each of them has its own memory area.

Suggested-by Grzegorz Jaszczyk <[email protected]>

Signed-off-by Miquel Raynal <[email protected]>

---
 arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 29 ++++++++++++++++++++
 1 file changed, 29 insertions(+)

arch/arm64/boot/dts/marvell/armada-37xx.dtsi +29 -0

index e7405931f381..036d6fd6c9ef 100644
@@ -242,6 +242,35 @@
 				reg = <0x14000 0x60>;
 			};
 
+			comphy: phy@18300 {
+				compatible = "marvell,comphy-a3700";
+				reg = <0x18300 0x300>,
+				      <0x1F000 0x400>,
+				      <0x5C000 0x400>,
+				      <0xe0178 0x8>;
+				reg-names = "comphy",
+					    "lane1_pcie_gbe",
+					    "lane0_usb3_gbe",
+					    "lane2_sata_usb3";
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				comphy0: phy@0 {
+					reg = <0>;
+					#phy-cells = <1>;
+				};
+
+				comphy1: phy@1 {
+					reg = <1>;
+					#phy-cells = <1>;
+				};
+
+				comphy2: phy@2 {
+					reg = <2>;
+					#phy-cells = <1>;
+				};
+			};
+
 			pinctrl_sb: pinctrl@18800 {
 				compatible = "marvell,armada3710-sb-pinctrl",
 					     "syscon", "simple-mfd";

Signature · 1 line

2.19.1

Hello,

This series adds a new driver to support Armada 3700 COMPHY IP. The series has been tested on an ESPRESSObin with SATA, PCIe and USB3 host. For this purpose, patch 1 enumerates the SATA PHY mode. The SGMII PHY mode that is supported by the IP has been written (uses SMC calls anyway) but could not be tested on this platform.

Three series will follow to add PHY support (or at least a PHY nodes in the A3700/ESPRESSObin device trees) to the MVEBU AHCI driver, the Aardvark PCI controller driver and the MVEBU xHCI driver. All this is needed in order to achieve suspend to RAM on this platform.

Thanks,
Miquèl

Changes since v4:
=================
* Fixed error in the driver probe where PHY_INTERFACE_MODE_NA was assigned to lane->mode instead of lane->submode.
* Compile-in the driver by default (depends on ARCH_MVEBU).
* Add dependency on HAVE_ARM_SMCC in Kconfig.

Changes since v3:
=================
* Added Rob's Reviewed-by tag on bindings.
* Rebased on top of phy -next as of the 12th of December, 2018.
* Adapted the driver to support SGMII/1000BASEX and HS_SGMII/2500BASEX.

Changes since v2:
=================
* Remove redundant check on lane->port/args->arg[0] at the end of the ->xlate() callback. Do it on both armada-cp110 and armada-a3700 COMPHY drivers.
* Put my SoB as author of the patch first when a patch is co-developed.

Changes since v1:
=================
* Fix wrong check in ->xlate().
* Apply the same fix to the cp110 comphy driver from which the a3700 driver is based.
* Added credit to Gregorz Jaszczyk for his work.
* Added Suggested-by tag to the patch adding the COMPHY DT node.

Grzegorz Jaszczyk (1):
phy: enumerate SATA PHY mode

Miquel Raynal (6):
phy: mvebu-cp110-comphy: fix port check in ->xlate()
phy: add A3700 COMPHY support
dt-bindings: phy: mvebu-comphy: extend the file to describe a3700
bindings
MAINTAINERS: phy: add entry for Armada 3700 COMPHY driver
ARM64: dts: marvell: armada-37xx: fix SATA node scope
ARM64: dts: marvell: armada-37xx: declare the COMPHY node

 .../bindings/phy/phy-mvebu-comphy.txt         |  65 +++-
 MAINTAINERS                                   |   6 +
 arch/arm64/boot/dts/marvell/armada-37xx.dtsi  |  31 +-
 drivers/phy/marvell/Kconfig                   |  12 +
 drivers/phy/marvell/Makefile                  |   1 +
 drivers/phy/marvell/phy-mvebu-a3700-comphy.c  | 318 ++++++++++++++++++
 drivers/phy/marvell/phy-mvebu-cp110-comphy.c  |   2 -
 include/linux/phy/phy.h                       |   1 +
 8 files changed, 421 insertions(+), 15 deletions(-)
 create mode 100644 drivers/phy/marvell/phy-mvebu-a3700-comphy.c

Hi Kishon,

Miquel Raynal <[email protected]> wrote on Tue, 8 Jan 2019 17:31:17 +0100:

Quoted 13 lines

Hello,

This series adds a new driver to support Armada 3700 COMPHY IP. The series has been tested on an ESPRESSObin with SATA, PCIe and USB3 host. For this purpose, patch 1 enumerates the SATA PHY mode. The SGMII PHY mode that is supported by the IP has been written (uses SMC calls anyway) but could not be tested on this platform.

Three series will follow to add PHY support (or at least a PHY nodes in the A3700/ESPRESSObin device trees) to the MVEBU AHCI driver, the Aardvark PCI controller driver and the MVEBU xHCI driver. All this is needed in order to achieve suspend to RAM on this platform.

Quoted 3 lines

Thanks,
Miquèl

Any inputs on this series? It is important for me because it impacts SATA, PCIe and USB changes I plan to get merge.

Thanks,
Miquèl

Quoted 54 lines

Changes since v4:
=================
* Fixed error in the driver probe where PHY_INTERFACE_MODE_NA was assigned to lane->mode instead of lane->submode.
* Compile-in the driver by default (depends on ARCH_MVEBU).
* Add dependency on HAVE_ARM_SMCC in Kconfig.

Changes since v3:
=================
* Added Rob's Reviewed-by tag on bindings.
* Rebased on top of phy -next as of the 12th of December, 2018.
* Adapted the driver to support SGMII/1000BASEX and HS_SGMII/2500BASEX.

Changes since v2:
=================
* Remove redundant check on lane->port/args->arg[0] at the end of the ->xlate() callback. Do it on both armada-cp110 and armada-a3700 COMPHY drivers.
* Put my SoB as author of the patch first when a patch is co-developed.

Changes since v1:
=================
* Fix wrong check in ->xlate().
* Apply the same fix to the cp110 comphy driver from which the a3700 driver is based.
* Added credit to Gregorz Jaszczyk for his work.
* Added Suggested-by tag to the patch adding the COMPHY DT node.

Grzegorz Jaszczyk (1):
phy: enumerate SATA PHY mode

Miquel Raynal (6):
phy: mvebu-cp110-comphy: fix port check in ->xlate()
phy: add A3700 COMPHY support
dt-bindings: phy: mvebu-comphy: extend the file to describe a3700
bindings
MAINTAINERS: phy: add entry for Armada 3700 COMPHY driver
ARM64: dts: marvell: armada-37xx: fix SATA node scope
ARM64: dts: marvell: armada-37xx: declare the COMPHY node

 .../bindings/phy/phy-mvebu-comphy.txt         |  65 +++-
 MAINTAINERS                                   |   6 +
 arch/arm64/boot/dts/marvell/armada-37xx.dtsi  |  31 +-
 drivers/phy/marvell/Kconfig                   |  12 +
 drivers/phy/marvell/Makefile                  |   1 +
 drivers/phy/marvell/phy-mvebu-a3700-comphy.c  | 318 ++++++++++++++++++
 drivers/phy/marvell/phy-mvebu-cp110-comphy.c  |   2 -
 include/linux/phy/phy.h                       |   1 +
 8 files changed, 421 insertions(+), 15 deletions(-)
 create mode 100644 drivers/phy/marvell/phy-mvebu-a3700-comphy.c