summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
AgeCommit message (Collapse)Author
2012-09-04Merge branch 'fixes' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes Two regression fixes and one boot-loader compatibility fix from Simon Horman. * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: armadillo800eva: enable rw rootfs mount ARM: shmobile: mackerel: fixup usb module order ARM: shmobile: armadillo800eva: fixup: sound card detection order
2012-09-02Merge branch 'fixes' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: marzen: fixup smsc911x id for regulator
2012-08-31ARM: shmobile: mackerel: fixup usb module orderKuninori Morimoto
renesas_usbhs driver can play role as both Host and Gadget. In case of Gadget, it requires not only renesas_usbhs but also usb gadget module (like g_ether). So, renesas_usbhs driver calls usb_add_gadget_udc() on probe time. Because of this behavior, Host port plays also Gadget role if kernel has both Host/Gadget support. In mackerel case, from 0ada2da51800a4914887a9bcf22d563be80e50be (ARM: mach-shmobile: mackerel: use renesas_usbhs instead of r8a66597_hcd) usb0 plays Gadget role, and usb1 plays Host role, and current mackerel board probes as usb1 -> usb0. Thus, 1st installed usb gadget module (like g_ether) will be assigned to usb1 (= usb Host port), and 2nd module to usb0 (= usb Gadget port). It is very confusable for user. This patch fixup usb modes probing order as usb0 -> usb1. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms@verge.net.au>
2012-08-31ARM: shmobile: armadillo800eva: fixup: sound card detection orderKuninori Morimoto
Since armadillo800eva has 2 sound cards, and had reversed deferred probe order issue, it was purposely registered in reverse order. But it was solved by 1d29cfa57471a5e4b8a7c2a7433eeba170d3ad92 (driver core: fixup reversed deferred probe order) armadillo800eva board is expecting that FSI-WM8978 is the 1st, and FSI-HDMI is the 2nd sound card. This patch fixes it up Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms@verge.net.au>
2012-08-30ARM: shmobile: marzen: fixup smsc911x id for regulatorKuninori Morimoto
dummy_supplies for smsc911x are registered as "smsc911x". smsc911x driver needs id = -1 Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms@verge.net.au>
2012-08-27Merge branch 'armadillo800eva' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes * 'armadillo800eva' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: mach-shmobile: armadillo800eva: Enable power button as wakeup source ARM: mach-shmobile: armadillo800eva: Fix GPIO buttons descriptions
2012-08-25ARM: mach-shmobile: armadillo800eva: Enable power button as wakeup sourceLaurent Pinchart
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms@verge.net.au>
2012-08-25ARM: mach-shmobile: armadillo800eva: Fix GPIO buttons descriptionsLaurent Pinchart
The GPIO buttons are named SW3, SW4, SW5 and SW6 on the board silkscreen. Update the buttons descriptions accordingly. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms@verge.net.au>
2012-08-22ARM: shmobile: sh73a0: fixup RELOC_BASE of intca_irq_pins_descKuninori Morimoto
sh73a0 :: intca_irq_pins_desc irq table had conflict from irq 552 to irq 557 before. But the second controller was simply trampling the first one by way of the -EEXIST case from irq_alloc_desc_at(). But now, we have irqdomain support from 1d6a21b0a672fb29b01ccf397d478e0541e17716 (sh: intc: initial irqdomain support) The irqdomain code has simply tightened down the sanity checks and error path. So, sh73a0 CPU board got some WARNING when booting now. This patch fixup RELOC_BASE to solve this issue. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2012-07-30Merge tag 'boards2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds
Pull arm-soc board updates from Olof Johansson: "This branch contains board updates, mostly for shmobile, but also a couple for PXA. The shmobile platforms are still in the early stages of DT enablement, so there's a bit more updates here than we'd ideally want to see: - regulator updates to provide some fixed regulators on several boards - gpio support updates for multiple boards - misc updates for recently-introduced boards armadillo800eva and kzm9g - defconfig updates" * tag 'boards2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (37 commits) ARM: shmobile: kzm9g: defconfig enable INOTIFY_USER ARM: mach-shmobile: armadillo800eva: defconfig Allow use of armhf userspace ARM: shmobile: armadillo800eva: A3SP domain includes USB ARM: shmobile: armadillo800eva: A4LC domain includes LCDC ARM: shmobile: armadillo800eva: USB Func enables external IRQ mode ARM: mach-shmobile: kzm9d: Add defconfig ARM: mach-shmobile: select the fixed regulator driver on several boards ARM: mach-shmobile: add SDHI2 to the 2.8V fixed regulator consumers on kzm9g ARM: pxa: hx4700: Use DEFINE_RES_* macros consistently ARM: pxa: remove eseries.h ARM: mach-shmobile: add fixed voltage regulators to marzen ARM: mach-shmobile: add fixed voltage regulators to kzm9g ARM: mach-shmobile: add fixed voltage regulators to kzm9d ARM: mach-shmobile: add fixed voltage regulators to kota2 ARM: mach-shmobile: add fixed voltage regulators to g4evm ARM: mach-shmobile: add fixed voltage regulators to bonito ARM: mach-shmobile: add fixed voltage regulators to armadillo800eva ARM: mach-shmobile: add fixed voltage regulators to ap4evb ARM: mach-shmobile: add fixed voltage regulators to ag5evm ARM: mach-shmobile: add 3.3V and 1.8V fixed regulators to mackerel ...
2012-07-21Merge tag 'v3.5-rc7' into late/socArnd Bergmann
Linux 3.5-rc7
2012-07-11Merge branch 'renesas-marzen' into renesas-boardRafael J. Wysocki
* renesas-marzen: ARM: mach-shmobile: add fixed voltage regulators to marzen
2012-07-11Merge branch 'renesas-mackerel' into renesas-boardRafael J. Wysocki
* renesas-mackerel: ARM: mach-shmobile: add 3.3V and 1.8V fixed regulators to mackerel ARM: shmobile: use common extra gpio functions on Mackerel
2012-07-11Merge branch 'renesas-kzm9g' into renesas-boardRafael J. Wysocki
* renesas-kzm9g: ARM: shmobile: kzm9g: defconfig enable INOTIFY_USER ARM: mach-shmobile: add SDHI2 to the 2.8V fixed regulator consumers on kzm9g ARM: mach-shmobile: add fixed voltage regulators to kzm9g ARM: shmobile: kzm9g: enable DMAEngine on MMCIF ARM: shmobile: kzm9g: enable DMAEngine on FSI ARM: shmobile: kzm9g: enable MicroSD ARM: shmobile: kzm9g: enable USB function
2012-07-11Merge branch 'renesas-kzm9d' into renesas-boardRafael J. Wysocki
* renesas-kzm9d: ARM: mach-shmobile: kzm9d: Add defconfig ARM: mach-shmobile: add fixed voltage regulators to kzm9d
2012-07-11Merge branch 'renesas-kota2' into renesas-boardRafael J. Wysocki
* renesas-kota2: ARM: mach-shmobile: add fixed voltage regulators to kota2
2012-07-11Merge branch 'renesas-g4evm' into renesas-boardRafael J. Wysocki
* renesas-g4evm: ARM: mach-shmobile: add fixed voltage regulators to g4evm ARM: shmobile: use common extra gpio functions on g4evm
2012-07-11Merge branch 'renesas-bonito' into renesas-boardRafael J. Wysocki
* renesas-bonito: ARM: mach-shmobile: add fixed voltage regulators to bonito
2012-07-11Merge branch 'renesas-ap4evb' into renesas-boardRafael J. Wysocki
* renesas-ap4evb: ARM: mach-shmobile: add fixed voltage regulators to ap4evb ARM: shmobile: use common extra gpio functions on ap4evb
2012-07-11Merge branch 'renesas-ag5evm' into renesas-boardRafael J. Wysocki
* renesas-ag5evm: ARM: mach-shmobile: add fixed voltage regulators to ag5evm
2012-07-11Merge branch 'renesas-armadillo' into renesas-boardRafael J. Wysocki
* renesas-armadillo: ARM: mach-shmobile: armadillo800eva: defconfig Allow use of armhf userspace ARM: shmobile: armadillo800eva: A3SP domain includes USB ARM: shmobile: armadillo800eva: A4LC domain includes LCDC ARM: shmobile: armadillo800eva: USB Func enables external IRQ mode ARM: mach-shmobile: add fixed voltage regulators to armadillo800eva ARM: shmobile: use common extra gpio functions on armadillo800eva ARM: shmobile: armadillo800eva: enable DMAEngine on USB ARM: shmobile: armadillo800eva: enable DMAEngine on SDHI ARM: shmobile: armadillo800eva: enable DMAEngine on FSI ARM: shmobile: armadillo800eva: enable FSI-HDMI sound ARM: shmobile: armadillo800eva: enable FSI-WM8978 sound Conflicts: arch/arm/mach-shmobile/Kconfig
2012-07-11Merge branch 'renesas-board-common' into renesas-boardRafael J. Wysocki
* renesas-board-common: ARM: mach-shmobile: select the fixed regulator driver on several boards regulator: extend the fixed dummy voltage regulator to accept voltage regulator: support multiple dummy fixed regulators Conflicts: arch/arm/mach-shmobile/Kconfig
2012-07-11Merge branch 'renesas-soc' into renesas-boardRafael J. Wysocki
* renesas-soc: (31 commits) ARM: shmobile: Fix build problem in pm-sh7372.c for unusual .config ARM: shmobile: Take cpuidle dependencies into account correctly ARM: mach-shmobile: sh7377 generic board support via DT ARM: mach-shmobile: r8a7740 generic board support via DT ARM: shmobile: sh7372: completely switch over to using pm-rmobile API ARM: shmobile: ap4evb: switch to using pm-rmobile API ARM: shmobile: mackerel: switch to using pm-rmobile API ARM: shmobile: sh7372: add pm-rmobile domain support ARM: shmobile: r8a7740: add A4LC pm domain support ARM: shmobile: r8a7740: add A3SP pm domain support ARM: shmobile: r8a7740: add A4S pm domain support ARM: shmobile: r8a7740: fixup: MSEL1CR 7bit control ARM: shmobile: soc-core: add R-mobile PM domain common APIs ARM: shmobile: sh7372 A3SM CPUIdle support ARM: shmobile: Use INTCA with sh7372 A3SM power domain ARM: mach-shmobile: Convert sh_clk_mstp32_register to sh_clk_mstp_register ARM: shmobile: use common DMAEngine definitions on sh7372 ARM: shmobile: use common DMAEngine definitions on sh73a0 ARM: shmobile: sh73a0: add DMAEngine support for MPDMAC ARM: shmobile: sh73a0: add USB clock support ...
2012-07-11Merge branch 'renesas-sh7377' into renesas-socRafael J. Wysocki
* renesas-sh7377: ARM: mach-shmobile: sh7377 generic board support via DT
2012-07-11Merge branch 'renesas-sh7372' into renesas-socRafael J. Wysocki
* renesas-sh7372: ARM: shmobile: Fix build problem in pm-sh7372.c for unusual .config ARM: shmobile: Take cpuidle dependencies into account correctly ARM: shmobile: sh7372: completely switch over to using pm-rmobile API ARM: shmobile: ap4evb: switch to using pm-rmobile API ARM: shmobile: mackerel: switch to using pm-rmobile API ARM: shmobile: sh7372: add pm-rmobile domain support ARM: shmobile: sh7372 A3SM CPUIdle support ARM: shmobile: Use INTCA with sh7372 A3SM power domain ARM: shmobile: use common DMAEngine definitions on sh7372 ARM: shmobile: sh7372: remove unused sh7372_a3sp_init() on !CONFIG_PM
2012-07-11Merge branch 'renesas-sh73a0' into renesas-socRafael J. Wysocki
* renesas-sh73a0: ARM: shmobile: use common DMAEngine definitions on sh73a0 ARM: shmobile: sh73a0: add DMAEngine support for MPDMAC ARM: shmobile: sh73a0: add USB clock support
2012-07-11Merge branch 'renesas-r8a7740' into renesas-socRafael J. Wysocki
* renesas-r8a7740: ARM: mach-shmobile: r8a7740 generic board support via DT ARM: shmobile: r8a7740: add A4LC pm domain support ARM: shmobile: r8a7740: add A3SP pm domain support ARM: shmobile: r8a7740: add A4S pm domain support ARM: shmobile: r8a7740: fixup: MSEL1CR 7bit control ARM: shmobile: use common DMAEngine definitions on r8a7740 ARM: shmobile: r8a7740: add DMAEngine support for USB ARM: shmobile: r8a7740: add DMAEngine support for SDHI ARM: shmobile: r8a7740: add DMAEngine support for FSI
2012-07-11Merge branch 'renesas-soc-core' into renesas-socRafael J. Wysocki
* renesas-soc-core: ARM: shmobile: soc-core: add R-mobile PM domain common APIs ARM: mach-shmobile: Convert sh_clk_mstp32_register to sh_clk_mstp_register ARM: shmobile: add common DMAEngine definitions ARM: shmobile: add common extra gpio functions Conflicts: arch/arm/mach-shmobile/clock-r8a7740.c
2012-07-11Merge branch 'renesas-fixes' into renesas-socRafael J. Wysocki
* renesas-fixes: ARM: shmobile: r8a7779: Route all interrupts to ARM ARM: shmobile: kzm9d: use late init machine hook ARM: shmobile: kzm9g: use late init machine hook ARM: mach-shmobile: armadillo800eva: Use late init machine hook
2012-07-11ARM: shmobile: Fix build problem in pm-sh7372.c for unusual .configRafael J. Wysocki
If neither CONFIG_SUSPEND nor CONFIG_CPU_IDLE is set in the kernel configuration file, build error occurs in arch/arm/mach-shmobile/pm-sh7372.c. Fix it by rearranging #ifdefs in that file to make the definition of sh7372_suspend_init() depend only on CONFIG_SUSPEND and the definition of sh7372_cpuidle_init() depend only on CONFIG_CPU_IDLE. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Magnus Damm <damm@opensource.se>
2012-07-11ARM: shmobile: Take cpuidle dependencies into account correctlyMagnus Damm
The sh7372's cpuidle code uses cpu_suspend() and cpu_resume() in its implementation of the .enter() callback for deeper C-states, so make ARCH_SH7372 select ARM_CPU_SUSPEND if CPU_IDLE is set to satisfy all of the build dependencies (it has to be selected for CONFIG_PM as well for the system suspend handling). [rjw: Added the subject and changelog.] Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2012-07-06ARM: shmobile: fix platsmp.c build when ARCH_SH73A0=nMagnus Damm
Fix build error in the case of SMP=y but ARCH_SH73A0=n introduced by: 9601e87 ARM: shmobile: fix smp build The use of of_machine_is_compatible() will link in the the SoC-specific symbols: "sh73a0_get_core_count", "sh73a0_smp_prepare_cpus", "sh73a0_secondary_init" and "sh73a0_boot_secondary". This patch adds an ugly #ifdef wrapper as a stop-gap solution. Signed-off-by: Magnus Damm <damm@opensource.se> Tested-by: Tested-by: Simon Horman <horms@verge.net.au> Acked-by: "Rafael J. Wysocki" <rjw@sisk.pl> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-07-06ARM: mach-shmobile: sh7377 generic board support via DTMagnus Damm
Add generic DT board support for the sh7377 SoC. SCIF serial ports and timers are kept as regular platform devices. Other on-chip and on-board devices should be configured via the device tree. At this point there is no interrupt controller support in place but such code will be added over time when proper IRQ domain support has been added to INTC. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2012-07-06ARM: mach-shmobile: r8a7740 generic board support via DTMagnus Damm
Add generic DT board support for the r8a7740 SoC. SCIF serial ports and timers are kept as regular platform devices. Other on-chip and on-board devices should be configured via the device tree. At this point there is no interrupt controller support in place but such code will be added over time when proper IRQ domain support has been added to INTC. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2012-07-06ARM: shmobile: sh7372: completely switch over to using pm-rmobile APIKuninori Morimoto
Now, all sh7372 platforms are switched over to use pm-rmobile base PM domain, and no one is using original sh7372_pm_domain APIs. We can remove these, switching has been fully completed. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2012-07-06ARM: shmobile: ap4evb: switch to using pm-rmobile APIKuninori Morimoto
This patch switches ap4evb platform to use pm-rmobile base common API. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2012-07-06ARM: shmobile: mackerel: switch to using pm-rmobile APIKuninori Morimoto
This patch switches mackerel platform to use pm-rmobile base common API. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2012-07-06ARM: shmobile: sh7372: add pm-rmobile domain supportKuninori Morimoto
This patch adds pm-rmobile common API base PM domain. sh7372 CPU/platform will switch to using it from original implementation Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2012-07-06Merge branch 'renesas-soc-core' into renesas-sh7372Rafael J. Wysocki
* renesas-soc-core: ARM: shmobile: soc-core: add R-mobile PM domain common APIs ARM: mach-shmobile: Convert sh_clk_mstp32_register to sh_clk_mstp_register
2012-07-06ARM: shmobile: armadillo800eva: A3SP domain includes USBKuninori Morimoto
Because USB Func is controlled by external IRQ mode, it is possible to control USB under A3SP domain to reduce power. This patch enables it. Armadillo800eva board switchs USB Host/Func by SW1.6, So, the device to adds into domain is selected on this patch. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2012-07-06ARM: shmobile: armadillo800eva: A4LC domain includes LCDCKuninori Morimoto
It is possible to control LCDC under A4LC domain to reduce power. This patch enable it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2012-07-06ARM: shmobile: armadillo800eva: USB Func enables external IRQ modeKuninori Morimoto
We can control renesas_usbhs driver as 2 way which are autonomy mode and external IRQ trigger mode. Autonomy mode is very easy settings for platform, but it required USB power domain always ON, since its connection/disconnection IRQ come from it. If platform uses external IRQ trigger mode, USB power domain can be OFF, since its connection/disconnection IRQ come from external IRQ. This patch enable external IRQ mode. Now it is possible to add USB support on A4SP domain. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2012-07-06Merge branch 'renesas-r8a7740' into renesas-armadilloRafael J. Wysocki
* renesas-r8a7740: ARM: shmobile: r8a7740: add A4LC pm domain support ARM: shmobile: r8a7740: add A3SP pm domain support ARM: shmobile: r8a7740: add A4S pm domain support ARM: shmobile: r8a7740: fixup: MSEL1CR 7bit control ARM: shmobile: soc-core: add R-mobile PM domain common APIs ARM: mach-shmobile: Convert sh_clk_mstp32_register to sh_clk_mstp_register
2012-07-06ARM: shmobile: r8a7740: add A4LC pm domain supportKuninori Morimoto
This patch adds basic A4LC pm domain support. Now, below devices can be controled by PM MERAM, LCDC, VOU, ICBS, SDENC-Link Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2012-07-06ARM: shmobile: r8a7740: add A3SP pm domain supportKuninori Morimoto
This patch adds basic A3SP pm domain support. Now, below devices can be controled by PM DMAC1/2/3, IPMMU, DDM, FLCTL, SYS-HPB, BBIF1, MSIOF1/2, SCIFA,SCIFB, IIC1, IrDA, USBH, USBDMAC, SDHI0/1/2, TPU, DREQPAK (Sys), MMCIF, RSPI, SIM, USBF Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2012-07-06ARM: shmobile: r8a7740: add A4S pm domain supportKuninori Morimoto
This patch adds basic A4S pm domain support. Now, below devices can be controled by PM Common-SHwy, Common-HPB, BSC, MFI, MMFROM, HS-SHwy, SYS-HPB, INTCA, DBSC, DDRPHY (Logic), ATAPI, GbEther, AXI-bus Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2012-07-06ARM: shmobile: r8a7740: fixup: MSEL1CR 7bit controlKuninori Morimoto
MSEL1CR 7bit selects IRQ7 source pin which was VBUS pin or A21/MSIOF0_RSYNC/MSIOF1_TSYNC pin. But current pfc-r8a7740 MSEL1CR 7bit setting was wrong. This patch fix it up Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2012-07-06Merge branch 'renesas-soc-core' into renesas-r8a7740Rafael J. Wysocki
* renesas-soc-core: ARM: shmobile: soc-core: add R-mobile PM domain common APIs ARM: mach-shmobile: Convert sh_clk_mstp32_register to sh_clk_mstp_register Conflicts: arch/arm/mach-shmobile/clock-r8a7740.c
2012-07-06ARM: shmobile: soc-core: add R-mobile PM domain common APIsKuninori Morimoto
This patch adds Renesas R-mobile series common PM domain APIs. R-mobile CPU can use/switch this API Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2012-07-06ARM: mach-shmobile: select the fixed regulator driver on several boardsGuennadi Liakhovetski
On systems, using regulators to supply power to devices, if the REGULATOR Kconfig option is disabled, regulator API stubs will be used, which often suffices to bring a default configuration up. If REGULATOR is enabled but respective regulator drivers are inactive, the real regulator API calls will be used, which in the absence of drivers will fail to provide services. This patch prevents such a problem on sh-mobile boards by forcing REGULATOR_FIXED_VOLTAGE on if REGULATOR is selected. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-20 09:03:16 +0000