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

Commit 61da823a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'orion/dt' into next/dt 



Merge in orion's cleanup branch together with the DT contents.  Ideally
the cleanup branch should have been the base for the DT branch to avoid
these, but that was missed when first merging. So we're doing it now to
reduce the amount of silly conflicts due to internal tree organization.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0dfeada9 52cfa7e5

arch/arm/mach-kirkwood/board-dockstar.c

+0 −13
Original line number Diff line number Diff line
@@ -16,20 +16,7 @@ 


#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/ata_platform.h>

#include <linux/mv643xx_eth.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_fdt.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <mach/kirkwood.h>

#include <mach/bridge-regs.h>

#include <linux/platform_data/mmc-mvsdio.h>

#include "common.h"



static struct mv643xx_eth_platform_data dockstar_ge00_data = {

arch/arm/mach-kirkwood/board-dreamplug.c

+0 −15
Original line number Diff line number Diff line
@@ -13,23 +13,8 @@ 


#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/ata_platform.h>

#include <linux/mv643xx_eth.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_fdt.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/gpio.h>

#include <linux/mtd/physmap.h>

#include <linux/spi/flash.h>

#include <linux/spi/spi.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <mach/kirkwood.h>

#include <mach/bridge-regs.h>

#include <linux/platform_data/mmc-mvsdio.h>

#include "common.h"

arch/arm/mach-kirkwood/board-dt.c

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static struct of_device_id kirkwood_dt_match_table[] __initdata = { 
	{ }

};



struct of_dev_auxdata kirkwood_auxdata_lookup[] __initdata = {

static struct of_dev_auxdata kirkwood_auxdata_lookup[] __initdata = {

	OF_DEV_AUXDATA("marvell,orion-spi", 0xf1010600, "orion_spi.0", NULL),

	OF_DEV_AUXDATA("marvell,mv64xxx-i2c", 0xf1011000, "mv64xxx_i2c.0",

		       NULL),
@@ -119,7 +119,7 @@ static void __init kirkwood_dt_init(void) 
			     kirkwood_auxdata_lookup, NULL);

}



static const char *kirkwood_dt_board_compat[] = {

static const char * const kirkwood_dt_board_compat[] = {

	"globalscale,dreamplug",

	"dlink,dns-320",

	"dlink,dns-325",

arch/arm/mach-kirkwood/board-goflexnet.c

+0 −13
Original line number Diff line number Diff line
@@ -18,20 +18,7 @@ 


#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/ata_platform.h>

#include <linux/mv643xx_eth.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_fdt.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <mach/kirkwood.h>

#include <mach/bridge-regs.h>

#include <linux/platform_data/mmc-mvsdio.h>

#include "common.h"



static struct mv643xx_eth_platform_data goflexnet_ge00_data = {

arch/arm/mach-kirkwood/board-ib62x0.c

+0 −6
Original line number Diff line number Diff line
@@ -13,14 +13,8 @@ 


#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/mtd/partitions.h>

#include <linux/ata_platform.h>

#include <linux/mv643xx_eth.h>

#include <linux/input.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <mach/kirkwood.h>

#include "common.h"



static struct mv643xx_eth_platform_data ib62x0_ge00_data = {