| From foo@baz Sun Jun 17 12:07:34 CEST 2018 |
| From: Sekhar Nori <nsekhar@ti.com> |
| Date: Wed, 25 Apr 2018 14:53:23 +0530 |
| Subject: ARM: davinci: board-dm355-evm: fix broken networking |
| |
| From: Sekhar Nori <nsekhar@ti.com> |
| |
| [ Upstream commit 5c054de228dd6d97bf8e38962bd118953b66e5a0 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/arm/mach-davinci/board-dm355-evm.c | 6 ++++++ |
| 1 file changed, 6 insertions(+) |
| |
| --- a/arch/arm/mach-davinci/board-dm355-evm.c |
| +++ b/arch/arm/mach-davinci/board-dm355-evm.c |
| @@ -19,6 +19,7 @@ |
| #include <linux/gpio.h> |
| #include <linux/gpio/machine.h> |
| #include <linux/clk.h> |
| +#include <linux/dm9000.h> |
| #include <linux/videodev2.h> |
| #include <media/i2c/tvp514x.h> |
| #include <linux/spi/spi.h> |
| @@ -179,11 +180,16 @@ static struct resource dm355evm_dm9000_r |
| }, |
| }; |
| |
| +static struct dm9000_plat_data dm335evm_dm9000_platdata; |
| + |
| static struct platform_device dm355evm_dm9000 = { |
| .name = "dm9000", |
| .id = -1, |
| .resource = dm355evm_dm9000_rsrc, |
| .num_resources = ARRAY_SIZE(dm355evm_dm9000_rsrc), |
| + .dev = { |
| + .platform_data = &dm335evm_dm9000_platdata, |
| + }, |
| }; |
| |
| static struct tvp514x_platform_data tvp5146_pdata = { |
