aboutsummaryrefslogtreecommitdiff
path: root/arch/sh/kernel/cpu
AgeCommit message (Collapse)AuthorFilesLines
2013-05-07Merge tag 'soc-for-linus-2' of ↵Linus Torvalds1-0/+2
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC platform updates (part 2) from Arnd Bergmann: "These patches are all for Renesas shmobile, and depend on the earlier pinctrl updates. Remarkably, this adds support for three new SoCs: r8a73a4, r8a73a4 and r8a7778. The bulk of the code added for these is for pinctrl (using the new subsystem) and for clocks (not yet using the common clock subsystem). The latter will have to get converted in one of the upcoming releases, but shmobile is not ready for that yet. The series also contains Renesas shmobile board changes, adding one board file for each of the three new SoCs. These boards are using a mix of classic and device-tree based probing, as there is still a lot of infrastructure in shmobile that has not been converted to DT yet. Once those are resolved to the degree that no board specific setup code is needed, they can get folded into the respective SoC setup files." * tag 'soc-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (78 commits) ARM: shmobile: use r8a7790 timer setup code on Lager ARM: shmobile: force enable of r8a7790 arch timer ARM: shmobile: Add second I/O range for r8a7790 PFC ARM: shmobile: bockw: enable network settings on bootargs ARM: shmobile: bockw: add SMSC ethernet support ARM: shmobile: R8A7778: add Ether support ARM: shmobile: bockw: enable SMSC ethernet on defconfig ARM: shmobile: r8a7778: add r8a7778_init_irq_extpin() ARM: shmobile: r8a7778: remove pointless PLATFORM_INFO() ARM: shmobile: mackerel: clean up MMCIF vs. SDHI1 selection ARM: shmobile: mackerel: add interrupt names for SDHI0 ARM: shmobile: mackerel: switch SDHI and MMCIF interfaces to slot-gpio ARM: shmobile: mackerel: remove OCR masks, where regulators are used ARM: shmobile: mackerel: SDHI resources do not have to be numbered ARM: shmobile: Initial r8a7790 Lager board support ARM: shmobile: APE6EVM LAN9220 support ARM: shmobile: APE6EVM PFC support ARM: shmobile: APE6EVM base support ARM: shmobile: kzm9g-reference: add ethernet support ARM: shmobile: add R-Car M1A Bock-W platform support ...
2013-05-04Merge tag 'renesas-pinctrl-for-linus' of ↵Linus Torvalds11-18/+132
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC pinctrl changes for Renesas from Olof Johansson: "This is yet another driver change, which is split out just because of its size. As already in 3.9, a lot of changes are going on here, as the shmobile platform gets converted from its own pin control API to the generic drivers/pinctrl subsystem. Based on agreements with Paul Mundt, we are merging the sh-arch-side changes here as well" * tag 'renesas-pinctrl-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (142 commits) ARM: shmobile: r8a7779: Remove INTC function GPIOs ARM: shmobile: r8a7779: Remove LBSC function GPIOs ARM: shmobile: r8a7779: Remove USB function GPIOs ARM: shmobile: r8a7779: Remove HSPI function GPIOs ARM: shmobile: r8a7779: Remove SCIF function GPIOs ARM: shmobile: r8a7779: Remove SDHI and MMCIF function GPIOs ARM: shmobile: r8a7779: Remove DU function GPIOs ARM: shmobile: r8a7779: Remove DU1_DOTCLKOUT1 GPIO ARM: shmobile: r8a7740: Remove SDHI and MMCIF function GPIOs ARM: shmobile: r8a7740: Remove LCD0 and LCD1 function GPIOs ARM: shmobile: sh73a0: Remove IrDA function GPIOs ARM: shmobile: sh73a0: Remove USB function GPIOs ARM: shmobile: sh73a0: Remove BSC function GPIOs ARM: shmobile: sh73a0: Remove KEYSC function GPIOs ARM: shmobile: sh73a0: Remove pull-up function GPIOS ARM: shmobile: sh73a0: Remove FSI function GPIOs ARM: shmobile: sh73a0: Remove I2C function GPIOs ARM: shmobile: sh73a0: Remove SCIFA and SCIFB function GPIOs ARM: shmobile: sh73a0: Remove LCDC and LCDC2 function GPIOs ARM: shmobile: sh7372: Remove SDHI and MMCIF function GPIOs ...
2013-04-24SH: cpuidle: use init/exit common routineDaniel Lezcano1-6/+1
Remove the duplicated code and use the cpuidle common code for initialization. Signed-off-by: Daniel Lezcano <[email protected]> Acked-by: Simon Horman <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
2013-04-23cpuidle: remove en_core_tk_irqen flagDaniel Lezcano1-1/+0
The en_core_tk_irqen flag is set in all the cpuidle driver which means it is not necessary to specify this flag. Remove the flag and the code related to it. Signed-off-by: Daniel Lezcano <[email protected]> Acked-by: Kevin Hilman <[email protected]> # for mach-omap2/* Signed-off-by: Rafael J. Wysocki <[email protected]>
2013-04-22SH: cpuidle: check error code at initDaniel Lezcano2-5/+9
Registering the driver, or the device, can fail, let's check the return code and return the error code to the PM layer. Signed-off-by: Daniel Lezcano <[email protected]> Acked-by: Simon Horman <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
2013-04-22SH: cpuidle: initialize the driver's states directlyDaniel Lezcano1-50/+42
Like all the other drivers, let's initialize the structure a compile time instead of init time. The states #1 and #2 are not enabled by default. The init function will check the features of the board in order to enable the state. Signed-off-by: Daniel Lezcano <[email protected]> Acked-by: Simon Horman <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
2013-04-22SH: cpuidle: remove CPUIDLE_DRIVER_STATE_START usageDaniel Lezcano1-4/+2
The CPUIDLE_DRIVER_STATE_START constant is only set when the kernel compilation option CONFIG_ARCH_HAS_CPU_RELAX is set, but this is only relatated to x86, so it is always zero. Remove the reference to this constant in the code. Signed-off-by: Daniel Lezcano <[email protected]> Acked-by: Simon Horman <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
2013-04-22SH: cpuidle: remove pointless initializationDaniel Lezcano1-6/+0
The driver is a global static variable automatically initialized to zero. Removing the useless initialization in the init function. Signed-off-by: Daniel Lezcano <[email protected]> Acked-by: Simon Horman <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
2013-04-02sh: sh7269: Fix compilation by adding missing includesLaurent Pinchart1-0/+2
struct resource is defined in linux/ioport.h. Include it. Signed-off-by: Laurent Pinchart <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-03-20sh: replace CONFIG_GENERIC_GPIO by CONFIG_GPIOLIBAlexandre Courbot3-3/+3
SH GPIO drivers all use gpiolib and CONFIG_GENERIC_GPIO is only selected through CONFIG_GPIOLIB, yet some compilation units depended on CONFIG_GENERIC_GPIO. Make them depend on CONFIG_GPIOLIB instead since it is more accurate and prepares us for the future removal of CONFIG_GENERIC_GPIO. Signed-off-by: Alexandre Courbot <[email protected]> Acked-by: Paul Mundt <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Acked-by: Linus Walleij <[email protected]>
2013-03-15sh: shx3: Add pin control resourcesLaurent Pinchart1-3/+14
Add memory resources for the pin control platform device to let the sh-pfc driver ioremap() registers properly instead of evily casting register physical addresses to virtual addresses. The memory resource address range has been extracted from the config and data registes lists in the sh-pfc driver. Signed-off-by: Laurent Pinchart <[email protected]>
2013-03-15sh: sh7786: Add pin control resourcesLaurent Pinchart1-2/+12
Add memory resources for the pin control platform device to let the sh-pfc driver ioremap() registers properly instead of evily casting register physical addresses to virtual addresses. The memory resource address range has been extracted from the config and data registes lists in the sh-pfc driver. Signed-off-by: Laurent Pinchart <[email protected]>
2013-03-15sh: sh7785: Add pin control resourcesLaurent Pinchart1-2/+12
Add memory resources for the pin control platform device to let the sh-pfc driver ioremap() registers properly instead of evily casting register physical addresses to virtual addresses. The memory resource address range has been extracted from the config and data registes lists in the sh-pfc driver. Signed-off-by: Laurent Pinchart <[email protected]>
2013-03-15sh: sh7757: Add pin control resourcesLaurent Pinchart1-1/+12
Add memory resources for the pin control platform device to let the sh-pfc driver ioremap() registers properly instead of evily casting register physical addresses to virtual addresses. The memory resource address range has been extracted from the config and data registes lists in the sh-pfc driver. Signed-off-by: Laurent Pinchart <[email protected]>
2013-03-15sh: sh7724: Add pin control resourcesLaurent Pinchart1-1/+12
Add memory resources for the pin control platform device to let the sh-pfc driver ioremap() registers properly instead of evily casting register physical addresses to virtual addresses. The memory resource address range has been extracted from the config and data registes lists in the sh-pfc driver. Signed-off-by: Laurent Pinchart <[email protected]>
2013-03-15sh: sh7723: Add pin control resourcesLaurent Pinchart1-2/+12
Add memory resources for the pin control platform device to let the sh-pfc driver ioremap() registers properly instead of evily casting register physical addresses to virtual addresses. The memory resource address range has been extracted from the config and data registes lists in the sh-pfc driver. Signed-off-by: Laurent Pinchart <[email protected]>
2013-03-15sh: sh7722: Add pin control resourcesLaurent Pinchart1-2/+12
Add memory resources for the pin control platform device to let the sh-pfc driver ioremap() registers properly instead of evily casting register physical addresses to virtual addresses. The memory resource address range has been extracted from the config and data registes lists in the sh-pfc driver. Signed-off-by: Laurent Pinchart <[email protected]>
2013-03-15sh: sh7720: Add pin control resourcesLaurent Pinchart1-2/+12
Add memory resources for the pin control platform device to let the sh-pfc driver ioremap() registers properly instead of evily casting register physical addresses to virtual addresses. The memory resource address range has been extracted from the config and data registes lists in the sh-pfc driver. Signed-off-by: Laurent Pinchart <[email protected]>
2013-03-15sh: sh7269: Add pin control resourcesLaurent Pinchart1-1/+10
Add memory resources for the pin control platform device to let the sh-pfc driver ioremap() registers properly instead of evily casting register physical addresses to virtual addresses. The memory resource address range has been extracted from the config and data registes lists in the sh-pfc driver. Signed-off-by: Laurent Pinchart <[email protected]>
2013-03-15sh: sh7264: Add pin control resourcesLaurent Pinchart1-1/+12
Add memory resources for the pin control platform device to let the sh-pfc driver ioremap() registers properly instead of evily casting register physical addresses to virtual addresses. The memory resource address range has been extracted from the config and data registes lists in the sh-pfc driver. Signed-off-by: Laurent Pinchart <[email protected]>
2013-03-15sh: sh7203: Add pin control resourcesLaurent Pinchart1-1/+12
Add memory resources for the pin control platform device to let the sh-pfc driver ioremap() registers properly instead of evily casting register physical addresses to virtual addresses. The memory resource address range has been extracted from the config and data registes lists in the sh-pfc driver. Signed-off-by: Laurent Pinchart <[email protected]>
2013-01-25sh: Remove unused sh_pfc_register_info() functionLaurent Pinchart1-12/+1
All boards use sh_pfc_register() directly, remove the unused sh_pfc_register_info() function. Make the name argument to sh_pfc_register() mandatory as it's now supplied by all callers. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: shx3: pinmux: Use driver-provided pinmux infoLaurent Pinchart1-571/+1
Pinmux info for the sh machines is now provided by pinmux drivers. Remove the duplicate copy in arch code. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7786: pinmux: Use driver-provided pinmux infoLaurent Pinchart1-820/+1
Pinmux info for the sh machines is now provided by pinmux drivers. Remove the duplicate copy in arch code. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7785: pinmux: Use driver-provided pinmux infoLaurent Pinchart1-1292/+1
Pinmux info for the sh machines is now provided by pinmux drivers. Remove the duplicate copy in arch code. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7757: pinmux: Use driver-provided pinmux infoLaurent Pinchart1-2265/+1
Pinmux info for the sh machines is now provided by pinmux drivers. Remove the duplicate copy in arch code. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7734: pinmux: Use driver-provided pinmux infoLaurent Pinchart1-2465/+3
Pinmux info for the sh machines is now provided by pinmux drivers. Remove the duplicate copy in arch code. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7724: pinmux: Use driver-provided pinmux infoLaurent Pinchart1-2208/+1
Pinmux info for the sh machines is now provided by pinmux drivers. Remove the duplicate copy in arch code. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7723: pinmux: Use driver-provided pinmux infoLaurent Pinchart1-1891/+1
Pinmux info for the sh machines is now provided by pinmux drivers. Remove the duplicate copy in arch code. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7722: pinmux: Use driver-provided pinmux infoLaurent Pinchart1-1776/+1
Pinmux info for the sh machines is now provided by pinmux drivers. Remove the duplicate copy in arch code. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7720: pinmux: Use driver-provided pinmux infoLaurent Pinchart1-1224/+1
Pinmux info for the sh machines is now provided by pinmux drivers. Remove the duplicate copy in arch code. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7269: pinmux: Use driver-provided pinmux infoLaurent Pinchart1-2821/+1
Pinmux info for the sh machines is now provided by pinmux drivers. Remove the duplicate copy in arch code. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7264: pinmux: Use driver-provided pinmux infoLaurent Pinchart1-2119/+1
Pinmux info for the sh machines is now provided by pinmux drivers. Remove the duplicate copy in arch code. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7203: pinmux: Use driver-provided pinmux infoLaurent Pinchart1-1580/+1
Pinmux info for the sh machines is now provided by pinmux drivers. Remove the duplicate copy in arch code. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: shx3: Register PFC platform deviceLaurent Pinchart1-1/+2
Add arch code to register the PFC platform device instead of calling the driver directly. Platform device registration in the sh-pfc driver will be removed. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7786: Register PFC platform deviceLaurent Pinchart1-1/+2
Add arch code to register the PFC platform device instead of calling the driver directly. Platform device registration in the sh-pfc driver will be removed. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7785: Register PFC platform deviceLaurent Pinchart1-1/+2
Add arch code to register the PFC platform device instead of calling the driver directly. Platform device registration in the sh-pfc driver will be removed. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7757: Register PFC platform deviceLaurent Pinchart1-1/+2
Add arch code to register the PFC platform device instead of calling the driver directly. Platform device registration in the sh-pfc driver will be removed. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7734: Register PFC platform deviceLaurent Pinchart1-4/+4
Add arch code to register the PFC platform device instead of calling the driver directly. Platform device registration in the sh-pfc driver will be removed. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7724: Register PFC platform deviceLaurent Pinchart1-1/+2
Add arch code to register the PFC platform device instead of calling the driver directly. Platform device registration in the sh-pfc driver will be removed. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7723: Register PFC platform deviceLaurent Pinchart1-1/+2
Add arch code to register the PFC platform device instead of calling the driver directly. Platform device registration in the sh-pfc driver will be removed. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7722: Register PFC platform deviceLaurent Pinchart1-1/+2
Add arch code to register the PFC platform device instead of calling the driver directly. Platform device registration in the sh-pfc driver will be removed. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7720: Register PFC platform deviceLaurent Pinchart1-1/+2
Add arch code to register the PFC platform device instead of calling the driver directly. Platform device registration in the sh-pfc driver will be removed. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7269: Register PFC platform deviceLaurent Pinchart1-1/+2
Add arch code to register the PFC platform device instead of calling the driver directly. Platform device registration in the sh-pfc driver will be removed. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7264: Register PFC platform deviceLaurent Pinchart1-1/+2
Add arch code to register the PFC platform device instead of calling the driver directly. Platform device registration in the sh-pfc driver will be removed. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7203: Register PFC platform deviceLaurent Pinchart1-1/+2
Add arch code to register the PFC platform device instead of calling the driver directly. Platform device registration in the sh-pfc driver will be removed. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: Add PFC platform device registration helper functionLaurent Pinchart2-1/+45
The sh_pfc_register() function can be called by boards or SoC setup code to register the PFC platform device. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: shx3: Fix last GPIO indexLaurent Pinchart1-1/+1
A careless look at the code shows that the last entry in the pinmux_gpios seems to be GPIO_FN_IRQOUT. However, entries are ordered by the GPIO number, as the PINMUX_GPIO macro is expended to an indexed array initializer. The last entry in the array is thus GPIO_FN_STATUS0. Set the pinmux_info last_gpio field accordingly. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7786: Fix last GPIO indexLaurent Pinchart1-1/+1
A careless look at the code shows that the last entry in the pinmux_gpios seems to be GPIO_FN_FSE. However, entries are ordered by the GPIO number, as the PINMUX_GPIO macro is expended to an indexed array initializer. The last entry in the array is thus GPIO_FN_IRL4. Set the pinmux_info last_gpio field accordingly. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2013-01-25sh: sh7786: Fix port E, G and J GPIOsLaurent Pinchart1-2/+2
The port E, G and J GPIOs don't match the SoC datasheet (they seem to have been copied from the SH7785). Fix them. Signed-off-by: Laurent Pinchart <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Simon Horman <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.