Skip to contentSkip to conversation

ARM: kirkwood: covert orion-spi to fdt.

PATCH New Jason Cooper 2 participants 7 messages Feb 27, 2012 – Feb 28, 2012

Subsystems (4)
Device tree bindings Arm (32-bit) Arm sub-architectures SPI
lore
Share & tools
lore

Jason Cooper

author
#0 lore raw

PATCH 1/1 ARM: kirkwood: covert orion-spi to fdt.

On the Globalscale Dreamplug (Marvell Kirkwood Development Platform), 2MB of NOR flash are used to hold the bootloader, bootloader environment, and devicetree blob. It is connected via spi.

Signed-off-by Jason Cooper <[email protected]>

---
Notes:
- checkpatch clean.
- compiles, boots, registers partitions correctly.

 arch/arm/boot/dts/kirkwood-dreamplug.dts |   34 +++++++++++++
 arch/arm/mach-kirkwood/board-dt.c        |   40 ----------------
 arch/arm/mach-kirkwood/common.c          |   11 ++++
 drivers/spi/spi-orion.c                  |   75 ++++++++++++++++++++++++++----
 4 files changed, 111 insertions(+), 49 deletions(-)
arch/arm/boot/dts/kirkwood-dreamplug.dts +34 -0
index 8a5dff8..bdf2ddc 100644
@@ -22,4 +22,38 @@
 		interrupts = <33>;
 		clock-frequency = <200000000>;
 	};
+
+	spi at f1010600 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		compatible = "marvell,orion-spi";
+		reg = <0xf1010600 0x1ff>;
+		clock-frequency = <200000000>;
+
+		flash at 0 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			compatible = "macronix,mx25l1606e", "jedec-flash";
+
+			spi-max-frequency = <50000000>;
+			reg = <0>;
+
+			partition at 0 {
+				label = "U-Boot";
+				reg = <0x0 0x100000>;
+			};
+
+			partition at 100000 {
+				label = "U-Boot Environment";
+				reg = <0x100000 0x080000>;
+			};
+
+			partition at 180000 {
+				label = "Flattened Device Tree";
+				reg = <0x180000 0x080000>;
+			};
+		};
+	};
 };
arch/arm/mach-kirkwood/board-dt.c +0 -40
index fbe6405..4960e63 100644
@@ -39,42 +39,6 @@ static struct of_device_id kirkwood_dt_match_table[] __initdata = {
 	{ }
 };
 
-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 = {
 	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),
 };

@@ -140,10 +104,6 @@ static void __init dreamplug_init(void)
 	 */
 	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_ge00_init(&dreamplug_ge00_data);
 	kirkwood_ge01_init(&dreamplug_ge01_data);
arch/arm/mach-kirkwood/common.c +11 -0
index cc15426..b041af3 100644
@@ -15,6 +15,7 @@
 #include <linux/ata_platform.h>
 #include <linux/mtd/nand.h>
 #include <linux/dma-mapping.h>
+#include <linux/of.h>
 #include <net/dsa.h>
 #include <asm/page.h>
 #include <asm/timex.h>

@@ -481,6 +482,9 @@ static int __init kirkwood_clock_gate(void)
 {
 	unsigned int curr = readl(CLOCK_GATING_CTRL);
 	u32 dev, rev;
+#ifdef CONFIG_OF
+	struct device_node *dp;
+#endif
 
 	kirkwood_pcie_id(&dev, &rev);
 	printk(KERN_DEBUG "Gating clock of unused units\n");

@@ -524,6 +528,13 @@ static int __init kirkwood_clock_gate(void)
 	} else  /* keep this bit set for devices that don't have PCIe1 */
 		kirkwood_clk_ctrl |= CGC_PEX1;
 
