summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/board-mackerel.c
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'pm-for-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/r...Linus Torvalds2012-10-021-15/+19
|\
| * Merge branch 'pm-shmobile'Rafael J. Wysocki2012-09-171-15/+19
| |\
| | * ARM: shmobile: Add A4S cpuidle state on sh7372Rafael J. Wysocki2012-09-041-1/+1
| | * ARM: shmobile: Rework adding devices to PM domains on MackerelRafael J. Wysocki2012-09-041-20/+17
| | * ARM: shmobile: Specify device latencies for Mackerel devices directlyRafael J. Wysocki2012-09-041-12/+19
| | * ARM: shmobile: Use names of power domains for adding devices to themRafael J. Wysocki2012-09-041-12/+12
* | | Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/ar...Linus Torvalds2012-10-011-0/+2
|\ \ \
| * \ \ Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux ...Olof Johansson2012-09-201-0/+2
| |\ \ \ | | |/ / | |/| |
| | * | ARM: shmobile: move custom gpio functions to sh-gpio.hRob Herring2012-09-141-0/+2
| | |/
* | | Merge branch 'cleanup/__iomem' into next/cleanupOlof Johansson2012-09-221-11/+11
|\ \ \ | |/ / |/| |
| * | ARM: shmobile: use __iomem pointers for MMIOArnd Bergmann2012-09-181-11/+11
| |/
* | ARM: shmobile: mackerel: fixup usb module orderKuninori Morimoto2012-08-311-1/+2
|/
* Merge branch 'renesas-mackerel' into renesas-boardRafael J. Wysocki2012-07-111-25/+34
|\
| * ARM: mach-shmobile: add 3.3V and 1.8V fixed regulators to mackerelGuennadi Liakhovetski2012-06-301-0/+35
| * ARM: shmobile: use common extra gpio functions on MackerelKuninori Morimoto2012-06-301-30/+4
* | Merge branch 'renesas-sh7372' into renesas-socRafael J. Wysocki2012-07-111-12/+12
|\ \
| * | ARM: shmobile: mackerel: switch to using pm-rmobile APIKuninori Morimoto2012-07-061-12/+12
| |/
* | ARM: mach-shmobile: add missing GPIO IRQ configuration on mackerelGuennadi Liakhovetski2012-06-201-0/+3
|/
* Merge tag 'cleanup-initcall' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-05-261-0/+1
|\
| * ARM: shmobile: use machine specific hook for late initShawn Guo2012-05-081-0/+1
* | Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/...Linus Torvalds2012-05-231-4/+31
|\ \
| * \ Merge tag 'v3.4-rc7' into for-3.5Mark Brown2012-05-131-20/+2
| |\ \
| * | | ASoC: sh: fsi: use simple-card instead of fsi-hdmiKuninori Morimoto2012-04-131-1/+19
| * | | ASoC: sh: fsi: use simple-card instead of fsi-ak4642Kuninori Morimoto2012-04-131-3/+12
| | |/ | |/|
* | | ARM: mach-shmobile: sh7372 CEU supports up to 8188x8188 imagesGuennadi Liakhovetski2012-05-121-0/+2
* | | ARM: mach-shmobile: mackerel: Add FSI DMAEngine supportKuninori Morimoto2012-05-121-2/+6
| |/ |/|
* | ARM: mach-shmobile: convert mackerel to use the generic MMC GPIO hotplug helperGuennadi Liakhovetski2012-05-121-20/+2
|/
* Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6Linus Torvalds2012-03-301-0/+71
|\
| * ARM: mach-shmobile: mackerel: Add the flash controller flctlBastian Hecht2012-03-271-0/+71
* | Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-291-0/+1
|\ \
| * | ARM: shmobile: remove NR_IRQSRob Herring2012-01-251-0/+1
* | | Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-281-10/+1
|\ \ \
| * \ \ Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh in...Arnd Bergmann2012-03-241-10/+1
| |\ \ \
* | \ \ \ Merge tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-271-33/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'renesas/fixes' into renesas/socArnd Bergmann2012-03-151-1/+10
| |\ \ \ \ | | |/ / /
| * | | | ARM: mach-shmobile: sh7372, AP4EVB and Mackerel timer reworkMagnus Damm2012-03-121-12/+1
| * | | | ARM: mach-shmobile: Move sh7372 Mackerel external clk setupMagnus Damm2012-03-121-3/+3
| * | | | ARM: mach-shmobile: sh7372 map_io and init_early updateMagnus Damm2012-03-121-23/+2
| | |_|/ | |/| |
* | | | Merge tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6Linus Torvalds2012-03-221-56/+50
|\ \ \ \
| * \ \ \ Merge commit 'v3.3' into fbdev-nextFlorian Tobias Schandinat2012-03-201-0/+4
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | arm: mach-shmobile: Constify sh_mobile_meram_cfg structuresLaurent Pinchart2012-03-121-2/+2
| * | | | arm: mach-shmobile: Don't set MERAM ICB numbers in platform dataLaurent Pinchart2012-03-121-8/+0
| * | | | fbdev: sh_mobile_meram: Use genalloc to manage MERAM allocationLaurent Pinchart2012-03-121-4/+0
| * | | | arm: mach-shmobile: Split MERAM resources into regs and meramLaurent Pinchart2012-03-121-1/+7
| * | | | fbdev: sh_mobile_lcdc: Rename (lcd|num)_cfg (lcd|num)_modesLaurent Pinchart2012-03-121-2/+2
| * | | | fbdev: sh_mobile_lcdc: Merge board_cfg and lcd_size_cfg into panel_cfgLaurent Pinchart2012-03-121-2/+4
| * | | | fbdev: sh_mobile_lcdc: Move brightness ops to sh_mobile_lcdc_bl_infoLaurent Pinchart2012-03-121-4/+2
| * | | | fbdev: sh_mobile_lcdc: Remove board configuration board_data fieldLaurent Pinchart2012-03-121-2/+2
| * | | | arm: mach-shmobile: Don't initialize the hdmi_info lcd_chan fieldLaurent Pinchart2012-03-121-3/+0
| * | | | arm: mach-shmobile: Add LCDC tx_dev field to platform dataLaurent Pinchart2012-03-121-31/+35
OpenPOWER on IntegriCloud