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

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

Merge branch 'cpsw_macid' 



Tony Lindgren says:

====================
Changes to cpsw and davinci_emac for getting MAC address

Here are a few patches to add common code for cpsw and davinci_emac for
getting the MAC address. Looks like we can also now add code to get the
MAC address on 3517 but in a slightly different way.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4c72c53b f276c0ce

arch/arm/boot/dts/am3517.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
			status = "disabled";

			reg = <0x5c000000 0x30000>;

			interrupts = <67 68 69 70>;

			syscon = <&omap3_scm_general>;

			ti,davinci-ctrl-reg-offset = <0x10000>;

			ti,davinci-ctrl-mod-reg-offset = <0>;

			ti,davinci-ctrl-ram-offset = <0x20000>;

drivers/net/ethernet/ti/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 
# Makefile for the TI network device drivers.

#



obj-$(CONFIG_TI_CPSW) += cpsw-common.o

obj-$(CONFIG_TI_DAVINCI_EMAC) += cpsw-common.o



obj-$(CONFIG_TLAN) += tlan.o

obj-$(CONFIG_CPMAC) += cpmac.o

obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o

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

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/*

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/regmap.h>

#include <linux/mfd/syscon.h>



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

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



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

			     u8 *mac_addr)

{

	u32 macid_lo;

	u32 macid_hi;

	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, AM33XX_CTRL_MAC_LO_REG(offset, slave),

		    &macid_lo);

	regmap_read(syscon, AM33XX_CTRL_MAC_HI_REG(offset, slave),

		    &macid_hi);



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

	mac_addr[4] = macid_lo & 0xff;

	mac_addr[3] = (macid_hi >> 24) & 0xff;

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

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

	mac_addr[0] = macid_hi & 0xff;



	return 0;

}

EXPORT_SYMBOL_GPL(cpsw_am33xx_cm_get_macid);



MODULE_LICENSE("GPL");

drivers/net/ethernet/ti/cpsw.c

+2 −33
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 
#include <linux/of_net.h>

#include <linux/of_device.h>

#include <linux/if_vlan.h>

#include <linux/mfd/syscon.h>

#include <linux/regmap.h>



#include <linux/pinctrl/consumer.h>
@@ -1936,36 +1934,6 @@ static void cpsw_slave_init(struct cpsw_slave *slave, struct cpsw_priv *priv, 
	slave->port_vlan = data->dual_emac_res_vlan;

}



#define AM33XX_CTRL_MAC_LO_REG(id) (0x630 + 0x8 * id)

#define AM33XX_CTRL_MAC_HI_REG(id) (0x630 + 0x8 * id + 0x4)



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

		u8 *mac_addr)

{

	u32 macid_lo;

	u32 macid_hi;

	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, AM33XX_CTRL_MAC_LO_REG(slave), &macid_lo);

	regmap_read(syscon, AM33XX_CTRL_MAC_HI_REG(slave), &macid_hi);



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

	mac_addr[4] = macid_lo & 0xff;

	mac_addr[3] = (macid_hi >> 24) & 0xff;

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

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

	mac_addr[0] = macid_hi & 0xff;



	return 0;

}



static int cpsw_probe_dt(struct cpsw_platform_data *data,

			 struct platform_device *pdev)

{
@@ -2090,7 +2058,8 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, 
			memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN);

		} else {

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

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

				ret = cpsw_am33xx_cm_get_macid(&pdev->dev,

							0x630, i,

							slave_data->mac_addr);

				if (ret)

					return ret;

drivers/net/ethernet/ti/cpsw.h

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



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,

			     u8 *mac_addr);



#endif /* __CPSW_H__ */