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

Commit a4bc7878 authored by Roland Stigge's avatar Roland Stigge
Browse files

ARM: LPC32xx: Platform update for devicetree completion of spi-pl022 



spi-pl022 got a further update to its devicetree support, completing properties
such that no platform data is necessary anymore. This patch adjusts phy3250.c
accordingly: The supplied platform data is deleted. However, OF_DEV_AUXDATA()
are still necessary due to device naming ("dev:ssp0").

Signed-off-by: default avatarRoland Stigge <stigge@antcom.de>
Acked-by: default avatarAlexandre Pereira da Silva <aletes.xgr@gmail.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 632cbbcf

arch/arm/mach-lpc32xx/phy3250.c

+2 −18
Original line number Original line Diff line number Diff line
@@ -27,7 +27,6 @@ 
#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>
@@ -156,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",
@@ -232,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",