[ARM] pxa: fix the corgi_ssp.c dependency issue in {corgi,spitz}_defconfig

Separate building of corgi_ssp.c, and introduce a new hidden config option
CONFIG_CORGI_SSP_DEPRECATED for this. Aslo mark corgi_ts.c and corgi_bl.c
as deprecated.

This unbreaks the legacy configs in {corgi,spitz}_defconfig, however, SPI
based ADS7846 touchscreen driver and a new SPI-based corgi_lcd.c driver
with integrated backlight support are recommended.

Signed-off-by: Eric Miao <eric.miao@marvell.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index 9427d8088395..f0845c1b001c 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -132,16 +132,16 @@ int sharpsl_pm_pxa_read_max1111(int channel)
         if (machine_is_tosa()) // Ugly, better move this function into another module
             return 0;
 
-#ifdef CONFIG_SENSORS_MAX1111
+#ifdef CONFIG_CORGI_SSP_DEPRECATED
+        return corgi_ssp_max1111_get((channel << MAXCTRL_SEL_SH) | MAXCTRL_PD0 | MAXCTRL_PD1
+                        | MAXCTRL_SGL | MAXCTRL_UNI | MAXCTRL_STR);
+#else
         extern int max1111_read_channel(int);
 
         /* max1111 accepts channels from 0-3, however,
          * it is encoded from 0-7 here in the code.
          */
         return max1111_read_channel(channel >> 1);
-#else
-        return corgi_ssp_max1111_get((channel << MAXCTRL_SEL_SH) | MAXCTRL_PD0 | MAXCTRL_PD1
-                        | MAXCTRL_SGL | MAXCTRL_UNI | MAXCTRL_STR);
 #endif
 }