+#ifdef CONFIG_OF
+	dp = of_find_node_by_path("/");
+	if (of_device_is_available(of_find_compatible_node(dp, NULL,
+							  "marvell,orion-spi")))
+		kirkwood_clk_ctrl |= CGC_RUNIT;
+#endif
+
 	/* Now gate clock the required units */
 	writel(kirkwood_clk_ctrl, CLOCK_GATING_CTRL);
 	printk(KERN_DEBUG " after: 0x%08x\n", readl(CLOCK_GATING_CTRL));
drivers/spi/spi-orion.c +66 -9

133 lines not on this page · raw message

Signature · 1 line
1.7.3.4
#1 lore raw

PATCH 1/1 ARM: kirkwood: covert orion-spi to fdt.

Quoted 9 lines · Jason Cooper

On the Globalscale Dreamplug (Marvell Kirkwood Development Platform), 2MB of NOR flash are used to hold the bootloader, bootloader environment, and devicetree blob. It is connected via spi.

Signed-off-by Jason Cooper <[email protected]>

---
Notes:
- checkpatch clean.
- compiles, boots, registers partitions correctly.

Nice, it seem that it was simpler than I first thought. I think you should lose some of the #ifdef statements, especially those where no extra object code gets added because the of_* function calls compile to empty inline functions.

More importantly, you should not treat CONFIG_OF as an exclusive option:
It should be possible to build a kernel that has CONFIG_OF enabled but still comes with legacy board files that work like before.

Quoted 4 lines
arch/arm/mach-kirkwood/common.c +0 -0
@@ -524,6 +528,13 @@ static int __init kirkwood_clock_gate(void)
 	} else  /* keep this bit set for devices that don't have PCIe1 */
 		kirkwood_clk_ctrl |= CGC_PEX1;

arch/arm/mach-kirkwood/common.c static int __init kirkwood_clock_gate(void) · line 540

Quoted 10 lines
arch/arm/mach-kirkwood/common.c +7 -0
+#ifdef CONFIG_OF
+	dp = of_find_node_by_path("/");
+	if (of_device_is_available(of_find_compatible_node(dp, NULL,
+							  "marvell,orion-spi")))
+		kirkwood_clk_ctrl |= CGC_RUNIT;
+#endif
+
 	/* Now gate clock the required units */
 	writel(kirkwood_clk_ctrl, CLOCK_GATING_CTRL);
 	printk(KERN_DEBUG " after: 0x%08x\n", readl(CLOCK_GATING_CTRL));

This looks like it could be improved by only enabling the clock if we actually start using the device from the spi driver, in its probe function. Not sure if that's worth it.

Quoted 12 lines
drivers/spi/spi-orion.c +5 -0
@@ -101,10 +102,24 @@ static int orion_spi_baudrate_set(struct spi_device *spi, unsigned int speed)
 	u32 prescale;
 	u32 reg;
 	struct orion_spi *orion_spi;
+#ifdef CONFIG_OF
+	const __be32 *prop;
+	int len;
+#endif
 
 	orion_spi = spi_master_get_devdata(spi->master);
 
+#ifdef CONFIG_OF

drivers/spi/spi-orion.c static int orion_spi_baudrate_set(struct spi_device *spi, unsigned int speed) · line 122

Quoted 10 lines
drivers/spi/spi-orion.c +9 -0
+	prop = of_get_property(spi->master->dev.of_node, "clock-frequency",
+				&len);
+	if (!prop || len < sizeof(*prop)) {
+		pr_debug("fdt missing 'clock-frequency' property.\n");
+		return -EINVAL;
+	}
+	tclk_hz = be32_to_cpup(prop);
+#else
 	tclk_hz = orion_spi->spi_info->tclk;
+#endif

of_get_property returns NULL when CONFIG_OF is disabled, so you can turn this all into a run-time logic:

	if (orion_spi->spi_info)
		tclk_hz = orion_spi->spi_info->tclk;

	of_property_read_u32(spi->master->dev.of_node, 
					"clock-frequency", &tclk_hz);

	if (!tclk_hz) {
		dev_error(&spi->dev, "cannot set clock rate\n");
		return -EINVAL;
	}

