On Thursday 22 August 2013 05:07 PM, Daniel Mack wrote:
> The cpsw currently lacks code to properly set up the hardware interface
> mode on AM33xx. Other platforms might be equally affected.
>
> Usually, the bootloader will configure the control module register, so
> probably that's why such support wasn't needed in the past. In suspend
> mode though, this register is modified, and so it needs reprogramming
> after resume.
>
> This patch adds code that makes use of the previously added and optional
> support for passing the control mode register, and configures the
> correct register bits from _cpsw_adjust_link().
>
> The AM33xx also has a bit for each slave to configure the RMII reference
> clock direction. Setting it is now supported by a per-slave DT property.
>
> This code path introducted by this patch is currently exclusive for
> am33xx.
>
> Signed-off-by: Daniel Mack <zonque@xxxxxxxxx>
> ---
> Documentation/devicetree/bindings/net/cpsw.txt | 2 ++
> drivers/net/ethernet/ti/cpsw.c | 49 ++++++++++++++++++++++++++
> include/linux/platform_data/cpsw.h | 1 +
> 3 files changed, 52 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/net/cpsw.txt b/Documentation/devicetree/bindings/net/cpsw.txt
> index 4e5ca54..0ccf01f 100644
> --- a/Documentation/devicetree/bindings/net/cpsw.txt
> +++ b/Documentation/devicetree/bindings/net/cpsw.txt
> @@ -33,6 +33,8 @@ Required properties:
> - phy_id : Specifies slave phy id
> - phy-mode : The interface between the SoC and the PHY (a string
> that of_get_phy_mode() can understand)
> +- ti,rmii-clock-ext : If present, the driver will configure the RMII
> + interface to external clock usage
> - mac-address : Specifies slave MAC address
>
> Optional properties:
> diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
> index 4855d8e..d18ae43 100644
> --- a/drivers/net/ethernet/ti/cpsw.c
> +++ b/drivers/net/ethernet/ti/cpsw.c
> @@ -138,6 +138,14 @@ do { \
> #define CPSW_CMINTMAX_INTVL (1000 / CPSW_CMINTMIN_CNT)
> #define CPSW_CMINTMIN_INTVL ((1000 / CPSW_CMINTMAX_CNT) + 1)
>
> +#define AM33XX_GMII_SEL_MODE_MII (0)
> +#define AM33XX_GMII_SEL_MODE_RMII (1)
> +#define AM33XX_GMII_SEL_MODE_RGMII (2)
> +#define AM33XX_GMII_SEL_MODE_UNUSED (3)
> +
> +#define AM33XX_GMII_SEL_RMII2_IO_CLK_EN BIT(7)
> +#define AM33XX_GMII_SEL_RMII1_IO_CLK_EN BIT(6)
> +
> #define cpsw_enable_irq(priv) \
> do { \
> u32 i; \
> @@ -728,6 +736,44 @@ static void _cpsw_adjust_link(struct cpsw_slave *slave,
> u32 mac_control = 0;
> u32 slave_port;
>
> + if (priv->gmii_sel_reg && of_machine_is_compatible("ti,am33xx")) {
This sounds like the DT version of cpu_is_am335x()! Looks like you need
to introduce a new compatible "ti,am3352-cpsw" to indicate the AM3352
specific features of the CPSW IP (yeah, control module is not really
part of the IP, but by introducing it in the driver, we are treating it
such anyway. And you can see this register as extension of IP since its
not shared for any other purpose).
> + u32 reg = __raw_readl(priv->gmii_sel_reg);
readl() and writel() instead of the __raw_ versions? Even if the
existing driver uses these, lets not have new code use them.
> + u32 mode = AM33XX_GMII_SEL_MODE_UNUSED;
> + u32 mask;
> +
> + if (phy) {
> + switch (phy->interface) {
> + case PHY_INTERFACE_MODE_MII:
> + mode = AM33XX_GMII_SEL_MODE_MII;
> + break;
> + case PHY_INTERFACE_MODE_RMII:
> + mode = AM33XX_GMII_SEL_MODE_RMII;
> + break;
> + case PHY_INTERFACE_MODE_RGMII:
> + mode = AM33XX_GMII_SEL_MODE_RGMII;
> + break;
> + default:
> + break;
> + };
> + }
> +
> + mask = 0x3 << (slave->slave_num * 2) |
> + BIT(slave->slave_num + 6);
> + mode <<= slave->slave_num * 2;
> +
> + if (slave->data->rmii_clock_external) {
> + if (slave->slave_num == 0)
> + mode |= AM33XX_GMII_SEL_RMII1_IO_CLK_EN;
> + else
> + mode |= AM33XX_GMII_SEL_RMII2_IO_CLK_EN;
> + }
> +
> + reg &= ~mask;
> + reg |= mode;
> +
> + __raw_writel(reg, priv->gmii_sel_reg);
> + }
> +
> if (!phy)
> return;
>
> @@ -1798,6 +1844,9 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
> memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN);
>
> slave_data->phy_if = of_get_phy_mode(slave_node);
> + if (of_find_property(slave_node, "ti,rmii-clock-external",
Hey, your documentation says this should be "ti,rmii-clock-ext"
Thanks,
Sekhar
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
