Merge branch 'sh/hwblk' into sh-latest

1 files changed, 0 insertions, 36 deletions

diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index 27af277cc63c..8420d4bc8bfc 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -173,9 +173,6 @@ struct platform_device dma_device = {
         .dev            = {
                 .platform_data  = &dma_platform_data,
         },
-        .archdata = {
-                .hwblk_id = HWBLK_DMAC,
-        },
 };
 
 /* Serial */
@@ -264,9 +261,6 @@ static struct platform_device rtc_device = {
         .id             = -1,
         .num_resources  = ARRAY_SIZE(rtc_resources),
         .resource       = rtc_resources,
-        .archdata = {
-                .hwblk_id = HWBLK_RTC,
-        },
 };
 
 static struct m66592_platdata usbf_platdata = {
@@ -297,9 +291,6 @@ static struct platform_device usbf_device = {
         },
         .num_resources  = ARRAY_SIZE(usbf_resources),
         .resource       = usbf_resources,
-        .archdata = {
-                .hwblk_id = HWBLK_USBF,
-        },
 };
 
 static struct resource iic_resources[] = {
@@ -321,9 +312,6 @@ static struct platform_device iic_device = {
         .id             = 0, /* "i2c0" clock */
         .num_resources  = ARRAY_SIZE(iic_resources),
         .resource       = iic_resources,
-        .archdata = {
-                .hwblk_id = HWBLK_IIC,
-        },
 };
 
 static struct uio_info vpu_platform_data = {
@@ -352,9 +340,6 @@ static struct platform_device vpu_device = {
         },
         .resource       = vpu_resources,
         .num_resources  = ARRAY_SIZE(vpu_resources),
-        .archdata = {
-                .hwblk_id = HWBLK_VPU,
-        },
 };
 
 static struct uio_info veu_platform_data = {
@@ -383,9 +368,6 @@ static struct platform_device veu_device = {
         },
         .resource       = veu_resources,
         .num_resources  = ARRAY_SIZE(veu_resources),
-        .archdata = {
-                .hwblk_id = HWBLK_VEU,
-        },
 };
 
 static struct uio_info jpu_platform_data = {
@@ -414,9 +396,6 @@ static struct platform_device jpu_device = {
         },
         .resource       = jpu_resources,
         .num_resources  = ARRAY_SIZE(jpu_resources),
-        .archdata = {
-                .hwblk_id = HWBLK_JPU,
-        },
 };
 
 static struct sh_timer_config cmt_platform_data = {
@@ -446,9 +425,6 @@ static struct platform_device cmt_device = {
         },
         .resource       = cmt_resources,
         .num_resources  = ARRAY_SIZE(cmt_resources),
-        .archdata = {
-                .hwblk_id = HWBLK_CMT,
-        },
 };
 
 static struct sh_timer_config tmu0_platform_data = {
@@ -477,9 +453,6 @@ static struct platform_device tmu0_device = {
         },
         .resource       = tmu0_resources,
         .num_resources  = ARRAY_SIZE(tmu0_resources),
-        .archdata = {
-                .hwblk_id = HWBLK_TMU,
-        },
 };
 
 static struct sh_timer_config tmu1_platform_data = {
@@ -508,9 +481,6 @@ static struct platform_device tmu1_device = {
         },
         .resource       = tmu1_resources,
         .num_resources  = ARRAY_SIZE(tmu1_resources),
-        .archdata = {
-                .hwblk_id = HWBLK_TMU,
-        },
 };
 
 static struct sh_timer_config tmu2_platform_data = {
@@ -538,9 +508,6 @@ static struct platform_device tmu2_device = {
         },
         .resource       = tmu2_resources,
         .num_resources  = ARRAY_SIZE(tmu2_resources),
-        .archdata = {
-                .hwblk_id = HWBLK_TMU,
-        },
 };
 
 static struct siu_platform siu_platform_data = {
@@ -571,9 +538,6 @@ static struct platform_device siu_device = {
         },
         .resource       = siu_resources,
         .num_resources  = ARRAY_SIZE(siu_resources),
-        .archdata = {
-                .hwblk_id = HWBLK_SIU,
-        },
 };
 
 static struct platform_device *sh7722_devices[] __initdata = {