[ARM] 5600/1: ep93xx: core.c remove cast when copying dev_addr
The MAC address for the ep93xx ethernet driver can be optionally copied from registers in the controller when booting. Due to [ARM] 5573/1: ep93xx: ensure typesafe io, the cast for the source address is no longer needed. EP93XX_ETHERNET_BASE is typed as a (void __iomem __force *) so memcpy_fromio() needs to be used instead of memcpy(). Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
d19d36672e
commit
5b1c3c858c
1 changed files with 2 additions and 4 deletions
|
@ -541,10 +541,8 @@ static struct platform_device ep93xx_eth_device = {
|
||||||
|
|
||||||
void __init ep93xx_register_eth(struct ep93xx_eth_data *data, int copy_addr)
|
void __init ep93xx_register_eth(struct ep93xx_eth_data *data, int copy_addr)
|
||||||
{
|
{
|
||||||
if (copy_addr) {
|
if (copy_addr)
|
||||||
memcpy(data->dev_addr,
|
memcpy_fromio(data->dev_addr, EP93XX_ETHERNET_BASE + 0x50, 6);
|
||||||
(void *)(EP93XX_ETHERNET_BASE + 0x50), 6);
|
|
||||||
}
|
|
||||||
|
|
||||||
ep93xx_eth_data = *data;
|
ep93xx_eth_data = *data;
|
||||||
platform_device_register(&ep93xx_eth_device);
|
platform_device_register(&ep93xx_eth_device);
|
||||||
|
|
Loading…
Add table
Reference in a new issue