system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-07-23 03:29:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bcm47xx: make it possible to build bcm47xx without ssb.

Browse source 
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Hauke Mehrtens 2011-07-23 01:20:13 +02:00 committed by John W. Linville
parent 08ccf57283
commit a656ffcbc7
12 changed files with 71 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/mips/Kconfig
View file

@ -91,15 +91,8 @@ config BCM47XX
select DMA_NONCOHERENT select DMA_NONCOHERENT
select HW_HAS_PCI select HW_HAS_PCI
select IRQ_CPU select IRQ_CPU
select SYS_HAS_CPU_MIPS32_R1
select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN
select SSB
select SSB_DRIVER_MIPS
select SSB_DRIVER_EXTIF
select SSB_EMBEDDED
select SSB_B43_PCI_BRIDGE if PCI
select SSB_PCICORE_HOSTMODE if PCI
select GENERIC_GPIO select GENERIC_GPIO
select SYS_HAS_EARLY_PRINTK select SYS_HAS_EARLY_PRINTK
select CFE select CFE
@ -788,6 +781,7 @@ endchoice
source "arch/mips/alchemy/Kconfig" source "arch/mips/alchemy/Kconfig"
source "arch/mips/ath79/Kconfig" source "arch/mips/ath79/Kconfig"
source "arch/mips/bcm47xx/Kconfig"
source "arch/mips/bcm63xx/Kconfig" source "arch/mips/bcm63xx/Kconfig"
source "arch/mips/jazz/Kconfig" source "arch/mips/jazz/Kconfig"
source "arch/mips/jz4740/Kconfig" source "arch/mips/jz4740/Kconfig"

18
arch/mips/bcm47xx/Kconfig Normal file
View file

@ -0,0 +1,18 @@
if BCM47XX
config BCM47XX_SSB
bool "SSB Support for Broadcom BCM47XX"
select SYS_HAS_CPU_MIPS32_R1
select SSB
select SSB_DRIVER_MIPS
select SSB_DRIVER_EXTIF
select SSB_EMBEDDED
select SSB_B43_PCI_BRIDGE if PCI
select SSB_PCICORE_HOSTMODE if PCI
default y
help
Add support for old Broadcom BCM47xx boards with Sonics Silicon Backplane support.
This will generate an image with support for SSB and MIPS32 R1 instruction set.
endif

3
arch/mips/bcm47xx/Makefile
View file

@ -3,4 +3,5 @@
# under Linux. # under Linux.
# #
obj-y := gpio.o irq.o nvram.o prom.o serial.o setup.o time.o wgt634u.o obj-y += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o
obj-$(CONFIG_BCM47XX_SSB) += wgt634u.o

6
arch/mips/bcm47xx/gpio.c
View file

