Merge branch 'at91/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[pandora-kernel.git] / arch / arm / plat-samsung / pwm-clock.c

diff --git a/arch/arm/plat-samsung/pwm-clock.c b/arch/arm/plat-samsung/pwm-clock.c
index 46c9381..f1bba88 100644 (file)
--- a/arch/arm/plat-samsung/pwm-clock.c
+++ b/arch/arm/plat-samsung/pwm-clock.c
@@ -268,6 +268,7 @@ static struct pwm_tdiv_clk clk_timer_tdiv[] = {
        [0]     = {
                .clk    = {
                        .name   = "pwm-tdiv",
+                       .devname        = "s3c24xx-pwm.0",
                        .ops    = &clk_tdiv_ops,
                        .parent = &clk_timer_scaler[0],
                },
@@ -275,6 +276,7 @@ static struct pwm_tdiv_clk clk_timer_tdiv[] = {
        [1]     = {
                .clk    = {
                        .name   = "pwm-tdiv",
+                       .devname        = "s3c24xx-pwm.1",
                        .ops    = &clk_tdiv_ops,
                        .parent = &clk_timer_scaler[0],
                }
@@ -282,6 +284,7 @@ static struct pwm_tdiv_clk clk_timer_tdiv[] = {
        [2]     = {
                .clk    = {
                        .name   = "pwm-tdiv",
+                       .devname        = "s3c24xx-pwm.2",
                        .ops    = &clk_tdiv_ops,
                        .parent = &clk_timer_scaler[1],
                },
@@ -289,6 +292,7 @@ static struct pwm_tdiv_clk clk_timer_tdiv[] = {
        [3]     = {
                .clk    = {
                        .name   = "pwm-tdiv",
+                       .devname        = "s3c24xx-pwm.3",
                        .ops    = &clk_tdiv_ops,
                        .parent = &clk_timer_scaler[1],
                },
@@ -296,6 +300,7 @@ static struct pwm_tdiv_clk clk_timer_tdiv[] = {
        [4]     = {
                .clk    = {
                        .name   = "pwm-tdiv",
+                       .devname        = "s3c24xx-pwm.4",
                        .ops    = &clk_tdiv_ops,
                        .parent = &clk_timer_scaler[1],
                },
@@ -361,26 +366,31 @@ static struct clk_ops clk_tin_ops = {
 static struct clk clk_tin[] = {
        [0]     = {
                .name   = "pwm-tin",
+               .devname        = "s3c24xx-pwm.0",
                .id     = 0,
                .ops    = &clk_tin_ops,
        },
        [1]     = {
                .name   = "pwm-tin",
+               .devname        = "s3c24xx-pwm.1",
                .id     = 1,
                .ops    = &clk_tin_ops,
        },
        [2]     = {
                .name   = "pwm-tin",
+               .devname        = "s3c24xx-pwm.2",
                .id     = 2,
                .ops    = &clk_tin_ops,
        },
        [3]     = {
                .name   = "pwm-tin",
+               .devname        = "s3c24xx-pwm.3",
                .id     = 3,
                .ops    = &clk_tin_ops,
        },
        [4]     = {
                .name   = "pwm-tin",
+               .devname        = "s3c24xx-pwm.4",
                .id     = 4,
                .ops    = &clk_tin_ops,
        },