drivers/spi/spi-orion.c static int orion_spi_setup(struct spi_device *spi) · line 384

Quoted 13 lines
drivers/spi/spi-orion.c +4 -0
 	/*
 	 * the supported rates are: 4,6,8...30

@@ -360,7 +375,11 @@ static int orion_spi_setup(struct spi_device *spi)
 	orion_spi = spi_master_get_devdata(spi->master);
 
 	/* Fix ac timing if required.   */
+#ifdef CONFIG_OF
+	if (of_find_property(spi->master->dev.of_node, "spi-clock-fix", NULL))
+#else
 	if (orion_spi->spi_info->enable_clock_fix)
+#endif
 		orion_spi_setbits(orion_spi, ORION_SPI_IF_CONFIG_REG,
 				  (1 << 14));

Same thing here:

	if (of_find_property(spi->master->dev.of_node, "spi-clock-fix", NULL) ||
		(orion_spi->spi_info && orion_spi->spi_info->enable_clock_fix))

drivers/spi/spi-orion.c msg_rejected: · line 511

Quoted 6 lines
drivers/spi/spi-orion.c +6 -0
+#ifdef CONFIG_OF
+	orion_spi_wq = create_singlethread_workqueue(
+				orion_spi_driver.driver.name);
+	if (orion_spi_wq == NULL)
+		return -ENOMEM;
+#endif

This seems wrong: why do you have to create the workqueue again here?

Quoted 7 lines
drivers/spi/spi-orion.c +7 -0
+#ifdef CONFIG_OF
+	prop = of_get_property(master->dev.of_node, "clock-frequency", &len);
+	if (!prop || len < sizeof(*prop)) {
+		pr_debug("fdt missing 'clock-frequency' property.\n");
+		status = -EINVAL;
+		goto out;
+	}

drivers/spi/spi-orion.c static int __init orion_spi_probe(struct platform_device *pdev) · line 550

Quoted 10 lines
drivers/spi/spi-orion.c +6 -0
+	tclk = be32_to_cpup(prop);
+
+	spi->max_speed = DIV_ROUND_UP(tclk, 4);
+	spi->min_speed = DIV_ROUND_UP(tclk, 30);
+#else
 	spi->spi_info = spi_info;
 
 	spi->max_speed = DIV_ROUND_UP(spi_info->tclk, 4);
 	spi->min_speed = DIV_ROUND_UP(spi_info->tclk, 30);
+#endif

Same code as above? Just find the clock frequency once and store it in spi->tclk.

Arnd

author
#2 lore raw

PATCH 1/1 ARM: kirkwood: covert orion-spi to fdt.

Quoted 11 lines · Arnd Bergmann
Quoted 9 lines · Jason Cooper

On the Globalscale Dreamplug (Marvell Kirkwood Development Platform), 2MB of NOR flash are used to hold the bootloader, bootloader environment, and devicetree blob. It is connected via spi.

Signed-off-by Jason Cooper <[email protected]>

---
Notes:
- checkpatch clean.
- compiles, boots, registers partitions correctly.

Quoted 4 lines

Nice, it seem that it was simpler than I first thought. I think you should lose some of the #ifdef statements, especially those where no extra object code gets added because the of_* function calls compile to empty inline functions.

Yes, I wasn't happy with those #ifdef's. But I wanted to get something working early so the review process could start earlier. I don't like polishing something for a week only to find out I did something wrong at the beginning.

Quoted 3 lines

More importantly, you should not treat CONFIG_OF as an exclusive option:
It should be possible to build a kernel that has CONFIG_OF enabled but still comes with legacy board files that work like before.

Understood.

Quoted 4 lines
Quoted 4 lines
arch/arm/mach-kirkwood/common.c +0 -0
@@ -524,6 +528,13 @@ static int __init kirkwood_clock_gate(void)
 	} else  /* keep this bit set for devices that don't have PCIe1 */
 		kirkwood_clk_ctrl |= CGC_PEX1;
