Add Cygnus PCIe PHY support
Ray Jui
maintainercover Add Cygnus PCIe PHY support
This patch series adds support for the Cygnus PCIe PHY and support of MDC/MDIO interface found in various iProc based of SoCs. The iProc MDC/MDIO interface can be used by the host processor to communicate with various internal Serdes/PHYs including Ethernet, PCIe, USB, etc.
This patch series is based on Linux v4.1-rc4 and is avaliable in:
https://github.com/Broadcom/cygnus-linux/tree/cygnus-pcie-phy-v1
Ray Jui (5):
phy: iproc-mdio: Define DT binding
phy: iproc-mdio: Initial iProc MDC/MDIO support
phy: cygnus: pcie: Define DT binding
phy: cygnus: pcie: Add Cygnus PCIe PHY support
ARM: dts: enable PCIe PHY support for Cygnus
.../bindings/phy/brcm,cygnus-pcie-phy.txt | 31 ++ .../devicetree/bindings/phy/brcm,iproc-mdio.txt | 15 + arch/arm/boot/dts/bcm-cygnus.dtsi | 17 + drivers/phy/Kconfig | 27 ++ drivers/phy/Makefile | 2 + drivers/phy/phy-cygnus-pcie.c | 340 ++++++++++++++++++++ drivers/phy/phy-iproc-mdio.c | 249 ++++++++++++++ include/linux/phy/iproc_mdio_phy.h | 22 ++ 8 files changed, 703 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt create mode 100644 Documentation/devicetree/bindings/phy/brcm,iproc-mdio.txt create mode 100644 drivers/phy/phy-cygnus-pcie.c create mode 100644 drivers/phy/phy-iproc-mdio.c create mode 100644 include/linux/phy/iproc_mdio_phy.h
Signature · 1 line
1.7.9.5
Ray Jui
maintainerPATCH 1/5 phy: iproc-mdio: Define DT binding
Define device tree bindings for iProc MDC/MDIO interface
--- .../devicetree/bindings/phy/brcm,iproc-mdio.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/brcm,iproc-mdio.txt
Documentation/devicetree/bindings/phy/brcm,iproc-mdio.txt new file +15 -0
@@ -0,0 +1,15 @@ +Broadcom iProc MDC/MDIO interface + +The iProc MDC/MDIO interface is found on various iProc based SoCs and used to +communicate with various types of Serdes/PHYs including Ethernet, PCIe, USB, +and etc. + +Required properties: +- compatible: Must be "brcm,iproc-mdio" +- reg: base address and length of the MDC/MDIO block + +Example: + mdio: mdio@18002000 { + compatible = "brcm,iproc-mdio"; + reg = <0x18002000 0x8>; + };
Signature · 1 line
1.7.9.5
Re: [PATCH 1/5] phy: iproc-mdio: Define DT binding
Hi,
Quoted 1 line · Ray Jui
Define device tree bindings for iProc MDC/MDIO interface
Fix $subject to something like 'dt_bindings: Add iProc MDC/MDIO PHY bindings'
Quoted 16 lines
Signed-off-by Ray Jui <[email protected]>Reviewed-by Arun Parameswaran <[email protected]>Reviewed-by JD (Jiandong) Zheng <[email protected]>Reviewed-by Scott Branden <[email protected]>--- .../devicetree/bindings/phy/brcm,iproc-mdio.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+)create mode 100644
Documentation/devicetree/bindings/phy/brcm,iproc-mdio.txtDocumentation/devicetree/bindings/phy/brcm,iproc-mdio.txt new file +0
-0
Documentation/devicetree/bindings/phy/brcm,iproc-mdio.txt line 5
Quoted 5 lines
Documentation/devicetree/bindings/phy/brcm,iproc-mdio.txt new file +5
-0@@ -0,0 +1,15 @@ +Broadcom iProc MDC/MDIO interface + +The iProc MDC/MDIO interface is found on various iProc based SoCs and used to +communicate with various types of Serdes/PHYs including Ethernet, PCIe, USB, +and etc.
This sounds like it isn't a PHY exactly but a bus to which other PHYs are connected?
Thanks
Kishon
Ray Jui
maintainerRe: [PATCH 1/5] phy: iproc-mdio: Define DT binding
Hi Kishon,
Quoted 9 lines · Kishon Vijay Abraham I
Hi,
Quoted 1 line · Ray Jui
Define device tree bindings for iProc MDC/MDIO interface
Fix $subject to something like '
dt_bindings: Add iProc MDC/MDIO PHY bindings'
Will do.
Quoted 21 lines
Quoted 21 lines
Signed-off-by Ray Jui <[email protected]>Reviewed-by Arun Parameswaran <[email protected]>Reviewed-by JD (Jiandong) Zheng <[email protected]>Reviewed-by Scott Branden <[email protected]>--- .../devicetree/bindings/phy/brcm,iproc-mdio.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+)create mode 100644
Documentation/devicetree/bindings/phy/brcm,iproc-mdio.txtDocumentation/devicetree/bindings/phy/brcm,iproc-mdio.txt new file +2
-0@@ -0,0 +1,15 @@ +Broadcom iProc MDC/MDIO interface +
Quoted 8 lines
Quoted 5 lines
Documentation/devicetree/bindings/phy/brcm,iproc-mdio.txt new file +1
-0+The iProc MDC/MDIO interface is found on various iProc based SoCs andused to
+communicate with various types of Serdes/PHYs including Ethernet, PCIe, USB,
+and etc.This sounds like it isn't a PHY exactly but a bus to which other PHYs are connected?
Yes it's an internal MDIO interface connected to various types of internal Serdes or PHYs.
Quoted 3 lines
Thanks
Kishon
Ray Jui
maintainerPATCH 2/5 phy: iproc-mdio: Initial iProc MDC/MDIO support
In reply to Ray JuiThis adds the support for the iProc MDC/MDIO interface. Multiple iProc SoCs contain the MDC/MDIO interface that can be used for the host to communicate with various Serdes/PHYs including Ethernet, PCIe, USB, etc.
--- drivers/phy/Kconfig | 12 ++ drivers/phy/Makefile | 1 + drivers/phy/phy-iproc-mdio.c | 249 ++++++++++++++++++++++++++++++++++++ include/linux/phy/iproc_mdio_phy.h | 22 ++++ 4 files changed, 284 insertions(+) create mode 100644 drivers/phy/phy-iproc-mdio.c create mode 100644 include/linux/phy/iproc_mdio_phy.h
drivers/phy/Kconfig +12 -0
@@ -52,6 +52,18 @@ config PHY_EXYNOS_MIPI_VIDEO Support for MIPI CSI-2 and MIPI DSI DPHY found on Samsung S5P and EXYNOS SoCs. +config PHY_IPROC_MDIO + bool "Broadcom iProc MDC/MDIO driver" + depends on ARCH_BCM_IPROC + default ARCH_BCM_IPROC + help + Enable this to support the iProc generic MDC/MDIO interface found + in various iProc based SoCs. The generic MDC/MDIO interface can be + used to communicate with various types of Serdes/PHYs including + Ethernet, PCIe, USB, and etc. + + If unsure, say N. + config PHY_MVEBU_SATA def_bool y depends on ARCH_DOVE || MACH_DOVE || MACH_KIRKWOOD
drivers/phy/Makefile +1 -0
@@ -13,6 +13,7 @@ obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o 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_IPROC_MDIO) += phy-iproc-mdio.o obj-$(CONFIG_PHY_RCAR_GEN2) += phy-rcar-gen2.o obj-$(CONFIG_OMAP_CONTROL_PHY) += phy-omap-control.o obj-$(CONFIG_OMAP_USB2) += phy-omap-usb2.o
drivers/phy/phy-iproc-mdio.c new file +249 -0
249 lines not on this page · raw message
include/linux/phy/iproc_mdio_phy.h new file +22 -0
@@ -0,0 +1,22 @@ +/* +* Copyright (C) 2015 Broadcom Corporation +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation version 2. +* +* This program is distributed "as is" WITHOUT ANY WARRANTY of any +* kind, whether express or implied; without even the implied warranty +* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#ifndef __IPROC_MDIO_PHY_H +#define __IPROC_MDIO_PHY_H + +int iproc_mdio_read (unsigned clk_div,unsigned phy_addr,unsigned reg_addr, +u16 *data); +int iproc_mdio_write (unsigned clk_div,unsigned phy_addr,unsigned reg_addr, +u16 data); + +#endif /* __IPROC_MDIO_PHY_H */
Signature · 1 line
1.7.9.5
Re: [PATCH 2/5] phy: iproc-mdio: Initial iProc MDC/MDIO support
Quoted 24 lines · Ray Jui
drivers/phy/Kconfig +11
-0+config PHY_IPROC_MDIO + bool "Broadcom iProc MDC/MDIO driver" + depends on ARCH_BCM_IPROC + default ARCH_BCM_IPROC + help + Enable this to support the iProc generic MDC/MDIO interface found + in various iProc based SoCs. The generic MDC/MDIO interface can be + used to communicate with various types of Serdes/PHYs including + Ethernet, PCIe, USB, and etc. + + If unsure, say N.drivers/phy/Makefile +1
-0+obj-$(CONFIG_PHY_IPROC_MDIO) += phy-iproc-mdio.odrivers/phy/phy-iproc-mdio.c new file +1
-0+#include <linux/module.h>
drivers/phy/phy-iproc-mdio.c line 249
Quoted 10 lines
drivers/phy/phy-iproc-mdio.c new file +9
-0+static int __init iproc_mdio_init (void ) +{ +return platform_driver_register (&iproc_mdio_driver); +} +arch_initcall_sync (iproc_mdio_init); + +MODULE_AUTHOR ("Ray Jui <[email protected]>" ); +MODULE_DESCRIPTION ("Broadcom iPROC MDC/MDIO driver" ); +MODULE_LICENSE ("GPL v2" );
I guess phy-iproc-mdio.o is intended to be built-in only. If that's correct the above three MODULE_ macros (and, probably, the include of linux/module.h) can safely be dropped.
Thanks,
Paul Bolle
Ray Jui
maintainerRe: [PATCH 2/5] phy: iproc-mdio: Initial iProc MDC/MDIO support
Quoted 40 lines · Paul Bolle
Quoted 24 lines · Ray Jui
drivers/phy/Kconfig +11
-0+config PHY_IPROC_MDIO + bool "Broadcom iProc MDC/MDIO driver" + depends on ARCH_BCM_IPROC + default ARCH_BCM_IPROC + help + Enable this to support the iProc generic MDC/MDIO interface found + in various iProc based SoCs. The generic MDC/MDIO interface can be + used to communicate with various types of Serdes/PHYs including + Ethernet, PCIe, USB, and etc. + + If unsure, say N.drivers/phy/Makefile +1
-0+obj-$(CONFIG_PHY_IPROC_MDIO) += phy-iproc-mdio.odrivers/phy/phy-iproc-mdio.c new file +1
-0+#include <linux/module.h> drivers/phy/phy-iproc-mdio.c line 249
Quoted 10 lines
drivers/phy/phy-iproc-mdio.c new file +9
-0+static int __init iproc_mdio_init (void ) +{ +return platform_driver_register (&iproc_mdio_driver); +} +arch_initcall_sync (iproc_mdio_init); + +MODULE_AUTHOR ("Ray Jui <[email protected]>" ); +MODULE_DESCRIPTION ("Broadcom iPROC MDC/MDIO driver" ); +MODULE_LICENSE ("GPL v2" );I guess phy-iproc-mdio.o is intended to be built-in only. If that's correct the above three
MODULE_macros (and, probably, the include oflinux/module.h) can safely be dropped.
Quoted 5 lines
Thanks,
Paul Bolle
I think we had previous discussions on this for the pinctrl patches. People including Linus and me think this is good to be there at least for information purpose.
I do not want to go over the same argument again. I'll leave this to the subsystem maintainer. If the subsystem maintainer wants this out, I can take it out. Otherwise, I'll leave it as it is.
Thanks,
Ray
Re: [PATCH 2/5] phy: iproc-mdio: Initial iProc MDC/MDIO support
Quoted 3 lines · Ray Jui
I think we had previous discussions on this for the pinctrl patches. People including Linus and me think this is good to be there at least for information purpose.
Maybe I just forgot we already discussed this. (I only remember PCI as valuing consistency with other drivers more. But even there I remember the maintainer wanting to clean things up, eventually.)
Quoted 3 lines
I do not want to go over the same argument again. I'll leave this to the subsystem maintainer. If the subsystem maintainer wants this out, I can take it out. Otherwise, I'll leave it as it is.
Sure. It's the maintainer's decision, at the end of the day.
Thanks,
Paul Bolle
Re: [PATCH 2/5] phy: iproc-mdio: Initial iProc MDC/MDIO support
In reply to Ray JuiHi,
Quoted 3 lines · Ray Jui
This adds the support for the iProc MDC/MDIO interface. Multiple iProc SoCs contain the MDC/MDIO interface that can be used for the host to communicate with various Serdes/PHYs including Ethernet, PCIe, USB, etc.
the term phy used in this driver is misleading. It's not a PHY actually. This sounds more like a bus driver to me and should be present in drivers/bus?
Thanks
Kishon
Quoted 333 lines
Signed-off-by Ray Jui <[email protected]>Reviewed-by Arun Parameswaran <[email protected]>Reviewed-by JD (Jiandong) Zheng <[email protected]>Reviewed-by Scott Branden <[email protected]>--- drivers/phy/Kconfig | 12 ++ drivers/phy/Makefile | 1 + drivers/phy/phy-iproc-mdio.c | 249 ++++++++++++++++++++++++++++++++++++ include/linux/phy/iproc_mdio_phy.h | 22 ++++ 4 files changed, 284 insertions(+)create mode 100644
drivers/phy/phy-iproc-mdio.ccreate mode 100644include/linux/phy/iproc_mdio_phy.hdrivers/phy/Kconfig +12
-0@@ -52,6 +52,18 @@ config PHY_EXYNOS_MIPI_VIDEO Support for MIPI CSI-2 and MIPI DSI DPHY found on Samsung S5P and EXYNOS SoCs. +config PHY_IPROC_MDIO + bool "Broadcom iProc MDC/MDIO driver" + depends on ARCH_BCM_IPROC + default ARCH_BCM_IPROC + help + Enable this to support the iProc generic MDC/MDIO interface found + in various iProc based SoCs. The generic MDC/MDIO interface can be + used to communicate with various types of Serdes/PHYs including + Ethernet, PCIe, USB, and etc. + + If unsure, say N. + config PHY_MVEBU_SATA def_bool y depends on ARCH_DOVE || MACH_DOVE || MACH_KIRKWOODdrivers/phy/Makefile +1
-0@@ -13,6 +13,7 @@ obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o 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_IPROC_MDIO) += phy-iproc-mdio.o obj-$(CONFIG_PHY_RCAR_GEN2) += phy-rcar-gen2.o obj-$(CONFIG_OMAP_CONTROL_PHY) += phy-omap-control.o obj-$(CONFIG_OMAP_USB2) += phy-omap-usb2.odrivers/phy/phy-iproc-mdio.c new file +249
-0@@ -0,0 +1,249 @@ +/* +* Copyright (C) 2015 Broadcom Corporation +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation version 2. +* +* This program is distributed "as is" WITHOUT ANY WARRANTY of any +* kind, whether express or implied; without even the implied warranty +* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/clk.h> +#include <linux/io.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/phy/iproc_mdio_phy.h> + +#define MDIO_TIMEOUT_MSEC 10 + +#define MDC_CTRL_OFFSET 0x000 + +#define MDC_CTRL_DIV_SHIFT 0 +#define MDC_CTRL_DIV_WIDTH 7 +#define MDC_MAX_DIV (BIT(MDC_CTRL_DIV_WIDTH) - 1) +#define MDC_CTRL_PRE_SHIFT 7 +#define MDC_CTRL_BUSY_SHIFT 8 +#define MDC_CTRL_EXT_SHIFT 9 +#define MDC_CTRL_BTP_SHIFT 10 + +#define MDC_DATA_OFFSET 0x004 + +#define MDC_DATA_SHIFT 0 +#define MDC_DATA_MASK 0xffff + +#define MDC_DATA_TA_SHIFT 16 +#define MDC_DATA_TA_VAL 2 + +#define MDC_DATA_RA_SHIFT 18 +#define MDC_DATA_RA_WIDTH 5 +#define MDC_MAX_RA (BIT(MDC_DATA_RA_WIDTH) - 1) + +#define MDC_DATA_PA_SHIFT 23 +#define MDC_DATA_PA_WIDTH 5 +#define MDC_MAX_PA (BIT(MDC_DATA_PA_WIDTH) - 1) + +#define MDC_DATA_OP_SHIFT 28 +#define MDC_DATA_OP_WRITE 1 +#define MDC_DATA_OP_READ 2 + +#define MDC_DATA_SB_SHIFT 30 + +/** +* struct iproc_mdc - iProc MDC/MDIO device +* @dev: pointer to device +* @base: MDC controller register base pointer +* @lock: mutex to protect access to the MDC device +* @is_ready: flag to indicate the driver has been initialized and is ready for +* use +*/ +struct iproc_mdc { +struct device *dev; +void __iomem *base; +struct mutex lock; +bool is_ready; +}; + +static struct iproc_mdc iproc_mdc; + +static inline int iproc_mdio_check_params (unsigned clk_div,unsigned pa, +unsigned ra) +{ +if (clk_div >MDC_MAX_DIV || pa >MDC_MAX_PA || ra >MDC_MAX_RA ) +return -EINVAL ; + +return 0 ; +} + +static inline int iproc_mdio_wait_for_idle (void __iomem *base) +{ +u32 val; +unsigned long timeout = jiffies +msecs_to_jiffies (MDIO_TIMEOUT_MSEC ); + +while (!time_after (jiffies, timeout)) { + val =readl (base +MDC_CTRL_OFFSET ); +if ((val &BIT (MDC_CTRL_BUSY_SHIFT )) ==0 ) +return 0 ; + +cpu_relax (); + } + +return -ETIMEDOUT ; +} + +static inline void iproc_mdio_config_clk (void __iomem *base,unsigned clk_div) +{ +u32 val; + + val = (clk_div <<MDC_CTRL_DIV_SHIFT ) |BIT (MDC_CTRL_PRE_SHIFT ); +writel (val, base +MDC_CTRL_OFFSET ); +} + +static int iproc_mdio_read_write (void __iomem *base,bool dir_is_write, +unsigned clk_div,unsigned pa,unsigned ra, +u16 *data) +{ +int ret; +u32 val; + + ret =iproc_mdio_check_params (clk_div, pa, ra); +if (ret) +return ret; + + ret =iproc_mdio_wait_for_idle (base); +if (ret) +return ret; + +iproc_mdio_config_clk (base, clk_div); + + ret =iproc_mdio_wait_for_idle (base); +if (ret) +return ret; + + val = (MDC_DATA_TA_VAL <<MDC_DATA_TA_SHIFT ) | + (ra <<MDC_DATA_RA_SHIFT ) | + (pa <<MDC_DATA_PA_SHIFT ) | +BIT (MDC_DATA_SB_SHIFT ); + +if (dir_is_write) { + val |= (MDC_DATA_OP_WRITE <<MDC_DATA_OP_SHIFT ); + val |= ((u32)(*data) &MDC_DATA_MASK ); + }else { + val |= (MDC_DATA_OP_READ <<MDC_DATA_OP_SHIFT ); + } + +writel (val, base +MDC_DATA_OFFSET ); + + ret =iproc_mdio_wait_for_idle (base); +if (ret) +return ret; + +if (!dir_is_write) { + val =readl (base +MDC_DATA_OFFSET ) &MDC_DATA_MASK ; + *data = (u16 )val; + } + +return 0 ; +} + + +/** +* iproc_mdio_read() - read from a PHY register through the MDC interface +* +* @clk_div: MDC clock divisor +* @phy_addr: MDC PHY address +* @reg_addr: PHY register address +* @data: pointer to the memory where data will be stored +*/ +int iproc_mdio_read (unsigned clk_div,unsigned phy_addr,unsigned reg_addr, +u16 *data) +{ +int ret; +struct iproc_mdc *mdc = &iproc_mdc; + +if (!mdc->is_ready) +return -ENODEV ; + +mutex_lock (&mdc->lock); + ret =iproc_mdio_read_write (mdc->base, false, clk_div, phy_addr, + reg_addr, data); +if (ret) +dev_err (mdc->dev,"mdio read failed\n" ); +mutex_unlock (&mdc->lock); + +return ret; +} +EXPORT_SYMBOL (iproc_mdio_read); + +/** +* iproc_mdio_write() - write to a PHY register through the MDC interface +* +* @clk_div: MDC clock divisor +* @phy_addr: MDC PHY address +* @reg_addr: PHY register address +* @data: data value to be written to the PHY register +*/ +int iproc_mdio_write (unsigned clk_div,unsigned phy_addr,unsigned reg_addr, +u16 data) +{ +int ret; +struct iproc_mdc *mdc = &iproc_mdc; + +if (!mdc->is_ready) +return -ENODEV ; + +mutex_lock (&mdc->lock); + ret =iproc_mdio_read_write (mdc->base, true, clk_div, phy_addr, + reg_addr, &data); +if (ret) +dev_err (mdc->dev,"mdio write failed\n" ); +mutex_unlock (&mdc->lock); + +return ret; +} +EXPORT_SYMBOL (iproc_mdio_write); + +static int iproc_mdio_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct iproc_mdc *mdc = &iproc_mdc; +struct resource *res; + + mdc->dev = dev; +mutex_init (&mdc->lock); + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + mdc->base =devm_ioremap_resource (dev, res); +if (IS_ERR (mdc->base)) +return PTR_ERR (mdc->base); + + mdc->is_ready = true; +return 0 ; +} + +static const struct of_device_id iproc_mdio_match_table[] = { + { .compatible ="brcm,iproc-mdio" }, + { } +}; + +static struct platform_driver iproc_mdio_driver = { + .driver = { + .name ="iproc-mdio" , + .of_match_table = iproc_mdio_match_table, + .suppress_bind_attrs = true, + }, + .probe = iproc_mdio_probe, +}; + +static int __init iproc_mdio_init (void ) +{ +return platform_driver_register (&iproc_mdio_driver); +} +arch_initcall_sync (iproc_mdio_init); + +MODULE_AUTHOR ("Ray Jui <[email protected]>" ); +MODULE_DESCRIPTION ("Broadcom iPROC MDC/MDIO driver" ); +MODULE_LICENSE ("GPL v2" );include/linux/phy/iproc_mdio_phy.h new file +22
-0@@ -0,0 +1,22 @@ +/* +* Copyright (C) 2015 Broadcom Corporation +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation version 2. +* +* This program is distributed "as is" WITHOUT ANY WARRANTY of any +* kind, whether express or implied; without even the implied warranty +* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#ifndef __IPROC_MDIO_PHY_H +#define __IPROC_MDIO_PHY_H + +int iproc_mdio_read (unsigned clk_div,unsigned phy_addr,unsigned reg_addr, +u16 *data); +int iproc_mdio_write (unsigned clk_div,unsigned phy_addr,unsigned reg_addr, +u16 data); + +#endif /* __IPROC_MDIO_PHY_H */
Ray Jui
maintainerRe: [PATCH 2/5] phy: iproc-mdio: Initial iProc MDC/MDIO support
Quoted 10 lines · Kishon Vijay Abraham I
Hi,
Quoted 3 lines · Ray Jui
This adds the support for the iProc MDC/MDIO interface. Multiple iProc SoCs contain the MDC/MDIO interface that can be used for the host to communicate with various Serdes/PHYs including Ethernet, PCIe, USB, etc.
the term phy used in this driver is misleading. It's not a PHY actually. This sounds more like a bus driver to me and should be present in
drivers/bus?
Sure I can move it to drivers/bus/* if that's more appropriate. Typically MDIO is used with Ethernet PHYs and most people register it to the mii bus under drivers/net/ethernet. Our case is rare, where the same MDIO interface is shared by the Ethernet PHY and other types of PHYs. But yeah that does not change the fact that this is more of a bus type of driver than a PHY driver.
I checked the maintainers' list and found apparently there's no maintainer for drivers/bus/*? In this case, who is supposed to ack and send a pull request for the patch?
Thanks,
Ray
Re: [PATCH 2/5] phy: iproc-mdio: Initial iProc MDC/MDIO support
Quoted 19 lines · Ray Jui
Quoted 10 lines · Kishon Vijay Abraham I
Hi,
Quoted 3 lines · Ray Jui
This adds the support for the iProc MDC/MDIO interface. Multiple iProc SoCs contain the MDC/MDIO interface that can be used for the host to communicate with various Serdes/PHYs including Ethernet, PCIe, USB, etc.
the term phy used in this driver is misleading. It's not a PHY actually. This sounds more like a bus driver to me and should be present in
drivers/bus?Sure I can move it to
drivers/bus/*if that's more appropriate. Typically MDIO is used with Ethernet PHYs and most people register it to the mii bus underdrivers/net/ethernet. Our case is rare, where the same MDIO interface is shared by the Ethernet PHY and other types of PHYs. But yeah that does not change the fact that this is more of a bus type of driver than a PHY driver.
Quoted 3 lines
I checked the maintainers' list and found apparently there's no maintainer for
drivers/bus/*? In this case, who is supposed to ack and send a pull request for the patch?
In the case of drivers/bus/brcmstb_gisb.c I sent change via an arm-soc pull request relating to driver/SoC code changes, and Arnd merged these changes the same way he did merge changes for code in arch/arm/
Signature · 1 line
Florian
Ray Jui
maintainerRe: [PATCH 2/5] phy: iproc-mdio: Initial iProc MDC/MDIO support
Quoted 20 lines · Florian Fainelli
Quoted 19 lines · Ray Jui
Quoted 10 lines · Kishon Vijay Abraham I
Hi,
Quoted 3 lines · Ray Jui
This adds the support for the iProc MDC/MDIO interface. Multiple iProc SoCs contain the MDC/MDIO interface that can be used for the host to communicate with various Serdes/PHYs including Ethernet, PCIe, USB, etc.
the term phy used in this driver is misleading. It's not a PHY actually. This sounds more like a bus driver to me and should be present in
drivers/bus?Sure I can move it to
drivers/bus/*if that's more appropriate. Typically MDIO is used with Ethernet PHYs and most people register it to the mii bus underdrivers/net/ethernet. Our case is rare, where the same MDIO interface is shared by the Ethernet PHY and other types of PHYs. But yeah that does not change the fact that this is more of a bus type of driver than a PHY driver.
Quoted 8 lines
Quoted 3 lines
I checked the maintainers' list and found apparently there's no maintainer for
drivers/bus/*? In this case, who is supposed to ack and send a pull request for the patch?In the case of
drivers/bus/brcmstb_gisb.cI sent change via an arm-soc pull request relating to driver/SoC code changes, and Arnd merged these changes the same way he did merge changes for code inarch/arm/
Thanks for the tip, Florian!
Ray
Ray Jui
maintainerPATCH 3/5 phy: cygnus: pcie: Define DT binding
In reply to Ray JuiAdd DT binding document for Broadcom Cygnus PCIe PHY driver
--- .../bindings/phy/brcm,cygnus-pcie-phy.txt | 31 ++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt
Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt new file +31 -0
@@ -0,0 +1,31 @@ +Broadcom Cygnus PCIe PHY + +Required properties: +- compatible: Must be "brcm,cygnus-pcie-phy" +- reg: base address and length of the CRMU block +- #phy-cells: must be <2> +The first cell is the PHY ID: +0 - PCIe RC 0 +1 - PCIe RC 1 +The second cell is the internal PHY address + +Example: + phy: phy@0301d0a0 { + compatible = "brcm,cygnus-pcie-phy"; + reg = <0x0301d0a0 0x14>; + #phy-cells = <2>; + }; + + pcie0: pcie@18012000 { + ... + ... + phys = <&phy 0 5>; + phy-names = "pcie-phy"; + }; + + pcie1: pcie@18013000 { + ... + ... + phys = <&phy 1 6>; + phy-names = "pcie-phy"; + };
Signature · 1 line
1.7.9.5
Re: [PATCH 3/5] phy: cygnus: pcie: Define DT binding
Hi,
Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt
Quoted 16 lines · Ray Jui
Add DT binding document for Broadcom Cygnus PCIe PHY driver
Signed-off-by Ray Jui <[email protected]>Reviewed-by Arun Parameswaran <[email protected]>Reviewed-by JD (Jiandong) Zheng <[email protected]>Reviewed-by Scott Branden <[email protected]>--- .../bindings/phy/brcm,cygnus-pcie-phy.txt | 31 ++++++++++++++++++++ 1 file changed, 31 insertions(+)create mode 100644
Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txtDocumentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt new file +0
-0
brcm-cygnus-pcie-phy.txt?
Quoted 8 lines
Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt new file +7
-0@@ -0,0 +1,31 @@ +Broadcom Cygnus PCIe PHY + +Required properties: +- compatible: Must be "brcm,cygnus-pcie-phy" +- reg: base address and length of the CRMU block +- #phy-cells: must be <2> +The first cell is the PHY ID:
Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt line 17
Quoted 10 lines
Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt new file +10
-0+0 - PCIe RC 0 +1 - PCIe RC 1 +The second cell is the internal PHY address + +Example: + phy: phy@0301d0a0 { + compatible = "brcm,cygnus-pcie-phy"; + reg = <0x0301d0a0 0x14>; + #phy-cells = <2>; + };
IMHO these nodes should be child nodes of the mdio node. Are they modelled that way?
Thanks
Kishon
Ray Jui
maintainerRe: [PATCH 3/5] phy: cygnus: pcie: Define DT binding
Quoted 47 lines · Kishon Vijay Abraham I
Hi,
Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt
Quoted 20 lines · Ray Jui
Add DT binding document for Broadcom Cygnus PCIe PHY driver
Signed-off-by Ray Jui <[email protected]>Reviewed-by Arun Parameswaran <[email protected]>Reviewed-by JD (Jiandong) Zheng <[email protected]>Reviewed-by Scott Branden <[email protected]>--- .../bindings/phy/brcm,cygnus-pcie-phy.txt | 31 ++++++++++++++++++++ 1 file changed, 31 insertions(+)create mode 100644
Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txtdiff --git
a/Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txtb/Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txtnew file mode 100644
index 0000000..36745eeDocumentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt new file +0
-0brcm-cygnus-pcie-phy.txt?
Quoted 8 lines
Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt new file +7
-0@@ -0,0 +1,31 @@ +Broadcom Cygnus PCIe PHY + +Required properties: +- compatible: Must be "brcm,cygnus-pcie-phy" +- reg: base address and length of the CRMU block +- #phy-cells: must be <2> +The first cell is the PHY ID:Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt line 17
Quoted 10 lines
Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt new file +10
-0+0 - PCIe RC 0 +1 - PCIe RC 1 +The second cell is the internal PHY address + +Example: + phy: phy@0301d0a0 { + compatible = "brcm,cygnus-pcie-phy"; + reg = <0x0301d0a0 0x14>; + #phy-cells = <2>; + };IMHO these nodes should be child nodes of the mdio node. Are they modelled that way?
Quoted 2 lines
Thanks
Kishon
Currently they are not. But you are right. It makes more sense for the PHY nodes to be declared under the MDIO bus node. I will make that change.
Thanks,
Ray
Ray Jui
maintainerRe: [PATCH 3/5] phy: cygnus: pcie: Define DT binding
Quoted 19 lines · Ray Jui
Quoted 16 lines · Kishon Vijay Abraham I
Hi,
Quoted 13 lines · Ray Jui
Add DT binding document for Broadcom Cygnus PCIe PHY driver
Signed-off-by Ray Jui <[email protected]>Reviewed-by Arun Parameswaran <[email protected]>Reviewed-by JD (Jiandong) Zheng <[email protected]>Reviewed-by Scott Branden <[email protected]>--- .../bindings/phy/brcm,cygnus-pcie-phy.txt | 31 ++++++++++++++++++++ 1 file changed, 31 insertions(+)create mode 100644
Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt
Quoted 9 lines
Quoted 9 lines
Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt
Quoted 7 lines
diff --git
a/Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txtb/Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txtnew file mode 100644
index 0000000..36745eeDocumentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt new file +0
-0brcm-cygnus-pcie-phy.txt?
Sorry, I missed this comment on my previous reply.
We try to keep the device tree file name the same format as the compatible string. That's why I use "brcm,...." instead of "brcm-...".
Thanks,
Ray
Ray Jui
maintainerPATCH 4/5 phy: cygnus: pcie: Add Cygnus PCIe PHY support
In reply to Ray JuiThis patch adds the PCIe PHY support for the Broadcom PCIe RC interface
--- drivers/phy/Kconfig | 15 ++ drivers/phy/Makefile | 1 + drivers/phy/phy-cygnus-pcie.c | 340 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 356 insertions(+) create mode 100644 drivers/phy/phy-cygnus-pcie.c
drivers/phy/Kconfig +15 -0
@@ -35,6 +35,21 @@ config ARMADA375_USBCLUSTER_PHY depends on OF select GENERIC_PHY +config PHY_CYGNUS_PCIE + bool "Broadcom Cygnus PCIe PHY driver" + depends on ARCH_BCM_CYGNUS + select GENERIC_PHY + select PHY_IPROC_MDIO + default ARCH_BCM_CYGNUS + help + Enable this to support the Broadcom Cygnus PCIe PHY. + + The host communicates with the PHY through the iProc MDC/MDIO + interface. + + If unsure, say N. + + config PHY_DM816X_USB tristate "TI dm816x USB PHY driver" depends on ARCH_OMAP2PLUS
drivers/phy/Makefile +1 -0
@@ -5,6 +5,7 @@ obj-$(CONFIG_GENERIC_PHY) += phy-core.o obj-$(CONFIG_PHY_BERLIN_USB) += phy-berlin-usb.o obj-$(CONFIG_PHY_BERLIN_SATA) += phy-berlin-sata.o +obj-$(CONFIG_PHY_CYGNUS_PCIE) += phy-cygnus-pcie.o obj-$(CONFIG_PHY_DM816X_USB) += phy-dm816x-usb.o obj-$(CONFIG_ARMADA375_USBCLUSTER_PHY) += phy-armada375-usb2.o obj-$(CONFIG_BCM_KONA_USB2_PHY) += phy-bcm-kona-usb2.o
drivers/phy/phy-cygnus-pcie.c new file +340 -0
340 lines not on this page · raw message
Signature · 1 line
1.7.9.5
Re: [PATCH 4/5] phy: cygnus: pcie: Add Cygnus PCIe PHY support
Quoted 37 lines · Ray Jui
drivers/phy/Kconfig +15
-0+config PHY_CYGNUS_PCIE + bool "Broadcom Cygnus PCIe PHY driver" + depends on ARCH_BCM_CYGNUS + select GENERIC_PHY + select PHY_IPROC_MDIO + default ARCH_BCM_CYGNUS + help + Enable this to support the Broadcom Cygnus PCIe PHY. + + The host communicates with the PHY through the iProc MDC/MDIO + interface. + + If unsure, say N. + +drivers/phy/Makefile +1
-0+obj-$(CONFIG_PHY_CYGNUS_PCIE) += phy-cygnus-pcie.odrivers/phy/phy-cygnus-pcie.c new file +9
-0+#include <linux/module.h> +static const struct of_device_id cygnus_pcie_phy_match_table[] = { + { .compatible ="brcm,cygnus-pcie-phy" }, + { } +}; +MODULE_DEVICE_TABLE (of, cygnus_pcie_phy_match_table); + +static struct platform_driver cygnus_pcie_phy_driver = { + .driver = {
drivers/phy/phy-cygnus-pcie.c line 340
Quoted 10 lines
drivers/phy/phy-cygnus-pcie.c new file +10
-0+ .name = "cygnus-pcie-phy", + .of_match_table = cygnus_pcie_phy_match_table, + }, + .probe = cygnus_pcie_phy_probe, +}; +module_platform_driver (cygnus_pcie_phy_driver); + +MODULE_AUTHOR ("Ray Jui <[email protected]>" ); +MODULE_DESCRIPTION ("Broadcom Cygnus PCIe PHY driver" ); +MODULE_LICENSE ("GPL v2" );
And here I guess you intend this to be buildable as a module. If that's the intention I think PHY_CYGNUS_PCIE needs to be tristate.
Thanks,
Paul Bolle
Ray Jui
maintainerRe: [PATCH 4/5] phy: cygnus: pcie: Add Cygnus PCIe PHY support
Quoted 43 lines · Paul Bolle
Quoted 42 lines · Ray Jui
drivers/phy/Kconfig +15
-0+config PHY_CYGNUS_PCIE + bool "Broadcom Cygnus PCIe PHY driver" + depends on ARCH_BCM_CYGNUS + select GENERIC_PHY + select PHY_IPROC_MDIO + default ARCH_BCM_CYGNUS + help + Enable this to support the Broadcom Cygnus PCIe PHY. + + The host communicates with the PHY through the iProc MDC/MDIO + interface. + + If unsure, say N. + +drivers/phy/Makefile +1
-0+obj-$(CONFIG_PHY_CYGNUS_PCIE) += phy-cygnus-pcie.odrivers/phy/phy-cygnus-pcie.c new file +14
-0+#include <linux/module.h> +static const struct of_device_id cygnus_pcie_phy_match_table[] = { + { .compatible ="brcm,cygnus-pcie-phy" }, + { } +}; +MODULE_DEVICE_TABLE (of, cygnus_pcie_phy_match_table); + +static struct platform_driver cygnus_pcie_phy_driver = { + .driver = { + .name ="cygnus-pcie-phy" , + .of_match_table = cygnus_pcie_phy_match_table, + }, + .probe = cygnus_pcie_phy_probe, +};
Quoted 8 lines
drivers/phy/phy-cygnus-pcie.c line 340
Quoted 5 lines
drivers/phy/phy-cygnus-pcie.c new file +5
-0+module_platform_driver (cygnus_pcie_phy_driver); + +MODULE_AUTHOR ("Ray Jui <[email protected]>" ); +MODULE_DESCRIPTION ("Broadcom Cygnus PCIe PHY driver" ); +MODULE_LICENSE ("GPL v2" );And here I guess you intend this to be buildable as a module. If that's the intention I think
PHY_CYGNUS_PCIEneeds to be tristate.
Yes, I'll change the PCIe PHY driver to tristate in the Kconfig. Thanks!
Quoted 6 lines
Thanks,
Paul Bolle
Re: [PATCH 4/5] phy: cygnus: pcie: Add Cygnus PCIe PHY support
Quoted 1 line · Ray Jui
Yes, I'll change the PCIe PHY driver to tristate in the
Kconfig. Thanks!
To continue the discussion started in 2/5: this is my main beef with built-in only code using module specific macros. It forces the reader of the patch, and the code if it's already in the tree, to know the intentions of the author. Did the author intend the code to be built-in only or not?
And since most people appear not to be clairvoyant that's kind of hard to do for most of us.
Paul Bolle
Re: [PATCH 4/5] phy: cygnus: pcie: Add Cygnus PCIe PHY support
In reply to Ray JuiQuoted 26 lines · Ray Jui
This patch adds the PCIe PHY support for the Broadcom PCIe RC interface
Signed-off-by Ray Jui <[email protected]>Reviewed-by Arun Parameswaran <[email protected]>Reviewed-by JD (Jiandong) Zheng <[email protected]>Reviewed-by Scott Branden <[email protected]>--- drivers/phy/Kconfig | 15 ++ drivers/phy/Makefile | 1 + drivers/phy/phy-cygnus-pcie.c | 340 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 356 insertions(+)create mode 100644
drivers/phy/phy-cygnus-pcie.cdrivers/phy/Kconfig +5
-0@@ -35,6 +35,21 @@ config ARMADA375_USBCLUSTER_PHY depends on OF select GENERIC_PHY +config PHY_CYGNUS_PCIE + bool "Broadcom Cygnus PCIe PHY driver" + depends on ARCH_BCM_CYGNUS + select GENERIC_PHY + select PHY_IPROC_MDIO
drivers/phy/Kconfig config ARMADA375_USBCLUSTER_PHY · line 52
Quoted 10 lines
drivers/phy/Kconfig +10
-0+ default ARCH_BCM_CYGNUS + help + Enable this to support the Broadcom Cygnus PCIe PHY. + + The host communicates with the PHY through the iProc MDC/MDIO + interface. + + If unsure, say N. + +
trailing blank line
Quoted 201 lines
drivers/phy/Kconfig +0
-0config PHY_DM816X_USB tristate "TI dm816x USB PHY driver" depends on ARCH_OMAP2PLUSdrivers/phy/Makefile +1
-0@@ -5,6 +5,7 @@ obj-$(CONFIG_GENERIC_PHY) += phy-core.o obj-$(CONFIG_PHY_BERLIN_USB) += phy-berlin-usb.o obj-$(CONFIG_PHY_BERLIN_SATA) += phy-berlin-sata.o +obj-$(CONFIG_PHY_CYGNUS_PCIE) += phy-cygnus-pcie.o obj-$(CONFIG_PHY_DM816X_USB) += phy-dm816x-usb.o obj-$(CONFIG_ARMADA375_USBCLUSTER_PHY) += phy-armada375-usb2.o obj-$(CONFIG_BCM_KONA_USB2_PHY) += phy-bcm-kona-usb2.odrivers/phy/phy-cygnus-pcie.c new file +180
-0@@ -0,0 +1,340 @@ +/* +* Copyright (C) 2015 Broadcom Corporation +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation version 2. +* +* This program is distributed "as is" WITHOUT ANY WARRANTY of any +* kind, whether express or implied; without even the implied warranty +* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/delay.h> +#include <linux/io.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/phy/phy.h> +#include <linux/platform_device.h> +#include <linux/phy/iproc_mdio_phy.h> + +#define MAX_PHY_ADDR 0x1f + +#define PCIE_MDCDIV_VAL 0x3e + +#define PCIE_BLK_ADDR_OFFSET 0x1f +#define PCIE_BLK_ADDR_MASK 0xff00 +#define PCIE_REG_ADDR_MASK 0x1f + +#define PCIE_SW_CTRL0_OFFSET 0x1000 +#define PCIE_SW_PWRDOWN_SHIFT 0 + +#define PCIE_AFE1_100MHZ_C3_OFFSET 0x2103 +#define PCIE_AFE1_100MHZ_C3_VAL 0x2b1c + +#define CRMU_PCIE_CFG_OFFSET 0x00 +#define CRMU_PCIE1_PHY_IDDQ_SHIFT 10 +#define CRMU_PCIE0_PHY_IDDQ_SHIFT 2 + +enum cygnus_pcie_phy_id { +CYGNUS_PHY_PCIE0 =0 , +CYGNUS_PHY_PCIE1 , +MAX_NUM_PHYS , +}; + +struct cygnus_pcie_phy_core ; + +/** +* struct cygnus_pcie_phy - Cygnus PCIe PHY device +* @core: pointer to the Cygnus PCIe PHY core control +* @id: internal ID to identify the Cygnus PCIe PHY +* @addr: PHY address used by MDC to communicate with the PHY +* @phy: pointer to the kernel PHY device +* +*/ +struct cygnus_pcie_phy { +struct cygnus_pcie_phy_core *core; +enum cygnus_pcie_phy_id id; +unsigned addr; +struct phy *phy; +}; + +/** +* struct cygnus_pcie_phy_core - Cygnus PCIe PHY core control +* @dev: pointer to device +* @crmu: CRMU register base +* @lock: mutex to protect access to individual PHYs +* @phys: pointer to Cygnus PHY device +* +*/ +struct cygnus_pcie_phy_core { +struct device *dev; +void __iomem *crmu; +struct mutex lock; +struct cygnus_pcie_phy phys[MAX_NUM_PHYS ]; +}; + +static int cygnus_pcie_phy_reg_read (unsigned phy_addr,unsigned reg_addr, +u16 *val) +{ +int ret; +u16 addr = (u16)(reg_addr &PCIE_BLK_ADDR_MASK ); + + ret =iproc_mdio_write (PCIE_MDCDIV_VAL , phy_addr,PCIE_BLK_ADDR_OFFSET , + addr); +if (ret) +return ret; + + ret =iproc_mdio_read (PCIE_MDCDIV_VAL , phy_addr, + reg_addr &PCIE_REG_ADDR_MASK , val); +return ret; +} + +static int cygnus_pcie_phy_reg_write (unsigned phy_addr,unsigned reg_addr, +u16 val) +{ +int ret; +u16 addr = (u16)(reg_addr &PCIE_BLK_ADDR_MASK ); + + ret =iproc_mdio_write (PCIE_MDCDIV_VAL , phy_addr,PCIE_BLK_ADDR_OFFSET , + addr); +if (ret) +return ret; + + ret =iproc_mdio_write (PCIE_MDCDIV_VAL , phy_addr, + reg_addr &PCIE_REG_ADDR_MASK , val); +return ret; +} + +static void cygnus_pcie_afe_enable_disable (void __iomem *reg, +enum cygnus_pcie_phy_id id, +bool enable) +{ +unsigned shift; +u32 val; + +if (id ==CYGNUS_PHY_PCIE0 ) + shift =CRMU_PCIE0_PHY_IDDQ_SHIFT ; +else + shift =CRMU_PCIE1_PHY_IDDQ_SHIFT ; + +if (enable) { + val =readl (reg +CRMU_PCIE_CFG_OFFSET ); + val &= ~BIT (shift); +writel (val, reg +CRMU_PCIE_CFG_OFFSET ); + }else { + val =readl (reg +CRMU_PCIE_CFG_OFFSET ); + val |=BIT (shift); +writel (val, reg +CRMU_PCIE_CFG_OFFSET ); + } + +/* wait for AFE to come up or shut down */ +msleep (100 ); +} + +static int cygnus_pcie_power_config (struct cygnus_pcie_phy *phy,bool on) +{ +struct cygnus_pcie_phy_core *core = phy->core; +u16 val; +int ret; + +if (phy->id !=CYGNUS_PHY_PCIE0 && phy->id !=CYGNUS_PHY_PCIE1 ) +return -EINVAL ; + +if (on) { +/* enable AFE through the CRMU interface */ +cygnus_pcie_afe_enable_disable (core->crmu, phy->id, true); + +/* to get the reference clock configured */ + ret =cygnus_pcie_phy_reg_write (phy->addr, +PCIE_AFE1_100MHZ_C3_OFFSET , +PCIE_AFE1_100MHZ_C3_VAL ); +if (ret) + goto err_disable_afe; +cygnus_pcie_phy_reg_read (phy->addr, +PCIE_AFE1_100MHZ_C3_OFFSET , &val); +if (ret) + goto err_disable_afe; + +msleep (20 ); + +/* now toggle AFE */ +cygnus_pcie_afe_enable_disable (core->crmu, phy->id, false); +cygnus_pcie_afe_enable_disable (core->crmu, phy->id, true); + +dev_info (core->dev, +"pcie phy on, addr:0x%02x off:0x%04x val:0x%04x\n" , + phy->addr,PCIE_AFE1_100MHZ_C3_OFFSET , val); + }else { +/* disable AFE through the CRMU interface */ +cygnus_pcie_afe_enable_disable (core->crmu, phy->id, false); +dev_info (core->dev,"pcie phy off\n" ); + } + +return 0 ; + +err_disable_afe: +cygnus_pcie_afe_enable_disable (core->crmu, phy->id, false); +return ret; +}
drivers/phy/phy-cygnus-pcie.c line 190
Quoted 10 lines
drivers/phy/phy-cygnus-pcie.c new file +10
-0+ +static int cygnus_pcie_phy_init (struct phy *p) +{ +return 0 ; +} + +static int cygnus_pcie_phy_exit (struct phy *p) +{ +return 0 ; +}
empty callbacks are not required.
Quoted 118 lines
drivers/phy/phy-cygnus-pcie.c new file +118
-0+ +static int cygnus_pcie_phy_power_on (struct phy *p) +{ +struct cygnus_pcie_phy *phy =phy_get_drvdata (p); +struct cygnus_pcie_phy_core *core = phy->core; +int ret =0 ; + +mutex_lock (&core->lock); + +switch (phy->id) { +case CYGNUS_PHY_PCIE0 : +case CYGNUS_PHY_PCIE1 : + ret =cygnus_pcie_power_config (phy, true); +if (ret) +dev_err (core->dev,"unable to power on PCIe PHY\n" ); +break ; + +default : +dev_err (core->dev,"PHY id not supported\n" ); +mutex_unlock (&core->lock); +return -EINVAL ; + } + +mutex_unlock (&core->lock); + +return ret; +} + +static int cygnus_pcie_phy_power_off (struct phy *p) +{ +struct cygnus_pcie_phy *phy =phy_get_drvdata (p); +struct cygnus_pcie_phy_core *core = phy->core; +int ret =0 ; + +mutex_lock (&core->lock); + +switch (phy->id) { +case CYGNUS_PHY_PCIE0 : +case CYGNUS_PHY_PCIE1 : + ret =cygnus_pcie_power_config (phy, false); +if (ret) +dev_err (core->dev,"unable to power off PCIe PHY\n" ); +break ; + +default : +dev_err (core->dev,"PHY id not supported\n" ); +mutex_unlock (&core->lock); +break ; + } + +mutex_unlock (&core->lock); + +return ret; +} + +static struct phy_ops cygnus_pcie_phy_ops = { + .init = cygnus_pcie_phy_init, + .exit = cygnus_pcie_phy_exit, + .power_on = cygnus_pcie_phy_power_on, + .power_off = cygnus_pcie_phy_power_off, +}; + +static struct phy *cygnus_pcie_phy_xlate (struct device *dev, +struct of_phandle_args *args) +{ +struct cygnus_pcie_phy_core *core; +int id, phy_addr; + + core =dev_get_drvdata (dev); +if (!core) +return ERR_PTR (-EINVAL ); + + id = args->args[0 ]; + phy_addr = args->args[1 ]; + +if (WARN_ON (id >=MAX_NUM_PHYS )) +return ERR_PTR (-ENODEV ); + +if (WARN_ON (phy_addr >MAX_PHY_ADDR )) +return ERR_PTR (-ENODEV ); + + core->phys[id].addr = phy_addr; + +return core->phys[id].phy; +} + +static int cygnus_pcie_phy_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct cygnus_pcie_phy_core *core; +struct phy_provider *provider; +struct resource *res; +int i =0 ; + + core =devm_kzalloc (dev,sizeof (*core),GFP_KERNEL ); +if (!core) +return -ENOMEM ; + + core->dev = dev; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + core->crmu =devm_ioremap_resource (dev, res); +if (IS_ERR (core->crmu)) +return PTR_ERR (core->crmu); + +mutex_init (&core->lock); + +for (i =0 ; i <MAX_NUM_PHYS ; i++) { +struct cygnus_pcie_phy *p = &core->phys[i]; + + p->phy =devm_phy_create (dev,NULL , &cygnus_pcie_phy_ops); +if (IS_ERR (p->phy)) { +dev_err (dev,"failed to create PHY\n" ); +return PTR_ERR (p->phy); + } + + p->core = core; + p->id = i;
drivers/phy/phy-cygnus-pcie.c line 318
Quoted 10 lines
drivers/phy/phy-cygnus-pcie.c new file +10
-0+phy_set_drvdata (p->phy, p); + } + +dev_set_drvdata (dev, core); + + provider =devm_of_phy_provider_register (dev, cygnus_pcie_phy_xlate); +if (IS_ERR (provider)) { +dev_err (dev,"failed to register PHY provider\n" ); +return PTR_ERR (provider); + }
PTR_ERR_OR_ZERO(phy_provider)?
Thanks
Kishon
Ray Jui
maintainerPATCH 5/5 ARM: dts: enable PCIe PHY support for Cygnus
In reply to Ray JuiAdded MDIO and PCIe PHY device nodes for Cygnus. The PCIe PHY is referenced by the iProc PCIe device
--- arch/arm/boot/dts/bcm-cygnus.dtsi | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
arch/arm/boot/dts/bcm-cygnus.dtsi +17 -0
@@ -54,6 +54,12 @@ /include/ "bcm-cygnus-clock.dtsi" + pcie_phy: pcie_phy@0301d0a0 { + compatible = "brcm,cygnus-pcie-phy"; + reg = <0x0301d0a0 0x14>; + #phy-cells = <2>; + }; + pinctrl: pinctrl@0x0301d0c8 { compatible = "brcm,cygnus-pinmux"; reg = <0x0301d0c8 0x30>,
@@ -106,6 +112,11 @@ }; }; + mdio: mdio@18002000 { + compatible = "brcm,iproc-mdio"; + reg = <0x18002000 0x8>; + }; + i2c0: i2c@18008000 { compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c"; reg = <0x18008000 0x100>;
@@ -144,6 +155,9 @@ ranges = <0x81000000 0 0 0x28000000 0 0x00010000 0x82000000 0 0x20000000 0x20000000 0 0x04000000>; + phys = <&pcie_phy 0 5>; + phy-names = "pcie-phy"; + status = "disabled"; };
@@ -165,6 +179,9 @@ ranges = <0x81000000 0 0 0x48000000 0 0x00010000 0x82000000 0 0x40000000 0x40000000 0 0x04000000>; + phys = <&pcie_phy 1 6>; + phy-names = "pcie-phy"; + status = "disabled"; };
Signature · 1 line
1.7.9.5