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

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

Merge branch 'cpsw-macid-no-of' 

Mugunthan V N says:

====================
Add support for reading macid when DT macid not found

Did a boot test on dra7-evm [1] and am437x-gp-evm [2].
Pushed a branch [3] for others to test the patch.

[1]: http://pastebin.ubuntu.com/12513420/
[2]: http://pastebin.ubuntu.com/12513428/
[3]: git://git.ti.com/~mugunthanvnm/ti-linux-kernel/linux.git

 cpsw-macid-read-support
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 607cba15 cec42849

arch/arm/boot/dts/am4372.dtsi

+1 −0
Original line number Original line Diff line number Diff line
@@ -591,6 +591,7 @@ 
			cpts_clock_mult = <0x80000000>;

			cpts_clock_mult = <0x80000000>;

			cpts_clock_shift = <29>;

			cpts_clock_shift = <29>;

			ranges;

			ranges;

			syscon = <&scm_conf>;





			davinci_mdio: mdio@4a101000 {

			davinci_mdio: mdio@4a101000 {

				compatible = "ti,am4372-mdio","ti,davinci_mdio";

				compatible = "ti,am4372-mdio","ti,davinci_mdio";

arch/arm/boot/dts/dra7.dtsi

+1 −0
Original line number Original line Diff line number Diff line
@@ -1447,6 +1447,7 @@ 
				     <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>;

				     <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>;

			ranges;

			ranges;

			syscon = <&scm_conf>;

			status = "disabled";

			status = "disabled";





			davinci_mdio: mdio@48485000 {

			davinci_mdio: mdio@48485000 {

drivers/net/ethernet/ti/cpsw-common.c

+55 −9
Original line number Original line Diff line number Diff line
@@ -19,10 +19,37 @@ 




#include "cpsw.h"

#include "cpsw.h"





#define AM33XX_CTRL_MAC_LO_REG(offset, id) ((offset) + 0x8 * (id))

#define CTRL_MAC_LO_REG(offset, id) ((offset) + 0x8 * (id))

#define AM33XX_CTRL_MAC_HI_REG(offset, id) ((offset) + 0x8 * (id) + 0x4)

#define CTRL_MAC_HI_REG(offset, id) ((offset) + 0x8 * (id) + 0x4)





int cpsw_am33xx_cm_get_macid(struct device *dev, u16 offset, int slave,

static int davinci_emac_3517_get_macid(struct device *dev, u16 offset,

				       int slave, u8 *mac_addr)

{

	u32 macid_lsb;

	u32 macid_msb;

	struct regmap *syscon;



	syscon = syscon_regmap_lookup_by_phandle(dev->of_node, "syscon");

	if (IS_ERR(syscon)) {

		if (PTR_ERR(syscon) == -ENODEV)

			return 0;

		return PTR_ERR(syscon);

	}



	regmap_read(syscon, CTRL_MAC_LO_REG(offset, slave), &macid_lsb);

	regmap_read(syscon, CTRL_MAC_HI_REG(offset, slave), &macid_msb);



	mac_addr[0] = (macid_msb >> 16) & 0xff;

	mac_addr[1] = (macid_msb >> 8)  & 0xff;

	mac_addr[2] = macid_msb & 0xff;

	mac_addr[3] = (macid_lsb >> 16) & 0xff;

	mac_addr[4] = (macid_lsb >> 8)  & 0xff;

	mac_addr[5] = macid_lsb & 0xff;



	return 0;

}



static int cpsw_am33xx_cm_get_macid(struct device *dev, u16 offset, int slave,

				    u8 *mac_addr)

				    u8 *mac_addr)

{

{

	u32 macid_lo;

	u32 macid_lo;
@@ -36,10 +63,8 @@ int cpsw_am33xx_cm_get_macid(struct device *dev, u16 offset, int slave, 
		return PTR_ERR(syscon);

		return PTR_ERR(syscon);

	}

	}





	regmap_read(syscon, AM33XX_CTRL_MAC_LO_REG(offset, slave),

	regmap_read(syscon, CTRL_MAC_LO_REG(offset, slave), &macid_lo);

		    &macid_lo);

	regmap_read(syscon, CTRL_MAC_HI_REG(offset, slave), &macid_hi);

	regmap_read(syscon, AM33XX_CTRL_MAC_HI_REG(offset, slave),

		    &macid_hi);





	mac_addr[5] = (macid_lo >> 8) & 0xff;

	mac_addr[5] = (macid_lo >> 8) & 0xff;

	mac_addr[4] = macid_lo & 0xff;

	mac_addr[4] = macid_lo & 0xff;
@@ -50,6 +75,27 @@ int cpsw_am33xx_cm_get_macid(struct device *dev, u16 offset, int slave, 




	return 0;

	return 0;

}

}

EXPORT_SYMBOL_GPL(cpsw_am33xx_cm_get_macid);



int ti_cm_get_macid(struct device *dev, int slave, u8 *mac_addr)

{

	if (of_machine_is_compatible("ti,am33xx"))

		return cpsw_am33xx_cm_get_macid(dev, 0x630, slave, mac_addr);



	if (of_device_is_compatible(dev->of_node, "ti,am3517-emac"))

		return davinci_emac_3517_get_macid(dev, 0x110, slave, mac_addr);



	if (of_device_is_compatible(dev->of_node, "ti,dm816-emac"))

		return cpsw_am33xx_cm_get_macid(dev, 0x30, slave, mac_addr);



	if (of_machine_is_compatible("ti,am4372"))

		return cpsw_am33xx_cm_get_macid(dev, 0x630, slave, mac_addr);



	if (of_machine_is_compatible("ti,dra7"))

		return davinci_emac_3517_get_macid(dev, 0x514, slave, mac_addr);



	dev_err(dev, "incompatible machine/device type for reading mac address\n");

	return -ENOENT;

}

EXPORT_SYMBOL_GPL(ti_cm_get_macid);





MODULE_LICENSE("GPL");
 
MODULE_LICENSE("GPL");

drivers/net/ethernet/ti/cpsw.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -2058,14 +2058,11 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, 
		if (mac_addr) {

		if (mac_addr) {

			memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN);

			memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN);

		} else {

		} else {

			if (of_machine_is_compatible("ti,am33xx")) {

			ret = ti_cm_get_macid(&pdev->dev, i,

				ret = cpsw_am33xx_cm_get_macid(&pdev->dev,

							0x630, i,

					      slave_data->mac_addr);

					      slave_data->mac_addr);

			if (ret)

			if (ret)

				return ret;

				return ret;

		}

		}

		}

		if (data->dual_emac) {

		if (data->dual_emac) {

			if (of_property_read_u32(slave_node, "dual_emac_res_vlan",

			if (of_property_read_u32(slave_node, "dual_emac_res_vlan",

						 &prop)) {

						 &prop)) {

drivers/net/ethernet/ti/cpsw.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -41,7 +41,6 @@ struct cpsw_platform_data { 
};

};





void cpsw_phy_sel(struct device *dev, phy_interface_t phy_mode, int slave);

void cpsw_phy_sel(struct device *dev, phy_interface_t phy_mode, int slave);

int cpsw_am33xx_cm_get_macid(struct device *dev, u16 offset, int slave,

int ti_cm_get_macid(struct device *dev, int slave, u8 *mac_addr);

			     u8 *mac_addr);





#endif /* __CPSW_H__ */
 
#endif /* __CPSW_H__ */