Quoted 14 lines

arch/arm/mach-kirkwood/common.c static int __init kirkwood_clock_gate(void) · line 540

Quoted 10 lines
arch/arm/mach-kirkwood/common.c +7 -0
+#ifdef CONFIG_OF
+	dp = of_find_node_by_path("/");
+	if (of_device_is_available(of_find_compatible_node(dp, NULL,
+							  "marvell,orion-spi")))
+		kirkwood_clk_ctrl |= CGC_RUNIT;
+#endif
+
 	/* Now gate clock the required units */
 	writel(kirkwood_clk_ctrl, CLOCK_GATING_CTRL);
 	printk(KERN_DEBUG " after: 0x%08x\n", readl(CLOCK_GATING_CTRL));

This looks like it could be improved by only enabling the clock if we actually start using the device from the spi driver, in its probe function. Not sure if that's worth it.

Yes, That is the best solution, I'm trying to work around the fact that when using fdt, kirkwood_spi_init() never gets called (CGC_RUNIT not set), and then, orion_spi_init() (plat-orion/common.c) isn't executed, so the plat data isn't populated.

As long as kirkwood_clock_gate() is called in late init, I'll need the above code to prevent turning off the spi's clock.

Quoted 26 lines
Quoted 12 lines
drivers/spi/spi-orion.c +5 -0
@@ -101,10 +102,24 @@ static int orion_spi_baudrate_set(struct spi_device *spi, unsigned int speed)
 	u32 prescale;
 	u32 reg;
 	struct orion_spi *orion_spi;
+#ifdef CONFIG_OF
+	const __be32 *prop;
+	int len;
+#endif
 
 	orion_spi = spi_master_get_devdata(spi->master);
 
+#ifdef CONFIG_OF

drivers/spi/spi-orion.c static int orion_spi_baudrate_set(struct spi_device *spi, unsigned int speed) · line 122

Quoted 10 lines
drivers/spi/spi-orion.c +9 -0
+	prop = of_get_property(spi->master->dev.of_node, "clock-frequency",
+				&len);
+	if (!prop || len < sizeof(*prop)) {
+		pr_debug("fdt missing 'clock-frequency' property.\n");
+		return -EINVAL;
+	}
+	tclk_hz = be32_to_cpup(prop);
+#else
 	tclk_hz = orion_spi->spi_info->tclk;
+#endif

of_get_property returns NULL when CONFIG_OF is disabled, so you can turn this all into a run-time logic:

Quoted 10 lines
	if (orion_spi->spi_info)
		tclk_hz = orion_spi->spi_info->tclk;

	of_property_read_u32(spi->master->dev.of_node, 
					"clock-frequency", &tclk_hz);

	if (!tclk_hz) {
		dev_error(&spi->dev, "cannot set clock rate\n");
		return -EINVAL;
	}

Much nicer, thanks.

Quoted 16 lines

drivers/spi/spi-orion.c static int orion_spi_setup(struct spi_device *spi) · line 384

Quoted 13 lines
drivers/spi/spi-orion.c +4 -0
 	/*
 	 * the supported rates are: 4,6,8...30

@@ -360,7 +375,11 @@ static int orion_spi_setup(struct spi_device *spi)
 	orion_spi = spi_master_get_devdata(spi->master);
 
 	/* Fix ac timing if required.   */
+#ifdef CONFIG_OF
+	if (of_find_property(spi->master->dev.of_node, "spi-clock-fix", NULL))
+#else
 	if (orion_spi->spi_info->enable_clock_fix)
+#endif
 		orion_spi_setbits(orion_spi, ORION_SPI_IF_CONFIG_REG,
 				  (1 << 14));

Same thing here:

