Linus Torvalds
4964e0664c
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
...
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (119 commits)
MIPS: Delete unused function add_temporary_entry.
MIPS: Set default pci cache line size.
MIPS: Flush huge TLB
MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM.
MIPS: Octeon: Add support for OCTEON II PCIe
MIPS: Octeon: Update PCI Latency timer and enable more error reporting.
MIPS: Alchemy: Update cpu-feature-overrides
MIPS: Alchemy: db1200: Improve PB1200 detection.
MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.
MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller
MIPS: Alchemy: irq: register pm at irq init time
MIPS: Alchemy: Touchscreen support on DB1100
MIPS: Alchemy: Hook up IrDA on DB1000/DB1100
net/irda: convert au1k_ir to platform driver.
MIPS: Alchemy: remove unused board headers
MTD: nand: make au1550nd.c a platform_driver
MIPS: Netlogic: Mark Netlogic chips as SMT capable
MIPS: Netlogic: Add support for XLP 3XX cores
MIPS: Netlogic: Merge some of XLR/XLP wakup code
MIPS: Netlogic: Add default XLP config.
...
Fix up trivial conflicts in arch/mips/kernel/{perf_event_mipsxx.c,
traps.c} and drivers/tty/serial/Makefile
2012-01-14 13:05:21 -08:00
Jonas Gorski
f4aa7adb8b
MIPS: BCM63XX: use the new bcm63xxpart parser
...
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com >
Acked-by: Florian Fainelli <florian@openwrt.org >
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@linux.intel.com >
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com >
2012-01-09 18:16:25 +00:00
Florian Fainelli
b15a6d62b5
MIPS: BCM63XX: generate WLAN MAC address after registering ethernet devices.
...
In case the MAC address pool is not big enough to also register a WLAN device
prefer registering the Ethernet devices.
[ralf@linux-mips.org: Fixed formatting as per Sergei's complaint.]
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3013/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-12-07 22:03:04 +00:00
Florian Fainelli
e1c96c8620
MIPS: BCM63xx: Remove BCM6345 hacks to read base boot address
...
Though BCM6345 does not technically have the same MPI register layout
than the other SoCs, reading the chip-select registers is done the same
way, and particularly for chip-select 0, which is the boot flash.
Signed-off-by: Florian Fainelli <florian@openwrt.org >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3009/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-12-07 22:03:04 +00:00
Hauke Mehrtens
b3ae52b6b0
SSB: Change fallback sprom to callback mechanism.
...
Some embedded devices like the Netgear WNDR3300 have two SSB based cards
without an own sprom on the pci bus. We have to provide two different
fallback sproms for these and this was not possible with the old solution.
In the bcm47xx architecture the sprom data is stored in the nvram in the
main flash storage. The architecture code will be able to fill the sprom
with the stored data based on the bus where the device was found.
The bcm63xx code should do the same thing as before, just using the new
API.
Acked-by: Michael Buesch <mb@bu3sch.de >
Cc: netdev@vger.kernel.org
Cc: linux-wireless@vger.kernel.org
Cc: Florian Fainelli <florian@openwrt.org >
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2362/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-05-19 09:55:47 +01:00
matt mooney
e3726304a2
mips: change to new flag variable
...
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com >
Acked-by: WANG Cong <xiyou.wangcong@gmail.com >
Signed-off-by: Michal Marek <mmarek@suse.cz >
2011-03-17 14:02:56 +01:00
Florian Fainelli
5e3644a95d
MIPS: BCM63xx: Fix build failure in board_bcm963xx.c
...
Since 2083e8327aeeaf818b0e4522a9d2539835c60423, the SPROM is now registered
in the board_prom_init callback, but it references variables and functions
which are declared below. Move the variables and functions above
board_prom_init.
Signed-off-by: Florian Fainelli <ffainelli@freebox.fr >
To: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/1077/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-04-12 17:26:20 +01:00
Florian Fainelli
e23a90eb73
MIPS: BCM63xx: Register SSB SPROM fallback in board's first stage callback
...
Signed-off-by: Florian Fainelli <ffainelli@freebox.fr >
To: Maxime Bizon <mbizon@freebox.fr >
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/1017/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-04-12 17:26:18 +01:00
Maxime Bizon
524ef29cff
MIPS: BCM63xx: Add support for second uart.
...
The BCm63xx SOC has two uarts. Some boards use the second one for
bluetooth. This patch changes platform device registration code to
handle this. Changes to the UART driver were already merged in
6a2c7eabfd
.
Signed-off-by: Maxime Bizon <mbizon@freebox.fr >
To: linux-mips@linux-mips.org
Cc: Maxime Bizon <mbizon@freebox.fr >
Patchwork: http://patchwork.linux-mips.org/patch/900/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-04-12 17:26:18 +01:00
Florian Fainelli
f29b7cac19
MIPS: BCM63xx: Add DWVS0 board
...
The DWVS0 board is a BCM6358-based board with an on-board OHCI controler.
Signed-off-by: Florian Fainelli <florian@openwrt.org >
To: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/1015/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-04-12 17:26:17 +01:00
Florian Fainelli
2e6ad9a958
MIPS: BCM63xx: Add the RTA1025W-16 BCM6348-based board to suppported boards.
...
Signed-off-by: Florian Fainelli <florian@openwrt.org >
To: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/1014/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-04-12 17:26:17 +01:00
Ralf Baechle
e0e53dee69
MIPS: Nuke trailing blank lines
...
Recent git versions now warn about those and they've always been a bit of
an annoyance.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-02-27 12:53:14 +01:00
Florian Fainelli
05c694681e
MIPS: BCM63xx: Fix whitespace damaged board_bcm963xx.c
...
Signed-off-by: Florian Fainelli <ffainelli@freebox.fr >
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-01-12 18:19:30 +01:00
Florian Fainelli
6c1e7a5ad9
MIPS: BCM63xx: Make bcm63xx_uart_register an initfunc
...
This patch removes the calls to bcm63xx_uart_register in board_bcm963xx.c
and make bcm63xx_uart_register an initfunc. Allows us to remove
bcm63xx_dev_uart.h which was there to make checkpatch.pl happy.
Signed-off-by: Florian Fainelli <florian@openwrt.org >
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2009-11-02 12:00:03 +01:00
Maxime Bizon
553d6d5f5b
MIPS: BCM63xx: Add PCMCIA & Cardbus support.
...
Signed-off-by: Maxime Bizon <mbizon@freebox.fr >
Reviewed-by: Wolfram Sang <w.sang@pengutronix.de >
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2009-09-30 21:47:01 +02:00
Maxime Bizon
9fcd66e572
MIPS: BCM63xx: Add serial driver for bcm63xx integrated UART.
...
Signed-off-by: Maxime Bizon <mbizon@freebox.fr >
Acked-by: Greg Kroah-Hartman <gregkh@suse.de >
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2009-09-30 21:46:59 +02:00
Huang Weiyi
6fae5311a9
MIPS: BCM63xx: Remove duplicated #include
...
Remove duplicated #include in arch/mips/bcm63xx/boards/board_bcm963xx.c.
Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com >
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2009-09-30 21:46:58 +02:00
Maxime Bizon
e7300d04bd
MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.
...
Signed-off-by: Maxime Bizon <mbizon@freebox.fr >
Signed-off-by: Florian Fainelli <florian@openwrt.org >
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2009-09-17 20:07:52 +02:00