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

Commit b6e3b5c2 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'lpc32xx/core' of git://git.antcom.de/linux-2.6 into next/soc 

From Roland Stigge, three more updates to lpc32xx.

* 'lpc32xx/core' of git://git.antcom.de/linux-2.6:
  ARM: LPC32xx: Support GPI 28
  ARM: LPC32xx: Platform update for devicetree completion of spi-pl022
  ARM: LPC32xx: Board cleanup
parents 28901c1f 8e4b97e3

arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ 
#define LPC32XX_GPIO_P1_MAX 24

#define LPC32XX_GPIO_P1_MAX 24

#define LPC32XX_GPIO_P2_MAX 13

#define LPC32XX_GPIO_P2_MAX 13

#define LPC32XX_GPIO_P3_MAX 6

#define LPC32XX_GPIO_P3_MAX 6

#define LPC32XX_GPI_P3_MAX 28

#define LPC32XX_GPI_P3_MAX 29

#define LPC32XX_GPO_P3_MAX 24

#define LPC32XX_GPO_P3_MAX 24





#define LPC32XX_GPIO_P0_GRP 0

#define LPC32XX_GPIO_P0_GRP 0

arch/arm/mach-lpc32xx/phy3250.c

+2 −20
Original line number Original line Diff line number Diff line
@@ -24,12 +24,9 @@ 
#include <linux/irq.h>

#include <linux/irq.h>

#include <linux/dma-mapping.h>

#include <linux/dma-mapping.h>

#include <linux/device.h>

#include <linux/device.h>

#include <linux/spi/spi.h>

#include <linux/spi/eeprom.h>

#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/amba/bus.h>

#include <linux/amba/bus.h>

#include <linux/amba/clcd.h>

#include <linux/amba/clcd.h>

#include <linux/amba/pl022.h>

#include <linux/amba/pl08x.h>

#include <linux/amba/pl08x.h>

#include <linux/amba/mmci.h>

#include <linux/amba/mmci.h>

#include <linux/of.h>

#include <linux/of.h>
@@ -158,21 +155,6 @@ static struct clcd_board lpc32xx_clcd_data = { 
	.remove		= lpc32xx_clcd_remove,

	.remove		= lpc32xx_clcd_remove,

};

};





/*

 * AMBA SSP (SPI)

 */

static struct pl022_ssp_controller lpc32xx_ssp0_data = {

	.bus_id			= 0,

	.num_chipselect		= 1,

	.enable_dma		= 0,

};



static struct pl022_ssp_controller lpc32xx_ssp1_data = {

	.bus_id			= 1,

	.num_chipselect		= 1,

	.enable_dma		= 0,

};



static struct pl08x_channel_data pl08x_slave_channels[] = {

static struct pl08x_channel_data pl08x_slave_channels[] = {

	{

	{

		.bus_id = "nand-slc",

		.bus_id = "nand-slc",
@@ -234,8 +216,8 @@ static struct lpc32xx_mlc_platform_data lpc32xx_mlc_data = { 
};

};





static const struct of_dev_auxdata lpc32xx_auxdata_lookup[] __initconst = {

static const struct of_dev_auxdata lpc32xx_auxdata_lookup[] __initconst = {

	OF_DEV_AUXDATA("arm,pl022", 0x20084000, "dev:ssp0", &lpc32xx_ssp0_data),

	OF_DEV_AUXDATA("arm,pl022", 0x20084000, "dev:ssp0", NULL),

	OF_DEV_AUXDATA("arm,pl022", 0x2008C000, "dev:ssp1", &lpc32xx_ssp1_data),

	OF_DEV_AUXDATA("arm,pl022", 0x2008C000, "dev:ssp1", NULL),

	OF_DEV_AUXDATA("arm,pl110", 0x31040000, "dev:clcd", &lpc32xx_clcd_data),

	OF_DEV_AUXDATA("arm,pl110", 0x31040000, "dev:clcd", &lpc32xx_clcd_data),

	OF_DEV_AUXDATA("arm,pl080", 0x31000000, "pl08xdmac", &pl08x_pd),

	OF_DEV_AUXDATA("arm,pl080", 0x31000000, "pl08xdmac", &pl08x_pd),

	OF_DEV_AUXDATA("arm,pl18x", 0x20098000, "20098000.sd",

	OF_DEV_AUXDATA("arm,pl18x", 0x20098000, "20098000.sd",