summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2008-10-20176-1219/+13195
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (112 commits) sh: Move SH-4 CPU headers down one more level. sh: Only build in gpio.o when CONFIG_GENERIC_GPIO is selected. sh: Migrate common board headers to mach-common/. sh: Move the CPU definition headers from asm/ to cpu/. serial: sh-sci: Add support SCIF of SH7723 video: add sh_mobile_lcdc platform flags video: remove unused sh_mobile_lcdc platform data sh: remove consistent alloc cruft sh: add dynamic crash base address support sh: reduce Migo-R smc91x overruns sh: Fix up some merge damage. Fix debugfs_create_file's error checking method for arch/sh/mm/ Fix debugfs_create_dir's error checking method for arch/sh/kernel/ sh: ap325rxa: Add support RTC RX-8564LC in AP325RXA board sh: Use sh7720 GPIO on magicpanelr2 board sh: Add sh7720 pinmux code sh: Use sh7203 GPIO on rsk7203 board sh: Add sh7203 pinmux code sh: Use sh7723 GPIO on AP325RXA board sh: Add sh7723 pinmux code ...
| * sh: Move SH-4 CPU headers down one more level.Paul Mundt2008-10-202-0/+0
| | | | | | | | | | | | | | These accidentally got placed in to cpu-sh4 instead of cpu-sh4/cpu, push them down one more level. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: Only build in gpio.o when CONFIG_GENERIC_GPIO is selected.Paul Mundt2008-10-202-2/+4
| | | | | | | | | | | | | | | | | | The pinmux management is tied in to this code, while it is presently only used by platforms that select GENERIC_GPIO. The asm/gpio.h definitions are not referenced when GENERIC_GPIO is disabled, resulting in a build failure for all of the platforms that don't select it. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: Migrate common board headers to mach-common/.Paul Mundt2008-10-2058-42/+45
| | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: Move the CPU definition headers from asm/ to cpu/.Paul Mundt2008-10-2011-7/+7
| | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * serial: sh-sci: Add support SCIF of SH7723Nobuhiro Iwamatsu2008-10-201-1/+8
| | | | | | | | | | | | | | | | | | | | SH7723 has two types of SCIF (SCIF and SCIFA). The current sh-sci driver supports only SCIFA, and calculation methods of SCBRR are different. This patch support this methods. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * video: add sh_mobile_lcdc platform flagsMagnus Damm2008-10-202-0/+12
| | | | | | | | | | | | | | Add platform data flags for detailed lcd display configuration. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * video: remove unused sh_mobile_lcdc platform dataMagnus Damm2008-10-202-2/+0
| | | | | | | | | | | | | | | | Remove lddckr from the platform data, these days we calculate the register value from clock source and clock dividers anyway. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: remove consistent alloc cruftMagnus Damm2008-10-201-10/+0
| | | | | | | | | | | | | | Remove left overs from the generic declared coherent rework. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: add dynamic crash base address supportMagnus Damm2008-10-201-6/+9
| | | | | | | | | | | | | | Add support for dynamic crash kernel base address. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: reduce Migo-R smc91x overrunsMagnus Damm2008-10-202-2/+6
| | | | | | | | | | | | | | | | Improve Migo-R ethernet performance by reducing smc91x overruns. This is done by enabling SMC91X_NOWAIT and optimizing CS4 setup. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: Fix up some merge damage.Paul Mundt2008-10-202-1/+3
| | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * Merge branch 'master' of ↵Paul Mundt2008-10-206752-170612/+537293
| |\ | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: Documentation/kernel-parameters.txt arch/sh/include/asm/elf.h
| * \ Merge branch 'sh/gpiolib'Paul Mundt2008-10-2022-100/+8144
| |\ \
| | * | sh: Use sh7720 GPIO on magicpanelr2 boardMagnus Damm2008-10-202-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch hooks up the magicpanelr2 board with the sh7720 pinmux code. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: Add sh7720 pinmux codeMagnus Damm2008-10-203-0/+1420
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds pinmux and gpio support for the sh7720 processor. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: Use sh7203 GPIO on rsk7203 boardMagnus Damm2008-10-202-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the rsk7203 board use the newly added sh7203 pinmux code. Only a single LED plus the serial console pins for now. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: Add sh7203 pinmux codeMagnus Damm2008-10-203-0/+1747
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds pinmux and gpio support for the sh7203 processor. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: Use sh7723 GPIO on AP325RXA boardMagnus Damm2008-10-202-26/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enables the GPIO code on AP325RXA and converts the code from register based pinmux configuration to GPIO based pin by pin setup. While at it 2 LEDs and one switch are added and exported to user space. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: Add sh7723 pinmux codeMagnus Damm2008-10-203-0/+2164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds pinmux and gpio support for the sh7723 processor. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: Use sh7722 GPIO on Migo-R boardMagnus Damm2008-10-203-69/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enables the GPIO code on Migo-R and converts the code from register based pinmux configuration to GPIO based pin by pin setup. Fix whitespace damage while at it and add 2 LEDs and export them to user space. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: Add sh7722 pinmux codeMagnus Damm2008-10-203-0/+1997
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds pinmux and gpio support for the sh7722 processor. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: GPIO and pinmux base codeMagnus Damm2008-10-205-4/+593
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds gpio code together with the pinmux table parser. In the future we should optimize this and switch back to gpiolib. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | Fix debugfs_create_file's error checking method for arch/sh/mm/Zhaolei2008-10-202-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debugfs_create_file() returns NULL if an error occurs, returns -ENODEV when debugfs is not enabled in the kernel. Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | Fix debugfs_create_dir's error checking method for arch/sh/kernel/Zhaolei2008-10-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debugfs_create_dir() returns NULL if an error occurs, returns -ENODEV when debugfs is not enabled in the kernel. Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: ap325rxa: Add support RTC RX-8564LC in AP325RXA boardNobuhiro Iwamatsu2008-10-201-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | Renesas AP325RXA board has Epson RX-8564LC of RTC. This patch supports RTC of this board. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: More I/O routine overhauling.Paul Mundt2008-10-036-232/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tidies up a lot of the PIO/MMIO split. No in-tree platforms were making use of the MMIO overloading through the machvec (nor have any of them been in some time), so we just kill all of that off. The ISA I/O routine wrapping remains unaffected, which remains the only special casing outside of the iomap API that boards need to think about. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | Merge branch 'sh/g3-prep'Paul Mundt2008-10-0216-175/+197
| |\ \
| | * | video: sh_mobile_lcdcfb: Support HAVE_CLK=n configurations.Paul Mundt2008-10-016-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This provides a workaround for users of sh_mobile_lcdcfb that don't define HAVE_CLK and have otherwise sane clock initialization. At the same time, move the sh_mobile_lcdc.h header to include/video/. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: Move the shared INTC code out to drivers/sh/Paul Mundt2008-10-015-93/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The INTC code will be re-used across different architectures, so move this out to drivers/sh/ and include/linux/sh_intc.h respectively. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | serial: sh-sci: Handle the general UPF_IOREMAP case.Paul Mundt2008-10-012-18/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Presently we don't do much with UPF_IOREMAP other than special case it for SH-5's onchip_remap() on the early console. Tie this in generically for platforms that need the remap. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: Use __raw_xxx() I/O accessors for INTC and IPR.Paul Mundt2008-10-012-14/+14
| | | | | | | | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: Fix up the __raw_read/writeX() definitions.Paul Mundt2008-10-012-45/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These were doing largely bogus things and using the wrong typing for the address. Bring these in line with the ARM definitions. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | serial: sh-sci: Dynamic clock management depends on HAVE_CLK.Paul Mundt2008-10-022-31/+16
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Presently this is conditionalized on sh, and disabled for sh64. Now that SH-5 ties in to the clock framework, the sh64 exception can be dropped. Additionally, ARM will want to use the same hooks once SH-Mobile G3 grows clock framework support, so switch these paths over to HAVE_CLK now. Once the H8 and ARM sh-sci users hook up HAVE_CLK, the driver can be switched over to having an outright dependency on it and the ifdefs can go away. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Use clk fwk for preset lpj on sh64, too.Paul Mundt2008-09-291-1/+0
| | | | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: SH-5 clk fwk support.Paul Mundt2008-09-293-161/+91
| | | | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: sh_ksyms_64 needs __strncpy_from_user() definition.Paul Mundt2008-09-291-0/+2
| | | | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Fix up signal_64 cast warnings.Paul Mundt2008-09-291-2/+2
| | | | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Fix up uaccess_64 put/get_user() cast warnings.Paul Mundt2008-09-291-8/+16
| | | | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Force pending restarted system calls to return -EINTR.Paul Mundt2008-09-242-6/+18
| | | | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: ap325rxa: create CPLD data area in mtdNobuhiro Iwamatsu2008-09-241-10/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | AP320 and AP325RXA has CPLD data in NOR Flash. If this area erased, this board can not boot. This patch create CPLD data area and set writeable mask bit. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Add FPU registers to regset interface.Paul Mundt2008-09-215-9/+108
| | | | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Add missing asm/ftrace.h.Paul Mundt2008-09-211-0/+8
| | | | | | | | | | | | | | | | | | This was missed with the ftrace support commit.. check it in now. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | doc: Add remaining SH parameters to kernel-parameters.txt.Paul Mundt2008-09-211-1/+11
| | | | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: ftrace support.Paul Mundt2008-09-214-0/+54
| | | | | | | | | | | | | | | | | | | | | This adds support for ftrace to SH. This only includes CONFIG_FTRACE, and does not handle dynamic ftrace presently. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Trivial trace_mark() instrumentation for core events.Paul Mundt2008-09-214-28/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements a few trace points across events that are deemed interesting. This implements a number of trace points: - The page fault handler / TLB miss - IPC calls - Kernel thread creation The original LTTng patch had the slow-path instrumented, which fails to account for the vast majority of events. In general placing this in the fast-path is not a huge performance hit, as we don't take page faults for kernel addresses. The other bits of interest are some of the other trap handlers, as well as the syscall entry/exit (which is better off being handled through the tracehook API). Most of the other trap handlers are corner cases where alternate means of notification exist, so there is little value in placing extra trace points in these locations. Based on top of the points provided both by the LTTng instrumentation patch as well as the patch shipping in the ST-Linux tree, albeit in a stripped down form. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Kill off duplicate page fault notifiers in slow path.Paul Mundt2008-09-211-7/+4
| | | | | | | | | | | | | | | | | | | | | We already have hooks in place in the __do_page_fault() fast-path, so kill them off in the slow path. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Look up the trap vector for the page fault notifier.Paul Mundt2008-09-211-9/+4
| | | | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: Move lookup_exception_vector() out to asm/system_32.h.Paul Mundt2008-09-212-12/+29
| | | | | | | | | | | | | | | | | | | | | | | | There are other places where we want to have access to the trap/exception number, so move out the lookup_exception_vector() helper. While we're at it, refactor it slightly to return the vector instead. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: edosk7760: Correct size of bootloader flash partition.Luca Santini2008-09-211-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is 256K instead of 1M. [ Converted to use asm/sizes.h. -- PFM ] Signed-off-by: Luca Santini <luca.santini@spesonline.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>