sh: hwblk: Kill off hwblk_id from pdev archdata.

Now that nothing is using this anymore, kill off the assignments across
the board.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
index 7030f4c8cf118ec734c086126fea72a794df6258..74d49c01783b26912f7e611b8d7f483020d27009 100644 (file)
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/mach-ap325rxa/setup.c
@@ -249,9 +249,6 @@ static struct platform_device lcdc_device = {
        .dev            = {
                .platform_data  = &lcdc_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_LCDC,
-       },
 };
 
 static void camera_power(int val)
@@ -424,9 +421,6 @@ static struct platform_device ceu_device = {
        .dev            = {
                .platform_data  = &sh_mobile_ceu_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_CEU,
-       },
 };
 
 static struct resource sdhi0_cn3_resources[] = {
@@ -454,9 +448,6 @@ static struct platform_device sdhi0_cn3_device = {
        .dev = {
                .platform_data = &sdhi0_cn3_data,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_SDHI0,
-       },
 };
 
 static struct resource sdhi1_cn7_resources[] = {
@@ -484,9 +475,6 @@ static struct platform_device sdhi1_cn7_device = {
        .dev = {
                .platform_data = &sdhi1_cn7_data,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_SDHI1,
-       },
 };
 
 static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = {

diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 92ddce4b34563faab3c53ac7629140dd05f089f9..9a19fb07276cba9304c3a34fed5febd8414fd378 100644 (file)
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -156,9 +156,6 @@ static struct platform_device sh_eth_device = {
        },
        .num_resources = ARRAY_SIZE(sh_eth_resources),
        .resource = sh_eth_resources,
-       .archdata = {
-               .hwblk_id = HWBLK_ETHER,
-       },
 };
 
 /* USB0 host */
@@ -278,9 +275,6 @@ static struct platform_device usbhs_device = {
        },
        .num_resources  = ARRAY_SIZE(usbhs_resources),
        .resource       = usbhs_resources,
-       .archdata = {
-               .hwblk_id = HWBLK_USB1,
-       },
 };
 
 /* LCDC */
@@ -366,9 +360,6 @@ static struct platform_device lcdc_device = {
        .dev            = {
                .platform_data  = &lcdc_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_LCDC,
-       },
 };
 
 /* CEU0 */
@@ -400,9 +391,6 @@ static struct platform_device ceu0_device = {
        .dev    = {
                .platform_data  = &sh_mobile_ceu0_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_CEU0,
-       },
 };
 
 /* CEU1 */
@@ -434,9 +422,6 @@ static struct platform_device ceu1_device = {
        .dev    = {
                .platform_data  = &sh_mobile_ceu1_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_CEU1,
-       },
 };
 
 /* I2C device */
@@ -491,9 +476,6 @@ static struct platform_device keysc_device = {
        .dev    = {
                .platform_data  = &keysc_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_KEYSC,
-       },
 };
 
 /* TouchScreen */
@@ -568,9 +550,6 @@ static struct platform_device sdhi0_device = {
        .dev    = {
                .platform_data  = &sdhi0_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_SDHI0,
-       },
 };
 
 #if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
@@ -608,9 +587,6 @@ static struct platform_device sdhi1_device = {
        .dev    = {
                .platform_data  = &sdhi1_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_SDHI1,
-       },
 };
 #endif /* CONFIG_MMC_SH_MMCIF */
 
@@ -676,9 +652,6 @@ static struct platform_device msiof0_device = {
        },
        .num_resources  = ARRAY_SIZE(msiof0_resources),
        .resource       = msiof0_resources,
-       .archdata = {
-               .hwblk_id = HWBLK_MSIOF0,
-       },
 };
 
 #endif
@@ -818,9 +791,6 @@ static struct platform_device fsi_device = {
        .dev    = {
                .platform_data  = &fsi_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_SPU, /* FSI needs SPU hwblk */
-       },
 };
 
 /* IrDA */
