summaryrefslogtreecommitdiffstats
path: root/arch/sh
Commit message (Collapse)AuthorAgeFilesLines
* sh: fix up cpu hotplug IRQ migration for irq_data changes.Paul Mundt2010-10-281-10/+14
| | | | | | | This fixes up the __cpu_disable() path's IRQ migration for the irq_data changes. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: oprofile: Make sure the backtrace op is available for timer-fallback.Paul Mundt2010-10-271-2/+2
| | | | | | | | Presently with hardware counter support disabled the backtrace op never gets initialized. This is a regression over the previous behaviour, so simply add it back in. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh64: oprofile: Fix up kernel stack pointer size mismatch.Paul Mundt2010-10-271-1/+1
| | | | | | | | | For the backtrace code its assumed that the stack pointer is 32-bits, which is not the case with the sh64 registers. Use the shared kernel_stack_pointer() helper to get at the actual register, which already takes care of the necessary typecasting. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: oprofile: Fix up and extend op_name_from_perf_id().Paul Mundt2010-10-274-16/+21
| | | | | | | | | | | | op_name_from_perf_id() currently returns a local variable, which isn't terribly productive. As we only handle a single PMU case for now, simply allocate and free the string from the arch init/exit context and have op_name_from_perf_id() hand back the cached string. This also takes UTS_MACHINE in to account, given that we build for multiple architectures. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: lockless get_user_pages_fast()Paul Mundt2010-10-272-1/+274
| | | | | | Implement get_user_pages_fast without locking in the fastpath on sh. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh64: _PAGE_SPECIAL support.Paul Mundt2010-10-273-6/+7
| | | | | | | Now that sh64 has grown extended page flag support we finally have a free bit for _PAGE_SPECIAL. Wire it up. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: disable deprecated genirq support.Paul Mundt2010-10-271-0/+1
| | | | | | | Now that all of the controllers have been fixed up, we can finally select GENERIC_HARDIRQS_NO_DEPRECATED. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: update show_interrupts() for irq_data chip lookup.Paul Mundt2010-10-271-1/+6
| | | | | | | Presently the irq chip is found through the irq_desc, but as this is going away convert over to an irq_data lookup instead. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh64: irq_data conversion.Paul Mundt2010-10-272-50/+15
| | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh64: update for IRQ flag handling naming changes.Paul Mundt2010-10-271-8/+8
| | | | | | | irq_32.c was updated for the new API, while irq_64.c was overlooked. This syncs them up and gets things building again. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: mach-se: irq_data conversion.Paul Mundt2010-10-274-31/+32
| | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: hd64461: irq_data conversion.Paul Mundt2010-10-271-8/+11
| | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: mach-x3proto: irq_data conversion.Paul Mundt2010-10-271-3/+4
| | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: mach-systemh: irq_data conversion.Paul Mundt2010-10-271-36/+21
| | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: imask IRQs irq_data conversion.Paul Mundt2010-10-271-5/+9
| | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: mach-microdev: irq_data conversion.Paul Mundt2010-10-271-19/+11
| | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: mach-landisk: irq_data conversion.Paul Mundt2010-10-271-8/+7
| | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: IPR IRQs irq_data conversion.Paul Mundt2010-10-271-13/+12
| | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: mach-dreamcast: irq_data conversion.Paul Mundt2010-10-271-7/+10
| | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: Fix the sparsemem disabled build.Paul Mundt2010-10-271-0/+1
| | | | | | | | The introduction of MAX_PHYSMEM_BITS in to the initial cpuinfo struct causes a build error when sparsemem is disabled and asm/sparsemem.h is not brought in by other means. Include it explicitly. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: Switch dynamic IRQ creation to generic irq allocator.Paul Mundt2010-10-261-6/+0
| | | | | | | | | | | Now that the genirq code provides an IRQ bitmap of its own and the necessary API to manipulate it, there's no need to keep our own version around anymore. In the process we kill off some unused IRQ reservation code, with future users now having to tie in to the genirq API as normal. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: Tidy up genirq Kconfig bits.Paul Mundt2010-10-261-10/+3
| | | | | | Now that there's a HAVE_GENERIC_HARDIRQS, switch over. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: Sanitize sparse irqThomas Gleixner2010-10-261-3/+3
| | | | | | | Switch over to the new allocator functions. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: Expose physical addressing mode through cpuinfo.Paul Mundt2010-10-263-0/+6
| | | | | | | | | | | CPUs can be in either the legacy 29-bit or 32-bit physical addressing modes. This follows the x86 approach of tracking the phys bits in cpuinfo and exposing it to userspace through procfs. This change was requested to permit kexec-tools to detect the physical addressing mode in order to determine the appropriate address mangling. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* Merge branch 'for-linus' of ↵Linus Torvalds2010-10-251-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (365 commits) ALSA: hda - Disable sticky PCM stream assignment for AD codecs ALSA: usb - Creative USB X-Fi volume knob support ALSA: ca0106: Use card specific dac id for mute controls. ALSA: ca0106: Allow different sound cards to use different SPI channel mappings. ALSA: ca0106: Create a nice spot for mapping channels to dacs. ALSA: ca0106: Move enabling of front dac out of hardcoded setup sequence. ALSA: ca0106: Pull out dac powering routine into separate function. ALSA: ca0106 - add Sound Blaster 5.1vx info. ASoC: tlv320dac33: Use usleep_range for delays ALSA: usb-audio: add Novation Launchpad support ALSA: hda - Add workarounds for CT-IBG controllers ALSA: hda - Fix wrong TLV mute bit for STAC/IDT codecs ASoC: tpa6130a2: Error handling for broken chip ASoC: max98088: Staticise m98088_eq_band ASoC: soc-core: Fix codec->name memory leak ALSA: hda - Apply ideapad quirk to Acer laptops with Cxt5066 ALSA: hda - Add some workarounds for Creative IBG ALSA: hda - Fix wrong SPDIF NID assignment for CA0110 ALSA: hda - Fix codec rename rules for ALC662-compatible codecs ALSA: hda - Add alc_init_jacks() call to other codecs ...
| * Merge branch 'topic/asoc' into for-linusTakashi Iwai2010-10-251-1/+1
| |\ | | | | | | | | | | | | Conflicts: arch/powerpc/platforms/85xx/p1022_ds.c
| | * sh: fix an SIU device name mismatchGuennadi Liakhovetski2010-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | Recent ASoC changes unified all PCM names, fix the platform code to match. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2010-10-25136-1573/+4891
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (110 commits) sh: i2c-sh7760: Replase from ctrl_* to __raw_* sh: clkfwk: Shuffle around to match the intc split up. sh: clkfwk: modify for_each_frequency end condition sh: fix clk_get() error handling sh: clkfwk: Fix fault in frequency iterator. sh: clkfwk: Add a helper for rate rounding by divisor ranges. sh: clkfwk: Abstract rate rounding helper. sh: clkfwk: support clock remapping. sh: pci: Convert to upper/lower_32_bits() helpers. sh: mach-sdk7786: Add support for the FPGA SRAM. sh: Provide a generic SRAM pool for tiny memories. sh: pci: Support secondary FPGA-driven PCIe clocks on SDK7786. sh: pci: Support slot 4 routing on SDK7786. sh: Fix up PMB locking. sh: mach-sdk7786: Add support for fpga gpios. sh: use pr_fmt for clock framework, too. sh: remove name and id from struct clk sh: free-without-alloc fix for sh_mobile_lcdcfb sh: perf: Set up perf_max_events. sh: perf: Support SH-X3 hardware counters. ... Fix up trivial conflicts (perf_max_events got removed) in arch/sh/kernel/perf_event.c
| * | | sh: fix clk_get() error handlingGuennadi Liakhovetski2010-10-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | clk_get() returns an ERR_PTR(errno) on error and not NULL. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: pci: Convert to upper/lower_32_bits() helpers.Paul Mundt2010-10-152-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | Instead of hand-rolling our own, just use the generic ones instead. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: mach-sdk7786: Add support for the FPGA SRAM.Paul Mundt2010-10-155-2/+92
| | | | | | | | | | | | | | | | | | | | | | | | This ties in the 2KiB of FPGA SRAM in to the generic SRAM pool. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: Provide a generic SRAM pool for tiny memories.Paul Mundt2010-10-154-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sets up a generic SRAM pool for CPUs and platform code to insert their otherwise unused memories into. A simple alloc/free interface is provided (lifed from avr32) for generic code. This only applies to tiny SRAMs that are otherwise unmanaged, and does not take in to account the more complex SRAMs sitting behind transfer engines, or that employ an I/D split. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: pci: Support secondary FPGA-driven PCIe clocks on SDK7786.Paul Mundt2010-10-144-5/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SDK7786 FPGA has secondary control over the PCIe clocks, specifically relating to the slots and oscillator. This ties the FPGA clocks in to the clock framework and balances the refcounting similar to how the primary on-chip clocks are managed. While the on-chip clocks are per-port, the FPGA clock enable/disable is global for the entire block. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: pci: Support slot 4 routing on SDK7786.Paul Mundt2010-10-144-1/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SDK7786 supports connecting either slot3 or 4 to the same PCIe port by way of FPGA muxing. By default the vertical slot 3 on the baseboard is enabled, so this adds in a command line option for forcibly enabling the slot 4 edge connector. If nothing has been specified on the command line, we fall back to reading the resistor values for card presence to figure out where to route the port to. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: Fix up PMB locking.Paul Mundt2010-10-141-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This first converts the PMB locking over to raw spinlocks, and secondly fixes up a nested locking issue that was triggering lockdep early on: swapper/0 is trying to acquire lock: (&pmbe->lock){......}, at: [<806be9bc>] pmb_init+0xf4/0x4dc but task is already holding lock: (&pmbe->lock){......}, at: [<806be98e>] pmb_init+0xc6/0x4dc other info that might help us debug this: 1 lock held by swapper/0: #0: (&pmbe->lock){......}, at: [<806be98e>] pmb_init+0xc6/0x4dc Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: mach-sdk7786: Add support for fpga gpios.Paul Mundt2010-10-143-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sdk7786 FPGA supports a number of user settable input switches that are otherwise unused. This wires up a dummy gpio chip for the switch bank to simply expose them to userspace. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: perf: Set up perf_max_events.Paul Mundt2010-10-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Presently this is uninitialized in the architecture code, so it's artificlally capped to the default initialization value. Set it up at registration time. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: perf: Support SH-X3 hardware counters.Paul Mundt2010-10-131-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PMCAT location has conveniently moved on newer SH-X3 parts, special case this for now with a note. This will probably want to be redone in a less visually offensive way when/if more information becomes available. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: wire up perf alignment and emulation faults.Paul Mundt2010-10-135-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This plugs in the alignment and emulation fault reporting for perf sw events. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: boards/mach-x3proto: gpio: fix error handling codeKulikov Vasiliy2010-10-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checks for (irq < 0) and (ilsel < 0) didn't make sense since they were unsigned. Made them signed. Signed-off-by: Vasiliy Kulikov <segooon@gmail.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: Fix up the SH-3 build.Paul Mundt2010-10-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SH-3 lacks an MMUCR_TI definition for global TLB flushes. As SH-3 parts lack a split TLB, the same global flush behaviour is accomplished through the flush bit, which just happens to be the same as on SH-4. This fixes up the build for all SH-3 MMU parts. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: Fix address calculation of InitrdNobuhiro Iwamatsu2010-10-061-3/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: fix uninitialized spinlockAkinobu Mita2010-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spinlock in traps_64.c is used without initialization. This fixes it by declaring DEFINE_SPINLOCK() and makes the spinlock static variable. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Cc: Paul Mundt <lethal@linux-sh.org> Cc: linux-sh@vger.kernel.org Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: Wire up INTC subgroup splitting for SH7786 SCIF1.Paul Mundt2010-10-051-38/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SH7786 is the big user for subgroup splitting, mostly for the PCIe block, but those will follow later. For now we simply split up SCIF1, as used by the serial console on SDK7786 and others. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: intc: Support virtual mappings for IRQ subgroups.Paul Mundt2010-10-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many interrupts that share a single mask source but are on different hardware vectors will have an associated register tied to an INTEVT that denotes the precise cause for the interrupt exception being triggered. This introduces the concept of IRQ subgroups in the intc core, where a virtual IRQ map is constructed for each of the pre-defined cause bits, and a higher level chained handler takes control of the parent INTEVT. This enables CPUs with heavily muxed IRQ vectors (especially across disjoint blocks) to break things out in to a series of managed chained handlers while being able to dynamically lookup and adopt the IRQs created for them. This is largely an opt-in interface, requiring CPUs to manually submit IRQs for subgroup splitting, in addition to providing identifiers in their enum maps that can be used for lazy lookup via the radix tree. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: Drop __initdata for SH-X3 pinmux tables.Paul Mundt2010-10-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The gpio sysfs support needs to get at these later, so drop the __initdata annotations. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: mach-x3proto: Improve ILSEL debugging.Paul Mundt2010-10-041-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment ILSEL blows up with a BUG when aliased sets are handed in, but as the enable call is able to hand back errors we opt for that path instead. None of the ILSEL peripherals are vital to the board's operation, so trapping a BUG is a bit excessive. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: mach-x3proto: gpio-keys support.Paul Mundt2010-10-041-2/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds gpio-keys mappings for the button matrix on the baseboard, now that we have support for the pin controller. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: mach-x3proto: Support for baseboard GPIOs.Paul Mundt2010-10-043-0/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds trivial support for the GPIOs implemented through the baseboard CPLD, used for driving the button matrix. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: mach-x3proto: Move the ilsel header to a better place.Paul Mundt2010-10-043-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We'll be adding more headers for this board, so move this over to its own directory. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
OpenPOWER on IntegriCloud