summaryrefslogtreecommitdiffstats
path: root/arch/sh/boards (follow)
Commit message (Collapse)AuthorAgeFilesLines
* sh: mach-sdk7786: Handle baseboard NMI source selection.Paul Mundt2010-12-173-1/+85
| | | | | | | | | The on-board NMI switch is routed through and mangled by the FPGA prior to its delivery to the NMI pin, so add some glue for the various configuration options. The default is to unmask it and enable all input sources. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
*-. Merge branches 'sh/urgent' and 'sh/rsk-updates' into sh-latestPaul Mundt2010-12-132-39/+41
|\ \
| | * sh: mach-rsk: Add polled GPIO buttons support for RSK+7203.Paul Mundt2010-12-131-1/+36
| |/ | | | | | | | | | | | | Now that there's an upstream polled gpio-keys driver, add the outstanding platform data for it. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: se/7724: Remove FSI/B of GPIO init codeNobuhiro Iwamatsu2010-12-031-9/+1
| | | | | | | | | | | | | | se7724 board does not have FSI/B. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: se/7724: Update clock framework of FSI clock to non-legacyNobuhiro Iwamatsu2010-12-031-29/+4
| | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* | Merge branch 'sh/urgent' into sh-latestPaul Mundt2010-11-302-32/+6
|\|
| * sh: boards: mach-se: use IS_ERR() instead of NULL checkVasiliy Kulikov2010-11-291-2/+2
| | | | | | | | | | | | | | | | clk_get() returns ERR_PTR() on error, not NULL. Signed-off-by: Vasiliy Kulikov <segoon@openwall.com> Reviewed-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: Add div6_reparent_clks to clock framework for FSIKuninori Morimoto2010-11-291-30/+4
| | | | | | | | | | | | | | | | | | | | | | | | Current clk_ops doesn't support .init which is used to select external clock on ecovec without CONFIG_SH_CLK_CPG_LEGACY. To solve this problem, this patch add div6_reparent_clks to clock-sh7724. This patch solve compile error too. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| |
| \
*-. | Merge branches 'sh/core', 'sh/io-overhaul' and 'sh/urgent' into sh-latestPaul Mundt2010-11-091-2/+0
|\ \|
| * | sh: machvec IO death.Paul Mundt2010-11-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This takes a bit of a sledgehammer to the machvec I/O routines. The iomem case requires no special casing and so can just be dropped outright. This only leaves the ioport casing for PCI and SuperIO mangling. With the SuperIO case going through the standard ioport mapping, it's possible to replace everything with generic routines. With this done the standard I/O routines are tidied up and NO_IOPORT now gets default-enabled for the vast majority of boards. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* | | sh: migrate SH_CLK_MD to mode pin API.Paul Mundt2010-11-092-0/+12
| |/ |/| | | | | | | | | | | This kills off the hardcoded SH_CLK_MD introduced by the SH-2 boards and converts over to the mode pin API. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| |
| \
*-. \ Merge branches 'sh/pio-death', 'sh/nommu', 'sh/clkfwk', 'sh/core' and ↵Paul Mundt2010-11-0825-1265/+100
|\ \ \ | | |/ | |/| | | | 'sh/intc-extension' into sh-fixes-for-linus
| | * sh: mach-se: Fix up SE7206 no ioport build.Paul Mundt2010-11-041-1/+3
| |/ |/| | | | | | | | | | | There was a leftover inw() used here that really just wants to be a __raw_readw() instead. Convert it over. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: mach-se: Rip out superfluous 7751 PIO routines.Paul Mundt2010-10-293-138/+1
| | | | | | | | | | | | | | | | MRSHPC is wholly unused here, no need to trap it specially. If support is added in the future it can be taken care of via platform data like on the others. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: mach-se: Rip out superfluous 770x PIO routines.Paul Mundt2010-10-293-179/+1
| | | | | | | | | | | | Platform data takes care of all of these these days, kill them off. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: mach-edosk7705: Kill off machtype, consolidate board def.Paul Mundt2010-10-293-6/+1
| | | | | | | | | | | | Trivial shuffling and tidying. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: mach-edosk7705: update for this century, kill off PIO trapping.Paul Mundt2010-10-293-82/+54
| | | | | | | | | | | | | | | | | | The only reason this board needs to do PIO trapping is for ethernet, which happens to follow the same scheme as its bigger brother the edosk7760. With ethernet properly supported through the platform device, we can kill off the left over PIO abortion. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: mach-se: Rip out superfluous 7206 PIO routines.Paul Mundt2010-10-293-120/+1
| | | | | | | | | | | | | | | | The PIO trapping was only for MRSHPC and the SMC ethernet. Given that the SMC ethernet is already properly handled and that nothing is using the MRSHPC, none of this is needed. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: mach-systemh: Kill off dead board.Paul Mundt2010-10-295-296/+0
| | | | | | | | | | | | | | | | | | This code has been untouched since it was merged many years ago, and has severely bitrotted since, suggesting that the board has no real users left. Notice of intent to remove has been sent out over the last few years, with no takers. Kill it off. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: mach-snapgear: Kill off machtype, consolidate board def.Paul Mundt2010-10-293-6/+2
| | | | | | | | | | | | | | Only the secureedge5410 was ever supported by this code, so make the board specification explicit rather than perpetuating a mach group. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: mach-snapgear: Rip out superfluous PIO routines.Paul Mundt2010-10-293-148/+11
| | | | | | | | | | | | | | None of these PIO routines do anything other than basic error checking, get rid of them and use the generic fallbacks. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: mach-microdev: SuperIO-relative ioport mapping.Paul Mundt2010-10-292-266/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | The microdev only has to contend with silly PIO mangling on anything within the SuperIO range. As each of the SuperIO modules is already speciail cased, we just shift that logic over to the ioport map. With microdev PCI never being merged (and being fudamentally broken in hardware), and the ethernet chip only doing 16-bit accesses already, there's no need to maintain any of the extra special casing. Kill it all off. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* | Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-10-305-95/+135
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (215 commits) ARM: memblock: setup lowmem mappings using memblock ARM: memblock: move meminfo into find_limits directly ARM: memblock: convert free_highpages() to use memblock ARM: move freeing of highmem pages out of mem_init() ARM: memblock: convert memory detail printing to use memblock ARM: memblock: use memblock to free memory into arm_bootmem_init() ARM: memblock: use memblock when initializing memory allocators ARM: ensure membank array is always sorted ARM: 6466/1: implement flush_icache_all for the rest of the CPUs ARM: 6464/2: fix spinlock recursion in adjust_pte() ARM: fix memblock breakage ARM: 6465/1: Fix data abort accessing proc_info from __lookup_processor_type ARM: 6460/1: ixp2000: fix type of ixp2000_timer_interrupt ARM: 6449/1: Fix for compiler warning of uninitialized variable. ARM: 6445/1: fixup TCM memory types ARM: imx: Add wake functionality to GPIO ARM: mx5: Add gpio-keys to mx51 babbage board ARM: imx: Add gpio-keys to plat-mxc mx31_3ds: Fix spi registration mx31_3ds: Fix the logic for detecting the debug board ...
| * Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into ↵Russell King2010-10-285-95/+135
| |\ | | | | | | | | | | | | | | | | | | devel-stable Conflicts: drivers/video/sh_mobile_hdmi.c
| | * sh: fix an ms7724se compile breakageGuennadi Liakhovetski2010-10-061-16/+16
| | | | | | | | | | | | | | | | | | | | | Fix a compile breakage, caused by my own careless copy-paste. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * fbdev: sh_mobile_lcdcfb: Support multiple video modes in platform dataGuennadi Liakhovetski2010-09-145-95/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a preparation for HDMI hotplug support. This patch just moves all platform defined video modes for the sh_mobile_lcdcfb driver to separate arrays and switches all users to use element 0 of that array, so, this patch doesn't introduce any functional changes and as such should not cause any regressions. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2010-10-2810-114/+91
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (32 commits) sh: intc: switch irq_desc iteration to new active IRQ iterator. sh: fix up cpu hotplug IRQ migration for irq_data changes. sh: oprofile: Make sure the backtrace op is available for timer-fallback. sh64: oprofile: Fix up kernel stack pointer size mismatch. sh: oprofile: Fix up and extend op_name_from_perf_id(). sh: lockless get_user_pages_fast() sh64: _PAGE_SPECIAL support. sound: sh: ctrl_in/outX to __raw_read/writeX conversion. sh: disable deprecated genirq support. sh: update show_interrupts() for irq_data chip lookup. sh: intc: irq_data conversion. sh64: irq_data conversion. sh64: update for IRQ flag handling naming changes. rtc: rtc-rs5c313: ctrl_in/outX to __raw_read/writeX conversion. sh: mach-se: irq_data conversion. input: hp680_ts_input: ctrl_in/outX to __raw_read/writeX conversion. input: jornada680_kbd: ctrl_in/outX to __raw_read/writeX conversion. sh: hd64461: irq_data conversion. sh: mach-x3proto: irq_data conversion. sh: mach-systemh: irq_data conversion. ...
| * | | sh64: irq_data conversion.Paul Mundt2010-10-271-10/+6
| | | | | | | | | | | | | | | | 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: 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: 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: mach-dreamcast: irq_data conversion.Paul Mundt2010-10-271-7/+10
| |/ / | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* | | Merge branch 'v4l_for_linus' of ↵Linus Torvalds2010-10-285-9/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (505 commits) [media] af9015: Fix max I2C message size when used with tda18271 [media] IR: initialize ir_raw_event in few more drivers [media] Guard a divide in v4l1 compat layer [media] imon: fix nomouse modprobe option [media] imon: remove redundant change_protocol call [media] imon: fix my egregious brown paper bag w/rdev/idev split [media] cafe_ccic: Configure ov7670 correctly [media] ov7670: allow configuration of image size, clock speed, and I/O method [media] af9015: support for DigitalNow TinyTwin v3 [1f4d:9016] [media] af9015: map DigitalNow TinyTwin v2 remote [media] DigitalNow TinyTwin remote controller [media] af9015: RC fixes and improvements videodev2.h.xml: Update to reflect the latest changes at videodev2.h [media] v4l: document new Bayer and monochrome pixel formats [media] DocBook/v4l: Add missing formats used on gspca cpia1 and sn9c2028 [media] firedtv: add parameter to fake ca_system_ids in CA_INFO [media] tm6000: fix a macro coding style issue tm6000: Remove some ugly debug code [media] Nova-S-Plus audio line input [media] [RFC,1/1] V4L2: Use new CAP bits in existing RDS capable drivers ...
| * | [media] soc_camera: Don't use module names to load I2C modulesLaurent Pinchart2010-10-234-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the v4l2_i2c_new_subdev* functions now supporting loading modules based on modaliases, remove the module names hardcoded in platform data and pass a NULL module name to those functions. All corresponding I2C modules have been checked, and all of them include a module aliases table with names corresponding to what the soc_camera platform data uses. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | [media] sh_vou: Don't use module names to load I2C modulesLaurent Pinchart2010-10-232-2/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | With the v4l2_i2c_new_subdev* functions now supporting loading modules based on modaliases, remove the module names hardcoded in platform data and pass a NULL module name to those functions. All corresponding I2C modules have been checked, and all of them include a module aliases table with names corresponding to what the sh_vou platform data uses. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2010-10-2513-22/+978
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: mach-sdk7786: Add support for the FPGA SRAM.Paul Mundt2010-10-143-1/+75
| | | | | | | | | | | | | | | | | | This ties in the 2KiB of FPGA SRAM in to the generic SRAM pool. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: pci: Support secondary FPGA-driven PCIe clocks on SDK7786.Paul Mundt2010-10-141-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: mach-sdk7786: Add support for fpga gpios.Paul Mundt2010-10-133-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: boards/mach-x3proto: gpio: fix error handling codeKulikov Vasiliy2010-10-111-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: mach-x3proto: Improve ILSEL debugging.Paul Mundt2010-10-031-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-031-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-032-0/+137
| | | | | | | | | | | | | | | | | | | | | 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-032-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>
| * | sh: Support early IRQ vector map reservation for delayed controllers.Paul Mundt2010-10-021-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some controllers will need to be initialized lazily due to pinmux constraints, while others may simply have no need to be brought online if there are no backing devices for them attached. In this case it's still necessary to be able to reserve their hardware vector map before dynamic IRQs get a hold of them. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | Revert "sh: ecovec24: modify tsc2007 platform settings"Paul Mundt2010-09-141-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | According to Morimoto-san, this is no longer needed. Revert it. This reverts commit e0009b0a44f28227571d8cddebc5ccdae86027a6. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: ecovec24: modify tsc2007 platform settingsKuninori Morimoto2010-09-141-24/+2
| | | | | | | | | | | | | | | | | | | | | | | | This patch modify x_plate_ohms to correct value for tsc2007 panel, and removed un-necessary ts_get_pendown_state() Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>