* [PATCH v4 0/2] net/phy: micrel: Add DT configuration support and documentation for KSZ9031
@ 2014-05-06 7:40 Hubert Chaumette
2014-05-06 7:40 ` [PATCH v4 1/2] Update Micrel KSZ90x1 binding documentation Hubert Chaumette
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Hubert Chaumette @ 2014-05-06 7:40 UTC (permalink / raw)
To: f.fainelli
Cc: netdev, linux-kernel, robh+dt, pawel.moll, mark.rutland,
ijc+devicetree, galak, rdunlap, xobs, davem, devicetree,
linux-doc
- Adds DT configuration support for ksz9031
- Renames micrel-ksz9021.txt to micrel-ksz90x1.txt and adds ksz9031 binding
documentation
Changes since v3:
- Rebased on net-next
Changes since v2:
- Merged together ksz9031_load_{clk,data,ctrl}_skew_values()
- Added field length and number of fields prameter to account for registers
specificities
- Added binding documentation
Changes since v1:
- Removed ksz9021 and ksz9031 fixup deletions from arch/arm/mach-imx/mach-imx6q.c
Hubert Chaumette (2):
Update Micrel KSZ90x1 binding documentation
ARM: i.MX6: Add OF configuration support for ksz9031
.../devicetree/bindings/net/micrel-ksz9021.txt | 49 ----------
.../devicetree/bindings/net/micrel-ksz90x1.txt | 83 ++++++++++++++++
drivers/net/phy/micrel.c | 106 ++++++++++++++++++++-
3 files changed, 188 insertions(+), 50 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/net/micrel-ksz9021.txt
create mode 100644 Documentation/devicetree/bindings/net/micrel-ksz90x1.txt
--
2.0.0.rc0
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v4 1/2] Update Micrel KSZ90x1 binding documentation 2014-05-06 7:40 [PATCH v4 0/2] net/phy: micrel: Add DT configuration support and documentation for KSZ9031 Hubert Chaumette @ 2014-05-06 7:40 ` Hubert Chaumette 2014-05-07 17:31 ` Florian Fainelli [not found] ` <1399362017-25787-1-git-send-email-hchaumette-HH5893ap9ioXz/+GnIZSFEEOCMrvLtNR@public.gmane.org> 2014-05-07 20:52 ` [PATCH v4 0/2] net/phy: micrel: Add DT configuration support and documentation for KSZ9031 David Miller 2 siblings, 1 reply; 6+ messages in thread From: Hubert Chaumette @ 2014-05-06 7:40 UTC (permalink / raw) To: f.fainelli Cc: netdev, linux-kernel, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, rdunlap, xobs, davem, devicetree, linux-doc Renames micrel-ksz9021.txt to micrel-ksz90x1.txt and adds documentation for the KSZ9031 binding from patch 1. Also adds step increment information, and note about phy fixups. Signed-off-by: Hubert Chaumette <hchaumette@adeneo-embedded.com> --- .../devicetree/bindings/net/micrel-ksz9021.txt | 49 ------------- .../devicetree/bindings/net/micrel-ksz90x1.txt | 83 ++++++++++++++++++++++ 2 files changed, 83 insertions(+), 49 deletions(-) delete mode 100644 Documentation/devicetree/bindings/net/micrel-ksz9021.txt create mode 100644 Documentation/devicetree/bindings/net/micrel-ksz90x1.txt diff --git a/Documentation/devicetree/bindings/net/micrel-ksz9021.txt b/Documentation/devicetree/bindings/net/micrel-ksz9021.txt deleted file mode 100644 index 997a63f..0000000 --- a/Documentation/devicetree/bindings/net/micrel-ksz9021.txt +++ /dev/null @@ -1,49 +0,0 @@ -Micrel KSZ9021 Gigabit Ethernet PHY - -Some boards require special tuning values, particularly when it comes to -clock delays. You can specify clock delay values by adding -micrel-specific properties to an Ethernet OF device node. - -All skew control options are specified in picoseconds. The minimum -value is 0, and the maximum value is 3000. - -Optional properties: - - rxc-skew-ps : Skew control of RXC pad - - rxdv-skew-ps : Skew control of RX CTL pad - - txc-skew-ps : Skew control of TXC pad - - txen-skew-ps : Skew control of TX_CTL pad - - rxd0-skew-ps : Skew control of RX data 0 pad - - rxd1-skew-ps : Skew control of RX data 1 pad - - rxd2-skew-ps : Skew control of RX data 2 pad - - rxd3-skew-ps : Skew control of RX data 3 pad - - txd0-skew-ps : Skew control of TX data 0 pad - - txd1-skew-ps : Skew control of TX data 1 pad - - txd2-skew-ps : Skew control of TX data 2 pad - - txd3-skew-ps : Skew control of TX data 3 pad - -Examples: - - /* Attach to an Ethernet device with autodetected PHY */ - &enet { - rxc-skew-ps = <3000>; - rxdv-skew-ps = <0>; - txc-skew-ps = <3000>; - txen-skew-ps = <0>; - status = "okay"; - }; - - /* Attach to an explicitly-specified PHY */ - mdio { - phy0: ethernet-phy@0 { - rxc-skew-ps = <3000>; - rxdv-skew-ps = <0>; - txc-skew-ps = <3000>; - txen-skew-ps = <0>; - reg = <0>; - }; - }; - ethernet@70000 { - status = "okay"; - phy = <&phy0>; - phy-mode = "rgmii-id"; - }; diff --git a/Documentation/devicetree/bindings/net/micrel-ksz90x1.txt b/Documentation/devicetree/bindings/net/micrel-ksz90x1.txt new file mode 100644 index 0000000..692076f --- /dev/null +++ b/Documentation/devicetree/bindings/net/micrel-ksz90x1.txt @@ -0,0 +1,83 @@ +Micrel KSZ9021/KSZ9031 Gigabit Ethernet PHY + +Some boards require special tuning values, particularly when it comes to +clock delays. You can specify clock delay values by adding +micrel-specific properties to an Ethernet OF device node. + +Note that these settings are applied after any phy-specific fixup from +phy_fixup_list (see phy_init_hw() from drivers/net/phy/phy_device.c), +and therefore may overwrite them. + +KSZ9021: + + All skew control options are specified in picoseconds. The minimum + value is 0, the maximum value is 3000, and it is incremented by 200ps + steps. + + Optional properties: + + - rxc-skew-ps : Skew control of RXC pad + - rxdv-skew-ps : Skew control of RX CTL pad + - txc-skew-ps : Skew control of TXC pad + - txen-skew-ps : Skew control of TX CTL pad + - rxd0-skew-ps : Skew control of RX data 0 pad + - rxd1-skew-ps : Skew control of RX data 1 pad + - rxd2-skew-ps : Skew control of RX data 2 pad + - rxd3-skew-ps : Skew control of RX data 3 pad + - txd0-skew-ps : Skew control of TX data 0 pad + - txd1-skew-ps : Skew control of TX data 1 pad + - txd2-skew-ps : Skew control of TX data 2 pad + - txd3-skew-ps : Skew control of TX data 3 pad + +KSZ9031: + + All skew control options are specified in picoseconds. The minimum + value is 0, and the maximum is property-dependent. The increment + step is 60ps. + + Optional properties: + + Maximum value of 1860: + + - rxc-skew-ps : Skew control of RX clock pad + - txc-skew-ps : Skew control of TX clock pad + + Maximum value of 900: + + - rxdv-skew-ps : Skew control of RX CTL pad + - txen-skew-ps : Skew control of TX CTL pad + - rxd0-skew-ps : Skew control of RX data 0 pad + - rxd1-skew-ps : Skew control of RX data 1 pad + - rxd2-skew-ps : Skew control of RX data 2 pad + - rxd3-skew-ps : Skew control of RX data 3 pad + - txd0-skew-ps : Skew control of TX data 0 pad + - txd1-skew-ps : Skew control of TX data 1 pad + - txd2-skew-ps : Skew control of TX data 2 pad + - txd3-skew-ps : Skew control of TX data 3 pad + +Examples: + + /* Attach to an Ethernet device with autodetected PHY */ + &enet { + rxc-skew-ps = <3000>; + rxdv-skew-ps = <0>; + txc-skew-ps = <3000>; + txen-skew-ps = <0>; + status = "okay"; + }; + + /* Attach to an explicitly-specified PHY */ + mdio { + phy0: ethernet-phy@0 { + rxc-skew-ps = <3000>; + rxdv-skew-ps = <0>; + txc-skew-ps = <3000>; + txen-skew-ps = <0>; + reg = <0>; + }; + }; + ethernet@70000 { + status = "okay"; + phy = <&phy0>; + phy-mode = "rgmii-id"; + }; -- 2.0.0.rc0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v4 1/2] Update Micrel KSZ90x1 binding documentation 2014-05-06 7:40 ` [PATCH v4 1/2] Update Micrel KSZ90x1 binding documentation Hubert Chaumette @ 2014-05-07 17:31 ` Florian Fainelli 0 siblings, 0 replies; 6+ messages in thread From: Florian Fainelli @ 2014-05-07 17:31 UTC (permalink / raw) To: Hubert Chaumette Cc: netdev, linux-kernel@vger.kernel.org, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Randy Dunlap, xobs, David Miller, devicetree@vger.kernel.org, linux-doc@vger.kernel.org 2014-05-06 0:40 GMT-07:00 Hubert Chaumette <hchaumette@adeneo-embedded.com>: > Renames micrel-ksz9021.txt to micrel-ksz90x1.txt and adds documentation for > the KSZ9031 binding from patch 1. Also adds step increment information, and > note about phy fixups. > > Signed-off-by: Hubert Chaumette <hchaumette@adeneo-embedded.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> > --- > .../devicetree/bindings/net/micrel-ksz9021.txt | 49 ------------- > .../devicetree/bindings/net/micrel-ksz90x1.txt | 83 ++++++++++++++++++++++ > 2 files changed, 83 insertions(+), 49 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/net/micrel-ksz9021.txt > create mode 100644 Documentation/devicetree/bindings/net/micrel-ksz90x1.txt > > diff --git a/Documentation/devicetree/bindings/net/micrel-ksz9021.txt b/Documentation/devicetree/bindings/net/micrel-ksz9021.txt > deleted file mode 100644 > index 997a63f..0000000 > --- a/Documentation/devicetree/bindings/net/micrel-ksz9021.txt > +++ /dev/null > @@ -1,49 +0,0 @@ > -Micrel KSZ9021 Gigabit Ethernet PHY > - > -Some boards require special tuning values, particularly when it comes to > -clock delays. You can specify clock delay values by adding > -micrel-specific properties to an Ethernet OF device node. > - > -All skew control options are specified in picoseconds. The minimum > -value is 0, and the maximum value is 3000. > - > -Optional properties: > - - rxc-skew-ps : Skew control of RXC pad > - - rxdv-skew-ps : Skew control of RX CTL pad > - - txc-skew-ps : Skew control of TXC pad > - - txen-skew-ps : Skew control of TX_CTL pad > - - rxd0-skew-ps : Skew control of RX data 0 pad > - - rxd1-skew-ps : Skew control of RX data 1 pad > - - rxd2-skew-ps : Skew control of RX data 2 pad > - - rxd3-skew-ps : Skew control of RX data 3 pad > - - txd0-skew-ps : Skew control of TX data 0 pad > - - txd1-skew-ps : Skew control of TX data 1 pad > - - txd2-skew-ps : Skew control of TX data 2 pad > - - txd3-skew-ps : Skew control of TX data 3 pad > - > -Examples: > - > - /* Attach to an Ethernet device with autodetected PHY */ > - &enet { > - rxc-skew-ps = <3000>; > - rxdv-skew-ps = <0>; > - txc-skew-ps = <3000>; > - txen-skew-ps = <0>; > - status = "okay"; > - }; > - > - /* Attach to an explicitly-specified PHY */ > - mdio { > - phy0: ethernet-phy@0 { > - rxc-skew-ps = <3000>; > - rxdv-skew-ps = <0>; > - txc-skew-ps = <3000>; > - txen-skew-ps = <0>; > - reg = <0>; > - }; > - }; > - ethernet@70000 { > - status = "okay"; > - phy = <&phy0>; > - phy-mode = "rgmii-id"; > - }; > diff --git a/Documentation/devicetree/bindings/net/micrel-ksz90x1.txt b/Documentation/devicetree/bindings/net/micrel-ksz90x1.txt > new file mode 100644 > index 0000000..692076f > --- /dev/null > +++ b/Documentation/devicetree/bindings/net/micrel-ksz90x1.txt > @@ -0,0 +1,83 @@ > +Micrel KSZ9021/KSZ9031 Gigabit Ethernet PHY > + > +Some boards require special tuning values, particularly when it comes to > +clock delays. You can specify clock delay values by adding > +micrel-specific properties to an Ethernet OF device node. > + > +Note that these settings are applied after any phy-specific fixup from > +phy_fixup_list (see phy_init_hw() from drivers/net/phy/phy_device.c), > +and therefore may overwrite them. > + > +KSZ9021: > + > + All skew control options are specified in picoseconds. The minimum > + value is 0, the maximum value is 3000, and it is incremented by 200ps > + steps. > + > + Optional properties: > + > + - rxc-skew-ps : Skew control of RXC pad > + - rxdv-skew-ps : Skew control of RX CTL pad > + - txc-skew-ps : Skew control of TXC pad > + - txen-skew-ps : Skew control of TX CTL pad > + - rxd0-skew-ps : Skew control of RX data 0 pad > + - rxd1-skew-ps : Skew control of RX data 1 pad > + - rxd2-skew-ps : Skew control of RX data 2 pad > + - rxd3-skew-ps : Skew control of RX data 3 pad > + - txd0-skew-ps : Skew control of TX data 0 pad > + - txd1-skew-ps : Skew control of TX data 1 pad > + - txd2-skew-ps : Skew control of TX data 2 pad > + - txd3-skew-ps : Skew control of TX data 3 pad > + > +KSZ9031: > + > + All skew control options are specified in picoseconds. The minimum > + value is 0, and the maximum is property-dependent. The increment > + step is 60ps. > + > + Optional properties: > + > + Maximum value of 1860: > + > + - rxc-skew-ps : Skew control of RX clock pad > + - txc-skew-ps : Skew control of TX clock pad > + > + Maximum value of 900: > + > + - rxdv-skew-ps : Skew control of RX CTL pad > + - txen-skew-ps : Skew control of TX CTL pad > + - rxd0-skew-ps : Skew control of RX data 0 pad > + - rxd1-skew-ps : Skew control of RX data 1 pad > + - rxd2-skew-ps : Skew control of RX data 2 pad > + - rxd3-skew-ps : Skew control of RX data 3 pad > + - txd0-skew-ps : Skew control of TX data 0 pad > + - txd1-skew-ps : Skew control of TX data 1 pad > + - txd2-skew-ps : Skew control of TX data 2 pad > + - txd3-skew-ps : Skew control of TX data 3 pad > + > +Examples: > + > + /* Attach to an Ethernet device with autodetected PHY */ > + &enet { > + rxc-skew-ps = <3000>; > + rxdv-skew-ps = <0>; > + txc-skew-ps = <3000>; > + txen-skew-ps = <0>; > + status = "okay"; > + }; > + > + /* Attach to an explicitly-specified PHY */ > + mdio { > + phy0: ethernet-phy@0 { > + rxc-skew-ps = <3000>; > + rxdv-skew-ps = <0>; > + txc-skew-ps = <3000>; > + txen-skew-ps = <0>; > + reg = <0>; > + }; > + }; > + ethernet@70000 { > + status = "okay"; > + phy = <&phy0>; > + phy-mode = "rgmii-id"; > + }; > -- > 2.0.0.rc0 > -- Florian ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <1399362017-25787-1-git-send-email-hchaumette-HH5893ap9ioXz/+GnIZSFEEOCMrvLtNR@public.gmane.org>]
* [PATCH v4 2/2] ARM: i.MX6: Add OF configuration support for ksz9031 [not found] ` <1399362017-25787-1-git-send-email-hchaumette-HH5893ap9ioXz/+GnIZSFEEOCMrvLtNR@public.gmane.org> @ 2014-05-06 7:40 ` Hubert Chaumette 2014-05-07 17:31 ` Florian Fainelli 0 siblings, 1 reply; 6+ messages in thread From: Hubert Chaumette @ 2014-05-06 7:40 UTC (permalink / raw) To: f.fainelli-Re5JQEeQqe8AvxtiuMwx3w Cc: netdev-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, robh+dt-DgEjT+Ai2ygdnm+yROfE0A, pawel.moll-5wv7dgnIgG8, mark.rutland-5wv7dgnIgG8, ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg, galak-sgV2jX0FEOL9JmXXK+q4OQ, rdunlap-wEGCiKHe2LqWVfeAwA7xHQ, xobs-nXMMniAx+RbQT0dZR+AlfA, davem-fT/PcQaiUtIeIZ0/mPfg9Q, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-doc-u79uwXL29TY76Z2rM5mHXA Adds support for ksz9031 PAD skew configuration over devicetree. Signed-off-by: Hubert Chaumette <hchaumette-HH5893ap9ioXz/+GnIZSFEEOCMrvLtNR@public.gmane.org> --- drivers/net/phy/micrel.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index d849684..bc7c7d2 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -283,6 +283,110 @@ static int ksz9021_config_init(struct phy_device *phydev) return 0; } +#define MII_KSZ9031RN_MMD_CTRL_REG 0x0d +#define MII_KSZ9031RN_MMD_REGDATA_REG 0x0e +#define OP_DATA 1 +#define KSZ9031_PS_TO_REG 60 + +/* Extended registers */ +#define MII_KSZ9031RN_CONTROL_PAD_SKEW 4 +#define MII_KSZ9031RN_RX_DATA_PAD_SKEW 5 +#define MII_KSZ9031RN_TX_DATA_PAD_SKEW 6 +#define MII_KSZ9031RN_CLK_PAD_SKEW 8 + +static int ksz9031_extended_write(struct phy_device *phydev, + u8 mode, u32 dev_addr, u32 regnum, u16 val) +{ + phy_write(phydev, MII_KSZ9031RN_MMD_CTRL_REG, dev_addr); + phy_write(phydev, MII_KSZ9031RN_MMD_REGDATA_REG, regnum); + phy_write(phydev, MII_KSZ9031RN_MMD_CTRL_REG, (mode << 14) | dev_addr); + return phy_write(phydev, MII_KSZ9031RN_MMD_REGDATA_REG, val); +} + +static int ksz9031_extended_read(struct phy_device *phydev, + u8 mode, u32 dev_addr, u32 regnum) +{ + phy_write(phydev, MII_KSZ9031RN_MMD_CTRL_REG, dev_addr); + phy_write(phydev, MII_KSZ9031RN_MMD_REGDATA_REG, regnum); + phy_write(phydev, MII_KSZ9031RN_MMD_CTRL_REG, (mode << 14) | dev_addr); + return phy_read(phydev, MII_KSZ9031RN_MMD_REGDATA_REG); +} + +static int ksz9031_of_load_skew_values(struct phy_device *phydev, + struct device_node *of_node, + u16 reg, size_t field_sz, + char *field[], u8 numfields) +{ + int val[4] = {-1, -2, -3, -4}; + int matches = 0; + u16 mask; + u16 maxval; + u16 newval; + int i; + + for (i = 0; i < numfields; i++) + if (!of_property_read_u32(of_node, field[i], val + i)) + matches++; + + if (!matches) + return 0; + + if (matches < numfields) + newval = ksz9031_extended_read(phydev, OP_DATA, 2, reg); + else + newval = 0; + + maxval = (field_sz == 4) ? 0xf : 0x1f; + for (i = 0; i < numfields; i++) + if (val[i] != -(i + 1)) { + mask = 0xffff; + mask ^= maxval << (field_sz * i); + newval = (newval & mask) | + (((val[i] / KSZ9031_PS_TO_REG) & maxval) + << (field_sz * i)); + } + + return ksz9031_extended_write(phydev, OP_DATA, 2, reg, newval); +} + +static int ksz9031_config_init(struct phy_device *phydev) +{ + struct device *dev = &phydev->dev; + struct device_node *of_node = dev->of_node; + char *clk_skews[2] = {"rxc-skew-ps", "txc-skew-ps"}; + char *rx_data_skews[4] = { + "rxd0-skew-ps", "rxd1-skew-ps", + "rxd2-skew-ps", "rxd3-skew-ps" + }; + char *tx_data_skews[4] = { + "txd0-skew-ps", "txd1-skew-ps", + "txd2-skew-ps", "txd3-skew-ps" + }; + char *control_skews[2] = {"txen-skew-ps", "rxdv-skew-ps"}; + + if (!of_node && dev->parent->of_node) + of_node = dev->parent->of_node; + + if (of_node) { + ksz9031_of_load_skew_values(phydev, of_node, + MII_KSZ9031RN_CLK_PAD_SKEW, 5, + clk_skews, 2); + + ksz9031_of_load_skew_values(phydev, of_node, + MII_KSZ9031RN_CONTROL_PAD_SKEW, 4, + control_skews, 2); + + ksz9031_of_load_skew_values(phydev, of_node, + MII_KSZ9031RN_RX_DATA_PAD_SKEW, 4, + rx_data_skews, 4); + + ksz9031_of_load_skew_values(phydev, of_node, + MII_KSZ9031RN_TX_DATA_PAD_SKEW, 4, + tx_data_skews, 4); + } + return 0; +} + #define KSZ8873MLL_GLOBAL_CONTROL_4 0x06 #define KSZ8873MLL_GLOBAL_CONTROL_4_DUPLEX (1 << 6) #define KSZ8873MLL_GLOBAL_CONTROL_4_SPEED (1 << 4) @@ -469,7 +573,7 @@ static struct phy_driver ksphy_driver[] = { .features = (PHY_GBIT_FEATURES | SUPPORTED_Pause | SUPPORTED_Asym_Pause), .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, - .config_init = kszphy_config_init, + .config_init = ksz9031_config_init, .config_aneg = genphy_config_aneg, .read_status = genphy_read_status, .ack_interrupt = kszphy_ack_interrupt, -- 2.0.0.rc0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v4 2/2] ARM: i.MX6: Add OF configuration support for ksz9031 2014-05-06 7:40 ` [PATCH v4 2/2] ARM: i.MX6: Add OF configuration support for ksz9031 Hubert Chaumette @ 2014-05-07 17:31 ` Florian Fainelli 0 siblings, 0 replies; 6+ messages in thread From: Florian Fainelli @ 2014-05-07 17:31 UTC (permalink / raw) To: Hubert Chaumette Cc: netdev, linux-kernel@vger.kernel.org, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Randy Dunlap, xobs, David Miller, devicetree@vger.kernel.org, linux-doc@vger.kernel.org 2014-05-06 0:40 GMT-07:00 Hubert Chaumette <hchaumette@adeneo-embedded.com>: > Adds support for ksz9031 PAD skew configuration over devicetree. > > Signed-off-by: Hubert Chaumette <hchaumette@adeneo-embedded.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> > --- > drivers/net/phy/micrel.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 105 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c > index d849684..bc7c7d2 100644 > --- a/drivers/net/phy/micrel.c > +++ b/drivers/net/phy/micrel.c > @@ -283,6 +283,110 @@ static int ksz9021_config_init(struct phy_device *phydev) > return 0; > } > > +#define MII_KSZ9031RN_MMD_CTRL_REG 0x0d > +#define MII_KSZ9031RN_MMD_REGDATA_REG 0x0e > +#define OP_DATA 1 > +#define KSZ9031_PS_TO_REG 60 > + > +/* Extended registers */ > +#define MII_KSZ9031RN_CONTROL_PAD_SKEW 4 > +#define MII_KSZ9031RN_RX_DATA_PAD_SKEW 5 > +#define MII_KSZ9031RN_TX_DATA_PAD_SKEW 6 > +#define MII_KSZ9031RN_CLK_PAD_SKEW 8 > + > +static int ksz9031_extended_write(struct phy_device *phydev, > + u8 mode, u32 dev_addr, u32 regnum, u16 val) > +{ > + phy_write(phydev, MII_KSZ9031RN_MMD_CTRL_REG, dev_addr); > + phy_write(phydev, MII_KSZ9031RN_MMD_REGDATA_REG, regnum); > + phy_write(phydev, MII_KSZ9031RN_MMD_CTRL_REG, (mode << 14) | dev_addr); > + return phy_write(phydev, MII_KSZ9031RN_MMD_REGDATA_REG, val); > +} > + > +static int ksz9031_extended_read(struct phy_device *phydev, > + u8 mode, u32 dev_addr, u32 regnum) > +{ > + phy_write(phydev, MII_KSZ9031RN_MMD_CTRL_REG, dev_addr); > + phy_write(phydev, MII_KSZ9031RN_MMD_REGDATA_REG, regnum); > + phy_write(phydev, MII_KSZ9031RN_MMD_CTRL_REG, (mode << 14) | dev_addr); > + return phy_read(phydev, MII_KSZ9031RN_MMD_REGDATA_REG); > +} > + > +static int ksz9031_of_load_skew_values(struct phy_device *phydev, > + struct device_node *of_node, > + u16 reg, size_t field_sz, > + char *field[], u8 numfields) > +{ > + int val[4] = {-1, -2, -3, -4}; > + int matches = 0; > + u16 mask; > + u16 maxval; > + u16 newval; > + int i; > + > + for (i = 0; i < numfields; i++) > + if (!of_property_read_u32(of_node, field[i], val + i)) > + matches++; > + > + if (!matches) > + return 0; > + > + if (matches < numfields) > + newval = ksz9031_extended_read(phydev, OP_DATA, 2, reg); > + else > + newval = 0; > + > + maxval = (field_sz == 4) ? 0xf : 0x1f; > + for (i = 0; i < numfields; i++) > + if (val[i] != -(i + 1)) { > + mask = 0xffff; > + mask ^= maxval << (field_sz * i); > + newval = (newval & mask) | > + (((val[i] / KSZ9031_PS_TO_REG) & maxval) > + << (field_sz * i)); > + } > + > + return ksz9031_extended_write(phydev, OP_DATA, 2, reg, newval); > +} > + > +static int ksz9031_config_init(struct phy_device *phydev) > +{ > + struct device *dev = &phydev->dev; > + struct device_node *of_node = dev->of_node; > + char *clk_skews[2] = {"rxc-skew-ps", "txc-skew-ps"}; > + char *rx_data_skews[4] = { > + "rxd0-skew-ps", "rxd1-skew-ps", > + "rxd2-skew-ps", "rxd3-skew-ps" > + }; > + char *tx_data_skews[4] = { > + "txd0-skew-ps", "txd1-skew-ps", > + "txd2-skew-ps", "txd3-skew-ps" > + }; > + char *control_skews[2] = {"txen-skew-ps", "rxdv-skew-ps"}; > + > + if (!of_node && dev->parent->of_node) > + of_node = dev->parent->of_node; > + > + if (of_node) { > + ksz9031_of_load_skew_values(phydev, of_node, > + MII_KSZ9031RN_CLK_PAD_SKEW, 5, > + clk_skews, 2); > + > + ksz9031_of_load_skew_values(phydev, of_node, > + MII_KSZ9031RN_CONTROL_PAD_SKEW, 4, > + control_skews, 2); > + > + ksz9031_of_load_skew_values(phydev, of_node, > + MII_KSZ9031RN_RX_DATA_PAD_SKEW, 4, > + rx_data_skews, 4); > + > + ksz9031_of_load_skew_values(phydev, of_node, > + MII_KSZ9031RN_TX_DATA_PAD_SKEW, 4, > + tx_data_skews, 4); > + } > + return 0; > +} > + > #define KSZ8873MLL_GLOBAL_CONTROL_4 0x06 > #define KSZ8873MLL_GLOBAL_CONTROL_4_DUPLEX (1 << 6) > #define KSZ8873MLL_GLOBAL_CONTROL_4_SPEED (1 << 4) > @@ -469,7 +573,7 @@ static struct phy_driver ksphy_driver[] = { > .features = (PHY_GBIT_FEATURES | SUPPORTED_Pause > | SUPPORTED_Asym_Pause), > .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, > - .config_init = kszphy_config_init, > + .config_init = ksz9031_config_init, > .config_aneg = genphy_config_aneg, > .read_status = genphy_read_status, > .ack_interrupt = kszphy_ack_interrupt, > -- > 2.0.0.rc0 > -- Florian ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v4 0/2] net/phy: micrel: Add DT configuration support and documentation for KSZ9031 2014-05-06 7:40 [PATCH v4 0/2] net/phy: micrel: Add DT configuration support and documentation for KSZ9031 Hubert Chaumette 2014-05-06 7:40 ` [PATCH v4 1/2] Update Micrel KSZ90x1 binding documentation Hubert Chaumette [not found] ` <1399362017-25787-1-git-send-email-hchaumette-HH5893ap9ioXz/+GnIZSFEEOCMrvLtNR@public.gmane.org> @ 2014-05-07 20:52 ` David Miller 2 siblings, 0 replies; 6+ messages in thread From: David Miller @ 2014-05-07 20:52 UTC (permalink / raw) To: hchaumette Cc: f.fainelli, netdev, linux-kernel, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, rdunlap, xobs, devicetree, linux-doc From: Hubert Chaumette <hchaumette@adeneo-embedded.com> Date: Tue, 6 May 2014 09:40:15 +0200 > - Adds DT configuration support for ksz9031 > - Renames micrel-ksz9021.txt to micrel-ksz90x1.txt and adds ksz9031 binding > documentation > > Changes since v3: > - Rebased on net-next > Changes since v2: > - Merged together ksz9031_load_{clk,data,ctrl}_skew_values() > - Added field length and number of fields prameter to account for registers > specificities > - Added binding documentation > Changes since v1: > - Removed ksz9021 and ksz9031 fixup deletions from arch/arm/mach-imx/mach-imx6q.c Series applied to net-next, thanks. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-05-07 20:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-06 7:40 [PATCH v4 0/2] net/phy: micrel: Add DT configuration support and documentation for KSZ9031 Hubert Chaumette
2014-05-06 7:40 ` [PATCH v4 1/2] Update Micrel KSZ90x1 binding documentation Hubert Chaumette
2014-05-07 17:31 ` Florian Fainelli
[not found] ` <1399362017-25787-1-git-send-email-hchaumette-HH5893ap9ioXz/+GnIZSFEEOCMrvLtNR@public.gmane.org>
2014-05-06 7:40 ` [PATCH v4 2/2] ARM: i.MX6: Add OF configuration support for ksz9031 Hubert Chaumette
2014-05-07 17:31 ` Florian Fainelli
2014-05-07 20:52 ` [PATCH v4 0/2] net/phy: micrel: Add DT configuration support and documentation for KSZ9031 David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).