From: grant.likely@secretlab.ca (Grant Likely) Date: Wed, 29 Dec 2010 01:11:32 -0700 Subject: [PATCH 4/9] arm/pxa2xx: reorgazine SSP and SPI header files In-Reply-To: <1291312057-7933-5-git-send-email-bigeasy@linutronix.de> References: <1291312057-7933-1-git-send-email-bigeasy@linutronix.de> <1291312057-7933-5-git-send-email-bigeasy@linutronix.de> Message-ID: <20101229081131.GP8172@angua.secretlab.ca> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thu, Dec 02, 2010 at 06:47:32PM +0100, Sebastian Andrzej Siewior wrote: > The PXA-SPI driver relies on some files / defines which are arm specific > and are within the ARM tree. The CE4100 SoC which is x86 has also the > SPI core. > This patch moves the ssp and spi files from arm/mach-pxa and plat-pxa to > include/linux where the CE4100 can access them. > > This move got verified by building the following defconfigs: > cm_x2xx_defconfig corgi_defconfig em_x270_defconfig ezx_defconfig > imote2_defconfig pxa3xx_defconfig spitz_defconfig zeus_defconfig > raumfeld_defconfig magician_defconfig > > Signed-off-by: Sebastian Andrzej Siewior > Signed-off-by: Dirk Brandewie picked up for -next via merge g. > --- > Documentation/spi/pxa2xx | 4 ++-- > arch/arm/mach-pxa/cm-x255.c | 2 +- > arch/arm/mach-pxa/cm-x270.c | 2 +- > arch/arm/mach-pxa/corgi.c | 2 +- > arch/arm/mach-pxa/devices.c | 2 +- > arch/arm/mach-pxa/em-x270.c | 2 +- > arch/arm/mach-pxa/hx4700.c | 2 +- > arch/arm/mach-pxa/icontrol.c | 2 +- > arch/arm/mach-pxa/littleton.c | 2 +- > arch/arm/mach-pxa/lubbock.c | 2 +- > arch/arm/mach-pxa/pcm027.c | 2 +- > arch/arm/mach-pxa/poodle.c | 2 +- > arch/arm/mach-pxa/spitz.c | 3 +-- > arch/arm/mach-pxa/stargate2.c | 2 +- > arch/arm/mach-pxa/tosa.c | 2 +- > arch/arm/mach-pxa/trizeps4.c | 1 - > arch/arm/mach-pxa/z2.c | 2 +- > arch/arm/mach-pxa/zeus.c | 2 +- > arch/arm/plat-pxa/ssp.c | 2 +- > drivers/spi/pxa2xx_spi.c | 4 +--- > .../plat/ssp.h => include/linux/pxa2xx_ssp.h | 8 ++++---- > .../mach => include/linux/spi}/pxa2xx_spi.h | 8 +++++--- > sound/soc/pxa/pxa-ssp.c | 2 +- > 23 files changed, 30 insertions(+), 32 deletions(-) > rename arch/arm/plat-pxa/include/plat/ssp.h => include/linux/pxa2xx_ssp.h (98%) > rename {arch/arm/mach-pxa/include/mach => include/linux/spi}/pxa2xx_spi.h (92%) > > diff --git a/Documentation/spi/pxa2xx b/Documentation/spi/pxa2xx > index 6bb916d..68a4fe3 100644 > --- a/Documentation/spi/pxa2xx > +++ b/Documentation/spi/pxa2xx > @@ -19,7 +19,7 @@ Declaring PXA2xx Master Controllers > ----------------------------------- > Typically a SPI master is defined in the arch/.../mach-*/board-*.c as a > "platform device". The master configuration is passed to the driver via a table > -found in arch/arm/mach-pxa/include/mach/pxa2xx_spi.h: > +found in include/linux/spi/pxa2xx_spi.h: > > struct pxa2xx_spi_master { > enum pxa_ssp_type ssp_type; > @@ -94,7 +94,7 @@ using the "spi_board_info" structure found in "linux/spi/spi.h". See > > Each slave device attached to the PXA must provide slave specific configuration > information via the structure "pxa2xx_spi_chip" found in > -"arch/arm/mach-pxa/include/mach/pxa2xx_spi.h". The pxa2xx_spi master controller driver > +"include/linux/spi/pxa2xx_spi.h". The pxa2xx_spi master controller driver > will uses the configuration whenever the driver communicates with the slave > device. All fields are optional. > > diff --git a/arch/arm/mach-pxa/cm-x255.c b/arch/arm/mach-pxa/cm-x255.c > index f1a7703..93f59f8 100644 > --- a/arch/arm/mach-pxa/cm-x255.c > +++ b/arch/arm/mach-pxa/cm-x255.c > @@ -17,13 +17,13 @@ > #include > > #include > +#include > > #include > #include > #include > > #include > -#include > > #include "generic.h" > > diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c > index a9926bb..b88d601 100644 > --- a/arch/arm/mach-pxa/cm-x270.c > +++ b/arch/arm/mach-pxa/cm-x270.c > @@ -19,12 +19,12 @@ > #include