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

Commit be2aa956 authored by Michael Walle's avatar Michael Walle Committed by Andrew Lunn
Browse files

ARM: kirkwood: use devicetree for SPI on dreamplug 



Use the device tree for the SPI driver and partition layout.

Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
parent 4aff38a3

arch/arm/boot/dts/kirkwood-dreamplug.dts

+29 −0
Original line number Original line Diff line number Diff line
@@ -20,5 +20,34 @@ 
			clock-frequency = <200000000>;

			clock-frequency = <200000000>;

			status = "ok";

			status = "ok";

		};

		};



		spi@10600 {

			status = "okay";



			m25p40@0 {

				#address-cells = <1>;

				#size-cells = <1>;

				compatible = "mx25l1606e";

				reg = <0>;

				spi-max-frequency = <50000000>;

				mode = <0>;



				partition@0 {

					reg = <0x0 0x80000>;

					label = "u-boot";

				};

				};



				partition@100000 {

					reg = <0x100000 0x10000>;

					label = "u-boot env";

				};



				partition@180000 {

					reg = <0x180000 0x10000>;

					label = "dtb";

				};

			};

		};

	};



};
 
};

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

+0 −41
Original line number Original line Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/mtd/partitions.h>

#include <linux/ata_platform.h>

#include <linux/ata_platform.h>

#include <linux/mv643xx_eth.h>

#include <linux/mv643xx_eth.h>

#include <linux/of.h>

#include <linux/of.h>
@@ -36,42 +35,6 @@ 
#include "common.h"

#include "common.h"

#include "mpp.h"

#include "mpp.h"





struct mtd_partition dreamplug_partitions[] = {

	{

		.name	= "u-boot",

		.size	= SZ_512K,

		.offset = 0,

	},

	{

		.name	= "u-boot env",

		.size	= SZ_64K,

		.offset = SZ_512K + SZ_512K,

	},

	{

		.name	= "dtb",

		.size	= SZ_64K,

		.offset = SZ_512K + SZ_512K + SZ_512K,

	},

};



static const struct flash_platform_data dreamplug_spi_slave_data = {

	.type		= "mx25l1606e",

	.name		= "spi_flash",

	.parts		= dreamplug_partitions,

	.nr_parts	= ARRAY_SIZE(dreamplug_partitions),

};



static struct spi_board_info __initdata dreamplug_spi_slave_info[] = {

	{

		.modalias	= "m25p80",

		.platform_data	= &dreamplug_spi_slave_data,

		.irq		= -1,

		.max_speed_hz	= 50000000,

		.bus_num	= 0,

		.chip_select	= 0,

	},

};



static struct mv643xx_eth_platform_data dreamplug_ge00_data = {

static struct mv643xx_eth_platform_data dreamplug_ge00_data = {

	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),

	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),

};

};
@@ -137,10 +100,6 @@ void __init dreamplug_init(void) 
	 */

	 */

	kirkwood_mpp_conf(dreamplug_mpp_config);

	kirkwood_mpp_conf(dreamplug_mpp_config);





	spi_register_board_info(dreamplug_spi_slave_info,

				ARRAY_SIZE(dreamplug_spi_slave_info));

	kirkwood_spi_init();



	kirkwood_ehci_init();

	kirkwood_ehci_init();

	kirkwood_ge00_init(&dreamplug_ge00_data);

	kirkwood_ge00_init(&dreamplug_ge00_data);

	kirkwood_ge01_init(&dreamplug_ge01_data);

	kirkwood_ge01_init(&dreamplug_ge01_data);