Skip to content

Commit

Permalink
sh: Kill off timer clock strings for legacy CPG parts.
Browse files Browse the repository at this point in the history 
Now with the lookup aliases in place there is no longer any need to
provide the clock string, kill it off for all legacy CPG CPUs.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Mar 29, 2010
1 parent 0776d60 commit 4dc50a0
Show file tree
Hide file tree
Showing 18 changed files with 0 additions and 77 deletions.
2 changes: 0 additions & 2 deletions arch/sh/kernel/cpu/sh2/setup-sh7619.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ static struct platform_device eth_device = {
static struct sh_timer_config cmt0_platform_data = {
.channel_offset = 0x02,
.timer_bit = 0,
.clk = "peripheral_clk",
.clockevent_rating = 125,
.clocksource_rating = 0, /* disabled due to code generation issues */
};
Expand Down Expand Up @@ -160,7 +159,6 @@ static struct platform_device cmt0_device = {
static struct sh_timer_config cmt1_platform_data = {
.channel_offset = 0x08,
.timer_bit = 1,
.clk = "peripheral_clk",
.clockevent_rating = 125,
.clocksource_rating = 0, /* disabled due to code generation issues */
};
Expand Down
3 changes: 0 additions & 3 deletions arch/sh/kernel/cpu/sh2a/setup-mxg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ static DECLARE_INTC_DESC(intc_desc, "mxg", vectors, groups,
static struct sh_timer_config mtu2_0_platform_data = {
.channel_offset = -0x80,
.timer_bit = 0,
.clk = "peripheral_clk",
.clockevent_rating = 200,
};

Expand Down Expand Up @@ -146,7 +145,6 @@ static struct platform_device mtu2_0_device = {
static struct sh_timer_config mtu2_1_platform_data = {
.channel_offset = -0x100,
.timer_bit = 1,
.clk = "peripheral_clk",
.clockevent_rating = 200,
};

Expand Down Expand Up @@ -175,7 +173,6 @@ static struct platform_device mtu2_1_device = {
static struct sh_timer_config mtu2_2_platform_data = {
.channel_offset = 0x80,
.timer_bit = 2,
.clk = "peripheral_clk",
.clockevent_rating = 200,
};

Expand Down
3 changes: 0 additions & 3 deletions arch/sh/kernel/cpu/sh2a/setup-sh7201.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,6 @@ static struct platform_device rtc_device = {
static struct sh_timer_config mtu2_0_platform_data = {
.channel_offset = -0x80,
.timer_bit = 0,
.clk = "peripheral_clk",
.clockevent_rating = 200,
};

Expand Down Expand Up @@ -349,7 +348,6 @@ static struct platform_device mtu2_0_device = {
static struct sh_timer_config mtu2_1_platform_data = {
.channel_offset = -0x100,
.timer_bit = 1,
.clk = "peripheral_clk",
.clockevent_rating = 200,
};

Expand Down Expand Up @@ -378,7 +376,6 @@ static struct platform_device mtu2_1_device = {
static struct sh_timer_config mtu2_2_platform_data = {
.channel_offset = 0x80,
.timer_bit = 2,
.clk = "peripheral_clk",
.clockevent_rating = 200,
};

Expand Down
4 changes: 0 additions & 4 deletions arch/sh/kernel/cpu/sh2a/setup-sh7203.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@ static struct platform_device scif3_device = {
static struct sh_timer_config cmt0_platform_data = {
.channel_offset = 0x02,
.timer_bit = 0,
.clk = "peripheral_clk",
.clockevent_rating = 125,
.clocksource_rating = 0, /* disabled due to code generation issues */
};
Expand Down Expand Up @@ -266,7 +265,6 @@ static struct platform_device cmt0_device = {
static struct sh_timer_config cmt1_platform_data = {
.channel_offset = 0x08,
.timer_bit = 1,
.clk = "peripheral_clk",
.clockevent_rating = 125,
.clocksource_rating = 0, /* disabled due to code generation issues */
};
Expand Down Expand Up @@ -296,7 +294,6 @@ static struct platform_device cmt1_device = {
static struct sh_timer_config mtu2_0_platform_data = {
.channel_offset = -0x80,
.timer_bit = 0,
.clk = "peripheral_clk",
.clockevent_rating = 200,
};

Expand Down Expand Up @@ -325,7 +322,6 @@ static struct platform_device mtu2_0_device = {
static struct sh_timer_config mtu2_1_platform_data = {
.channel_offset = -0x100,
.timer_bit = 1,
.clk = "peripheral_clk",
.clockevent_rating = 200,
};

Expand Down
5 changes: 0 additions & 5 deletions arch/sh/kernel/cpu/sh2a/setup-sh7206.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@ static struct platform_device scif3_device = {
static struct sh_timer_config cmt0_platform_data = {
.channel_offset = 0x02,
.timer_bit = 0,
.clk = "peripheral_clk",
.clockevent_rating = 125,
.clocksource_rating = 0, /* disabled due to code generation issues */
};
Expand Down Expand Up @@ -226,7 +225,6 @@ static struct platform_device cmt0_device = {
static struct sh_timer_config cmt1_platform_data = {
.channel_offset = 0x08,
.timer_bit = 1,
.clk = "peripheral_clk",
.clockevent_rating = 125,
.clocksource_rating = 0, /* disabled due to code generation issues */
};
Expand Down Expand Up @@ -256,7 +254,6 @@ static struct platform_device cmt1_device = {
static struct sh_timer_config mtu2_0_platform_data = {
.channel_offset = -0x80,
.timer_bit = 0,
.clk = "peripheral_clk",
.clockevent_rating = 200,
};

Expand Down Expand Up @@ -285,7 +282,6 @@ static struct platform_device mtu2_0_device = {
static struct sh_timer_config mtu2_1_platform_data = {
.channel_offset = -0x100,
.timer_bit = 1,
.clk = "peripheral_clk",
.clockevent_rating = 200,
};

Expand Down Expand Up @@ -314,7 +310,6 @@ static struct platform_device mtu2_1_device = {
static struct sh_timer_config mtu2_2_platform_data = {
.channel_offset = 0x80,
.timer_bit = 2,
.clk = "peripheral_clk",
.clockevent_rating = 200,
};

Expand Down
3 changes: 0 additions & 3 deletions arch/sh/kernel/cpu/sh3/setup-sh7705.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ static struct platform_device rtc_device = {
static struct sh_timer_config tmu0_platform_data = {
.channel_offset = 0x02,
.timer_bit = 0,
.clk = "peripheral_clk",
.clockevent_rating = 200,
};

Expand Down Expand Up @@ -155,7 +154,6 @@ static struct platform_device tmu0_device = {
static struct sh_timer_config tmu1_platform_data = {
.channel_offset = 0xe,
.timer_bit = 1,
.clk = "peripheral_clk",
.clocksource_rating = 200,
};

Expand Down Expand Up @@ -184,7 +182,6 @@ static struct platform_device tmu1_device = {
static struct sh_timer_config tmu2_platform_data = {
.channel_offset = 0x1a,
.timer_bit = 2,
.clk = "peripheral_clk",
};

static struct resource tmu2_resources[] = {
Expand Down
3 changes: 0 additions & 3 deletions arch/sh/kernel/cpu/sh3/setup-sh770x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ static struct platform_device scif2_device = {
static struct sh_timer_config tmu0_platform_data = {
.channel_offset = 0x02,
.timer_bit = 0,
.clk = "peripheral_clk",
.clockevent_rating = 200,
};

Expand Down Expand Up @@ -188,7 +187,6 @@ static struct platform_device tmu0_device = {
static struct sh_timer_config tmu1_platform_data = {
.channel_offset = 0xe,
.timer_bit = 1,
.clk = "peripheral_clk",
.clocksource_rating = 200,
};

Expand Down Expand Up @@ -217,7 +215,6 @@ static struct platform_device tmu1_device = {
static struct sh_timer_config tmu2_platform_data = {
.channel_offset = 0x1a,
.timer_bit = 2,
.clk = "peripheral_clk",
};

static struct resource tmu2_resources[] = {
Expand Down
3 changes: 0 additions & 3 deletions arch/sh/kernel/cpu/sh3/setup-sh7710.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ static struct platform_device scif1_device = {
static struct sh_timer_config tmu0_platform_data = {
.channel_offset = 0x02,
.timer_bit = 0,
.clk = "peripheral_clk",
.clockevent_rating = 200,
};

Expand Down Expand Up @@ -158,7 +157,6 @@ static struct platform_device tmu0_device = {
static struct sh_timer_config tmu1_platform_data = {
.channel_offset = 0xe,
.timer_bit = 1,
.clk = "peripheral_clk",
.clocksource_rating = 200,
};

Expand Down Expand Up @@ -187,7 +185,6 @@ static struct platform_device tmu1_device = {
static struct sh_timer_config tmu2_platform_data = {
.channel_offset = 0x1a,
.timer_bit = 2,
.clk = "peripheral_clk",
};

static struct resource tmu2_resources[] = {
Expand Down
8 changes: 0 additions & 8 deletions arch/sh/kernel/cpu/sh3/setup-sh7720.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ static struct platform_device usbf_device = {
static struct sh_timer_config cmt0_platform_data = {
.channel_offset = 0x10,
.timer_bit = 0,
.clk = "peripheral_clk",
.clockevent_rating = 125,
.clocksource_rating = 125,
};
Expand Down Expand Up @@ -162,7 +161,6 @@ static struct platform_device cmt0_device = {
static struct sh_timer_config cmt1_platform_data = {
.channel_offset = 0x20,
.timer_bit = 1,
.clk = "peripheral_clk",
};

static struct resource cmt1_resources[] = {
Expand Down Expand Up @@ -190,7 +188,6 @@ static struct platform_device cmt1_device = {
static struct sh_timer_config cmt2_platform_data = {
.channel_offset = 0x30,
.timer_bit = 2,
.clk = "peripheral_clk",
};

static struct resource cmt2_resources[] = {
Expand Down Expand Up @@ -218,7 +215,6 @@ static struct platform_device cmt2_device = {
static struct sh_timer_config cmt3_platform_data = {
.channel_offset = 0x40,
.timer_bit = 3,
.clk = "peripheral_clk",
};

static struct resource cmt3_resources[] = {
Expand Down Expand Up @@ -246,7 +242,6 @@ static struct platform_device cmt3_device = {
static struct sh_timer_config cmt4_platform_data = {
.channel_offset = 0x50,
.timer_bit = 4,
.clk = "peripheral_clk",
};

static struct resource cmt4_resources[] = {
Expand Down Expand Up @@ -274,7 +269,6 @@ static struct platform_device cmt4_device = {
static struct sh_timer_config tmu0_platform_data = {
.channel_offset = 0x02,
.timer_bit = 0,
.clk = "peripheral_clk",
.clockevent_rating = 200,
};

Expand Down Expand Up @@ -303,7 +297,6 @@ static struct platform_device tmu0_device = {
static struct sh_timer_config tmu1_platform_data = {
.channel_offset = 0xe,
.timer_bit = 1,
.clk = "peripheral_clk",
.clocksource_rating = 200,
};

Expand Down Expand Up @@ -332,7 +325,6 @@ static struct platform_device tmu1_device = {
static struct sh_timer_config tmu2_platform_data = {
.channel_offset = 0x1a,
.timer_bit = 2,
.clk = "peripheral_clk",
};

static struct resource tmu2_resources[] = {
Expand Down
3 changes: 0 additions & 3 deletions arch/sh/kernel/cpu/sh4/setup-sh4-202.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ static struct platform_device scif0_device = {
static struct sh_timer_config tmu0_platform_data = {
.channel_offset = 0x04,
.timer_bit = 0,
.clk = "peripheral_clk",
.clockevent_rating = 200,
};

Expand Down Expand Up @@ -62,7 +61,6 @@ static struct platform_device tmu0_device = {
static struct sh_timer_config tmu1_platform_data = {
.channel_offset = 0x10,
.timer_bit = 1,
.clk = "peripheral_clk",
.clocksource_rating = 200,
};

Expand Down Expand Up @@ -91,7 +89,6 @@ static struct platform_device tmu1_device = {
static struct sh_timer_config tmu2_platform_data = {
.channel_offset = 0x1c,
.timer_bit = 2,
.clk = "peripheral_clk",
};

static struct resource tmu2_resources[] = {
Expand Down
5 changes: 0 additions & 5 deletions arch/sh/kernel/cpu/sh4/setup-sh7750.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ static struct platform_device scif1_device = {
static struct sh_timer_config tmu0_platform_data = {
.channel_offset = 0x04,
.timer_bit = 0,
.clk = "peripheral_clk",
.clockevent_rating = 200,
};

Expand Down Expand Up @@ -97,7 +96,6 @@ static struct platform_device tmu0_device = {
static struct sh_timer_config tmu1_platform_data = {
.channel_offset = 0x10,
.timer_bit = 1,
.clk = "peripheral_clk",
.clocksource_rating = 200,
};

Expand Down Expand Up @@ -126,7 +124,6 @@ static struct platform_device tmu1_device = {
static struct sh_timer_config tmu2_platform_data = {
.channel_offset = 0x1c,
.timer_bit = 2,
.clk = "peripheral_clk",
};

static struct resource tmu2_resources[] = {
Expand Down Expand Up @@ -159,7 +156,6 @@ static struct platform_device tmu2_device = {
static struct sh_timer_config tmu3_platform_data = {
.channel_offset = 0x04,
.timer_bit = 0,
.clk = "peripheral_clk",
};

static struct resource tmu3_resources[] = {
Expand Down Expand Up @@ -187,7 +183,6 @@ static struct platform_device tmu3_device = {
static struct sh_timer_config tmu4_platform_data = {
.channel_offset = 0x10,
.timer_bit = 1,
.clk = "peripheral_clk",
};

static struct resource tmu4_resources[] = {
Expand Down
3 changes: 0 additions & 3 deletions arch/sh/kernel/cpu/sh4/setup-sh7760.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ static struct platform_device scif3_device = {
static struct sh_timer_config tmu0_platform_data = {
.channel_offset = 0x04,
.timer_bit = 0,
.clk = "peripheral_clk",
.clockevent_rating = 200,
};

Expand Down Expand Up @@ -218,7 +217,6 @@ static struct platform_device tmu0_device = {
static struct sh_timer_config tmu1_platform_data = {
.channel_offset = 0x10,
.timer_bit = 1,
.clk = "peripheral_clk",
.clocksource_rating = 200,
};

Expand Down Expand Up @@ -247,7 +245,6 @@ static struct platform_device tmu1_device = {
static struct sh_timer_config tmu2_platform_data = {
.channel_offset = 0x1c,
.timer_bit = 2,
.clk = "peripheral_clk",
};

static struct resource tmu2_resources[] = {
Expand Down
2 changes: 0 additions & 2 deletions arch/sh/kernel/cpu/sh4a/setup-sh7757.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ static struct platform_device scif4_device = {
static struct sh_timer_config tmu0_platform_data = {
.channel_offset = 0x04,
.timer_bit = 0,
.clk = "peripheral_clk",
.clockevent_rating = 200,
};

Expand Down Expand Up @@ -94,7 +93,6 @@ static struct platform_device tmu0_device = {
static struct sh_timer_config tmu1_platform_data = {
.channel_offset = 0x10,
.timer_bit = 1,
.clk = "peripheral_clk",
.clocksource_rating = 200,
};

Expand Down
Loading

0 comments on commit 4dc50a0

Please sign in to comment.