Skip to contentSkip to conversation

Device Bus support for Marvell EBU SoC

PATCH Superseded Ezequiel Garcia 2 participants 11 messages Apr 9, 2013 – Apr 10, 2013

Subsystems (3)

v6 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

v6 cover Device Bus support for Marvell EBU SoC

This patchset continues the effort to add Device Bus support on Marvell EBU SoC.

If you're reading this for the first time you can grab the full details here:

http://www.spinics.net/lists/arm-kernel/msg236151.html

This new version changes the way each chip select is described in the DT. Now there's a separate node for each Device Bus chip select, like this:

	devbus-bootcs at d0010400 {
		compatible = "marvell,mvebu-devbus";
		reg = <0xd0010400 0x8>;
		ranges = <0 0xf0000000 0x8000000>; /* @addr 0xf000000, size 0x8000000 */

		device at 0 {
			reg = <0 0x8000000>;
		}
	};

	// ...

	devbus-cs1 at d0010410 {
		compatible = "marvell,mvebu-devbus";
		reg = <0xd0010410 0x8>;
	};

In particular, please note that once the window handling is properly added to the DT, and we remove the mbus usage from this driver, in the above DT nodes the ranges property value will have to be changed, but the ABI will be the same.

This applies on top of v3.9-rc5 with mbus patches applied, which can be found in Jason Cooper's mvebus/soc branch.

This v6 fixes some issues pointed out by both Arnd Bergmann and Jason Gunthorpe. Thanks to both for reviewing the driver and for the feedback!

Changes from v5:

* Instead of translating the child address, parse the 'ranges' property. This is possible because the 'ranges' is mandatory and will a single entry to describing the address window. This allows to remove every reference to child nodes, and will be removed later, once the mbus binding is added.

* Use of_platform_populate to register all child nodes. This way we solve the one-child only constraint present in the previous v5 of this series.

* Rework the driver registration. Now there's a module_init() to register the platform driver, but there's no module_exit() to unregister it. This is done because currently there's no function opposite to of_platform_populate() to unregister all devices from a DT tree.

Changes from v4:

* Calculate the chip select from the base address and drop the 2-cell address size. Suggested by Arnd Bergmann and Jason Gunthorpe.

* The mvebu driver can't be compiled as a module, since the mbus API is not exported yet, so remove that option.

* Bunch of comments here and there...

Changes from v3:

* Rename devbus,dev-width to devbus,bus-width and changed the parameter value from bytes to bits: <8>, <16>, ... Suggested by Arnd Bergmann.

* As suggested by Jason Gunthorpe and agreed by Arnd Bergmann. Reworked the whole devbus child chip-select device tree design. Now there's a separate devbus at addr DT node for each controller chip select. The impact of this is:
1. Timing parameters now go into the parent node.
2. There can only be one child per devbus node.

* Remove unneeded bank-width parameter read.

Changes from v2:

* Replace the 'NOR' specific probe by a generic probe. Currently, we don't see anything specific to NOR in this driver. Suggested by Jason Gunthorpe.

* Add a check to detect that every timing parameter is specified in the device tree node.
Suggested by Jason Gunthorpe.

Changes from v1:

* Added a remove() function to unregister childs and remove address windows, as suggested by Thomas Petazzoni.

* Remove unneeded 'inline' prefix on functions as suggested by Thomas Petazzoni.

* Timings parameters are now mandatory and expressed in picoseconds, as requested by Jason Gunthorpe.
This is consistent with OMAP's GPMC dts binding.

* Fix documentation as suggested by Jason Gunthorpe.

Thanks!

