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

Commit 94a544a4 authored by Grant Likely's avatar Grant Likely
Browse files

Merge branch 'spi' of git://git.linutronix.de/users/bigeasy/soda into spi/next 

* 'spi' of git://git.linutronix.de/users/bigeasy/soda into spi/next
  spi/pxa2xx: register driver properly
  spi/pxa2xx: add support for shared IRQ handler
  spi/pxa2xx: Use define for SSSR_TFL_MASK instead of plain numbers
  arm/pxa2xx: reorgazine SSP and SPI header files
  spi/pxa2xx: Add CE4100 support
  spi/pxa2xx: Consider CE4100's FIFO depth
  spi/pxa2xx: Add chipselect support for Sodaville
  spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.
  spi/pxa2xx: pass of_node to spi device and set a parent device
parents 496a2e36 21486af0

Documentation/spi/pxa2xx

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

arch/arm/mach-pxa/cm-x255.c

+1 −1
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 
#include <linux/mtd/nand-gpio.h>



#include <linux/spi/spi.h>

#include <linux/spi/pxa2xx_spi.h>



#include <asm/mach/arch.h>

#include <asm/mach-types.h>

#include <asm/mach/map.h>



#include <mach/pxa25x.h>

#include <mach/pxa2xx_spi.h>



#include "generic.h"

arch/arm/mach-pxa/cm-x270.c

+1 −1
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ 
#include <video/mbxfb.h>



#include <linux/spi/spi.h>

#include <linux/spi/pxa2xx_spi.h>

#include <linux/spi/libertas_spi.h>



#include <mach/pxa27x.h>

#include <mach/ohci.h>

#include <mach/mmc.h>

#include <mach/pxa2xx_spi.h>



#include "generic.h"

arch/arm/mach-pxa/corgi.c

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

#include <linux/spi/ads7846.h>

#include <linux/spi/corgi_lcd.h>

#include <linux/spi/pxa2xx_spi.h>

#include <linux/mtd/sharpsl.h>

#include <linux/input/matrix_keypad.h>

#include <video/w100fb.h>
@@ -48,7 +49,6 @@ 
#include <mach/irda.h>

#include <mach/mmc.h>

#include <mach/udc.h>

#include <mach/pxa2xx_spi.h>

#include <mach/corgi.h>

#include <mach/sharpsl_pm.h>

arch/arm/mach-pxa/devices.c

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

#include <linux/platform_device.h>

#include <linux/dma-mapping.h>

#include <linux/spi/pxa2xx_spi.h>



#include <asm/pmu.h>

#include <mach/udc.h>
@@ -12,7 +13,6 @@ 
#include <mach/irda.h>

#include <mach/ohci.h>

#include <plat/pxa27x_keypad.h>

#include <mach/pxa2xx_spi.h>

#include <mach/camera.h>

#include <mach/audio.h>

#include <mach/hardware.h>