aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Miao <eric.miao@linaro.org>2011-12-04 23:29:23 +0800
committerEric Miao <eric.miao@linaro.org>2011-12-05 11:16:25 +0800
commit72945c6900f5da7bc842a33b3493e0018b674bb9 (patch)
treef17dcf7ddf9a512e158eb412b853f8383f4fc992
parentb78b75907b24fbcfe4e6107d7457a427b73939eb (diff)
downloadlinux-linaro-72945c6900f5da7bc842a33b3493e0018b674bb9.tar.gz
SAUCE: fix the removal of mxc_register_device()
Signed-off-by: Eric Miao <eric.miao@linaro.org>
-rw-r--r--arch/arm/mach-mx5/board-mx53_loco.c8
-rwxr-xr-xarch/arm/mach-mx5/usb_dr.c3
-rw-r--r--arch/arm/mach-mx5/usb_h1.c9
3 files changed, 15 insertions, 5 deletions
diff --git a/arch/arm/mach-mx5/board-mx53_loco.c b/arch/arm/mach-mx5/board-mx53_loco.c
index fe3485f62b3..f517862d1f7 100644
--- a/arch/arm/mach-mx5/board-mx53_loco.c
+++ b/arch/arm/mach-mx5/board-mx53_loco.c
@@ -284,6 +284,9 @@ static struct mxc_audio_platform_data loco_audio_data = {
static struct platform_device loco_audio_device = {
.name = "imx-sgtl5000",
+ .dev = {
+ .platform_data = &loco_audio_data,
+ }
};
static inline void mx53_loco_fec_reset(void)
@@ -558,7 +561,7 @@ static void __init mx53_loco_board_init(void)
imx53_add_sdhci_esdhc_imx(0, &mx53_loco_sd1_data);
imx53_add_sdhci_esdhc_imx(2, &mx53_loco_sd3_data);
- mxc_register_device(&loco_audio_device, &loco_audio_data);
+ platform_device_register(&loco_audio_device);
imx53_add_imx_ssi(1, &loco_ssi_pdata);
imx53_add_srtc();
imx_add_gpio_keys(&loco_button_data);
@@ -570,7 +573,8 @@ static void __init mx53_loco_board_init(void)
i2c_register_board_info(0, mxc_i2c0_board_info,
ARRAY_SIZE(mxc_i2c0_board_info));
- mxc_register_device(&mxc_pm_device, &loco_pm_data);
+ mxc_pm_device.dev.platform_data = &loco_pm_data;
+ platform_device_register(&mxc_pm_device);
mx53_loco_init_da9052();
pm_power_off = da9053_power_off;
diff --git a/arch/arm/mach-mx5/usb_dr.c b/arch/arm/mach-mx5/usb_dr.c
index 099cd402774..ae4df535d1e 100755
--- a/arch/arm/mach-mx5/usb_dr.c
+++ b/arch/arm/mach-mx5/usb_dr.c
@@ -328,7 +328,8 @@ void __init mx5_usb_dr_init(void)
ret |= platform_device_register(&mx53_usbdr_udc_device);
dr_wakeup_config.usb_pdata[2] = mx53_usbdr_udc_device.dev.platform_data;
#endif
- ret |= mxc_register_device(&mx53_usbdr_wakeup_device, &dr_wakeup_config);
+ mx53_usbdr_wakeup_device.dev.platform_data = &dr_wakeup_config;
+ ret |= platform_device_register(&mx53_usbdr_wakeup_device);
if (ret)
printk(KERN_ERR "%s(%d): error occures while init usb dr \n", __func__, __LINE__);
}
diff --git a/arch/arm/mach-mx5/usb_h1.c b/arch/arm/mach-mx5/usb_h1.c
index 11058cac793..0336b16a133 100644
--- a/arch/arm/mach-mx5/usb_h1.c
+++ b/arch/arm/mach-mx5/usb_h1.c
@@ -20,6 +20,7 @@
#include <linux/gpio.h>
#include <asm/delay.h>
+#include <mach/hardware.h>
#include <mach/arc_otg.h>
#include <mach/iomux-mx51.h>
#include <mach/iomux-mx53.h>
@@ -287,9 +288,13 @@ void __init mx5_usbh1_init(void)
mx53_usbh1_device.resource[0].end -= MX53_OFFSET;
}
if (cpu_is_mx53()) {
- mxc_register_device(&mx53_usbh1_device, &usbh1_config);
usbh1_config.wakeup_pdata = &usbh1_wakeup_config;
- mxc_register_device(&mx53_usbh1_wakeup_device, &usbh1_wakeup_config);
+
+ mx53_usbh1_device.dev.platform_data = &usbh1_config;
+ platform_device_register(&mx53_usbh1_device);
+
+ mx53_usbh1_wakeup_device.dev.platform_data = &usbh1_wakeup_config;
+ platform_device_register(&mx53_usbh1_wakeup_device);
}
}