Ezequiel Garcia (5):
drivers: memory: Introduce Marvell EBU Device Bus driver
ARM: mvebu: Add Device Bus support for Armada 370/XP SoC
ARM: mvebu: Add support for NOR flash device on Armada XP-GP board
ARM: mvebu: Add support for NOR flash device on Openblocks AX3 board
ARM: mvebu: Add Device Bus and CFI flash memory support to defconfig

 .../bindings/memory-controllers/mvebu-devbus.txt   | 156 ++++++++++
 arch/arm/boot/dts/armada-370-xp.dtsi               |  45 +++
 arch/arm/boot/dts/armada-xp-gp.dts                 |  29 ++
 arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts   |  29 ++
 arch/arm/configs/mvebu_defconfig                   |   7 +
 drivers/memory/Kconfig                             |  10 +
 drivers/memory/Makefile                            |   1 +
 drivers/memory/mvebu-devbus.c                      | 326 +++++++++++++++++++++
 8 files changed, 603 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/memory-controllers/mvebu-devbus.txt
 create mode 100644 drivers/memory/mvebu-devbus.c
Signature · 1 line
1.8.1.5
#1 lore raw

PATCH v6 1/5 drivers: memory: Introduce Marvell EBU Device Bus driver

Marvell EBU SoCs such as Armada 370/XP, Orion5x (88f5xxx) and Discovery (mv78xx0) supports a Device Bus controller to access several kinds of memories and I/O devices (NOR, NAND, SRAM, FPGA).

This commit adds a driver to handle this controller. So far only Armada 370, Armada XP and Discovery SoCs are supported.

The driver must be registered through a device tree node; as explained in the binding document.

For each child node in the device tree, this driver will:
* set timing parameters
* register a child device
* setup an address decoding window, using the mbus driver

Keep in mind the address decoding window setup is only a temporary hack. This code will be removed from this devbus driver as soon as a proper device tree binding for the mbus driver is added.

---
 .../bindings/memory-controllers/mvebu-devbus.txt   | 156 ++++++++++
 drivers/memory/Kconfig                             |  10 +
 drivers/memory/Makefile                            |   1 +
 drivers/memory/mvebu-devbus.c                      | 326 +++++++++++++++++++++
 4 files changed, 493 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/memory-controllers/mvebu-devbus.txt
 create mode 100644 drivers/memory/mvebu-devbus.c