Quoted 2 lines
	if (of_find_property(spi->master->dev.of_node, "spi-clock-fix", NULL) ||
		(orion_spi->spi_info && orion_spi->spi_info->enable_clock_fix))

Also, should this be "mv,spi-clock-fix" like I've seen for some ti custom dt bindings?

Quoted 8 lines

drivers/spi/spi-orion.c msg_rejected: · line 511

Quoted 6 lines
drivers/spi/spi-orion.c +6 -0
+#ifdef CONFIG_OF
+	orion_spi_wq = create_singlethread_workqueue(
+				orion_spi_driver.driver.name);
+	if (orion_spi_wq == NULL)
+		return -ENOMEM;
+#endif

This seems wrong: why do you have to create the workqueue again here?

Gah! Originally, I was trying to mirror spi-tegra.c, which uses module_platform_driver(). So, I was moving code out of orion_spi_init() into orion_spi_probe() and setting .probe = orion_spi_probe(). I forgot to undo this when I backed away from that approach (to get it working first).

Should I go ahead and convert it to module_platform_driver()?

Quoted 14 lines
Quoted 14 lines
drivers/spi/spi-orion.c +12 -0
+#ifdef CONFIG_OF
+	prop = of_get_property(master->dev.of_node, "clock-frequency", &len);
+	if (!prop || len < sizeof(*prop)) {
+		pr_debug("fdt missing 'clock-frequency' property.\n");
+		status = -EINVAL;
+		goto out;
+	}
+	tclk = be32_to_cpup(prop);
+
+	spi->max_speed = DIV_ROUND_UP(tclk, 4);
+	spi->min_speed = DIV_ROUND_UP(tclk, 30);
+#else
 	spi->spi_info = spi_info;
Quoted 6 lines

drivers/spi/spi-orion.c static int __init orion_spi_probe(struct platform_device *pdev) · line 550

Quoted 3 lines
drivers/spi/spi-orion.c +1 -0
 	spi->max_speed = DIV_ROUND_UP(spi_info->tclk, 4);
 	spi->min_speed = DIV_ROUND_UP(spi_info->tclk, 30);
+#endif

Same code as above? Just find the clock frequency once and store it in spi->tclk.

Do you mean spi_info->tclk? If so, spi_info is NULL when using device tree because orion_spi_init() in plat-orion/common.c never gets called, so the platform data isn't set.

What I can do is set tclk as you suggested, above:

	if (orion_spi->spi_info)
		tclk = orion_spi->spi_info->tclk;

	of_property_read_u32(spi->master->dev.of_node, 
					"clock-frequency", &tclk);

	if (!tclk) {
		dev_error(&spi->dev, "cannot set clock rate\n");
		return -EINVAL;
	}

Thanks for the review and pointers, much appreciated!

Jason.

#3 lore raw

PATCH 1/1 ARM: kirkwood: covert orion-spi to fdt.

Quoted 8 lines · Jason
Quoted 4 lines · Arnd Bergmann

Same thing here:

	if (of_find_property(spi->master->dev.of_node, "spi-clock-fix", NULL) ||
		(orion_spi->spi_info && orion_spi->spi_info->enable_clock_fix))

Also, should this be "mv,spi-clock-fix" like I've seen for some ti custom dt bindings?

I'm never sure about this either. Maybe Grant can comment on this.

Quoted 9 lines
Quoted 8 lines

drivers/spi/spi-orion.c msg_rejected: · line 511

Quoted 6 lines
drivers/spi/spi-orion.c +6 -0
+#ifdef CONFIG_OF
+	orion_spi_wq = create_singlethread_workqueue(
+				orion_spi_driver.driver.name);
+	if (orion_spi_wq == NULL)
+		return -ENOMEM;
+#endif

This seems wrong: why do you have to create the workqueue again here?

Quoted 7 lines

