Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4999df1 authored by Sekhar Nori's avatar Sekhar Nori Committed by Greg Kroah-Hartman
Browse files

ARM: davinci: board-dm355-evm: fix broken networking 



[ Upstream commit 5c054de228dd6d97bf8e38962bd118953b66e5a0 ]

Since commit 09f3756b ("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: 09f3756b ("dm9000: Return an ERR_PTR() in all error conditions of dm9000_parse_dt()")
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4d74ecf6

arch/arm/mach-davinci/board-dm355-evm.c

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/i2c.h>

#include <linux/gpio.h>

#include <linux/clk.h>

#include <linux/dm9000.h>

#include <linux/videodev2.h>

#include <media/tvp514x.h>

#include <linux/spi/spi.h>
@@ -170,11 +171,16 @@ static struct resource dm355evm_dm9000_rsrc[] = { 
	},

};



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 = {