Documentation/devicetree/bindings/memory-controllers/mvebu-devbus.txt new file +156 -0
new file mode 100644
index 0000000..653c90c
@@ -0,0 +1,156 @@
+Device tree bindings for MVEBU Device Bus controllers
+
+The Device Bus controller available in some Marvell's SoC allows to control
+different types of standard memory and I/O devices such as NOR, NAND, and FPGA.
+The actual devices are instantiated from the child nodes of a Device Bus node.
+
+Required properties:
+
+ - compatible:          Currently only Armada 370/XP SoC are supported,
+                        with this compatible string:
+
+                        marvell,mvebu-devbus
+
+ - reg:                 A resource specifier for the register space.
+                        This is the base address of a chip select within
+			the controller's register space.
+                        (see the example below)
+
+ - #address-cells:      Must be set to 1
+ - #size-cells:         Must be set to 1
+ - ranges:              Must be set up to reflect the memory layout with four
+                        integer values for each chip-select line in use:
+                        0 <physical address of mapping> <size>
+
+Mandatory timing properties for child nodes:
+
+Read parameters:
+
+ - devbus,turn-off-ps:  Defines the time during which the controller does not
+                        drive the AD bus after the completion of a device read.
+                        This prevents contentions on the Device Bus after a read
+                        cycle from a slow device.
+
+ - devbus,bus-width:    Defines the bus width (e.g. <16>)
+
+ - devbus,badr-skew-ps: Defines the time delay from from A[2:0] toggle,
+                        to read data sample. This parameter is useful for
+                        synchronous pipelined devices, where the address
+                        precedes the read data by one or two cycles.
+
+ - devbus,acc-first-ps: Defines the time delay from the negation of
+                        ALE[0] to the cycle that the first read data is sampled
+                        by the controller.
+
+ - devbus,acc-next-ps:  Defines the time delay between the cycle that
+                        samples data N and the cycle that samples data N+1
+                        (in burst accesses).
+
+ - devbus,rd-setup-ps:  Defines the time delay between DEV_CSn assertion to
+			DEV_OEn assertion. If set to 0 (default),
+                        DEV_OEn and DEV_CSn are asserted at the same cycle.
+                        This parameter has no affect on <acc-first-ps> parameter
+                        (no affect on first data sample). Set <rd-setup-ps>
+                        to a value smaller than <acc-first-ps>.
+
+ - devbus,rd-hold-ps:   Defines the time between the last data sample to the
+			de-assertion of DEV_CSn. If set to 0 (default),
+			DEV_OEn and DEV_CSn are de-asserted at the same cycle
+			(the cycle of the last data sample).
+                        This parameter has no affect on DEV_OEn de-assertion.
+                        DEV_OEn is always de-asserted the next cycle after
+                        last data sampled. Also this parameter has no
+                        affect on <turn-off-ps> parameter.
+                        Set <rd-hold-ps> to a value smaller than <turn-off-ps>.
+
+Write parameters:
+
+ - devbus,ale-wr-ps:    Defines the time delay from the ALE[0] negation cycle
+			to the DEV_WEn assertion.
+
+ - devbus,wr-low-ps:    Defines the time during which DEV_WEn is active.
+                        A[2:0] and Data are kept valid as long as DEV_WEn
+                        is active. This parameter defines the setup time of
+                        address and data to DEV_WEn rise.
+
+ - devbus,wr-high-ps:   Defines the time during which DEV_WEn is kept
+                        inactive (high) between data beats of a burst write.
+                        DEV_A[2:0] and Data are kept valid (do not toggle) for
+                        <wr-high-ps> - <tick> ps.
+			This parameter defines the hold time of address and
+			data after DEV_WEn rise.
+
+ - devbus,sync-enable: Synchronous device enable.
+                       1: True
+                       0: False
+
+An example for an Armada XP GP board, with a 16 MiB NOR device as child
+is showed below. Note that the Device Bus driver is in charge of allocating
+the mbus address decoding window for each of its child devices.
+The window is created using the chip select specified in the child
+device node together with the base address and size specified in the ranges
+property. For instance, in the example below the allocated decoding window
+will start at base address 0xf0000000, with a size 0x1000000 (16 MiB)
+for chip select 0 (a.k.a DEV_BOOTCS).
+
+This address window handling is done in this mvebu-devbus only as a temporary
+solution. It will be removed when the support for mbus device tree binding is
+added.
+
+The reg property implicitly specifies the chip select as this:
+
+  0x10400: DEV_BOOTCS
+  0x10408: DEV_CS0
+  0x10410: DEV_CS1
+  0x10418: DEV_CS2
+  0x10420: DEV_CS3
+
+Example:
+
+	devbus-bootcs at d0010400 {
+		status = "okay";
+		ranges = <0 0xf0000000 0x1000000>; /* @addr 0xf0000000, size 0x1000000 */
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* Device Bus parameters are required */
+
+		/* Read parameters */
+		devbus,bus-width    = <8>;
+		devbus,turn-off-ps  = <60000>;
+		devbus,badr-skew-ps = <0>;
+		devbus,acc-first-ps = <124000>;
+		devbus,acc-next-ps  = <248000>;
+		devbus,rd-setup-ps  = <0>;
+		devbus,rd-hold-ps   = <0>;
+
+		/* Write parameters */
+		devbus,sync-enable = <0>;
+		devbus,wr-high-ps  = <60000>;
+		devbus,wr-low-ps   = <60000>;
+		devbus,ale-wr-ps   = <60000>;
+
+		flash at 0 {
+			compatible = "cfi-flash";
+
+			/* 16 MiB */
+			reg = <0 0x1000000>;
+			bank-width = <2>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			/*
+			 * We split the 16 MiB in two partitions,
+			 * just as an example.
+			 */
+			partition at 0 {
+				label = "First";
+				reg = <0 0x800000>;
+			};
+
+			partition at 800000 {
+				label = "Second";
+				reg = <0x800000 0x800000>;
+			};
+		};
+	};
drivers/memory/Kconfig +10 -0
index 067f311..29a11db 100644
@@ -20,6 +20,16 @@ config TI_EMIF
 	  parameters and other settings during frequency, voltage and
 	  temperature changes
 
+config MVEBU_DEVBUS
+	bool "Marvell EBU Device Bus Controller"
+	default y
+	depends on PLAT_ORION && OF
+	help
+	  This driver is for the Device Bus controller available in some
+	  Marvell EBU SoCs such as Discovery (mv78xx0), Orion (88f5xxx) and
+	  Armada 370 and Armada XP. This controller allows to handle flash
+	  devices such as NOR, NAND, SRAM, and FPGA.
+
 config TEGRA20_MC
 	bool "Tegra20 Memory Controller(MC) driver"
 	default y
drivers/memory/Makefile +1 -0
index 9cce5d7..969d923 100644
@@ -6,5 +6,6 @@ ifeq ($(CONFIG_DDR),y)
 obj-$(CONFIG_OF)		+= of_memory.o
 endif
 obj-$(CONFIG_TI_EMIF)		+= emif.o
+obj-$(CONFIG_MVEBU_DEVBUS)	+= mvebu-devbus.o
 obj-$(CONFIG_TEGRA20_MC)	+= tegra20-mc.o
 obj-$(CONFIG_TEGRA30_MC)	+= tegra30-mc.o
drivers/memory/mvebu-devbus.c new file +326 -0

326 lines not on this page · raw message

Signature · 1 line
1.8.1.5
#2 lore raw

PATCH v6 1/5 drivers: memory: Introduce Marvell EBU Device Bus driver

Quoted 11 lines · Ezequiel Garcia
drivers/memory/mvebu-devbus.c new file +11 -0
+	/*
+	 * Since this is only part of the workaround,
+	 * we can do this dirty 'ranges' property parsing.
+	 * Of course, this will be removed once the address windows
+	 * are declared in the device tree.
+	 */
+	err = of_property_read_u32_array(node, "ranges", addr_region,
+					 ARRAY_SIZE(addr_region));
+	if (err < 0) {
+		dev_err(dev, "%s has a malformed 'range' property\n",
+			node->full_name);

drivers/memory/mvebu-devbus.c line 285

Quoted 10 lines
drivers/memory/mvebu-devbus.c new file +9 -0
+		return err;
+	}
 
+	/*
+	 * Create an mbus address windows.
+	 * FIXME: Remove this, together with the above code, once the
+	 * address windows are declared in the device tree.
+	 */
+	err = mvebu_mbus_add_window(devbus_wins[cs],
+				    addr_region[1], addr_region[2]);

Oh, this is a dangerous way to parse ranges..

Try something like:

const __be32 *prop;
u64 base;
u64 size;

prop = of_get_property("ranges",&psize);
if (prop == NULL || psize != of_n_addr_cells(node) + of_n_size_cells(node))
err;
base = of_translate_address(node,prop);
if (base == OF_BAD_ADDR)
err;
size = of_read_number(prop + of_n_addr_cells(node),of_n_size_cells(node));

err = mvebu_mbus_add_window(devbus_wins[cs],base,size);

I omitted some error checking.

Jason

#3 lore raw

PATCH v6 1/5 drivers: memory: Introduce Marvell EBU Device Bus driver

Quoted 39 lines · Jason Gunthorpe
Quoted 11 lines · Ezequiel Garcia
drivers/memory/mvebu-devbus.c new file +11 -0
+	/*
+	 * Since this is only part of the workaround,
+	 * we can do this dirty 'ranges' property parsing.
+	 * Of course, this will be removed once the address windows
+	 * are declared in the device tree.
+	 */
+	err = of_property_read_u32_array(node, "ranges", addr_region,
+					 ARRAY_SIZE(addr_region));
+	if (err < 0) {
+		dev_err(dev, "%s has a malformed 'range' property\n",
+			node->full_name);

drivers/memory/mvebu-devbus.c line 285

Quoted 10 lines
drivers/memory/mvebu-devbus.c new file +9 -0
+		return err;
+	}
 
+	/*
+	 * Create an mbus address windows.
+	 * FIXME: Remove this, together with the above code, once the
+	 * address windows are declared in the device tree.
+	 */
+	err = mvebu_mbus_add_window(devbus_wins[cs],
+				    addr_region[1], addr_region[2]);

Oh, this is a dangerous way to parse ranges..

Try something like:

const __be32 *prop;
u64 base;
u64 size;

prop = of_get_property("ranges",&psize);
if (prop == NULL || psize != of_n_addr_cells(node) + of_n_size_cells(node))
err;
base = of_translate_address(node,prop);
if (base == OF_BAD_ADDR)
err;
size = of_read_number(prop + of_n_addr_cells(node),of_n_size_cells(node));

Quoted 2 lines

err = mvebu_mbus_add_window(devbus_wins[cs],base,size);

No problem, I'll try something like the above.

Mind explaining me why do you think it's dangerous
or in what cases do you expect the other (dirty) solution to break?

Signature · 3 lines
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
#4 lore raw

PATCH v6 1/5 drivers: memory: Introduce Marvell EBU Device Bus driver

In reply to Jason Gunthorpe

Hi Jason,

Quoted 18 lines · Jason Gunthorpe

drivers/memory/mvebu-devbus.c line 272

Quoted 8 lines · Ezequiel Garcia
drivers/memory/mvebu-devbus.c new file +8 -0
+	/*
+	 * Since this is only part of the workaround,
+	 * we can do this dirty 'ranges' property parsing.
+	 * Of course, this will be removed once the address windows
+	 * are declared in the device tree.
+	 */
+	err = of_property_read_u32_array(node, "ranges", addr_region,
+					 ARRAY_SIZE(addr_region));

Oh, this is a dangerous way to parse ranges..

Try something like:

const __be32 *prop;
u64 base;
u64 size;

Quoted 8 lines

prop = of_get_property("ranges",&psize);
if (prop == NULL || psize != of_n_addr_cells(node) + of_n_size_cells(node))
err;
base = of_translate_address(node,prop);
if (base == OF_BAD_ADDR)
err;
size = of_read_number(prop + of_n_addr_cells(node),of_n_size_cells(node));

Thanks for giving me these hints!

Following your suggestion, here's a working piece of the ranges parsing code, how does this look?

const __be32 *ranges;
int addr_cells, p_addr_cells, size_cells;
int ranges_len, tuple_len;
u32 base, size;

p_addr_cells = of_n_addr_cells(node->parent);
addr_cells = of_n_addr_cells(node);
size_cells = of_n_size_cells(node);
tuple_len = (p_addr_cells + addr_cells + size_cells) * sizeof(__be32);

ranges = of_get_property(node, "ranges", &ranges_len); if (ranges == NULL || ranges_len != tuple_len)

	return -EINVAL;

base = of_translate_address(node, ranges + addr_cells); if (base == 0 || base == OF_BAD_ADDR)

	return -EINVAL;

size = of_read_number(ranges + addr_cells + p_addr_cells, size_cells);

Signature · 3 lines
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
#5 lore raw

PATCH v6 1/5 drivers: memory: Introduce Marvell EBU Device Bus driver

Quoted 30 lines · Ezequiel Garcia

Hi Jason,

Quoted 18 lines · Jason Gunthorpe

drivers/memory/mvebu-devbus.c line 272

