PCI:Add SPEAr13xx PCie support
Subsystems (9)
v4 cover PCI:Add SPEAr13xx PCie support
First three patches are improvement and fixes for SPEAr13xx support. Patches 4-6 add miphy40lp skelten driver and support for spear1310/40 miphy wrapper. Patch 7 add support for SPEAr13xx PCIe.
These pathes are tested with linux-3.14-rc1 with following patch on the top of it:
Author: Balaji T K <[email protected]> Date: Mon Jan 20 16:41:27 2014 +0200
ata: ahci_platform: Manage SATA PHY
Tested with SPEAr1310 evaluation board:
- INTEL PRO 100/100 EP card
- USB xhci gen2 card
- Above cards connected through LeCROY PTC switch
Modifications for SATA are tested with SPEAr1340-evb board
Changes since v3:
- Phy driver renamed to phy-miphy40lp
- ahci phy hook patch used as suggested by Arnd
- Incorporated other minor comments from v3
Changes since v2:
- Incorporated comments to move SPEAr13xx PCIe and SATA phy specific routines to the phy framework
- Modify ahci driver to include phy hooks
- phy-core driver modifications for subsys_initcall()
Changes since v1:
- Few patches of the series are already accepted and applied to mainline e.g. pcie designware driver improvements,fixes for IO translation bug, PCIe dw driver maintainer. So dropped these from v2.
- Incorporated comment to move the common/reset PCIe code to the seperate driver
- PCIe and SATA share common PHY configuration registers, so move SATA platform code to the system config driver
Fourth patch is improves pcie designware driver and fixes the IO translation bug. IO translation bug fix leads to the working of PCIe EP devices connected to RC through switch.
PCIe driver support for SPEAr1310/40 platform board is added.
These patches are tested with SPEAr1310 evaluation board:
- INTEL PRO 100/100 EP card
- USB xhci gen2 card
- Above cards connected through LeCROY PTC switch
Mohit Kumar (2):
SPEAr13xx: defconfig: Update
MAINTAINERS: Add ST SPEAr13xx PCIe driver maintainer
Pratyush Anand (6):
clk: SPEAr13xx: Fix pcie clock name
SPEAr13xx: Fix static mapping table
phy: st-miphy-40lp: Add skeleton driver
SPEAr13xx: Fixup: Move SPEAr1340 SATA platform code to phy driver
phy: st-miphy-40lp: Add SPEAr1310 and SPEAr1340 PCIe phy support
pcie: SPEAr13xx: Add designware pcie support
.../devicetree/bindings/arm/spear-misc.txt | 4 + .../devicetree/bindings/pci/spear13xx-pcie.txt | 7 + .../devicetree/bindings/phy/st-miphy40lp.txt | 12 + MAINTAINERS | 6 + arch/arm/boot/dts/spear1310-evb.dts | 4 + arch/arm/boot/dts/spear1310.dtsi | 96 +++- arch/arm/boot/dts/spear1340-evb.dts | 4 + arch/arm/boot/dts/spear1340.dtsi | 32 +- arch/arm/boot/dts/spear13xx.dtsi | 10 +- arch/arm/configs/spear13xx_defconfig | 15 + arch/arm/mach-spear/Kconfig | 3 + arch/arm/mach-spear/include/mach/spear.h | 4 +- arch/arm/mach-spear/spear1340.c | 127 +---- arch/arm/mach-spear/spear13xx.c | 2 +- drivers/clk/spear/spear1310_clock.c | 6 +- drivers/clk/spear/spear1340_clock.c | 2 +- drivers/pci/host/Kconfig | 5 + drivers/pci/host/Makefile | 1 + drivers/pci/host/pcie-spear13xx.c | 414 ++++++++++++++++ drivers/phy/Kconfig | 6 + drivers/phy/Makefile | 1 + drivers/phy/phy-miphy40lp.c | 544 +++++++++++++++++++++ 22 files changed, 1166 insertions(+), 139 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/spear-misc.txt create mode 100644 Documentation/devicetree/bindings/pci/spear13xx-pcie.txt create mode 100644 Documentation/devicetree/bindings/phy/st-miphy40lp.txt create mode 100644 drivers/pci/host/pcie-spear13xx.c create mode 100644 drivers/phy/phy-miphy40lp.c
Signature · 1 line
1.8.1.2
PATCH v4 1/8 clk: SPEAr13xx: Fix pcie clock name
Follow dt clock naming convention for PCIe clocks.
--- drivers/clk/spear/spear1310_clock.c | 6 +++--- drivers/clk/spear/spear1340_clock.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/clk/spear/spear1310_clock.c +3 -3
@@ -742,19 +742,19 @@ void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base) clk =clk_register_gate (NULL ,"pcie_sata_0_clk" ,"ahb_clk" ,0 ,SPEAR1310_PERIP1_CLK_ENB ,SPEAR1310_PCIE_SATA_0_CLK_ENB ,0 , &_lock); -clk_register_clkdev (clk,NULL ,"dw_pcie.0" ); +clk_register_clkdev (clk,NULL ,"b1000000.pcie" );clk_register_clkdev (clk,NULL ,"b1000000.ahci" ); clk =clk_register_gate (NULL ,"pcie_sata_1_clk" ,"ahb_clk" ,0 ,SPEAR1310_PERIP1_CLK_ENB ,SPEAR1310_PCIE_SATA_1_CLK_ENB ,0 , &_lock); -clk_register_clkdev (clk,NULL ,"dw_pcie.1" ); +clk_register_clkdev (clk,NULL ,"b1800000.pcie" );clk_register_clkdev (clk,NULL ,"b1800000.ahci" ); clk =clk_register_gate (NULL ,"pcie_sata_2_clk" ,"ahb_clk" ,0 ,SPEAR1310_PERIP1_CLK_ENB ,SPEAR1310_PCIE_SATA_2_CLK_ENB ,0 , &_lock); -clk_register_clkdev (clk,NULL ,"dw_pcie.2" ); +clk_register_clkdev (clk,NULL ,"b4000000.pcie" );clk_register_clkdev (clk,NULL ,"b4000000.ahci" ); clk = clk_register_gate(NULL, "sysram0_clk", "ahb_clk", 0,
drivers/clk/spear/spear1340_clock.c +1 -1
@@ -839,7 +839,7 @@ void __init spear1340_clk_init(void __iomem *misc_base) clk =clk_register_gate (NULL ,"pcie_sata_clk" ,"ahb_clk" ,0 ,SPEAR1340_PERIP1_CLK_ENB ,SPEAR1340_PCIE_SATA_CLK_ENB ,0 , &_lock); -clk_register_clkdev (clk,NULL ,"dw_pcie" ); +clk_register_clkdev (clk,NULL ,"b1000000.pcie" );clk_register_clkdev (clk,NULL ,"b1000000.ahci" ); clk = clk_register_gate(NULL, "sysram0_clk", "ahb_clk", 0,
Signature · 1 line
1.8.1.2
PATCH v4 2/8 SPEAr13xx: Fix static mapping table
In reply to Pratyush AnandSPEAr13xx was using virtual address space 0xFE000000 to map physical address space 0xB3000000. pci_remap_io uses 0xFEE00000 as virtual address. So change 0xFE000000 to 0xF9000000.
--- arch/arm/mach-spear/include/mach/spear.h | 4 ++-- arch/arm/mach-spear/spear13xx.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-spear/include/mach/spear.h +2 -2
@@ -52,10 +52,10 @@#ifdef CONFIG_ARCH_SPEAR13XX #define PERIP_GRP2_BASE UL(0xB3000000) -#define VA_PERIP_GRP2_BASE IOMEM(0xFE000000) +#define VA_PERIP_GRP2_BASE IOMEM(0xF9000000)#define MCIF_SDHCI_BASE UL(0xB3000000)#define SYSRAM0_BASE UL(0xB3800000) -#define VA_SYSRAM0_BASE IOMEM(0xFE800000) +#define VA_SYSRAM0_BASE IOMEM(0xF9800000)#define SYS_LOCATION (VA_SYSRAM0_BASE + 0x600)#define PERIP_GRP1_BASE UL(0xE0000000)
arch/arm/mach-spear/spear13xx.c +1 -1
@@ -52,7 +52,7 @@ void __init spear13xx_l2x0_init(void)/* * Following will create 16MB static virtual/physical mappings * PHYSICAL VIRTUAL -* 0xB3000000 0xFE000000 +* 0xB3000000 0xF9000000 * 0xE0000000 0xFD000000 * 0xEC000000 0xFC000000 * 0xED000000 0xFB000000
Signature · 1 line
1.8.1.2
PATCH v4 3/8 SPEAr13xx: defconfig: Update
In reply to Pratyush AnandFrom: Mohit Kumar <[email protected]>
Enable EABI, VFP and NFS configs in default configuration file for SPEAr13xx.
--- arch/arm/configs/spear13xx_defconfig | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/arm/configs/spear13xx_defconfig +13 -0
@@ -14,10 +14,18 @@ CONFIG_MACH_SPEAR1340=y CONFIG_SMP=y # CONFIG_SMP_ON_UP is not set # CONFIG_ARM_CPU_TOPOLOGY is not set +CONFIG_AEABI=y CONFIG_ARM_APPENDED_DTB=y CONFIG_ARM_ATAG_DTB_COMPAT=y +CONFIG_VFP=y CONFIG_BINFMT_MISC=y CONFIG_NET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_NET_IPIP=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_MTD=y CONFIG_MTD_OF_PARTS=y
@@ -27,6 +35,7 @@ CONFIG_MTD_NAND=y CONFIG_MTD_NAND_FSMC=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=16384 +CONFIG_BLK_DEV_SD=y CONFIG_ATA=y # CONFIG_SATA_PMP is not set CONFIG_SATA_AHCI_PLATFORM=y
@@ -66,6 +75,7 @@ CONFIG_USB=y # CONFIG_USB_DEVICE_CLASS is not set CONFIG_USB_EHCI_HCD=y CONFIG_USB_OHCI_HCD=y +CONFIG_USB_STORAGE=y CONFIG_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SPEAR=y
@@ -79,11 +89,14 @@ CONFIG_EXT2_FS_SECURITY=y CONFIG_EXT3_FS=y CONFIG_EXT3_FS_SECURITY=y CONFIG_AUTOFS4_FS=m +CONFIG_FUSE_FS=y CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_IOCHARSET="ascii" CONFIG_TMPFS=y CONFIG_JFFS2_FS=y +CONFIG_NFS_FS=y +CONFIG_ROOT_NFS=y CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ASCII=m
Signature · 1 line
1.8.1.2
PATCH v4 4/8 phy: st-miphy-40lp: Add skeleton driver
In reply to Pratyush AnandST miphy-40lp supports PCIe, SATA and Super Speed USB. This driver adds skeleton support for the same.
Currently phy ops are returning -EINVAL. They can be elaborated depending on the SOC being supported in future.
--- .../devicetree/bindings/phy/st-miphy40lp.txt | 12 ++ drivers/phy/Kconfig | 6 + drivers/phy/Makefile | 1 + drivers/phy/phy-miphy40lp.c | 174 +++++++++++++++++++++ 4 files changed, 193 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/st-miphy40lp.txt create mode 100644 drivers/phy/phy-miphy40lp.c
Documentation/devicetree/bindings/phy/st-miphy40lp.txt new file +12 -0
@@ -0,0 +1,12 @@ +Required properties: +- compatible : should be "st,miphy40lp-phy" + Other supported soc specific compatible: + "st,spear1310-miphy" + "st,spear1340-miphy" +- reg : offset and length of the PHY register set. +- misc: phandle for the syscon node to access misc registers +- phy-id: Instance id of the phy. +- #phy-cells : from the generic PHY bindings, must be 1. + - 1st cell: phandle to the phy node. + - 2nd cell: 0 if phy (in 1st cell) is to be used for SATA, 1 for PCIe + and 2 for Super Speed USB.
drivers/phy/Kconfig +6 -0
@@ -64,4 +64,10 @@ config BCM_KONA_USB2_PHY help Enable this to support the Broadcom Kona USB 2.0 PHY. +config PHY_ST_MIPHY40LP + tristate "ST MIPHY 40LP driver" + help + Support for ST MIPHY 40LP which can be used for PCIe, SATA and Super Speed USB. + select GENERIC_PHY + endmenu
drivers/phy/Makefile +1 -0
@@ -9,3 +9,4 @@ obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o obj-$(CONFIG_PHY_MVEBU_SATA) += phy-mvebu-sata.o obj-$(CONFIG_OMAP_USB2) += phy-omap-usb2.o obj-$(CONFIG_TWL4030_USB) += phy-twl4030-usb.o +obj-$(CONFIG_PHY_ST_MIPHY40LP) += phy-miphy40lp.o
drivers/phy/phy-miphy40lp.c new file +174 -0
174 lines not on this page · raw message
Signature · 1 line
1.8.1.2
Re: [PATCH V4 4/8] phy: st-miphy-40lp: Add skeleton driver
Hi,
Quoted 133 lines · Pratyush Anand
ST miphy-40lp supports PCIe, SATA and Super Speed USB. This driver adds skeleton support for the same.
Currently phy ops are returning
-EINVAL. They can be elaborated depending on the SOC being supported in future.Signed-off-by Pratyush Anand <[email protected]>Tested-by Mohit Kumar <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Kishon Vijay Abraham I <[email protected]>Cc spear-devel at list.st.comCc linux-arm-kernel at lists.infradead.orgCc devicetree at vger.kernel.orgCc linux-kernel at vger.kernel.org--- .../devicetree/bindings/phy/st-miphy40lp.txt | 12 ++ drivers/phy/Kconfig | 6 + drivers/phy/Makefile | 1 + drivers/phy/phy-miphy40lp.c | 174 +++++++++++++++++++++ 4 files changed, 193 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/st-miphy40lp.txt create mode 100644 drivers/phy/phy-miphy40lp.cDocumentation/devicetree/bindings/phy/st-miphy40lp.txt new file +12
-0@@ -0,0 +1,12 @@ +Required properties: +- compatible : should be "st,miphy40lp-phy" + Other supported soc specific compatible: + "st,spear1310-miphy" + "st,spear1340-miphy" +- reg : offset and length of the PHY register set. +- misc: phandle for the syscon node to access misc registers +- phy-id: Instance id of the phy. +- #phy-cells : from the generic PHY bindings, must be 1. + - 1st cell: phandle to the phy node. + - 2nd cell: 0 if phy (in 1st cell) is to be used for SATA, 1 for PCIe + and 2 for Super Speed USB.drivers/phy/Kconfig +6
-0@@ -64,4 +64,10 @@ config BCM_KONA_USB2_PHY help Enable this to support the Broadcom Kona USB 2.0 PHY. +config PHY_ST_MIPHY40LP + tristate "ST MIPHY 40LP driver" + help + Support for ST MIPHY 40LP which can be used for PCIe, SATA and Super Speed USB. + select GENERIC_PHY + endmenudrivers/phy/Makefile +1
-0@@ -9,3 +9,4 @@ obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o obj-$(CONFIG_PHY_MVEBU_SATA) += phy-mvebu-sata.o obj-$(CONFIG_OMAP_USB2) += phy-omap-usb2.o obj-$(CONFIG_TWL4030_USB) += phy-twl4030-usb.o +obj-$(CONFIG_PHY_ST_MIPHY40LP) += phy-miphy40lp.odrivers/phy/phy-miphy40lp.c new file +62
-0@@ -0,0 +1,174 @@ +/* +* ST MiPHY-40LP PHY driver +* +* Copyright (C) 2014 ST Microelectronics +* Pratyush Anand <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +*/ + +#include <linux/delay.h> +#include <linux/dma-mapping.h> +#include <linux/kernel.h> +#include <linux/mfd/syscon.h> +#include <linux/module.h> +#include <linux/of_device.h> +#include <linux/phy/phy.h> +#include <linux/regmap.h> + +enum phy_mode { +SATA , +PCIE , +SS_USB , +}; + +struct st_miphy40lp_priv { +/* regmap for any soc specific misc registers */ +struct regmap *misc; +/* phy struct pointer */ +struct phy *phy; +/* device node pointer */ +struct device_node *np; +/* phy mode: 0 for SATA 1 for PCIe and 2 for SS-USB */ +enum phy_mode mode; +/* instance id of this phy */ +u32 id; +}; + +static int miphy40lp_init (struct phy *phy) +{ +return -EINVAL ; +} + +static int miphy40lp_exit (struct phy *phy) +{ +return -EINVAL ; +} + +static int miphy40lp_power_off (struct phy *phy) +{ +return -EINVAL ; +} + +static int miphy40lp_power_on (struct phy *phy) +{ +return -EINVAL ; +} + +static const struct of_device_id st_miphy40lp_of_match[] = { + { .compatible ="st,miphy40lp-phy" },
drivers/phy/phy-miphy40lp.c line 72
Quoted 10 lines
drivers/phy/phy-miphy40lp.c new file +10
-0+ { }, +}; +MODULE_DEVICE_TABLE (of, st_miphy40lp_of_match); + +static struct phy_ops st_miphy40lp_ops = { + .init = miphy40lp_init, + .exit = miphy40lp_exit, + .power_off = miphy40lp_power_off, + .power_on = miphy40lp_power_on, + .owner =THIS_MODULE ,
Would prefer to either align all the fields or align none. Here only owner is aligned.
Quoted 47 lines
drivers/phy/phy-miphy40lp.c new file +47
-0+}; + +#ifdef CONFIG_PM_SLEEP +static int miphy40lp_suspend (struct device *dev) +{ +return -EINVAL ; +} + +static int miphy40lp_resume (struct device *dev) +{ +return -EINVAL ; +} +#endif + +static SIMPLE_DEV_PM_OPS(miphy40lp_pm_ops, miphy40lp_suspend, + miphy40lp_resume); + +static struct phy *st_miphy40lp_xlate (struct device *dev, +struct of_phandle_args *args) +{ +struct st_miphy40lp_priv *phypriv =dev_get_drvdata (dev); + +if (args->args_count <1 ) { +dev_err (dev,"DT did not pass correct no of args\n" ); +return NULL ; + } + + phypriv->mode = args->args[0 ]; + +return phypriv->phy; +} + +static int __init st_miphy40lp_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct st_miphy40lp_priv *phypriv; +struct phy_provider *phy_provider; + + phypriv =devm_kzalloc (dev,sizeof (*phypriv),GFP_KERNEL ); +if (!phypriv) { +dev_err (dev,"can't alloc miphy40lp private date memory\n" ); +return -ENOMEM ; + } + + phypriv->np = dev->of_node; + + phypriv->misc =
drivers/phy/phy-miphy40lp.c line 129
Quoted 10 lines
drivers/phy/phy-miphy40lp.c new file +10
-0+syscon_regmap_lookup_by_phandle (dev->of_node,"misc" ); +if (IS_ERR (phypriv->misc)) { +dev_err (dev,"failed to find misc regmap\n" ); +return PTR_ERR (phypriv->misc); + } + +if (of_property_read_u32 (dev->of_node,"phy-id" , &phypriv->id)) { +dev_err (dev,"failed to find phy id\n" ); +return -EINVAL ; + }
Do we really need this phy id? How is it being used?
drivers/phy/phy-miphy40lp.c line 135
Quoted 6 lines
drivers/phy/phy-miphy40lp.c new file +6
-0+ + phy_provider =devm_of_phy_provider_register (dev, st_miphy40lp_xlate); +if (IS_ERR (phy_provider)) { +dev_err (dev,"failed to register phy provider\n" ); +return PTR_ERR (phy_provider); + }
phy_provider_register should be the last step in registering the PHY. Or your PHY call backs can be called before you create the PHY. Btw in your case you should call dev_set_drvdata before doing phy_provider_register.
Quoted 7 lines
drivers/phy/phy-miphy40lp.c new file +7
-0+ + phypriv->phy =devm_phy_create (dev, &st_miphy40lp_ops,NULL ); +if (IS_ERR (phypriv->phy)) { +dev_err (dev,"failed to create SATA PCIe PHY\n" ); +return PTR_ERR (phypriv->phy); + } +
drivers/phy/phy-miphy40lp.c line 152
Quoted 10 lines
drivers/phy/phy-miphy40lp.c new file +10
-0+dev_set_drvdata (dev, phypriv); +phy_set_drvdata (phypriv->phy, phypriv); + +return 0 ; +} + +static int __exit st_miphy40lp_remove(struct platform_device *pdev) +{ +return 0 ; +}
I think you can remove this empty 'remove' callback.
Thanks
Kishon
Re: [PATCH V4 4/8] phy: st-miphy-40lp: Add skeleton driver
Hi Kishon,
Quoted 141 lines · Kishon Vijay Abraham I
Hi,
Quoted 138 lines · Pratyush Anand
ST miphy-40lp supports PCIe, SATA and Super Speed USB. This driver adds skeleton support for the same.
Currently phy ops are returning
-EINVAL. They can be elaborated depending on the SOC being supported in future.Signed-off-by Pratyush Anand <[email protected]>Tested-by Mohit Kumar <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Kishon Vijay Abraham I <[email protected]>Cc spear-devel at list.st.comCc linux-arm-kernel at lists.infradead.orgCc devicetree at vger.kernel.orgCc linux-kernel at vger.kernel.org--- .../devicetree/bindings/phy/st-miphy40lp.txt | 12 ++ drivers/phy/Kconfig | 6 + drivers/phy/Makefile | 1 + drivers/phy/phy-miphy40lp.c | 174 +++++++++++++++++++++ 4 files changed, 193 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/st-miphy40lp.txt create mode 100644 drivers/phy/phy-miphy40lp.cDocumentation/devicetree/bindings/phy/st-miphy40lp.txt new file +12
-0@@ -0,0 +1,12 @@ +Required properties: +- compatible : should be "st,miphy40lp-phy" + Other supported soc specific compatible: + "st,spear1310-miphy" + "st,spear1340-miphy" +- reg : offset and length of the PHY register set. +- misc: phandle for the syscon node to access misc registers +- phy-id: Instance id of the phy. +- #phy-cells : from the generic PHY bindings, must be 1. + - 1st cell: phandle to the phy node. + - 2nd cell: 0 if phy (in 1st cell) is to be used for SATA, 1 for PCIe + and 2 for Super Speed USB.drivers/phy/Kconfig +6
-0@@ -64,4 +64,10 @@ config BCM_KONA_USB2_PHY help Enable this to support the Broadcom Kona USB 2.0 PHY. +config PHY_ST_MIPHY40LP + tristate "ST MIPHY 40LP driver" + help + Support for ST MIPHY 40LP which can be used for PCIe, SATA and Super Speed USB. + select GENERIC_PHY + endmenudrivers/phy/Makefile +1
-0@@ -9,3 +9,4 @@ obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o obj-$(CONFIG_PHY_MVEBU_SATA) += phy-mvebu-sata.o obj-$(CONFIG_OMAP_USB2) += phy-omap-usb2.o obj-$(CONFIG_TWL4030_USB) += phy-twl4030-usb.o +obj-$(CONFIG_PHY_ST_MIPHY40LP) += phy-miphy40lp.odrivers/phy/phy-miphy40lp.c new file +67
-0@@ -0,0 +1,174 @@ +/* +* ST MiPHY-40LP PHY driver +* +* Copyright (C) 2014 ST Microelectronics +* Pratyush Anand <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +*/ + +#include <linux/delay.h> +#include <linux/dma-mapping.h> +#include <linux/kernel.h> +#include <linux/mfd/syscon.h> +#include <linux/module.h> +#include <linux/of_device.h> +#include <linux/phy/phy.h> +#include <linux/regmap.h> + +enum phy_mode { +SATA , +PCIE , +SS_USB , +}; + +struct st_miphy40lp_priv { +/* regmap for any soc specific misc registers */ +struct regmap *misc; +/* phy struct pointer */ +struct phy *phy; +/* device node pointer */ +struct device_node *np; +/* phy mode: 0 for SATA 1 for PCIe and 2 for SS-USB */ +enum phy_mode mode; +/* instance id of this phy */ +u32 id; +}; + +static int miphy40lp_init (struct phy *phy) +{ +return -EINVAL ; +} + +static int miphy40lp_exit (struct phy *phy) +{ +return -EINVAL ; +} + +static int miphy40lp_power_off (struct phy *phy) +{ +return -EINVAL ; +} + +static int miphy40lp_power_on (struct phy *phy) +{ +return -EINVAL ; +} + +static const struct of_device_id st_miphy40lp_of_match[] = { + { .compatible ="st,miphy40lp-phy" }, + { }, +}; +MODULE_DEVICE_TABLE (of, st_miphy40lp_of_match); + +static struct phy_ops st_miphy40lp_ops = {
Quoted 8 lines
drivers/phy/phy-miphy40lp.c line 72
Quoted 5 lines
drivers/phy/phy-miphy40lp.c new file +5
-0+ .init = miphy40lp_init, + .exit = miphy40lp_exit, + .power_off = miphy40lp_power_off, + .power_on = miphy40lp_power_on, + .owner = THIS_MODULE,Would prefer to either align all the fields or align none. Here only owner is aligned.
ok.
Quoted 50 lines
Quoted 50 lines
drivers/phy/phy-miphy40lp.c new file +50
-0+}; + +#ifdef CONFIG_PM_SLEEP +static int miphy40lp_suspend (struct device *dev) +{ +return -EINVAL ; +} + +static int miphy40lp_resume (struct device *dev) +{ +return -EINVAL ; +} +#endif + +static SIMPLE_DEV_PM_OPS(miphy40lp_pm_ops, miphy40lp_suspend, + miphy40lp_resume); + +static struct phy *st_miphy40lp_xlate (struct device *dev, +struct of_phandle_args *args) +{ +struct st_miphy40lp_priv *phypriv =dev_get_drvdata (dev); + +if (args->args_count <1 ) { +dev_err (dev,"DT did not pass correct no of args\n" ); +return NULL ; + } + + phypriv->mode = args->args[0 ]; + +return phypriv->phy; +} + +static int __init st_miphy40lp_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct st_miphy40lp_priv *phypriv; +struct phy_provider *phy_provider; + + phypriv =devm_kzalloc (dev,sizeof (*phypriv),GFP_KERNEL ); +if (!phypriv) { +dev_err (dev,"can't alloc miphy40lp private date memory\n" ); +return -ENOMEM ; + } + + phypriv->np = dev->of_node; + + phypriv->misc = +syscon_regmap_lookup_by_phandle (dev->of_node,"misc" ); +if (IS_ERR (phypriv->misc)) { +dev_err (dev,"failed to find misc regmap\n" );
Quoted 8 lines
drivers/phy/phy-miphy40lp.c line 129
Quoted 7 lines
drivers/phy/phy-miphy40lp.c new file +7
-0+return PTR_ERR (phypriv->misc); + } + +if (of_property_read_u32 (dev->of_node,"phy-id" , &phypriv->id)) { +dev_err (dev,"failed to find phy id\n" ); +return -EINVAL ; + }Do we really need this phy id? How is it being used?
Yes , it is being used by patch 6/8.
Quoted 10 lines
drivers/phy/phy-miphy40lp.c line 135
Quoted 7 lines
drivers/phy/phy-miphy40lp.c new file +6
-0+ + phy_provider =devm_of_phy_provider_register (dev, st_miphy40lp_xlate); +if (IS_ERR (phy_provider)) { +dev_err (dev,"failed to register phy provider\n" ); +return PTR_ERR (phy_provider); + }
phy_provider_registershould be the last step in registering the PHY. Or your PHY call backs can be called before you create the PHY. Btw in your case you
But every one else like phy-exynos-mipi-video or phy-omap-usb2 or any other did it same way. First phy_provider_register and then phy_create.
Quoted 1 line
should call
dev_set_drvdatabefore doingphy_provider_register.
yes, I need to correct it.
Quoted 11 lines
Quoted 11 lines
drivers/phy/phy-miphy40lp.c new file +11
-0+ + phypriv->phy =devm_phy_create (dev, &st_miphy40lp_ops,NULL ); +if (IS_ERR (phypriv->phy)) { +dev_err (dev,"failed to create SATA PCIe PHY\n" ); +return PTR_ERR (phypriv->phy); + } + +dev_set_drvdata (dev, phypriv); +phy_set_drvdata (phypriv->phy, phypriv); + +return 0 ;
Quoted 8 lines
drivers/phy/phy-miphy40lp.c line 152
Quoted 6 lines
drivers/phy/phy-miphy40lp.c new file +6
-0+} + +static int __exit st_miphy40lp_remove(struct platform_device *pdev) +{ +return 0 ; +}I think you can remove this empty 'remove' callback.
Yaa.. Can be removed.
Rgds
Pratyush
Quoted 3 lines
Thanks
Kishon
Re: [PATCH V4 4/8] phy: st-miphy-40lp: Add skeleton driver
Hi,
Quoted 214 lines · Pratyush Anand
Hi Kishon,
Quoted 141 lines · Kishon Vijay Abraham I
Hi,
Quoted 138 lines · Pratyush Anand
ST miphy-40lp supports PCIe, SATA and Super Speed USB. This driver adds skeleton support for the same.
Currently phy ops are returning
-EINVAL. They can be elaborated depending on the SOC being supported in future.Signed-off-by Pratyush Anand <[email protected]>Tested-by Mohit Kumar <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Kishon Vijay Abraham I <[email protected]>Cc spear-devel at list.st.comCc linux-arm-kernel at lists.infradead.orgCc devicetree at vger.kernel.orgCc linux-kernel at vger.kernel.org--- .../devicetree/bindings/phy/st-miphy40lp.txt | 12 ++ drivers/phy/Kconfig | 6 + drivers/phy/Makefile | 1 + drivers/phy/phy-miphy40lp.c | 174 +++++++++++++++++++++ 4 files changed, 193 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/st-miphy40lp.txt create mode 100644 drivers/phy/phy-miphy40lp.cDocumentation/devicetree/bindings/phy/st-miphy40lp.txt new file +12
-0@@ -0,0 +1,12 @@ +Required properties: +- compatible : should be "st,miphy40lp-phy" + Other supported soc specific compatible: + "st,spear1310-miphy" + "st,spear1340-miphy" +- reg : offset and length of the PHY register set. +- misc: phandle for the syscon node to access misc registers +- phy-id: Instance id of the phy. +- #phy-cells : from the generic PHY bindings, must be 1. + - 1st cell: phandle to the phy node. + - 2nd cell: 0 if phy (in 1st cell) is to be used for SATA, 1 for PCIe + and 2 for Super Speed USB.drivers/phy/Kconfig +6
-0@@ -64,4 +64,10 @@ config BCM_KONA_USB2_PHY help Enable this to support the Broadcom Kona USB 2.0 PHY. +config PHY_ST_MIPHY40LP + tristate "ST MIPHY 40LP driver" + help + Support for ST MIPHY 40LP which can be used for PCIe, SATA and Super Speed USB. + select GENERIC_PHY + endmenudrivers/phy/Makefile +1
-0@@ -9,3 +9,4 @@ obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o obj-$(CONFIG_PHY_MVEBU_SATA) += phy-mvebu-sata.o obj-$(CONFIG_OMAP_USB2) += phy-omap-usb2.o obj-$(CONFIG_TWL4030_USB) += phy-twl4030-usb.o +obj-$(CONFIG_PHY_ST_MIPHY40LP) += phy-miphy40lp.odrivers/phy/phy-miphy40lp.c new file +67
-0@@ -0,0 +1,174 @@ +/* +* ST MiPHY-40LP PHY driver +* +* Copyright (C) 2014 ST Microelectronics +* Pratyush Anand <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +*/ + +#include <linux/delay.h> +#include <linux/dma-mapping.h> +#include <linux/kernel.h> +#include <linux/mfd/syscon.h> +#include <linux/module.h> +#include <linux/of_device.h> +#include <linux/phy/phy.h> +#include <linux/regmap.h> + +enum phy_mode { +SATA , +PCIE , +SS_USB , +}; + +struct st_miphy40lp_priv { +/* regmap for any soc specific misc registers */ +struct regmap *misc; +/* phy struct pointer */ +struct phy *phy; +/* device node pointer */ +struct device_node *np; +/* phy mode: 0 for SATA 1 for PCIe and 2 for SS-USB */ +enum phy_mode mode; +/* instance id of this phy */ +u32 id; +}; + +static int miphy40lp_init (struct phy *phy) +{ +return -EINVAL ; +} + +static int miphy40lp_exit (struct phy *phy) +{ +return -EINVAL ; +} + +static int miphy40lp_power_off (struct phy *phy) +{ +return -EINVAL ; +} + +static int miphy40lp_power_on (struct phy *phy) +{ +return -EINVAL ; +} + +static const struct of_device_id st_miphy40lp_of_match[] = { + { .compatible ="st,miphy40lp-phy" }, + { }, +}; +MODULE_DEVICE_TABLE (of, st_miphy40lp_of_match); + +static struct phy_ops st_miphy40lp_ops = {Quoted 8 lines
drivers/phy/phy-miphy40lp.c line 72
Quoted 5 lines
drivers/phy/phy-miphy40lp.c new file +5
-0+ .init = miphy40lp_init, + .exit = miphy40lp_exit, + .power_off = miphy40lp_power_off, + .power_on = miphy40lp_power_on, + .owner = THIS_MODULE,Would prefer to either align all the fields or align none. Here only owner is aligned.
ok.
Quoted 50 lines
Quoted 50 lines
drivers/phy/phy-miphy40lp.c new file +50
-0+}; + +#ifdef CONFIG_PM_SLEEP +static int miphy40lp_suspend (struct device *dev) +{ +return -EINVAL ; +} + +static int miphy40lp_resume (struct device *dev) +{ +return -EINVAL ; +} +#endif + +static SIMPLE_DEV_PM_OPS(miphy40lp_pm_ops, miphy40lp_suspend, + miphy40lp_resume); + +static struct phy *st_miphy40lp_xlate (struct device *dev, +struct of_phandle_args *args) +{ +struct st_miphy40lp_priv *phypriv =dev_get_drvdata (dev); + +if (args->args_count <1 ) { +dev_err (dev,"DT did not pass correct no of args\n" ); +return NULL ; + } + + phypriv->mode = args->args[0 ]; + +return phypriv->phy; +} + +static int __init st_miphy40lp_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct st_miphy40lp_priv *phypriv; +struct phy_provider *phy_provider; + + phypriv =devm_kzalloc (dev,sizeof (*phypriv),GFP_KERNEL ); +if (!phypriv) { +dev_err (dev,"can't alloc miphy40lp private date memory\n" ); +return -ENOMEM ; + } + + phypriv->np = dev->of_node; + + phypriv->misc = +syscon_regmap_lookup_by_phandle (dev->of_node,"misc" ); +if (IS_ERR (phypriv->misc)) { +dev_err (dev,"failed to find misc regmap\n" );Quoted 8 lines
drivers/phy/phy-miphy40lp.c line 129
Quoted 7 lines
drivers/phy/phy-miphy40lp.c new file +7
-0+return PTR_ERR (phypriv->misc); + } + +if (of_property_read_u32 (dev->of_node,"phy-id" , &phypriv->id)) { +dev_err (dev,"failed to find phy id\n" ); +return -EINVAL ; + }Do we really need this phy id? How is it being used?
Quoted 1 line
Yes , it is being used by patch 6/8.
Alright.
Quoted 12 lines
Quoted 11 lines
drivers/phy/phy-miphy40lp.c line 135
Quoted 8 lines
drivers/phy/phy-miphy40lp.c new file +6
-0+ + phy_provider =devm_of_phy_provider_register (dev, st_miphy40lp_xlate); +if (IS_ERR (phy_provider)) { +dev_err (dev,"failed to register phy provider\n" ); +return PTR_ERR (phy_provider); + }
phy_provider_registershould be the last step in registering the PHY. Or your PHY call backs can be called before you create the PHY. Btw in your case you
Quoted 3 lines
But every one else like phy-exynos-mipi-video or phy-omap-usb2 or any other did it same way. First
phy_provider_registerand thenphy_create.
That's a bug which we figured out very late. Will get it fixed in this -rc cycle.
Thanks
Kishon
Re: [PATCH V4 4/8] phy: st-miphy-40lp: Add skeleton driver
Quoted 10 lines · Kishon Vijay Abraham I
Hi,
Quoted 7 lines · Pratyush Anand
Hi Kishon,
Quoted 4 lines · Kishon Vijay Abraham I
Hi,
Quoted 1 line · Pratyush Anand
ST miphy-40lp supports PCIe, SATA and Super Speed USB. This driver adds
[...]
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
drivers/phy/phy-miphy40lp.c line 135
Quoted 6 lines
drivers/phy/phy-miphy40lp.c new file +6
-0+ + phy_provider =devm_of_phy_provider_register (dev, st_miphy40lp_xlate); +if (IS_ERR (phy_provider)) { +dev_err (dev,"failed to register phy provider\n" ); +return PTR_ERR (phy_provider); + }
phy_provider_registershould be the last step in registering the PHY. Or your PHY call backs can be called before you create the PHY. Btw in your case you
Quoted 5 lines
Quoted 3 lines
But every one else like phy-exynos-mipi-video or phy-omap-usb2 or any other did it same way. First
phy_provider_registerand thenphy_create.That's a bug which we figured out very late. Will get it fixed in this -rc cycle.
Ok..I ll correct in mine too. :)
Rgds
Pratyush
Quoted 3 lines
Thanks
Kishon
PATCH v4 5/8 SPEAr13xx: Fixup: Move SPEAr1340 SATA platform code to phy driver
In reply to Pratyush Anandahci driver needs some platform specific functions which are called at init, exit, suspend and resume conditions. Till now these functions were present in a platform driver with a fixme notes.
Similar functions modifying same set of registers will also be needed in case of PCIe phy init/exit.
So move all these SATA platform code to phy-miphy40lp driver.
--- .../devicetree/bindings/arm/spear-misc.txt | 4 + arch/arm/boot/dts/spear1310-evb.dts | 4 + arch/arm/boot/dts/spear1310.dtsi | 39 +++- arch/arm/boot/dts/spear1340-evb.dts | 4 + arch/arm/boot/dts/spear1340.dtsi | 13 +- arch/arm/boot/dts/spear13xx.dtsi | 5 + arch/arm/mach-spear/Kconfig | 2 + arch/arm/mach-spear/spear1340.c | 127 +------------ drivers/phy/phy-miphy40lp.c | 204 ++++++++++++++++++++- 9 files changed, 266 insertions(+), 136 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/spear-misc.txt
Documentation/devicetree/bindings/arm/spear-misc.txt new file +4 -0
@@ -0,0 +1,4 @@ +* SPEAr Misc configuration +** misc node required properties: +- compatible Should be "st,spear1340-misc", "syscon". +- reg: Address range of misc space
arch/arm/boot/dts/spear1310-evb.dts +4 -0
@@ -106,6 +106,10 @@ status = "okay"; }; + miphy at eb800000 { + status = "okay"; + }; + cf at b2800000 { status = "okay"; };
arch/arm/boot/dts/spear1310.dtsi +36 -3
@@ -29,24 +29,57 @@ #gpio-cells = <2>; }; - ahci at b1000000 { + miphy0: miphy at eb800000 { + compatible = "st,miphy", "st,spear1310-miphy"; + reg = <0xeb800000 0x4000>; + misc = <&misc>; + phy-id = <0>; + #phy-cells = <1>; + status = "disabled"; + }; + + miphy1: miphy at eb804000 { + compatible = "st,miphy", "st,spear1310-miphy"; + reg = <0xeb804000 0x4000>; + misc = <&misc>; + phy-id = <1>; + #phy-cells = <1>; + status = "disabled"; + }; + + miphy2: miphy at eb808000 { + compatible = "st,miphy", "st,spear1310-miphy"; + reg = <0xeb808000 0x4000>; + misc = <&misc>; + phy-id = <2>; + #phy-cells = <1>; + status = "disabled"; + }; + + ahci0: ahci at b1000000 { compatible = "snps,spear-ahci"; reg = <0xb1000000 0x10000>; interrupts = <0 68 0x4>; + phys = <&miphy0 0>; + phy-names = "sata-phy"; status = "disabled"; }; - ahci at b1800000 { + ahci1: ahci at b1800000 { compatible = "snps,spear-ahci"; reg = <0xb1800000 0x10000>; interrupts = <0 69 0x4>; + phys = <&miphy1 0>; + phy-names = "sata-phy"; status = "disabled"; }; - ahci at b4000000 { + ahci2: ahci at b4000000 { compatible = "snps,spear-ahci"; reg = <0xb4000000 0x10000>; interrupts = <0 70 0x4>; + phys = <&miphy2 0>; + phy-names = "sata-phy"; status = "disabled"; };
arch/arm/boot/dts/spear1340-evb.dts +4 -0
@@ -122,6 +122,10 @@ status = "okay"; }; + miphy at eb800000 { + status = "okay"; + }; + dma at ea800000 { status = "okay"; };
arch/arm/boot/dts/spear1340.dtsi +12 -1
@@ -31,10 +31,21 @@ status = "disabled"; }; - ahci at b1000000 { + miphy0: miphy at eb800000 { + compatible = "st,miphy", "st,spear1340-miphy"; + reg = <0xeb800000 0x4000>; + misc = <&misc>; + phy-id = <0>; + #phy-cells = <1>; + status = "disabled"; + }; + + ahci0: ahci at b1000000 { compatible = "snps,spear-ahci"; reg = <0xb1000000 0x10000>; interrupts = <0 72 0x4>; + phys = <&miphy0 0>; + phy-names = "sata-phy"; status = "disabled"; };
arch/arm/boot/dts/spear13xx.dtsi +5 -0
@@ -220,6 +220,11 @@ 0xd8000000 0xd8000000 0x01000000 0xe0000000 0xe0000000 0x10000000>; + misc: syscon at e0700000 { + compatible = "st,spear1340-misc", "syscon"; + reg = <0xe0700000 0x1000>; + }; + gpio0: gpio at e0600000 { compatible = "arm,pl061", "arm,primecell"; reg = <0xe0600000 0x1000>;
arch/arm/mach-spear/Kconfig +2 -0
@@ -26,6 +26,8 @@ config ARCH_SPEAR13XX select MIGHT_HAVE_CACHE_L2X0 select PINCTRL select USE_OF + select MFD_SYSCON + select PHY_ST_MIPHY40LP help Supports for ARM's SPEAR13XX family
arch/arm/mach-spear/spear1340.c +1 -126
139 lines not on this page · raw message
drivers/phy/phy-miphy40lp.c +198 -6
250 lines not on this page · raw message
Signature · 1 line
1.8.1.2
Re: [PATCH V4 5/8] SPEAr13xx: Fixup: Move SPEAr1340 SATA platform code to phy driver
Hi,
Quoted 20 lines · Pratyush Anand
ahci driver needs some platform specific functions which are called at init, exit, suspend and resume conditions. Till now these functions were present in a platform driver with a fixme notes.
Similar functions modifying same set of registers will also be needed in case of PCIe phy init/exit.
So move all these SATA platform code to phy-miphy40lp driver.
Signed-off-by Pratyush Anand <[email protected]>Tested-by Mohit Kumar <[email protected]>Cc Viresh Kumar <[email protected]>Cc Tejun Heo <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Kishon Vijay Abraham I <[email protected]>Cc spear-devel at list.st.comCc linux-arm-kernel at lists.infradead.orgCc devicetree at vger.kernel.orgCc linux-ide at vger.kernel.orgCc linux-kernel at vger.kernel.org
Quoted 10 lines
--- .../devicetree/bindings/arm/spear-misc.txt | 4 + arch/arm/boot/dts/spear1310-evb.dts | 4 + arch/arm/boot/dts/spear1310.dtsi | 39 +++- arch/arm/boot/dts/spear1340-evb.dts | 4 + arch/arm/boot/dts/spear1340.dtsi | 13 +- arch/arm/boot/dts/spear13xx.dtsi | 5 + arch/arm/mach-spear/Kconfig | 2 + arch/arm/mach-spear/spear1340.c | 127 +------------ drivers/phy/phy-miphy40lp.c | 204 ++++++++++++++++++++-
It would be better if you can split this patch. Keep arch/ in separate patch and drivers/ in separate patch.
Quoted 3 lines
9 files changed, 266 insertions(+), 136 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/spear-misc.txt
.
.
<snip>
.
.
Quoted 23 lines
static const char * const spear1340_dt_board_compat[] = {
drivers/phy/phy-miphy40lp.c +7
-0@@ -8,6 +8,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. * +* 04/02/2014: Adding support of SATA mode for SPEAr1340. */ #include <linux/delay.h> @@ -19,6 +20,60 @@#include <linux/phy/phy.h> #include <linux/regmap.h> +/* SPEAr1340 Registers */ +/* Power Management Registers */ +#define SPEAR1340_PCM_CFG 0x100 +#define SPEAR1340_PCM_CFG_SATA_POWER_EN 0x800 +#define SPEAR1340_PCM_WKUP_CFG 0x104 +#define SPEAR1340_SWITCH_CTR 0x108
drivers/phy/phy-miphy40lp.c line 38
Quoted 10 lines
drivers/phy/phy-miphy40lp.c +10
-0+ +#define SPEAR1340_PERIP1_SW_RST 0x318 +#define SPEAR1340_PERIP1_SW_RST_SATA 0x1000 +#define SPEAR1340_PERIP2_SW_RST 0x31C +#define SPEAR1340_PERIP3_SW_RST 0x320 + +/* PCIE - SATA configuration registers */ +#define SPEAR1340_PCIE_SATA_CFG 0x424 +/* PCIE CFG MASks */ +#define SPEAR1340_PCIE_CFG_DEVICE_PRESENT (1 << 11)
use BIT() wherever possible.
Quoted 42 lines
drivers/phy/phy-miphy40lp.c +38
-0+#define SPEAR1340_PCIE_CFG_POWERUP_RESET (1 << 10) +#define SPEAR1340_PCIE_CFG_CORE_CLK_EN (1 << 9) +#define SPEAR1340_PCIE_CFG_AUX_CLK_EN (1 << 8) +#define SPEAR1340_SATA_CFG_TX_CLK_EN (1 << 4) +#define SPEAR1340_SATA_CFG_RX_CLK_EN (1 << 3) +#define SPEAR1340_SATA_CFG_POWERUP_RESET (1 << 2) +#define SPEAR1340_SATA_CFG_PM_CLK_EN (1 << 1) +#define SPEAR1340_PCIE_SATA_SEL_PCIE (0) +#define SPEAR1340_PCIE_SATA_SEL_SATA (1) +#define SPEAR1340_PCIE_SATA_CFG_MASK 0xF1F +#define SPEAR1340_PCIE_CFG_VAL (SPEAR1340_PCIE_SATA_SEL_PCIE | \ + SPEAR1340_PCIE_CFG_AUX_CLK_EN | \ + SPEAR1340_PCIE_CFG_CORE_CLK_EN | \ + SPEAR1340_PCIE_CFG_POWERUP_RESET | \ + SPEAR1340_PCIE_CFG_DEVICE_PRESENT) +#define SPEAR1340_SATA_CFG_VAL (SPEAR1340_PCIE_SATA_SEL_SATA | \ + SPEAR1340_SATA_CFG_PM_CLK_EN | \ + SPEAR1340_SATA_CFG_POWERUP_RESET | \ + SPEAR1340_SATA_CFG_RX_CLK_EN | \ + SPEAR1340_SATA_CFG_TX_CLK_EN) + +#define SPEAR1340_PCIE_MIPHY_CFG 0x428 +#define SPEAR1340_MIPHY_OSC_BYPASS_EXT (1 << 31) +#define SPEAR1340_MIPHY_CLK_REF_DIV2 (1 << 27) +#define SPEAR1340_MIPHY_CLK_REF_DIV4 (2 << 27) +#define SPEAR1340_MIPHY_CLK_REF_DIV8 (3 << 27) +#define SPEAR1340_MIPHY_PLL_RATIO_TOP (x) (x << 0) +#define SPEAR1340_PCIE_MIPHY_CFG_MASK 0xF80000FF +#define SPEAR1340_PCIE_SATA_MIPHY_CFG_SATA \ + (SPEAR1340_MIPHY_OSC_BYPASS_EXT | \ + SPEAR1340_MIPHY_CLK_REF_DIV2 | \ + SPEAR1340_MIPHY_PLL_RATIO_TOP(60)) +#define SPEAR1340_PCIE_SATA_MIPHY_CFG_SATA_25M_CRYSTAL_CLK \ + (SPEAR1340_MIPHY_PLL_RATIO_TOP(120)) +#define SPEAR1340_PCIE_SATA_MIPHY_CFG_PCIE \ + (SPEAR1340_MIPHY_OSC_BYPASS_EXT | \ + SPEAR1340_MIPHY_PLL_RATIO_TOP(25)) +enum phy_mode {SATA ,PCIE ,
drivers/phy/phy-miphy40lp.c struct st_miphy40lp_priv { · line 96
Quoted 4 lines
drivers/phy/phy-miphy40lp.c +1
-0@@ -38,28 +93,145 @@ struct st_miphy40lp_priv {u32 id; }; +static int spear1340_sata_miphy_init (struct st_miphy40lp_priv *phypriv)
The function name format here differs from what you have already added. It will be good to have consistent name in the file.
Quoted 32 lines
drivers/phy/phy-miphy40lp.c +32
-0+{ +regmap_update_bits (phypriv->misc,SPEAR1340_PCIE_SATA_CFG , +SPEAR1340_PCIE_SATA_CFG_MASK ,SPEAR1340_SATA_CFG_VAL ); +regmap_update_bits (phypriv->misc,SPEAR1340_PCIE_MIPHY_CFG , +SPEAR1340_PCIE_MIPHY_CFG_MASK , +SPEAR1340_PCIE_SATA_MIPHY_CFG_SATA_25M_CRYSTAL_CLK ); +/* Switch on sata power domain */ +regmap_update_bits (phypriv->misc,SPEAR1340_PCM_CFG , +SPEAR1340_PCM_CFG_SATA_POWER_EN , +SPEAR1340_PCM_CFG_SATA_POWER_EN ); +msleep (20 ); +/* Disable PCIE SATA Controller reset */ +regmap_update_bits (phypriv->misc,SPEAR1340_PERIP1_SW_RST , +SPEAR1340_PERIP1_SW_RST_SATA ,0 ); +msleep (20 ); + +return 0 ; +} + +static int spear1340_sata_miphy_exit (struct st_miphy40lp_priv *phypriv) +{ +regmap_update_bits (phypriv->misc,SPEAR1340_PCIE_SATA_CFG , +SPEAR1340_PCIE_SATA_CFG_MASK ,0 ); +regmap_update_bits (phypriv->misc,SPEAR1340_PCIE_MIPHY_CFG , +SPEAR1340_PCIE_MIPHY_CFG_MASK ,0 ); + +/* Enable PCIE SATA Controller reset */ +regmap_update_bits (phypriv->misc,SPEAR1340_PERIP1_SW_RST , +SPEAR1340_PERIP1_SW_RST_SATA , +SPEAR1340_PERIP1_SW_RST_SATA ); +msleep (20 ); +/* Switch off sata power domain */
drivers/phy/phy-miphy40lp.c struct st_miphy40lp_priv { · line 138
Quoted 10 lines
drivers/phy/phy-miphy40lp.c +10
-0+regmap_update_bits (phypriv->misc,SPEAR1340_PCM_CFG , +SPEAR1340_PCM_CFG_SATA_POWER_EN ,0 ); +msleep (20 ); + +return 0 ; +} + +static int sata_miphy_init (struct st_miphy40lp_priv *phypriv) +{ +if (of_device_is_compatible (phypriv->np,"st,spear1340-miphy" ))
This compatible value is a bit confusing since it doesn't have 'sata' in it. spear1340 can have usb phy or pcie phy too no? How do we differentiate it then?
Quoted 104 lines
drivers/phy/phy-miphy40lp.c +78
-4+return spear1340_sata_miphy_init (phypriv); + else + return -EINVAL; +} + +static int sata_miphy_exit (struct st_miphy40lp_priv *phypriv) +{ +if (of_device_is_compatible (phypriv->np,"st,spear1340-miphy" )) +return spear1340_sata_miphy_exit (phypriv); +else +return -EINVAL ; +} + +static int sata_miphy_power_off (struct st_miphy40lp_priv *phypriv) +{ +if (of_device_is_compatible (phypriv->np,"st,spear1340-miphy" )) +return 0 ; +else +return -EINVAL ; +} + +static int sata_miphy_power_on (struct st_miphy40lp_priv *phypriv) +{ +if (of_device_is_compatible (phypriv->np,"st,spear1340-miphy" )) +return 0 ; +else +return -EINVAL ; +} + +static int sata_miphy_suspend (struct st_miphy40lp_priv *phypriv) +{ +if (of_device_is_compatible (phypriv->np,"st,spear1340-miphy" )) +return spear1340_sata_miphy_exit (phypriv); +else +return -EINVAL ; +} + +static int sata_miphy_resume (struct st_miphy40lp_priv *phypriv) +{ +if (of_device_is_compatible (phypriv->np,"st,spear1340-miphy" )) +return spear1340_sata_miphy_init (phypriv); +else +return -EINVAL ; +} +static int miphy40lp_init (struct phy *phy) { -return -EINVAL ; +struct st_miphy40lp_priv *phypriv =phy_get_drvdata (phy); + +switch (phypriv->mode) { +case SATA : +return sata_miphy_init (phypriv); +default : +return -EINVAL ; + } }static int miphy40lp_exit (struct phy *phy) { -return -EINVAL ; +struct st_miphy40lp_priv *phypriv =phy_get_drvdata (phy); + +switch (phypriv->mode) { +case SATA : +return sata_miphy_exit (phypriv); +default : +return -EINVAL ; + } }static int miphy40lp_power_off (struct phy *phy) { -return -EINVAL ; +struct st_miphy40lp_priv *phypriv =phy_get_drvdata (phy); + +switch (phypriv->mode) { +case SATA : +return sata_miphy_power_off (phypriv); +default : +return -EINVAL ; + } }static int miphy40lp_power_on (struct phy *phy) { -return -EINVAL ; +struct st_miphy40lp_priv *phypriv =phy_get_drvdata (phy); + +switch (phypriv->mode) { +case SATA : +return sata_miphy_power_on (phypriv); +default : +return -EINVAL ; + } }static const struct of_device_id st_miphy40lp_of_match[] = { { .compatible ="st,miphy40lp-phy" }, + { .compatible ="st,spear1340-miphy" }, { }, };MODULE_DEVICE_TABLE (of, st_miphy40lp_of_match);
drivers/phy/phy-miphy40lp.c static struct phy_ops st_miphy40lp_ops = { · line 253
Quoted 8 lines
drivers/phy/phy-miphy40lp.c +4
-1@@ -75,12 +247,32 @@ static struct phy_ops st_miphy40lp_ops = {#ifdef CONFIG_PM_SLEEP static int miphy40lp_suspend (struct device *dev) { -return -EINVAL ; +struct st_miphy40lp_priv *phypriv =dev_get_drvdata (dev); + +if (dev->power.power_state.event ==PM_EVENT_FREEZE ) +return 0 ;
I'm not sure if you should be accessing it from the drivers. Will be good to check with PM guys.
Quoted 6 lines
drivers/phy/phy-miphy40lp.c +6
-0+ +switch (phypriv->mode) { +case SATA : +return sata_miphy_suspend (phypriv); +default : +return -EINVAL ;
drivers/phy/phy-miphy40lp.c static struct phy_ops st_miphy40lp_ops = { · line 268
Quoted 10 lines
drivers/phy/phy-miphy40lp.c +5
-1+ } }static int miphy40lp_resume (struct device *dev) { -return -EINVAL ; +struct st_miphy40lp_priv *phypriv =dev_get_drvdata (dev); + +if (dev->power.power_state.event ==PM_EVENT_THAW ) +return 0 ;
Same here.
Thanks
Kishon
Re: [PATCH V4 5/8] SPEAr13xx: Fixup: Move SPEAr1340 SATA platform code to phy driver
Quoted 34 lines · Kishon Vijay Abraham I
Hi,
Quoted 20 lines · Pratyush Anand
ahci driver needs some platform specific functions which are called at init, exit, suspend and resume conditions. Till now these functions were present in a platform driver with a fixme notes.
Similar functions modifying same set of registers will also be needed in case of PCIe phy init/exit.
So move all these SATA platform code to phy-miphy40lp driver.
Signed-off-by Pratyush Anand <[email protected]>Tested-by Mohit Kumar <[email protected]>Cc Viresh Kumar <[email protected]>Cc Tejun Heo <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Kishon Vijay Abraham I <[email protected]>Cc spear-devel at list.st.comCc linux-arm-kernel at lists.infradead.orgCc devicetree at vger.kernel.orgCc linux-ide at vger.kernel.orgCc linux-kernel at vger.kernel.orgQuoted 10 lines
--- .../devicetree/bindings/arm/spear-misc.txt | 4 + arch/arm/boot/dts/spear1310-evb.dts | 4 + arch/arm/boot/dts/spear1310.dtsi | 39 +++- arch/arm/boot/dts/spear1340-evb.dts | 4 + arch/arm/boot/dts/spear1340.dtsi | 13 +- arch/arm/boot/dts/spear13xx.dtsi | 5 + arch/arm/mach-spear/Kconfig | 2 + arch/arm/mach-spear/spear1340.c | 127 +------------ drivers/phy/phy-miphy40lp.c | 204 ++++++++++++++++++++-
Quoted 2 lines
It would be better if you can split this patch. Keep
arch/in separate patch anddrivers/in separate patch.
Code is actually moving from arch to driver. Therefore I kept it in same patch.
Quoted 35 lines
Quoted 3 lines
9 files changed, 266 insertions(+), 136 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/spear-misc.txt.
.
<snip>
.
.Quoted 27 lines
static const char * const spear1340_dt_board_compat[] = {
drivers/phy/phy-miphy40lp.c +11
-0@@ -8,6 +8,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. * +* 04/02/2014: Adding support of SATA mode for SPEAr1340. */ #include <linux/delay.h> @@ -19,6 +20,60 @@#include <linux/phy/phy.h> #include <linux/regmap.h> +/* SPEAr1340 Registers */ +/* Power Management Registers */ +#define SPEAR1340_PCM_CFG 0x100 +#define SPEAR1340_PCM_CFG_SATA_POWER_EN 0x800 +#define SPEAR1340_PCM_WKUP_CFG 0x104 +#define SPEAR1340_SWITCH_CTR 0x108 + +#define SPEAR1340_PERIP1_SW_RST 0x318 +#define SPEAR1340_PERIP1_SW_RST_SATA 0x1000 +#define SPEAR1340_PERIP2_SW_RST 0x31C
Quoted 8 lines
drivers/phy/phy-miphy40lp.c line 38
Quoted 6 lines
drivers/phy/phy-miphy40lp.c +6
-0+#define SPEAR1340_PERIP3_SW_RST 0x320 + +/* PCIE - SATA configuration registers */ +#define SPEAR1340_PCIE_SATA_CFG 0x424 +/* PCIE CFG MASks */ +#define SPEAR1340_PCIE_CFG_DEVICE_PRESENT (1 << 11)use
BIT()wherever possible.
OK.
Quoted 45 lines
Quoted 45 lines
drivers/phy/phy-miphy40lp.c +38
-0+#define SPEAR1340_PCIE_CFG_POWERUP_RESET (1 << 10) +#define SPEAR1340_PCIE_CFG_CORE_CLK_EN (1 << 9) +#define SPEAR1340_PCIE_CFG_AUX_CLK_EN (1 << 8) +#define SPEAR1340_SATA_CFG_TX_CLK_EN (1 << 4) +#define SPEAR1340_SATA_CFG_RX_CLK_EN (1 << 3) +#define SPEAR1340_SATA_CFG_POWERUP_RESET (1 << 2) +#define SPEAR1340_SATA_CFG_PM_CLK_EN (1 << 1) +#define SPEAR1340_PCIE_SATA_SEL_PCIE (0) +#define SPEAR1340_PCIE_SATA_SEL_SATA (1) +#define SPEAR1340_PCIE_SATA_CFG_MASK 0xF1F +#define SPEAR1340_PCIE_CFG_VAL (SPEAR1340_PCIE_SATA_SEL_PCIE | \ + SPEAR1340_PCIE_CFG_AUX_CLK_EN | \ + SPEAR1340_PCIE_CFG_CORE_CLK_EN | \ + SPEAR1340_PCIE_CFG_POWERUP_RESET | \ + SPEAR1340_PCIE_CFG_DEVICE_PRESENT) +#define SPEAR1340_SATA_CFG_VAL (SPEAR1340_PCIE_SATA_SEL_SATA | \ + SPEAR1340_SATA_CFG_PM_CLK_EN | \ + SPEAR1340_SATA_CFG_POWERUP_RESET | \ + SPEAR1340_SATA_CFG_RX_CLK_EN | \ + SPEAR1340_SATA_CFG_TX_CLK_EN) + +#define SPEAR1340_PCIE_MIPHY_CFG 0x428 +#define SPEAR1340_MIPHY_OSC_BYPASS_EXT (1 << 31) +#define SPEAR1340_MIPHY_CLK_REF_DIV2 (1 << 27) +#define SPEAR1340_MIPHY_CLK_REF_DIV4 (2 << 27) +#define SPEAR1340_MIPHY_CLK_REF_DIV8 (3 << 27) +#define SPEAR1340_MIPHY_PLL_RATIO_TOP (x) (x << 0) +#define SPEAR1340_PCIE_MIPHY_CFG_MASK 0xF80000FF +#define SPEAR1340_PCIE_SATA_MIPHY_CFG_SATA \ + (SPEAR1340_MIPHY_OSC_BYPASS_EXT | \ + SPEAR1340_MIPHY_CLK_REF_DIV2 | \ + SPEAR1340_MIPHY_PLL_RATIO_TOP(60)) +#define SPEAR1340_PCIE_SATA_MIPHY_CFG_SATA_25M_CRYSTAL_CLK \ + (SPEAR1340_MIPHY_PLL_RATIO_TOP(120)) +#define SPEAR1340_PCIE_SATA_MIPHY_CFG_PCIE \ + (SPEAR1340_MIPHY_OSC_BYPASS_EXT | \ + SPEAR1340_MIPHY_PLL_RATIO_TOP(25)) +enum phy_mode {SATA ,PCIE ,@@ -38,28 +93,145 @@ struct st_miphy40lp_priv {u32 id; };
Quoted 4 lines
drivers/phy/phy-miphy40lp.c struct st_miphy40lp_priv { · line 96
Quoted 1 line
drivers/phy/phy-miphy40lp.c +1
-0+static int spear1340_sata_miphy_init (struct st_miphy40lp_priv *phypriv)The function name format here differs from what you have already added. It will be good to have consistent name in the file.
You mean to pass "struct phy *phy" in all the internal functions too?
Quoted 37 lines
Quoted 37 lines
drivers/phy/phy-miphy40lp.c +37
-0+{ +regmap_update_bits (phypriv->misc,SPEAR1340_PCIE_SATA_CFG , +SPEAR1340_PCIE_SATA_CFG_MASK ,SPEAR1340_SATA_CFG_VAL ); +regmap_update_bits (phypriv->misc,SPEAR1340_PCIE_MIPHY_CFG , +SPEAR1340_PCIE_MIPHY_CFG_MASK , +SPEAR1340_PCIE_SATA_MIPHY_CFG_SATA_25M_CRYSTAL_CLK ); +/* Switch on sata power domain */ +regmap_update_bits (phypriv->misc,SPEAR1340_PCM_CFG , +SPEAR1340_PCM_CFG_SATA_POWER_EN , +SPEAR1340_PCM_CFG_SATA_POWER_EN ); +msleep (20 ); +/* Disable PCIE SATA Controller reset */ +regmap_update_bits (phypriv->misc,SPEAR1340_PERIP1_SW_RST , +SPEAR1340_PERIP1_SW_RST_SATA ,0 ); +msleep (20 ); + +return 0 ; +} + +static int spear1340_sata_miphy_exit (struct st_miphy40lp_priv *phypriv) +{ +regmap_update_bits (phypriv->misc,SPEAR1340_PCIE_SATA_CFG , +SPEAR1340_PCIE_SATA_CFG_MASK ,0 ); +regmap_update_bits (phypriv->misc,SPEAR1340_PCIE_MIPHY_CFG , +SPEAR1340_PCIE_MIPHY_CFG_MASK ,0 ); + +/* Enable PCIE SATA Controller reset */ +regmap_update_bits (phypriv->misc,SPEAR1340_PERIP1_SW_RST , +SPEAR1340_PERIP1_SW_RST_SATA , +SPEAR1340_PERIP1_SW_RST_SATA ); +msleep (20 ); +/* Switch off sata power domain */ +regmap_update_bits (phypriv->misc,SPEAR1340_PCM_CFG , +SPEAR1340_PCM_CFG_SATA_POWER_EN ,0 ); +msleep (20 ); + +return 0 ;
Quoted 8 lines
drivers/phy/phy-miphy40lp.c struct st_miphy40lp_priv { · line 138
Quoted 5 lines
drivers/phy/phy-miphy40lp.c +5
-0+} + +static int sata_miphy_init (struct st_miphy40lp_priv *phypriv) +{ +if (of_device_is_compatible (phypriv->np,"st,spear1340-miphy" ))This compatible value is a bit confusing since it doesn't have 'sata' in it. spear1340 can have usb phy or pcie phy too no? How do we differentiate it then?
same spear1340 miphy is used for sata as well as for pcie. sata or pcie mode is selected using mode args passed in phys.
Quoted 107 lines
Quoted 107 lines
drivers/phy/phy-miphy40lp.c +78
-4+return spear1340_sata_miphy_init (phypriv); + else + return -EINVAL; +} + +static int sata_miphy_exit (struct st_miphy40lp_priv *phypriv) +{ +if (of_device_is_compatible (phypriv->np,"st,spear1340-miphy" )) +return spear1340_sata_miphy_exit (phypriv); +else +return -EINVAL ; +} + +static int sata_miphy_power_off (struct st_miphy40lp_priv *phypriv) +{ +if (of_device_is_compatible (phypriv->np,"st,spear1340-miphy" )) +return 0 ; +else +return -EINVAL ; +} + +static int sata_miphy_power_on (struct st_miphy40lp_priv *phypriv) +{ +if (of_device_is_compatible (phypriv->np,"st,spear1340-miphy" )) +return 0 ; +else +return -EINVAL ; +} + +static int sata_miphy_suspend (struct st_miphy40lp_priv *phypriv) +{ +if (of_device_is_compatible (phypriv->np,"st,spear1340-miphy" )) +return spear1340_sata_miphy_exit (phypriv); +else +return -EINVAL ; +} + +static int sata_miphy_resume (struct st_miphy40lp_priv *phypriv) +{ +if (of_device_is_compatible (phypriv->np,"st,spear1340-miphy" )) +return spear1340_sata_miphy_init (phypriv); +else +return -EINVAL ; +} +static int miphy40lp_init (struct phy *phy) { -return -EINVAL ; +struct st_miphy40lp_priv *phypriv =phy_get_drvdata (phy); + +switch (phypriv->mode) { +case SATA : +return sata_miphy_init (phypriv); +default : +return -EINVAL ; + } }static int miphy40lp_exit (struct phy *phy) { -return -EINVAL ; +struct st_miphy40lp_priv *phypriv =phy_get_drvdata (phy); + +switch (phypriv->mode) { +case SATA : +return sata_miphy_exit (phypriv); +default : +return -EINVAL ; + } }static int miphy40lp_power_off (struct phy *phy) { -return -EINVAL ; +struct st_miphy40lp_priv *phypriv =phy_get_drvdata (phy); + +switch (phypriv->mode) { +case SATA : +return sata_miphy_power_off (phypriv); +default : +return -EINVAL ; + } }static int miphy40lp_power_on (struct phy *phy) { -return -EINVAL ; +struct st_miphy40lp_priv *phypriv =phy_get_drvdata (phy); + +switch (phypriv->mode) { +case SATA : +return sata_miphy_power_on (phypriv); +default : +return -EINVAL ; + } }static const struct of_device_id st_miphy40lp_of_match[] = { { .compatible ="st,miphy40lp-phy" }, + { .compatible ="st,spear1340-miphy" }, { }, };MODULE_DEVICE_TABLE (of, st_miphy40lp_of_match);@@ -75,12 +247,32 @@ static struct phy_ops st_miphy40lp_ops = {#ifdef CONFIG_PM_SLEEP static int miphy40lp_suspend (struct device *dev) {
Quoted 8 lines
drivers/phy/phy-miphy40lp.c static struct phy_ops st_miphy40lp_ops = { · line 253
Quoted 5 lines
drivers/phy/phy-miphy40lp.c +4
-1-return -EINVAL ; +struct st_miphy40lp_priv *phypriv =dev_get_drvdata (dev); + +if (dev->power.power_state.event ==PM_EVENT_FREEZE ) +return 0 ;I'm not sure if you should be accessing it from the drivers. Will be good to check with PM guys.
+ linux-pm mailing list.
Rgds
Pratyush
Quoted 21 lines
Quoted 6 lines
drivers/phy/phy-miphy40lp.c +6
-0+ +switch (phypriv->mode) { +case SATA : +return sata_miphy_suspend (phypriv); +default : +return -EINVAL ;drivers/phy/phy-miphy40lp.c static struct phy_ops st_miphy40lp_ops = { · line 268
Quoted 10 lines
drivers/phy/phy-miphy40lp.c +5
-1+ } }static int miphy40lp_resume (struct device *dev) { -return -EINVAL ; +struct st_miphy40lp_priv *phypriv =dev_get_drvdata (dev); + +if (dev->power.power_state.event ==PM_EVENT_THAW ) +return 0 ;Same here.
Thanks
Kishon
Re: [PATCH V4 5/8] SPEAr13xx: Fixup: Move SPEAr1340 SATA platform code to phy driver
Hi,
Quoted 132 lines · Pratyush Anand
Quoted 34 lines · Kishon Vijay Abraham I
Hi,
Quoted 20 lines · Pratyush Anand
ahci driver needs some platform specific functions which are called at init, exit, suspend and resume conditions. Till now these functions were present in a platform driver with a fixme notes.
Similar functions modifying same set of registers will also be needed in case of PCIe phy init/exit.
So move all these SATA platform code to phy-miphy40lp driver.
Signed-off-by Pratyush Anand <[email protected]>Tested-by Mohit Kumar <[email protected]>Cc Viresh Kumar <[email protected]>Cc Tejun Heo <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Kishon Vijay Abraham I <[email protected]>Cc spear-devel at list.st.comCc linux-arm-kernel at lists.infradead.orgCc devicetree at vger.kernel.orgCc linux-ide at vger.kernel.orgCc linux-kernel at vger.kernel.orgQuoted 10 lines
--- .../devicetree/bindings/arm/spear-misc.txt | 4 + arch/arm/boot/dts/spear1310-evb.dts | 4 + arch/arm/boot/dts/spear1310.dtsi | 39 +++- arch/arm/boot/dts/spear1340-evb.dts | 4 + arch/arm/boot/dts/spear1340.dtsi | 13 +- arch/arm/boot/dts/spear13xx.dtsi | 5 + arch/arm/mach-spear/Kconfig | 2 + arch/arm/mach-spear/spear1340.c | 127 +------------ drivers/phy/phy-miphy40lp.c | 204 ++++++++++++++++++++-Quoted 2 lines
It would be better if you can split this patch. Keep
arch/in separate patch anddrivers/in separate patch.Code is actually moving from arch to driver. Therefore I kept it in same patch.
Quoted 35 lines
Quoted 3 lines
9 files changed, 266 insertions(+), 136 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/spear-misc.txt.
.
<snip>
.
.Quoted 27 lines
static const char * const spear1340_dt_board_compat[] = {
drivers/phy/phy-miphy40lp.c +11
-0@@ -8,6 +8,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. * +* 04/02/2014: Adding support of SATA mode for SPEAr1340. */ #include <linux/delay.h> @@ -19,6 +20,60 @@#include <linux/phy/phy.h> #include <linux/regmap.h> +/* SPEAr1340 Registers */ +/* Power Management Registers */ +#define SPEAR1340_PCM_CFG 0x100 +#define SPEAR1340_PCM_CFG_SATA_POWER_EN 0x800 +#define SPEAR1340_PCM_WKUP_CFG 0x104 +#define SPEAR1340_SWITCH_CTR 0x108 + +#define SPEAR1340_PERIP1_SW_RST 0x318 +#define SPEAR1340_PERIP1_SW_RST_SATA 0x1000 +#define SPEAR1340_PERIP2_SW_RST 0x31CQuoted 8 lines
drivers/phy/phy-miphy40lp.c line 38
Quoted 6 lines
drivers/phy/phy-miphy40lp.c +6
-0+#define SPEAR1340_PERIP3_SW_RST 0x320 + +/* PCIE - SATA configuration registers */ +#define SPEAR1340_PCIE_SATA_CFG 0x424 +/* PCIE CFG MASks */ +#define SPEAR1340_PCIE_CFG_DEVICE_PRESENT (1 << 11)use
BIT()wherever possible.OK.
Quoted 45 lines
Quoted 45 lines
drivers/phy/phy-miphy40lp.c +38
-0+#define SPEAR1340_PCIE_CFG_POWERUP_RESET (1 << 10) +#define SPEAR1340_PCIE_CFG_CORE_CLK_EN (1 << 9) +#define SPEAR1340_PCIE_CFG_AUX_CLK_EN (1 << 8) +#define SPEAR1340_SATA_CFG_TX_CLK_EN (1 << 4) +#define SPEAR1340_SATA_CFG_RX_CLK_EN (1 << 3) +#define SPEAR1340_SATA_CFG_POWERUP_RESET (1 << 2) +#define SPEAR1340_SATA_CFG_PM_CLK_EN (1 << 1) +#define SPEAR1340_PCIE_SATA_SEL_PCIE (0) +#define SPEAR1340_PCIE_SATA_SEL_SATA (1) +#define SPEAR1340_PCIE_SATA_CFG_MASK 0xF1F +#define SPEAR1340_PCIE_CFG_VAL (SPEAR1340_PCIE_SATA_SEL_PCIE | \ + SPEAR1340_PCIE_CFG_AUX_CLK_EN | \ + SPEAR1340_PCIE_CFG_CORE_CLK_EN | \ + SPEAR1340_PCIE_CFG_POWERUP_RESET | \ + SPEAR1340_PCIE_CFG_DEVICE_PRESENT) +#define SPEAR1340_SATA_CFG_VAL (SPEAR1340_PCIE_SATA_SEL_SATA | \ + SPEAR1340_SATA_CFG_PM_CLK_EN | \ + SPEAR1340_SATA_CFG_POWERUP_RESET | \ + SPEAR1340_SATA_CFG_RX_CLK_EN | \ + SPEAR1340_SATA_CFG_TX_CLK_EN) + +#define SPEAR1340_PCIE_MIPHY_CFG 0x428 +#define SPEAR1340_MIPHY_OSC_BYPASS_EXT (1 << 31) +#define SPEAR1340_MIPHY_CLK_REF_DIV2 (1 << 27) +#define SPEAR1340_MIPHY_CLK_REF_DIV4 (2 << 27) +#define SPEAR1340_MIPHY_CLK_REF_DIV8 (3 << 27) +#define SPEAR1340_MIPHY_PLL_RATIO_TOP (x) (x << 0) +#define SPEAR1340_PCIE_MIPHY_CFG_MASK 0xF80000FF +#define SPEAR1340_PCIE_SATA_MIPHY_CFG_SATA \ + (SPEAR1340_MIPHY_OSC_BYPASS_EXT | \ + SPEAR1340_MIPHY_CLK_REF_DIV2 | \ + SPEAR1340_MIPHY_PLL_RATIO_TOP(60)) +#define SPEAR1340_PCIE_SATA_MIPHY_CFG_SATA_25M_CRYSTAL_CLK \ + (SPEAR1340_MIPHY_PLL_RATIO_TOP(120)) +#define SPEAR1340_PCIE_SATA_MIPHY_CFG_PCIE \ + (SPEAR1340_MIPHY_OSC_BYPASS_EXT | \ + SPEAR1340_MIPHY_PLL_RATIO_TOP(25)) +enum phy_mode {SATA ,PCIE ,@@ -38,28 +93,145 @@ struct st_miphy40lp_priv {u32 id; };
Quoted 6 lines
Quoted 4 lines
drivers/phy/phy-miphy40lp.c struct st_miphy40lp_priv { · line 96
Quoted 1 line
drivers/phy/phy-miphy40lp.c +1
-0+static int spear1340_sata_miphy_init (struct st_miphy40lp_priv *phypriv)The function name format here differs from what you have already added. It will be good to have consistent name in the file.
You mean to pass "struct phy *phy" in all the internal functions too?
No. I meant let all the function names begin with miphy40lp_.
Quoted 47 lines
Quoted 38 lines
Quoted 38 lines
drivers/phy/phy-miphy40lp.c +37
-0+{ +regmap_update_bits (phypriv->misc,SPEAR1340_PCIE_SATA_CFG , +SPEAR1340_PCIE_SATA_CFG_MASK ,SPEAR1340_SATA_CFG_VAL ); +regmap_update_bits (phypriv->misc,SPEAR1340_PCIE_MIPHY_CFG , +SPEAR1340_PCIE_MIPHY_CFG_MASK , +SPEAR1340_PCIE_SATA_MIPHY_CFG_SATA_25M_CRYSTAL_CLK ); +/* Switch on sata power domain */ +regmap_update_bits (phypriv->misc,SPEAR1340_PCM_CFG , +SPEAR1340_PCM_CFG_SATA_POWER_EN , +SPEAR1340_PCM_CFG_SATA_POWER_EN ); +msleep (20 ); +/* Disable PCIE SATA Controller reset */ +regmap_update_bits (phypriv->misc,SPEAR1340_PERIP1_SW_RST , +SPEAR1340_PERIP1_SW_RST_SATA ,0 ); +msleep (20 ); + +return 0 ; +} + +static int spear1340_sata_miphy_exit (struct st_miphy40lp_priv *phypriv) +{ +regmap_update_bits (phypriv->misc,SPEAR1340_PCIE_SATA_CFG , +SPEAR1340_PCIE_SATA_CFG_MASK ,0 ); +regmap_update_bits (phypriv->misc,SPEAR1340_PCIE_MIPHY_CFG , +SPEAR1340_PCIE_MIPHY_CFG_MASK ,0 ); + +/* Enable PCIE SATA Controller reset */ +regmap_update_bits (phypriv->misc,SPEAR1340_PERIP1_SW_RST , +SPEAR1340_PERIP1_SW_RST_SATA , +SPEAR1340_PERIP1_SW_RST_SATA ); +msleep (20 ); +/* Switch off sata power domain */ +regmap_update_bits (phypriv->misc,SPEAR1340_PCM_CFG , +SPEAR1340_PCM_CFG_SATA_POWER_EN ,0 ); +msleep (20 ); + +return 0 ;Quoted 8 lines
drivers/phy/phy-miphy40lp.c struct st_miphy40lp_priv { · line 138
Quoted 5 lines
drivers/phy/phy-miphy40lp.c +5
-0+} + +static int sata_miphy_init (struct st_miphy40lp_priv *phypriv) +{ +if (of_device_is_compatible (phypriv->np,"st,spear1340-miphy" ))This compatible value is a bit confusing since it doesn't have 'sata' in it. spear1340 can have usb phy or pcie phy too no? How do we differentiate it then?
Quoted 2 lines
same spear1340 miphy is used for sata as well as for pcie. sata or pcie mode is selected using mode args passed in phys.
Alright. Got it while reading the next patch ;-)
Thanks
Kishon
Re: [PATCH V4 5/8] SPEAr13xx: Fixup: Move SPEAr1340 SATA platform code to phy driver
Quoted 135 lines · Kishon Vijay Abraham I
Hi,
Quoted 132 lines · Pratyush Anand
Quoted 34 lines · Kishon Vijay Abraham I
Hi,
Quoted 20 lines · Pratyush Anand
ahci driver needs some platform specific functions which are called at init, exit, suspend and resume conditions. Till now these functions were present in a platform driver with a fixme notes.
Similar functions modifying same set of registers will also be needed in case of PCIe phy init/exit.
So move all these SATA platform code to phy-miphy40lp driver.
Signed-off-by Pratyush Anand <[email protected]>Tested-by Mohit Kumar <[email protected]>Cc Viresh Kumar <[email protected]>Cc Tejun Heo <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Kishon Vijay Abraham I <[email protected]>Cc spear-devel at list.st.comCc linux-arm-kernel at lists.infradead.orgCc devicetree at vger.kernel.orgCc linux-ide at vger.kernel.orgCc linux-kernel at vger.kernel.orgQuoted 10 lines
--- .../devicetree/bindings/arm/spear-misc.txt | 4 + arch/arm/boot/dts/spear1310-evb.dts | 4 + arch/arm/boot/dts/spear1310.dtsi | 39 +++- arch/arm/boot/dts/spear1340-evb.dts | 4 + arch/arm/boot/dts/spear1340.dtsi | 13 +- arch/arm/boot/dts/spear13xx.dtsi | 5 + arch/arm/mach-spear/Kconfig | 2 + arch/arm/mach-spear/spear1340.c | 127 +------------ drivers/phy/phy-miphy40lp.c | 204 ++++++++++++++++++++-Quoted 2 lines
It would be better if you can split this patch. Keep
arch/in separate patch anddrivers/in separate patch.Code is actually moving from arch to driver. Therefore I kept it in same patch.
Quoted 35 lines
Quoted 3 lines
9 files changed, 266 insertions(+), 136 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/spear-misc.txt.
.
<snip>
.
.Quoted 27 lines
static const char * const spear1340_dt_board_compat[] = {
drivers/phy/phy-miphy40lp.c +11
-0@@ -8,6 +8,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. * +* 04/02/2014: Adding support of SATA mode for SPEAr1340. */ #include <linux/delay.h> @@ -19,6 +20,60 @@#include <linux/phy/phy.h> #include <linux/regmap.h> +/* SPEAr1340 Registers */ +/* Power Management Registers */ +#define SPEAR1340_PCM_CFG 0x100 +#define SPEAR1340_PCM_CFG_SATA_POWER_EN 0x800 +#define SPEAR1340_PCM_WKUP_CFG 0x104 +#define SPEAR1340_SWITCH_CTR 0x108 + +#define SPEAR1340_PERIP1_SW_RST 0x318 +#define SPEAR1340_PERIP1_SW_RST_SATA 0x1000 +#define SPEAR1340_PERIP2_SW_RST 0x31CQuoted 8 lines
drivers/phy/phy-miphy40lp.c line 38
Quoted 6 lines
drivers/phy/phy-miphy40lp.c +6
-0+#define SPEAR1340_PERIP3_SW_RST 0x320 + +/* PCIE - SATA configuration registers */ +#define SPEAR1340_PCIE_SATA_CFG 0x424 +/* PCIE CFG MASks */ +#define SPEAR1340_PCIE_CFG_DEVICE_PRESENT (1 << 11)use
BIT()wherever possible.OK.
Quoted 45 lines
Quoted 45 lines
drivers/phy/phy-miphy40lp.c +38
-0+#define SPEAR1340_PCIE_CFG_POWERUP_RESET (1 << 10) +#define SPEAR1340_PCIE_CFG_CORE_CLK_EN (1 << 9) +#define SPEAR1340_PCIE_CFG_AUX_CLK_EN (1 << 8) +#define SPEAR1340_SATA_CFG_TX_CLK_EN (1 << 4) +#define SPEAR1340_SATA_CFG_RX_CLK_EN (1 << 3) +#define SPEAR1340_SATA_CFG_POWERUP_RESET (1 << 2) +#define SPEAR1340_SATA_CFG_PM_CLK_EN (1 << 1) +#define SPEAR1340_PCIE_SATA_SEL_PCIE (0) +#define SPEAR1340_PCIE_SATA_SEL_SATA (1) +#define SPEAR1340_PCIE_SATA_CFG_MASK 0xF1F +#define SPEAR1340_PCIE_CFG_VAL (SPEAR1340_PCIE_SATA_SEL_PCIE | \ + SPEAR1340_PCIE_CFG_AUX_CLK_EN | \ + SPEAR1340_PCIE_CFG_CORE_CLK_EN | \ + SPEAR1340_PCIE_CFG_POWERUP_RESET | \ + SPEAR1340_PCIE_CFG_DEVICE_PRESENT) +#define SPEAR1340_SATA_CFG_VAL (SPEAR1340_PCIE_SATA_SEL_SATA | \ + SPEAR1340_SATA_CFG_PM_CLK_EN | \ + SPEAR1340_SATA_CFG_POWERUP_RESET | \ + SPEAR1340_SATA_CFG_RX_CLK_EN | \ + SPEAR1340_SATA_CFG_TX_CLK_EN) + +#define SPEAR1340_PCIE_MIPHY_CFG 0x428 +#define SPEAR1340_MIPHY_OSC_BYPASS_EXT (1 << 31) +#define SPEAR1340_MIPHY_CLK_REF_DIV2 (1 << 27) +#define SPEAR1340_MIPHY_CLK_REF_DIV4 (2 << 27) +#define SPEAR1340_MIPHY_CLK_REF_DIV8 (3 << 27) +#define SPEAR1340_MIPHY_PLL_RATIO_TOP (x) (x << 0) +#define SPEAR1340_PCIE_MIPHY_CFG_MASK 0xF80000FF +#define SPEAR1340_PCIE_SATA_MIPHY_CFG_SATA \ + (SPEAR1340_MIPHY_OSC_BYPASS_EXT | \ + SPEAR1340_MIPHY_CLK_REF_DIV2 | \ + SPEAR1340_MIPHY_PLL_RATIO_TOP(60)) +#define SPEAR1340_PCIE_SATA_MIPHY_CFG_SATA_25M_CRYSTAL_CLK \ + (SPEAR1340_MIPHY_PLL_RATIO_TOP(120)) +#define SPEAR1340_PCIE_SATA_MIPHY_CFG_PCIE \ + (SPEAR1340_MIPHY_OSC_BYPASS_EXT | \ + SPEAR1340_MIPHY_PLL_RATIO_TOP(25)) +enum phy_mode {SATA ,PCIE ,@@ -38,28 +93,145 @@ struct st_miphy40lp_priv {u32 id; };
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
drivers/phy/phy-miphy40lp.c struct st_miphy40lp_priv { · line 96
Quoted 1 line
drivers/phy/phy-miphy40lp.c +1
-0+static int spear1340_sata_miphy_init (struct st_miphy40lp_priv *phypriv)The function name format here differs from what you have already added. It will be good to have consistent name in the file.
You mean to pass "struct phy *phy" in all the internal functions too?
No. I meant let all the function names begin with
miphy40lp_.
okkk.. miphy40lp_spear1340_sata_init looks better :)
Rgds
Pratyush
PATCH v4 6/8 phy: st-miphy-40lp: Add SPEAr1310 and SPEAr1340 PCIe phy support
In reply to Pratyush AnandSPEAr1310 and SPEAr1340 uses miphy40lp phy for PCIe. This driver adds support for the same.
--- drivers/phy/phy-miphy40lp.c | 178 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 178 insertions(+)
drivers/phy/phy-miphy40lp.c +178 -0
@@ -9,6 +9,7 @@* published by the Free Software Foundation. * * 04/02/2014: Adding support of SATA mode for SPEAr1340. +* 04/02/2014: Adding support of PCIe mode for SPEAr1340 and SPEAr1310 */ #include <linux/delay.h>
@@ -73,6 +74,80 @@#define SPEAR1340_PCIE_SATA_MIPHY_CFG_PCIE \ (SPEAR1340_MIPHY_OSC_BYPASS_EXT | \ SPEAR1340_MIPHY_PLL_RATIO_TOP(25)) +/* SPEAr1310 Registers */ +#define SPEAR1310_PCIE_SATA_CFG 0x3A4 +#define SPEAR1310_PCIE_SATA2_SEL_PCIE (0 << 31) +#define SPEAR1310_PCIE_SATA1_SEL_PCIE (0 << 30) +#define SPEAR1310_PCIE_SATA0_SEL_PCIE (0 << 29) +#define SPEAR1310_PCIE_SATA2_SEL_SATA (1 << 31) +#define SPEAR1310_PCIE_SATA1_SEL_SATA (1 << 30) +#define SPEAR1310_PCIE_SATA0_SEL_SATA (1 << 29) +#define SPEAR1310_SATA2_CFG_TX_CLK_EN (1 << 27) +#define SPEAR1310_SATA2_CFG_RX_CLK_EN (1 << 26) +#define SPEAR1310_SATA2_CFG_POWERUP_RESET (1 << 25) +#define SPEAR1310_SATA2_CFG_PM_CLK_EN (1 << 24) +#define SPEAR1310_SATA1_CFG_TX_CLK_EN (1 << 23) +#define SPEAR1310_SATA1_CFG_RX_CLK_EN (1 << 22) +#define SPEAR1310_SATA1_CFG_POWERUP_RESET (1 << 21) +#define SPEAR1310_SATA1_CFG_PM_CLK_EN (1 << 20) +#define SPEAR1310_SATA0_CFG_TX_CLK_EN (1 << 19) +#define SPEAR1310_SATA0_CFG_RX_CLK_EN (1 << 18) +#define SPEAR1310_SATA0_CFG_POWERUP_RESET (1 << 17) +#define SPEAR1310_SATA0_CFG_PM_CLK_EN (1 << 16) +#define SPEAR1310_PCIE2_CFG_DEVICE_PRESENT (1 << 11) +#define SPEAR1310_PCIE2_CFG_POWERUP_RESET (1 << 10) +#define SPEAR1310_PCIE2_CFG_CORE_CLK_EN (1 << 9) +#define SPEAR1310_PCIE2_CFG_AUX_CLK_EN (1 << 8) +#define SPEAR1310_PCIE1_CFG_DEVICE_PRESENT (1 << 7) +#define SPEAR1310_PCIE1_CFG_POWERUP_RESET (1 << 6) +#define SPEAR1310_PCIE1_CFG_CORE_CLK_EN (1 << 5) +#define SPEAR1310_PCIE1_CFG_AUX_CLK_EN (1 << 4) +#define SPEAR1310_PCIE0_CFG_DEVICE_PRESENT (1 << 3) +#define SPEAR1310_PCIE0_CFG_POWERUP_RESET (1 << 2) +#define SPEAR1310_PCIE0_CFG_CORE_CLK_EN (1 << 1) +#define SPEAR1310_PCIE0_CFG_AUX_CLK_EN (1 << 0) + +#define SPEAR1310_PCIE_CFG_MASK (x) ((0xF << (x * 4)) | (1 << (x + 29))) +#define SPEAR1310_SATA_CFG_MASK (x) ((0xF << (x * 4 + 16)) | \ + (1 << (x + 29))) +#define SPEAR1310_PCIE_CFG_VAL (x) \ + (SPEAR1310_PCIE_SATA##x##_SEL_PCIE | \ + SPEAR1310_PCIE##x##_CFG_AUX_CLK_EN | \ + SPEAR1310_PCIE##x##_CFG_CORE_CLK_EN | \ + SPEAR1310_PCIE##x##_CFG_POWERUP_RESET | \ + SPEAR1310_PCIE##x##_CFG_DEVICE_PRESENT) +#define SPEAR1310_SATA_CFG_VAL (x) \ + (SPEAR1310_PCIE_SATA##x##_SEL_SATA | \ + SPEAR1310_SATA##x##_CFG_PM_CLK_EN | \ + SPEAR1310_SATA##x##_CFG_POWERUP_RESET | \ + SPEAR1310_SATA##x##_CFG_RX_CLK_EN | \ + SPEAR1310_SATA##x##_CFG_TX_CLK_EN) + +#define SPEAR1310_PCIE_MIPHY_CFG_1 0x3A8 +#define SPEAR1310_MIPHY_DUAL_OSC_BYPASS_EXT (1 << 31) +#define SPEAR1310_MIPHY_DUAL_CLK_REF_DIV2 (1 << 28) +#define SPEAR1310_MIPHY_DUAL_PLL_RATIO_TOP (x) (x << 16) +#define SPEAR1310_MIPHY_SINGLE_OSC_BYPASS_EXT (1 << 15) +#define SPEAR1310_MIPHY_SINGLE_CLK_REF_DIV2 (1 << 12) +#define SPEAR1310_MIPHY_SINGLE_PLL_RATIO_TOP (x) (x << 0) +#define SPEAR1310_PCIE_SATA_MIPHY_CFG_SATA_MASK (0xFFFF) +#define SPEAR1310_PCIE_SATA_MIPHY_CFG_PCIE_MASK (0xFFFF << 16) +#define SPEAR1310_PCIE_SATA_MIPHY_CFG_SATA \ + (SPEAR1310_MIPHY_DUAL_OSC_BYPASS_EXT | \ + SPEAR1310_MIPHY_DUAL_CLK_REF_DIV2 | \ + SPEAR1310_MIPHY_DUAL_PLL_RATIO_TOP(60) | \ + SPEAR1310_MIPHY_SINGLE_OSC_BYPASS_EXT | \ + SPEAR1310_MIPHY_SINGLE_CLK_REF_DIV2 | \ + SPEAR1310_MIPHY_SINGLE_PLL_RATIO_TOP(60)) +#define SPEAR1310_PCIE_SATA_MIPHY_CFG_SATA_25M_CRYSTAL_CLK \ + (SPEAR1310_MIPHY_SINGLE_PLL_RATIO_TOP(120)) +#define SPEAR1310_PCIE_SATA_MIPHY_CFG_PCIE \ + (SPEAR1310_MIPHY_DUAL_OSC_BYPASS_EXT | \ + SPEAR1310_MIPHY_DUAL_PLL_RATIO_TOP(25) | \ + SPEAR1310_MIPHY_SINGLE_OSC_BYPASS_EXT | \ + SPEAR1310_MIPHY_SINGLE_PLL_RATIO_TOP(25)) + +#define SPEAR1310_PCIE_MIPHY_CFG_2 0x3ACenum phy_mode {SATA ,
@@ -181,6 +256,104 @@ static int sata_miphy_resume(struct st_miphy40lp_priv *phypriv)return -EINVAL ; } +static int spear1340_pcie_miphy_init (struct st_miphy40lp_priv *phypriv) +{ +regmap_update_bits (phypriv->misc,SPEAR1340_PCIE_MIPHY_CFG , +SPEAR1340_PCIE_MIPHY_CFG_MASK , +SPEAR1340_PCIE_SATA_MIPHY_CFG_PCIE ); +regmap_update_bits (phypriv->misc,SPEAR1340_PCIE_SATA_CFG , +SPEAR1340_PCIE_SATA_CFG_MASK ,SPEAR1340_PCIE_CFG_VAL ); + +return 0 ; +} + +static int spear1340_pcie_miphy_exit (struct st_miphy40lp_priv *phypriv) +{ +regmap_update_bits (phypriv->misc,SPEAR1340_PCIE_MIPHY_CFG , +SPEAR1340_PCIE_MIPHY_CFG_MASK ,0 ); +regmap_update_bits (phypriv->misc,SPEAR1340_PCIE_SATA_CFG , +SPEAR1340_PCIE_SATA_CFG_MASK ,0 ); + +return 0 ; +} + +static int spear1310_pcie_miphy_init (struct st_miphy40lp_priv *phypriv) +{ +u32 mask, val; + +regmap_update_bits (phypriv->misc,SPEAR1310_PCIE_MIPHY_CFG_1 , +SPEAR1310_PCIE_SATA_MIPHY_CFG_PCIE_MASK , +SPEAR1310_PCIE_SATA_MIPHY_CFG_PCIE ); + +switch (phypriv->id) { +case 0 : + mask =SPEAR1310_PCIE_CFG_MASK (0 ); + val =SPEAR1310_PCIE_CFG_VAL (0 ); +break ; +case 1 : + mask =SPEAR1310_PCIE_CFG_MASK (1 ); + val =SPEAR1310_PCIE_CFG_VAL (1 ); +break ; +case 2 : + mask =SPEAR1310_PCIE_CFG_MASK (2 ); + val =SPEAR1310_PCIE_CFG_VAL (2 ); +break ; +default : +return -EINVAL ; + } + +regmap_update_bits (phypriv->misc,SPEAR1310_PCIE_SATA_CFG , mask, val); + +return 0 ; +} + +static int spear1310_pcie_miphy_exit (struct st_miphy40lp_priv *phypriv) +{ +u32 mask; + +switch (phypriv->id) { +case 0 : + mask =SPEAR1310_PCIE_CFG_MASK (0 ); +break ; +case 1 : + mask =SPEAR1310_PCIE_CFG_MASK (1 ); +break ; +case 2 : + mask =SPEAR1310_PCIE_CFG_MASK (2 ); +break ; +default : +return -EINVAL ; + } + +regmap_update_bits (phypriv->misc,SPEAR1310_PCIE_SATA_CFG , +SPEAR1310_PCIE_CFG_MASK (phypriv->id),0 ); + +regmap_update_bits (phypriv->misc,SPEAR1310_PCIE_MIPHY_CFG_1 , +SPEAR1310_PCIE_SATA_MIPHY_CFG_PCIE_MASK ,0 ); + +return 0 ; +} + +static int pcie_miphy_init (struct st_miphy40lp_priv *phypriv) +{ +if (of_device_is_compatible (phypriv->np,"st,spear1340-miphy" )) +return spear1340_pcie_miphy_init (phypriv); +else if (of_device_is_compatible (phypriv->np,"st,spear1310-miphy" )) +return spear1310_pcie_miphy_init (phypriv); +else +return -EINVAL ; +} + +static int pcie_miphy_exit (struct st_miphy40lp_priv *phypriv) +{ +if (of_device_is_compatible (phypriv->np,"st,spear1340-miphy" )) +return spear1340_pcie_miphy_exit (phypriv); +else if (of_device_is_compatible (phypriv->np,"st,spear1310-miphy" )) +return spear1310_pcie_miphy_exit (phypriv); +else +return -EINVAL ; +} +static int miphy40lp_init (struct phy *phy) {struct st_miphy40lp_priv *phypriv =phy_get_drvdata (phy);
@@ -188,6 +361,8 @@ static int miphy40lp_init(struct phy *phy)switch (phypriv->mode) {case SATA :return sata_miphy_init (phypriv); +case PCIE : +return pcie_miphy_init (phypriv);default :return -EINVAL ; }
@@ -200,6 +375,8 @@ static int miphy40lp_exit(struct phy *phy)switch (phypriv->mode) {case SATA :return sata_miphy_exit (phypriv); +case PCIE : +return pcie_miphy_exit (phypriv);default :return -EINVAL ; }
@@ -232,6 +409,7 @@ static int miphy40lp_power_on(struct phy *phy)static const struct of_device_id st_miphy40lp_of_match[] = { { .compatible ="st,miphy40lp-phy" }, { .compatible ="st,spear1340-miphy" }, + { .compatible ="st,spear1310-miphy" }, { }, };MODULE_DEVICE_TABLE (of, st_miphy40lp_of_match);
Signature · 1 line
1.8.1.2
Re: [PATCH V4 6/8] phy: st-miphy-40lp: Add SPEAr1310 and SPEAr1340 PCIe phy support
Quoted 16 lines · Pratyush Anand
drivers/phy/phy-miphy40lp.c +16
-0+static int spear1310_pcie_miphy_exit (struct st_miphy40lp_priv *phypriv) +{ +u32 mask; + +switch (phypriv->id) { +case 0 : + mask =SPEAR1310_PCIE_CFG_MASK (0 ); +break ; +case 1 : + mask =SPEAR1310_PCIE_CFG_MASK (1 ); +break ; +case 2 : + mask =SPEAR1310_PCIE_CFG_MASK (2 ); +break ; +default : +return -EINVAL ;
drivers/phy/phy-miphy40lp.c static int sata_miphy_resume(struct st_miphy40lp_priv *phypriv) · line 335
Quoted 10 lines
drivers/phy/phy-miphy40lp.c +10
-0+ } + +regmap_update_bits (phypriv->misc,SPEAR1310_PCIE_SATA_CFG , +SPEAR1310_PCIE_CFG_MASK (phypriv->id),0 ); + +regmap_update_bits (phypriv->misc,SPEAR1310_PCIE_MIPHY_CFG_1 , +SPEAR1310_PCIE_SATA_MIPHY_CFG_PCIE_MASK ,0 ); + +return 0 ; +}
hmm, you set the mask based on the id, but then use the macro below and ignore the mask?
Quoted 10 lines
drivers/phy/phy-miphy40lp.c +10
-0+ +static int pcie_miphy_init (struct st_miphy40lp_priv *phypriv) +{ +if (of_device_is_compatible (phypriv->np,"st,spear1340-miphy" )) +return spear1340_pcie_miphy_init (phypriv); +else if (of_device_is_compatible (phypriv->np,"st,spear1310-miphy" )) +return spear1310_pcie_miphy_init (phypriv); +else +return -EINVAL ; +}
drivers/phy/phy-miphy40lp.c static int sata_miphy_resume(struct st_miphy40lp_priv *phypriv) · line 355
Quoted 10 lines
drivers/phy/phy-miphy40lp.c +10
-0+ +static int pcie_miphy_exit (struct st_miphy40lp_priv *phypriv) +{ +if (of_device_is_compatible (phypriv->np,"st,spear1340-miphy" )) +return spear1340_pcie_miphy_exit (phypriv); +else if (of_device_is_compatible (phypriv->np,"st,spear1310-miphy" )) +return spear1310_pcie_miphy_exit (phypriv); +else +return -EINVAL ; +}
I think it's better to make this code table-driven. Rather than checking 'of_device_is_compatible()', it's much easier to add a .data field to the of_device_id array that describes the PHY. You can use .data to point to a structure containing per-device function pointers or (better) values and offsets to be used.
Arnd
Re: [PATCH V4 6/8] phy: st-miphy-40lp: Add SPEAr1310 and SPEAr1340 PCIe phy support
Hi Arnd,
Quoted 22 lines · Arnd Bergmann
Quoted 21 lines · Pratyush Anand
drivers/phy/phy-miphy40lp.c +21
-0+static int spear1310_pcie_miphy_exit (struct st_miphy40lp_priv *phypriv) +{ +u32 mask; + +switch (phypriv->id) { +case 0 : + mask =SPEAR1310_PCIE_CFG_MASK (0 ); +break ; +case 1 : + mask =SPEAR1310_PCIE_CFG_MASK (1 ); +break ; +case 2 : + mask =SPEAR1310_PCIE_CFG_MASK (2 ); +break ; +default : +return -EINVAL ; + } + +regmap_update_bits (phypriv->misc,SPEAR1310_PCIE_SATA_CFG , +SPEAR1310_PCIE_CFG_MASK (phypriv->id),0 ); +
Quoted 8 lines
drivers/phy/phy-miphy40lp.c static int sata_miphy_resume(struct st_miphy40lp_priv *phypriv) · line 335
Quoted 5 lines
drivers/phy/phy-miphy40lp.c +5
-0+regmap_update_bits (phypriv->misc,SPEAR1310_PCIE_MIPHY_CFG_1 , +SPEAR1310_PCIE_SATA_MIPHY_CFG_PCIE_MASK ,0 ); + +return 0 ; +}hmm, you set the mask based on the id, but then use the macro below and ignore the mask?
Blunder, no need of switch case here :(
Will correct.
Quoted 19 lines
Quoted 19 lines
drivers/phy/phy-miphy40lp.c +18
-0+ +static int pcie_miphy_init (struct st_miphy40lp_priv *phypriv) +{ +if (of_device_is_compatible (phypriv->np,"st,spear1340-miphy" )) +return spear1340_pcie_miphy_init (phypriv); +else if (of_device_is_compatible (phypriv->np,"st,spear1310-miphy" )) +return spear1310_pcie_miphy_init (phypriv); +else +return -EINVAL ; +} + +static int pcie_miphy_exit (struct st_miphy40lp_priv *phypriv) +{ +if (of_device_is_compatible (phypriv->np,"st,spear1340-miphy" )) +return spear1340_pcie_miphy_exit (phypriv); +else if (of_device_is_compatible (phypriv->np,"st,spear1310-miphy" )) +return spear1310_pcie_miphy_exit (phypriv); +else
Quoted 8 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ return -EINVAL; +}I think it's better to make this code table-driven. Rather than checking '
of_device_is_compatible()', it's much easier to add a .data field to theof_device_idarray that describes the PHY. You can use .data to point to a structure containing per-device function pointers or (better) values and offsets to be used.
Sounds a better idea. will reduce code size a lot. Thanks.
Regards
Pratyush
Quoted 2 lines
Arnd
Re: [PATCH V4 6/8] phy: st-miphy-40lp: Add SPEAr1310 and SPEAr1340 PCIe phy support
Hi Arnd,
Quoted 5 lines · Pratyush ANAND
Hi Arnd,
Quoted 2 lines · Arnd Bergmann
On Thursday 06 February 2014, Pratyush Anand wrote:
[...]
Quoted 5 lines
Quoted 5 lines
I think it's better to make this code table-driven. Rather than checking '
of_device_is_compatible()', it's much easier to add a .data field to theof_device_idarray that describes the PHY. You can use .data to point to a structure containing per-device function pointers or (better) values and offsets to be used.
values and offset would be good as long as we do not need to write on conditional read status. In our case its OK, as we do not need to write conditionally. But, would it be a good idea to go that way?
Regards
Pratyush
Quoted 8 lines
Sounds a better idea. will reduce code size a lot. Thanks.
Regards
PratyushQuoted 2 lines
Arnd
PATCH v4 7/8 pcie: SPEAr13xx: Add designware pcie support
In reply to Pratyush AnandSPEAr1310 and SPEAr1340 SOC uses designware PCIe controller. Add SPEAr13xx PCIe driver based on designware controller driver.
SPEAr1310 has 3 PCIe ports and SPEAr1340 has 1, which are multiplexed with ahci/sata pins. By default evaluation board of both controller works for ahci mode.
To use these patches on SPEAr1340/1310 evaluation board, do the necessary modifications on board and enable (okay) pcie and miphy from respective evb dtsi file.
--- .../devicetree/bindings/pci/spear13xx-pcie.txt | 7 + arch/arm/boot/dts/spear1310.dtsi | 57 +++ arch/arm/boot/dts/spear1340.dtsi | 19 + arch/arm/boot/dts/spear13xx.dtsi | 5 +- arch/arm/configs/spear13xx_defconfig | 2 + arch/arm/mach-spear/Kconfig | 1 + drivers/pci/host/Kconfig | 5 + drivers/pci/host/Makefile | 1 + drivers/pci/host/pcie-spear13xx.c | 414 +++++++++++++++++++++ 9 files changed, 509 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/pci/spear13xx-pcie.txt create mode 100644 drivers/pci/host/pcie-spear13xx.c
Documentation/devicetree/bindings/pci/spear13xx-pcie.txt new file +7 -0
@@ -0,0 +1,7 @@ +Required properties: +- compatible : should be "st,spear1340-pcie", "snps,dw-pcie". +- pcie_is_gen1: pass <1> if forced gen1 initialization is needed to work with + some buggy cards else pass <0>. +- phys : phandle to phy node associated with pcie controller +- phy-names : must be "pcie-phy" +- All other definitions as per generic PCI bindings
arch/arm/boot/dts/spear1310.dtsi +57 -0
63 lines not on this page · raw message
arch/arm/boot/dts/spear1340.dtsi +19 -0
@@ -49,6 +49,25 @@ status = "disabled"; }; + pcie0: pcie@b1000000 { + compatible = "st,spear1340-pcie", "snps,dw-pcie"; + reg = <0xb1000000 0x4000>; + interrupts = <0 68 0x4>; + interrupt-map-mask = <0 0 0 0>; + interrupt-map = <0x0 0 &gic 68>; + pcie_is_gen1 = <0>; + num-lanes = <1>; + phys = <&miphy0 1>; + phy-names = "pcie-phy"; + #address-cells = <3>; + #size-cells = <2>; + device_type = "pci"; + ranges = <0x00000800 0 0x80000000 0x80000000 0 0x00020000 /* configuration space */ + 0x81000000 0 0 0x80020000 0 0x00010000 /* downstream I/O */ + 0x82000000 0 0x80030000 0xc0030000 0 0x0ffd0000>; /* non-prefetchable memory */ + status = "disabled"; + }; + i2s-play@b2400000 { compatible = "snps,designware-i2s"; reg = <0xb2400000 0x10000>;
arch/arm/boot/dts/spear13xx.dtsi +3 -2
@@ -83,8 +83,8 @@ #size-cells = <1>; compatible = "simple-bus"; ranges = <0x50000000 0x50000000 0x10000000 - 0xb0000000 0xb0000000 0x10000000 - 0xd0000000 0xd0000000 0x02000000 + 0x80000000 0x80000000 0x20000000 + 0xb0000000 0xb0000000 0x22000000 0xd8000000 0xd8000000 0x01000000 0xe0000000 0xe0000000 0x10000000>;
@@ -338,6 +338,7 @@ reg = <0xe07008c4 0x4>; thermal_flags = <0x7000>; }; + }; }; };
arch/arm/configs/spear13xx_defconfig +2 -0
@@ -11,6 +11,8 @@ CONFIG_ARCH_SPEAR13XX=y CONFIG_MACH_SPEAR1310=y CONFIG_MACH_SPEAR1340=y # CONFIG_SWP_EMULATE is not set +CONFIG_PCI_MSI=y +CONFIG_PCIE_SPEAR13XX=y CONFIG_SMP=y # CONFIG_SMP_ON_UP is not set # CONFIG_ARM_CPU_TOPOLOGY is not set
arch/arm/mach-spear/Kconfig +1 -0
@@ -28,6 +28,7 @@ config ARCH_SPEAR13XX select USE_OF select MFD_SYSCON select PHY_ST_MIPHY40LP + select PCI help Supports for ARM's SPEAR13XX family
drivers/pci/host/Kconfig +5 -0
@@ -33,4 +33,9 @@ config PCI_RCAR_GEN2 There are 3 internal PCI controllers available with a single built-in EHCI/OHCI host controller present on each one. +config PCIE_SPEAR13XX + bool "STMicroelectronics SPEAr PCIe controller" + depends on ARCH_SPEAR13XX + select PCIEPORTBUS + select PCIE_DW endmenu
drivers/pci/host/Makefile +1 -0
@@ -4,3 +4,4 @@ obj-$(CONFIG_PCI_IMX6) += pci-imx6.o obj-$(CONFIG_PCI_MVEBU) += pci-mvebu.o obj-$(CONFIG_PCI_TEGRA) += pci-tegra.o obj-$(CONFIG_PCI_RCAR_GEN2) += pci-rcar-gen2.o +obj-$(CONFIG_PCIE_SPEAR13XX) += pcie-spear13xx.o
drivers/pci/host/pcie-spear13xx.c new file +414 -0
414 lines not on this page · raw message
Signature · 1 line
1.8.1.2
PATCH v4 8/8 MAINTAINERS: Add ST SPEAr13xx PCIe driver maintainer
In reply to Pratyush AnandFrom: Mohit Kumar <[email protected]>
Add Mohit Kumar as maintainer for ST SPEAr13xx PCIe driver.
--- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+)
MAINTAINERS +6 -0
@@ -6596,6 +6596,12 @@ L: [email protected] S: Maintained F: drivers/pci/host/*designware* +PCIE DRIVER FOR ST SPEAR13XX +M: Mohit Kumar <[email protected]> +L: [email protected] +S: Maintained +F: drivers/pci/host/pcie-spear13xx.c + PCMCIA SUBSYSTEM P: Linux PCMCIA Team L: [email protected]
Signature · 1 line
1.8.1.2
Hi Arnd,
Do you see any more improvement in this series.
Else we will send V5 (probably the final one) with modifications for Kishon's comment.
Regards
Pratyush
Quoted 103 lines · Pratyush Anand
First three patches are improvement and fixes for SPEAr13xx support. Patches 4-6 add miphy40lp skelten driver and support for spear1310/40 miphy wrapper. Patch 7 add support for SPEAr13xx PCIe.
These pathes are tested with linux-3.14-rc1 with following patch on the top of it:
Author: Balaji T K <[email protected]> Date: Mon Jan 20 16:41:27 2014 +0200ata:
ahci_platform: Manage SATA PHYTested with SPEAr1310 evaluation board:
- INTEL PRO 100/100 EP card
- USB xhci gen2 card
- Above cards connected through LeCROY PTC switchModifications for SATA are tested with SPEAr1340-evb board
Changes since v3:
- Phy driver renamed to phy-miphy40lp
- ahci phy hook patch used as suggested by Arnd
- Incorporated other minor comments from v3Changes since v2:
- Incorporated comments to move SPEAr13xx PCIe and SATA phy specific routines to the phy framework
- Modify ahci driver to include phy hooks
- phy-core driver modifications forsubsys_initcall()Changes since v1:
- Few patches of the series are already accepted and applied to mainline e.g. pcie designware driver improvements,fixes for IO translation bug, PCIe dw driver maintainer. So dropped these from v2.
- Incorporated comment to move the common/reset PCIe code to the seperate driver
- PCIe and SATA share common PHY configuration registers, so move SATA platform code to the system config driver
Fourth patch is improves pcie designware driver and fixes the IO translation bug. IO translation bug fix leads to the working of PCIe EP devices connected to RC through switch.PCIe driver support for SPEAr1310/40 platform board is added.
These patches are tested with SPEAr1310 evaluation board:
- INTEL PRO 100/100 EP card
- USB xhci gen2 card
- Above cards connected through LeCROY PTC switchCc linux-arm-kernel at lists.infradead.orgCc devicetree at vger.kernel.orgCc linux-ide at vger.kernel.orgCc linux-pci at vger.kernel.orgCc spear-devel at list.st.comCc linux-kernel at vger.kernel.orgMohit Kumar (2):
SPEAr13xx: defconfig: Update
MAINTAINERS: Add ST SPEAr13xx PCIe driver maintainerPratyush Anand (6):
clk: SPEAr13xx: Fix pcie clock name
SPEAr13xx: Fix static mapping table
phy: st-miphy-40lp: Add skeleton driver
SPEAr13xx: Fixup: Move SPEAr1340 SATA platform code to phy driver
phy: st-miphy-40lp: Add SPEAr1310 and SPEAr1340 PCIe phy support
pcie: SPEAr13xx: Add designware pcie support.../devicetree/bindings/arm/spear-misc.txt | 4 + .../devicetree/bindings/pci/spear13xx-pcie.txt | 7 + .../devicetree/bindings/phy/st-miphy40lp.txt | 12 + MAINTAINERS | 6 + arch/arm/boot/dts/spear1310-evb.dts | 4 + arch/arm/boot/dts/spear1310.dtsi | 96 +++- arch/arm/boot/dts/spear1340-evb.dts | 4 + arch/arm/boot/dts/spear1340.dtsi | 32 +- arch/arm/boot/dts/spear13xx.dtsi | 10 +- arch/arm/configs/spear13xx_defconfig | 15 + arch/arm/mach-spear/Kconfig | 3 + arch/arm/mach-spear/include/mach/spear.h | 4 +- arch/arm/mach-spear/spear1340.c | 127 +---- arch/arm/mach-spear/spear13xx.c | 2 +- drivers/clk/spear/spear1310_clock.c | 6 +- drivers/clk/spear/spear1340_clock.c | 2 +- drivers/pci/host/Kconfig | 5 + drivers/pci/host/Makefile | 1 + drivers/pci/host/pcie-spear13xx.c | 414 ++++++++++++++++ drivers/phy/Kconfig | 6 + drivers/phy/Makefile | 1 + drivers/phy/phy-miphy40lp.c | 544 +++++++++++++++++++++ 22 files changed, 1166 insertions(+), 139 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/spear-misc.txt create mode 100644 Documentation/devicetree/bindings/pci/spear13xx-pcie.txt create mode 100644 Documentation/devicetree/bindings/phy/st-miphy40lp.txt create mode 100644 drivers/pci/host/pcie-spear13xx.c create mode 100644 drivers/phy/phy-miphy40lp.c--
1.8.1.2_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel