kirkwood: add dir-665 support

This patch is a hack to dir-665 by referencing mv88f6281gtw_ge board. LEDs, GPIO, Buttons remains unknown.

To use this patch, u-boot must also be modified.

Signed-off-by Hirundo Cam <[email protected]>

This patch is a hack to dir-665 by referencing mv88f6281gtw_ge board. LEDs, GPIO, Buttons remains unknown.

To use this patch, u-boot must also be modified.

Signed-off-by Hirundo Cam <[email protected]>

---

?arch/arm/mach-kirkwood/Kconfig ? ? ? ? ? ?| ? ?6 ++
?arch/arm/mach-kirkwood/Makefile ? ? ? ? ? | ? ?1 +
?arch/arm/mach-kirkwood/mv88f6281_dir665.c | ?107 +++++++++++++++++++++++++++++
?arch/arm/tools/mach-types ? ? ? ? ? ? ? ? | ? ?1 +

?4 files changed, 115 insertions(+), 0 deletions(-)

This patch is a hack to dir-665 by referencing mv88f6281gtw_ge board. LEDs, GPIO, Buttons remains unknown.

To use this patch, u-boot must also be modified.

Signed-off-by Hirundo Cam <[email protected]>

---
 arch/arm/mach-kirkwood/Kconfig            |    6 ++
 arch/arm/mach-kirkwood/Makefile           |    1 +
 arch/arm/mach-kirkwood/mv88f6281_dir665.c |  107 +++++++++++++++++++++++++++++
 arch/arm/tools/mach-types                 |    1 +
 4 files changed, 115 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-kirkwood/mv88f6281_dir665.c

arch/arm/mach-kirkwood/Kconfig +0 -0

index 7fc603b..296d97f 100644

arch/arm/mach-kirkwood/Kconfig +3 -0

+	  Say 'Y' here if you want your kernel to support the
+	  88F6281 DIR665 Board.
+
 config MACH_SHEEVAPLUG
 	bool "Marvell SheevaPlug Reference Board"
 	help

arch/arm/mach-kirkwood/Makefile +1 -0

index 5dcaa81..f86649f 100644
@@ -3,6 +3,7 @@ obj-y				+= common.o addr-map.o irq.o pcie.o mpp.o
 obj-$(CONFIG_MACH_DB88F6281_BP)		+= db88f6281-bp-setup.o
 obj-$(CONFIG_MACH_RD88F6192_NAS)	+= rd88f6192-nas-setup.o
 obj-$(CONFIG_MACH_RD88F6281)		+= rd88f6281-setup.o
+obj-$(CONFIG_MACH_MV88F6281_DIR665)	+= mv88f6281_dir665.o
 obj-$(CONFIG_MACH_MV88F6281GTW_GE)	+= mv88f6281gtw_ge-setup.o
 obj-$(CONFIG_MACH_SHEEVAPLUG)		+= sheevaplug-setup.o
 obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG)	+= sheevaplug-setup.o

arch/arm/mach-kirkwood/mv88f6281_dir665.c new file +23 -0

