diff options
| author | Todd Doucet <todd.doucet@timesys.com> | 2010-02-18 12:38:44 -0500 |
|---|---|---|
| committer | Todd Doucet <todd.doucet@timesys.com> | 2010-02-18 12:38:44 -0500 |
| commit | 793deae7244b1c3d3dc9ad9437b692655e04d1c1 (patch) | |
| tree | b49aa81dd8bdc377dc64aee55c0ebca1e522b34e /arch/arm/mach-mx51/devices.c | |
| parent | 7e407c346b8c197f73e88aea4c6ca3de19710aa1 (diff) | |
Intermediate alpha release with partially working touchscreen for special customer.2.6.28-ccwmx51js-201002181258
Diffstat (limited to 'arch/arm/mach-mx51/devices.c')
| -rw-r--r-- | arch/arm/mach-mx51/devices.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm/mach-mx51/devices.c b/arch/arm/mach-mx51/devices.c index 3496580d807f..d1a6f8f42528 100644 --- a/arch/arm/mach-mx51/devices.c +++ b/arch/arm/mach-mx51/devices.c @@ -596,6 +596,13 @@ extern void mx51_babbage_gpio_spi_chipselect_active(int cspi_mode, int status, int chipselect); extern void mx51_babbage_gpio_spi_chipselect_inactive(int cspi_mode, int status, int chipselect); + +extern void mx51_ccwmx51js_gpio_spi_chipselect_active(int cspi_mode, int status, + int chipselect); +extern void mx51_ccwmx51js_gpio_spi_chipselect_inactive(int cspi_mode, int status, + int chipselect); + + /*! Platform Data for MXC CSPI1 */ static struct mxc_spi_master mxcspi1_data = { .maxchipselect = 4, @@ -695,9 +702,14 @@ void __init mxc_init_spi(void) #ifdef CONFIG_SPI_MXC_SELECT1 if (machine_is_mx51_babbage()) { mxcspi1_data.chipselect_active = - mx51_babbage_gpio_spi_chipselect_active; + mx51_babbage_gpio_spi_chipselect_active; mxcspi1_data.chipselect_inactive = mx51_babbage_gpio_spi_chipselect_inactive; + } else { + mxcspi1_data.chipselect_active = + mx51_ccwmx51js_gpio_spi_chipselect_active; + mxcspi1_data.chipselect_inactive = + mx51_ccwmx51js_gpio_spi_chipselect_inactive; } if (platform_device_register(&mxcspi1_device) < 0) printk(KERN_ERR "Error: Registering the SPI Controller_1\n"); |