@ -21,6 +21,7 @@ static DECLARE_BITMAP(gpio_in_use, BCM47XX_EXTIF_GPIO_LINES);
int gpio_request(unsigned gpio, const char *tag) int gpio_request(unsigned gpio, const char *tag)
{ {
switch (bcm47xx_bus_type) { switch (bcm47xx_bus_type) {
#ifdef CONFIG_BCM47XX_SSB
case BCM47XX_BUS_TYPE_SSB: case BCM47XX_BUS_TYPE_SSB:
if (ssb_chipco_available(&bcm47xx_bus.ssb.chipco) && if (ssb_chipco_available(&bcm47xx_bus.ssb.chipco) &&
((unsigned)gpio >= BCM47XX_CHIPCO_GPIO_LINES)) ((unsigned)gpio >= BCM47XX_CHIPCO_GPIO_LINES))
@ -34,6 +35,7 @@ int gpio_request(unsigned gpio, const char *tag)
return -EBUSY; return -EBUSY;
return 0; return 0;
#endif
} }
return -EINVAL; return -EINVAL;
} }
@ -42,6 +44,7 @@ EXPORT_SYMBOL(gpio_request);
void gpio_free(unsigned gpio) void gpio_free(unsigned gpio)
{ {
switch (bcm47xx_bus_type) { switch (bcm47xx_bus_type) {
#ifdef CONFIG_BCM47XX_SSB
case BCM47XX_BUS_TYPE_SSB: case BCM47XX_BUS_TYPE_SSB:
if (ssb_chipco_available(&bcm47xx_bus.ssb.chipco) && if (ssb_chipco_available(&bcm47xx_bus.ssb.chipco) &&
((unsigned)gpio >= BCM47XX_CHIPCO_GPIO_LINES)) ((unsigned)gpio >= BCM47XX_CHIPCO_GPIO_LINES))
@ -53,6 +56,7 @@ void gpio_free(unsigned gpio)
clear_bit(gpio, gpio_in_use); clear_bit(gpio, gpio_in_use);
return; return;
#endif
} }
} }
EXPORT_SYMBOL(gpio_free); EXPORT_SYMBOL(gpio_free);
@ -60,6 +64,7 @@ EXPORT_SYMBOL(gpio_free);
int gpio_to_irq(unsigned gpio) int gpio_to_irq(unsigned gpio)
{ {
switch (bcm47xx_bus_type) { switch (bcm47xx_bus_type) {
#ifdef CONFIG_BCM47XX_SSB
case BCM47XX_BUS_TYPE_SSB: case BCM47XX_BUS_TYPE_SSB:
if (ssb_chipco_available(&bcm47xx_bus.ssb.chipco)) if (ssb_chipco_available(&bcm47xx_bus.ssb.chipco))
return ssb_mips_irq(bcm47xx_bus.ssb.chipco.dev) + 2; return ssb_mips_irq(bcm47xx_bus.ssb.chipco.dev) + 2;
@ -67,6 +72,7 @@ int gpio_to_irq(unsigned gpio)
return ssb_mips_irq(bcm47xx_bus.ssb.extif.dev) + 2; return ssb_mips_irq(bcm47xx_bus.ssb.extif.dev) + 2;
else else
return -EINVAL; return -EINVAL;
#endif
} }
return -EINVAL; return -EINVAL;
} }

4
arch/mips/bcm47xx/nvram.c
View file

@ -26,7 +26,9 @@ static char nvram_buf[NVRAM_SPACE];
/* Probe for NVRAM header */ /* Probe for NVRAM header */
static void early_nvram_init(void) static void early_nvram_init(void)
{ {
#ifdef CONFIG_BCM47XX_SSB
struct ssb_mipscore *mcore_ssb; struct ssb_mipscore *mcore_ssb;
#endif
struct nvram_header *header; struct nvram_header *header;
int i; int i;
u32 base = 0; u32 base = 0;
@ -35,11 +37,13 @@ static void early_nvram_init(void)
u32 *src, *dst; u32 *src, *dst;
switch (bcm47xx_bus_type) { switch (bcm47xx_bus_type) {
#ifdef CONFIG_BCM47XX_SSB
case BCM47XX_BUS_TYPE_SSB: case BCM47XX_BUS_TYPE_SSB:
mcore_ssb = &bcm47xx_bus.ssb.mipscore; mcore_ssb = &bcm47xx_bus.ssb.mipscore;
base = mcore_ssb->flash_window; base = mcore_ssb->flash_window;
lim = mcore_ssb->flash_window_size; lim = mcore_ssb->flash_window_size;
break; break;
#endif
} }
off = FLASH_MIN; off = FLASH_MIN;

4
arch/mips/bcm47xx/serial.c
View file

@ -23,6 +23,7 @@ static struct platform_device uart8250_device = {
}, },
}; };
#ifdef CONFIG_BCM47XX_SSB
static int __init uart8250_init_ssb(void) static int __init uart8250_init_ssb(void)
{ {
int i; int i;
@ -44,12 +45,15 @@ static int __init uart8250_init_ssb(void)
} }
return platform_device_register(&uart8250_device); return platform_device_register(&uart8250_device);
} }
#endif
static int __init uart8250_init(void) static int __init uart8250_init(void)
{ {
switch (bcm47xx_bus_type) { switch (bcm47xx_bus_type) {
#ifdef CONFIG_BCM47XX_SSB
case BCM47XX_BUS_TYPE_SSB: case BCM47XX_BUS_TYPE_SSB:
return uart8250_init_ssb(); return uart8250_init_ssb();
#endif
} }
return -EINVAL; return -EINVAL;
} }