Quoted 8 lines · Ezequiel Garcia
drivers/memory/mvebu-devbus.c new file +8 -0
+	/*
+	 * Since this is only part of the workaround,
+	 * we can do this dirty 'ranges' property parsing.
+	 * Of course, this will be removed once the address windows
+	 * are declared in the device tree.
+	 */
+	err = of_property_read_u32_array(node, "ranges", addr_region,
+					 ARRAY_SIZE(addr_region));

Oh, this is a dangerous way to parse ranges..

Try something like:

const __be32 *prop;
u64 base;
u64 size;

Quoted 8 lines

prop = of_get_property("ranges",&psize);
if (prop == NULL || psize != of_n_addr_cells(node) + of_n_size_cells(node))
err;
base = of_translate_address(node,prop);
if (base == OF_BAD_ADDR)
err;
size = of_read_number(prop + of_n_addr_cells(node),of_n_size_cells(node));

Quoted 1 line

Thanks for giving me these hints!

NP, the motivation for doing this properly is to support cases where p_addr_cells/addr_cells/size_cells is != 1, and to support cases where the parent bus address is not the CPU address. The proposed bindings for mbus will exercise both of these conditions..

Quoted 9 lines

Following your suggestion, here's a working piece of the ranges parsing code, how does this look?

const __be32 *ranges;
int addr_cells, p_addr_cells, size_cells;
int ranges_len, tuple_len;
u32 base, size;

p_addr_cells = of_n_addr_cells(node->parent);

I wonder if of_get_parent / of_node_put is technically needed here?

Quoted 11 lines

addr_cells = of_n_addr_cells(node);
size_cells = of_n_size_cells(node);
tuple_len = (p_addr_cells + addr_cells + size_cells) * sizeof(__be32);

ranges = of_get_property(node, "ranges", &ranges_len); if (ranges == NULL || ranges_len != tuple_len)

	return -EINVAL;

base = of_translate_address(node, ranges + addr_cells); if (base == 0 || base == OF_BAD_ADDR)

	return -EINVAL;

Why the check for base == 0?

Quoted 1 line

size = of_read_number(ranges + addr_cells + p_addr_cells, size_cells);

Everything basically looks right. I definitely forgot the include the p_addr in my quick sample.

Jason

#6 lore raw

PATCH v6 1/5 drivers: memory: Introduce Marvell EBU Device Bus driver

Hi Jason,

Quoted 41 lines · Jason Gunthorpe
Quoted 30 lines · Ezequiel Garcia

Hi Jason,

Quoted 18 lines · Jason Gunthorpe

drivers/memory/mvebu-devbus.c line 272

Quoted 8 lines · Ezequiel Garcia
drivers/memory/mvebu-devbus.c new file +8 -0
+	/*
+	 * Since this is only part of the workaround,
+	 * we can do this dirty 'ranges' property parsing.
+	 * Of course, this will be removed once the address windows
+	 * are declared in the device tree.
+	 */
+	err = of_property_read_u32_array(node, "ranges", addr_region,
+					 ARRAY_SIZE(addr_region));

Oh, this is a dangerous way to parse ranges..

Try something like:

const __be32 *prop;
u64 base;
u64 size;

Quoted 8 lines

prop = of_get_property("ranges",&psize);
if (prop == NULL || psize != of_n_addr_cells(node) + of_n_size_cells(node))
err;
base = of_translate_address(node,prop);
if (base == OF_BAD_ADDR)
err;
size = of_read_number(prop + of_n_addr_cells(node),of_n_size_cells(node));

Quoted 1 line

Thanks for giving me these hints!

NP, the motivation for doing this properly is to support cases where p_addr_cells/addr_cells/size_cells is != 1, and to support cases where the parent bus address is not the CPU address. The proposed bindings for mbus will exercise both of these conditions..

Quoted 3 lines

Following your suggestion, here's a working piece of the ranges parsing code, how does this look?

Quoted 9 lines
Quoted 6 lines

const __be32 *ranges;
int addr_cells, p_addr_cells, size_cells;
int ranges_len, tuple_len;
u32 base, size;

p_addr_cells = of_n_addr_cells(node->parent);

