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

Commit a1fd306b authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Fix up heartbeat build and resource size. 



We were abusing the resource size for the number of bits, this
has been reworked using proper platform data, so this can be
tidied up now. Boards in general only have a 1-byte wide resource,
which the ioremap_nocache() case already handles.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent b8996e49

arch/sh/boards/mpc1211/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static int put_smb_blk(unsigned char *p, int address, int command, int no) 
static struct resource heartbeat_resources[] = {

	[0] = {

		.start	= 0xa2000000,

		.end	= 0xa2000000 + 8 - 1,

		.end	= 0xa2000000,

		.flags	= IORESOURCE_MEM,

	},

};

arch/sh/boards/renesas/r7780rp/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static struct platform_device cf_ide_device = { 
static struct resource heartbeat_resources[] = {

	[0] = {

		.start	= PA_OBLED,

		.end	= PA_OBLED + 8 - 1,

		.end	= PA_OBLED,

		.flags	= IORESOURCE_MEM,

	},

};
@@ -133,7 +133,7 @@ static struct platform_device heartbeat_device = { 
	/* R7785RP has a slightly more sensible FPGA.. */

#ifndef CONFIG_SH_R7785RP

	.dev	= {

		.platform_data	= heartbeat_data,

		.platform_data	= &heartbeat_data,

	},

#endif

	.num_resources	= ARRAY_SIZE(heartbeat_resources),

arch/sh/boards/renesas/rts7751r2d/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static struct platform_device cf_ide_device = { 
static struct resource heartbeat_resources[] = {

	[0] = {

		.start	= PA_OUTPORT,

		.end	= PA_OUTPORT + 8 - 1,

		.end	= PA_OUTPORT,

		.flags	= IORESOURCE_MEM,

	},

};

arch/sh/boards/renesas/x3proto/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
static struct resource heartbeat_resources[] = {

	[0] = {

		.start	= 0xb8140020,

		.end	= 0xb8140020 + 8 - 1,

		.end	= 0xb8140020,

		.flags	= IORESOURCE_MEM,

	},

};

arch/sh/boards/se/7206/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static struct heartbeat_data heartbeat_data = { 
static struct resource heartbeat_resources[] = {

	[0] = {

		.start	= PA_LED,

		.end	= PA_LED + ARRAY_SIZE(heartbeat_bit_pos) - 1,

		.end	= PA_LED,

		.flags	= IORESOURCE_MEM,

	},

};
@@ -55,7 +55,7 @@ static struct platform_device heartbeat_device = { 
	.name		= "heartbeat",

	.id		= -1,

	.dev	= {

		.platform_data	= heartbeat_data,

		.platform_data	= &heartbeat_data,

	},

	.num_resources	= ARRAY_SIZE(heartbeat_resources),

	.resource	= heartbeat_resources,