Merge branch 'sh/hwblk' into sh-latest

6 files changed, 0 insertions, 105 deletions

diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
index 7030f4c8cf11..74d49c01783b 100644
--- 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 92ddce4b3456..9a19fb07276c 100644
--- 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 f65271a8d075..5c3c71366848 100644
--- 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 e4c81195929c..f8f9377d5684 100644
--- 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 80a4e571b310..e1963fecd761 100644
--- 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 b747c0ab9264..affde85ff63e 100644
--- 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 = {