pxa: ssp code cleanup
Subsystems (7)
cover pxa: ssp code cleanup
Which includes the following patches:
[PATCH 1/8] input: remove now deprecated corgi_ts.c touchscreen driver [PATCH 2/8] [ARM] pxa: remove now un-used corgi_ssp.c and corgi_lcd.c [PATCH 3/8] [ARM] pxa: remove the now legacy SSP API [PATCH 4/8] [ARM] pxa: correct SSCR0_SCR to support multiple SoCs [PATCH 5/8] [ARM] pxa: merge regs-ssp.h into ssp.h
[PATCH 6/8] [ARM] pxa: remove unnecessary #include of <mach/ssp.h> [PATCH 7/8] [ARM] pxa: move ssp into common plat-pxa [PATCH 8/8] [ARM] pxa: remove incorrect select PXA_SSP in Kconfig
PATCH 1/8 input: remove now deprecated corgi_ts.c touchscreen driver
The corgi touchscreen is now deprecated in favour of the generic ads7846.c driver. The noise reduction technique used in corgi_ts.c, which is to wait till vsync before ADC sampling, is also integrated into ads7846 driver now. Provided that the original driver is not generic and is difficult to maintain, it will be removed now.
--- drivers/input/touchscreen/Kconfig | 16 -- drivers/input/touchscreen/Makefile | 1 - drivers/input/touchscreen/corgi_ts.c | 385 ---------------------------------- 3 files changed, 0 insertions(+), 402 deletions(-) delete mode 100644 drivers/input/touchscreen/corgi_ts.c
drivers/input/touchscreen/Kconfig +0 -16
@@ -99,22 +99,6 @@ config TOUCHSCREEN_BITSY To compile this driver as a module, choose M here: the module will be called h3600_ts_input. -config TOUCHSCREEN_CORGI - tristate "SharpSL (Corgi and Spitz series) touchscreen driver (DEPRECATED)" - depends on PXA_SHARPSL - select CORGI_SSP_DEPRECATED - help - Say Y here to enable the driver for the touchscreen on the - Sharp SL-C7xx and SL-Cxx00 series of PDAs. - - If unsure, say N. - - 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_DA9034 tristate "Touchscreen support for Dialog Semiconductor DA9034" depends on PMIC_DA903X
drivers/input/touchscreen/Makefile +0 -1
@@ -12,7 +12,6 @@ obj-$(CONFIG_TOUCHSCREEN_AD7879) += ad7879.o obj-$(CONFIG_TOUCHSCREEN_ADS7846) += ads7846.o obj-$(CONFIG_TOUCHSCREEN_ATMEL_TSADCC) += atmel_tsadcc.o obj-$(CONFIG_TOUCHSCREEN_BITSY) += h3600_ts_input.o -obj-$(CONFIG_TOUCHSCREEN_CORGI) += corgi_ts.o obj-$(CONFIG_TOUCHSCREEN_DYNAPRO) += dynapro.o obj-$(CONFIG_TOUCHSCREEN_GUNZE) += gunze.o obj-$(CONFIG_TOUCHSCREEN_EETI) += eeti_ts.o
drivers/input/touchscreen/corgi_ts.c deleted +0 -385
385 lines not on this page · raw message
Signature · 1 line
1.6.3.3
PATCH 2/8 pxa: remove now un-used corgi_ssp.c and corgi_lcd.c
In reply to Eric MiaoThe only use of corgi_ssp.c is corgi_ts.c, which is now deprecated and removed. Remove corgi_ssp.c and corgi_lcd.c and their relevant function declarations and data structures.
--- arch/arm/mach-pxa/Kconfig | 9 - arch/arm/mach-pxa/Makefile | 1 - arch/arm/mach-pxa/corgi_lcd.c | 288 -------------------------------- arch/arm/mach-pxa/corgi_ssp.c | 275 ------------------------------ arch/arm/mach-pxa/include/mach/corgi.h | 1 - arch/arm/mach-pxa/sharpsl.h | 23 --- 6 files changed, 0 insertions(+), 597 deletions(-) delete mode 100644 arch/arm/mach-pxa/corgi_lcd.c delete mode 100644 arch/arm/mach-pxa/corgi_ssp.c
arch/arm/mach-pxa/Kconfig +0 -9
@@ -461,15 +461,6 @@ config SHARPSL_PM_MAX1111 select HWMON select SENSORS_MAX1111 -config CORGI_SSP_DEPRECATED - bool - select PXA_SSP - select PXA_SSP_LEGACY - 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 +0 -1
@@ -80,7 +80,6 @@ obj-$(CONFIG_MACH_PALMLD) += palmld.o obj-$(CONFIG_PALM_TREO) += palmtreo.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_TOSA) += tosa.o obj-$(CONFIG_MACH_ICONTROL) += icontrol.o mxm8x10.o
arch/arm/mach-pxa/corgi_lcd.c deleted +0 -288
288 lines not on this page · raw message
arch/arm/mach-pxa/corgi_ssp.c deleted +0 -275
275 lines not on this page · raw message
arch/arm/mach-pxa/include/mach/corgi.h +0 -1
@@ -113,7 +113,6 @@* Shared data structures */ extern struct platform_device corgiscoop_device; -extern struct platform_device corgissp_device;#endif /* __ASM_ARCH_CORGI_H */
arch/arm/mach-pxa/sharpsl.h +0 -23
@@ -10,29 +10,6 @@#include <mach/sharpsl_pm.h> /* -* SharpSL SSP Driver -*/ -struct corgissp_machinfo { -int port; -int cs_lcdcon; -int cs_ads7846; -int cs_max1111; -int clk_lcdcon; -int clk_ads7846; -int clk_max1111; -}; - -void corgi_ssp_set_machinfo (struct corgissp_machinfo *machinfo); - - -/* -* SharpSL/Corgi LCD Driver -*/ -void corgi_lcdtg_suspend (void ); -void corgi_lcdtg_hw_init (int mode); - - -/* * SharpSL Battery/PM Driver */ #define READ_GPIO_BIT (x) (GPLR(x) & GPIO_bit(x))
Signature · 1 line
1.6.3.3
PATCH 3/8 pxa: remove the now legacy SSP API
In reply to Eric Miao--- arch/arm/mach-pxa/Kconfig | 5 - arch/arm/mach-pxa/include/mach/ssp.h | 35 ---- arch/arm/mach-pxa/ssp.c | 286 ---------------------------------- 3 files changed, 0 insertions(+), 326 deletions(-)
arch/arm/mach-pxa/Kconfig +0 -5
@@ -653,11 +653,6 @@ config PXA_SSP help Enable support for PXA2xx SSP ports -config PXA_SSP_LEGACY - bool - help - Support of legacy SSP API - config TOSA_BT tristate "Control the state of built-in bluetooth chip on Sharp SL-6000" depends on MACH_TOSA
arch/arm/mach-pxa/include/mach/ssp.h +0 -35
@@ -46,41 +46,6 @@ struct ssp_device {int drcmr_tx; }; -#ifdef CONFIG_PXA_SSP_LEGACY -/* -* SSP initialisation flags -*/ -#define SSP_NO_IRQ 0x1/* don't register an irq handler in SSP driver */ - -struct ssp_state { -u32 cr0; -u32 cr1; -u32 to; -u32 psp; -}; - -struct ssp_dev { -struct ssp_device *ssp; -u32 port; -u32 mode; -u32 flags; -u32 psp_flags; -u32 speed; -int irq; -}; - -int ssp_write_word (struct ssp_dev *dev,u32 data); -int ssp_read_word (struct ssp_dev *dev,u32 *data); -int ssp_flush (struct ssp_dev *dev); -void ssp_enable (struct ssp_dev *dev); -void ssp_disable (struct ssp_dev *dev); -void ssp_save_state (struct ssp_dev *dev,struct ssp_state *ssp); -void ssp_restore_state (struct ssp_dev *dev,struct ssp_state *ssp); -int ssp_init (struct ssp_dev *dev,u32 port,u32 init_flags); -int ssp_config (struct ssp_dev *dev,u32 mode,u32 flags,u32 psp_flags,u32 speed); -void ssp_exit (struct ssp_dev *dev); -#endif /* CONFIG_PXA_SSP_LEGACY */ -/** * ssp_write_reg - Write to a SSP register *
arch/arm/mach-pxa/ssp.c +0 -286
298 lines not on this page · raw message
Signature · 1 line
1.6.3.3
PATCH 4/8 pxa: correct SSCR0_SCR to support multiple SoCs
In reply to Eric MiaoThe previous definitions of SSCR0_SCR and SSCR0_SerClkDiv() prevented them being used simultaneously when supporting multiple PXA SoCs, esp. in drivers/spi/pxa2xx_spi.c, make them correct.
The change from SSCR0_SerClkDiv(2) to SSCR0_SCR(2), will make the result a little bit different in pxa2xx_spi_probe(), however, since that's only used as a default initialization value, it's acceptable.
--- arch/arm/mach-pxa/include/mach/regs-ssp.h | 9 +-------- drivers/spi/pxa2xx_spi.c | 14 +++++++------- 2 files changed, 8 insertions(+), 15 deletions(-)
arch/arm/mach-pxa/include/mach/regs-ssp.h +1 -8
@@ -33,14 +33,7 @@#define SSCR0_National (0x2 << 4)/* National Microwire */ #define SSCR0_ECS (1 << 6)/* External clock select */ #define SSCR0_SSE (1 << 7)/* Synchronous Serial Port Enable */ - -#if defined(CONFIG_PXA25x) -#define SSCR0_SCR (0x0000ff00)/* Serial Clock Rate (mask) */ -#define SSCR0_SerClkDiv (x) ((((x) - 2)/2) << 8)/* Divisor [2..512] */ -#elif defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx) -#define SSCR0_SCR (0x000fff00)/* Serial Clock Rate (mask) */ -#define SSCR0_SerClkDiv (x) (((x) - 1) << 8)/* Divisor [1..4096] */ -#endif +#define SSCR0_SCR (x) ((x) << 8)/* Serial Clock Rate (mask) */ #if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx)#define SSCR0_EDSS (1 << 20)/* Extended data size select */
drivers/spi/pxa2xx_spi.c +7 -7
@@ -1317,14 +1317,14 @@ static int setup(struct spi_device *spi)/* NOTE: PXA25x_SSP _could_ use external clocking ... */ if (drv_data->ssp_type != PXA25x_SSP)dev_dbg (&spi->dev,"%ld Hz actual, %s\n" , -clk_get_rate (ssp->clk) - / (1 + ((chip->cr0 &SSCR0_SCR ) >>8 )), - chip->enable_dma ?"DMA" :"PIO" ); +clk_get_rate (ssp->clk) + / (1 + ((chip->cr0 &SSCR0_SCR (0xfff )) >>8 )), + chip->enable_dma ?"DMA" :"PIO" );else dev_dbg (&spi->dev,"%ld Hz actual, %s\n" , -clk_get_rate (ssp->clk) /2 - / (1 + ((chip->cr0 &SSCR0_SCR ) >>8 )), - chip->enable_dma ?"DMA" :"PIO" ); +clk_get_rate (ssp->clk) /2 + / (1 + ((chip->cr0 &SSCR0_SCR (0x0ff )) >>8 )), + chip->enable_dma ?"DMA" :"PIO" );if (spi->bits_per_word <=8 ) { chip->n_bytes =1 ;
@@ -1557,7 +1557,7 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev)write_SSCR1 (SSCR1_RxTresh (RX_THRESH_DFLT ) |SSCR1_TxTresh (TX_THRESH_DFLT ), drv_data->ioaddr); -write_SSCR0 (SSCR0_SerClkDiv (2 ) +write_SSCR0 (SSCR0_SCR (2 ) | SSCR0_Motorola |SSCR0_DataSize (8 ), drv_data->ioaddr);
Signature · 1 line
1.6.3.3
PATCH 5/8 pxa: merge regs-ssp.h into ssp.h
In reply to Eric MiaoNo need to separate them as they should be together from the begining.
--- arch/arm/mach-pxa/include/mach/regs-ssp.h | 127 ----------------------------- arch/arm/mach-pxa/include/mach/ssp.h | 122 +++++++++++++++++++++++++++ arch/arm/mach-pxa/ssp.c | 1 - drivers/spi/pxa2xx_spi.c | 1 - sound/soc/pxa/pxa-ssp.c | 1 - 5 files changed, 122 insertions(+), 130 deletions(-) delete mode 100644 arch/arm/mach-pxa/include/mach/regs-ssp.h
arch/arm/mach-pxa/include/mach/regs-ssp.h deleted +0 -127
@@ -1,127 +0,0 @@ -#ifndef __ASM_ARCH_REGS_SSP_H -#define __ASM_ARCH_REGS_SSP_H - -/* -* SSP Serial Port Registers -* PXA250, PXA255, PXA26x and PXA27x SSP controllers are all slightly different. -* PXA255, PXA26x and PXA27x have extra ports, registers and bits. -*/ - -#define SSCR0 (0x00)/* SSP Control Register 0 */ -#define SSCR1 (0x04)/* SSP Control Register 1 */ -#define SSSR (0x08)/* SSP Status Register */ -#define SSITR (0x0C)/* SSP Interrupt Test Register */ -#define SSDR (0x10)/* SSP Data Write/Data Read Register */ - -#define SSTO (0x28)/* SSP Time Out Register */ -#define SSPSP (0x2C)/* SSP Programmable Serial Protocol */ -#define SSTSA (0x30)/* SSP Tx Timeslot Active */ -#define SSRSA (0x34)/* SSP Rx Timeslot Active */ -#define SSTSS (0x38)/* SSP Timeslot Status */ -#define SSACD (0x3C)/* SSP Audio Clock Divider */ - -#if defined(CONFIG_PXA3xx) -#define SSACDD (0x40)/* SSP Audio Clock Dither Divider */ -#endif - -/* Common PXA2xx bits first */ -#define SSCR0_DSS (0x0000000f)/* Data Size Select (mask) */ -#define SSCR0_DataSize (x) ((x) - 1)/* Data Size Select [4..16] */ -#define SSCR0_FRF (0x00000030)/* FRame Format (mask) */ -#define SSCR0_Motorola (0x0 << 4)/* Motorola's Serial Peripheral Interface (SPI) */ -#define SSCR0_TI (0x1 << 4)/* Texas Instruments' Synchronous Serial Protocol (SSP) */ -#define SSCR0_National (0x2 << 4)/* National Microwire */ -#define SSCR0_ECS (1 << 6)/* External clock select */ -#define SSCR0_SSE (1 << 7)/* Synchronous Serial Port Enable */ -#define SSCR0_SCR (x) ((x) << 8)/* Serial Clock Rate (mask) */ - -#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx) -#define SSCR0_EDSS (1 << 20)/* Extended data size select */ -#define SSCR0_NCS (1 << 21)/* Network clock select */ -#define SSCR0_RIM (1 << 22)/* Receive FIFO overrrun interrupt mask */ -#define SSCR0_TUM (1 << 23)/* Transmit FIFO underrun interrupt mask */ -#define SSCR0_FRDC (0x07000000)/* Frame rate divider control (mask) */ -#define SSCR0_SlotsPerFrm (x) (((x) - 1) << 24)/* Time slots per frame [1..8] */ -#define SSCR0_ACS (1 << 30)/* Audio clock select */ -#define SSCR0_MOD (1 << 31)/* Mode (normal or network) */ -#endif - -#if defined(CONFIG_PXA3xx) -#define SSCR0_FPCKE (1 << 29)/* FIFO packing enable */ -#endif - -#define SSCR1_RIE (1 << 0)/* Receive FIFO Interrupt Enable */ -#define SSCR1_TIE (1 << 1)/* Transmit FIFO Interrupt Enable */ -#define SSCR1_LBM (1 << 2)/* Loop-Back Mode */ -#define SSCR1_SPO (1 << 3)/* Motorola SPI SSPSCLK polarity setting */ -#define SSCR1_SPH (1 << 4)/* Motorola SPI SSPSCLK phase setting */ -#define SSCR1_MWDS (1 << 5)/* Microwire Transmit Data Size */ -#define SSCR1_TFT (0x000003c0)/* Transmit FIFO Threshold (mask) */ -#define SSCR1_TxTresh (x) (((x) - 1) << 6)/* level [1..16] */ -#define SSCR1_RFT (0x00003c00)/* Receive FIFO Threshold (mask) */ -#define SSCR1_RxTresh (x) (((x) - 1) << 10)/* level [1..16] */ - -#define SSSR_TNF (1 << 2)/* Transmit FIFO Not Full */ -#define SSSR_RNE (1 << 3)/* Receive FIFO Not Empty */ -#define SSSR_BSY (1 << 4)/* SSP Busy */ -#define SSSR_TFS (1 << 5)/* Transmit FIFO Service Request */ -#define SSSR_RFS (1 << 6)/* Receive FIFO Service Request */ -#define SSSR_ROR (1 << 7)/* Receive FIFO Overrun */ - -#define SSCR0_TIM (1 << 23)/* Transmit FIFO Under Run Interrupt Mask */ -#define SSCR0_RIM (1 << 22)/* Receive FIFO Over Run interrupt Mask */ -#define SSCR0_NCS (1 << 21)/* Network Clock Select */ -#define SSCR0_EDSS (1 << 20)/* Extended Data Size Select */ - -/* extra bits in PXA255, PXA26x and PXA27x SSP ports */ -#define SSCR0_TISSP (1 << 4)/* TI Sync Serial Protocol */ -#define SSCR0_PSP (3 << 4)/* PSP - Programmable Serial Protocol */ -#define SSCR1_TTELP (1 << 31)/* TXD Tristate Enable Last Phase */ -#define SSCR1_TTE (1 << 30)/* TXD Tristate Enable */ -#define SSCR1_EBCEI (1 << 29)/* Enable Bit Count Error interrupt */ -#define SSCR1_SCFR (1 << 28)/* Slave Clock free Running */ -#define SSCR1_ECRA (1 << 27)/* Enable Clock Request A */ -#define SSCR1_ECRB (1 << 26)/* Enable Clock request B */ -#define SSCR1_SCLKDIR (1 << 25)/* Serial Bit Rate Clock Direction */ -#define SSCR1_SFRMDIR (1 << 24)/* Frame Direction */ -#define SSCR1_RWOT (1 << 23)/* Receive Without Transmit */ -#define SSCR1_TRAIL (1 << 22)/* Trailing Byte */ -#define SSCR1_TSRE (1 << 21)/* Transmit Service Request Enable */ -#define SSCR1_RSRE (1 << 20)/* Receive Service Request Enable */ -#define SSCR1_TINTE (1 << 19)/* Receiver Time-out Interrupt enable */ -#define SSCR1_PINTE (1 << 18)/* Peripheral Trailing Byte Interupt Enable */ -#define SSCR1_IFS (1 << 16)/* Invert Frame Signal */ -#define SSCR1_STRF (1 << 15)/* Select FIFO or EFWR */ -#define SSCR1_EFWR (1 << 14)/* Enable FIFO Write/Read */ - -#define SSSR_BCE (1 << 23)/* Bit Count Error */ -#define SSSR_CSS (1 << 22)/* Clock Synchronisation Status */ -#define SSSR_TUR (1 << 21)/* Transmit FIFO Under Run */ -#define SSSR_EOC (1 << 20)/* End Of Chain */ -#define SSSR_TINT (1 << 19)/* Receiver Time-out Interrupt */ -#define SSSR_PINT (1 << 18)/* Peripheral Trailing Byte Interrupt */ - -#if defined(CONFIG_PXA3xx) -#define SSPSP_EDMYSTOP (x) ((x) << 28)/* Extended Dummy Stop */ -#define SSPSP_EDMYSTRT (x) ((x) << 26)/* Extended Dummy Start */ -#endif - -#define SSPSP_FSRT (1 << 25)/* Frame Sync Relative Timing */ -#define SSPSP_DMYSTOP (x) ((x) << 23)/* Dummy Stop */ -#define SSPSP_SFRMWDTH (x) ((x) << 16)/* Serial Frame Width */ -#define SSPSP_SFRMDLY (x) ((x) << 9)/* Serial Frame Delay */ -#define SSPSP_DMYSTRT (x) ((x) << 7)/* Dummy Start */ -#define SSPSP_STRTDLY (x) ((x) << 4)/* Start Delay */ -#define SSPSP_ETDS (1 << 3)/* End of Transfer data State */ -#define SSPSP_SFRMP (1 << 2)/* Serial Frame Polarity */ -#define SSPSP_SCMODE (x) ((x) << 0)/* Serial Bit Rate Clock Mode */ - -#define SSACD_SCDB (1 << 3)/* SSPSYSCLK Divider Bypass */ -#define SSACD_ACPS (x) ((x) << 4)/* Audio clock PLL select */ -#define SSACD_ACDS (x) ((x) << 0)/* Audio clock divider select */ -#if defined(CONFIG_PXA3xx) -#define SSACD_SCDX8 (1 << 7)/* SYSCLK division ratio select */ -#endif - - -#endif /* __ASM_ARCH_REGS_SSP_H */
arch/arm/mach-pxa/include/mach/ssp.h +122 -0
128 lines not on this page · raw message
arch/arm/mach-pxa/ssp.c +0 -1
@@ -33,7 +33,6 @@#include <asm/irq.h> #include <mach/hardware.h> #include <mach/ssp.h> -#include <mach/regs-ssp.h> static DEFINE_MUTEX (ssp_lock);static LIST_HEAD (ssp_list);
drivers/spi/pxa2xx_spi.c +0 -1
@@ -35,7 +35,6 @@#include <asm/delay.h> #include <mach/dma.h> -#include <mach/regs-ssp.h> #include <mach/ssp.h> #include <mach/pxa2xx_spi.h>
sound/soc/pxa/pxa-ssp.c +0 -1
@@ -31,7 +31,6 @@#include <mach/hardware.h> #include <mach/dma.h> -#include <mach/regs-ssp.h> #include <mach/audio.h> #include <mach/ssp.h>
Signature · 1 line
1.6.3.3
PATCH 6/8 pxa: remove unnecessary #include of <mach/ssp.h>
In reply to Eric Miao--- arch/arm/mach-pxa/littleton.c | 1 - arch/arm/mach-pxa/poodle.c | 1 - arch/arm/mach-pxa/pxa3xx.c | 1 - 3 files changed, 0 insertions(+), 3 deletions(-)
arch/arm/mach-pxa/littleton.c +0 -1
@@ -41,7 +41,6 @@#include <mach/pxa300.h> #include <mach/pxafb.h> -#include <mach/ssp.h> #include <mach/mmc.h> #include <mach/pxa2xx_spi.h> #include <mach/pxa27x_keypad.h>
arch/arm/mach-pxa/poodle.c +0 -1
@@ -45,7 +45,6 @@#include <mach/poodle.h> #include <mach/pxafb.h> #include <mach/sharpsl.h> -#include <mach/ssp.h> #include <mach/pxa2xx_spi.h> #include <asm/hardware/scoop.h>
arch/arm/mach-pxa/pxa3xx.c +0 -1
@@ -29,7 +29,6 @@#include <mach/ohci.h> #include <mach/pm.h> #include <mach/dma.h> -#include <mach/ssp.h> #include <mach/regs-intc.h> #include <plat/i2c.h>
Signature · 1 line
1.6.3.3
PATCH 7/8 pxa: move ssp into common plat-pxa
In reply to Eric MiaoFrom: Haojian Zhuang <[email protected]>
---
arch/arm/mach-pxa/Kconfig | 5 -----
arch/arm/mach-pxa/Makefile | 1 -
arch/arm/mach-pxa/poodle.c | 2 +-
arch/arm/plat-pxa/Kconfig | 5 +++++
arch/arm/plat-pxa/Makefile | 1 +
.../include/mach => plat-pxa/include/plat}/ssp.h | 0
arch/arm/{mach-pxa => plat-pxa}/ssp.c | 2 +-
drivers/spi/pxa2xx_spi.c | 2 +-
sound/soc/pxa/pxa-ssp.c | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
rename arch/arm/{mach-pxa/include/mach => plat-pxa/include/plat}/ssp.h (100%)
rename arch/arm/{mach-pxa => plat-pxa}/ssp.c (99%)arch/arm/mach-pxa/Kconfig +0 -5
@@ -648,11 +648,6 @@ config PXA_SHARP_Cxx00 help Enable common support for Sharp Cxx00 models -config PXA_SSP - tristate - help - Enable support for PXA2xx SSP ports - config TOSA_BT tristate "Control the state of built-in bluetooth chip on Sharp SL-6000" depends on MACH_TOSA
arch/arm/mach-pxa/Makefile +0 -1
@@ -14,7 +14,6 @@ obj-$(CONFIG_PXA3xx) += cpufreq-pxa3xx.o endif # Generic drivers that other drivers may depend upon -obj-$(CONFIG_PXA_SSP) += ssp.o # SoC-specific code obj-$(CONFIG_PXA25x) += mfp-pxa2xx.o pxa2xx.o pxa25x.o
arch/arm/mach-pxa/poodle.c +1 -1
@@ -40,12 +40,12 @@#include <mach/pxa25x.h> #include <mach/mmc.h> #include <mach/udc.h> -#include <plat/i2c.h> #include <mach/irda.h> #include <mach/poodle.h> #include <mach/pxafb.h> #include <mach/sharpsl.h> #include <mach/pxa2xx_spi.h> +#include <plat/i2c.h> #include <asm/hardware/scoop.h> #include <asm/hardware/locomo.h>
arch/arm/plat-pxa/Kconfig +5 -0
@@ -1,3 +1,8 @@ if PLAT_PXA +config PXA_SSP + tristate + help + Enable support for PXA2xx SSP ports + endif
arch/arm/plat-pxa/Makefile +1 -0
@@ -9,3 +9,4 @@ obj-$(CONFIG_PXA3xx) += mfp.o obj-$(CONFIG_ARCH_MMP) += mfp.o obj-$(CONFIG_HAVE_PWM) += pwm.o +obj-$(CONFIG_PXA_SSP) += ssp.o
arch/arm/plat-pxa/include/plat/ssp.h renamed from arch/arm/mach-pxa/include/mach/ssp.h +0 -0
arch/arm/plat-pxa/ssp.c renamed from arch/arm/mach-pxa/ssp.c +1 -1
@@ -32,7 +32,7 @@#include <asm/irq.h> #include <mach/hardware.h> -#include <mach/ssp.h> +#include <plat/ssp.h> static DEFINE_MUTEX (ssp_lock);static LIST_HEAD (ssp_list);
drivers/spi/pxa2xx_spi.c +1 -1
@@ -35,7 +35,7 @@#include <asm/delay.h> #include <mach/dma.h> -#include <mach/ssp.h> +#include <plat/ssp.h> #include <mach/pxa2xx_spi.h> MODULE_AUTHOR ("Stephen Street" );
sound/soc/pxa/pxa-ssp.c +1 -1
@@ -32,7 +32,7 @@#include <mach/hardware.h> #include <mach/dma.h> #include <mach/audio.h> -#include <mach/ssp.h> +#include <plat/ssp.h> #include "pxa2xx-pcm.h" #include "pxa-ssp.h"
Signature · 1 line
1.6.3.3
Haojian Zhuang
maintainerPATCH 7/8 pxa: move ssp into common plat-pxa
arch/arm/mach-pxa/Kconfig
Quoted 21 lines · Eric Miao
From: Haojian Zhuang <[email protected]>
Signed-off-by Haojian Zhuang <[email protected]>Acked-by Mark Brown <[email protected]>Signed-off-by Eric Miao <[email protected]>---
?arch/arm/mach-pxa/Kconfig ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?5 ----- ?arch/arm/mach-pxa/Makefile ? ? ? ? ? ? ? ? ? ? ? ? | ? ?1 - ?arch/arm/mach-pxa/poodle.c ? ? ? ? ? ? ? ? ? ? ? ? | ? ?2 +- ?arch/arm/plat-pxa/Kconfig ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?5 +++++ ?arch/arm/plat-pxa/Makefile ? ? ? ? ? ? ? ? ? ? ? ? | ? ?1 + ?.../include/mach => plat-pxa/include/plat}/ssp.h ? | ? ?0 ?arch/arm/{mach-pxa => plat-pxa}/ssp.c ? ? ? ? ? ? ?| ? ?2 +- ?drivers/spi/pxa2xx_spi.c ? ? ? ? ? ? ? ? ? ? ? ? ? | ? ?2 +- ?sound/soc/pxa/pxa-ssp.c ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?2 +-?9 files changed, 10 insertions(+), 10 deletions(-)
?renamearch/arm/{mach-pxa/include/mach=>plat-pxa/include/plat}/ssp.h(100%) ?renamearch/arm/{mach-pxa=>plat-pxa}/ssp.c(99%)arch/arm/mach-pxa/Kconfig +0
-0
Hi Eric,
I have some comments on this patch. I'm re-formating that patch in sound-2.6 git tree and attach it for reference. I think more files should be modified. Here's the file list in my patch.
arch/arm/mach-pxa/Kconfig | 5 - arch/arm/mach-pxa/Makefile | 3 - arch/arm/mach-pxa/corgi_ssp.c | 2 +- arch/arm/mach-pxa/include/mach/ssp.h | 107 ------- arch/arm/mach-pxa/littleton.c | 2 +- arch/arm/mach-pxa/poodle.c | 4 +- arch/arm/mach-pxa/pxa3xx.c | 2 +- arch/arm/mach-pxa/ssp.c | 505 -------------------------------- arch/arm/plat-pxa/Kconfig | 5 + arch/arm/plat-pxa/Makefile | 1 + arch/arm/plat-pxa/include/plat/ssp.h | 107 +++++++ arch/arm/plat-pxa/ssp.c | 527 ++++++++++++++++++++++++++++++++++ sound/soc/pxa/pxa-ssp.c | 2 +- 13 files changed, 646 insertions(+), 626 deletions(-)
By the way, I'm still format other patches for share more code between pxa2xx-ssp & pxa168-sssp. Since you're updating ssp. The ssp code will be different between your git tree and mark's asoc git tree. If my patches are merged into asoc git tree, how to sync to your git tree?
Mark,
do you have any comments on syncing code?
Thanks
Haojian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001--ARM-pxa-move-ssp-into-plat.patch
Type: application/octet-stream
Size: 35428 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100316/643de334/attachment-0001.obj>
PATCH 7/8 pxa: move ssp into common plat-pxa
Quoted 7 lines · Haojian Zhuang
By the way, I'm still format other patches for share more code between pxa2xx-ssp & pxa168-sssp. Since you're updating ssp. The ssp code will be different between your git tree and mark's asoc git tree. If my patches are merged into asoc git tree, how to sync to your git tree?
Mark,
do you have any comments on syncing code?
As I keep say I believe we need to do an early merge of a topic branch that covers the common stuff into both the PXA and ASoC trees, otherwise we'll end up with conflicting lines of development and no way to resolve them until the merge down.
PATCH 7/8 pxa: move ssp into common plat-pxa
Quoted 7 lines · Mark Brown
Quoted 4 lines · Haojian Zhuang
By the way, I'm still format other patches for share more code between pxa2xx-ssp & pxa168-sssp. Since you're updating ssp. The ssp code will be different between your git tree and mark's asoc git tree. If my patches are merged into asoc git tree, how to sync to your git tree?
Quoted 8 lines
Quoted 2 lines
Mark,
do you have any comments on syncing code?As I keep say I believe we need to do an early merge of a topic branch that covers the common stuff into both the PXA and ASoC trees, otherwise we'll end up with conflicting lines of development and no way to resolve them until the merge down.
Mark,
So do you have any detailed plan in your mind? I'm basically thinking if it's possible to setup a common topic branch with pxa-ssp changes to be a common baseline for both trees.
PATCH 7/8 pxa: move ssp into common plat-pxa
Quoted 3 lines · Eric Miao
So do you have any detailed plan in your mind? I'm basically thinking if it's possible to setup a common topic branch with pxa-ssp changes to be a common baseline for both trees.
How about creating a branch off 2.6.34-rc1, doing the updates that need to be shared on that branch and then when we're happy pulling that topic branch into both the PXA and ASoC development trees? If required we can always merge that branch multiple times into our trees.
PATCH 7/8 pxa: move ssp into common plat-pxa
Quoted 11 lines · Mark Brown
Quoted 3 lines · Eric Miao
So do you have any detailed plan in your mind? I'm basically thinking if it's possible to setup a common topic branch with pxa-ssp changes to be a common baseline for both trees.
How about creating a branch off 2.6.34-rc1, doing the updates that need to be shared on that branch and then when we're happy pulling that topic branch into both the PXA and ASoC development trees? ?If required we can always merge that branch multiple times into our trees.
Sounds good to me. Yet I doubt I won't have many changes to the SSP from now on, as it's almost very close to what I want at the moment, so next step work would be:
1. resolve the above conflict
2. merge the pxa168 SSP support
After that, there could be only minor changes, which could be easily merged either way, and I'd be happy to see ASoC tree add good support the pxa ssp. So what I'm thinking now is actually which one is easier, to merge asoc into pxa and get ssp cleaned up or to rebase asoc onto this ssp cleanup branch. I might need to take a look into what's going on inside asoc to evaluate this.
PATCH 7/8 pxa: move ssp into common plat-pxa
Quoted 6 lines · Eric Miao
After that, there could be only minor changes, which could be easily merged either way, and I'd be happy to see ASoC tree add good support the pxa ssp. So what I'm thinking now is actually which one is easier, to merge asoc into pxa and get ssp cleaned up or to rebase asoc onto this ssp cleanup branch. I might need to take a look into what's going on inside asoc to evaluate this.
Rebasing isn't an option for ASoC - it gets merged into Takashi's tree for one thing (and I don't see any reason why rebasing would be required anyway, no point in discarding history). A merge into ASoC should be sufficient, right now there's no changes at all in the SSP code against Linus' tree so that'll be trivial anyway at the minute.
There's also no need to pick one route for the merge - if we do merges and avoid rebasing then git will cope fine.
PATCH 7/8 pxa: move ssp into common plat-pxa
Quoted 9 lines · Mark Brown
Quoted 6 lines · Eric Miao
After that, there could be only minor changes, which could be easily merged either way, and I'd be happy to see ASoC tree add good support the pxa ssp. So what I'm thinking now is actually which one is easier, to merge asoc into pxa and get ssp cleaned up or to rebase asoc onto this ssp cleanup branch. I might need to take a look into what's going on inside asoc to evaluate this.
Quoted 9 lines
Rebasing isn't an option for ASoC - it gets merged into Takashi's tree for one thing (and I don't see any reason why rebasing would be required anyway, no point in discarding history). ?A merge into ASoC should be sufficient, right now there's no changes at all in the SSP code against Linus' tree so that'll be trivial anyway at the minute.
There's also no need to pick one route for the merge - if we do merges and avoid rebasing then git will cope fine.
Mark,
I'm seeing no merge conflict between my ssp_cleanup and Takashi's latest tree, which branch do you suggest to merge then?
PATCH 7/8 pxa: move ssp into common plat-pxa
Quoted 2 lines · Eric Miao
I'm seeing no merge conflict between my
ssp_cleanupand Takashi's latest tree, which branch do you suggest to merge then?
I'm not sure what you're asking here but if you're looking for any incompatible changes in ASoC they've not been implemented yet, the issue is that due to the stuff Liam is working on at the minute there are likely to be incompatible changes in the current release cycle which would mean that merging new drivers (like Haojian posted) via a non-ALSA tree would lead to problems after the trees are been merged together.
PATCH 7/8 pxa: move ssp into common plat-pxa
Quoted 5 lines · Mark Brown
Quoted 2 lines · Eric Miao
I'm seeing no merge conflict between my
ssp_cleanupand Takashi's latest tree, which branch do you suggest to merge then?
Quoted 7 lines
I'm not sure what you're asking here but if you're looking for any incompatible changes in ASoC they've not been implemented yet, the issue is that due to the stuff Liam is working on at the minute there are likely to be incompatible changes in the current release cycle which would mean that merging new drivers (like Haojian posted) via a non-ALSA tree would lead to problems after the trees are been merged together.
I tried a trivial merge of 'pxa-ssp' branch in your tree, and there's a conflict but it's fixable. There won't be much change to make in my 'ssp_cleanup' branch except for the pxa168 base support. What I can do is I'll try constantly merge of the asoc tree, and see if I can provide a conflict resolve which could be later used during upstream merge.
Haojian Zhuang
maintainerPATCH 7/8 pxa: move ssp into common plat-pxa
Quoted 15 lines · Eric Miao
Quoted 5 lines · Mark Brown
Quoted 2 lines · Eric Miao
I'm seeing no merge conflict between my
ssp_cleanupand Takashi's latest tree, which branch do you suggest to merge then?Quoted 7 lines
I'm not sure what you're asking here but if you're looking for any incompatible changes in ASoC they've not been implemented yet, the issue is that due to the stuff Liam is working on at the minute there are likely to be incompatible changes in the current release cycle which would mean that merging new drivers (like Haojian posted) via a non-ALSA tree would lead to problems after the trees are been merged together.
Quoted 7 lines
I tried a trivial merge of 'pxa-ssp' branch in your tree, and there's a conflict but it's fixable. There won't be much change to make in my '
ssp_cleanup' branch except for the pxa168 base support. What I can do is I'll try constantly merge of the asoc tree, and see if I can provide a conflict resolve which could be later used during upstream merge.
It seems not bad. How about you, Mark?
By the way, I reformat my patches on Eric's git since one of my patch is contained in his branch (ssp_cleanup). Now I attach them for review first.
Thanks
Haojian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ssp_aspenite.tgz
Type: application/x-gzip
Size: 18666 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100317/835cdeb3/attachment-0001.tgz>
PATCH 7/8 pxa: move ssp into common plat-pxa
In reply to Eric MiaoQuoted 6 lines · Eric Miao
I tried a trivial merge of 'pxa-ssp' branch in your tree, and there's a conflict but it's fixable. There won't be much change to make in my '
ssp_cleanup' branch except for the pxa168 base support. What I can do is I'll try constantly merge of the asoc tree, and see if I can provide a conflict resolve which could be later used during upstream merge.
OK, I guess. Please keep the SSP cleanup branch (including any ASoC machine drivers) around so it can be merged both ways if needed.
Haojian Zhuang
maintainerPATCH 7/8 pxa: move ssp into common plat-pxa
In reply to Mark BrownQuoted 5 lines · Mark Brown
Quoted 2 lines · Eric Miao
I'm seeing no merge conflict between my
ssp_cleanupand Takashi's latest tree, which branch do you suggest to merge then?
Quoted 7 lines
I'm not sure what you're asking here but if you're looking for any incompatible changes in ASoC they've not been implemented yet, the issue is that due to the stuff Liam is working on at the minute there are likely to be incompatible changes in the current release cycle which would mean that merging new drivers (like Haojian posted) via a non-ALSA tree would lead to problems after the trees are been merged together.
Hi Mark & Eric,
There're some ssp fixes after 2.6.34-rc1 that result ssp code different between pxa tree and asoc tree (neither Eric's ssp cleanup patch nor my patch). If those fixes could be merged into 2.6.34-rc2, I want to know whether ASoC tree will sync to them. If so, it seems that we could work at the same point. What's your opinion, Mark?
By the way, I reformat my patches on Eric's git since one of my patch is contained in his branch. Now I attach them for review first.
Thanks
Haojian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-ASoC-split-pxa-ssp-for-reusing-code.patch
Type: text/x-patch
Size: 43910 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100317/6cc81079/attachment-0005.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002--ARM-pxa-remove-ifdef-in-ssp.h.patch
Type: text/x-patch
Size: 4501 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100317/6cc81079/attachment-0006.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003--ARM-mmp-support-ssp-in-pxa168.patch
Type: text/x-patch
Size: 8934 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100317/6cc81079/attachment-0007.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0004-ASoC-support-codec-via-ssp-interface-in-aspenite.patch
Type: text/x-patch
Size: 20797 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100317/6cc81079/attachment-0008.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0005--ARM-mmp-enable-ssp-in-aspenite.patch
Type: text/x-patch
Size: 1444 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100317/6cc81079/attachment-0009.bin>
PATCH 8/8 pxa: remove incorrect select PXA_SSP in Kconfig
In reply to Eric MiaoPXA_SSP is actually used by drivers like drivers/spi/pxa2xx_spi.c and sound/soc/pxa/pxa-ssp.c, not by boards. Remove those incorrect 'select' from Kconfig and make SOC_PXA_SSP to select.
--- arch/arm/mach-pxa/Kconfig | 13 ------------- sound/soc/pxa/Kconfig | 1 + 2 files changed, 1 insertions(+), 13 deletions(-)
arch/arm/mach-pxa/Kconfig +0 -13
@@ -19,7 +19,6 @@ config MACH_MAINSTONE config MACH_ZYLONITE bool select PXA3xx - select PXA_SSP select HAVE_PWM select PXA_HAVE_BOARD_IRQS
@@ -39,7 +38,6 @@ config MACH_LITTLETON select PXA3xx select CPU_PXA300 select CPU_PXA310 - select PXA_SSP config MACH_TAVOREVB bool "PXA930 Evaluation Board (aka TavorEVB)"
@@ -98,7 +96,6 @@ config MACH_ARMCORE select PXA27x select IWMMXT select PXA25x - select PXA_SSP config MACH_EM_X270 bool "CompuLab EM-x270 platform"
@@ -161,7 +158,6 @@ config MACH_XCEP select MTD_CFI select MTD_CHAR select SMC91X - select PXA_SSP help PXA255 based Single Board Computer with SMC 91C111 ethernet chip and 64 MB of flash. Tuned for usage in Libera instruments for particle accelerators.
@@ -180,7 +176,6 @@ config MACH_TRIZEPS4WL depends on TRIZEPS_PXA select TRIZEPS_PCMCIA select PXA27x - select PXA_SSP choice prompt "Select base board for Trizeps module"
@@ -217,7 +212,6 @@ config MACH_PCM027 bool "Phytec phyCORE-PXA270 CPU module (PCM-027)" select PXA27x select IWMMXT - select PXA_SSP select PXA_HAVE_BOARD_IRQS config MACH_PCM990_BASEBOARD
@@ -261,7 +255,6 @@ config MACH_H4700 bool "HP iPAQ hx4700" select PXA27x select IWMMXT - select PXA_SSP select HAVE_PWM select PXA_HAVE_BOARD_IRQS
@@ -277,7 +270,6 @@ config MACH_MAGICIAN bool "Enable HTC Magician Support" select PXA27x select IWMMXT - select PXA_SSP select HAVE_PWM select PXA_HAVE_BOARD_IRQS
@@ -431,13 +423,11 @@ config MACH_RAUMFELD_CONNECTOR bool "Raumfeld Connector" select PXA3xx select CPU_PXA300 - select PXA_SSP config MACH_RAUMFELD_SPEAKER bool "Raumfeld Speaker" select PXA3xx select CPU_PXA300 - select PXA_SSP config PXA_SHARPSL bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models"
@@ -466,7 +456,6 @@ config MACH_POODLE depends on PXA_SHARPSL select PXA25x select SHARP_LOCOMO - select PXA_SSP select PXA_HAVE_BOARD_IRQS config MACH_CORGI
@@ -636,14 +625,12 @@ config CPU_PXA950 config PXA_SHARP_C7xx bool - select PXA_SSP select SHARPSL_PM help Enable support for all Sharp C7xx models config PXA_SHARP_Cxx00 bool - select PXA_SSP select SHARPSL_PM help Enable common support for Sharp Cxx00 models
sound/soc/pxa/Kconfig +1 -0
@@ -23,6 +23,7 @@ config SND_PXA2XX_SOC_I2S config SND_PXA_SOC_SSP tristate + select PXA_SSP config SND_PXA2XX_SOC_CORGI tristate "SoC Audio support for Sharp Zaurus SL-C7x0"
Signature · 1 line
1.6.3.3