new file mode 100644
index 0000000..41aa7ef
@@ -0,0 +1,107 @@
+/*
+ * arch/arm/mach-kirkwood/mv88f6281_dir665.c
+ *
+ * Marvell 88F6281 DIR-665 Board Setup
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/pci.h>
+#include <linux/irq.h>
+#include <linux/mtd/physmap.h>
+#include <linux/timer.h>
+#include <linux/mv643xx_eth.h>
+#include <linux/ethtool.h>
+#include <linux/gpio.h>
+#include <linux/leds.h>
+#include <linux/input.h>
+#include <linux/gpio_keys.h>

arch/arm/mach-kirkwood/mv88f6281_dir665.c new file +73 -0

+static struct mv643xx_eth_platform_data mv88f6281_dir665_ge00_data = {
+	.phy_addr	= MV643XX_ETH_PHY_NONE,
+	.speed		= SPEED_1000,
+	.duplex		= DUPLEX_FULL,
+};
+
+static struct mv643xx_eth_platform_data mv88f6281_dir665_ge01_data = {
+	.phy_addr	= MV643XX_ETH_PHY_NONE,
+	.speed		= SPEED_1000,
+	.duplex		= DUPLEX_FULL,
+};
+
+static struct dsa_chip_data mv88f6281_dir665_switch_chip_data = {
+	.port_names[0]	= "lan4",
+	.port_names[1]	= "lan3",
+	.port_names[2]	= "lan2",
+	.port_names[3]	= "lan1",
+	.port_names[6]	= "cpu",
+};
+
+static struct dsa_platform_data mv88f6281_dir665_switch_plat_data = {
+	.nr_chips	= 1,
+	.chip		= &mv88f6281_dir665_switch_chip_data,
+};
+
+static const struct flash_platform_data mv88f6281_dir665_spi_slave_data = {
+	.type		= "mx25l12805d",
+};
+
+static struct spi_board_info __initdata mv88f6281_dir665_spi_slave_info[] = {
+	{
+		.modalias	= "m25p80",
+		.platform_data	= &mv88f6281_dir665_spi_slave_data,
+		.irq		= -1,
+		.max_speed_hz	= 50000000,
+		.bus_num	= 0,
+		.chip_select	= 0,
+	},
+};
+
+static void __init mv88f6281_dir665_init(void)
+{
+	/*
+	 * Basic setup. Needs to be called early.
+	 */
+	kirkwood_init();
+
+	kirkwood_ehci_init();
+	kirkwood_ge00_init(&mv88f6281_dir665_ge00_data);
+	kirkwood_ge01_init(&mv88f6281_dir665_ge01_data);
+	kirkwood_ge00_switch_init(&mv88f6281_dir665_switch_plat_data, NO_IRQ);
+	spi_register_board_info(mv88f6281_dir665_spi_slave_info,
+				ARRAY_SIZE(mv88f6281_dir665_spi_slave_info));
+	kirkwood_spi_init();
+	kirkwood_uart0_init();
+}
+
+static int __init mv88f6281_dir665_pci_init(void)
+{
+	if (machine_is_mv88f6281_dir665())
+		kirkwood_pcie_init(KW_PCIE0);
+
+	return 0;
+}
+subsys_initcall(mv88f6281_dir665_pci_init);
+
+MACHINE_START(MV88F6281_DIR665, "Marvell 88F6281 DIR665 Board")
+	.boot_params	= 0x00000100,
+	.init_machine	= mv88f6281_dir665_init,
+	.map_io		= kirkwood_map_io,
+	.init_irq	= kirkwood_init_irq,
+	.timer		= &kirkwood_timer,
+MACHINE_END

arch/arm/tools/mach-types +0 -0

index 7ca41f0..02d008d 100644

Hello Hirundo Cam,

I'm not Kirkwood expert, so my comments are quite general.

Quoted 22 lines

This patch is a hack to dir-665 by referencing mv88f6281gtw_ge board. LEDs, GPIO, Buttons remains unknown.

To use this patch, u-boot must also be modified.

Signed-off-by Hirundo Cam <[email protected]>

---

?arch/arm/mach-kirkwood/Kconfig ? ? ? ? ? ?| ? ?6 ++
?arch/arm/mach-kirkwood/Makefile ? ? ? ? ? | ? ?1 +
?arch/arm/mach-kirkwood/mv88f6281_dir665.c | ?107 +++++++++++++++++++++++++++++
?arch/arm/tools/mach-types ? ? ? ? ? ? ? ? | ? ?1 +

?4 files changed, 115 insertions(+), 0 deletions(-) ?create mode 100644 arch/arm/mach-kirkwood/mv88f6281_dir665.c

arch/arm/mach-kirkwood/Kconfig +0 -0

index 7fc603b..296d97f 100644
@@ -26,6 +26,12 @@ config MACH_MV88F6281GTW_GE

? ? ? ? Say 'Y' here if you want your kernel to support the ? ? ? ? Marvell 88F6281 GTW GE Board.

Quoted 3 lines

+config MACH_MV88F6281_DIR665
+ ? ? bool "Marvell 88F6281 DIR665 Board"
+ ? ? help

Citing checkpatch.pl:
"WARNIING: please write a paragraph that describes the config symbol fully"

Please check what headers are actually needed. I belieive that linux/input.h, linux/leds.h, linux/gpio.h and most probably many others can be safely removed.

You should add the dir665 machine into the machine registry at
http://www.arm.linux.org.uk/developer/machines/ rather than modify the mach-types file.

Hi Mike and Simon,

I've send a machine submit to arm-linux, it generated the mach-types as

[stripped]
mx51_moray ? ? ? ? ? ? ?MACH_MX51_MORAY ? ? ? ? MX51_MORAY ? ? ? ? ? ? ?3484 thales_cbc ? ? ? ? ? ? ?MACH_THALES_CBC ? ? ? ? THALES_CBC ? ? ? ? ? ? ?3485 bluepoint ? ? ? ? ? ? ? MACH_BLUEPOINT ? ? ? ? ?BLUEPOINT ? ? ? ? ? ? ? 3486 dir665 ? ? ? ? ? ? ? ? ?MACH_DIR665 ? ? ? ? ? ? DIR665 ? ? ? ? ? ? ? ? ?3487

Is this correct for the DIR665 board using mv88f6281 chips?

Hi Mike and Simon

2011/5/4 Hirundo Cam <[email protected]>:

Quoted 10 lines

Hi Mike and Simon,

I've send a machine submit to arm-linux, it generated the mach-types as

[stripped]

mx51_moray              MACH_MX51_MORAY         MX51_MORAY              3484
thales_cbc              MACH_THALES_CBC         THALES_CBC              3485
bluepoint               MACH_BLUEPOINT          BLUEPOINT               3486
dir665                  MACH_DIR665             DIR665                  3487

Quoted 1 line

Is this correct for the DIR665 board using mv88f6281 chips?

Is this implied that I could get rid of the modification to mach-type in my patch?

Thanks!

Hi Mike and Simon,

I've send a machine submit to arm-linux, it generated the mach-types as

[stripped]
mx51_moray MACH_MX51_MORAY MX51_MORAY 3484
thales_cbc MACH_THALES_CBC THALES_CBC 3485
bluepoint MACH_BLUEPOINT BLUEPOINT 3486
dir665 MACH_DIR665 DIR665 3487

Is this correct for the DIR665 board using mv88f6281 chips?

Hi Hirundo,

Quoted 10 lines · Hirundo Cam

Hi Mike and Simon,

I've send a machine submit to arm-linux, it generated the mach-types as

[stripped]
mx51_moray MACH_MX51_MORAY MX51_MORAY 3484
thales_cbc MACH_THALES_CBC THALES_CBC 3485
bluepoint MACH_BLUEPOINT BLUEPOINT 3486
dir665 MACH_DIR665 DIR665 3487

Quoted 1 line

Is this correct for the DIR665 board using mv88f6281 chips?

It looks correct.

I think that Kirkwood is actually a good case for device tree as the differences between boards is really simple as it usually boils down to different GPIO usage and MPP assignments. ?If someone would like to contribute to the DT effort on ARM then this would be a nice and easy target to convert over.

Quoted 13 lines · Simon Guinot

Hi Hirundo,

Quoted 10 lines · Hirundo Cam

Hi Mike and Simon,

I've send a machine submit to arm-linux, it generated the mach-types as

[stripped]
mx51_moray MACH_MX51_MORAY MX51_MORAY 3484
thales_cbc MACH_THALES_CBC THALES_CBC 3485
bluepoint MACH_BLUEPOINT BLUEPOINT 3486
dir665 MACH_DIR665 DIR665 3487

Quoted 3 lines

Quoted 1 line

Is this correct for the DIR665 board using mv88f6281 chips?

It looks correct.

It may look correct, but I'll ask that you hang to it for a while as there is a desire to stop the addition of such board specific files to the kernel and move towards a solution such as device tree instead to represent those board details.

I think that Kirkwood is actually a good case for device tree as the differences between boards is really simple as it usually boils down to different GPIO usage and MPP assignments. If someone would like to contribute to the DT effort on ARM then this would be a nice and easy target to convert over.

Hi Nicolas,

Quoted 17 lines · Nicolas Pitre

Quoted 15 lines · Simon Guinot

Hi Hirundo,

Quoted 11 lines · Hirundo Cam

Hi Mike and Simon,

I've send a machine submit to arm-linux, it generated the mach-types as

[stripped]
mx51_moray MACH_MX51_MORAY MX51_MORAY 3484
thales_cbc MACH_THALES_CBC THALES_CBC 3485
bluepoint MACH_BLUEPOINT BLUEPOINT 3486
dir665 MACH_DIR665 DIR665 3487

Is this correct for the DIR665 board using mv88f6281 chips?

Quoted 6 lines

Quoted 1 line

It looks correct.

It may look correct, but I'll ask that you hang to it for a while as there is a desire to stop the addition of such board specific files to the kernel and move towards a solution such as device tree instead to represent those board details.

For my curiosity, how a device tree kernel will deal with ATAGs ?

Is there a compatibility layer planned ?

I mean... For now, the boards on market are not providing a device tree capable bootloader. Without a compatibility layer, the kernel support for this boards can't rely on device tree.

Quoted 22 lines · Simon Guinot

Hi Nicolas,

Quoted 19 lines · Nicolas Pitre

Quoted 16 lines · Simon Guinot

Hi Hirundo,

Quoted 11 lines · Hirundo Cam

Hi Mike and Simon,

I've send a machine submit to arm-linux, it generated the mach-types as

[stripped]
mx51_moray MACH_MX51_MORAY MX51_MORAY 3484
thales_cbc MACH_THALES_CBC THALES_CBC 3485
bluepoint MACH_BLUEPOINT BLUEPOINT 3486
dir665 MACH_DIR665 DIR665 3487

Is this correct for the DIR665 board using mv88f6281 chips?

It looks correct.

Quoted 6 lines

Quoted 4 lines

It may look correct, but I'll ask that you hang to it for a while as there is a desire to stop the addition of such board specific files to the kernel and move towards a solution such as device tree instead to represent those board details.

For my curiosity, how a device tree kernel will deal with ATAGs ?

The kernel may use either. The DTB is meant to supersede ATAGs.

Quoted 6 lines

Is there a compatibility layer planned ?

I mean... For now, the boards on market are not providing a device tree capable bootloader. Without a compatibility layer, the kernel support for this boards can't rely on device tree.

There is a patch allowing for you to simply concatenate the appropriate DTB data to the kernel zImage. With this the existing bootloaders can be used unchanged.

Hi Nicolas,

Quoted 29 lines · Nicolas Pitre

Quoted 27 lines · Simon Guinot

Hi Nicolas,

Quoted 23 lines · Nicolas Pitre

Quoted 13 lines · Simon Guinot

Hi Hirundo,

Quoted 10 lines · Hirundo Cam

Hi Mike and Simon,

I've send a machine submit to arm-linux, it generated the mach-types as

[stripped]
mx51_moray MACH_MX51_MORAY MX51_MORAY 3484
thales_cbc MACH_THALES_CBC THALES_CBC 3485
bluepoint MACH_BLUEPOINT BLUEPOINT 3486
dir665 MACH_DIR665 DIR665 3487

Quoted 3 lines

Quoted 1 line

Is this correct for the DIR665 board using mv88f6281 chips?

It looks correct.

It may look correct, but I'll ask that you hang to it for a while as there is a desire to stop the addition of such board specific files to the kernel and move towards a solution such as device tree instead to represent those board details.

Quoted 3 lines

Quoted 1 line

For my curiosity, how a device tree kernel will deal with ATAGs ?

The kernel may use either. The DTB is meant to supersede ATAGs.

Ok. The board specific files are still needed to handle ATAGs (and "old" bootloader version), how it is possible to stop the addition of this files ?

Quoted 6 lines

Quoted 5 lines

Is there a compatibility layer planned ?

I mean... For now, the boards on market are not providing a device tree capable bootloader. Without a compatibility layer, the kernel support for this boards can't rely on device tree.

Quoted 3 lines

There is a patch allowing for you to simply concatenate the appropriate DTB data to the kernel zImage. With this the existing bootloaders can be used unchanged.

And I will end up with a kernel zImage per board... It looks not very attractive.

Quoted 3 lines

+config MACH_MV88F6281_DIR665
+ ? ? bool "Marvell 88F6281 DIR665 Board"
+ ? ? help

Citing checkpatch.pl:
"WARNIING: please write a paragraph that describes the config symbol fully"

Hi Mike,

Quoted 4 lines

Quoted 3 lines

arch/arm/mach-kirkwood/Kconfig +3 -0

+config MACH_MV88F6281_DIR665
+     bool "Marvell 88F6281 DIR665 Board"
+     help

Quoted 2 lines

Citing checkpatch.pl:
"WARNIING: please write a paragraph that describes the config symbol fully"

I've removed Kconfig and re-add the Kconfig in my git repo. (rm is 1 commit, and the add is the following commit) And then I've found most of those paragraph is this Kconfig has the same problem.
So I have no idea where the problem is .

Regards,
Hirundo Cam

This patch is a hack to dir-665 by referencing mv88f6281gtw_ge board. LEDs, GPIO, Buttons remains unknown.

To use this patch, u-boot must also be modified.

Signed-off-by Hirundo Cam <[email protected]>

---
 arch/arm/mach-kirkwood/Kconfig            |    6 ++
 arch/arm/mach-kirkwood/Makefile           |    1 +
 arch/arm/mach-kirkwood/mv88f6281_dir665.c |  107 +++++++++++++++++++++++++++++
 arch/arm/tools/mach-types                 |    1 +
 4 files changed, 115 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-kirkwood/mv88f6281_dir665.c

arch/arm/mach-kirkwood/Kconfig +0 -0

index 7fc603b..296d97f 100644

This patch is a hack to dir-665 by referencing mv88f6281gtw_ge board. LEDs, GPIO, Buttons remains unknown.

To use this patch, on board u-boot must also be recompiled and replaced.

Signed-off-by Hirundo Cam <[email protected]>

---
Changes for V2
?- Remove mach-type and register a new machine to
? ?http://www.arm.linux.org.uk/developer/machines/
?- Replace mv88f6281_dir665 to dir665 according to Simon's suggestion. ?- Rename mv88f6281_dir665.c to dir665-setup.c
?- Remove include/leds.h, gpio.h, input.h, gpiokey.h according to Mike's ? ?suggestion.

This patch is a hack to dir-665 by referencing mv88f6281gtw_ge board. LEDs, GPIO, Buttons remains unknown.

To use this patch, on board u-boot must also be recompiled and replaced.

Hi Hirundo,

Quoted 2 lines · Hirundo Cam

This patch is a hack to dir-665 by referencing mv88f6281gtw_ge board. LEDs, GPIO, Buttons remains unknown.

Quoted 5 lines

Hi Hirundo,

Quoted 2 lines · Hirundo Cam

This patch is a hack to dir-665 by referencing mv88f6281gtw_ge board. LEDs, GPIO, Buttons remains unknown.

Hirundo,

? if this board is very similar to mv88f6281gtw_ge, you should use the same board setup file. it will be great if you specify the differences between the two boards.

? please have a look at sheevaplug-setup.c to see how multiple boards supported in same setup file.
saeed

Hi Saeed and Nicolas,

2011/5/4 saeed bishara <[email protected]>:

Quoted 7 lines · Simon Guinot

Quoted 5 lines

Hi Hirundo,

Quoted 2 lines · Hirundo Cam

This patch is a hack to dir-665 by referencing mv88f6281gtw_ge board. LEDs, GPIO, Buttons remains unknown.

Hirundo,

Quoted 3 lines

? if this board is very similar to mv88f6281gtw_ge, you should use the same board setup file. it will be great if you specify the differences between the two boards.

I have no mv88f6281gtw_ge board on hand.
However, After I've looked into the setup file of mv88f6281gtw_ge. I've found that the NOR flash, ddr2 DRAM, switch chip, ethernet port define are differ from mv88f6281gtw_ge.

I have no idea if we could use #if define to distinguish the different boards use
the same SoC. While I want also made this adaptable in OpenWrt.

Quoted 5 lines

? please have a look at sheevaplug-setup.c to see how multiple boards supported in same setup file.
saeed

Hum, I think Kernel will rely on the mach-type ID in u-boot to check which board is in booting. If the original u-boot has changed mach-type ID, I don't think us the same configuration file with mv88f6281gtw_ge is good. At least I've tried kernel image compiled with mv88f6281gtw_ge option but it seems kernel cannot be booted and hanged in very early stage. Just like the mach-type ID doesn't match.

Regards,
Hirundo Cam

Hi Hirundo,

Quoted 4 lines · Hirundo Cam

This patch is a hack to dir-665 by referencing mv88f6281gtw_ge board. LEDs, GPIO, Buttons remains unknown.

To use this patch, on board u-boot must also be recompiled and replaced.

Just for curiosity, what is the problem the stock U-Boot ?

Regards,

Hi Simon

2011/5/4 Simon Guinot <[email protected]>:

Quoted 10 lines

Hi Hirundo,

Quoted 4 lines · Hirundo Cam

This patch is a hack to dir-665 by referencing mv88f6281gtw_ge board. LEDs, GPIO, Buttons remains unknown.

To use this patch, on board u-boot must also be recompiled and replaced.

Just for curiosity, what is the problem the stock U-Boot ?

Quoted 2 lines

Regards,

Just as Jean-Christophe said,
I guess the mach-type id in origin u-boot which shipped with the DIR-665 is differed.
Hence the u-boot must update to the new mach-type ID.

It is hard to find out which the origin mach-type has been used. I'm not sure if hexdump
could help.

Anyway, I just replaced the u-boot and get it boot luckly.

This patch is a hack to dir-665 by referencing mv88f6281gtw_ge board. LEDs, GPIO, Buttons remains unknown.

To use this patch, u-boot must also be modified.