Ralf Baechle
f1b6a5054c
MIPS: JZ4740: Fix GCC 4.6.0 build error.
...
CC arch/mips/jz4740/dma.o
arch/mips/jz4740/dma.c: In function 'jz4740_dma_chan_irq':
arch/mips/jz4740/dma.c:245:11: error: variable 'status' set but not used [-Werro
r=unused-but-set-variable]
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-05-10 18:15:26 +01:00
Lucas De Marchi
25985edced
Fix common misspellings
...
Fixes generated by 'codespell' and manually reviewed.
Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi >
2011-03-31 11:26:23 -03:00
Thomas Gleixner
e4ec7989b4
MIPS: Convert the irq functions to the new names
...
Scripted with coccinelle.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
2011-03-29 14:48:07 +02:00
Lars-Peter Clausen
c8fb4022cf
MIPS: JZ4740: Set nand ecc offsets for the qi_lb60 board
...
The jz4740 nand driver now requires that the ecc offsets are set.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/2058/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:21 +01:00
Lars-Peter Clausen
0b4cf1813f
MIPS: JZ4740: qi_lb60: Add gpio-charger device
...
Register the gpio-charger device which reports whether device is currently
charging or not.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/2059/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:21 +01:00
Lars-Peter Clausen
fe92a23826
MIPS: JZ4740: Cleanup the mechanical irq_chip conversion
...
The conversion did not make use of the new chip flag which signals the
core code to mask the chip before calling the set_type callback. Sigh.
Use the new lockdep helper as well.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2183/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:16 +01:00
Lars-Peter Clausen
cd11d14de9
MIPS: JZ4740: GPIO: Use shared irq chip for all gpios
...
Currently there is one irq_chip per gpio_chip with the only difference
being the name. Since the information whether the irq belong to GPIO
bank A, B, C or D is not that important rewrite the code to simply use
a single irq_chip for all gpio_chips.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2182/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:16 +01:00
Thomas Gleixner
42b64f388c
MIPS: JZ4740: Convert to new irq functions
...
Convert the JZ4740 intc and gpio irq chips to use newstyle irq functions.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2181/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-03-25 18:45:16 +01:00
Linus Torvalds
a44f99c7ef
Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
...
* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits)
video: change to new flag variable
scsi: change to new flag variable
rtc: change to new flag variable
rapidio: change to new flag variable
pps: change to new flag variable
net: change to new flag variable
misc: change to new flag variable
message: change to new flag variable
memstick: change to new flag variable
isdn: change to new flag variable
ieee802154: change to new flag variable
ide: change to new flag variable
hwmon: change to new flag variable
dma: change to new flag variable
char: change to new flag variable
fs: change to new flag variable
xtensa: change to new flag variable
um: change to new flag variables
s390: change to new flag variable
mips: change to new flag variable
...
Fix up trivial conflict in drivers/hwmon/Makefile
2011-03-20 18:14:55 -07: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
Paul Cercueil
f865c35224
watchdog: add JZ4740 watchdog driver
...
Adds support for the hardware watchdog found in Ingenic's jz4740
System-on-Chip.
Signed-off-by: Paul Cercueil <paul@crapouillou.net >
Signed-off-by: Wim Van Sebroeck <wim@iguana.be >
2011-03-15 16:01:44 +00:00
John Stultz
75c4fd8c78
mips: convert to clocksource_register_hz/khz
...
This converts the mips clocksources to use clocksource_register_hz/khz
CC: Ralf Baechle <ralf@linux-mips.org >
CC: Thomas Gleixner <tglx@linutronix.de >
Signed-off-by: John Stultz <johnstul@us.ibm.com >
2011-02-21 13:33:50 -08:00
Jiri Kosina
4b7bd36470
Merge branch 'master' into for-next
...
Conflicts:
MAINTAINERS
arch/arm/mach-omap2/pm24xx.c
drivers/scsi/bfa/bfa_fcpim.c
Needed to update to apply fixes for which the old branch was too
outdated.
2010-12-22 18:57:02 +01:00
Lars-Peter Clausen
4afdea8182
MIPS: JZ4740: Fix pcm device name
...
As part the ASoC multi-component patch (commit f0fba2ad
) the jz4740 pcm
driver was renamed to 'jz4740-pcm-audio'. Adjust the device name
accordingly.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1770/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-12-16 18:10:57 +00:00
Lars-Peter Clausen
1d210386f6
MIPS: jz4740: Fix section mismatch in prom.c
...
This patch fixes the following section mismatch:
WARNING: arch/mips/built-in.o(.text+0xc): Section mismatch in reference from the
function jz4740_init_cmdline() to the variable .init.data:arcs_cmdline
While were at it, make jz4740_init_cmdline static as well.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/1755/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-12-16 18:10:53 +00:00
Lars-Peter Clausen
fe749aab1d
MIPS: jz4740: qi_lb60: Fix gpio for the 6th row of the keyboard matrix
...
This patch fixes the gpio number for the 6th row of the keyboard matrix.
(And fixes a typo in my name...)
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: linux-mips@linux-mips.org
Cc: stable@kernel.org
Signed-off-by: https://patchwork.linux-mips.org/patch/1754/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-12-16 18:10:53 +00:00
Lionel Debroux
2f55ac072f
suspend: constify platform_suspend_ops
...
While at it, fix two checkpatch errors.
Several non-const struct instances constified by this patch were added after
the introduction of platform_suspend_ops in checkpatch.pl's list of "should
be const" structs (79404849e9
).
Patch against mainline.
Inspired by hunks of the grsecurity patch, updated for newer kernels.
Signed-off-by: Lionel Debroux <lionel_debroux@yahoo.fr >
Acked-by: Ingo Molnar <mingo@elte.hu >
Signed-off-by: Jiri Kosina <jkosina@suse.cz >
2010-11-16 14:14:02 +01:00
Uwe Kleine-König
b595076a18
tree-wide: fix comment/printk typos
...
"gadget", "through", "command", "maintain", "maintain", "controller", "address",
"between", "initiali[zs]e", "instead", "function", "select", "already",
"equal", "access", "management", "hierarchy", "registration", "interest",
"relative", "memory", "offset", "already",
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de >
Signed-off-by: Jiri Kosina <jkosina@suse.cz >
2010-11-01 15:38:34 -04:00
David Daney
08be7b2bc7
MIPS: jz4740: Fix Kbuild Platform file.
...
The platform specific files should be included via the platform-y
variable.
Signed-off-by: David Daney <ddaney@caviumnetworks.com >
Cc: Lars-Peter Clausen <lars@metafoo.de >
Patchwork: https://patchwork.linux-mips.org/patch/1719/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-10-19 18:32:39 +01:00
Lars-Peter Clausen
e6b78c4f22
MIPS: JZ4740: Add qi_lb60 board support
...
Add support for the qi_lb60 (a.k.a QI Ben NanoNote) clamshell device.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1472/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-08-05 13:26:20 +01:00
Lars-Peter Clausen
5ebabe5980
MIPS: JZ4740: Add Kbuild files
...
Add the Kbuild files for the JZ4740 architecture and adds JZ4740 support
to the MIPS Kbuild files.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1406/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-08-05 13:26:17 +01:00
Lars-Peter Clausen
c2a529f73d
MIPS: JZ4740: Add platform devices
...
Add platform devices for all the JZ4740 platform drivers.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1469/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-08-05 13:26:17 +01:00
Lars-Peter Clausen
a8b7e9e8b0
MIPS: JZ4740: Add prom support
...
Add support for initializing arcs_cmdline on JZ4740 based machines and
provides a prom_putchar implementation.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1404/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-08-05 13:26:16 +01:00
Lars-Peter Clausen
c3b9566de8
MIPS: JZ4740: Add serial support
...
The JZ4740 UART interface is almost 16550 compatible.
The UART module needs to be enabled by setting a bit in the FCR register
and it has support for receive timeout interrupts. Instead of adding yet
another machine specific quirk to the 8250 serial driver we provide a
serial_out implementation which sets the required additional flags.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1403/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-08-05 13:26:16 +01:00
Lars-Peter Clausen
eda0347bf8
MIPS: JZ4740: Add PWM support
...
Add support for the PWM part of the timer unit on a JZ4740 SoC.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1468/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-08-05 13:26:16 +01:00
Lars-Peter Clausen
68fcfe7f82
MIPS: JZ4740: Add DMA support.
...
Add support for DMA transfers on JZ4740 SoCs.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1401/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-08-05 13:26:15 +01:00
Lars-Peter Clausen
a55f450665
MIPS: JZ4740: Add GPIO support
...
Add gpiolib support for JZ4740 SoCs.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1467/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-08-05 13:26:15 +01:00
Lars-Peter Clausen
713233fbaf
MIPS: JZ4740: Add setup code
...
Add plat_mem_setup and get_system_type for JZ4740 SoCs.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1399/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-08-05 13:26:14 +01:00
Lars-Peter Clausen
c863a2368c
MIPS: JZ4740: Add power-management and system reset support
...
Add support for suspend/resume and poweroff/reboot on a JZ4740 SoC.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1398/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-08-05 13:26:14 +01:00
Lars-Peter Clausen
b200eff6d1
MIPS: JZ4740: Add clocksource/clockevent support.
...
Add clocksource and clockevent support for the timer/counter unit on
JZ4740 SoCs.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1397/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-08-05 13:26:14 +01:00
Lars-Peter Clausen
544a732419
MIPS: JZ4740: Add timer support
...
Add support for the timer/counter unit on a JZ4740 SoC. This code is used
as a common base for the JZ4740 clocksource/clockevent implementation and
PWM support.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1396/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-08-05 13:26:13 +01:00
Lars-Peter Clausen
9869848d12
MIPS: JZ4740: Add IRQ handler code
...
Add support for IRQ handling on a JZ4740 SoC.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1465/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-08-05 13:26:13 +01:00
Lars-Peter Clausen
570a0bb82f
MIPS: JZ4740: Add clock API support.
...
Add support for managing the clocks found on JZ4740 SoC through the
Linux clock API.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1466/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2010-08-05 13:26:12 +01:00