brcm63xx: 3.10: backport multi-board support

There have been no reported regressions, so backport it to 3.10.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 41422

1 files changed, 0 insertions, 390 deletions

diff --git a/target/linux/brcm63xx/patches-3.10/513-board_livebox.patch b/target/linux/brcm63xx/patches-3.10/513-board_livebox.patch
deleted file mode 100644
index 2323b5eef7..0000000000
--- a/target/linux/brcm63xx/patches-3.10/513-board_livebox.patch
+++ /dev/null
@@ -1,390 +0,0 @@
---- a/arch/mips/bcm63xx/boards/Kconfig
-+++ b/arch/mips/bcm63xx/boards/Kconfig
-@@ -8,4 +8,10 @@ config BOARD_BCM963XX
- 	select SSB
-        help
- 
-+config BOARD_LIVEBOX
-+	bool "Inventel Livebox(es) boards"
-+	select SSB
-+	help
-+	 Inventel Livebox boards using the RedBoot bootloader.
-+
- endchoice
---- a/arch/mips/bcm63xx/boards/Makefile
-+++ b/arch/mips/bcm63xx/boards/Makefile
-@@ -1 +1,2 @@
- obj-$(CONFIG_BOARD_BCM963XX)		+= board_bcm963xx.o
-+obj-$(CONFIG_BOARD_LIVEBOX)		+= board_livebox.o
---- /dev/null
-+++ b/arch/mips/bcm63xx/boards/board_livebox.c
-@@ -0,0 +1,369 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2008 Florian Fainelli <florian@openwrt.org>
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/string.h>
-+#include <linux/platform_device.h>
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
-+#include <linux/mtd/physmap.h>
-+#include <linux/ssb/ssb.h>
-+#include <linux/gpio_keys.h>
-+#include <linux/input.h>
-+#include <linux/spi/spi.h>
-+#include <asm/addrspace.h>
-+#include <bcm63xx_board.h>
-+#include <bcm63xx_cpu.h>
-+#include <bcm63xx_dev_uart.h>
-+#include <bcm63xx_regs.h>
-+#include <bcm63xx_io.h>
-+#include <bcm63xx_dev_pci.h>
-+#include <bcm63xx_dev_enet.h>
-+#include <bcm63xx_dev_dsp.h>
-+#include <bcm63xx_dev_pcmcia.h>
-+#include <bcm63xx_dev_usb_ohci.h>
-+#include <bcm63xx_dev_usb_ehci.h>
-+#include <bcm63xx_dev_spi.h>
-+#include <board_bcm963xx.h>
-+
-+#define PFX	"board_livebox: "
-+
-+#define LIVEBOX_KEYS_POLL_INTERVAL	20
-+#define LIVEBOX_KEYS_DEBOUNCE_INTERVAL	(LIVEBOX_KEYS_POLL_INTERVAL * 3)
-+
-+static unsigned int mac_addr_used = 0;
-+static struct board_info board;
-+
-+/*
-+ * known 6348 boards
-+ */
-+#ifdef CONFIG_BCM63XX_CPU_6348
-+static struct board_info __initdata board_livebox_blue5g = {
-+	.name				= "Livebox-blue-5g",
-+	.expected_cpu_id		= 0x6348,
-+
-+	.has_uart0			= 1,
-+	.has_enet0			= 1,
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
-+
-+	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
-+	},
-+
-+	.enet1 = {
-+		  .has_phy		= 1,
-+		  .phy_id 		= 31,
-+	},
-+
-+	.has_ohci0			= 1,
-+	.has_pccard			= 1,
-+
-+	.has_dsp			= 0, /*TODO some Liveboxes have dsp*/
-+	.dsp = {
-+		.gpio_rst		= 6, /*FIXME eth1 shares gpio6 with dsp?*/
-+		.gpio_int		= 35,
-+		.cs			= 2,
-+		.ext_irq		= 2,
-+	},
-+
-+	.leds = {
-+		{
-+			.name		= "Livebox-blue-5g::adsl-fail",
-+			.gpio		= 0,
-+			.active_low	= 0,
-+			.default_trigger = "default-on",
-+		},
-+		{
-+			.name		= "Livebox-blue-5g::adsl",
-+			.gpio		= 1,
-+		},
-+		{
-+			.name		= "Livebox-blue-5g::traffic",
-+			.gpio		= 2,
-+		},
-+		{
-+			.name		= "Livebox-blue-5g::phone",
-+			.gpio		= 3,
-+		},
-+		{
-+			.name		= "Livebox-blue-5g::wifi",
-+			.gpio		= 4,
-+		},
-+	},
-+
-+	.buttons = {
-+		{
-+			.desc		= "BTN_1",
-+			.gpio		= 36,
-+			.active_low	= 1,
-+			.type		= EV_KEY,
-+			.code		= BTN_1,
-+			.debounce_interval = LIVEBOX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+		{
-+			.desc		= "BTN_2",
-+			.gpio		= 7,
-+			.active_low	= 1,
-+			.type		= EV_KEY,
-+			.code		= BTN_2,
-+			.debounce_interval = LIVEBOX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+
-+	},
-+};
-+#endif
-+
-+/*
-+ * all boards
-+ */
-+static const struct board_info __initdata *bcm963xx_boards[] = {
-+#ifdef CONFIG_BCM63XX_CPU_6348
-+	&board_livebox_blue5g
-+#endif
-+};
-+/*
-+ * return board name for /proc/cpuinfo
-+ */
-+const char *board_get_name(void)
-+{
-+	return board.name;
-+}
-+
-+/*
-+ * register & return a new board mac address
-+ */
-+static int board_get_mac_address(u8 *mac)
-+{
-+	u8 *p;
-+	int count;
-+
-+	memcpy(mac, (u8 *)0xBEBFF377, ETH_ALEN);
-+
-+	p = mac + ETH_ALEN - 1;
-+	count = mac_addr_used;
-+
-+	while (count--) {
-+		do {
-+			(*p)++;
-+			if (*p != 0)
-+				break;
-+			p--;
-+		} while (p != mac);
-+	}
-+
-+	if (p == mac) {
-+		printk(KERN_ERR PFX "unable to fetch mac address\n");
-+		return -ENODEV;
-+	}
-+        mac_addr_used++;
-+
-+	return 0;
-+}
-+
-+/*
-+ * early init callback
-+ */
-+#define LIVEBOX_GPIO_DETECT_MASK	0x000000ff
-+#define LIVEBOX_BOOT_ADDR		0x1e400000
-+
-+#define LIVEBOX_HW_BLUE5G_9		0x90
-+
-+void __init board_prom_init(void)
-+{
-+	u32 val;
-+	u8 hw_version;
-+
-+	/* Get hardware version */
-+	val = bcm_gpio_readl(GPIO_CTL_LO_REG);
-+	val &= ~LIVEBOX_GPIO_DETECT_MASK;
-+	bcm_gpio_writel(val, GPIO_CTL_LO_REG);
-+
-+	hw_version = bcm_gpio_readl(GPIO_DATA_LO_REG) & LIVEBOX_GPIO_DETECT_MASK;
-+	switch (hw_version) {
-+	case LIVEBOX_HW_BLUE5G_9:
-+		printk(KERN_INFO PFX "Livebox BLUE5G.9\n");
-+		memcpy(&board, bcm963xx_boards[0], sizeof(board));
-+		break;
-+	default:
-+		printk(KERN_INFO PFX "Unknown livebox version: %02x\n", hw_version);
-+		break;
-+	}
-+
-+	/* use default livebox configuration */
-+	memcpy(&board, bcm963xx_boards[0], sizeof(board));
-+
-+	/* setup pin multiplexing depending on board enabled device,
-+	 * this has to be done this early since PCI init is done
-+	 * inside arch_initcall */
-+	val = 0;
-+
-+#ifdef CONFIG_PCI
-+	if (board.has_pci) {
-+		bcm63xx_pci_enabled = 1;
-+		if (BCMCPU_IS_6348())
-+			val |= GPIO_MODE_6348_G2_PCI;
-+	}
-+#endif
-+	if (board.has_pccard) {
-+		if (BCMCPU_IS_6348())
-+			val |= GPIO_MODE_6348_G1_MII_PCCARD;
-+	}
-+
-+	if (board.has_enet0 && !board.enet0.use_internal_phy) {
-+		if (BCMCPU_IS_6348())
-+			val |= GPIO_MODE_6348_G3_EXT_MII |
-+				GPIO_MODE_6348_G0_EXT_MII;
-+	}
-+
-+	if (board.has_enet1 && !board.enet1.use_internal_phy) {
-+		if (BCMCPU_IS_6348())
-+			val |= GPIO_MODE_6348_G3_EXT_MII |
-+				GPIO_MODE_6348_G0_EXT_MII;
-+			printk(KERN_INFO PFX "resetting gpio6 for eth1...\n");
-+			gpio_request(6, "dsp_eth_rst");
-+			gpio_direction_output(6, 0);
-+			gpio_set_value(6, 1);
-+	}
-+
-+	bcm_gpio_writel(val, GPIO_MODE_REG);
-+}
-+
-+/*
-+ * second stage init callback, good time to panic if we couldn't
-+ * identify on which board we're running since early printk is working
-+ */
-+void __init board_setup(void)
-+{
-+	if (!board.name[0])
-+		panic("unable to detect bcm963xx board");
-+	printk(KERN_INFO PFX "board name: %s\n", board.name);
-+
-+	/* make sure we're running on expected cpu */
-+	if (bcm63xx_get_cpu_id() != board.expected_cpu_id)
-+		panic("unexpected CPU for bcm963xx board");
-+}
-+
-+static struct physmap_flash_data flash_data = {
-+	.width			= 2,
-+};
-+
-+static struct resource mtd_resources[] = {
-+	{
-+		.start          = 0,    /* filled at runtime */
-+		.end            = 0,    /* filled at runtime */
-+		.flags          = IORESOURCE_MEM,
-+	}
-+};
-+
-+static struct platform_device mtd_dev = {
-+	.name			= "physmap-flash",
-+	.resource		= mtd_resources,
-+	.num_resources		= ARRAY_SIZE(mtd_resources),
-+	.dev			= {
-+		.platform_data	= &flash_data,
-+	},
-+};
-+
-+static struct gpio_led_platform_data bcm63xx_led_data;
-+
-+static struct platform_device bcm63xx_gpio_leds = {
-+	.name			= "leds-gpio",
-+	.id			= 0,
-+	.dev.platform_data	= &bcm63xx_led_data,
-+};
-+
-+static struct gpio_keys_platform_data bcm63xx_gpio_keys_data = {
-+	.poll_interval  = LIVEBOX_KEYS_POLL_INTERVAL,
-+};
-+
-+static struct platform_device bcm63xx_gpio_keys_device = {
-+	.name		= "gpio-keys-polled",
-+	.id		= 0,
-+	.dev.platform_data = &bcm63xx_gpio_keys_data,
-+};
-+
-+/*
-+ * third stage init callback, register all board devices.
-+ */
-+int __init board_register_devices(void)
-+{
-+	u32 val;
-+	int led_count = 0;
-+	int button_count = 0;
-+
-+	if (board.has_uart0)
-+		bcm63xx_uart_register(0);
-+
-+	if (board.has_uart1)
-+		bcm63xx_uart_register(1);
-+
-+	if (board.has_pccard)
-+		bcm63xx_pcmcia_register();
-+
-+	if (board.has_enet0 &&
-+	    !board_get_mac_address(board.enet0.mac_addr))
-+		bcm63xx_enet_register(0, &board.enet0);
-+
-+	if (board.has_enet1 &&
-+	    !board_get_mac_address(board.enet1.mac_addr))
-+		bcm63xx_enet_register(1, &board.enet1);
-+
-+	if (board.has_ehci0)
-+		bcm63xx_ehci_register();
-+
-+	if (board.has_ohci0)
-+		bcm63xx_ohci_register();
-+
-+	if (board.has_dsp)
-+		bcm63xx_dsp_register(&board.dsp);
-+
-+	bcm63xx_spi_register();
-+
-+	if (board.num_devs)
-+		platform_add_devices(board.devs, board.num_devs);
-+
-+	if (board.num_spis)
-+		spi_register_board_info(board.spis, board.num_spis);
-+
-+
-+	/* read base address of boot chip select (0) */
-+	val = bcm_mpi_readl(MPI_CSBASE_REG(0));
-+	val &= MPI_CSBASE_BASE_MASK;
-+	if (val != LIVEBOX_BOOT_ADDR)
-+		printk(KERN_NOTICE PFX "flash address is: 0x%08x, forcing to: 0x%08x\n",
-+			val, LIVEBOX_BOOT_ADDR);
-+	mtd_resources[0].start = LIVEBOX_BOOT_ADDR;
-+	mtd_resources[0].end = 0x1ebfffff;
-+
-+	platform_device_register(&mtd_dev);
-+
-+	/* count number of LEDs defined by this device */
-+	while (led_count < ARRAY_SIZE(board.leds) && board.leds[led_count].name)
-+		led_count++;
-+
-+	bcm63xx_led_data.num_leds = led_count;
-+	bcm63xx_led_data.leds = board.leds;
-+
-+	platform_device_register(&bcm63xx_gpio_leds);
-+
-+	/* count number of BUTTONs defined by this device */
-+	while (button_count < ARRAY_SIZE(board.buttons) && board.buttons[button_count].desc)
-+		button_count++;
-+
-+	if (button_count) {
-+		bcm63xx_gpio_keys_data.nbuttons = button_count;
-+		bcm63xx_gpio_keys_data.buttons = board.buttons;
-+
-+		platform_device_register(&bcm63xx_gpio_keys_device);
-+	}
-+
-+	return 0;
-+}