From: Sasha Levin <Alexander.Levin@microsoft.com>
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"stable@vger.kernel.org" <stable@vger.kernel.org>
Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
"David S . Miller" <davem@davemloft.net>,
Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 3.18 20/24] SolutionEngine771x: fix Ether platform data
Date: Sat, 3 Feb 2018 18:05:09 +0000 [thread overview]
Message-ID: <20180203180444.10801-20-alexander.levin@microsoft.com> (raw)
In-Reply-To: <20180203180444.10801-1-alexander.levin@microsoft.com>
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
[ Upstream commit 195e2addbce09e5afbc766efc1e6567c9ce840d3 ]
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: 71557a37adb5 ("[netdrvr] sh_eth: Add SH7619 support")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
arch/sh/boards/mach-se/770x/setup.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/sh/boards/mach-se/770x/setup.c b/arch/sh/boards/mach-se/770x/setup.c
index 658326f44df8..5e0267624d8d 100644
--- a/arch/sh/boards/mach-se/770x/setup.c
+++ b/arch/sh/boards/mach-se/770x/setup.c
@@ -8,6 +8,7 @@
*/
#include <linux/init.h>
#include <linux/platform_device.h>
+#include <linux/sh_eth.h>
#include <mach-se/mach/se.h>
#include <mach-se/mach/mrshpc.h>
#include <asm/machvec.h>
@@ -114,6 +115,11 @@ static struct platform_device heartbeat_device = {
#if defined(CONFIG_CPU_SUBTYPE_SH7710) ||\
defined(CONFIG_CPU_SUBTYPE_SH7712)
/* 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[] = {
[0] = {
.start = SH_ETH0_BASE,
@@ -131,7 +137,7 @@ static struct platform_device sh_eth0_device = {
.name = "sh771x-ether",
.id = 0,
.dev = {
- .platform_data = PHY_ID,
+ .platform_data = &sh_eth_plat,
},
.num_resources = ARRAY_SIZE(sh_eth0_resources),
.resource = sh_eth0_resources,
@@ -154,7 +160,7 @@ static struct platform_device sh_eth1_device = {
.name = "sh771x-ether",
.id = 1,
.dev = {
- .platform_data = PHY_ID,
+ .platform_data = &sh_eth_plat,
},
.num_resources = ARRAY_SIZE(sh_eth1_resources),
.resource = sh_eth1_resources,
--
2.11.0
next prev parent reply other threads:[~2018-02-03 18:19 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-03 18:04 [PATCH AUTOSEL for 3.18 01/24] mtd: nand: gpmi: Fix failure when a erased page has a bitflip at BBM Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 3.18 02/24] ipv6: icmp6: Allow icmp messages to be looped back Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 3.18 03/24] mm,vmscan: Make unregister_shrinker() no-op if register_shrinker() failed Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 3.18 04/24] sget(): handle failures of register_shrinker() Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 06/24] net: arc_emac: fix arc_emac_rx() error paths Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 05/24] spi: atmel: fixed spin_lock usage inside atmel_spi_remove Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 07/24] scsi: storvsc: Fix scsi_cmd error assignments in storvsc_handle_error Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 09/24] tg3: Enable PHY reset in MTU change path for 5720 Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 08/24] tg3: Add workaround to restrict 5762 MRRS to 2048 Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 10/24] bnx2x: Improve reliability in case of nested PCI errors Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 12/24] s390/dasd: fix wrongly assigned configuration data Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 11/24] led: core: Fix brightness setting when setting delay_off=0 Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 14/24] xfs: quota: check result of register_shrinker() Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 13/24] xfs: quota: fix missed destroy of qi_tree_lock Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 15/24] e1000: fix disabling already-disabled warning Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 16/24] drm/ttm: check the return value of kzalloc Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 17/24] loop: fix concurrent lo_open/lo_release Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 19/24] mdio-sun4i: Fix a memory leak Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 18/24] xen-netfront: enable device after manual module load Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 21/24] xen/gntdev: Fix off-by-one error when unmapping with holes Sasha Levin
2018-02-03 18:05 ` Sasha Levin [this message]
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 23/24] sctp: make use of pre-calculated len Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 22/24] xen/gntdev: Fix partial gntdev_mmap() cleanup Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 24/24] net: gianfar_ptp: move set_fipers() to spinlock protecting area Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180203180444.10801-20-alexander.levin@microsoft.com \
--to=alexander.levin@microsoft.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=sergei.shtylyov@cogentembedded.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®