From: kishon@ti.com (Kishon Vijay Abraham I)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/4] phy: miphy365x: Provide support for the MiPHY356x Generic PHY
Date: Thu, 13 Feb 2014 12:23:41 +0530 [thread overview]
Message-ID: <52FC6BF5.9030900@ti.com> (raw)
In-Reply-To: <1392220985-28189-4-git-send-email-lee.jones@linaro.org>
Hi,
On Wednesday 12 February 2014 09:33 PM, Lee Jones wrote:
> The MiPHY365x is a Generic PHY which can serve various SATA or PCIe
> devices. It has 2 ports which it can use for either; both SATA, both
various SATA or PCIe devices in STMicroelectronics STiH41x SoC series?
> PCIe or one of each in any configuration.
>
> Cc: Kishon Vijay Abraham I <kishon@ti.com>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
> drivers/phy/Kconfig | 8 +
> drivers/phy/Makefile | 1 +
> drivers/phy/phy-miphy365x.c | 634 ++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 643 insertions(+)
> create mode 100644 drivers/phy/phy-miphy365x.c
>
> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
> index 330ef2d..bb2706a 100644
> --- a/drivers/phy/Kconfig
> +++ b/drivers/phy/Kconfig
> @@ -21,6 +21,14 @@ config PHY_EXYNOS_MIPI_VIDEO
> Support for MIPI CSI-2 and MIPI DSI DPHY found on Samsung S5P
> and EXYNOS SoCs.
>
> +config PHY_MIPHY365X
> + tristate "STMicroelectronics MIPHY365X PHY driver for STiH41x series"
> + depends on ARCH_STI
> + depends on GENERIC_PHY
depends on CONFIG_OF and HAS_IOMEM?
> + help
> + Enable this to support the miphy transceiver (for SATA/PCIE)
> + that is part of STMicroelectronics STiH41x SoC series.
> +
> config OMAP_USB2
> tristate "OMAP USB2 PHY Driver"
> depends on ARCH_OMAP2PLUS
> diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
> index d0caae9..5879639 100644
> --- a/drivers/phy/Makefile
> +++ b/drivers/phy/Makefile
> @@ -5,5 +5,6 @@
> obj-$(CONFIG_GENERIC_PHY) += phy-core.o
> obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO) += phy-exynos-dp-video.o
> obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o
> +obj-$(CONFIG_PHY_MIPHY365X) += phy-miphy365x.o
> obj-$(CONFIG_OMAP_USB2) += phy-omap-usb2.o
> obj-$(CONFIG_TWL4030_USB) += phy-twl4030-usb.o
> diff --git a/drivers/phy/phy-miphy365x.c b/drivers/phy/phy-miphy365x.c
> new file mode 100644
> index 0000000..c4124e3
> --- /dev/null
> +++ b/drivers/phy/phy-miphy365x.c
> @@ -0,0 +1,634 @@
> +/*
> + * Copyright (C) 2014 STMicroelectronics
> + *
> + * STMicroelectronics PHY driver MiPHY365 (for SoC STiH416).
> + *
> + * Author: Alexandre Torgue <alexandre.torgue@st.com>
The author of this patch is not Alexandre Torgue?
> + *
> + * 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/platform_device.h>
> +#include <linux/io.h>
> +#include <linux/kernel.h>
> +#include <linux/module.h>
> +#include <linux/of.h>
> +#include <linux/of_platform.h>
> +#include <linux/clk.h>
> +#include <linux/phy/phy.h>
> +#include <linux/delay.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/regmap.h>
> +
> +#include <dt-bindings/phy/phy-miphy365x.h>
> +
> +#define HFC_TIMEOUT 50
> +
> +#define SYSCFG_2521 0x824
> +#define SYSCFG_2522 0x828
> +#define SYSCFG_PCIE_SATA_MASK BIT(1)
> +#define SYSCFG_PCIE_SATA_POS 1
> +
> +/* MiPHY365x register definitiona */
> +#define RESET_REG 0x00
> +#define RST_PLL BIT(1)
There are quite a few alignment problems with these macros. It needs to be fixed.
> +#define RST_PLL_CAL BIT(2)
> +#define RST_RX BIT(4)
> +#define RST_MACRO BIT(7)
> +
> +#define STATUS_REG 0x01
> +#define IDLL_RDY BIT(0)
> +#define PLL_RDY BIT(1)
> +#define DES_BIT_LOCK BIT(2)
> +#define DES_SYMBOL_LOCK BIT(3)
> +
> +#define CTRL_REG 0x02
> +#define TERM_EN BIT(0)
> +#define PCI_EN BIT(2)
> +#define DES_BIT_LOCK_EN BIT(3)
> +#define TX_POL BIT(5)
> +
> +#define INT_CTRL_REG 0x03
> +
> +#define BOUNDARY1_REG 0x10
> +#define SPDSEL_SEL BIT(0)
> +
> +#define BOUNDARY3_REG 0x12
> +#define TX_SPDSEL_GEN1_VAL 0
> +#define TX_SPDSEL_GEN2_VAL 0x01
> +#define TX_SPDSEL_GEN3_VAL 0x02
> +#define RX_SPDSEL_GEN1_VAL 0
> +#define RX_SPDSEL_GEN2_VAL (0x01 << 3)
> +#define RX_SPDSEL_GEN3_VAL (0x02 << 3)
> +
> +#define PCIE_REG 0x16
> +
> +#define BUF_SEL_REG 0x20
> +#define CONF_GEN_SEL_GEN3 0x02
> +#define CONF_GEN_SEL_GEN2 0x01
> +#define PD_VDDTFILTER BIT(4)
> +
> +#define TXBUF1_REG 0x21
> +#define SWING_VAL 0x04
> +#define SWING_VAL_GEN1 0x03
> +#define PREEMPH_VAL (0x3 << 5)
> +
> +#define TXBUF2_REG 0x22
> +#define TXSLEW_VAL 0x2
> +#define TXSLEW_VAL_GEN1 0x4
> +
> +#define RXBUF_OFFSET_CTRL_REG 0x23
> +
> +#define RXBUF_REG 0x25
> +#define SDTHRES_VAL 0x01
> +#define EQ_ON3 (0x03 << 4)
> +#define EQ_ON1 (0x01 << 4)
> +
> +#define COMP_CTRL1_REG 0x40
> +#define START_COMSR BIT(0)
> +#define START_COMZC BIT(1)
> +#define COMP_AUTO_LOAD BIT(4)
> +
> +#define COMP_CTRL2_REG 0x41
> +#define COMP_2MHZ_RAT_GEN1 0x1e
> +#define COMP_2MHZ_RAT 0xf
> +
> +#define COMP_CTRL3_REG 0x42
> +#define COMSR_COMP_REF 0x33
> +
> +#define COMP_IDLL_REG 0x47
> +#define COMZC_IDLL 0x2a
> +
> +#define PLL_CTRL1_REG 0x50
> +#define PLL_START_CAL BIT(0)
> +#define BUF_EN BIT(2)
> +#define SYNCHRO_TX BIT(3)
> +#define SSC_EN BIT(6)
> +#define CONFIG_PLL BIT(7)
> +
> +#define PLL_CTRL2_REG 0x51
> +#define BYPASS_PLL_CAL BIT(1)
> +
> +#define PLL_RAT_REG 0x52
> +
> +#define PLL_SSC_STEP_MSB_REG 0x56
> +#define PLL_SSC_STEP_MSB_VAL 0x03
> +
> +#define PLL_SSC_STEP_LSB_REG 0x57
> +#define PLL_SSC_STEP_LSB_VAL 0x63
> +
> +#define PLL_SSC_PER_MSB_REG 0x58
> +#define PLL_SSC_PER_MSB_VAL 0
> +
> +#define PLL_SSC_PER_LSB_REG 0x59
> +#define PLL_SSC_PER_LSB_VAL 0xf1
> +
> +#define IDLL_TEST_REG 0x72
> +#define START_CLK_HF BIT(6)
> +
> +#define DES_BITLOCK_REG 0x86
> +#define BIT_LOCK_LEVEL 0x01
> +#define BIT_LOCK_CNT_512 (0x03 << 5)
> +
> +static u8 ports[] = { MIPHY_PORT_0, MIPHY_PORT_1 };
> +
> +struct miphy365x_phy {
> + struct phy *phy;
> + void __iomem *base;
> + void __iomem *sata;
> + void __iomem *pcie;
> + u8 type;
> + u8 port;
> +};
> +
> +struct miphy365x_dev {
> + struct device *dev;
> + struct mutex miphy_mutex;
> + struct miphy365x_phy phys[ARRAY_SIZE(ports)];
> + bool pcie_tx_pol_inv;
> + bool sata_tx_pol_inv;
> + u32 sata_gen;
> + struct regmap *regmap;
> +};
> +
> +enum miphy_sata_gen {
> + SATA_GEN1,
> + SATA_GEN2,
> + SATA_GEN3
> +};
> +
> +static u8 rx_tx_spd[] = {
> + TX_SPDSEL_GEN1_VAL | RX_SPDSEL_GEN1_VAL,
> + TX_SPDSEL_GEN2_VAL | RX_SPDSEL_GEN2_VAL,
> + TX_SPDSEL_GEN3_VAL | RX_SPDSEL_GEN3_VAL
> +};
> +
> +#define miphy365x_phy_to_dev(inst) \
> + container_of((inst), struct miphy365x_dev, phys[(inst)->port]);
> +
> +/*
> + * This function selects the system configuration,
> + * either two SATA, one SATA and one PCIe, or two PCIe lanes.
> + */
> +static int miphy365x_set_path(struct miphy365x_phy *miphy_phy,
> + struct miphy365x_dev *miphy_dev)
> +{
> + u8 config = miphy_phy->type | miphy_phy->port;
> + u32 mask = SYSCFG_PCIE_SATA_MASK;
> + u32 reg;
> + bool sata;
> +
> + switch (config) {
> + case MIPHY_SATA_PORT0:
> + reg = SYSCFG_2521;
> + sata = true;
How do we configure PORT1 for SATA here? Do we really support all the system
configuration?
> + break;
> + case MIPHY_PCIE_PORT1:
> + reg = SYSCFG_2522;
> + sata = false;
> + break;
> + default:
> + dev_err(miphy_dev->dev, "Configuration not supported\n");
> + return -EINVAL;
> + }
> +
> + return regmap_update_bits(miphy_dev->regmap, reg, mask,
> + sata << SYSCFG_PCIE_SATA_POS);
> +}
> +
> +static void miphy365x_phy_init_pcie_port(struct miphy365x_phy *miphy_phy,
> + struct miphy365x_dev *miphy_dev)
> +{
> + u8 val;
> +
> + if (!miphy_dev->pcie_tx_pol_inv)
> + return;
> +
> + /* Invert Tx polarity and clear pci_txdetect_pol bit */
> + val = TERM_EN | PCI_EN | DES_BIT_LOCK_EN | TX_POL;
> + writeb_relaxed(val, miphy_phy->base + CTRL_REG);
> + writeb_relaxed(0x00, miphy_phy->base + PCIE_REG);
> +}
> +
> +static inline int miphy365x_phy_hfc_not_rdy(struct miphy365x_phy *miphy_phy,
> + struct miphy365x_dev *miphy_dev)
> +{
> + int timeout = HFC_TIMEOUT;
> + u8 mask = IDLL_RDY | PLL_RDY;
> + u8 regval;
> +
> + do {
> + regval = readb_relaxed(miphy_phy->base + STATUS_REG);
> + usleep_range(2000, 2500);
Any comment on how this delay value is obtained?
> + } while (timeout-- && (regval & mask));
> +
> + if (timeout < 0) {
> + dev_err(miphy_dev->dev, "HFC ready timeout!\n");
> + return -EBUSY;
> + }
> +
> + return 0;
> +}
> +
> +static inline int miphy365x_phy_rdy(struct miphy365x_phy *miphy_phy,
> + struct miphy365x_dev *miphy_dev)
> +{
> + int timeout = HFC_TIMEOUT;
> + u8 mask = mask = IDLL_RDY | PLL_RDY;
just u8 mask = IDLL_RDY | PLL_RDY; would suffice.
> + u8 regval;
> +
> + do {
> + regval = readb_relaxed(miphy_phy->base + STATUS_REG);
> + usleep_range(2000, 2500);
same here.
> + } while (timeout-- && ((regval & mask) != mask));
> +
> + if (timeout < 0) {
> + dev_err(miphy_dev->dev, "PHY not ready timeout!\n");
> + return -EBUSY;
> + }
> +
> + return 0;
> +}
> +
> +static inline void miphy365x_phy_set_comp(struct miphy365x_phy *miphy_phy,
> + struct miphy365x_dev *miphy_dev)
> +{
> + u8 val, mask;
> +
> + if (miphy_dev->sata_gen == SATA_GEN1)
> + writeb_relaxed(COMP_2MHZ_RAT_GEN1,
> + miphy_phy->base + COMP_CTRL2_REG);
> + else
> + writeb_relaxed(COMP_2MHZ_RAT,
> + miphy_phy->base + COMP_CTRL2_REG);
> +
> + if (miphy_dev->sata_gen != SATA_GEN3) {
> + writeb_relaxed(COMSR_COMP_REF,
> + miphy_phy->base + COMP_CTRL3_REG);
> + /*
> + * Force VCO current to value defined by address 0x5A
> + * and disable PCIe100Mref bit
> + * Enable auto load compensation for pll_i_bias
> + */
> + writeb_relaxed(BYPASS_PLL_CAL, miphy_phy->base + PLL_CTRL2_REG);
> + writeb_relaxed(COMZC_IDLL, miphy_phy->base + COMP_IDLL_REG);
> + }
> +
> + /*
> + * Force restart compensation and enable auto load
> + * for Comzc_Tx, Comzc_Rx and Comsr on macro
> + */
> + val = START_COMSR | START_COMZC | COMP_AUTO_LOAD;
> + writeb_relaxed(val, miphy_phy->base + COMP_CTRL1_REG);
> +
> + mask = DES_BIT_LOCK | DES_SYMBOL_LOCK;
> + while ((readb_relaxed(miphy_phy->base + COMP_CTRL1_REG) & mask) != mask)
> + cpu_relax();
Don't we need to break from here at some point if the LOCK's are never set?
> +}
> +
> +static inline void miphy365x_phy_set_ssc(struct miphy365x_phy *miphy_phy,
> + struct miphy365x_dev *miphy_dev)
> +{
> + u8 val;
> +
> + /*
> + * SSC Settings. SSC will be enabled through Link
> + * SSC Ampl. = 0.4%
> + * SSC Freq = 31KHz
> + */
> + writeb_relaxed(PLL_SSC_STEP_MSB_VAL,
> + miphy_phy->base + PLL_SSC_STEP_MSB_REG);
> + writeb_relaxed(PLL_SSC_STEP_LSB_VAL,
> + miphy_phy->base + PLL_SSC_STEP_LSB_REG);
> + writeb_relaxed(PLL_SSC_PER_MSB_VAL,
> + miphy_phy->base + PLL_SSC_PER_MSB_REG);
> + writeb_relaxed(PLL_SSC_PER_LSB_VAL,
> + miphy_phy->base + PLL_SSC_PER_LSB_REG);
> +
> + /* SSC Settings complete */
> + if (miphy_dev->sata_gen == SATA_GEN1) {
> + val = PLL_START_CAL | BUF_EN | SYNCHRO_TX | CONFIG_PLL;
> + writeb_relaxed(val, miphy_phy->base + PLL_CTRL1_REG);
> + } else {
> + val = SSC_EN | PLL_START_CAL | BUF_EN | SYNCHRO_TX | CONFIG_PLL;
> + writeb_relaxed(val, miphy_phy->base + PLL_CTRL1_REG);
> + }
> +}
> +
> +static int miphy365x_phy_init_sata_port(struct miphy365x_phy *miphy_phy,
> + struct miphy365x_dev *miphy_dev)
> +{
> + int ret;
> + u8 val;
> +
> + /*
> + * Force PHY macro reset, PLL calibration reset, PLL reset
> + * and assert Deserializer Reset
> + */
> + val = RST_PLL | RST_PLL_CAL | RST_RX | RST_MACRO;
> + writeb_relaxed(val, miphy_phy->base + RESET_REG);
> +
> + if (miphy_dev->sata_tx_pol_inv)
> + writeb_relaxed(TX_POL, miphy_phy->base + CTRL_REG);
> +
> + /*
> + * Force macro1 to use rx_lspd, tx_lspd
> + * Force Rx_Clock on first I-DLL phase
> + * Force Des in HP mode on macro, rx_lspd, tx_lspd for Gen2/3
> + */
> + writeb_relaxed(SPDSEL_SEL, miphy_phy->base + BOUNDARY1_REG);
> + writeb_relaxed(START_CLK_HF, miphy_phy->base + IDLL_TEST_REG);
> + val = rx_tx_spd[miphy_dev->sata_gen];
> + writeb_relaxed(val, miphy_phy->base + BOUNDARY3_REG);
> +
> + /* Wait for HFC_READY = 0 */
> + ret = miphy365x_phy_hfc_not_rdy(miphy_phy, miphy_dev);
> + if (ret)
> + return ret;
> +
> + /* Compensation Recalibration */
> + miphy365x_phy_set_comp(miphy_phy, miphy_dev);
> +
> + switch (miphy_dev->sata_gen) {
> + case SATA_GEN3:
> + /*
> + * TX Swing target 550-600mv peak to peak diff
> + * Tx Slew target 90-110ps rising/falling time
> + * Rx Eq ON3, Sigdet threshold SDTH1
> + */
> + val = PD_VDDTFILTER | CONF_GEN_SEL_GEN3;
> + writeb_relaxed(val, miphy_phy->base + BUF_SEL_REG);
> + val = SWING_VAL | PREEMPH_VAL;
> + writeb_relaxed(val, miphy_phy->base + TXBUF1_REG);
> + writeb_relaxed(TXSLEW_VAL, miphy_phy->base + TXBUF2_REG);
> + writeb_relaxed(0x00, miphy_phy->base + RXBUF_OFFSET_CTRL_REG);
> + val = SDTHRES_VAL | EQ_ON3;
> + writeb_relaxed(val, miphy_phy->base + RXBUF_REG);
> + break;
> + case SATA_GEN2:
> + /*
> + * conf gen sel=0x1 to program Gen2 banked registers
> + * VDDT filter ON
> + * Tx Swing target 550-600mV peak-to-peak diff
> + * Tx Slew target 90-110 ps rising/falling time
> + * RX Equalization ON1, Sigdet threshold SDTH1
> + */
> + writeb_relaxed(CONF_GEN_SEL_GEN2,
> + miphy_phy->base + BUF_SEL_REG);
> + writeb_relaxed(SWING_VAL, miphy_phy->base + TXBUF1_REG);
> + writeb_relaxed(TXSLEW_VAL, miphy_phy->base + TXBUF2_REG);
> + val = SDTHRES_VAL | EQ_ON1;
> + writeb_relaxed(val, miphy_phy->base + RXBUF_REG);
> + break;
> + case SATA_GEN1:
> + /*
> + * conf gen sel = 00b to program Gen1 banked registers
> + * VDDT filter ON
> + * Tx Swing target 500-550mV peak-to-peak diff
> + * Tx Slew target120-140 ps rising/falling time
> + */
> + writeb_relaxed(PD_VDDTFILTER, miphy_phy->base + BUF_SEL_REG);
> + writeb_relaxed(SWING_VAL_GEN1, miphy_phy->base + TXBUF1_REG);
> + writeb_relaxed(TXSLEW_VAL_GEN1, miphy_phy->base + TXBUF2_REG);
> + break;
> + default:
> + break;
> + }
> +
> + /* Force Macro1 in partial mode & release pll cal reset */
> + writeb_relaxed(RST_RX, miphy_phy->base + RESET_REG);
> + usleep_range(100, 150);
> +
> + miphy365x_phy_set_ssc(miphy_phy, miphy_dev);
> +
> + /* Wait for phy_ready */
> + ret = miphy365x_phy_rdy(miphy_phy, miphy_dev);
> + if (ret)
> + return ret;
> +
> + /*
> + * Enable macro1 to use rx_lspd & tx_lspd
> + * Release Rx_Clock on first I-DLL phase on macro1
> + * Assert deserializer reset
> + * des_bit_lock_en is set
> + * bit lock detection strength
> + * Deassert deserializer reset
> + */
> + writeb_relaxed(0x00, miphy_phy->base + BOUNDARY1_REG);
> + writeb_relaxed(0x00, miphy_phy->base + IDLL_TEST_REG);
> + writeb_relaxed(RST_RX, miphy_phy->base + RESET_REG);
> + val = miphy_dev->sata_tx_pol_inv ?
> + (TX_POL | DES_BIT_LOCK_EN) : DES_BIT_LOCK_EN;
> + writeb_relaxed(val, miphy_phy->base + CTRL_REG);
> +
> + val = BIT_LOCK_CNT_512 | BIT_LOCK_LEVEL;
> + writeb_relaxed(val, miphy_phy->base + DES_BITLOCK_REG);
> + writeb_relaxed(0x00, miphy_phy->base + RESET_REG);
> +
> + return 0;
> +}
> +
> +static int miphy365x_phy_init(struct phy *phy)
> +{
> + int ret = 0;
> + struct miphy365x_phy *miphy_phy = phy_get_drvdata(phy);
> + struct miphy365x_dev *miphy_dev = miphy365x_phy_to_dev(miphy_phy);
> +
> + mutex_lock(&miphy_dev->miphy_mutex);
> +
> + ret = miphy365x_set_path(miphy_phy, miphy_dev);
> + if (ret) {
> + mutex_unlock(&miphy_dev->miphy_mutex);
> + return ret;
> + }
> +
> + /* Initialise Miphy for PCIe or SATA */
> + if (miphy_phy->type == MIPHY_TYPE_PCIE)
> + miphy365x_phy_init_pcie_port(miphy_phy, miphy_dev);
> + else
> + ret = miphy365x_phy_init_sata_port(miphy_phy, miphy_dev);
> +
> + mutex_unlock(&miphy_dev->miphy_mutex);
> +
> + return ret;
> +}
> +
> +static int miphy365x_phy_power_on(struct phy *phy)
> +{
> + return 0;
> +}
> +
> +static int miphy365x_phy_power_off(struct phy *phy)
> +{
> + return 0;
> +}
Both these empty functions can be removed.
> +
> +static struct phy *miphy365x_phy_xlate(struct device *dev,
> + struct of_phandle_args *args)
> +{
> + struct miphy365x_dev *state = dev_get_drvdata(dev);
> + u8 port = args->args[0];
> + u8 type = args->args[1];
> +
> + if (WARN_ON(port >= ARRAY_SIZE(ports)))
> + return ERR_PTR(-EINVAL);
> +
> + if (type == MIPHY_TYPE_SATA)
> + state->phys[port].base = state->phys[port].sata;
> + else if (type == MIPHY_TYPE_PCIE)
> + state->phys[port].base = state->phys[port].pcie;
> + else {
> + WARN(1, "Invalid type specified in DT");
> + return ERR_PTR(-EINVAL);
> + }
> +
> + state->phys[port].type = type;
> +
> + return state->phys[port].phy;
> +}
> +
> +static struct phy_ops miphy365x_phy_ops = {
> + .init = miphy365x_phy_init,
> + .power_on = miphy365x_phy_power_on,
> + .power_off = miphy365x_phy_power_off,
> + .owner = THIS_MODULE,
> +};
> +
> +static int miphy365x_phy_get_base_addr(struct platform_device *pdev,
> + struct miphy365x_phy *phy, u8 port)
> +{
> + struct resource *res;
> + char sata[16];
> + char pcie[16];
It can be done with a single variable ;-)
> +
> + sprintf(sata, "sata%d", port);
> +
> + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, sata);
> + if (!res)
> + return -ENODEV;
> +
> + phy->sata = devm_ioremap(&pdev->dev, res->start, resource_size(res));
> + if (!phy->sata)
> + return -ENOMEM;
> +
> + sprintf(pcie, "pcie%d", port);
> +
> + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pcie);
> + if (!res)
> + return -ENODEV;
> +
> + phy->pcie = devm_ioremap(&pdev->dev, res->start, resource_size(res));
> + if (!phy->pcie)
> + return -ENOMEM;
> +
> + return 0;
> +}
> +
> +static int miphy365x_phy_of_probe(struct device_node *np,
> + struct miphy365x_dev *phy_dev)
> +{
> + const char *sata_gen;
> +
> + phy_dev->regmap = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
> + if (IS_ERR(phy_dev->regmap)) {
> + dev_err(phy_dev->dev, "No syscfg phandle specified\n");
> + return PTR_ERR(phy_dev->regmap);
> + }
> +
> + /* Default */
> + phy_dev->sata_gen = SATA_GEN1;
> +
> + of_property_read_string(np, "st,sata_gen", &sata_gen);
> + if (sata_gen) {
> + if (!strcmp(sata_gen, "gen3"))
> + phy_dev->sata_gen = SATA_GEN3;
> + else if (!strcmp(sata_gen, "gen2"))
> + phy_dev->sata_gen = SATA_GEN2;
> + }
> +
> + phy_dev->pcie_tx_pol_inv =
> + of_property_read_bool(np, "st,pcie_tx_pol_inv");
> +
> + phy_dev->sata_tx_pol_inv =
> + of_property_read_bool(np, "st,sata_tx_pol_inv");
> +
> + return 0;
> +}
> +
> +static int miphy365x_phy_probe(struct platform_device *pdev)
> +{
> + struct device_node *np = pdev->dev.of_node;
> + struct miphy365x_dev *phy_dev;
> + struct device *dev = &pdev->dev;
> + struct phy_provider *provider;
> + u8 port;
> + int ret;
> +
> + if (!np) {
> + dev_err(dev, "No DT found\n");
> + return -EINVAL;
> + }
> +
> + phy_dev = devm_kzalloc(dev, sizeof(*phy_dev), GFP_KERNEL);
> + if (!phy_dev)
> + return -ENOMEM;
> +
> + ret = miphy365x_phy_of_probe(np, phy_dev);
> + if (ret)
> + return ret;
> +
> + phy_dev->dev = dev;
> +
> + dev_set_drvdata(dev, phy_dev);
> +
> + mutex_init(&phy_dev->miphy_mutex);
> +
> + provider = devm_of_phy_provider_register(dev, miphy365x_phy_xlate);
> + if (IS_ERR(provider))
> + return PTR_ERR(provider);
Phy provider register should be the last step in registering the PHY.
Thanks
Kishon
WARNING: multiple messages have this Message-ID (diff)
From: Kishon Vijay Abraham I <kishon@ti.com>
To: Lee Jones <lee.jones@linaro.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Cc: <alexandre.torgue@st.com>
Subject: Re: [PATCH 4/4] phy: miphy365x: Provide support for the MiPHY356x Generic PHY
Date: Thu, 13 Feb 2014 12:23:41 +0530 [thread overview]
Message-ID: <52FC6BF5.9030900@ti.com> (raw)
In-Reply-To: <1392220985-28189-4-git-send-email-lee.jones@linaro.org>
Hi,
On Wednesday 12 February 2014 09:33 PM, Lee Jones wrote:
> The MiPHY365x is a Generic PHY which can serve various SATA or PCIe
> devices. It has 2 ports which it can use for either; both SATA, both
various SATA or PCIe devices in STMicroelectronics STiH41x SoC series?
> PCIe or one of each in any configuration.
>
> Cc: Kishon Vijay Abraham I <kishon@ti.com>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
> drivers/phy/Kconfig | 8 +
> drivers/phy/Makefile | 1 +
> drivers/phy/phy-miphy365x.c | 634 ++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 643 insertions(+)
> create mode 100644 drivers/phy/phy-miphy365x.c
>
> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
> index 330ef2d..bb2706a 100644
> --- a/drivers/phy/Kconfig
> +++ b/drivers/phy/Kconfig
> @@ -21,6 +21,14 @@ config PHY_EXYNOS_MIPI_VIDEO
> Support for MIPI CSI-2 and MIPI DSI DPHY found on Samsung S5P
> and EXYNOS SoCs.
>
> +config PHY_MIPHY365X
> + tristate "STMicroelectronics MIPHY365X PHY driver for STiH41x series"
> + depends on ARCH_STI
> + depends on GENERIC_PHY
depends on CONFIG_OF and HAS_IOMEM?
> + help
> + Enable this to support the miphy transceiver (for SATA/PCIE)
> + that is part of STMicroelectronics STiH41x SoC series.
> +
> config OMAP_USB2
> tristate "OMAP USB2 PHY Driver"
> depends on ARCH_OMAP2PLUS
> diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
> index d0caae9..5879639 100644
> --- a/drivers/phy/Makefile
> +++ b/drivers/phy/Makefile
> @@ -5,5 +5,6 @@
> obj-$(CONFIG_GENERIC_PHY) += phy-core.o
> obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO) += phy-exynos-dp-video.o
> obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o
> +obj-$(CONFIG_PHY_MIPHY365X) += phy-miphy365x.o
> obj-$(CONFIG_OMAP_USB2) += phy-omap-usb2.o
> obj-$(CONFIG_TWL4030_USB) += phy-twl4030-usb.o
> diff --git a/drivers/phy/phy-miphy365x.c b/drivers/phy/phy-miphy365x.c
> new file mode 100644
> index 0000000..c4124e3
> --- /dev/null
> +++ b/drivers/phy/phy-miphy365x.c
> @@ -0,0 +1,634 @@
> +/*
> + * Copyright (C) 2014 STMicroelectronics
> + *
> + * STMicroelectronics PHY driver MiPHY365 (for SoC STiH416).
> + *
> + * Author: Alexandre Torgue <alexandre.torgue@st.com>
The author of this patch is not Alexandre Torgue?
> + *
> + * 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/platform_device.h>
> +#include <linux/io.h>
> +#include <linux/kernel.h>
> +#include <linux/module.h>
> +#include <linux/of.h>
> +#include <linux/of_platform.h>
> +#include <linux/clk.h>
> +#include <linux/phy/phy.h>
> +#include <linux/delay.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/regmap.h>
> +
> +#include <dt-bindings/phy/phy-miphy365x.h>
> +
> +#define HFC_TIMEOUT 50
> +
> +#define SYSCFG_2521 0x824
> +#define SYSCFG_2522 0x828
> +#define SYSCFG_PCIE_SATA_MASK BIT(1)
> +#define SYSCFG_PCIE_SATA_POS 1
> +
> +/* MiPHY365x register definitiona */
> +#define RESET_REG 0x00
> +#define RST_PLL BIT(1)
There are quite a few alignment problems with these macros. It needs to be fixed.
> +#define RST_PLL_CAL BIT(2)
> +#define RST_RX BIT(4)
> +#define RST_MACRO BIT(7)
> +
> +#define STATUS_REG 0x01
> +#define IDLL_RDY BIT(0)
> +#define PLL_RDY BIT(1)
> +#define DES_BIT_LOCK BIT(2)
> +#define DES_SYMBOL_LOCK BIT(3)
> +
> +#define CTRL_REG 0x02
> +#define TERM_EN BIT(0)
> +#define PCI_EN BIT(2)
> +#define DES_BIT_LOCK_EN BIT(3)
> +#define TX_POL BIT(5)
> +
> +#define INT_CTRL_REG 0x03
> +
> +#define BOUNDARY1_REG 0x10
> +#define SPDSEL_SEL BIT(0)
> +
> +#define BOUNDARY3_REG 0x12
> +#define TX_SPDSEL_GEN1_VAL 0
> +#define TX_SPDSEL_GEN2_VAL 0x01
> +#define TX_SPDSEL_GEN3_VAL 0x02
> +#define RX_SPDSEL_GEN1_VAL 0
> +#define RX_SPDSEL_GEN2_VAL (0x01 << 3)
> +#define RX_SPDSEL_GEN3_VAL (0x02 << 3)
> +
> +#define PCIE_REG 0x16
> +
> +#define BUF_SEL_REG 0x20
> +#define CONF_GEN_SEL_GEN3 0x02
> +#define CONF_GEN_SEL_GEN2 0x01
> +#define PD_VDDTFILTER BIT(4)
> +
> +#define TXBUF1_REG 0x21
> +#define SWING_VAL 0x04
> +#define SWING_VAL_GEN1 0x03
> +#define PREEMPH_VAL (0x3 << 5)
> +
> +#define TXBUF2_REG 0x22
> +#define TXSLEW_VAL 0x2
> +#define TXSLEW_VAL_GEN1 0x4
> +
> +#define RXBUF_OFFSET_CTRL_REG 0x23
> +
> +#define RXBUF_REG 0x25
> +#define SDTHRES_VAL 0x01
> +#define EQ_ON3 (0x03 << 4)
> +#define EQ_ON1 (0x01 << 4)
> +
> +#define COMP_CTRL1_REG 0x40
> +#define START_COMSR BIT(0)
> +#define START_COMZC BIT(1)
> +#define COMP_AUTO_LOAD BIT(4)
> +
> +#define COMP_CTRL2_REG 0x41
> +#define COMP_2MHZ_RAT_GEN1 0x1e
> +#define COMP_2MHZ_RAT 0xf
> +
> +#define COMP_CTRL3_REG 0x42
> +#define COMSR_COMP_REF 0x33
> +
> +#define COMP_IDLL_REG 0x47
> +#define COMZC_IDLL 0x2a
> +
> +#define PLL_CTRL1_REG 0x50
> +#define PLL_START_CAL BIT(0)
> +#define BUF_EN BIT(2)
> +#define SYNCHRO_TX BIT(3)
> +#define SSC_EN BIT(6)
> +#define CONFIG_PLL BIT(7)
> +
> +#define PLL_CTRL2_REG 0x51
> +#define BYPASS_PLL_CAL BIT(1)
> +
> +#define PLL_RAT_REG 0x52
> +
> +#define PLL_SSC_STEP_MSB_REG 0x56
> +#define PLL_SSC_STEP_MSB_VAL 0x03
> +
> +#define PLL_SSC_STEP_LSB_REG 0x57
> +#define PLL_SSC_STEP_LSB_VAL 0x63
> +
> +#define PLL_SSC_PER_MSB_REG 0x58
> +#define PLL_SSC_PER_MSB_VAL 0
> +
> +#define PLL_SSC_PER_LSB_REG 0x59
> +#define PLL_SSC_PER_LSB_VAL 0xf1
> +
> +#define IDLL_TEST_REG 0x72
> +#define START_CLK_HF BIT(6)
> +
> +#define DES_BITLOCK_REG 0x86
> +#define BIT_LOCK_LEVEL 0x01
> +#define BIT_LOCK_CNT_512 (0x03 << 5)
> +
> +static u8 ports[] = { MIPHY_PORT_0, MIPHY_PORT_1 };
> +
> +struct miphy365x_phy {
> + struct phy *phy;
> + void __iomem *base;
> + void __iomem *sata;
> + void __iomem *pcie;
> + u8 type;
> + u8 port;
> +};
> +
> +struct miphy365x_dev {
> + struct device *dev;
> + struct mutex miphy_mutex;
> + struct miphy365x_phy phys[ARRAY_SIZE(ports)];
> + bool pcie_tx_pol_inv;
> + bool sata_tx_pol_inv;
> + u32 sata_gen;
> + struct regmap *regmap;
> +};
> +
> +enum miphy_sata_gen {
> + SATA_GEN1,
> + SATA_GEN2,
> + SATA_GEN3
> +};
> +
> +static u8 rx_tx_spd[] = {
> + TX_SPDSEL_GEN1_VAL | RX_SPDSEL_GEN1_VAL,
> + TX_SPDSEL_GEN2_VAL | RX_SPDSEL_GEN2_VAL,
> + TX_SPDSEL_GEN3_VAL | RX_SPDSEL_GEN3_VAL
> +};
> +
> +#define miphy365x_phy_to_dev(inst) \
> + container_of((inst), struct miphy365x_dev, phys[(inst)->port]);
> +
> +/*
> + * This function selects the system configuration,
> + * either two SATA, one SATA and one PCIe, or two PCIe lanes.
> + */
> +static int miphy365x_set_path(struct miphy365x_phy *miphy_phy,
> + struct miphy365x_dev *miphy_dev)
> +{
> + u8 config = miphy_phy->type | miphy_phy->port;
> + u32 mask = SYSCFG_PCIE_SATA_MASK;
> + u32 reg;
> + bool sata;
> +
> + switch (config) {
> + case MIPHY_SATA_PORT0:
> + reg = SYSCFG_2521;
> + sata = true;
How do we configure PORT1 for SATA here? Do we really support all the system
configuration?
> + break;
> + case MIPHY_PCIE_PORT1:
> + reg = SYSCFG_2522;
> + sata = false;
> + break;
> + default:
> + dev_err(miphy_dev->dev, "Configuration not supported\n");
> + return -EINVAL;
> + }
> +
> + return regmap_update_bits(miphy_dev->regmap, reg, mask,
> + sata << SYSCFG_PCIE_SATA_POS);
> +}
> +
> +static void miphy365x_phy_init_pcie_port(struct miphy365x_phy *miphy_phy,
> + struct miphy365x_dev *miphy_dev)
> +{
> + u8 val;
> +
> + if (!miphy_dev->pcie_tx_pol_inv)
> + return;
> +
> + /* Invert Tx polarity and clear pci_txdetect_pol bit */
> + val = TERM_EN | PCI_EN | DES_BIT_LOCK_EN | TX_POL;
> + writeb_relaxed(val, miphy_phy->base + CTRL_REG);
> + writeb_relaxed(0x00, miphy_phy->base + PCIE_REG);
> +}
> +
> +static inline int miphy365x_phy_hfc_not_rdy(struct miphy365x_phy *miphy_phy,
> + struct miphy365x_dev *miphy_dev)
> +{
> + int timeout = HFC_TIMEOUT;
> + u8 mask = IDLL_RDY | PLL_RDY;
> + u8 regval;
> +
> + do {
> + regval = readb_relaxed(miphy_phy->base + STATUS_REG);
> + usleep_range(2000, 2500);
Any comment on how this delay value is obtained?
> + } while (timeout-- && (regval & mask));
> +
> + if (timeout < 0) {
> + dev_err(miphy_dev->dev, "HFC ready timeout!\n");
> + return -EBUSY;
> + }
> +
> + return 0;
> +}
> +
> +static inline int miphy365x_phy_rdy(struct miphy365x_phy *miphy_phy,
> + struct miphy365x_dev *miphy_dev)
> +{
> + int timeout = HFC_TIMEOUT;
> + u8 mask = mask = IDLL_RDY | PLL_RDY;
just u8 mask = IDLL_RDY | PLL_RDY; would suffice.
> + u8 regval;
> +
> + do {
> + regval = readb_relaxed(miphy_phy->base + STATUS_REG);
> + usleep_range(2000, 2500);
same here.
> + } while (timeout-- && ((regval & mask) != mask));
> +
> + if (timeout < 0) {
> + dev_err(miphy_dev->dev, "PHY not ready timeout!\n");
> + return -EBUSY;
> + }
> +
> + return 0;
> +}
> +
> +static inline void miphy365x_phy_set_comp(struct miphy365x_phy *miphy_phy,
> + struct miphy365x_dev *miphy_dev)
> +{
> + u8 val, mask;
> +
> + if (miphy_dev->sata_gen == SATA_GEN1)
> + writeb_relaxed(COMP_2MHZ_RAT_GEN1,
> + miphy_phy->base + COMP_CTRL2_REG);
> + else
> + writeb_relaxed(COMP_2MHZ_RAT,
> + miphy_phy->base + COMP_CTRL2_REG);
> +
> + if (miphy_dev->sata_gen != SATA_GEN3) {
> + writeb_relaxed(COMSR_COMP_REF,
> + miphy_phy->base + COMP_CTRL3_REG);
> + /*
> + * Force VCO current to value defined by address 0x5A
> + * and disable PCIe100Mref bit
> + * Enable auto load compensation for pll_i_bias
> + */
> + writeb_relaxed(BYPASS_PLL_CAL, miphy_phy->base + PLL_CTRL2_REG);
> + writeb_relaxed(COMZC_IDLL, miphy_phy->base + COMP_IDLL_REG);
> + }
> +
> + /*
> + * Force restart compensation and enable auto load
> + * for Comzc_Tx, Comzc_Rx and Comsr on macro
> + */
> + val = START_COMSR | START_COMZC | COMP_AUTO_LOAD;
> + writeb_relaxed(val, miphy_phy->base + COMP_CTRL1_REG);
> +
> + mask = DES_BIT_LOCK | DES_SYMBOL_LOCK;
> + while ((readb_relaxed(miphy_phy->base + COMP_CTRL1_REG) & mask) != mask)
> + cpu_relax();
Don't we need to break from here at some point if the LOCK's are never set?
> +}
> +
> +static inline void miphy365x_phy_set_ssc(struct miphy365x_phy *miphy_phy,
> + struct miphy365x_dev *miphy_dev)
> +{
> + u8 val;
> +
> + /*
> + * SSC Settings. SSC will be enabled through Link
> + * SSC Ampl. = 0.4%
> + * SSC Freq = 31KHz
> + */
> + writeb_relaxed(PLL_SSC_STEP_MSB_VAL,
> + miphy_phy->base + PLL_SSC_STEP_MSB_REG);
> + writeb_relaxed(PLL_SSC_STEP_LSB_VAL,
> + miphy_phy->base + PLL_SSC_STEP_LSB_REG);
> + writeb_relaxed(PLL_SSC_PER_MSB_VAL,
> + miphy_phy->base + PLL_SSC_PER_MSB_REG);
> + writeb_relaxed(PLL_SSC_PER_LSB_VAL,
> + miphy_phy->base + PLL_SSC_PER_LSB_REG);
> +
> + /* SSC Settings complete */
> + if (miphy_dev->sata_gen == SATA_GEN1) {
> + val = PLL_START_CAL | BUF_EN | SYNCHRO_TX | CONFIG_PLL;
> + writeb_relaxed(val, miphy_phy->base + PLL_CTRL1_REG);
> + } else {
> + val = SSC_EN | PLL_START_CAL | BUF_EN | SYNCHRO_TX | CONFIG_PLL;
> + writeb_relaxed(val, miphy_phy->base + PLL_CTRL1_REG);
> + }
> +}
> +
> +static int miphy365x_phy_init_sata_port(struct miphy365x_phy *miphy_phy,
> + struct miphy365x_dev *miphy_dev)
> +{
> + int ret;
> + u8 val;
> +
> + /*
> + * Force PHY macro reset, PLL calibration reset, PLL reset
> + * and assert Deserializer Reset
> + */
> + val = RST_PLL | RST_PLL_CAL | RST_RX | RST_MACRO;
> + writeb_relaxed(val, miphy_phy->base + RESET_REG);
> +
> + if (miphy_dev->sata_tx_pol_inv)
> + writeb_relaxed(TX_POL, miphy_phy->base + CTRL_REG);
> +
> + /*
> + * Force macro1 to use rx_lspd, tx_lspd
> + * Force Rx_Clock on first I-DLL phase
> + * Force Des in HP mode on macro, rx_lspd, tx_lspd for Gen2/3
> + */
> + writeb_relaxed(SPDSEL_SEL, miphy_phy->base + BOUNDARY1_REG);
> + writeb_relaxed(START_CLK_HF, miphy_phy->base + IDLL_TEST_REG);
> + val = rx_tx_spd[miphy_dev->sata_gen];
> + writeb_relaxed(val, miphy_phy->base + BOUNDARY3_REG);
> +
> + /* Wait for HFC_READY = 0 */
> + ret = miphy365x_phy_hfc_not_rdy(miphy_phy, miphy_dev);
> + if (ret)
> + return ret;
> +
> + /* Compensation Recalibration */
> + miphy365x_phy_set_comp(miphy_phy, miphy_dev);
> +
> + switch (miphy_dev->sata_gen) {
> + case SATA_GEN3:
> + /*
> + * TX Swing target 550-600mv peak to peak diff
> + * Tx Slew target 90-110ps rising/falling time
> + * Rx Eq ON3, Sigdet threshold SDTH1
> + */
> + val = PD_VDDTFILTER | CONF_GEN_SEL_GEN3;
> + writeb_relaxed(val, miphy_phy->base + BUF_SEL_REG);
> + val = SWING_VAL | PREEMPH_VAL;
> + writeb_relaxed(val, miphy_phy->base + TXBUF1_REG);
> + writeb_relaxed(TXSLEW_VAL, miphy_phy->base + TXBUF2_REG);
> + writeb_relaxed(0x00, miphy_phy->base + RXBUF_OFFSET_CTRL_REG);
> + val = SDTHRES_VAL | EQ_ON3;
> + writeb_relaxed(val, miphy_phy->base + RXBUF_REG);
> + break;
> + case SATA_GEN2:
> + /*
> + * conf gen sel=0x1 to program Gen2 banked registers
> + * VDDT filter ON
> + * Tx Swing target 550-600mV peak-to-peak diff
> + * Tx Slew target 90-110 ps rising/falling time
> + * RX Equalization ON1, Sigdet threshold SDTH1
> + */
> + writeb_relaxed(CONF_GEN_SEL_GEN2,
> + miphy_phy->base + BUF_SEL_REG);
> + writeb_relaxed(SWING_VAL, miphy_phy->base + TXBUF1_REG);
> + writeb_relaxed(TXSLEW_VAL, miphy_phy->base + TXBUF2_REG);
> + val = SDTHRES_VAL | EQ_ON1;
> + writeb_relaxed(val, miphy_phy->base + RXBUF_REG);
> + break;
> + case SATA_GEN1:
> + /*
> + * conf gen sel = 00b to program Gen1 banked registers
> + * VDDT filter ON
> + * Tx Swing target 500-550mV peak-to-peak diff
> + * Tx Slew target120-140 ps rising/falling time
> + */
> + writeb_relaxed(PD_VDDTFILTER, miphy_phy->base + BUF_SEL_REG);
> + writeb_relaxed(SWING_VAL_GEN1, miphy_phy->base + TXBUF1_REG);
> + writeb_relaxed(TXSLEW_VAL_GEN1, miphy_phy->base + TXBUF2_REG);
> + break;
> + default:
> + break;
> + }
> +
> + /* Force Macro1 in partial mode & release pll cal reset */
> + writeb_relaxed(RST_RX, miphy_phy->base + RESET_REG);
> + usleep_range(100, 150);
> +
> + miphy365x_phy_set_ssc(miphy_phy, miphy_dev);
> +
> + /* Wait for phy_ready */
> + ret = miphy365x_phy_rdy(miphy_phy, miphy_dev);
> + if (ret)
> + return ret;
> +
> + /*
> + * Enable macro1 to use rx_lspd & tx_lspd
> + * Release Rx_Clock on first I-DLL phase on macro1
> + * Assert deserializer reset
> + * des_bit_lock_en is set
> + * bit lock detection strength
> + * Deassert deserializer reset
> + */
> + writeb_relaxed(0x00, miphy_phy->base + BOUNDARY1_REG);
> + writeb_relaxed(0x00, miphy_phy->base + IDLL_TEST_REG);
> + writeb_relaxed(RST_RX, miphy_phy->base + RESET_REG);
> + val = miphy_dev->sata_tx_pol_inv ?
> + (TX_POL | DES_BIT_LOCK_EN) : DES_BIT_LOCK_EN;
> + writeb_relaxed(val, miphy_phy->base + CTRL_REG);
> +
> + val = BIT_LOCK_CNT_512 | BIT_LOCK_LEVEL;
> + writeb_relaxed(val, miphy_phy->base + DES_BITLOCK_REG);
> + writeb_relaxed(0x00, miphy_phy->base + RESET_REG);
> +
> + return 0;
> +}
> +
> +static int miphy365x_phy_init(struct phy *phy)
> +{
> + int ret = 0;
> + struct miphy365x_phy *miphy_phy = phy_get_drvdata(phy);
> + struct miphy365x_dev *miphy_dev = miphy365x_phy_to_dev(miphy_phy);
> +
> + mutex_lock(&miphy_dev->miphy_mutex);
> +
> + ret = miphy365x_set_path(miphy_phy, miphy_dev);
> + if (ret) {
> + mutex_unlock(&miphy_dev->miphy_mutex);
> + return ret;
> + }
> +
> + /* Initialise Miphy for PCIe or SATA */
> + if (miphy_phy->type == MIPHY_TYPE_PCIE)
> + miphy365x_phy_init_pcie_port(miphy_phy, miphy_dev);
> + else
> + ret = miphy365x_phy_init_sata_port(miphy_phy, miphy_dev);
> +
> + mutex_unlock(&miphy_dev->miphy_mutex);
> +
> + return ret;
> +}
> +
> +static int miphy365x_phy_power_on(struct phy *phy)
> +{
> + return 0;
> +}
> +
> +static int miphy365x_phy_power_off(struct phy *phy)
> +{
> + return 0;
> +}
Both these empty functions can be removed.
> +
> +static struct phy *miphy365x_phy_xlate(struct device *dev,
> + struct of_phandle_args *args)
> +{
> + struct miphy365x_dev *state = dev_get_drvdata(dev);
> + u8 port = args->args[0];
> + u8 type = args->args[1];
> +
> + if (WARN_ON(port >= ARRAY_SIZE(ports)))
> + return ERR_PTR(-EINVAL);
> +
> + if (type == MIPHY_TYPE_SATA)
> + state->phys[port].base = state->phys[port].sata;
> + else if (type == MIPHY_TYPE_PCIE)
> + state->phys[port].base = state->phys[port].pcie;
> + else {
> + WARN(1, "Invalid type specified in DT");
> + return ERR_PTR(-EINVAL);
> + }
> +
> + state->phys[port].type = type;
> +
> + return state->phys[port].phy;
> +}
> +
> +static struct phy_ops miphy365x_phy_ops = {
> + .init = miphy365x_phy_init,
> + .power_on = miphy365x_phy_power_on,
> + .power_off = miphy365x_phy_power_off,
> + .owner = THIS_MODULE,
> +};
> +
> +static int miphy365x_phy_get_base_addr(struct platform_device *pdev,
> + struct miphy365x_phy *phy, u8 port)
> +{
> + struct resource *res;
> + char sata[16];
> + char pcie[16];
It can be done with a single variable ;-)
> +
> + sprintf(sata, "sata%d", port);
> +
> + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, sata);
> + if (!res)
> + return -ENODEV;
> +
> + phy->sata = devm_ioremap(&pdev->dev, res->start, resource_size(res));
> + if (!phy->sata)
> + return -ENOMEM;
> +
> + sprintf(pcie, "pcie%d", port);
> +
> + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pcie);
> + if (!res)
> + return -ENODEV;
> +
> + phy->pcie = devm_ioremap(&pdev->dev, res->start, resource_size(res));
> + if (!phy->pcie)
> + return -ENOMEM;
> +
> + return 0;
> +}
> +
> +static int miphy365x_phy_of_probe(struct device_node *np,
> + struct miphy365x_dev *phy_dev)
> +{
> + const char *sata_gen;
> +
> + phy_dev->regmap = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
> + if (IS_ERR(phy_dev->regmap)) {
> + dev_err(phy_dev->dev, "No syscfg phandle specified\n");
> + return PTR_ERR(phy_dev->regmap);
> + }
> +
> + /* Default */
> + phy_dev->sata_gen = SATA_GEN1;
> +
> + of_property_read_string(np, "st,sata_gen", &sata_gen);
> + if (sata_gen) {
> + if (!strcmp(sata_gen, "gen3"))
> + phy_dev->sata_gen = SATA_GEN3;
> + else if (!strcmp(sata_gen, "gen2"))
> + phy_dev->sata_gen = SATA_GEN2;
> + }
> +
> + phy_dev->pcie_tx_pol_inv =
> + of_property_read_bool(np, "st,pcie_tx_pol_inv");
> +
> + phy_dev->sata_tx_pol_inv =
> + of_property_read_bool(np, "st,sata_tx_pol_inv");
> +
> + return 0;
> +}
> +
> +static int miphy365x_phy_probe(struct platform_device *pdev)
> +{
> + struct device_node *np = pdev->dev.of_node;
> + struct miphy365x_dev *phy_dev;
> + struct device *dev = &pdev->dev;
> + struct phy_provider *provider;
> + u8 port;
> + int ret;
> +
> + if (!np) {
> + dev_err(dev, "No DT found\n");
> + return -EINVAL;
> + }
> +
> + phy_dev = devm_kzalloc(dev, sizeof(*phy_dev), GFP_KERNEL);
> + if (!phy_dev)
> + return -ENOMEM;
> +
> + ret = miphy365x_phy_of_probe(np, phy_dev);
> + if (ret)
> + return ret;
> +
> + phy_dev->dev = dev;
> +
> + dev_set_drvdata(dev, phy_dev);
> +
> + mutex_init(&phy_dev->miphy_mutex);
> +
> + provider = devm_of_phy_provider_register(dev, miphy365x_phy_xlate);
> + if (IS_ERR(provider))
> + return PTR_ERR(provider);
Phy provider register should be the last step in registering the PHY.
Thanks
Kishon
next prev parent reply other threads:[~2014-02-13 6:53 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-12 16:03 [PATCH 1/4] phy: miphy365x: Add Device Tree bindings for the MiPHY365x Lee Jones
2014-02-12 16:03 ` Lee Jones
2014-02-12 16:03 ` [PATCH 2/4] phy: miphy365x: Add MiPHY365x header file for DT x Driver defines Lee Jones
2014-02-12 16:03 ` Lee Jones
2014-02-12 16:03 ` [PATCH 3/4] ARM: DT: STi: Add DT node for MiPHY365x Lee Jones
2014-02-12 16:03 ` Lee Jones
2014-02-12 16:03 ` [PATCH 4/4] phy: miphy365x: Provide support for the MiPHY356x Generic PHY Lee Jones
2014-02-12 16:03 ` Lee Jones
2014-02-12 16:54 ` Mark Rutland
2014-02-12 16:54 ` Mark Rutland
2014-02-13 10:47 ` Lee Jones
2014-02-13 10:47 ` Lee Jones
2014-02-13 6:53 ` Kishon Vijay Abraham I [this message]
2014-02-13 6:53 ` Kishon Vijay Abraham I
2014-02-13 10:29 ` Lee Jones
2014-02-13 10:29 ` Lee Jones
2014-02-12 16:40 ` [PATCH 1/4] phy: miphy365x: Add Device Tree bindings for the MiPHY365x Mark Rutland
2014-02-12 16:40 ` Mark Rutland
2014-02-12 16:40 ` Mark Rutland
2014-02-13 11:03 ` Lee Jones
2014-02-13 11:03 ` Lee Jones
2014-02-13 12:23 ` Mark Rutland
2014-02-13 12:23 ` Mark Rutland
2014-02-13 12:23 ` Mark Rutland
-- strict thread matches above, loose matches on Subject: below --
2014-02-14 11:23 Lee Jones
2014-02-14 11:23 ` [PATCH 4/4] phy: miphy365x: Provide support for the MiPHY356x Generic PHY Lee Jones
2014-02-14 11:23 ` Lee Jones
2014-02-25 10:51 ` Lee Jones
2014-02-25 10:51 ` Lee Jones
2014-03-05 7:55 ` Mark Rutland
2014-03-05 7:55 ` Mark Rutland
2014-05-19 14:21 ` Kishon Vijay Abraham I
2014-05-19 14:21 ` Kishon Vijay Abraham I
2014-05-19 16:41 ` Lee Jones
2014-05-19 16:41 ` Lee Jones
2014-03-12 13:14 [PATCH 0/4] phy: Introduce support for MiPHY365x Lee Jones
2014-03-12 13:14 ` [PATCH 4/4] phy: miphy365x: Provide support for the MiPHY356x Generic PHY Lee Jones
2014-03-12 13:14 ` Lee Jones
2014-04-29 7:21 [PATCH 0/4] phy: Introduce support for MiPHY365x Lee Jones
2014-04-29 7:21 ` [PATCH 4/4] phy: miphy365x: Provide support for the MiPHY356x Generic PHY Lee Jones
2014-04-29 7:21 ` Lee Jones
2014-05-22 13:53 [RESEND 0/4] phy: Introduce support for MiPHY365x Lee Jones
2014-05-22 13:53 ` [PATCH 4/4] phy: miphy365x: Provide support for the MiPHY356x Generic PHY Lee Jones
2014-05-22 13:53 ` Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52FC6BF5.9030900@ti.com \
--to=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.