I wonder if of_get_parent / of_node_put is technically needed here?

Yes, that sounds definitely better.

Quoted 8 lines
Quoted 8 lines

addr_cells = of_n_addr_cells(node);
size_cells = of_n_size_cells(node);
tuple_len = (p_addr_cells + addr_cells + size_cells) * sizeof(__be32);

ranges = of_get_property(node, "ranges", &ranges_len); if (ranges == NULL || ranges_len != tuple_len)

	return -EINVAL;
Quoted 6 lines
Quoted 3 lines

base = of_translate_address(node, ranges + addr_cells); if (base == 0 || base == OF_BAD_ADDR)

	return -EINVAL;

Why the check for base == 0?

Well, when writing this code my first experiments where failing (because the code was wrong) and I was getting base=0. So I added this to catch that error.

Thinking it twice, it doesn't seem correct to check that.

Quoted 5 lines
Quoted 1 line

size = of_read_number(ranges + addr_cells + p_addr_cells, size_cells);

Everything basically looks right. I definitely forgot the include the p_addr in my quick sample.

Great, I'll send the v7, with these two fixes.

Signature · 3 lines
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
#7 lore raw

PATCH v6 2/5 ARM: mvebu: Add Device Bus support for Armada 370/XP SoC

In reply to Ezequiel Garcia

Armada 370 and Armada XP SoC have a Device Bus controller to handle NOR, NAND, SRAM and FPGA devices.
This patch adds the device tree node to enable the controller.

---
 arch/arm/boot/dts/armada-370-xp.dtsi | 45 ++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
arch/arm/boot/dts/armada-370-xp.dtsi +45 -0
index 7704829..9693f79 100644
@@ -176,6 +176,51 @@
 			clocks = <&coreclk 0>;
 			status = "disabled";
 		};
+
+		devbus-bootcs at d0010400 {
+			compatible = "marvell,mvebu-devbus";
+			reg = <0xd0010400 0x8>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			clocks = <&coreclk 0>;
+			status = "disabled";
+		};
+
+		devbus-cs0 at d0010408 {
+			compatible = "marvell,mvebu-devbus";
+			reg = <0xd0010408 0x8>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			clocks = <&coreclk 0>;
+			status = "disabled";
+		};
+
+		devbus-cs1 at d0010410 {
+			compatible = "marvell,mvebu-devbus";
+			reg = <0xd0010410 0x8>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			clocks = <&coreclk 0>;
+			status = "disabled";
+		};
+
+		devbus-cs2 at d0010418 {
+			compatible = "marvell,mvebu-devbus";
+			reg = <0xd0010418 0x8>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			clocks = <&coreclk 0>;
+			status = "disabled";
+		};
+
+		devbus-cs3 at d0010420 {
+			compatible = "marvell,mvebu-devbus";
+			reg = <0xd0010420 0x8>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			clocks = <&coreclk 0>;
+			status = "disabled";
+		};
 	};
 };
 
Signature · 1 line
1.8.1.5
#8 lore raw

PATCH v6 3/5 ARM: mvebu: Add support for NOR flash device on Armada XP-GP board

In reply to Ezequiel Garcia

The Armada XP Development Board DB-MV784MP-GP has a NOR flash device connected to the Device Bus. This commit adds the device tree node to support this device.

This SoC supports a flexible and dynamic decoding window allocation scheme; but since this feature is still not implemented we need to specify the window base address in the device tree node itself.

This base address has been selected in a completely arbitrary fashion.

---
 arch/arm/boot/dts/armada-xp-gp.dts | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
arch/arm/boot/dts/armada-xp-gp.dts +29 -0
index 1c8afe2..e57e9c7 100644
@@ -109,5 +109,34 @@
 				spi-max-frequency = <108000000>;
 			};
 		};