Gah! Originally, I was trying to mirror spi-tegra.c, which uses module_platform_driver(). So, I was moving code out of orion_spi_init() into orion_spi_probe() and setting .probe = orion_spi_probe(). I forgot to undo this when I backed away from that approach (to get it working first).

Should I go ahead and convert it to module_platform_driver()?

You can do that if you like, but it's not required here. If you do, best send that conversion as a separate patch in a series before this one.

Quoted 13 lines
Quoted 6 lines
Quoted 6 lines
drivers/spi/spi-orion.c +4 -0
+
+	spi->max_speed = DIV_ROUND_UP(tclk, 4);
+	spi->min_speed = DIV_ROUND_UP(tclk, 30);
+#else
 	spi->spi_info = spi_info;
Quoted 6 lines

drivers/spi/spi-orion.c static int __init orion_spi_probe(struct platform_device *pdev) · line 550

Quoted 3 lines
drivers/spi/spi-orion.c +1 -0
 	spi->max_speed = DIV_ROUND_UP(spi_info->tclk, 4);
 	spi->min_speed = DIV_ROUND_UP(spi_info->tclk, 30);
+#endif

Same code as above? Just find the clock frequency once and store it in spi->tclk.

Quoted 3 lines

Do you mean spi_info->tclk? If so, spi_info is NULL when using device tree because orion_spi_init() in plat-orion/common.c never gets called, so the platform data isn't set.

I meant you should add a new "tclk" member to struct orion_spi and set that to spi_info->tclk or the value from the device tree.

Arnd

author
#4 lore raw

PATCH v2 1/1 ARM: kirkwood: covert orion-spi to fdt.

In reply to Jason Cooper

On the Globalscale Dreamplug (Marvell Kirkwood Development Platform), 2MB of NOR flash are used to hold the bootloader, bootloader environment, and devicetree blob. It is connected via spi.

Signed-off-by Jason Cooper <[email protected]>

---
Changes from v1:

- checkpatch clean.
- compiles, boots, registers partitions correctly.
- removed WIP tag.
- removed most '#ifdef CONFIG_OF's as suggested by Arnd
- added tclk and clock_fix elements to struct orion_spi
- remove/undo partial conversion to module_platform_driver()

 arch/arm/boot/dts/kirkwood-dreamplug.dts |   34 ++++++++++++++++++++++++
 arch/arm/mach-kirkwood/board-dt.c        |   40 -----------------------------
 arch/arm/mach-kirkwood/common.c          |    7 +++++
 drivers/spi/spi-orion.c                  |   41 +++++++++++++++++++++++++++---
 4 files changed, 78 insertions(+), 44 deletions(-)
arch/arm/boot/dts/kirkwood-dreamplug.dts +34 -0
index 8a5dff8..bdf2ddc 100644
@@ -22,4 +22,38 @@
 		interrupts = <33>;
 		clock-frequency = <200000000>;
 	};
+
+	spi at f1010600 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		compatible = "marvell,orion-spi";
+		reg = <0xf1010600 0x1ff>;
+		clock-frequency = <200000000>;
+
+		flash at 0 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			compatible = "macronix,mx25l1606e", "jedec-flash";
+
+			spi-max-frequency = <50000000>;
+			reg = <0>;
+
+			partition at 0 {
+				label = "U-Boot";
+				reg = <0x0 0x100000>;
+			};
+
+			partition at 100000 {
+				label = "U-Boot Environment";
+				reg = <0x100000 0x080000>;
+			};
+
+			partition at 180000 {
+				label = "Flattened Device Tree";
+				reg = <0x180000 0x080000>;
+			};
+		};
+	};
 };
arch/arm/mach-kirkwood/board-dt.c +0 -40
index fbe6405..4960e63 100644
@@ -39,42 +39,6 @@ static struct of_device_id kirkwood_dt_match_table[] __initdata = {
 	{ }
 };
 
-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 = {
 	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),
 };