@@ -882,9 +852,6 @@ static struct platform_device vou_device = {
        .dev            = {
                .platform_data  = &sh_vou_pdata,
        },
-       .archdata       = {
-               .hwblk_id       = HWBLK_VOU,
-       },
 };
 
 #if defined(CONFIG_MMC_SH_MMCIF) || defined(CONFIG_MMC_SH_MMCIF_MODULE)
@@ -936,9 +903,6 @@ static struct platform_device sh_mmcif_device = {
        },
        .num_resources  = ARRAY_SIZE(sh_mmcif_resources),
        .resource       = sh_mmcif_resources,
-       .archdata = {
-               .hwblk_id = HWBLK_MMC,
-       },
 };
 #endif
 

diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c
index f65271a8d0754af996d0e8f2519d5d46c21edb7b..5c3c713668480815b63cc24bc4896fc2689bf22f 100644 (file)
--- a/arch/sh/boards/mach-kfr2r09/setup.c
+++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@ -122,9 +122,6 @@ static struct platform_device kfr2r09_sh_keysc_device = {
        .dev    = {
                .platform_data  = &kfr2r09_sh_keysc_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_KEYSC,
-       },
 };
 
 static const struct fb_videomode kfr2r09_lcdc_modes[] = {
@@ -191,9 +188,6 @@ static struct platform_device kfr2r09_sh_lcdc_device = {
        .dev    = {
                .platform_data  = &kfr2r09_sh_lcdc_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_LCDC,
-       },
 };
 
 static struct r8a66597_platdata kfr2r09_usb0_gadget_data = {
@@ -254,9 +248,6 @@ static struct platform_device kfr2r09_ceu_device = {
        .dev    = {
                .platform_data  = &sh_mobile_ceu_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_CEU0,
-       },
 };
 
 static struct i2c_board_info kfr2r09_i2c_camera = {
@@ -377,9 +368,6 @@ static struct platform_device kfr2r09_sh_sdhi0_device = {
        .dev = {
                .platform_data  = &sh7724_sdhi0_data,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_SDHI0,
-       },
 };
 
 static struct platform_device *kfr2r09_devices[] __initdata = {

diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index e4c81195929c3f8b485d5d3eb9995cb03968affc..f8f9377d5684ecfb9a817a35eab371d78400bb7e 100644 (file)
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -99,9 +99,6 @@ static struct platform_device sh_keysc_device = {
        .dev    = {
                .platform_data  = &sh_keysc_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_KEYSC,
-       },
 };
 
 static struct mtd_partition migor_nor_flash_partitions[] =
@@ -300,9 +297,6 @@ static struct platform_device migor_lcdc_device = {
        .dev    = {
                .platform_data  = &sh_mobile_lcdc_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_LCDC,
-       },
 };
 
 static struct clk *camera_clk;
@@ -390,9 +384,6 @@ static struct platform_device migor_ceu_device = {
        .dev    = {
                .platform_data  = &sh_mobile_ceu_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_CEU,
-       },
 };
 
 static struct resource sdhi_cn9_resources[] = {
@@ -421,9 +412,6 @@ static struct platform_device sdhi_cn9_device = {
        .dev = {
                .platform_data  = &sh7724_sdhi_data,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_SDHI,
-       },
 };
 
 static struct i2c_board_info migor_i2c_devices[] = {

diff --git a/arch/sh/boards/mach-se/7722/setup.c b/arch/sh/boards/mach-se/7722/setup.c
index 80a4e571b310f99e79c04f991236ef92c1d232be..e1963fecd761ace85df196720c2c68c4f4d7a738 100644 (file)
--- a/arch/sh/boards/mach-se/7722/setup.c
+++ b/arch/sh/boards/mach-se/7722/setup.c
@@ -127,9 +127,6 @@ static struct platform_device sh_keysc_device = {
        .dev    = {
                .platform_data  = &sh_keysc_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_KEYSC,
-       },
 };
 
 static struct platform_device *se7722_devices[] __initdata = {

diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index b747c0ab9264ac3ed5d1894b8c67f471c7bc852d..affde85ff63e959391ce804cbbb5e65eb538adf8 100644 (file)
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -210,9 +210,6 @@ static struct platform_device lcdc_device = {
        .dev            = {
                .platform_data  = &lcdc_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_LCDC,
-       },
 };
 
 /* CEU0 */
@@ -244,9 +241,6 @@ static struct platform_device ceu0_device = {
        .dev    = {
                .platform_data  = &sh_mobile_ceu0_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_CEU0,
-       },
 };
 
 /* CEU1 */
@@ -278,9 +272,6 @@ static struct platform_device ceu1_device = {
        .dev    = {
                .platform_data  = &sh_mobile_ceu1_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_CEU1,
-       },
 };
 
 /* FSI */
@@ -310,9 +301,6 @@ static struct platform_device fsi_device = {
        .dev    = {
                .platform_data  = &fsi_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_SPU, /* FSI needs SPU hwblk */
-       },
 };
 
 static struct platform_device fsi_ak4642_device = {
@@ -355,9 +343,6 @@ static struct platform_device keysc_device = {
        .dev    = {
                .platform_data  = &keysc_info,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_KEYSC,
-       },
 };
 
 /* SH Eth */
@@ -386,9 +371,6 @@ static struct platform_device sh_eth_device = {
        },
        .num_resources = ARRAY_SIZE(sh_eth_resources),
        .resource = sh_eth_resources,
-       .archdata = {
-               .hwblk_id = HWBLK_ETHER,
-       },
 };
 
 static struct r8a66597_platdata sh7724_usb0_host_data = {
@@ -418,9 +400,6 @@ static struct platform_device sh7724_usb0_host_device = {
        },
        .num_resources  = ARRAY_SIZE(sh7724_usb0_host_resources),
        .resource       = sh7724_usb0_host_resources,
-       .archdata = {
-               .hwblk_id = HWBLK_USB0,
-       },
 };
 
 static struct r8a66597_platdata sh7724_usb1_gadget_data = {
@@ -479,9 +458,6 @@ static struct platform_device sdhi0_cn7_device = {
        .dev = {
                .platform_data  = &sh7724_sdhi0_data,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_SDHI0,
-       },
 };
 
 static struct resource sdhi1_cn8_resources[] = {
@@ -511,9 +487,6 @@ static struct platform_device sdhi1_cn8_device = {
        .dev = {
                .platform_data  = &sh7724_sdhi1_data,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_SDHI1,
-       },
 };
 
 /* IrDA */
@@ -576,9 +549,6 @@ static struct platform_device vou_device = {
        .dev            = {
                .platform_data  = &sh_vou_pdata,
        },
-       .archdata       = {
-               .hwblk_id       = HWBLK_VOU,
-       },
 };
 
 static struct platform_device *ms7724se_devices[] __initdata = {

diff --git a/arch/sh/include/asm/device.h b/arch/sh/include/asm/device.h
index 783ecdc64e25b36609f87aeb64b42c7cb323a3fd..a1c9c0daec109c694184d03da5d0701d049b8c40 100644 (file)
--- a/arch/sh/include/asm/device.h
+++ b/arch/sh/include/asm/device.h
@@ -15,5 +15,4 @@ int platform_resource_setup_memory(struct platform_device *pdev,
 void plat_early_device_setup(void);
 
 struct pdev_archdata {
-       int hwblk_id;
 };

diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index 278a0e572158697793d76404b6ffb87eb4c9a7c2..65246ab8f973333b01faad47f012717b0aeb86fe 100644 (file)
--- 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 = {

diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
index 3c2810d8f72e3caf81643baef9fabff588747736..a188c9ea4393b3443b8564a020b7c6bb3ae9c1e1 100644 (file)
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
@@ -158,9 +158,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 veu0_platform_data = {
@@ -189,9 +186,6 @@ static struct platform_device veu0_device = {
        },
        .resource       = veu0_resources,
        .num_resources  = ARRAY_SIZE(veu0_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_VEU2H0,
-       },
 };
 
 static struct uio_info veu1_platform_data = {
@@ -220,9 +214,6 @@ static struct platform_device veu1_device = {
        },
        .resource       = veu1_resources,
        .num_resources  = ARRAY_SIZE(veu1_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_VEU2H1,
-       },
 };
 
 static struct sh_timer_config cmt_platform_data = {
@@ -252,9 +243,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 = {
@@ -283,9 +271,6 @@ static struct platform_device tmu0_device = {
        },
        .resource       = tmu0_resources,
        .num_resources  = ARRAY_SIZE(tmu0_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_TMU0,
-       },
 };
 
 static struct sh_timer_config tmu1_platform_data = {
@@ -314,9 +299,6 @@ static struct platform_device tmu1_device = {
        },
        .resource       = tmu1_resources,
        .num_resources  = ARRAY_SIZE(tmu1_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_TMU0,
-       },
 };
 
 static struct sh_timer_config tmu2_platform_data = {
@@ -344,9 +326,6 @@ static struct platform_device tmu2_device = {
        },
        .resource       = tmu2_resources,
        .num_resources  = ARRAY_SIZE(tmu2_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_TMU0,
-       },
 };
 
 static struct sh_timer_config tmu3_platform_data = {
@@ -374,9 +353,6 @@ static struct platform_device tmu3_device = {
        },
        .resource       = tmu3_resources,
        .num_resources  = ARRAY_SIZE(tmu3_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_TMU1,
-       },
 };
 
 static struct sh_timer_config tmu4_platform_data = {
@@ -404,9 +380,6 @@ static struct platform_device tmu4_device = {
        },
        .resource       = tmu4_resources,
        .num_resources  = ARRAY_SIZE(tmu4_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_TMU1,
-       },
 };
 
 static struct sh_timer_config tmu5_platform_data = {
@@ -434,9 +407,6 @@ static struct platform_device tmu5_device = {
        },
        .resource       = tmu5_resources,
        .num_resources  = ARRAY_SIZE(tmu5_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_TMU1,
-       },
 };
 
 static struct resource rtc_resources[] = {
@@ -467,9 +437,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 r8a66597_platdata r8a66597_data = {
@@ -499,9 +466,6 @@ static struct platform_device sh7723_usb_host_device = {
        },
        .num_resources  = ARRAY_SIZE(sh7723_usb_host_resources),
        .resource       = sh7723_usb_host_resources,
-       .archdata = {
-               .hwblk_id = HWBLK_USB,
-       },
 };
 
 static struct resource iic_resources[] = {
@@ -523,9 +487,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 platform_device *sh7723_devices[] __initdata = {

diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
index a37dd72c36719d06c938431691b48a9c56023790..7370aa94b9a910f3b891f12fae2b90801b4af83f 100644 (file)
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
@@ -275,9 +275,6 @@ static struct platform_device dma0_device = {
        .dev            = {
                .platform_data  = &dma_platform_data,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_DMAC0,
-       },
 };
 
 static struct platform_device dma1_device = {
@@ -288,9 +285,6 @@ static struct platform_device dma1_device = {
        .dev            = {
                .platform_data  = &dma_platform_data,
        },
-       .archdata = {
-               .hwblk_id = HWBLK_DMAC1,
-       },
 };
 
 /* Serial */
@@ -434,9 +428,6 @@ static struct platform_device rtc_device = {
        .id             = -1,
        .num_resources  = ARRAY_SIZE(rtc_resources),
        .resource       = rtc_resources,
-       .archdata = {
-               .hwblk_id = HWBLK_RTC,
-       },
 };
 
 /* I2C0 */
@@ -459,9 +450,6 @@ static struct platform_device iic0_device = {
        .id             = 0, /* "i2c0" clock */
        .num_resources  = ARRAY_SIZE(iic0_resources),
        .resource       = iic0_resources,
-       .archdata = {
-               .hwblk_id = HWBLK_IIC0,
-       },
 };
 
 /* I2C1 */
@@ -484,9 +472,6 @@ static struct platform_device iic1_device = {
        .id             = 1, /* "i2c1" clock */
        .num_resources  = ARRAY_SIZE(iic1_resources),
        .resource       = iic1_resources,
-       .archdata = {
-               .hwblk_id = HWBLK_IIC1,
-       },
 };
 
 /* VPU */
@@ -516,9 +501,6 @@ static struct platform_device vpu_device = {
        },
        .resource       = vpu_resources,
        .num_resources  = ARRAY_SIZE(vpu_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_VPU,
-       },
 };
 
 /* VEU0 */
@@ -548,9 +530,6 @@ static struct platform_device veu0_device = {
        },
        .resource       = veu0_resources,
        .num_resources  = ARRAY_SIZE(veu0_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_VEU0,
-       },
 };
 
 /* VEU1 */
@@ -580,9 +559,6 @@ static struct platform_device veu1_device = {
        },
        .resource       = veu1_resources,
        .num_resources  = ARRAY_SIZE(veu1_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_VEU1,
-       },
 };
 
 /* BEU0 */
@@ -612,9 +588,6 @@ static struct platform_device beu0_device = {
        },
        .resource       = beu0_resources,
        .num_resources  = ARRAY_SIZE(beu0_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_BEU0,
-       },
 };
 
 /* BEU1 */
@@ -644,9 +617,6 @@ static struct platform_device beu1_device = {
        },
        .resource       = beu1_resources,
        .num_resources  = ARRAY_SIZE(beu1_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_BEU1,
-       },
 };
 
 static struct sh_timer_config cmt_platform_data = {
@@ -676,9 +646,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 = {
@@ -707,9 +674,6 @@ static struct platform_device tmu0_device = {
        },
        .resource       = tmu0_resources,
        .num_resources  = ARRAY_SIZE(tmu0_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_TMU0,
-       },
 };
 
 static struct sh_timer_config tmu1_platform_data = {
@@ -738,9 +702,6 @@ static struct platform_device tmu1_device = {
        },
        .resource       = tmu1_resources,
        .num_resources  = ARRAY_SIZE(tmu1_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_TMU0,
-       },
 };
 
 static struct sh_timer_config tmu2_platform_data = {
@@ -768,9 +729,6 @@ static struct platform_device tmu2_device = {
        },
        .resource       = tmu2_resources,
        .num_resources  = ARRAY_SIZE(tmu2_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_TMU0,
-       },
 };
 
 
@@ -799,9 +757,6 @@ static struct platform_device tmu3_device = {
        },
        .resource       = tmu3_resources,
        .num_resources  = ARRAY_SIZE(tmu3_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_TMU1,
-       },
 };
 
 static struct sh_timer_config tmu4_platform_data = {
@@ -829,9 +784,6 @@ static struct platform_device tmu4_device = {
        },
        .resource       = tmu4_resources,
        .num_resources  = ARRAY_SIZE(tmu4_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_TMU1,
-       },
 };
 
 static struct sh_timer_config tmu5_platform_data = {
@@ -859,9 +811,6 @@ static struct platform_device tmu5_device = {
        },
        .resource       = tmu5_resources,
        .num_resources  = ARRAY_SIZE(tmu5_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_TMU1,
-       },
 };
 
 /* JPU */
@@ -891,9 +840,6 @@ static struct platform_device jpu_device = {
        },
        .resource       = jpu_resources,
        .num_resources  = ARRAY_SIZE(jpu_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_JPU,
-       },
 };
 
 /* SPU2DSP0 */
@@ -923,9 +869,6 @@ static struct platform_device spu0_device = {
        },
        .resource       = spu0_resources,
        .num_resources  = ARRAY_SIZE(spu0_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_SPU,
-       },
 };
 
 /* SPU2DSP1 */
@@ -955,9 +898,6 @@ static struct platform_device spu1_device = {
        },
        .resource       = spu1_resources,
        .num_resources  = ARRAY_SIZE(spu1_resources),
-       .archdata = {
-               .hwblk_id = HWBLK_SPU,
-       },
 };
 
 static struct platform_device *sh7724_devices[] __initdata = {