Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b62cb8d9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'cpsw' 



Mugunthan V N says:

====================
Add DRA7xx and AM43xx platform support in cpsw-phy-sel driver

Adding DRA7xx and AM43xx platform support to cpsw-phy-sel driver to select
phy mode in control driver and fixing the uninitialized dev by initializing
to platform device structure pointer.

Changes from Initial version
* Added back the missing patch (1/3)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b2ce49e7 b80b9309

Documentation/devicetree/bindings/net/cpsw-phy-sel.txt

+3 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,9 @@ TI CPSW Phy mode Selection Device Tree Bindings 
-----------------------------------------------

-----------------------------------------------





Required properties:

Required properties:

- compatible		: Should be "ti,am3352-cpsw-phy-sel"

- compatible		: Should be "ti,am3352-cpsw-phy-sel" for am335x platform and

			  "ti,dra7xx-cpsw-phy-sel" for dra7xx platform

			  "ti,am43xx-cpsw-phy-sel" for am43xx platform

- reg			: physical base address and size of the cpsw

- reg			: physical base address and size of the cpsw

			  registers map

			  registers map

- reg-names		: names of the register map given in "reg" node

- reg-names		: names of the register map given in "reg" node

drivers/net/ethernet/ti/cpsw-phy-sel.c

+61 −1
Original line number Original line Diff line number Diff line
@@ -29,6 +29,8 @@ 
#define AM33XX_GMII_SEL_RMII2_IO_CLK_EN	BIT(7)

#define AM33XX_GMII_SEL_RMII2_IO_CLK_EN	BIT(7)

#define AM33XX_GMII_SEL_RMII1_IO_CLK_EN	BIT(6)

#define AM33XX_GMII_SEL_RMII1_IO_CLK_EN	BIT(6)





#define GMII_SEL_MODE_MASK		0x3



struct cpsw_phy_sel_priv {

struct cpsw_phy_sel_priv {

	struct device	*dev;

	struct device	*dev;

	u32 __iomem	*gmii_sel;

	u32 __iomem	*gmii_sel;
@@ -65,7 +67,7 @@ static void cpsw_gmii_sel_am3352(struct cpsw_phy_sel_priv *priv, 
		break;

		break;

	};

	};





	mask = 0x3 << (slave * 2) | BIT(slave + 6);

	mask = GMII_SEL_MODE_MASK << (slave * 2) | BIT(slave + 6);

	mode <<= slave * 2;

	mode <<= slave * 2;





	if (priv->rmii_clock_external) {

	if (priv->rmii_clock_external) {
@@ -81,6 +83,55 @@ static void cpsw_gmii_sel_am3352(struct cpsw_phy_sel_priv *priv, 
	writel(reg, priv->gmii_sel);

	writel(reg, priv->gmii_sel);

}

}





static void cpsw_gmii_sel_dra7xx(struct cpsw_phy_sel_priv *priv,

				 phy_interface_t phy_mode, int slave)

{

	u32 reg;

	u32 mask;

	u32 mode = 0;



	reg = readl(priv->gmii_sel);



	switch (phy_mode) {

	case PHY_INTERFACE_MODE_RMII:

		mode = AM33XX_GMII_SEL_MODE_RMII;

		break;



	case PHY_INTERFACE_MODE_RGMII:

	case PHY_INTERFACE_MODE_RGMII_ID:

	case PHY_INTERFACE_MODE_RGMII_RXID:

	case PHY_INTERFACE_MODE_RGMII_TXID:

		mode = AM33XX_GMII_SEL_MODE_RGMII;

		break;



	case PHY_INTERFACE_MODE_MII:

	default:

		mode = AM33XX_GMII_SEL_MODE_MII;

		break;

	};



	switch (slave) {

	case 0:

		mask = GMII_SEL_MODE_MASK;

		break;

	case 1:

		mask = GMII_SEL_MODE_MASK << 4;

		mode <<= 4;

		break;

	default:

		dev_err(priv->dev, "invalid slave number...\n");

		return;

	}



	if (priv->rmii_clock_external)

		dev_err(priv->dev, "RMII External clock is not supported\n");



	reg &= ~mask;

	reg |= mode;



	writel(reg, priv->gmii_sel);

}



static struct platform_driver cpsw_phy_sel_driver;

static struct platform_driver cpsw_phy_sel_driver;

static int match(struct device *dev, void *data)

static int match(struct device *dev, void *data)

{

{
@@ -112,6 +163,14 @@ static const struct of_device_id cpsw_phy_sel_id_table[] = { 
		.compatible	= "ti,am3352-cpsw-phy-sel",

		.compatible	= "ti,am3352-cpsw-phy-sel",

		.data		= &cpsw_gmii_sel_am3352,

		.data		= &cpsw_gmii_sel_am3352,

	},

	},

	{

		.compatible	= "ti,dra7xx-cpsw-phy-sel",

		.data		= &cpsw_gmii_sel_dra7xx,

	},

	{

		.compatible	= "ti,am43xx-cpsw-phy-sel",

		.data		= &cpsw_gmii_sel_am3352,

	},

	{}

	{}

};

};

MODULE_DEVICE_TABLE(of, cpsw_phy_sel_id_table);

MODULE_DEVICE_TABLE(of, cpsw_phy_sel_id_table);
@@ -132,6 +191,7 @@ static int cpsw_phy_sel_probe(struct platform_device *pdev) 
		return -ENOMEM;

		return -ENOMEM;

	}

	}





	priv->dev = &pdev->dev;

	priv->cpsw_phy_sel = of_id->data;

	priv->cpsw_phy_sel = of_id->data;





	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "gmii-sel");

	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "gmii-sel");