diff options
| author | Quinn Jensen <quinn.jensen@freescale.com> | 2007-10-24 21:22:06 -0600 |
|---|---|---|
| committer | Quinn Jensen <quinn.jensen@freescale.com> | 2007-10-24 21:22:06 -0600 |
| commit | 19f48fbe00e75572b2e28fd031bed5d0fa0d73f6 (patch) | |
| tree | d618d93a7a432b7853b035cc1406cd3b1cb051bb /arch | |
| parent | 28e0402d101282efefd3d3310119b4662908bc4b (diff) | |
CR ENGR00043063: platform device for scc added
Patch for CR ENGR00043063: add platform device support for scc.
Applies to linux 2.6.22 kernel for MX platforms.
http://www.bitshrine.org/gpp/linux-2.6.22-mx-CR-ENGR00043063-platform-device-for-scc-ad.patch
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mx27/devices.c | 18 | ||||
| -rw-r--r-- | arch/arm/mach-mx3/devices.c | 18 |
2 files changed, 36 insertions, 0 deletions
diff --git a/arch/arm/mach-mx27/devices.c b/arch/arm/mach-mx27/devices.c index e22020206c83..0df427998b7c 100644 --- a/arch/arm/mach-mx27/devices.c +++ b/arch/arm/mach-mx27/devices.c @@ -122,7 +122,24 @@ static inline void mxc_init_wdt(void) { } #endif +/*! + * This is platform device structure for adding SCC + */ +#if defined(CONFIG_MXC_SECURITY_SCC) || defined(CONFIG_MXC_SECURITY_SCC_MODULE) +static struct platform_device mxc_scc_device = { + .name = "mxc_scc", + .id = 0, +}; +static void mxc_init_scc(void) +{ + platform_device_register(&mxc_scc_device); +} +#else +static inline void mxc_init_scc(void) +{ +} +#endif /* MMC device data */ #if defined(CONFIG_MMC_MXC) || defined(CONFIG_MMC_MXC_MODULE) @@ -588,6 +605,7 @@ static int __init mxc_init_devices(void) mxc_init_spi(); mxc_init_i2c(); mxc_init_rtc(); + mxc_init_scc(); mxc_init_owire(); mxc_init_vpu(); #ifndef CONFIG_MX27_DPTC diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c index 74205972ba67..51ff2253cef5 100644 --- a/arch/arm/mach-mx3/devices.c +++ b/arch/arm/mach-mx3/devices.c @@ -335,7 +335,24 @@ static inline void mxc_init_ir(void) { } #endif +/*! + * This is platform device structure for adding SCC + */ +#if defined(CONFIG_MXC_SECURITY_SCC) || defined(CONFIG_MXC_SECURITY_SCC_MODULE) +static struct platform_device mxc_scc_device = { + .name = "mxc_scc", + .id = 0, +}; +static void mxc_init_scc(void) +{ + platform_device_register(&mxc_scc_device); +} +#else +static inline void mxc_init_scc(void) +{ +} +#endif /* MMC device data */ #if defined(CONFIG_MMC_MXC) || defined(CONFIG_MMC_MXC_MODULE) @@ -863,6 +880,7 @@ static int __init mxc_init_devices(void) mxc_init_rtc(); mxc_init_owire(); mxc_init_pcmcia(); + mxc_init_scc(); mxc_init_hmp4e(); mxc_init_dma(); #ifndef CONFIG_MXC_DPTC |