+
+		devbus-bootcs at d0010400 {
+			status = "okay";
+			ranges = <0 0xf0000000 0x1000000>; /* @addr 0xf000000, size 0x1000000 */
+
+			/* Device Bus parameters are required */
+
+			/* Read parameters */
+			devbus,bus-width    = <8>;
+			devbus,turn-off-ps  = <60000>;
+			devbus,badr-skew-ps = <0>;
+			devbus,acc-first-ps = <124000>;
+			devbus,acc-next-ps  = <248000>;
+			devbus,rd-setup-ps  = <0>;
+			devbus,rd-hold-ps   = <0>;
+
+			/* Write parameters */
+			devbus,sync-enable = <0>;
+			devbus,wr-high-ps  = <60000>;
+			devbus,wr-low-ps   = <60000>;
+			devbus,ale-wr-ps   = <60000>;
+
+			/* NOR 16 MiB */
+			nor at 0 {
+				compatible = "cfi-flash";
+				reg = <0 0x1000000>;
+				bank-width = <2>;
+			};
+		};
 	};
 };
Signature · 1 line
1.8.1.5
#9 lore raw

PATCH v6 4/5 ARM: mvebu: Add support for NOR flash device on Openblocks AX3 board

In reply to Ezequiel Garcia

The Plat'home Openblocks AX3 has a 128 MiB NOR flash device connected to the Device Bus. This commit adds the device tree node to support this device.

The SoC supports a flexible and dynamic decoding window allocation scheme; but since this feature is still not implemented we need to specify the window base address in the device tree node itself.
This base address has been selected in a completely arbitrary fashion.

---
 arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 29 ++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +29 -0
index 3818a82..b5c5f4d 100644
@@ -139,5 +139,34 @@
 		usb at d0051000 {
 			status = "okay";
 		};
+
+		devbus-bootcs at d0010400 {
+			status = "okay";
+			ranges = <0 0xf0000000 0x8000000>; /* @addr 0xf000000, size 0x8000000 */
+
+			/* Device Bus parameters are required */
+
+			/* Read parameters */
+			devbus,bus-width    = <8>;
+			devbus,turn-off-ps  = <60000>;
+			devbus,badr-skew-ps = <0>;
+			devbus,acc-first-ps = <124000>;
+			devbus,acc-next-ps  = <248000>;
+			devbus,rd-setup-ps  = <0>;
+			devbus,rd-hold-ps   = <0>;
+
+			/* Write parameters */
+			devbus,sync-enable = <0>;
+			devbus,wr-high-ps  = <60000>;
+			devbus,wr-low-ps   = <60000>;
+			devbus,ale-wr-ps   = <60000>;
+
+			/* NOR 128 MiB */
+			nor at 0 {
+				compatible = "cfi-flash";
+				reg = <0 0x8000000>;
+				bank-width = <2>;
+			};
+		};
 	};
 };
Signature · 1 line
1.8.1.5
#10 lore raw

PATCH v6 5/5 ARM: mvebu: Add Device Bus and CFI flash memory support to defconfig

In reply to Ezequiel Garcia

This patch selects the devbus driver as part of the mvebu default config, along with the required options to detect and support CFI flash memories.

---
 arch/arm/configs/mvebu_defconfig | 7 +++++++
 1 file changed, 7 insertions(+)
arch/arm/configs/mvebu_defconfig +7 -0
index 2ec8119..fe8ba26 100644
@@ -46,6 +46,11 @@ CONFIG_I2C_MV64XXX=y
 CONFIG_MTD=y
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_M25P80=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_CFI_STAA=y
+CONFIG_MTD_PHYSMAP_OF=y
 CONFIG_SERIAL_8250_DW=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
@@ -65,6 +70,8 @@ CONFIG_RTC_DRV_S35390A=y
 CONFIG_RTC_DRV_MV=y
 CONFIG_DMADEVICES=y
 CONFIG_MV_XOR=y
+CONFIG_MEMORY=y
+CONFIG_MVEBU_DEVBUS=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
Signature · 1 line
1.8.1.5