xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sh: Consolidate MTU2/CMT/TMU timer platform data.

Browse Source 
All of the SH timers use a roughly identical structure for platform data,
which presently is broken out for each block. Consolidate all of these
definitions, as there is no reason for them to be broken out in the first
place.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt
2009-05-03 17:57:17 +09:00
parent d43a41bf8b
commit 46a12f7426
17 changed files with 69 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/sh/kernel/cpu/sh2/setup-sh7619.c
View File

@@ -12,7 +12,7 @@
#include <linux/init.h>
#include <linux/serial.h>
#include <linux/serial_sci.h>
#include <linux/sh_cmt.h>
#include <linux/sh_timer.h>
#include <linux/io.h>
enum {
@@ -111,7 +111,7 @@ static struct platform_device eth_device = {
.resource = eth_resources,
};
static struct sh_cmt_config cmt0_platform_data = {
static struct sh_timer_config cmt0_platform_data = {
.name = "CMT0",
.channel_offset = 0x02,
.timer_bit = 0,
@@ -143,7 +143,7 @@ static struct platform_device cmt0_device = {
.num_resources = ARRAY_SIZE(cmt0_resources),
};
static struct sh_cmt_config cmt1_platform_data = {
static struct sh_timer_config cmt1_platform_data = {
.name = "CMT1",
.channel_offset = 0x08,
.timer_bit = 1,

8
arch/sh/kernel/cpu/sh2a/setup-mxg.c
View File

@@ -11,7 +11,7 @@
#include <linux/init.h>
#include <linux/serial.h>
#include <linux/serial_sci.h>
#include <linux/sh_mtu2.h>
#include <linux/sh_timer.h>
enum {
UNUSED = 0,
@@ -114,7 +114,7 @@ static struct intc_mask_reg mask_registers[] __initdata = {
static DECLARE_INTC_DESC(intc_desc, "mxg", vectors, groups,
mask_registers, prio_registers, NULL);
static struct sh_mtu2_config mtu2_0_platform_data = {
static struct sh_timer_config mtu2_0_platform_data = {
.name = "MTU2_0",
.channel_offset = -0x80,
.timer_bit = 0,
@@ -145,7 +145,7 @@ static struct platform_device mtu2_0_device = {
.num_resources = ARRAY_SIZE(mtu2_0_resources),
};
static struct sh_mtu2_config mtu2_1_platform_data = {
static struct sh_timer_config mtu2_1_platform_data = {
.name = "MTU2_1",
.channel_offset = -0x100,
.timer_bit = 1,
@@ -176,7 +176,7 @@ static struct platform_device mtu2_1_device = {
.num_resources = ARRAY_SIZE(mtu2_1_resources),
};
static struct sh_mtu2_config mtu2_2_platform_data = {
static struct sh_timer_config mtu2_2_platform_data = {
.name = "MTU2_2",
.channel_offset = 0x80,
.timer_bit = 2,

8
arch/sh/kernel/cpu/sh2a/setup-sh7201.c
View File

@@ -12,7 +12,7 @@
#include <linux/init.h>
#include <linux/serial.h>
#include <linux/serial_sci.h>
#include <linux/sh_mtu2.h>
#include <linux/sh_timer.h>
#include <linux/io.h>
enum {
@@ -251,7 +251,7 @@ static struct platform_device rtc_device = {
.resource = rtc_resources,
};
static struct sh_mtu2_config mtu2_0_platform_data = {
static struct sh_timer_config mtu2_0_platform_data = {
.name = "MTU2_0",
.channel_offset = -0x80,
.timer_bit = 0,
@@ -282,7 +282,7 @@ static struct platform_device mtu2_0_device = {
.num_resources = ARRAY_SIZE(mtu2_0_resources),
};
static struct sh_mtu2_config mtu2_1_platform_data = {
static struct sh_timer_config mtu2_1_platform_data = {
.name = "MTU2_1",
.channel_offset = -0x100,
.timer_bit = 1,
@@ -313,7 +313,7 @@ static struct platform_device mtu2_1_device = {
.num_resources = ARRAY_SIZE(mtu2_1_resources),
};
static struct sh_mtu2_config mtu2_2_platform_data = {
static struct sh_timer_config mtu2_2_platform_data = {
.name = "MTU2_2",
.channel_offset = 0x80,
.timer_bit = 2,

11
arch/sh/kernel/cpu/sh2a/setup-sh7203.c
View File

@@ -11,8 +11,7 @@
#include <linux/init.h>
#include <linux/serial.h>
#include <linux/serial_sci.h>
#include <linux/sh_cmt.h>
#include <linux/sh_mtu2.h>
#include <linux/sh_timer.h>
#include <linux/io.h>
enum {
@@ -208,7 +207,7 @@ static struct platform_device sci_device = {
},
};
static struct sh_cmt_config cmt0_platform_data = {
static struct sh_timer_config cmt0_platform_data = {
.name = "CMT0",
.channel_offset = 0x02,
.timer_bit = 0,
@@ -240,7 +239,7 @@ static struct platform_device cmt0_device = {
.num_resources = ARRAY_SIZE(cmt0_resources),
};
static struct sh_cmt_config cmt1_platform_data = {
static struct sh_timer_config cmt1_platform_data = {
.name = "CMT1",
.channel_offset = 0x08,
.timer_bit = 1,
@@ -272,7 +271,7 @@ static struct platform_device cmt1_device = {
.num_resources = ARRAY_SIZE(cmt1_resources),
};
static struct sh_mtu2_config mtu2_0_platform_data = {
static struct sh_timer_config mtu2_0_platform_data = {
.name = "MTU2_0",
.channel_offset = -0x80,
.timer_bit = 0,
@@ -303,7 +302,7 @@ static struct platform_device mtu2_0_device = {
.num_resources = ARRAY_SIZE(mtu2_0_resources),
};
static struct sh_mtu2_config mtu2_1_platform_data = {
static struct sh_timer_config mtu2_1_platform_data = {
.name = "MTU2_1",
.channel_offset = -0x100,
.timer_bit = 1,

13
arch/sh/kernel/cpu/sh2a/setup-sh7206.c
View File

@@ -12,8 +12,7 @@
#include <linux/init.h>
#include <linux/serial.h>
#include <linux/serial_sci.h>
#include <linux/sh_cmt.h>
#include <linux/sh_mtu2.h>
#include <linux/sh_timer.h>
#include <linux/io.h>
enum {
@@ -168,7 +167,7 @@ static struct platform_device sci_device = {
},
};
static struct sh_cmt_config cmt0_platform_data = {
static struct sh_timer_config cmt0_platform_data = {
.name = "CMT0",
.channel_offset = 0x02,
.timer_bit = 0,
@@ -200,7 +199,7 @@ static struct platform_device cmt0_device = {
.num_resources = ARRAY_SIZE(cmt0_resources),
};
static struct sh_cmt_config cmt1_platform_data = {
static struct sh_timer_config cmt1_platform_data = {
.name = "CMT1",
.channel_offset = 0x08,
.timer_bit = 1,
@@ -232,7 +231,7 @@ static struct platform_device cmt1_device = {
.num_resources = ARRAY_SIZE(cmt1_resources),
};
static struct sh_mtu2_config mtu2_0_platform_data = {
static struct sh_timer_config mtu2_0_platform_data = {
.name = "MTU2_0",
.channel_offset = -0x80,
.timer_bit = 0,
@@ -263,7 +262,7 @@ static struct platform_device mtu2_0_device = {
.num_resources = ARRAY_SIZE(mtu2_0_resources),
};
static struct sh_mtu2_config mtu2_1_platform_data = {
static struct sh_timer_config mtu2_1_platform_data = {
.name = "MTU2_1",
.channel_offset = -0x100,
.timer_bit = 1,
@@ -294,7 +293,7 @@ static struct platform_device mtu2_1_device = {
.num_resources = ARRAY_SIZE(mtu2_1_resources),
};
static struct sh_mtu2_config mtu2_2_platform_data = {
static struct sh_timer_config mtu2_2_platform_data = {
.name = "MTU2_2",
.channel_offset = 0x80,
.timer_bit = 2,

4
arch/sh/kernel/cpu/sh4a/setup-sh7343.c
View File

@@ -12,7 +12,7 @@
#include <linux/serial.h>
#include <linux/serial_sci.h>
#include <linux/uio_driver.h>
#include <linux/sh_cmt.h>
#include <linux/sh_timer.h>
#include <asm/clock.h>
static struct resource iic0_resources[] = {
@@ -141,7 +141,7 @@ static struct platform_device jpu_device = {
.num_resources = ARRAY_SIZE(jpu_resources),
};
static struct sh_cmt_config cmt_platform_data = {
static struct sh_timer_config cmt_platform_data = {
.name = "CMT",
.channel_offset = 0x60,
.timer_bit = 5,

4
arch/sh/kernel/cpu/sh4a/setup-sh7366.c
View File

@@ -14,7 +14,7 @@
#include <linux/serial.h>
#include <linux/serial_sci.h>
#include <linux/uio_driver.h>
#include <linux/sh_cmt.h>
#include <linux/sh_timer.h>
#include <asm/clock.h>
static struct resource iic_resources[] = {
@@ -148,7 +148,7 @@ static struct platform_device veu1_device = {
.num_resources = ARRAY_SIZE(veu1_resources),
};
static struct sh_cmt_config cmt_platform_data = {
static struct sh_timer_config cmt_platform_data = {
.name = "CMT",
.channel_offset = 0x60,
.timer_bit = 5,

11
arch/sh/kernel/cpu/sh4a/setup-sh7722.c
View File

@@ -13,8 +13,7 @@
#include <linux/serial_sci.h>
#include <linux/mm.h>
#include <linux/uio_driver.h>
#include <linux/sh_cmt.h>
#include <linux/sh_tmu.h>
#include <linux/sh_timer.h>
#include <asm/clock.h>
#include <asm/mmzone.h>
@@ -178,7 +177,7 @@ static struct platform_device jpu_device = {
.num_resources = ARRAY_SIZE(jpu_resources),
};
static struct sh_cmt_config cmt_platform_data = {
static struct sh_timer_config cmt_platform_data = {
.name = "CMT",
.channel_offset = 0x60,
.timer_bit = 5,
@@ -210,7 +209,7 @@ static struct platform_device cmt_device = {
.num_resources = ARRAY_SIZE(cmt_resources),
};
static struct sh_tmu_config tmu0_platform_data = {
static struct sh_timer_config tmu0_platform_data = {
.name = "TMU0",
.channel_offset = 0x04,
.timer_bit = 0,
@@ -241,7 +240,7 @@ static struct platform_device tmu0_device = {
.num_resources = ARRAY_SIZE(tmu0_resources),
};
static struct sh_tmu_config tmu1_platform_data = {
static struct sh_timer_config tmu1_platform_data = {
.name = "TMU1",
.channel_offset = 0x10,
.timer_bit = 1,
@@ -272,7 +271,7 @@ static struct platform_device tmu1_device = {
.num_resources = ARRAY_SIZE(tmu1_resources),
};
static struct sh_tmu_config tmu2_platform_data = {
static struct sh_timer_config tmu2_platform_data = {
.name = "TMU2",
.channel_offset = 0x1c,
.timer_bit = 2,

4
arch/sh/kernel/cpu/sh4a/setup-sh7723.c
View File

@@ -13,7 +13,7 @@
#include <linux/mm.h>
#include <linux/serial_sci.h>
#include <linux/uio_driver.h>
#include <linux/sh_cmt.h>
#include <linux/sh_timer.h>
#include <asm/clock.h>
#include <asm/mmzone.h>
@@ -101,7 +101,7 @@ static struct platform_device veu1_device = {
.num_resources = ARRAY_SIZE(veu1_resources),
};
static struct sh_cmt_config cmt_platform_data = {
static struct sh_timer_config cmt_platform_data = {
.name = "CMT",
.channel_offset = 0x60,
.timer_bit = 5,

4
arch/sh/kernel/cpu/sh4a/setup-sh7724.c
View File

@@ -18,7 +18,7 @@
#include <linux/mm.h>
#include <linux/serial_sci.h>
#include <linux/uio_driver.h>
#include <linux/sh_cmt.h>
#include <linux/sh_timer.h>
#include <linux/io.h>
#include <asm/clock.h>
#include <asm/mmzone.h>
@@ -230,7 +230,7 @@ static struct platform_device veu1_device = {
.num_resources = ARRAY_SIZE(veu1_resources),
};
static struct sh_cmt_config cmt_platform_data = {
static struct sh_timer_config cmt_platform_data = {
.name = "CMT",
.channel_offset = 0x60,
.timer_bit = 5,