@@ -140,10 +104,6 @@ static void __init dreamplug_init(void)
 	 */
 	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_ge00_init(&dreamplug_ge00_data);
 	kirkwood_ge01_init(&dreamplug_ge01_data);
arch/arm/mach-kirkwood/common.c +7 -0
index cc15426..4868dbd 100644
@@ -15,6 +15,7 @@
 #include <linux/ata_platform.h>
 #include <linux/mtd/nand.h>
 #include <linux/dma-mapping.h>
+#include <linux/of.h>
 #include <net/dsa.h>
 #include <asm/page.h>
 #include <asm/timex.h>

@@ -481,6 +482,7 @@ static int __init kirkwood_clock_gate(void)
 {
 	unsigned int curr = readl(CLOCK_GATING_CTRL);
 	u32 dev, rev;
+	struct device_node *dp;
 
 	kirkwood_pcie_id(&dev, &rev);
 	printk(KERN_DEBUG "Gating clock of unused units\n");

@@ -524,6 +526,11 @@ static int __init kirkwood_clock_gate(void)
 	} else  /* keep this bit set for devices that don't have PCIe1 */
 		kirkwood_clk_ctrl |= CGC_PEX1;
 
+	dp = of_find_node_by_path("/");
+	if (dp && of_device_is_available(of_find_compatible_node(dp, NULL,
+							  "marvell,orion-spi")))
+		kirkwood_clk_ctrl |= CGC_RUNIT;
+
 	/* Now gate clock the required units */
 	writel(kirkwood_clk_ctrl, CLOCK_GATING_CTRL);
 	printk(KERN_DEBUG " after: 0x%08x\n", readl(CLOCK_GATING_CTRL));
drivers/spi/spi-orion.c +37 -4

87 lines not on this page · raw message

Signature · 1 line
1.7.3.4
#5 lore raw

PATCH v2 1/1 ARM: kirkwood: covert orion-spi to fdt.

Quoted 10 lines · Jason Cooper

On the Globalscale Dreamplug (Marvell Kirkwood Development Platform), 2MB of NOR flash are used to hold the bootloader, bootloader environment, and devicetree blob. It is connected via spi.

arch/arm/mach-kirkwood/common.c +0 -0
index cc15426..4868dbd 100644
@@ -524,6 +526,11 @@ static int __init kirkwood_clock_gate(void)
 	} else  /* keep this bit set for devices that don't have PCIe1 */

arch/arm/mach-kirkwood/common.c static int __init kirkwood_clock_gate(void) · line 536

Quoted 10 lines
arch/arm/mach-kirkwood/common.c +5 -0
 		kirkwood_clk_ctrl |= CGC_PEX1;
 
+	dp = of_find_node_by_path("/");
+	if (dp && of_device_is_available(of_find_compatible_node(dp, NULL,
+							  "marvell,orion-spi")))
+		kirkwood_clk_ctrl |= CGC_RUNIT;
+
 	/* Now gate clock the required units */
 	writel(kirkwood_clk_ctrl, CLOCK_GATING_CTRL);
 	printk(KERN_DEBUG " after: 0x%08x\n", readl(CLOCK_GATING_CTRL));

I think this needs to move to the board-dt.c file as Andrew suggested, or you have to put the #ifdef back, otherwise you get a link error because of_find_node_by_path does not have a fallback with CONFIG_OF not set.

Everything else looks good to me now.

Arnd

author
#6 lore raw

PATCH v3 1/1 ARM: kirkwood: covert orion-spi to fdt.

In reply to Jason Cooper

On the Globalscale Dreamplug (Marvell Kirkwood Development Platform), 2MB of NOR flash are used to hold the bootloader, bootloader environment, and devicetree blob. It is connected via spi.

Signed-off-by Jason Cooper <[email protected]>

---
Changes from v1:

- checkpatch clean.
- compiles, boots, registers partitions correctly.
- removed WIP tag.
- removed most '#ifdef CONFIG_OF's as suggested by Arnd
- added tclk and clock_fix elements to struct orion_spi
- remove/undo partial conversion to module_platform_driver()

