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: 41422v19.07.3_mercusys_ac12_duma
Jonas Gorski
10 years ago
parent
44ef9f7789
commit
dc230d9b0f
@ -0,0 +1,493 @@
|
||||
From 5a50cb0d53344a2429831b00925d6183d4d332e1 Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Gorski <jogo@openwrt.org>
|
||||
Date: Sun, 9 Mar 2014 03:54:05 +0100
|
||||
Subject: [PATCH 40/44] MIPS: BCM63XX: move device registration code into its
|
||||
own file
|
||||
|
||||
Move device registration code into its own file to allow sharing it
|
||||
between board implementations.
|
||||
|
||||
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
---
|
||||
arch/mips/bcm63xx/boards/Makefile | 1 +
|
||||
arch/mips/bcm63xx/boards/board_bcm963xx.c | 188 +-------------------------
|
||||
arch/mips/bcm63xx/boards/board_common.c | 215 ++++++++++++++++++++++++++++++
|
||||
arch/mips/bcm63xx/boards/board_common.h | 8 ++
|
||||
4 files changed, 223 insertions(+), 183 deletions(-)
|
||||
create mode 100644 arch/mips/bcm63xx/boards/board_common.c
|
||||
create mode 100644 arch/mips/bcm63xx/boards/board_common.h
|
||||
|
||||
--- a/arch/mips/bcm63xx/boards/Makefile
|
||||
+++ b/arch/mips/bcm63xx/boards/Makefile
|
||||
@@ -1 +1,2 @@
|
||||
+obj-y += board_common.o
|
||||
obj-$(CONFIG_BOARD_BCM963XX) += board_bcm963xx.o
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -10,35 +10,22 @@
|
||||
#include <linux/init.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/string.h>
|
||||
-#include <linux/platform_device.h>
|
||||
-#include <linux/ssb/ssb.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_nvram.h>
|
||||
-#include <bcm63xx_dev_pci.h>
|
||||
-#include <bcm63xx_dev_enet.h>
|
||||
-#include <bcm63xx_dev_dsp.h>
|
||||
-#include <bcm63xx_dev_flash.h>
|
||||
-#include <bcm63xx_dev_hsspi.h>
|
||||
-#include <bcm63xx_dev_pcmcia.h>
|
||||
-#include <bcm63xx_dev_spi.h>
|
||||
-#include <bcm63xx_dev_usb_ehci.h>
|
||||
-#include <bcm63xx_dev_usb_ohci.h>
|
||||
-#include <bcm63xx_dev_usb_usbd.h>
|
||||
#include <board_bcm963xx.h>
|
||||
|
||||
+#include "board_common.h"
|
||||
+
|
||||
#include <uapi/linux/bcm933xx_hcs.h>
|
||||
|
||||
#define PFX "board_bcm963xx: "
|
||||
|
||||
#define HCS_OFFSET_128K 0x20000
|
||||
|
||||
-static struct board_info board;
|
||||
-
|
||||
/*
|
||||
* known 3368 boards
|
||||
*/
|
||||
@@ -711,52 +698,6 @@ static const struct board_info __initcon
|
||||
};
|
||||
|
||||
/*
|
||||
- * Register a sane SPROMv2 to make the on-board
|
||||
- * bcm4318 WLAN work
|
||||
- */
|
||||
-#ifdef CONFIG_SSB_PCIHOST
|
||||
-static struct ssb_sprom bcm63xx_sprom = {
|
||||
- .revision = 0x02,
|
||||
- .board_rev = 0x17,
|
||||
- .country_code = 0x0,
|
||||
- .ant_available_bg = 0x3,
|
||||
- .pa0b0 = 0x15ae,
|
||||
- .pa0b1 = 0xfa85,
|
||||
- .pa0b2 = 0xfe8d,
|
||||
- .pa1b0 = 0xffff,
|
||||
- .pa1b1 = 0xffff,
|
||||
- .pa1b2 = 0xffff,
|
||||
- .gpio0 = 0xff,
|
||||
- .gpio1 = 0xff,
|
||||
- .gpio2 = 0xff,
|
||||
- .gpio3 = 0xff,
|
||||
- .maxpwr_bg = 0x004c,
|
||||
- .itssi_bg = 0x00,
|
||||
- .boardflags_lo = 0x2848,
|
||||
- .boardflags_hi = 0x0000,
|
||||
-};
|
||||
-
|
||||
-int bcm63xx_get_fallback_sprom(struct ssb_bus *bus, struct ssb_sprom *out)
|
||||
-{
|
||||
- if (bus->bustype == SSB_BUSTYPE_PCI) {
|
||||
- memcpy(out, &bcm63xx_sprom, sizeof(struct ssb_sprom));
|
||||
- return 0;
|
||||
- } else {
|
||||
- printk(KERN_ERR PFX "unable to fill SPROM for given bustype.\n");
|
||||
- return -EINVAL;
|
||||
- }
|
||||
-}
|
||||
-#endif
|
||||
-
|
||||
-/*
|
||||
- * return board name for /proc/cpuinfo
|
||||
- */
|
||||
-const char *board_get_name(void)
|
||||
-{
|
||||
- return board.name;
|
||||
-}
|
||||
-
|
||||
-/*
|
||||
* early init callback, read nvram data from flash and checksum it
|
||||
*/
|
||||
void __init board_prom_init(void)
|
||||
@@ -801,141 +742,16 @@ void __init board_prom_init(void)
|
||||
if (strncmp(board_name, bcm963xx_boards[i]->name, 16))
|
||||
continue;
|
||||
/* copy, board desc array is marked initdata */
|
||||
- memcpy(&board, bcm963xx_boards[i], sizeof(board));
|
||||
+ board_early_setup(bcm963xx_boards[i]);
|
||||
break;
|
||||
}
|
||||
|
||||
- /* bail out if board is not found, will complain later */
|
||||
- if (!board.name[0]) {
|
||||
+ /* warn if board is not found, will complain later */
|
||||
+ if (i == ARRAY_SIZE(bcm963xx_boards)) {
|
||||
char name[17];
|
||||
memcpy(name, board_name, 16);
|
||||
name[16] = 0;
|
||||
printk(KERN_ERR PFX "unknown bcm963xx board: %s\n",
|
||||
name);
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- /* 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;
|
||||
- }
|
||||
-
|
||||
- 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 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,
|
||||
-};
|
||||
-
|
||||
-/*
|
||||
- * third stage init callback, register all board devices.
|
||||
- */
|
||||
-int __init board_register_devices(void)
|
||||
-{
|
||||
- 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 &&
|
||||
- !bcm63xx_nvram_get_mac_address(board.enet0.mac_addr))
|
||||
- bcm63xx_enet_register(0, &board.enet0);
|
||||
-
|
||||
- if (board.has_enet1 &&
|
||||
- !bcm63xx_nvram_get_mac_address(board.enet1.mac_addr))
|
||||
- bcm63xx_enet_register(1, &board.enet1);
|
||||
-
|
||||
- if (board.has_enetsw &&
|
||||
- !bcm63xx_nvram_get_mac_address(board.enetsw.mac_addr))
|
||||
- bcm63xx_enetsw_register(&board.enetsw);
|
||||
-
|
||||
- if (board.has_usbd)
|
||||
- bcm63xx_usbd_register(&board.usbd);
|
||||
-
|
||||
- if (board.has_ehci0)
|
||||
- bcm63xx_ehci_register();
|
||||
-
|
||||
- if (board.has_ohci0)
|
||||
- bcm63xx_ohci_register();
|
||||
-
|
||||
- if (board.has_dsp)
|
||||
- bcm63xx_dsp_register(&board.dsp);
|
||||
-
|
||||
- /* Generate MAC address for WLAN and register our SPROM,
|
||||
- * do this after registering enet devices
|
||||
- */
|
||||
-#ifdef CONFIG_SSB_PCIHOST
|
||||
- if (!bcm63xx_nvram_get_mac_address(bcm63xx_sprom.il0mac)) {
|
||||
- memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
||||
- memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
||||
- if (ssb_arch_register_fallback_sprom(
|
||||
- &bcm63xx_get_fallback_sprom) < 0)
|
||||
- pr_err(PFX "failed to register fallback SPROM\n");
|
||||
}
|
||||
-#endif
|
||||
-
|
||||
- bcm63xx_spi_register();
|
||||
-
|
||||
- bcm63xx_hsspi_register();
|
||||
-
|
||||
- bcm63xx_flash_register();
|
||||
-
|
||||
- bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
|
||||
- bcm63xx_led_data.leds = board.leds;
|
||||
-
|
||||
- platform_device_register(&bcm63xx_gpio_leds);
|
||||
-
|
||||
- if (board.ephy_reset_gpio && board.ephy_reset_gpio_flags)
|
||||
- gpio_request_one(board.ephy_reset_gpio,
|
||||
- board.ephy_reset_gpio_flags, "ephy-reset");
|
||||
-
|
||||
- return 0;
|
||||
}
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/bcm63xx/boards/board_common.c
|
||||
@@ -0,0 +1,217 @@
|
||||
+/*
|
||||
+ * 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 Maxime Bizon <mbizon@freebox.fr>
|
||||
+ * 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/ssb/ssb.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_nvram.h>
|
||||
+#include <bcm63xx_dev_pci.h>
|
||||
+#include <bcm63xx_dev_enet.h>
|
||||
+#include <bcm63xx_dev_dsp.h>
|
||||
+#include <bcm63xx_dev_flash.h>
|
||||
+#include <bcm63xx_dev_hsspi.h>
|
||||
+#include <bcm63xx_dev_pcmcia.h>
|
||||
+#include <bcm63xx_dev_spi.h>
|
||||
+#include <bcm63xx_dev_usb_ehci.h>
|
||||
+#include <bcm63xx_dev_usb_ohci.h>
|
||||
+#include <bcm63xx_dev_usb_usbd.h>
|
||||
+#include <board_bcm963xx.h>
|
||||
+
|
||||
+#define PFX "board: "
|
||||
+
|
||||
+static struct board_info board;
|
||||
+
|
||||
+/*
|
||||
+ * Register a sane SPROMv2 to make the on-board
|
||||
+ * bcm4318 WLAN work
|
||||
+ */
|
||||
+#ifdef CONFIG_SSB_PCIHOST
|
||||
+static struct ssb_sprom bcm63xx_sprom = {
|
||||
+ .revision = 0x02,
|
||||
+ .board_rev = 0x17,
|
||||
+ .country_code = 0x0,
|
||||
+ .ant_available_bg = 0x3,
|
||||
+ .pa0b0 = 0x15ae,
|
||||
+ .pa0b1 = 0xfa85,
|
||||
+ .pa0b2 = 0xfe8d,
|
||||
+ .pa1b0 = 0xffff,
|
||||
+ .pa1b1 = 0xffff,
|
||||
+ .pa1b2 = 0xffff,
|
||||
+ .gpio0 = 0xff,
|
||||
+ .gpio1 = 0xff,
|
||||
+ .gpio2 = 0xff,
|
||||
+ .gpio3 = 0xff,
|
||||
+ .maxpwr_bg = 0x004c,
|
||||
+ .itssi_bg = 0x00,
|
||||
+ .boardflags_lo = 0x2848,
|
||||
+ .boardflags_hi = 0x0000,
|
||||
+};
|
||||
+
|
||||
+int bcm63xx_get_fallback_sprom(struct ssb_bus *bus, struct ssb_sprom *out)
|
||||
+{
|
||||
+ if (bus->bustype == SSB_BUSTYPE_PCI) {
|
||||
+ memcpy(out, &bcm63xx_sprom, sizeof(struct ssb_sprom));
|
||||
+ return 0;
|
||||
+ } else {
|
||||
+ printk(KERN_ERR PFX "unable to fill SPROM for given bustype.\n");
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+/*
|
||||
+ * return board name for /proc/cpuinfo
|
||||
+ */
|
||||
+const char *board_get_name(void)
|
||||
+{
|
||||
+ return board.name;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * setup board for device registration
|
||||
+ */
|
||||
+void __init board_early_setup(const struct board_info *target)
|
||||
+{
|
||||
+ u32 val;
|
||||
+
|
||||
+ memcpy(&board, target, 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;
|
||||
+ }
|
||||
+
|
||||
+ 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 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,
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * third stage init callback, register all board devices.
|
||||
+ */
|
||||
+int __init board_register_devices(void)
|
||||
+{
|
||||
+ 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 &&
|
||||
+ !bcm63xx_nvram_get_mac_address(board.enet0.mac_addr))
|
||||
+ bcm63xx_enet_register(0, &board.enet0);
|
||||
+
|
||||
+ if (board.has_enet1 &&
|
||||
+ !bcm63xx_nvram_get_mac_address(board.enet1.mac_addr))
|
||||
+ bcm63xx_enet_register(1, &board.enet1);
|
||||
+
|
||||
+ if (board.has_enetsw &&
|
||||
+ !bcm63xx_nvram_get_mac_address(board.enetsw.mac_addr))
|
||||
+ bcm63xx_enetsw_register(&board.enetsw);
|
||||
+
|
||||
+ if (board.has_usbd)
|
||||
+ bcm63xx_usbd_register(&board.usbd);
|
||||
+
|
||||
+ if (board.has_ehci0)
|
||||
+ bcm63xx_ehci_register();
|
||||
+
|
||||
+ if (board.has_ohci0)
|
||||
+ bcm63xx_ohci_register();
|
||||
+
|
||||
+ if (board.has_dsp)
|
||||
+ bcm63xx_dsp_register(&board.dsp);
|
||||
+
|
||||
+ /* Generate MAC address for WLAN and register our SPROM,
|
||||
+ * do this after registering enet devices
|
||||
+ */
|
||||
+#ifdef CONFIG_SSB_PCIHOST
|
||||
+ if (!bcm63xx_nvram_get_mac_address(bcm63xx_sprom.il0mac)) {
|
||||
+ memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
||||
+ memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
||||
+ if (ssb_arch_register_fallback_sprom(
|
||||
+ &bcm63xx_get_fallback_sprom) < 0)
|
||||
+ pr_err(PFX "failed to register fallback SPROM\n");
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
+ bcm63xx_spi_register();
|
||||
+
|
||||
+ bcm63xx_hsspi_register();
|
||||
+
|
||||
+ bcm63xx_flash_register();
|
||||
+
|
||||
+ bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
|
||||
+ bcm63xx_led_data.leds = board.leds;
|
||||
+
|
||||
+ platform_device_register(&bcm63xx_gpio_leds);
|
||||
+
|
||||
+ if (board.ephy_reset_gpio && board.ephy_reset_gpio_flags)
|
||||
+ gpio_request_one(board.ephy_reset_gpio,
|
||||
+ board.ephy_reset_gpio_flags, "ephy-reset");
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/bcm63xx/boards/board_common.h
|
||||
@@ -0,0 +1,8 @@
|
||||
+#ifndef __BOARD_COMMON_H
|
||||
+#define __BOARD_COMMON_H
|
||||
+
|
||||
+#include <board_bcm963xx.h>
|
||||
+
|
||||
+void board_early_setup(const struct board_info *board);
|
||||
+
|
||||
+#endif /* __BOARD_COMMON_H */
|
||||
@ -0,0 +1,100 @@
|
||||
From 4e9c34a37bd3442b286ba55441bfe22c1ac5b65f Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Gorski <jogo@openwrt.org>
|
||||
Date: Sun, 9 Mar 2014 04:08:06 +0100
|
||||
Subject: [PATCH 41/44] MIPS: BCM63XX: pass a mac addresss allocator to board
|
||||
setup
|
||||
|
||||
Pass a mac address allocator to board setup code to allow board
|
||||
implementations to work with third party bootloaders not using nvram
|
||||
for configuration storage.
|
||||
|
||||
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
---
|
||||
arch/mips/bcm63xx/boards/board_bcm963xx.c | 3 ++-
|
||||
arch/mips/bcm63xx/boards/board_common.c | 16 ++++++++++------
|
||||
arch/mips/bcm63xx/boards/board_common.h | 3 ++-
|
||||
3 files changed, 14 insertions(+), 8 deletions(-)
|
||||
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -742,7 +742,8 @@ void __init board_prom_init(void)
|
||||
if (strncmp(board_name, bcm963xx_boards[i]->name, 16))
|
||||
continue;
|
||||
/* copy, board desc array is marked initdata */
|
||||
- board_early_setup(bcm963xx_boards[i]);
|
||||
+ board_early_setup(bcm963xx_boards[i],
|
||||
+ bcm63xx_nvram_get_mac_address);
|
||||
break;
|
||||
}
|
||||
|
||||
--- a/arch/mips/bcm63xx/boards/board_common.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_common.c
|
||||
@@ -18,7 +18,6 @@
|
||||
#include <bcm63xx_dev_uart.h>
|
||||
#include <bcm63xx_regs.h>
|
||||
#include <bcm63xx_io.h>
|
||||
-#include <bcm63xx_nvram.h>
|
||||
#include <bcm63xx_dev_pci.h>
|
||||
#include <bcm63xx_dev_enet.h>
|
||||
#include <bcm63xx_dev_dsp.h>
|
||||
@@ -81,15 +80,20 @@ const char *board_get_name(void)
|
||||
return board.name;
|
||||
}
|
||||
|
||||
+static int (*board_get_mac_address)(u8 mac[ETH_ALEN]);
|
||||
+
|
||||
/*
|
||||
* setup board for device registration
|
||||
*/
|
||||
-void __init board_early_setup(const struct board_info *target)
|
||||
+void __init board_early_setup(const struct board_info *target,
|
||||
+ int (*get_mac_address)(u8 mac[ETH_ALEN]))
|
||||
{
|
||||
u32 val;
|
||||
|
||||
memcpy(&board, target, sizeof(board));
|
||||
|
||||
+ board_get_mac_address = get_mac_address;
|
||||
+
|
||||
/* setup pin multiplexing depending on board enabled device,
|
||||
* this has to be done this early since PCI init is done
|
||||
* inside arch_initcall */
|
||||
@@ -162,15 +166,15 @@ int __init board_register_devices(void)
|
||||
bcm63xx_pcmcia_register();
|
||||
|
||||
if (board.has_enet0 &&
|
||||
- !bcm63xx_nvram_get_mac_address(board.enet0.mac_addr))
|
||||
+ !board_get_mac_address(board.enet0.mac_addr))
|
||||
bcm63xx_enet_register(0, &board.enet0);
|
||||
|
||||
if (board.has_enet1 &&
|
||||
- !bcm63xx_nvram_get_mac_address(board.enet1.mac_addr))
|
||||
+ !board_get_mac_address(board.enet1.mac_addr))
|
||||
bcm63xx_enet_register(1, &board.enet1);
|
||||
|
||||
if (board.has_enetsw &&
|
||||
- !bcm63xx_nvram_get_mac_address(board.enetsw.mac_addr))
|
||||
+ !board_get_mac_address(board.enetsw.mac_addr))
|
||||
bcm63xx_enetsw_register(&board.enetsw);
|
||||
|
||||
if (board.has_usbd)
|
||||
@@ -189,7 +193,7 @@ int __init board_register_devices(void)
|
||||
* do this after registering enet devices
|
||||
*/
|
||||
#ifdef CONFIG_SSB_PCIHOST
|
||||
- if (!bcm63xx_nvram_get_mac_address(bcm63xx_sprom.il0mac)) {
|
||||
+ if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
|
||||
memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
||||
memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
||||
if (ssb_arch_register_fallback_sprom(
|
||||
--- a/arch/mips/bcm63xx/boards/board_common.h
|
||||
+++ b/arch/mips/bcm63xx/boards/board_common.h
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
#include <board_bcm963xx.h>
|
||||
|
||||
-void board_early_setup(const struct board_info *board);
|
||||
+void board_early_setup(const struct board_info *board,
|
||||
+ int (*get_mac_address)(u8 mac[ETH_ALEN]));
|
||||
|
||||
#endif /* __BOARD_COMMON_H */
|
||||
@ -0,0 +1,95 @@
|
||||
From 0daf361ea799fba0af5a232036d0f06cea85ad24 Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Gorski <jogo@openwrt.org>
|
||||
Date: Sat, 21 Jun 2014 12:47:49 +0200
|
||||
Subject: [PATCH 42/44] MIPS: BCM63XX: allow building support for more than one
|
||||
board type
|
||||
|
||||
Use the arguments passed to the kernel to detect being booted with
|
||||
CFE as the indicator for bcm963xx board support, allowing the
|
||||
non presence of CFE_EPTSEAL to assume a different board type.
|
||||
|
||||
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
---
|
||||
arch/mips/bcm63xx/boards/Kconfig | 7 +++----
|
||||
arch/mips/bcm63xx/boards/board_bcm963xx.c | 2 +-
|
||||
arch/mips/bcm63xx/boards/board_common.c | 13 +++++++++++++
|
||||
arch/mips/bcm63xx/boards/board_common.h | 6 ++++++
|
||||
4 files changed, 23 insertions(+), 5 deletions(-)
|
||||
|
||||
--- a/arch/mips/bcm63xx/boards/Kconfig
|
||||
+++ b/arch/mips/bcm63xx/boards/Kconfig
|
||||
@@ -1,11 +1,10 @@
|
||||
-choice
|
||||
- prompt "Board support"
|
||||
+menu "Board support"
|
||||
depends on BCM63XX
|
||||
- default BOARD_BCM963XX
|
||||
|
||||
config BOARD_BCM963XX
|
||||
bool "Generic Broadcom 963xx boards"
|
||||
select SSB
|
||||
+ default y
|
||||
help
|
||||
|
||||
-endchoice
|
||||
+endmenu
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -754,7 +754,7 @@ static void __init boardid_fixup(u8 *boo
|
||||
/*
|
||||
* early init callback, read nvram data from flash and checksum it
|
||||
*/
|
||||
-void __init board_prom_init(void)
|
||||
+void __init board_bcm963xx_init(void)
|
||||
{
|
||||
unsigned int i;
|
||||
u8 *boot_addr, *cfe;
|
||||
--- a/arch/mips/bcm63xx/boards/board_common.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_common.c
|
||||
@@ -15,6 +15,8 @@
|
||||
#include <linux/gpio_keys.h>
|
||||
#include <linux/spi/spi.h>
|
||||
#include <asm/addrspace.h>
|
||||
+#include <asm/bootinfo.h>
|
||||
+#include <asm/fw/cfe/cfe_api.h>
|
||||
#include <bcm63xx_board.h>
|
||||
#include <bcm63xx_cpu.h>
|
||||
#include <bcm63xx_dev_uart.h>
|
||||
@@ -32,6 +34,8 @@
|
||||
#include <bcm63xx_dev_usb_usbd.h>
|
||||
#include <board_bcm963xx.h>
|
||||
|
||||
+#include "board_common.h"
|
||||
+
|
||||
#define PFX "board: "
|
||||
|
||||
#define BCM963XX_KEYS_POLL_INTERVAL 20
|
||||
@@ -84,6 +88,15 @@ const char *board_get_name(void)
|
||||
return board.name;
|
||||
}
|
||||
|
||||
+void __init board_prom_init(void)
|
||||
+{
|
||||
+ /* detect bootloader */
|
||||
+ if (fw_arg3 == CFE_EPTSEAL)
|
||||
+ board_bcm963xx_init();
|
||||
+ else
|
||||
+ panic("unsupported bootloader detected");
|
||||
+}
|
||||
+
|
||||
static int (*board_get_mac_address)(u8 mac[ETH_ALEN]);
|
||||
|
||||
/*
|
||||
--- a/arch/mips/bcm63xx/boards/board_common.h
|
||||
+++ b/arch/mips/bcm63xx/boards/board_common.h
|
||||
@@ -6,4 +6,10 @@
|
||||
void board_early_setup(const struct board_info *board,
|
||||
int (*get_mac_address)(u8 mac[ETH_ALEN]));
|
||||
|
||||
+#if defined(CONFIG_BOARD_BCM963XX)
|
||||
+void board_bcm963xx_init(void);
|
||||
+#else
|
||||
+static inline void board_bcm963xx_init(void) { }
|
||||
+#endif
|
||||
+
|
||||
#endif /* __BOARD_COMMON_H */
|
||||
@ -0,0 +1,61 @@
|
||||
From 8a30097a899b975709f728666d5ad20c8b832d21 Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Gorski <jogo@openwrt.org>
|
||||
Date: Sun, 9 Mar 2014 04:28:14 +0100
|
||||
Subject: [PATCH 43/44] MIPS: BCM63XX: allow board implementations to force
|
||||
flash address
|
||||
|
||||
Allow board implementations to force the physmap address.
|
||||
|
||||
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
---
|
||||
arch/mips/bcm63xx/dev-flash.c | 19 ++++++++++++++-----
|
||||
.../mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h | 2 ++
|
||||
2 files changed, 16 insertions(+), 5 deletions(-)
|
||||
|
||||
--- a/arch/mips/bcm63xx/dev-flash.c
|
||||
+++ b/arch/mips/bcm63xx/dev-flash.c
|
||||
@@ -57,6 +57,12 @@ static struct platform_device mtd_dev =
|
||||
},
|
||||
};
|
||||
|
||||
+void __init bcm63xx_flash_force_phys_base_address(u32 start, u32 end)
|
||||
+{
|
||||
+ mtd_resources[0].start = start;
|
||||
+ mtd_resources[0].end = end;
|
||||
+}
|
||||
+
|
||||
static int __init bcm63xx_detect_flash_type(void)
|
||||
{
|
||||
u32 val;
|
||||
@@ -158,12 +164,15 @@ int __init bcm63xx_flash_register(void)
|
||||
|
||||
switch (flash_type) {
|
||||
case BCM63XX_FLASH_TYPE_PARALLEL:
|
||||
- /* read base address of boot chip select (0) */
|
||||
- val = bcm_mpi_readl(MPI_CSBASE_REG(0));
|
||||
- val &= MPI_CSBASE_BASE_MASK;
|
||||
|
||||
- mtd_resources[0].start = val;
|
||||
- mtd_resources[0].end = 0x1FFFFFFF;
|
||||
+ if (!mtd_resources[0].start) {
|
||||
+ /* read base address of boot chip select (0) */
|
||||
+ val = bcm_mpi_readl(MPI_CSBASE_REG(0));
|
||||
+ val &= MPI_CSBASE_BASE_MASK;
|
||||
+
|
||||
+ mtd_resources[0].start = val;
|
||||
+ mtd_resources[0].end = 0x1FFFFFFF;
|
||||
+ }
|
||||
|
||||
return platform_device_register(&mtd_dev);
|
||||
case BCM63XX_FLASH_TYPE_SERIAL:
|
||||
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
|
||||
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
|
||||
@@ -9,6 +9,8 @@ enum {
|
||||
|
||||
void bcm63xx_flash_detect(void);
|
||||
|
||||
+void bcm63xx_flash_force_phys_base_address(u32 start, u32 end);
|
||||
+
|
||||
int __init bcm63xx_flash_register(void);
|
||||
|
||||
#endif /* __BCM63XX_FLASH_H */
|
||||
@ -0,0 +1,257 @@
|
||||
From 7e6b22225e16fbb22dbf7f2113d8c6d65333818c Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Gorski <jogo@openwrt.org>
|
||||
Date: Sun, 9 Mar 2014 04:55:52 +0100
|
||||
Subject: [PATCH 44/44] MIPS: BCM63XX: add inventel Livebox support
|
||||
|
||||
---
|
||||
arch/mips/bcm63xx/boards/Kconfig | 6 +
|
||||
arch/mips/bcm63xx/boards/Makefile | 1 +
|
||||
arch/mips/bcm63xx/boards/board_common.c | 2 +-
|
||||
arch/mips/bcm63xx/boards/board_common.h | 6 +
|
||||
arch/mips/bcm63xx/boards/board_livebox.c | 193 +++++++++++++++++++++++++++++++
|
||||
5 files changed, 207 insertions(+), 1 deletion(-)
|
||||
create mode 100644 arch/mips/bcm63xx/boards/board_livebox.c
|
||||
|
||||
--- a/arch/mips/bcm63xx/boards/Kconfig
|
||||
+++ b/arch/mips/bcm63xx/boards/Kconfig
|
||||
@@ -7,4 +7,10 @@ config BOARD_BCM963XX
|
||||
default y
|
||||
help
|
||||
|
||||
+config BOARD_LIVEBOX
|
||||
+ bool "Inventel Livebox(es) boards"
|
||||
+ select SSB
|
||||
+ help
|
||||
+ Inventel Livebox boards using the RedBoot bootloader.
|
||||
+
|
||||
endmenu
|
||||
--- a/arch/mips/bcm63xx/boards/Makefile
|
||||
+++ b/arch/mips/bcm63xx/boards/Makefile
|
||||
@@ -1,2 +1,3 @@
|
||||
obj-y += board_common.o
|
||||
obj-$(CONFIG_BOARD_BCM963XX) += board_bcm963xx.o
|
||||
+obj-$(CONFIG_BOARD_LIVEBOX) += board_livebox.o
|
||||
--- a/arch/mips/bcm63xx/boards/board_common.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_common.c
|
||||
@@ -96,7 +96,7 @@ void __init board_prom_init(void)
|
||||
if (fw_arg3 == CFE_EPTSEAL)
|
||||
board_bcm963xx_init();
|
||||
else
|
||||
- panic("unsupported bootloader detected");
|
||||
+ board_livebox_init();
|
||||
}
|
||||
|
||||
static int (*board_get_mac_address)(u8 mac[ETH_ALEN]);
|
||||
--- a/arch/mips/bcm63xx/boards/board_common.h
|
||||
+++ b/arch/mips/bcm63xx/boards/board_common.h
|
||||
@@ -12,4 +12,10 @@ void board_bcm963xx_init(void);
|
||||
static inline void board_bcm963xx_init(void) { }
|
||||
#endif
|
||||
|
||||
+#if defined(CONFIG_BOARD_LIVEBOX)
|
||||
+void board_livebox_init(void);
|
||||
+#else
|
||||
+static inline void board_livebox_init(void) { }
|
||||
+#endif
|
||||
+
|
||||
#endif /* __BOARD_COMMON_H */
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/bcm63xx/boards/board_livebox.c
|
||||
@@ -0,0 +1,197 @@
|
||||
+/*
|
||||
+ * 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/input.h>
|
||||
+#include <asm/addrspace.h>
|
||||
+#include <bcm63xx_board.h>
|
||||
+#include <bcm63xx_cpu.h>
|
||||
+#include <bcm63xx_regs.h>
|
||||
+#include <bcm63xx_io.h>
|
||||
+#include <bcm63xx_dev_flash.h>
|
||||
+#include <board_bcm963xx.h>
|
||||
+
|
||||
+#include "board_common.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;
|
||||
+
|
||||
+/*
|
||||
+ * 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,
|
||||
+ },
|
||||
+
|
||||
+ .ephy_reset_gpio = 6,
|
||||
+ .ephy_reset_gpio_flags = GPIOF_INIT_HIGH,
|
||||
+
|
||||
+ .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
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * register & return a new board mac address
|
||||
+ */
|
||||
+static int livebox_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_livebox_init(void)
|
||||
+{
|
||||
+ u32 val;
|
||||
+ u8 hw_version;
|
||||
+ const struct board_info *board;
|
||||
+
|
||||
+ /* 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");
|
||||
+ board = bcm963xx_boards[0];
|
||||
+ break;
|
||||
+ default:
|
||||
+ printk(KERN_INFO PFX "Unknown livebox version: %02x\n", hw_version);
|
||||
+ /* use default livebox configuration */
|
||||
+ board = bcm963xx_boards[0];
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ /* use default livebox configuration */
|
||||
+ board_early_setup(board, livebox_get_mac_address);
|
||||
+
|
||||
+ /* 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);
|
||||
+ bcm63xx_flash_force_phys_base_address(LIVEBOX_BOOT_ADDR, 0x1ebfffff);
|
||||
+ }
|
||||
+}
|
||||
@ -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;
|
||||
+}
|
||||
Loading…
Reference in New Issue