aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSekhar Nori <nsekhar@ti.com>2018-04-25 05:23:23 -0400
committerSekhar Nori <nsekhar@ti.com>2018-05-01 07:49:51 -0400
commit5c054de228dd6d97bf8e38962bd118953b66e5a0 (patch)
treebcc9f8281c1738ddc1c58226b5d7c9a70cccd69c
parentd45622c0eaa5992a1a2248cbe93e1ff7a2da7be4 (diff)
ARM: davinci: board-dm355-evm: fix broken networking
Since commit 09f3756bb9a8 ("dm9000: Return an ERR_PTR() in all error conditions of dm9000_parse_dt()"), passing either non-NULL platform data or device-tree for dm9000 driver to probe is mandatory. DM335 board was using none, so networking failed to initialize. Fix it by passing non-NULL (but empty) platform data. Fixes: 09f3756bb9a8 ("dm9000: Return an ERR_PTR() in all error conditions of dm9000_parse_dt()") Signed-off-by: Sekhar Nori <nsekhar@ti.com>
-rw-r--r--arch/arm/mach-davinci/board-dm355-evm.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index cb30637d9eaf..762d29683a3a 100644
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -19,6 +19,7 @@
19#include <linux/gpio.h> 19#include <linux/gpio.h>
20#include <linux/gpio/machine.h> 20#include <linux/gpio/machine.h>
21#include <linux/clk.h> 21#include <linux/clk.h>
22#include <linux/dm9000.h>
22#include <linux/videodev2.h> 23#include <linux/videodev2.h>
23#include <media/i2c/tvp514x.h> 24#include <media/i2c/tvp514x.h>
24#include <linux/spi/spi.h> 25#include <linux/spi/spi.h>
@@ -179,11 +180,16 @@ static struct resource dm355evm_dm9000_rsrc[] = {
179 }, 180 },
180}; 181};
181 182
183static struct dm9000_plat_data dm335evm_dm9000_platdata;
184
182static struct platform_device dm355evm_dm9000 = { 185static struct platform_device dm355evm_dm9000 = {
183 .name = "dm9000", 186 .name = "dm9000",
184 .id = -1, 187 .id = -1,
185 .resource = dm355evm_dm9000_rsrc, 188 .resource = dm355evm_dm9000_rsrc,
186 .num_resources = ARRAY_SIZE(dm355evm_dm9000_rsrc), 189 .num_resources = ARRAY_SIZE(dm355evm_dm9000_rsrc),
190 .dev = {
191 .platform_data = &dm335evm_dm9000_platdata,
192 },
187}; 193};
188 194
189static struct tvp514x_platform_data tvp5146_pdata = { 195static struct tvp514x_platform_data tvp5146_pdata = {