Commit 195e2add authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller

SolutionEngine771x: fix Ether platform data

The 'sh_eth' driver's probe() method would fail  on the SolutionEngine7710
board and crash on SolutionEngine7712 board  as the platform code is
hopelessly behind the driver's platform data --  it passes the PHY address
instead of 'struct sh_eth_plat_data *'; pass the latter to the driver in
order to fix the bug...

Fixes: 71557a37 ("[netdrvr] sh_eth: Add SH7619 support")
Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2fdd1811
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/sh_eth.h>
#include <mach-se/mach/se.h> #include <mach-se/mach/se.h>
#include <mach-se/mach/mrshpc.h> #include <mach-se/mach/mrshpc.h>
#include <asm/machvec.h> #include <asm/machvec.h>
...@@ -115,6 +116,11 @@ static struct platform_device heartbeat_device = { ...@@ -115,6 +116,11 @@ static struct platform_device heartbeat_device = {
#if defined(CONFIG_CPU_SUBTYPE_SH7710) ||\ #if defined(CONFIG_CPU_SUBTYPE_SH7710) ||\
defined(CONFIG_CPU_SUBTYPE_SH7712) defined(CONFIG_CPU_SUBTYPE_SH7712)
/* SH771X Ethernet driver */ /* SH771X Ethernet driver */
static struct sh_eth_plat_data sh_eth_plat = {
.phy = PHY_ID,
.phy_interface = PHY_INTERFACE_MODE_MII,
};
static struct resource sh_eth0_resources[] = { static struct resource sh_eth0_resources[] = {
[0] = { [0] = {
.start = SH_ETH0_BASE, .start = SH_ETH0_BASE,
...@@ -132,7 +138,7 @@ static struct platform_device sh_eth0_device = { ...@@ -132,7 +138,7 @@ static struct platform_device sh_eth0_device = {
.name = "sh771x-ether", .name = "sh771x-ether",
.id = 0, .id = 0,
.dev = { .dev = {
.platform_data = PHY_ID, .platform_data = &sh_eth_plat,
}, },
.num_resources = ARRAY_SIZE(sh_eth0_resources), .num_resources = ARRAY_SIZE(sh_eth0_resources),
.resource = sh_eth0_resources, .resource = sh_eth0_resources,
...@@ -155,7 +161,7 @@ static struct platform_device sh_eth1_device = { ...@@ -155,7 +161,7 @@ static struct platform_device sh_eth1_device = {
.name = "sh771x-ether", .name = "sh771x-ether",
.id = 1, .id = 1,
.dev = { .dev = {
.platform_data = PHY_ID, .platform_data = &sh_eth_plat,
}, },
.num_resources = ARRAY_SIZE(sh_eth1_resources), .num_resources = ARRAY_SIZE(sh_eth1_resources),
.resource = sh_eth1_resources, .resource = sh_eth1_resources,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment