aboutsummaryrefslogtreecommitdiff
path: root/arch/sh
AgeCommit message (Collapse)Author
2009-04-27Merge branches 'sh/stable-updates' and 'sh/pci-rework'Paul Mundt
2009-04-27sh: sh7785lcr: fix defconfig for 29-bit modeYoshihiro Shimoda
Fix the problem that cannot work 29-bit mode when use sh7785lcr_defconfig. Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-26sh: convert to use __HEAD and HEAD_TEXT macros.Tim Abbott
This has the consequence of changing the section name use for head code from ".text.head" to ".head.text". Since this commit changes all users in the architecture, this change should be harmless. Signed-off-by: Tim Abbott <tabbott@mit.edu> Cc: Paul Mundt <lethal@linux-sh.org> Acked-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-04-24sh: pci: Fix up the build for CONFIG_PCI=n.Paul Mundt
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-22Merge branch 'master' of ↵Paul Mundt
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-04-21clocksource: pass clocksource to read() callbackMagnus Damm
Pass clocksource pointer to the read() callback for clocksources. This allows us to share the callback between multiple instances. [hugh@veritas.com: fix powerpc build of clocksource pass clocksource mods] [akpm@linux-foundation.org: cleanup] Signed-off-by: Magnus Damm <damm@igel.co.jp> Acked-by: John Stultz <johnstul@us.ibm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-04-21Merge branch 'sh/stable-updates' into sh/for-2.6.30Paul Mundt
2009-04-21sh: Fix mmap2 for handling differing PAGE_SIZEs.Toshinobu Sugioka
mmap2 uses a fixed page shift of 12, regardless of the PAGE_SIZE setting. Fix up the mmap2 code to add some sanity checks on the mapping, and to update pgoff accordingly. Error handling bits based on 4280e3126f641898f0ed1a931645373d3489e2a6 ("frv: fix mmap2 error handling"). Signed-off-by: Toshinobu Sugioka <sugioka@itonet.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Rename pci-new.c to pci.c.Paul Mundt
pci-new.c is now in a state to replace the old pci.c, rename it accordingly. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Roll pci-lib in to pci-new.Paul Mundt
Now that the pci-auto cruft is gone, pci-lib can go away. Roll it back in to pci-new.c where it originally split off from. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Kill off the last remnants of the now unused pci-auto code.Paul Mundt
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Move the se7751 fixups in to arch/sh/drivers/pci/.Paul Mundt
The se7751 was still doing the PCI fixups in its own board directory, so we move it over to arch/sh/drivers/pci/ with the rest of the board fixups. It has bitrotted significantly over the years, so will still likely need a bit of work to bring back up to date. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Convert dreamcast to new-style interface.Paul Mundt
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Consolidate lboxre2 and r2d IRQ fixups.Paul Mundt
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Rename SH7751 platform ops files to fixups.Paul Mundt
None of these contain pci_ops, only IRQ routing bits, rename them accordingly. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Rewrite SH7751 PCI support to follow SH7780.Paul Mundt
This follows the similar sort of scheme that the refactored SH7780 code uses, using a 64MB CS3 mapping to handle the window0 case, and simply discarding window1. This vastly simplifies the code, and allows most of the board-specific setup to go die. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Rename ops-cayman -> fixups-cayman.Paul Mundt
Now that ops-cayman.c only contains IRQ routing fixups, rename it. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Convert the SH-5 code over to the new interface.Paul Mundt
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Tidy up the dreamcast PCI support.Paul Mundt
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Kill off legacy ide quirks.Paul Mundt
These fixups seem to have bitrotted a bit since their introduction in the 2.4 days. As we never had much use for them in the first place, and nothing is using them any more, kill them off the rest of the way. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Consolidate pcibios_setup() in pci-lib.Paul Mundt
This wasn't really being used for anything useful, so just stub it in pci-lib. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Kill off dead references to is_pci_ioaddr and friends.Paul Mundt
Some old boards are still using this in their I/O routines, kill it off. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Flag the dreamcast BBA as IORESOURCE_PCI_FIXED.Paul Mundt
This isn't a real BAR, so prevent any attempts to move it, as we don't wish to encourage a bus luck by overzealous PCI initialization code. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Kill off superfluous lboxre2 pci fixups.Paul Mundt
This is a verbatim copy of the r2d one, use that instead. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Kill off the now unused hose->io_base.Paul Mundt
Nothing is using this any more, so kill it off. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Consolidate the remaining common bits.Paul Mundt
This moves the remaining common bits in to pci-lib. Thereby reducing pci.c/pci-new.c to simple bus fixups and controller registration. As more platforms are moved over, the old code will disappear completely and the pci-new bits will be rolled in to pci-lib, eventually replacing pci.c completely. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Consolidate bus<->resource mapping in pci-lib.Paul Mundt
Now that the io and mem offsets are tracked accordingly, the pci-new version of the bus<->resource mappers can be used generically. This moves them in to pci-lib. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Track io and mem_offset per-channel.Paul Mundt
This implements a per-hose offset for I/O and mem resources. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: New-style controller registration.Paul Mundt
This moves off of the board_pci_channels[] approach for bus registration and over to a cleaner register_pci_controller(), all derived from the MIPS code. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Rework fixed region checks in ioremap().Paul Mundt
Not all PCI channels have non-translatable memory windows, this is a special property of the on-chip PCIC with its 0xfd00... mapping, handle this explicitly. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Consolidate pci_iomap() and use the generic I/O base.Paul Mundt
This consolidates the pci_iomap() definitions and reworks how the I/O port base is handled. PCI channels can register their own I/O map base, or if none is provided, the system-wide generic I/O base is used instead. Functionally nothing changes, while this allows us to kill off lots of I/O address special casing and lookups. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Kill off unused pcibios_fixup().Paul Mundt
This is left over cruft that hasn't been used by anything in a long time, kill off bits that weren't purged previously. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Consolidate pcibios_align_resource() definitions.Paul Mundt
This introduces a saner pcibios_align_resource() that can be used regardless of whether pci-auto or pci-new are being used, and consolidates it in pci-lib.c. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: HAVE_PCI_MMAP support.Paul Mundt
Derived from the MIPS version, now uses pgprot_noncached(). Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Split out new-style PCI core.Paul Mundt
This splits off a 'pci-new.c' which is aimed at gradually replacing the pci-auto backend and the arch/sh/drivers/pci/pci.c core respectively. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-20sh: pci: Drop asm-generic/pci.h, so we can use our own fixups.Paul Mundt
The new PCI code wants its own bus<->resource mappings instead of the generic equivalents, so drop the asm-generic include in preparation. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-19sh: sh7724: Register CMT as an early platform device here too.Paul Mundt
Follows the SH7722/SH7723 changes. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-19sh: sh7724: Don't default enable the RTC clock.Paul Mundt
rtc-sh takes care of this now, so no need to have this always enabled. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-19Merge branches 'sh/earlytimer' and 'sh/shmobile-r2r-staging'Paul Mundt
2009-04-19sh: Early Platform Data for SuperH MobileMagnus Damm
Use plat_early_device_setup() to register Early Platform Data for SuperH Mobile processors. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-19sh: Add plat_early_device_setup()Magnus Damm
Add a plat_early_device_setup() function to allow processor-specific code to register Early Platform Data. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-19sh: arch earlytimer supportMagnus Damm
Extend the 32-bit SuperH timer code to register and probe the earlytimer class of Early Platform Drivers. This registers the sh_cmt driver if compiled-in. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-17sh: pci: Start unifying the SH7780 PCIC initialization.Paul Mundt
This starts moving out the common initialization bits from the various fixup paths in to the shared init path. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-17sh: pci: Consolidate SH7780 PCIC IRQ routing.Paul Mundt
Now that the platform code is a bit leaner, we can start consolidating the various IRQ routing implementations. There are effectively only 2 variants, and the others can use those directly. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-17sh: pci: Kill off platform-specific multi-window mappings.Paul Mundt
Commit 68b42d1b548be1840aff7122fdebeb804daf0fa3 ("sh: sh7785lcr: Map whole PCI address space.") changed around the semantics of how various chip-selects are made accessible to PCI. Now that there is a single large mapping covering from CS0-CS6, there is no longer any need to do multi-window mapping. Subsequently, all of the differing implementations can be consolidated in to pci-sh7780. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-17sh: pci: Consolidate PCI I/O and mem window definitions for SH7780.Paul Mundt
This consolidates all of the PCI I/O and memory window definitions across the pci-sh7780 users in pci-sh7780 itself. No functional changes, in that every platform had exactly the same implementation. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-17sh: pci: Set the I/O port base to the SH7780 I/O window default.Paul Mundt
Presently the I/O port base isn't being set anywhere, which allows things like generic_inl() to blow up. Fix this up to point at the PCI IO window. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-17sh: pci: Set pci_cache_line_size on SH7780 via the PCICLS register.Paul Mundt
The SH7780 PCIC contains a read-only cache line size register that we can derive pci_cache_line_size from. So, make sure that the software idea of the cache line size actually matches the host controller's idea. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-17sh: pci: Use the proper write size for class/sub-class code.Paul Mundt
Don't use pci_write_reg() for these, as it defaults to 32-bit. Rather than using the helper, use __raw_writeb() directly. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2009-04-17sh: pci: Rework SH7780 host controller detection.Paul Mundt
This reworks how the host controller is probed, and makes it a bit more verbose in the event a new type of controller is detected. Additionally, we also log the revision information. This now uses the proper access sizes for the vendor/device registers, rather than relying on a larger access that encapsulated both of them. Not all devices support 32-bit read cycles for these registers. Signed-off-by: Paul Mundt <lethal@linux-sh.org>