Changes from v2:

- checkpatch clean.
- boot-tested.
- restore '#ifdef CONFIG_OF' in kirkwood_clock_gate(), prevents linker errors.

 arch/arm/boot/dts/kirkwood-dreamplug.dts |   34 ++++++++++++++++++++++++
 arch/arm/mach-kirkwood/board-dt.c        |   40 -----------------------------
 arch/arm/mach-kirkwood/common.c          |   11 ++++++++
 drivers/spi/spi-orion.c                  |   41 +++++++++++++++++++++++++++---
 4 files changed, 82 insertions(+), 44 deletions(-)
arch/arm/boot/dts/kirkwood-dreamplug.dts +34 -0
index 8a5dff8..bdf2ddc 100644
@@ -22,4 +22,38 @@
 		interrupts = <33>;
 		clock-frequency = <200000000>;
 	};
+
+	spi at f1010600 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		compatible = "marvell,orion-spi";
+		reg = <0xf1010600 0x1ff>;
+		clock-frequency = <200000000>;
+
+		flash at 0 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			compatible = "macronix,mx25l1606e", "jedec-flash";
+
+			spi-max-frequency = <50000000>;
+			reg = <0>;
+
+			partition at 0 {
+				label = "U-Boot";
+				reg = <0x0 0x100000>;
+			};
+
+			partition at 100000 {
+				label = "U-Boot Environment";
+				reg = <0x100000 0x080000>;
+			};
+
+			partition at 180000 {
+				label = "Flattened Device Tree";
+				reg = <0x180000 0x080000>;
+			};
+		};
+	};
 };
arch/arm/mach-kirkwood/board-dt.c +0 -40
index fbe6405..4960e63 100644
@@ -39,42 +39,6 @@ static struct of_device_id kirkwood_dt_match_table[] __initdata = {
 	{ }
 };
 
-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 = {
 	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),
 };

@@ -140,10 +104,6 @@ static void __init dreamplug_init(void)
 	 */
 	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_ge00_init(&dreamplug_ge00_data);
 	kirkwood_ge01_init(&dreamplug_ge01_data);
arch/arm/mach-kirkwood/common.c +11 -0
index cc15426..357fcde 100644
@@ -15,6 +15,7 @@
 #include <linux/ata_platform.h>
 #include <linux/mtd/nand.h>
 #include <linux/dma-mapping.h>
+#include <linux/of.h>
 #include <net/dsa.h>
 #include <asm/page.h>
 #include <asm/timex.h>

@@ -481,6 +482,9 @@ static int __init kirkwood_clock_gate(void)
 {
 	unsigned int curr = readl(CLOCK_GATING_CTRL);
 	u32 dev, rev;
+#ifdef CONFIG_OF
+	struct device_node *dp;
+#endif
 
 	kirkwood_pcie_id(&dev, &rev);
 	printk(KERN_DEBUG "Gating clock of unused units\n");

@@ -524,6 +528,13 @@ static int __init kirkwood_clock_gate(void)
 	} else  /* keep this bit set for devices that don't have PCIe1 */
 		kirkwood_clk_ctrl |= CGC_PEX1;
 
+#ifdef CONFIG_OF
+	dp = of_find_node_by_path("/");
+	if (dp && of_device_is_available(of_find_compatible_node(dp, NULL,
+							  "marvell,orion-spi")))
+		kirkwood_clk_ctrl |= CGC_RUNIT;
+#endif
+
 	/* Now gate clock the required units */
 	writel(kirkwood_clk_ctrl, CLOCK_GATING_CTRL);
 	printk(KERN_DEBUG " after: 0x%08x\n", readl(CLOCK_GATING_CTRL));
drivers/spi/spi-orion.c +37 -4

87 lines not on this page · raw message

Signature · 1 line
1.7.3.4