aboutsummaryrefslogtreecommitdiff
path: root/arch/sh/kernel/cpu
AgeCommit message (Collapse)AuthorFilesLines
2012-08-01sh: sh7724: fixup renesas_usbhs clock settingsKuninori Morimoto1-2/+2
8cc88a55b03bd4940390125c2521c99368513be5 (sh: sh7724: use runtime PM implementation) broke sh7724 clocks. renesas_usbhs needs HWBLK_USB0/1 clock on sh7724 Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2012-07-26sh: modify the sh_dmae_slave_config for RSPI in setup-sh7757Shimoda, Yoshihiro1-0/+14
Modify the sh7757_dmae1_slave to add paramters of RSPI's slave_id. Signed-off-by: Yoshihiro Shimoda <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2012-07-24Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds1-1/+0
Pull slave-dmaengine update from Vinod Koul: "This time we have a new dmaengine driver from the tegra folks. Also we have Guennadi's cleanup of sh drivers which incudes a library for sh drivers. And the usual odd fixes in bunch of drivers and some nice cleanup of dw_dmac from Andy." Fix up conflicts in drivers/mmc/host/sh_mmcif.c * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (46 commits) dmaengine: Cleanup logging messages mmc: sh_mmcif: switch to the new DMA channel allocation and configuration dma: sh: provide a migration path for slave drivers to stop using .private dma: sh: use an integer slave ID to improve API compatibility dmaengine: shdma: prepare to stop using struct dma_chan::private sh: remove unused DMA device pointer from SIU platform data ASoC: siu: don't use DMA device for channel filtering dmaengine: shdma: (cosmetic) simplify a static function dmaengine: at_hdmac: add a few const qualifiers dw_dmac: use 'u32' for LLI structure members, not dma_addr_t dw_dmac: mark dwc_dump_lli inline dma: mxs-dma: Export missing symbols from mxs-dma.c dma: shdma: convert to the shdma base library ASoC: fsi: prepare for conversion to the shdma base library usb: renesas_usbhs: prepare for conversion to the shdma base library ASoC: siu: prepare for conversion to the shdma base library serial: sh-sci: prepare for conversion to the shdma base library mmc: sh_mobile_sdhi: prepare for conversion to the shdma base library mmc: sh_mmcif: remove unneeded struct sh_mmcif_dma, prepare to shdma conversion dma: shdma: prepare for conversion to the shdma base library ...
2012-07-23Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-shLinus Torvalds1-22/+41
Pull SuperH updates from Paul Mundt: - Migration off of old-style dynamic IRQ API. - irqdomain and generic irq chip propagation. - div4/6 clock consolidation, another step towards co-existing with the common struct clk infrastructure. - Extensive PFC rework - Decoupling GPIO from pin state. - Initial pinctrl support to facilitate incremental migration off of legacy pinmux. - gpiolib support made optional, and made pinctrl-backed. * tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: (38 commits) sh: pfc: pin config get/set support. sh: pfc: Prefer DRV_NAME over KBUILD_MODNAME. sh: pfc: pinctrl legacy group support. sh: pfc: Ignore pinmux GPIOs with invalid enum IDs. sh: pfc: Export pinctrl binding init symbol. sh: pfc: Error out on pinctrl init resolution failure. sh: pfc: Make pr_fmt consistent across pfc drivers. sh: pfc: pinctrl legacy function support. sh: pfc: Rudimentary pinctrl-backed GPIO support. sh: pfc: Dumb GPIO stringification. sh: pfc: Shuffle PFC support core. sh: pfc: Verify pin type encoding size at build time. sh: pfc: Kill off unused pinmux bias flags. sh: pfc: Make gpio chip support optional where possible. sh: pfc: Split out gpio chip support. sh64: Fix up section mismatch warnings. sh64: Attempt to make reserved insn trap handler resemble C. sh: Consolidate die definitions for trap handlers. sh64: Kill off old exception debugging helpers. sh64: Use generic unaligned access control/counters. ...
2012-07-20Merge branch 'common/pinctrl' into sh-latestPaul Mundt10-10/+10
2012-07-20sh: remove unused DMA device pointer from SIU platform dataGuennadi Liakhovetski1-1/+0
The SIU ALSA driver is not using the DMA device pointer for DMA channel filtering any more, it can be now removed. Signed-off-by: Guennadi Liakhovetski <[email protected]> Cc: Paul Mundt <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2012-07-02sh: Fix up se7721 GPIOLIB=y build warnings.Paul Mundt1-1/+1
Presently the SH7720/21 serial code uses asm/gpio.h to get at the CPU GPIO port definitions, but in the case of GPIOLIB=y this also includes references to generic GPIOLIB routines that we don't have any function declarations for, tripping up on -Werror=implicit-function-declaration with newer gcc versions: CC arch/sh/kernel/cpu/sh3/serial-sh7720.o In file included from include/linux/sh_pfc.h:14:0, from arch/sh/include/asm/gpio.h:23, from arch/sh/kernel/cpu/sh3/serial-sh7720.c:5: include/asm-generic/gpio.h: In function 'gpio_get_value_cansleep': include/asm-generic/gpio.h:220:2: error: implicit declaration of function '__gpio_get_value' [-Werror=implicit-function-declaration] include/asm-generic/gpio.h: In function 'gpio_set_value_cansleep': include/asm-generic/gpio.h:226:2: error: implicit declaration of function '__gpio_set_value' [-Werror=implicit-function-declaration] In file included from arch/sh/include/asm/gpio.h:23:0, from arch/sh/kernel/cpu/sh3/serial-sh7720.c:5: include/linux/sh_pfc.h: At top level: include/linux/sh_pfc.h:121:19: error: field 'chip' has incomplete type Switch to using the cpu/ version for the port definitions explicitly. Signed-off-by: Paul Mundt <[email protected]>
2012-06-28sh: Convert sh_clk_mstp32_register to sh_clk_mstp_registerNobuhiro Iwamatsu10-10/+10
sh_clk_mstp32_register is deprecated. This convert to sh_clk_mstp_register. Signed-off-by: Nobuhiro Iwamatsu <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2012-06-13Merge branch 'sh/multi-unwinders' into sh-latestPaul Mundt1-22/+41
2012-06-13sh: use the new generic strnlen_user() functionPaul Mundt1-41/+0
This discards both the _32 and _64 versions in favour of the consolidated generic one. Signed-off-by: Paul Mundt <[email protected]>
2012-06-13sh: switch to generic strncpy_from_user().Paul Mundt1-41/+0
This kills off the special sh32/64 versions and adopts the generic version. It should be possible to optimize this for SH-4A unaligned loads, but this is a corner case that can be supported incrementally. Signed-off-by: Paul Mundt <[email protected]>
2012-05-24sh64: Convert to unwinder API.Paul Mundt1-22/+41
This switches over to use the sh unwinder API which brings it all in line with the general sh routines (which we shuffle around at the same time), and lets us kill off more sh64-specific cruft. Signed-off-by: Paul Mundt <[email protected]>
2012-05-22sh: intc: Kill off special reservation interface.Paul Mundt1-3/+0
At present reserving the IRLs in the IRQ bitmap in addition to the dropping of the legacy IRQ pre-allocation prevent IRL IRQs from being allocated for the x3proto board. The only reason to permit reservations was to lock down possible hardware vectors prior to dynamic IRQ scanning, but this doesn't matter much given that the hardware controller configuration is sorted before we get around to doing any dynamic IRQ allocation anyways. Beyond that, all of the tables are __init annotated, so quite a bit more work would need to be done to support reconfiguring things like IRL controllers on the fly, much more than would ever make it worth the hassle. Signed-off-by: Paul Mundt <[email protected]>
2012-05-18Merge branch 'sh/evt2irq-migration' into sh-latestPaul Mundt19-289/+346
Conflicts: arch/sh/kernel/cpu/sh3/setup-sh770x.c arch/sh/kernel/cpu/sh3/setup-sh7710.c arch/sh/kernel/cpu/sh3/setup-sh7720.c arch/sh/kernel/cpu/sh4/setup-sh7750.c arch/sh/kernel/cpu/sh4a/setup-sh7343.c arch/sh/kernel/cpu/sh4a/setup-sh7366.c arch/sh/kernel/cpu/sh4a/setup-sh7722.c arch/sh/kernel/cpu/sh4a/setup-sh7723.c arch/sh/kernel/cpu/sh4a/setup-sh7724.c arch/sh/kernel/cpu/sh4a/setup-sh7757.c arch/sh/kernel/cpu/sh4a/setup-sh7763.c arch/sh/kernel/cpu/sh4a/setup-sh7770.c arch/sh/kernel/cpu/sh4a/setup-sh7785.c arch/sh/kernel/cpu/sh4a/setup-sh7786.c Signed-off-by: Paul Mundt <[email protected]>
2012-05-18sh: sh7720 evt2irq migration.Paul Mundt1-15/+17
Migrate SH7720 to evt2irq() backed hwirq lookups. Signed-off-by: Paul Mundt <[email protected]>
2012-05-18sh: sh7710/sh7712 evt2irq migration.Paul Mundt1-6/+7
Migrate SH7710/SH7712 to evt2irq() backed hwirq lookups. Signed-off-by: Paul Mundt <[email protected]>
2012-05-18sh: sh7706/sh7707/sh7709/sh7709 evt2irq migration.Paul Mundt1-7/+8
Migrate SH770x to evt2irq() backed hwirq lookups. Signed-off-by: Paul Mundt <[email protected]>
2012-05-18sh: sh7705 evt2irq migration.Paul Mundt1-6/+7
Migrate SH7705 to evt2irq() backed hwirq lookups. Signed-off-by: Paul Mundt <[email protected]>
2012-05-18sh: sh7760 evt2irq migration.Paul Mundt1-7/+19
Migrate SH7760 to evt2irq() backed hwirq lookups. Signed-off-by: Paul Mundt <[email protected]>
2012-05-18sh: sh7750 evt2irq migration.Paul Mundt1-8/+9
Migrate SH7750 to evt2irq() backed hwirq lookups. Signed-off-by: Paul Mundt <[email protected]>
2012-05-18sh: sh4-202 evt2irq migration.Paul Mundt1-4/+8
Migrate SH4-202 to evt2irq() backed hwirq lookups. Signed-off-by: Paul Mundt <[email protected]>
2012-05-18sh: sh-x3 evt2irq migration.Paul Mundt1-9/+19
Migrate SH-X3 to evt2irq() backed hwirq lookups. Signed-off-by: Paul Mundt <[email protected]>
2012-05-18sh: sh7785 evt2irq migration.Paul Mundt1-18/+25
Migrate SH7785 to evt2irq() backed hwirq lookups. Signed-off-by: Paul Mundt <[email protected]>
2012-05-18sh: sh7780 evt2irq migration.Paul Mundt1-15/+22
Migrate SH7780 to evt2irq() backed hwirq lookups. Signed-off-by: Paul Mundt <[email protected]>
2012-05-18sh: sh7770 evt2irq migration.Paul Mundt1-19/+20
Migrate SH7770 to evt2irq() backed hwirq lookups. Signed-off-by: Paul Mundt <[email protected]>
2012-05-18sh: sh7763 evt2irq migration.Paul Mundt1-14/+16
Migrate SH7763 to evt2irq() backed hwirq lookups. Signed-off-by: Paul Mundt <[email protected]>
2012-05-18sh: sh7757 evt2irq migration.Paul Mundt1-44/+44
Migrate SH7757 to evt2irq() backed hwirq lookups. Signed-off-by: Paul Mundt <[email protected]>
2012-05-18sh: sh7724 evt2irq migration.Paul Mundt1-38/+39
Migrate SH7724 to evt2irq() backed hwirq lookups. Signed-off-by: Paul Mundt <[email protected]>
2012-05-18sh: sh7723 evt2irq migration.Paul Mundt1-23/+24
Migrate SH7723 to evt2irq() backed hwirq lookups. Signed-off-by: Paul Mundt <[email protected]>
2012-05-18sh: sh7722 evt2irq migration.Paul Mundt1-23/+24
Migrate SH7722 to evt2irq() backed hwirq lookups. Signed-off-by: Paul Mundt <[email protected]>
2012-05-18sh: sh7366 evt2irq migration.Paul Mundt1-11/+12
Migrate SH7366 to evt2irq() backed hwirq lookups. Signed-off-by: Paul Mundt <[email protected]>
2012-05-18sh: sh7343 evt2irq migration.Paul Mundt1-15/+16
Migrate SH7343 to evt2irq() backed hwirq lookups. Signed-off-by: Paul Mundt <[email protected]>
2012-05-18sh: sh7786 evt2irq migration.Paul Mundt1-22/+25
This migrates SH7786 to evt2irq() backed hwirq lookup rather than using an open-coded calculation. This will make it possible to reposition the vector base at a later point in time. Signed-off-by: Paul Mundt <[email protected]>
2012-05-17sh: Fix mistake of the member variable of plat_sci_port for SH7343Nobuhiro Iwamatsu1-1/+1
The current code was going to initialize irq of plat_sci_port. Not irq, irqs is right. Signed-off-by: Nobuhiro Iwamatsu <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2012-05-14sh64: Invert page fault fast-path error path values.Paul Mundt1-1/+1
This brings the sh64 version in line with the sh32 one with regards to how errors are handled. Base work for further unification of the implementations. Signed-off-by: Paul Mundt <[email protected]>
2012-05-14sh64: Utilize thread fault code encoding.Paul Mundt1-11/+9
This plugs in fault code encoding for the sh64 page fault, too. Signed-off-by: Paul Mundt <[email protected]>
2012-05-14sh: Support thread fault code encoding.Paul Mundt1-5/+6
This provides a simple interface modelled after sparc64/m32r to encode the error code in the upper byte of thread_info for finer-grained handling in the page fault path. Signed-off-by: Paul Mundt <[email protected]>
2012-05-10sh: Fix up comment noise in sh7269 pinmux code.Paul Mundt1-1/+2
The build complains about a /* nested within a comment block, so just tidy up the formatting. Signed-off-by: Paul Mundt <[email protected]>
2012-05-10Merge branches 'sh/wdt' and 'sh/rsk-updates' into sh-latestPaul Mundt6-1/+3604
Conflicts: arch/sh/Kconfig Signed-off-by: Paul Mundt <[email protected]>
2012-05-10sh: Add pinmux for sh7269Phil Edworthy2-0/+2800
Signed-off-by: Phil Edworthy <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2012-05-10sh: Add sh7269 devicePhil Edworthy5-1/+804
This is an sh2a device (max 266MHz) with FPU, video display controller (VDC), 8 serial ports, 4 I2C channels, 3 CAN ports, SD and on-chip USB. Signed-off-by: Phil Edworthy <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2012-05-10Merge branch 'sh/rsk-updates' into sh-latestPaul Mundt6-0/+2901
Conflicts: arch/sh/Kconfig Signed-off-by: Paul Mundt <[email protected]>
2012-05-10sh: Add pinmux for sh7264Phil Edworthy2-0/+2137
Signed-off-by: Phil Edworthy <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2012-05-10sh: Add sh7264 devicePhil Edworthy5-0/+764
This is an sh2a device with FPU, video display controller (VDC), 8 serial ports, 3 I2C channels, 2 CAN ports, SD and on-chip USB. Signed-off-by: Phil Edworthy <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2012-04-19sh64: Kill off unused trap_no/error_code from thread_struct.Paul Mundt1-3/+0
While the trap number and error code are passed around for debugging purposes, this occurs wholly independently of the thread struct values. These values were never part of the sigcontext ABI and are thus never passed anywhere, so we can just kill them off across the board. Signed-off-by: Paul Mundt <[email protected]>
2012-04-17sh: Add support pinmux for SH7734Nobuhiro Iwamatsu2-0/+2498
Signed-off-by: Nobuhiro Iwamatsu <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2012-04-17sh: Add initial support for SH7734 CPU subtypeNobuhiro Iwamatsu5-1/+1073
This implements initial support for the SH7734. This adds support SCIF, TMU and RTC. Signed-off-by: Nobuhiro Iwamatsu <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2012-04-17sh: sh2: Change the specification method of IRQ to SCIx_IRQ_MUXEDNobuhiro Iwamatsu5-20/+20
Some SCIF devices specify the same IRQ. We can use SCIx_IRQ_MUXED for this. This is correction to the SH2/SH2A series. Signed-off-by: Nobuhiro Iwamatsu <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2012-04-17sh: sh3: Change the specification method of IRQ to SCIx_IRQ_MUXEDNobuhiro Iwamatsu4-9/+9
Some SCIF devices specify the same IRQ. We can use SCIx_IRQ_MUXED for this. And change use to evt2irq(), without specifying the value of IRQ directly. This is correction to the SH3 series. Signed-off-by: Nobuhiro Iwamatsu <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2012-04-17sh: sh4: Change the specification method of IRQ to SCIx_IRQ_MUXEDNobuhiro Iwamatsu1-2/+2
Some SCIF devices specify the same IRQ. We can use SCIx_IRQ_MUXED for this. And change use to evt2irq(), without specifying the value of IRQ directly. This is correction to the SH4 series. Signed-off-by: Nobuhiro Iwamatsu <[email protected]> Signed-off-by: Paul Mundt <[email protected]>