8
arch/mips/bcm47xx/setup.c
View file

@ -47,9 +47,11 @@ static void bcm47xx_machine_restart(char *command)
local_irq_disable(); local_irq_disable();
/* Set the watchdog timer to reset immediately */ /* Set the watchdog timer to reset immediately */
switch (bcm47xx_bus_type) { switch (bcm47xx_bus_type) {
#ifdef CONFIG_BCM47XX_SSB
case BCM47XX_BUS_TYPE_SSB: case BCM47XX_BUS_TYPE_SSB:
ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 1); ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 1);
break; break;
#endif
} }
while (1) while (1)
cpu_relax(); cpu_relax();
@ -60,14 +62,17 @@ static void bcm47xx_machine_halt(void)
/* Disable interrupts and watchdog and spin forever */ /* Disable interrupts and watchdog and spin forever */
local_irq_disable(); local_irq_disable();
switch (bcm47xx_bus_type) { switch (bcm47xx_bus_type) {
#ifdef CONFIG_BCM47XX_SSB
case BCM47XX_BUS_TYPE_SSB: case BCM47XX_BUS_TYPE_SSB:
ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 0); ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 0);
break; break;
#endif
} }
while (1) while (1)
cpu_relax(); cpu_relax();
} }
#ifdef CONFIG_BCM47XX_SSB
#define READ_FROM_NVRAM(_outvar, name, buf) \ #define READ_FROM_NVRAM(_outvar, name, buf) \
if (nvram_getprefix(prefix, name, buf, sizeof(buf)) >= 0)\ if (nvram_getprefix(prefix, name, buf, sizeof(buf)) >= 0)\
sprom->_outvar = simple_strtoul(buf, NULL, 0); sprom->_outvar = simple_strtoul(buf, NULL, 0);
@ -288,13 +293,16 @@ static void __init bcm47xx_register_ssb(void)
} }
} }
} }
#endif
void __init plat_mem_setup(void) void __init plat_mem_setup(void)
{ {
struct cpuinfo_mips *c = &current_cpu_data; struct cpuinfo_mips *c = &current_cpu_data;
#ifdef CONFIG_BCM47XX_SSB
bcm47xx_bus_type = BCM47XX_BUS_TYPE_SSB; bcm47xx_bus_type = BCM47XX_BUS_TYPE_SSB;
bcm47xx_register_ssb(); bcm47xx_register_ssb();
#endif
_machine_restart = bcm47xx_machine_restart; _machine_restart = bcm47xx_machine_restart;
_machine_halt = bcm47xx_machine_halt; _machine_halt = bcm47xx_machine_halt;

2
arch/mips/bcm47xx/time.c
View file

@ -40,9 +40,11 @@ void __init plat_time_init(void)
write_c0_compare(0xffff); write_c0_compare(0xffff);
switch (bcm47xx_bus_type) { switch (bcm47xx_bus_type) {
#ifdef CONFIG_BCM47XX_SSB
case BCM47XX_BUS_TYPE_SSB: case BCM47XX_BUS_TYPE_SSB:
hz = ssb_cpu_clock(&bcm47xx_bus.ssb.mipscore) / 2; hz = ssb_cpu_clock(&bcm47xx_bus.ssb.mipscore) / 2;
break; break;
#endif
} }
if (!hz) if (!hz)

4
arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
View file

@ -22,11 +22,15 @@
#include <linux/ssb/ssb.h> #include <linux/ssb/ssb.h>
enum bcm47xx_bus_type { enum bcm47xx_bus_type {
#ifdef CONFIG_BCM47XX_SSB
BCM47XX_BUS_TYPE_SSB, BCM47XX_BUS_TYPE_SSB,
#endif
}; };
union bcm47xx_bus { union bcm47xx_bus {
#ifdef CONFIG_BCM47XX_SSB
struct ssb_bus ssb; struct ssb_bus ssb;
#endif
}; };
extern union bcm47xx_bus bcm47xx_bus; extern union bcm47xx_bus bcm47xx_bus;

12
arch/mips/include/asm/mach-bcm47xx/gpio.h
View file

@ -22,8 +22,10 @@ extern int gpio_to_irq(unsigned gpio);
static inline int gpio_get_value(unsigned gpio) static inline int gpio_get_value(unsigned gpio)
{ {
switch (bcm47xx_bus_type) { switch (bcm47xx_bus_type) {
#ifdef CONFIG_BCM47XX_SSB
case BCM47XX_BUS_TYPE_SSB: case BCM47XX_BUS_TYPE_SSB:
return ssb_gpio_in(&bcm47xx_bus.ssb, 1 << gpio); return ssb_gpio_in(&bcm47xx_bus.ssb, 1 << gpio);
#endif
} }
return -EINVAL; return -EINVAL;
} }
@ -31,18 +33,22 @@ static inline int gpio_get_value(unsigned gpio)
static inline void gpio_set_value(unsigned gpio, int value) static inline void gpio_set_value(unsigned gpio, int value)
{ {
switch (bcm47xx_bus_type) { switch (bcm47xx_bus_type) {
#ifdef CONFIG_BCM47XX_SSB
case BCM47XX_BUS_TYPE_SSB: case BCM47XX_BUS_TYPE_SSB:
ssb_gpio_out(&bcm47xx_bus.ssb, 1 << gpio, ssb_gpio_out(&bcm47xx_bus.ssb, 1 << gpio,
value ? 1 << gpio : 0); value ? 1 << gpio : 0);
#endif
} }
} }
static inline int gpio_direction_input(unsigned gpio) static inline int gpio_direction_input(unsigned gpio)
{ {
switch (bcm47xx_bus_type) { switch (bcm47xx_bus_type) {
#ifdef CONFIG_BCM47XX_SSB
case BCM47XX_BUS_TYPE_SSB: case BCM47XX_BUS_TYPE_SSB:
ssb_gpio_outen(&bcm47xx_bus.ssb, 1 << gpio, 0); ssb_gpio_outen(&bcm47xx_bus.ssb, 1 << gpio, 0);
return 0; return 0;
#endif
} }
return -EINVAL; return -EINVAL;
} }
@ -50,6 +56,7 @@ static inline int gpio_direction_input(unsigned gpio)
static inline int gpio_direction_output(unsigned gpio, int value) static inline int gpio_direction_output(unsigned gpio, int value)
{ {
switch (bcm47xx_bus_type) { switch (bcm47xx_bus_type) {
#ifdef CONFIG_BCM47XX_SSB
case BCM47XX_BUS_TYPE_SSB: case BCM47XX_BUS_TYPE_SSB:
/* first set the gpio out value */ /* first set the gpio out value */
ssb_gpio_out(&bcm47xx_bus.ssb, 1 << gpio, ssb_gpio_out(&bcm47xx_bus.ssb, 1 << gpio,
@ -57,6 +64,7 @@ static inline int gpio_direction_output(unsigned gpio, int value)
/* then set the gpio mode */ /* then set the gpio mode */
ssb_gpio_outen(&bcm47xx_bus.ssb, 1 << gpio, 1 << gpio); ssb_gpio_outen(&bcm47xx_bus.ssb, 1 << gpio, 1 << gpio);
return 0; return 0;
#endif
} }
return -EINVAL; return -EINVAL;
} }
@ -64,10 +72,12 @@ static inline int gpio_direction_output(unsigned gpio, int value)
static inline int gpio_intmask(unsigned gpio, int value) static inline int gpio_intmask(unsigned gpio, int value)
{ {
switch (bcm47xx_bus_type) { switch (bcm47xx_bus_type) {
#ifdef CONFIG_BCM47XX_SSB
case BCM47XX_BUS_TYPE_SSB: case BCM47XX_BUS_TYPE_SSB:
ssb_gpio_intmask(&bcm47xx_bus.ssb, 1 << gpio, ssb_gpio_intmask(&bcm47xx_bus.ssb, 1 << gpio,
value ? 1 << gpio : 0); value ? 1 << gpio : 0);
return 0; return 0;
#endif
} }
return -EINVAL; return -EINVAL;
} }
@ -75,10 +85,12 @@ static inline int gpio_intmask(unsigned gpio, int value)
static inline int gpio_polarity(unsigned gpio, int value) static inline int gpio_polarity(unsigned gpio, int value)
{ {
switch (bcm47xx_bus_type) { switch (bcm47xx_bus_type) {
#ifdef CONFIG_BCM47XX_SSB
case BCM47XX_BUS_TYPE_SSB: case BCM47XX_BUS_TYPE_SSB:
ssb_gpio_polarity(&bcm47xx_bus.ssb, 1 << gpio, ssb_gpio_polarity(&bcm47xx_bus.ssb, 1 << gpio,
value ? 1 << gpio : 0); value ? 1 << gpio : 0);
return 0; return 0;
#endif
} }
return -EINVAL; return -EINVAL;
} }

6
arch/mips/pci/pci-bcm47xx.c
View file

@ -25,6 +25,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/ssb/ssb.h> #include <linux/ssb/ssb.h>
#include <bcm47xx.h>
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{ {
@ -33,9 +34,13 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
int pcibios_plat_dev_init(struct pci_dev *dev) int pcibios_plat_dev_init(struct pci_dev *dev)
{ {
#ifdef CONFIG_BCM47XX_SSB
int res; int res;
u8 slot, pin; u8 slot, pin;
if (bcm47xx_bus_type != BCM47XX_BUS_TYPE_SSB)
return 0;
res = ssb_pcibios_plat_dev_init(dev); res = ssb_pcibios_plat_dev_init(dev);
if (res < 0) { if (res < 0) {
printk(KERN_ALERT "PCI: Failed to init device %s\n", printk(KERN_ALERT "PCI: Failed to init device %s\n",
@ -55,5 +60,6 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
} }
dev->irq = res; dev->irq = res;
#endif
return 0; return 0;
} }

4
drivers/watchdog/bcm47xx_wdt.c
View file

@ -55,17 +55,21 @@ static inline void bcm47xx_wdt_hw_start(void)
{ {
/* this is 2,5s on 100Mhz clock and 2s on 133 Mhz */ /* this is 2,5s on 100Mhz clock and 2s on 133 Mhz */
switch (bcm47xx_bus_type) { switch (bcm47xx_bus_type) {
#ifdef CONFIG_BCM47XX_SSB
case BCM47XX_BUS_TYPE_SSB: case BCM47XX_BUS_TYPE_SSB:
ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 0xfffffff); ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 0xfffffff);
break; break;
#endif
} }
} }
static inline int bcm47xx_wdt_hw_stop(void) static inline int bcm47xx_wdt_hw_stop(void)
{ {
switch (bcm47xx_bus_type) { switch (bcm47xx_bus_type) {
#ifdef CONFIG_BCM47XX_SSB
case BCM47XX_BUS_TYPE_SSB: case BCM47XX_BUS_TYPE_SSB:
return ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 0); return ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 0);
#endif
} }
return -EINVAL; return -EINVAL;
} }