Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45e2a9b4 authored by Eric Miao's avatar Eric Miao
Browse files

[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: default avatarEric Miao <eric.miao@marvell.com>
parent 25af3b0f

arch/arm/mach-pxa/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -71,6 +71,14 @@ config PXA_SHARPSL 
	  SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa)

	  handheld computer.



config CORGI_SSP_DEPRECATED

	bool

	select PXA_SSP

	help

	  This option will include corgi_ssp.c and corgi_lcd.c

	  that corgi_ts.c and other legacy drivers (corgi_bl.c

	  and sharpsl_pm.c) may depend on.



config MACH_POODLE

	bool "Enable Sharp SL-5600 (Poodle) Support"

	depends on PXA_SHARPSL

arch/arm/mach-pxa/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ obj-$(CONFIG_MACH_TRIZEPS4) += trizeps4.o 
obj-$(CONFIG_MACH_COLIBRI)	+= colibri.o

obj-$(CONFIG_PXA_SHARP_C7xx)	+= corgi.o sharpsl_pm.o corgi_pm.o

obj-$(CONFIG_PXA_SHARP_Cxx00)	+= spitz.o sharpsl_pm.o spitz_pm.o

obj-$(CONFIG_CORGI_SSP_DEPRECATED)	+= corgi_ssp.o corgi_lcd.o

obj-$(CONFIG_MACH_POODLE)	+= poodle.o

obj-$(CONFIG_MACH_PCM027)	+= pcm027.o

obj-$(CONFIG_MACH_PCM990_BASEBOARD)	+= pcm990-baseboard.o

arch/arm/mach-pxa/corgi_lcd.c

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <linux/platform_device.h>

#include <linux/module.h>

#include <linux/string.h>

#include <mach/akita.h>

#include <mach/corgi.h>

#include <mach/hardware.h>

#include <mach/pxa-regs.h>

arch/arm/mach-pxa/sharpsl_pm.c

+4 −4
Original line number Diff line number Diff line
@@ -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

}

drivers/input/touchscreen/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -42,8 +42,9 @@ config TOUCHSCREEN_BITSY 
	  module will be called h3600_ts_input.



config TOUCHSCREEN_CORGI

	tristate "SharpSL (Corgi and Spitz series) touchscreen driver"

	tristate "SharpSL (Corgi and Spitz series) touchscreen driver (DEPRECATED)"

	depends on PXA_SHARPSL

	select CORGI_SSP_DEPRECATED

	default y

	help

	  Say Y here to enable the driver for the touchscreen on the
@@ -54,6 +55,9 @@ config TOUCHSCREEN_CORGI 
	  To compile this driver as a module, choose M here: the

	  module will be called corgi_ts.



	  NOTE: this driver is deprecated, try enable SPI and generic

	  ADS7846-based touchscreen driver.



config TOUCHSCREEN_FUJITSU

	tristate "Fujitsu serial touchscreen"

	select SERIO