]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
11 years agoMerge branch 'fixes' into for-next
Olof Johansson [Tue, 11 Jun 2013 08:10:31 +0000 (01:10 -0700)]
Merge branch 'fixes' into for-next

* fixes:
  ARM: SAMSUNG: pm: Adjust for pinctrl- and DT-enabled platforms

11 years agoARM: SAMSUNG: pm: Adjust for pinctrl- and DT-enabled platforms
Tomasz Figa [Fri, 17 May 2013 16:24:29 +0000 (18:24 +0200)]
ARM: SAMSUNG: pm: Adjust for pinctrl- and DT-enabled platforms

This patch makes legacy code on suspend/resume path being executed
conditionally, on non-DT platforms only, to fix suspend/resume of
DT-enabled systems, for which the code is inappropriate.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
[olof: add #include <linux/of.h>]
Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge branch 'next/boards' into for-next
Olof Johansson [Tue, 11 Jun 2013 07:33:29 +0000 (00:33 -0700)]
Merge branch 'next/boards' into for-next

* next/boards:
  ARM: shmobile: marzen: keep local function as static
  ARM: shmobile: bockw: add SDHI0 support
  ARM: shmobile: marzen: Use INTC External IRQ pin driver for SMSC
  ARM: shmobile: lager: support GPIO switches
  ARM: shmobile: lager: Add GPIO LEDs
  ARM: shmobile: bockw: add dummy regulators for SMSC
  ARM: shmobile: bockw: add CN9 SCIF/RCAN selection dipswitch explanation
  ARM: shmobile: kzm9g: add AS3711 PMIC platform data
  ARM: shmobile: kzm9d: resigser smsc911x platform device with id -1
  ARM: shmobile: bockw: define FPGA address and rename iomem variable
  ARM: shmobile: ape6evm: MP clock parent become EXTAL2

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge tag 'renesas-boards-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel...
Olof Johansson [Tue, 11 Jun 2013 07:33:14 +0000 (00:33 -0700)]
Merge tag 'renesas-boards-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

From Simon Horman:
Renesas ARM-based SoC board updates for v3.11

Highlights:
bockw: add SDHI0 support
bockw: add dummy regulators for SMSC
bockw: Document CN9 SCIF/RCAN dipswitch selection
lager: support GPIO switches and LEDs
kzm9g: add AS3711 PMIC platform data
marzen: Use INTC External IRQ pin driver for SMSC
ape6evm: Update MP clock parent become EXTAL2 in line with changes
         to r8a73a4 SoC code

* tag 'renesas-boards-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: marzen: keep local function as static
  ARM: shmobile: bockw: add SDHI0 support
  ARM: shmobile: marzen: Use INTC External IRQ pin driver for SMSC
  ARM: shmobile: lager: support GPIO switches
  ARM: shmobile: lager: Add GPIO LEDs
  ARM: shmobile: bockw: add dummy regulators for SMSC
  ARM: shmobile: bockw: add CN9 SCIF/RCAN selection dipswitch explanation
  ARM: shmobile: kzm9g: add AS3711 PMIC platform data
  ARM: shmobile: kzm9d: resigser smsc911x platform device with id -1
  ARM: shmobile: bockw: define FPGA address and rename iomem variable
  ARM: shmobile: ape6evm: MP clock parent become EXTAL2

11 years agoMerge branch 'renesas/soc' into next/boards
Olof Johansson [Tue, 11 Jun 2013 07:32:57 +0000 (00:32 -0700)]
Merge branch 'renesas/soc' into next/boards

Signed-off-by: Olof Johansson <olof@lixom.net>
Conflicts:
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/include/mach/r8a7778.h
arch/arm/mach-shmobile/setup-r8a7778.c

11 years agoMerge branch 'renesas/pinmux-gpio' into next/boards
Olof Johansson [Tue, 11 Jun 2013 07:32:20 +0000 (00:32 -0700)]
Merge branch 'renesas/pinmux-gpio' into next/boards

11 years agoMerge branch 'next/soc' into for-next
Olof Johansson [Tue, 11 Jun 2013 07:31:45 +0000 (00:31 -0700)]
Merge branch 'next/soc' into for-next

* next/soc: (157 commits)
  ARM: shmobile: sh73a0: div4 clocks must check the kick bit before changing rate
  ARM: shmobile: sh73a0: do not overwrite all div4 clock operations
  ARM: shmobile: sh73a0: Always use shmobile_setup_delay()
  ARM: shmobile: sh73a0: add CPUFreq support
  ARM: shmobile: sh73a0: add support for adjusting CPU frequency
  ARM: shmobile: r8a7790: add TPU PWM support
  ARM: shmobile: r8a7790: Make private clock arrays static
  ARM: shmobile: r8a7790: add div6 clocks
  ARM: shmobile: r8a7790: add div4 clocks
  ARM: shmobile: r8a7790: add main clock
  ARM: shmobile: r8a7778: Register SDHI device
  ARM: shmobile: r8a7778: add SDHI clock support
  ARM: shmobile: r8a7778: use fixed ratio clock
  ARM: shmobile: r8a7779: Add PCIe clocks
  ARM: shmobile: r8a73a4: add div6 clocks
  ARM: shmobile: r8a73a4: add div4 clocks
  ARM: shmobile: r8a73a4: add pll clocks
  ARM: shmobile: r8a73a4: add main clock
  ARM: shmobile: r8a7740: add TPU PWM support
  ARM: shmobile: r8a7740: Add I2C DT clock names
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge tag 'renesas-soc-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git...
Olof Johansson [Tue, 11 Jun 2013 07:31:14 +0000 (00:31 -0700)]
Merge tag 'renesas-soc-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

From Simon Horman:
Renesas ARM-based SoC updates for v3.11

* Increased clock coverage for r8a7740, r8a73a4, r8a7778 and r8a7790
* Use fixed clock ratio for r8a7778
* Always use shmobile_setup_delay for sh73a0
* Add add CPUFreq support for sh73a0
* Check kick bit before changing rate on sh73a0
* Do not overwrite all div4 clock operations on sh73a0

* Cleanup SH_FIXED_RATIO_CLK and SH_FIXED_RATIO_CLK macros
* sh73a0: Use DEFINE_RES_MEM*() everywhere
* r8a7740: Make private clock arrays static
* r8a7778: Correct model number

The last four changes listed above are cleanups. I have included them
in this series as all bar the last one are dependencies of non-cleanup
patches.

* tag 'renesas-soc-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (27 commits)
  ARM: shmobile: sh73a0: div4 clocks must check the kick bit before changing rate
  ARM: shmobile: sh73a0: do not overwrite all div4 clock operations
  ARM: shmobile: sh73a0: Always use shmobile_setup_delay()
  ARM: shmobile: sh73a0: add CPUFreq support
  ARM: shmobile: sh73a0: add support for adjusting CPU frequency
  ARM: shmobile: r8a7790: add TPU PWM support
  ARM: shmobile: r8a7790: Make private clock arrays static
  ARM: shmobile: r8a7790: add div6 clocks
  ARM: shmobile: r8a7790: add div4 clocks
  ARM: shmobile: r8a7790: add main clock
  ARM: shmobile: r8a7778: Register SDHI device
  ARM: shmobile: r8a7778: add SDHI clock support
  ARM: shmobile: r8a7778: use fixed ratio clock
  ARM: shmobile: r8a7779: Add PCIe clocks
  ARM: shmobile: r8a73a4: add div6 clocks
  ARM: shmobile: r8a73a4: add div4 clocks
  ARM: shmobile: r8a73a4: add pll clocks
  ARM: shmobile: r8a73a4: add main clock
  ARM: shmobile: r8a7740: add TPU PWM support
  ARM: shmobile: r8a7740: Add I2C DT clock names
  ...

Conflicts:
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/include/mach/r8a7778.h
arch/arm/mach-shmobile/setup-r8a7778.c

11 years agoMerge branch 'fixes' into for-next
Olof Johansson [Tue, 11 Jun 2013 07:13:09 +0000 (00:13 -0700)]
Merge branch 'fixes' into for-next

* fixes:
  ARM: prima2: fix incorrect panic usage

11 years agoMerge branch 'next/fixes-non-critical' into for-next
Olof Johansson [Tue, 11 Jun 2013 07:08:49 +0000 (00:08 -0700)]
Merge branch 'next/fixes-non-critical' into for-next

* next/fixes-non-critical:
  irqchip: Add irqchip_init dummy function
  irqchip: renesas-irqc: Fix irqc_probe error handling

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge tag 'renesas-pinmux-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel...
Olof Johansson [Tue, 11 Jun 2013 07:21:46 +0000 (00:21 -0700)]
Merge tag 'renesas-pinmux-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

From Simon Horman:
Renesas ARM based SoC pinmux and GPIO update for v3.11

SH-PFC:
* Entries for INTC external IRQs
* Remove dependency on GPIOLIB
* PFC support for r8a7790 SoC
* Pinmux support for r8a7778 SoC
* Increase pin group and function coverage for sh7372, r8a7740,
  r8a7778, r8a7779 and r8a7790 SoCs
* Use pinctrl mapping on mackerel, ap4evb, armadillo800eva,
  bonito, bockw, lager boards
* Use RCAR_GP_PIN macro in marzen board
* Remove unused GPIOs for sh7372, sh73a0, r8a7740 and r8a7790 SoCs
* Add bias (pull-up/down) pinconf support for r8a7740 SoC
* Add VCCQ support for sh73a0

GPIO car:
* Add RCAR_GP_PIN macro
* Add support for IRQ_TYPE_EDGE_BOTH
* Make the platform data gpio_base field signed

The GPIO changes have been included as the RCAR_GP_PIN and
IRQ_TYPE_EDGE_BOTH changes are depended on by SH-PFC changes.

* tag 'renesas-pinmux-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (132 commits)
  ARM: shmobile: marzen: Use RCAR_GP_PIN macro
  ARM: shmobile: lager: Initialize pinmux
  ARM: shmobile: bockw: add pinctrl support
  ARM: shmobile: kzm9g: tidyup FSI pinctrl
  ARM: shmobile: r8a7740 pinmux platform device cleanup
  ARM: shmobile: r8a7790: Configure R-Car GPIO for IRQ_TYPE_EDGE_BOTH
  pinctrl: sh-pfc: r8a7779: Fix missing MOD_SEL2 entry
  Revert "ARM: shmobile: Disallow PINCTRL without GPIOLIB"
  pinctrl: r8a7790: add pinmux data for MMCIF and SDHI interfaces
  sh-pfc: r8a7778: add MMCIF pin groups
  sh-pfc: r8a7778: add HSPI pin groups
  sh-pfc: r8a7778: add I2C pin groups
  pinctrl: sh-pfc: fix a typo in pfc-r8a7790
  pinctrl: sh-pfc: fix r8a7790 Function Select register tables
  sh-pfc: r8a7778: fixup IRQ1A settings
  sh-pfc: r8a7779: add Ether pin groups
  sh-pfc: r8a7778: add Ether pin groups
  sh-pfc: r8a7778: add VIN pin groups
  sh-pfc: sh73a0: Remove function GPIOs
  sh-pfc: r8a7790: Add TPU pin groups and functions
  ...

11 years agoARM: prima2: fix incorrect panic usage
Haojian Zhuang [Fri, 7 Jun 2013 03:17:07 +0000 (11:17 +0800)]
ARM: prima2: fix incorrect panic usage

In prima2, some functions of checking DT is registered in initcall
level. If it doesn't match the compatible name of sirf, kernel
will panic. It blocks the usage of multiplatform on other verndor.

The error message is in below.

Knic - not syncing: unable to find compatible pwrc node in dtb
CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.10.0-rc3-00006-gd7f26ea-dirty #86
[<c0013adc>] (unwind_backtrace+0x0/0xf8) from [<c0011430>] (show_stack+0x10/0x1)
[<c0011430>] (show_stack+0x10/0x14) from [<c026f724>] (panic+0x90/0x1e8)
[<c026f724>] (panic+0x90/0x1e8) from [<c03267fc>] (sirfsoc_of_pwrc_init+0x24/0x)
[<c03267fc>] (sirfsoc_of_pwrc_init+0x24/0x58) from [<c0320864>] (do_one_initcal)
[<c0320864>] (do_one_initcall+0x90/0x150) from [<c0320a20>] (kernel_init_freeab)
[<c0320a20>] (kernel_init_freeable+0xfc/0x1c4) from [<c026b9e8>] (kernel_init+0)
[<c026b9e8>] (kernel_init+0x8/0xe4) from [<c000e158>] (ret_from_fork+0x14/0x3c)

Signen-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge tag 'renesas-intc-external-irq-for-v3.11' of git://git.kernel.org/pub/scm/linux...
Olof Johansson [Tue, 11 Jun 2013 07:08:32 +0000 (00:08 -0700)]
Merge tag 'renesas-intc-external-irq-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/fixes-non-critical

From Simon Horman:
Update for Renesas INTC External IRQ pin driver for v3.11

- Correct error handing in irqc_probe
- Add irqchip_init dummy function

* tag 'renesas-intc-external-irq-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  irqchip: Add irqchip_init dummy function
  irqchip: renesas-irqc: Fix irqc_probe error handling

11 years agoMerge branch 'next/dt' into for-next
Olof Johansson [Tue, 11 Jun 2013 05:14:19 +0000 (22:14 -0700)]
Merge branch 'next/dt' into for-next

* next/dt:
  ARM: shmobile: marzen-reference: add irqpin support in DT
  ARM: shmobile: kzm9g-reference: add AS3711 and CPUFreq DT bindings
  ARM: shmobile: armadillo800eva: Reference DT implementation
  ARM: shmobile: Remove unused r8a7790 GIC CPU interface DT bits
  ARM: shmobile: Remove unused r8a73a4 GIC CPU interface DT bits
  ARM: shmobile: r8a7740: Prepare for reference DT setup
  ARM: shmobile: r8a7740: Add OF support to initialze the GIC

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge tag 'renesas-dt-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git...
Olof Johansson [Tue, 11 Jun 2013 05:13:52 +0000 (22:13 -0700)]
Merge tag 'renesas-dt-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

From Simon Horman:
Renesas ARM-based SoC DT updates for v3.11

* Armadillo800eva reference DT - bring up armadillo800eva baord
  using DT as much as possible
* Remove unused GIC dtsi entries for r8a7790 and r8a73a4
* Add AS3711 and CPUFreq DT bindings for kzm9g-reference
* Add irqpin DT support for marzen-reference

* tag 'renesas-dt-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: marzen-reference: add irqpin support in DT
  ARM: shmobile: kzm9g-reference: add AS3711 and CPUFreq DT bindings
  ARM: shmobile: armadillo800eva: Reference DT implementation
  ARM: shmobile: Remove unused r8a7790 GIC CPU interface DT bits
  ARM: shmobile: Remove unused r8a73a4 GIC CPU interface DT bits
  ARM: shmobile: r8a7740: Prepare for reference DT setup
  ARM: shmobile: r8a7740: Add OF support to initialze the GIC

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge branch 'next/boards' into for-next
Olof Johansson [Tue, 11 Jun 2013 05:12:25 +0000 (22:12 -0700)]
Merge branch 'next/boards' into for-next

* next/boards:
  ARM: shmobile: kzm9g: enable AS3711 PMIC in defconfig
  ARM: shmobile: bockw: enable USB in defconfig
  ARM: shmobile: bockw: enable CONFIG_PM_RUNTIME in defconfig
  ARM: shmobile: bockw: enable I2C in defconfig
  ARM: shmobile: bockw: enable SDHI on defconfig
  ARM: shmobile: armadillo800eva: Fix maximum number of SCIF

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge tag 'renesas-defconfig-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel...
Olof Johansson [Tue, 11 Jun 2013 05:12:00 +0000 (22:12 -0700)]
Merge tag 'renesas-defconfig-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

From Simon Horman:
Renesas ARM based SoC defconfig updates for v3.11

kzm9g: Enable AS3711 PMIC
bockw: Enable, USB, PM_RUNTIME, I2C and SDHI
armadillo800eva: Correct SERIAL_SH_SCI_NR_UARTS

* tag 'renesas-defconfig-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: kzm9g: enable AS3711 PMIC in defconfig
  ARM: shmobile: bockw: enable USB in defconfig
  ARM: shmobile: bockw: enable CONFIG_PM_RUNTIME in defconfig
  ARM: shmobile: bockw: enable I2C in defconfig
  ARM: shmobile: bockw: enable SDHI on defconfig
  ARM: shmobile: armadillo800eva: Fix maximum number of SCIF

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge branch 'next/soc' into for-next
Olof Johansson [Tue, 11 Jun 2013 05:01:21 +0000 (22:01 -0700)]
Merge branch 'next/soc' into for-next

* next/soc:
  arm: kirkwood: NETGEAR ReadyNAS Duo v2 init PCIe via DT

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge tag 'pcie_kw-3.11-2' of git://git.infradead.org/users/jcooper/linux into next/soc
Olof Johansson [Tue, 11 Jun 2013 04:50:49 +0000 (21:50 -0700)]
Merge tag 'pcie_kw-3.11-2' of git://git.infradead.org/users/jcooper/linux into next/soc

From Jason Cooper:
mvebu pcie driver (kirkwood) for v3.11 (round 2)
 - kirkwood
    - migrate Netgear ReadyNAS Duo v2 to pcie DT init

* tag 'pcie_kw-3.11-2' of git://git.infradead.org/users/jcooper/linux:
  arm: kirkwood: NETGEAR ReadyNAS Duo v2 init PCIe via DT

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge branch 'next/dt' into for-next
Olof Johansson [Tue, 11 Jun 2013 04:42:48 +0000 (21:42 -0700)]
Merge branch 'next/dt' into for-next

* next/dt:
  ARM: Kirkwood add cpus definition needed by cpufreq driver to dtsi
  ARM: kirkwood: add i2c-gpio controller for km_kirkwood
  ARM: kirkwood: refactor dtsi to largest common nodes

Signed-off-by: Olof Johansson <olof@lixom.net>
Conflicts:
arch/arm/boot/dts/kirkwood-6281.dtsi

11 years agoMerge tag 'dt-3.11-4' of git://git.infradead.org/users/jcooper/linux into next/dt
Olof Johansson [Tue, 11 Jun 2013 04:39:37 +0000 (21:39 -0700)]
Merge tag 'dt-3.11-4' of git://git.infradead.org/users/jcooper/linux into next/dt

From Jason Cooper:
mvebu dt changes for v3.11 (round 4)

 - kirkwood
    - reshuffle nodes from kirkwood.dtsi to -6281.dtsi, etc
    - add i2c-gpio for km_kirkwood
    - add cpu node so pending cpufreq driver will init

* tag 'dt-3.11-4' of git://git.infradead.org/users/jcooper/linux:
  ARM: Kirkwood add cpus definition needed by cpufreq driver to dtsi
  ARM: kirkwood: add i2c-gpio controller for km_kirkwood
  ARM: kirkwood: refactor dtsi to largest common nodes

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge branch 'next/dt' into for-next
Arnd Bergmann [Mon, 10 Jun 2013 14:53:23 +0000 (16:53 +0200)]
Merge branch 'next/dt' into for-next

11 years agoARM: dts: add missing cpu #address-cell values
Arnd Bergmann [Mon, 10 Jun 2013 14:48:36 +0000 (16:48 +0200)]
ARM: dts: add missing cpu #address-cell values

A recent series has added CPU numbers to a lot of dts files,
but unfortunately in a few cases the #address-cells
and #size-cells values are missing, which causes build warnings.
This adds the missing ones for sunxi and sama5 that I found
through build testing.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
11 years agoMerge branch 'fixes' into for-next
Olof Johansson [Sun, 9 Jun 2013 18:44:42 +0000 (11:44 -0700)]
Merge branch 'fixes' into for-next

* fixes:
  ARM: omap3: clock: fix wrong container_of in clock36xx.c
  ARM: dts: OMAP5: Fix missing PWM capability to timer nodes
  ARM: dts: omap4-panda|sdp: Fix mux for twl6030 IRQ pin and msecure line
  ARM: dts: AM33xx: Fix properties on gpmc node
  arm: omap2: fix AM33xx hwmod infos for UART2
  ARM: OMAP3: Fix iva2_pwrdm settings for 3703

11 years agoMerge tag 'omap-for-v3.10/fixes-v3.10-rc4' of git://git.kernel.org/pub/scm/linux...
Olof Johansson [Sun, 9 Jun 2013 18:44:17 +0000 (11:44 -0700)]
Merge tag 'omap-for-v3.10/fixes-v3.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

From Tony Lindgren, a set of small fixes for omaps for the -rc cycle:

- am7303 iva2 reset PM regression fix
- am33xx uart2 dma channel fix
- am33xx gpmc properties fix
- omap44xx rtc wake-up mux fix for nirq pins
- omap36xx clock divider restore fix

There's also one tiny non-critical .dts fix for omap5
timer pwm properties.

* tag 'omap-for-v3.10/fixes-v3.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: omap3: clock: fix wrong container_of in clock36xx.c
  ARM: dts: OMAP5: Fix missing PWM capability to timer nodes
  ARM: dts: omap4-panda|sdp: Fix mux for twl6030 IRQ pin and msecure line
  ARM: dts: AM33xx: Fix properties on gpmc node
  arm: omap2: fix AM33xx hwmod infos for UART2
  ARM: OMAP3: Fix iva2_pwrdm settings for 3703

11 years agoMerge branch 'next/fixes-non-critical' into for-next
Olof Johansson [Sun, 9 Jun 2013 05:31:06 +0000 (22:31 -0700)]
Merge branch 'next/fixes-non-critical' into for-next

* next/fixes-non-critical:
  arm: prima2: use of_platform_populate instead of of_platform_bus_probe
  ARM: prima2: fix a checkpatch issue
  ARM: prima2: Replace include linux/module.h with linux/export.h

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge tag 'sirf-arm-soc-v3.10-fixes' of git://gitorious.org/sirfprima2-kernel/sirfpri...
Olof Johansson [Sun, 9 Jun 2013 05:30:28 +0000 (22:30 -0700)]
Merge tag 'sirf-arm-soc-v3.10-fixes' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/fixes-non-critical

From Barry Song, SiRF fixes for v3.10 (that we're punting to 3.11):

- Replace include linux/module.h with linux/export.h
- fix a checkpatch issue
- use of_platform_populate instead of of_platform_bus_probe

* tag 'sirf-arm-soc-v3.10-fixes' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel:
  arm: prima2: use of_platform_populate instead of of_platform_bus_probe
  ARM: prima2: fix a checkpatch issue
  ARM: prima2: Replace include linux/module.h with linux/export.h
  + Linux 3.10-rc4

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge branch 'next/soc' into for-next
Olof Johansson [Sat, 8 Jun 2013 01:22:23 +0000 (18:22 -0700)]
Merge branch 'next/soc' into for-next

* next/soc:
  clk: zynq: Remove deprecated clock code
  arm: zynq: Migrate platform to clock controller
  clk: zynq: Add clock controller driver
  clk: zynq: Factor out PLL driver

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge branch 'fixes' into for-next
Olof Johansson [Sat, 8 Jun 2013 01:20:26 +0000 (18:20 -0700)]
Merge branch 'fixes' into for-next

* fixes:
  ARM: exynos: add debug_ll_io_init() call in exynos_init_io()
  ARM: EXYNOS: uncompress - print debug messages if DEBUG_LL is defined
  ARM: shmobile: sh73a0: Update CMT clockevent rating to 80
  sh-pfc: r8a7779: Don't group USB OVC and PENC pins
  ARM: mxs: icoll: Fix interrupts gpio bank 0
  ARM: imx: clk-imx6q: AXI clock select index is incorrect
  ARM: dts: imx: fix clocks for cspi
  ARM i.MX6q: fix for ldb_di_sels

11 years agoMerge branch 'next/dt' into for-next
Olof Johansson [Sat, 8 Jun 2013 00:52:45 +0000 (17:52 -0700)]
Merge branch 'next/dt' into for-next

* next/dt:
  dts: vt8500: Correct reference clock on WM8850 SoCs
  dts: vt8500: Add ARM, AHB, APB and DDR clock nodes to SoC files
  dts: vt8500: Populate missing PLL nodes
  dts: clk: vt8500: Update SoC dtsi to use WM8850 PLL  clocks
  dts: vt8500: Update serial nodes and disable by default in SoC files
  dts: vt8500: Add devicetree support for WM8750 SoC and APC8750 board
  dts: vt8500: Fix invalid/missing cpu nodes for soc files.

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge tag 'zynq-clk-for-3.11' of git://git.xilinx.com/linux-xlnx into next/soc
Olof Johansson [Sat, 8 Jun 2013 00:01:42 +0000 (17:01 -0700)]
Merge tag 'zynq-clk-for-3.11' of git://git.xilinx.com/linux-xlnx into next/soc

From Michal Simek:
arm: Xilinx Zynq clock changes for v3.11

Change Xilinx Zynq DT clock description which reflects logical abstraction
of Zynq's clock tree.

- Refactor PLL driver
- Use new clock controller driver
- Change timer and uart drivers

* tag 'zynq-clk-for-3.11' of git://git.xilinx.com/linux-xlnx:
  clk: zynq: Remove deprecated clock code
  arm: zynq: Migrate platform to clock controller
  clk: zynq: Add clock controller driver
  clk: zynq: Factor out PLL driver

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge branch 'next/dt' into for-next
Olof Johansson [Fri, 7 Jun 2013 23:39:48 +0000 (16:39 -0700)]
Merge branch 'next/dt' into for-next

* next/dt:
  ARM: dts: sunxi: cpus/cpu nodes dts updates
  ARM: dts: spear: cpus/cpu nodes dts updates
  ARM: dts: sh7372: cpus/cpu nodes dts updates
  ARM: dts: r8a7740: cpus/cpu nodes dts updates
  ARM: dts: pxa2xx: cpus/cpu nodes dts updates
  ARM: dts: prima2: cpus/cpu node dts updates
  ARM: dts: picoxcell: cpus/cpu nodes dts updates
  ARM: dts: omap: cpus/cpu nodes dts updates
  ARM: dts: lpc32xx: cpus/cpu nodes dts updates
  ARM: dts: imx: cpus/cpu nodes dts updates
  ARM: dts: exynos5440: cpus/cpu nodes dts updates
  ARM: dts: at91: cpus/cpu node dts updates
  ARM: dts: armada-370-xp: cpus/cpu node dts updates
  ARM: dts: am33xx: cpus/cpu nodes dts updates

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge tag 'mxs-fixes-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into...
Olof Johansson [Sat, 8 Jun 2013 01:19:30 +0000 (18:19 -0700)]
Merge tag 'mxs-fixes-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes

From Shawn Guo, mxs fixes for 3.10:

- Since the time we move to MULTI_IRQ_HANDLER, the 0x7f polling for no
  interrupt in icoll_handle_irq() becomes insane, because 0x7f is an
  valid interrupt number, the irq of gpio bank 0.  That unnecessary
  polling results in the driver not detecting when irq 0x7f is active
  which makes the machine effectively dead lock.  The fix removes the
  interrupt poll loop and allows usage of gpio0 interrupt without an
  infinite loop.

* tag 'mxs-fixes-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: mxs: icoll: Fix interrupts gpio bank 0

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge tag 'imx-fixes-3.10-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into...
Olof Johansson [Sat, 8 Jun 2013 01:18:08 +0000 (18:18 -0700)]
Merge tag 'imx-fixes-3.10-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes

From Shawn Guo, imx fixes for 3.10, take 2:

- One device tree fix for all spi node to have per clock added.
  The clock is needed by spi driver to calculate bit rate divisor.
  The spi node in the current device trees either does not have the
  clock or is defined as dummy clock, in which case the driver probe
  will fail or spi will run at a wrong bit rate.

- Two imx6q clock fixes, which correct axi_sels and ldb_di_sels.

* tag 'imx-fixes-3.10-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: imx: clk-imx6q: AXI clock select index is incorrect
  ARM: dts: imx: fix clocks for cspi
  ARM i.MX6q: fix for ldb_di_sels

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoARM: exynos: add debug_ll_io_init() call in exynos_init_io()
Doug Anderson [Wed, 5 Jun 2013 20:56:33 +0000 (13:56 -0700)]
ARM: exynos: add debug_ll_io_init() call in exynos_init_io()

If the early MMU mapping of the UART happens to get booted out of the
TLB between the start of paging_init() and when we finally re-add the
UART at the very end of s3c_init_cpu(), we'll get a hang at bootup if
we've got early_printk enabled.  Avoid this hang by calling
debug_ll_io_init() early.

Without this patch, you can reliably reproduce a hang when early
printk is enabled by adding flush_tlb_all() at the start of
exynos_init_io().  After this patch the hang goes away.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge tag 'renesas-fixes-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel...
Olof Johansson [Sat, 8 Jun 2013 01:10:42 +0000 (18:10 -0700)]
Merge tag 'renesas-fixes-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes

From Simon Horman, Renesas ARM based SoC fixes for v3.10:
- Correction to USB OVC and PENC pin groupings on r8a7779 SoC.
  This avoids conflicts when the USB_OVCn pins are used by another function.
  This has been observed to be a problem in v3.10-rc1.
- Update CMT clock rating for sh73a0 SoC to resolve boot failure
  on kzm9g-reference. This resolves a regression between v3.9 and v3.10-rc1.

* tag 'renesas-fixes-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: sh73a0: Update CMT clockevent rating to 80
  sh-pfc: r8a7779: Don't group USB OVC and PENC pins

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoARM: EXYNOS: uncompress - print debug messages if DEBUG_LL is defined
Tushar Behera [Tue, 4 Jun 2013 04:19:10 +0000 (09:49 +0530)]
ARM: EXYNOS: uncompress - print debug messages if DEBUG_LL is defined

Printing low-level debug messages make an assumption that the specified
UART port has been preconfigured by the bootloader. Incorrectly
specified UART port results in system getting stalled while printing the
message "Uncompressing Linux... done, booting the kernel"
This UART port number is specified through S3C_LOWLEVEL_UART_PORT. Since
the UART port might different for different board, it is not possible to
specify it correctly for every board that use a common defconfig file.

Calling this print subroutine only when DEBUG_LL fixes the problem. By
disabling DEBUG_LL in default config file, we would be able to boot
multiple boards with different default UART ports.

With this current approach, we miss the print "Uncompressing Linux...
done, booting the kernel." when DEBUG_LL is not defined.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge tag 'vt8500/dts-3.11' of git://github.com/linux-wmt/linux-vtwm into next/dt
Olof Johansson [Sat, 8 Jun 2013 00:51:39 +0000 (17:51 -0700)]
Merge tag 'vt8500/dts-3.11' of git://github.com/linux-wmt/linux-vtwm into next/dt

From Tony Prisk, vt8500 devicetree updates for 3.11.

* tag 'vt8500/dts-3.11' of git://github.com/linux-wmt/linux-vtwm:
  dts: vt8500: Correct reference clock on WM8850 SoCs
  dts: vt8500: Add ARM, AHB, APB and DDR clock nodes to SoC files
  dts: vt8500: Populate missing PLL nodes
  dts: clk: vt8500: Update SoC dtsi to use WM8850 PLL  clocks
  dts: vt8500: Update serial nodes and disable by default in SoC files
  dts: vt8500: Add devicetree support for WM8750 SoC and APC8750 board
  dts: vt8500: Fix invalid/missing cpu nodes for soc files.

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge branch 'dts-cpus-updates' of git://linux-arm.org/linux-2.6-lp into next/dt
Olof Johansson [Fri, 7 Jun 2013 23:38:54 +0000 (16:38 -0700)]
Merge branch 'dts-cpus-updates' of git://linux-arm.org/linux-2.6-lp into next/dt

From Lorenzo Pieralisi, this is a series of patches that cleans up the CPU
nodes in most of the SoC dtsi files to conform to the standard bindings.

* 'dts-cpus-updates' of git://linux-arm.org/linux-2.6-lp:
  ARM: dts: sunxi: cpus/cpu nodes dts updates
  ARM: dts: spear: cpus/cpu nodes dts updates
  ARM: dts: sh7372: cpus/cpu nodes dts updates
  ARM: dts: r8a7740: cpus/cpu nodes dts updates
  ARM: dts: pxa2xx: cpus/cpu nodes dts updates
  ARM: dts: prima2: cpus/cpu node dts updates
  ARM: dts: picoxcell: cpus/cpu nodes dts updates
  ARM: dts: omap: cpus/cpu nodes dts updates
  ARM: dts: lpc32xx: cpus/cpu nodes dts updates
  ARM: dts: imx: cpus/cpu nodes dts updates
  ARM: dts: exynos5440: cpus/cpu nodes dts updates
  ARM: dts: at91: cpus/cpu node dts updates
  ARM: dts: armada-370-xp: cpus/cpu node dts updates
  ARM: dts: am33xx: cpus/cpu nodes dts updates

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge tag 'omap-fixes-b-for-3.10-rc' of git://git.kernel.org/pub/scm/linux/kernel...
Tony Lindgren [Fri, 7 Jun 2013 22:06:18 +0000 (15:06 -0700)]
Merge tag 'omap-fixes-b-for-3.10-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.10/fixes

More OMAP hwmod and clock fixes for v3.10-rc.  Fixes the AM33xx UART2.
Also fixes some CCF-related breakage on OMAP36xx/37xx, affecting DSS
at the very least.

Basic test logs for this branch are here:

http://www.pwsan.com/omap/testlogs/fixes_b_v3.10-rc/20130606093449/

11 years agoMerge branch 'dts-fixes-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git...
Tony Lindgren [Fri, 7 Jun 2013 22:05:36 +0000 (15:05 -0700)]
Merge branch 'dts-fixes-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.10/fixes

11 years agoARM: shmobile: marzen: keep local function as static
Kuninori Morimoto [Thu, 18 Apr 2013 06:33:47 +0000 (23:33 -0700)]
ARM: shmobile: marzen: keep local function as static

marzen_init_late() should be static

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: bockw: add SDHI0 support
Kuninori Morimoto [Wed, 17 Apr 2013 05:17:56 +0000 (05:17 +0000)]
ARM: shmobile: bockw: add SDHI0 support

This patch is directly accessing to PUPR4 register which can
control SDHI0 CD/WP pin pull-up setting.
It should be replaced in the future.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: marzen: Use INTC External IRQ pin driver for SMSC
Simon Horman [Thu, 18 Apr 2013 12:21:09 +0000 (21:21 +0900)]
ARM: shmobile: marzen: Use INTC External IRQ pin driver for SMSC

Update the marzen board to use the INTC External IRQ pin driver for SMSC.

This code was originally posted by Magnus Damm as part of
"ARM: shmobile: INTC External IRQ pin driver on r8a7779"
but somehow omitted when I applied that patch.

Cc: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: lager: support GPIO switches
Simon Horman [Mon, 13 May 2013 07:04:31 +0000 (16:04 +0900)]
ARM: shmobile: lager: support GPIO switches

The lager board has pins 1 - 4 of SW2 wired up to GPIO pins.
This patch allows access to those pins as KEYS 1 - 4 using
gpio-keys.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: lager: Add GPIO LEDs
Simon Horman [Tue, 23 Apr 2013 02:37:05 +0000 (02:37 +0000)]
ARM: shmobile: lager: Add GPIO LEDs

The board has 3 LEDs connected to GPIOs. Add a led-gpio device to
support them.

Based on "ARM: shmobile: marzen: Add GPIO LEDs" by Laurent Pinchart.

Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: bockw: add dummy regulators for SMSC
Kuninori Morimoto [Tue, 9 Apr 2013 09:37:15 +0000 (02:37 -0700)]
ARM: shmobile: bockw: add dummy regulators for SMSC

SMSC driver will try to get regulator if .config had CONFIG_REGULATOR,
and, shmobile_defconfig has it.
SMSC driver on Bock-W board will be failed if it doens't have
dummy regulator settings.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: bockw: add CN9 SCIF/RCAN selection dipswitch explanation
Kuninori Morimoto [Tue, 9 Apr 2013 06:54:16 +0000 (23:54 -0700)]
ARM: shmobile: bockw: add CN9 SCIF/RCAN selection dipswitch explanation

Debug serial (= SCIF0) is connected to CN9 upper side,
and it is shared by RCAN.
This patch adds SCIF/RCAN dipswitch explanation on
comment area for developers.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: kzm9g: add AS3711 PMIC platform data
Guennadi Liakhovetski [Tue, 12 Feb 2013 17:15:31 +0000 (17:15 +0000)]
ARM: shmobile: kzm9g: add AS3711 PMIC platform data

KZM9G uses an AS3711 PMIC to supply power to the CPU and the LCD backlight.
The PMIC on the board is pre-programmed to supply correct voltages to the
CPU, power supply to the backlight has to be turned on at run-time. The
latter is currently performed by a hard-coded I2C command sequence in the
board file. This patch removes the backlight hack and instead adds an I2C
device to instantiate the AS3711 MFD driver, which will add a regulator
device to dynamically adjust CPU voltages and a backlight device.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: kzm9d: resigser smsc911x platform device with id -1
Simon Horman [Thu, 4 Apr 2013 02:20:33 +0000 (11:20 +0900)]
ARM: shmobile: kzm9d: resigser smsc911x platform device with id -1

As the kzm9d only has one smsc911x device it
may be registered as a platform device with id -1.

This allows the kzm9d board to access the smsc911x device
when CONFIG_REGULATOR (and CONFIG_REGULATOR_FIXED_VOLTAGE)
are set. The motivation for which is twofold: using regulators
seems to be generally a good thing; it will move the kzm9d defconfig
one step closer to being able to be consolidated with other
shmobile defconfigs.

An alternate but so far untested approach would be to
update the definition of dummy_supplies in board-kzm9d.c
to use "smsc911x.0" instead of "smsc911x".

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: bockw: define FPGA address and rename iomem variable
Kuninori Morimoto [Wed, 17 Apr 2013 05:17:42 +0000 (22:17 -0700)]
ARM: shmobile: bockw: define FPGA address and rename iomem variable

Bock-W board will needs more board specific ioremap() method.
This patch tidyup current FPGA specific settings

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: ape6evm: MP clock parent become EXTAL2
Kuninori Morimoto [Fri, 5 Apr 2013 04:24:27 +0000 (21:24 -0700)]
ARM: shmobile: ape6evm: MP clock parent become EXTAL2

The orignal commit 3263e09d287fbaa8a9424b5e69396599a3bbd518
(ARM: shmobile: Initial r8a73a4 SoC support V3)
put MP clock parent as EXTAL2, but its code was removed
on DIV6 clock support commit.
This patch makes it consistent.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoMerge branches 'pinmux' and 'soc' into boards-base
Simon Horman [Fri, 7 Jun 2013 05:26:22 +0000 (14:26 +0900)]
Merge branches 'pinmux' and 'soc' into boards-base

Conflicts:
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/include/mach/r8a7778.h
arch/arm/mach-shmobile/setup-r8a7778.c

11 years agoARM: shmobile: sh73a0: div4 clocks must check the kick bit before changing rate
Guennadi Liakhovetski [Wed, 22 May 2013 22:10:00 +0000 (00:10 +0200)]
ARM: shmobile: sh73a0: div4 clocks must check the kick bit before changing rate

According to the datasheet, it is not allowed to change div4 clock rates
if an earlier rate change operation is still in progress, as indicated by
a set kick bit.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: sh73a0: do not overwrite all div4 clock operations
Guennadi Liakhovetski [Wed, 22 May 2013 22:09:36 +0000 (00:09 +0200)]
ARM: shmobile: sh73a0: do not overwrite all div4 clock operations

An earlier commit "ARM: shmobile: sh73a0: add support for adjusting CPU
frequency" intended to replace some clock operations only for the Z-clock,
instead it replaced them for all div4 clocks, since all div4 clocks share
the same copy of clock operations. Fix this by using a separate clock
operations structure for Z-clock.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: sh73a0: Always use shmobile_setup_delay()
Magnus Damm [Wed, 22 May 2013 06:04:14 +0000 (15:04 +0900)]
ARM: shmobile: sh73a0: Always use shmobile_setup_delay()

Break out the function sh73a0_init_delay() that now
gets called both for the C version of the code and
the DT -reference boards. This way we handle both
cases in the same way.

Allows us to boot with TWD only in the kernel configuration
for C board code. TWD is not yet enabled in the case of
DT -reference - this due to a dependency on CCF.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: sh73a0: add CPUFreq support
Guennadi Liakhovetski [Fri, 5 Apr 2013 10:00:38 +0000 (12:00 +0200)]
ARM: shmobile: sh73a0: add CPUFreq support

This patch enables the use of the generic cpufreq-cpu0 driver on sh73a0.
Providing a regulator, a list of OPPs in DT, combined with a virtual
cpufreq-cpu0 platform device and a clock, attached to it is everything,
the cpufreq-cpu0 driver needs. The first sh73a0 platform, implementing
such CPUFreq support is kzm9g-reference.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: sh73a0: add support for adjusting CPU frequency
Guennadi Liakhovetski [Fri, 5 Apr 2013 10:00:36 +0000 (12:00 +0200)]
ARM: shmobile: sh73a0: add support for adjusting CPU frequency

On SH73A0 the output of PLL0 is supplied to two dividers, feeding clock to
the CPU core and SGX. Lower CPU frequencies allow the use of lower supply
voltages and thus reduce power consumption.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a7790: add TPU PWM support
Laurent Pinchart [Wed, 24 Apr 2013 20:36:01 +0000 (22:36 +0200)]
ARM: shmobile: r8a7790: add TPU PWM support

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a7790: Make private clock arrays static
Laurent Pinchart [Tue, 16 Apr 2013 15:16:20 +0000 (17:16 +0200)]
ARM: shmobile: r8a7790: Make private clock arrays static

Both clock-r8a7740.c and clock-r8a7790.c define a div4_clks array as
non-static. Compiling support for both SoCs thus result in a symbol
redefinition. Fix it by defining the arrays as static.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a7790: add div6 clocks
Kuninori Morimoto [Fri, 12 Apr 2013 07:43:09 +0000 (00:43 -0700)]
ARM: shmobile: r8a7790: add div6 clocks

DIV6 clocks control SD*/MMC* core clocks.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a7790: add div4 clocks
Kuninori Morimoto [Fri, 12 Apr 2013 07:42:52 +0000 (00:42 -0700)]
ARM: shmobile: r8a7790: add div4 clocks

DIV4 clocks control SD* core clocks.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a7790: add main clock
Kuninori Morimoto [Fri, 12 Apr 2013 07:42:22 +0000 (00:42 -0700)]
ARM: shmobile: r8a7790: add main clock

Almost all clock needs main clock which is basis clock on r8a7790.
This patch adds it, and, set its parent/ratio via MD pin.
It is based on v0.05 datasheet

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a7778: Register SDHI device
Kuninori Morimoto [Wed, 17 Apr 2013 05:17:25 +0000 (22:17 -0700)]
ARM: shmobile: r8a7778: Register SDHI device

This patch adds SDHI register function which needs id number (= 0/1/2)

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a7778: add SDHI clock support
Kuninori Morimoto [Wed, 17 Apr 2013 05:17:04 +0000 (22:17 -0700)]
ARM: shmobile: r8a7778: add SDHI clock support

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a7778: use fixed ratio clock
Kuninori Morimoto [Fri, 12 Apr 2013 08:13:14 +0000 (01:13 -0700)]
ARM: shmobile: r8a7778: use fixed ratio clock

R-Car M1 has many clocks, and it is possible to
read/use clock ratio of these clocks from FRQMRx.
But, these ratio are fixed value and
these are decided by MD pin status.

This patch reads MD pin status,
and used fixed ratio clock for other clocks.
It was tesed on bock-w board.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a7779: Add PCIe clocks
Phil Edworthy [Tue, 9 Apr 2013 14:35:15 +0000 (14:35 +0000)]
ARM: shmobile: r8a7779: Add PCIe clocks

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a73a4: add div6 clocks
Kuninori Morimoto [Fri, 5 Apr 2013 04:22:41 +0000 (21:22 -0700)]
ARM: shmobile: r8a73a4: add div6 clocks

DIV6 clocks control each core clocks.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a73a4: add div4 clocks
Kuninori Morimoto [Fri, 5 Apr 2013 04:22:16 +0000 (21:22 -0700)]
ARM: shmobile: r8a73a4: add div4 clocks

DIV4 clocks control each core clocks.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a73a4: add pll clocks
Kuninori Morimoto [Fri, 5 Apr 2013 04:21:39 +0000 (21:21 -0700)]
ARM: shmobile: r8a73a4: add pll clocks

PLL clocks are basis clock for other clock.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a73a4: add main clock
Kuninori Morimoto [Fri, 5 Apr 2013 04:20:40 +0000 (21:20 -0700)]
ARM: shmobile: r8a73a4: add main clock

Almost all clock needs main clock which is basis clock on r8a73a4.
This patch adds it, and, set parent clock via CKSCR register.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a7740: add TPU PWM support
Laurent Pinchart [Fri, 26 Oct 2012 13:38:47 +0000 (15:38 +0200)]
ARM: shmobile: r8a7740: add TPU PWM support

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a7740: Add I2C DT clock names
Bastian Hecht [Wed, 17 Apr 2013 10:34:03 +0000 (12:34 +0200)]
ARM: shmobile: r8a7740: Add I2C DT clock names

Add clock association for i2c0 and i2c1 for the new DT names.

Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a7740: Add interim sh-eth device name to clocks list
Bastian Hecht [Tue, 18 Dec 2012 17:22:38 +0000 (17:22 +0000)]
ARM: shmobile: r8a7740: Add interim sh-eth device name to clocks list

When we use the ethernet device via DT setup, we need to add it
to a lookup list until this is properly handled later in a DT-only
fashion.

Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a7778: fixup Ether setup code position
Kuninori Morimoto [Tue, 9 Apr 2013 05:33:44 +0000 (22:33 -0700)]
ARM: shmobile: r8a7778: fixup Ether setup code position

Ether setup code position was scattering.
This patch fixes it up

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: use do{ }while() on SH_CLK_SET_RATIO()
Kuninori Morimoto [Fri, 12 Apr 2013 07:41:07 +0000 (00:41 -0700)]
ARM: shmobile: use do{ }while() on SH_CLK_SET_RATIO()

SH_CLK_SET_RATIO() will be trouble without this patch

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: remove ";" from SH_FIXED_RATIO_CLK*() macro
Kuninori Morimoto [Thu, 4 Apr 2013 07:05:42 +0000 (00:05 -0700)]
ARM: shmobile: remove ";" from SH_FIXED_RATIO_CLK*() macro

Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: omap3: clock: fix wrong container_of in clock36xx.c
Jean-Philippe Francois [Thu, 6 Jun 2013 14:48:07 +0000 (08:48 -0600)]
ARM: omap3: clock: fix wrong container_of in clock36xx.c

omap36xx_pwrdn_clk_enable_with_hsdiv_restore expects the parent hw of
the clock to be a clk_hw_omap. However, looking at cclock3xxx_data.c,
all concerned clock have parent defined as clk_divider.  Fix the
function to use clk_divider.  Tested with 3.9 on dm3730.

Signed-off-by: Jean-Philippe François <jp.francois@cynove.com>
Cc: NeilBrown <neilb@suse.de>
Cc: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
11 years agoARM: shmobile: sh73a0: Use DEFINE_RES_MEM*() everywhere
Simon Horman [Tue, 23 Apr 2013 02:27:15 +0000 (02:27 +0000)]
ARM: shmobile: sh73a0: Use DEFINE_RES_MEM*() everywhere

Convert code to use DEFINE_RES_MEM*() macros.
These macros were already used in this file,
this change makes their usage consistent throughout the file.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a7778: correct model name in Kconfig
Sergei Shtylyov [Thu, 9 May 2013 00:05:40 +0000 (00:05 +0000)]
ARM: shmobile: r8a7778: correct model name in Kconfig

The correct model name is R-Car M1A or R8A77781; R8A77780 corresponds to R-Car
M1S which is a SH based SoC.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
[horms+renesas@verge.net.au: manually applied]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a7740: Make private clock arrays static
Laurent Pinchart [Tue, 16 Apr 2013 15:16:19 +0000 (17:16 +0200)]
ARM: shmobile: r8a7740: Make private clock arrays static

Both clock-r8a7740.c and clock-r8a7790.c define a div4_clks array as
non-static. Compiling support for both SoCs thus result in a symbol
redefinition. Fix it by defining the arrays as static.

To avoid further similar issues, also define the main_clks as static.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoirqchip: Add irqchip_init dummy function
Bastian Hecht [Wed, 8 May 2013 13:20:04 +0000 (15:20 +0200)]
irqchip: Add irqchip_init dummy function

We add an empty irqchip_init dummy function for cases in which
CONFIG_IRQCHIP is not used. In these cases irqchip.c is not compiled,
but a funtion call may still be present in architecture code, that in
runtime doesn't get hit.

E.g. this is needed in the arch/arm/mach-shmobile/intc-r8a7740.c
interrupt setup code where OF use and non OF us is both handled in one
file.

Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com>
[horms+renesas@verge.net.au: Make non-CONFIG_IRQCHIP version static inline
 and remove trailing ';'.]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoirqchip: renesas-irqc: Fix irqc_probe error handling
Axel Lin [Mon, 6 May 2013 09:03:32 +0000 (17:03 +0800)]
irqchip: renesas-irqc: Fix irqc_probe error handling

The code in goto err3 path is wrong because it will call fee_irq() with k == 0,
which means it does free_irq(p->irq[-1].requested_irq, &p->irq[-1]);

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: marzen: Use RCAR_GP_PIN macro
Laurent Pinchart [Mon, 8 Apr 2013 10:05:32 +0000 (12:05 +0200)]
ARM: shmobile: marzen: Use RCAR_GP_PIN macro

Replace hardcoded pin numbers with the RCAR_GP_PIN macro to make the
code match the documentation.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: lager: Initialize pinmux
Laurent Pinchart [Mon, 8 Apr 2013 09:36:22 +0000 (11:36 +0200)]
ARM: shmobile: lager: Initialize pinmux

Initialize r8a7790 pinmuxing and register mappings for the two debug
serial ports.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: bockw: add pinctrl support
Kuninori Morimoto [Fri, 12 Apr 2013 05:38:03 +0000 (05:38 +0000)]
ARM: shmobile: bockw: add pinctrl support

SCIF0 support as 1st step

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: kzm9g: tidyup FSI pinctrl
Kuninori Morimoto [Thu, 23 May 2013 01:34:10 +0000 (18:34 -0700)]
ARM: shmobile: kzm9g: tidyup FSI pinctrl

sh73a0 needs "sh_fsi2", not "sh_fsi2.0"

Tested-by: Hiep Cao Minh <cm-hiep@jinso.co.jp>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a7740 pinmux platform device cleanup
Magnus Damm [Wed, 3 Apr 2013 06:32:58 +0000 (15:32 +0900)]
ARM: shmobile: r8a7740 pinmux platform device cleanup

Use DEFINE_RES_MEM() and platform_device_register_simple()
to save a couple of lines of code.

Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a7790: Configure R-Car GPIO for IRQ_TYPE_EDGE_BOTH
Simon Horman [Mon, 13 May 2013 08:53:52 +0000 (17:53 +0900)]
ARM: shmobile: r8a7790: Configure R-Car GPIO for IRQ_TYPE_EDGE_BOTH

"gpio-rcar: Support IRQ_TYPE_EDGE_BOTH" adds support to the R-Car GPIO
driver for IRQ_TYPE_EDGE_BOTH. As hardware support for this feature is
not universal for all SoCs a flag, has_both_edge_trigger, has been
added to the platform data of the driver to allow this feature to be
enabled.

As the r8a7790 SoC hardware supports this feature enable it.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agopinctrl: sh-pfc: r8a7779: Fix missing MOD_SEL2 entry
Phil Edworthy [Mon, 3 Jun 2013 07:52:28 +0000 (08:52 +0100)]
pinctrl: sh-pfc: r8a7779: Fix missing MOD_SEL2 entry

The list of functions selected by the MOD_SEL2 register was missing
an entry. This caused all entries after this to modify the MOD_SEL2
register incorrectly.

This bug showed up when selecting i2c2_c pins on the Renesas Hurricane board.

This bug has been present since pinmux support was added for the
r8a7779 SoC by 881023d28b465eb457067dc8bbca0f24d8b34279 ("sh-pfc: Add
r8a7779 pinmux support") in v3.8-rc4.

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoRevert "ARM: shmobile: Disallow PINCTRL without GPIOLIB"
Laurent Pinchart [Fri, 31 May 2013 03:00:27 +0000 (05:00 +0200)]
Revert "ARM: shmobile: Disallow PINCTRL without GPIOLIB"

GPIOLIB dependency handling was added to the PINCTRL core by

commit 2afe8229687ec24cbc07e78449a588bb8b68f858
Author: Haojian Zhuang <haojian.zhuang@linaro.org>
Date:   Thu Mar 28 07:34:19 2013 +0800

    pinctrl: core: add dependence of GPIOLIB

There is not need to handle that dependency at the SH Mobile level
anymore. Revert

commit 6722f6cb763203cab775297b6e9d00834af0d6d7
Author: Magnus Damm <damm@opensource.se>
Date:   Mon Mar 18 22:58:18 2013 +0900

    ARM: shmobile: Disallow PINCTRL without GPIOLIB

    Modify mach-shmobile to only select PINCTRL in case of
    ARCH_WANT_OPTIONAL_GPIOLIB is set.

    This fixes a build error triggered when adding a new SoC
    lacking GPIO software support (ARCH_WANT_OPTIONAL_GPIOLIB=n):

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agopinctrl: r8a7790: add pinmux data for MMCIF and SDHI interfaces
Guennadi Liakhovetski [Fri, 17 May 2013 14:55:12 +0000 (16:55 +0200)]
pinctrl: r8a7790: add pinmux data for MMCIF and SDHI interfaces

This patch adds pinmux groups and functions for the two MMCIF and four
SDHI interfaces on r8a73a4 (APE6).

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7778: add MMCIF pin groups
Kuninori Morimoto [Thu, 23 May 2013 03:17:04 +0000 (20:17 -0700)]
sh-pfc: r8a7778: add MMCIF pin groups

Add MMCIF CLK/CMD/DATA groups to R8A7778 PFC driver.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7778: add HSPI pin groups
Kuninori Morimoto [Thu, 23 May 2013 03:16:30 +0000 (20:16 -0700)]
sh-pfc: r8a7778: add HSPI pin groups

Add HSPI CLK/CS/RX/TX pin groups to R8A7778 PFC driver.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7778: add I2C pin groups
Kuninori Morimoto [Thu, 23 May 2013 03:15:53 +0000 (20:15 -0700)]
sh-pfc: r8a7778: add I2C pin groups

Add I2C SDA/SCL pin groups to R8A7778 PFC driver.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agopinctrl: sh-pfc: fix a typo in pfc-r8a7790
Guennadi Liakhovetski [Wed, 15 May 2013 10:46:54 +0000 (10:46 +0000)]
pinctrl: sh-pfc: fix a typo in pfc-r8a7790

Fix multiple occurrences of the "RESEVED" typo.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agopinctrl: sh-pfc: fix r8a7790 Function Select register tables
Guennadi Liakhovetski [Wed, 15 May 2013 10:46:49 +0000 (10:46 +0000)]
pinctrl: sh-pfc: fix r8a7790 Function Select register tables

Fix several errors in Peripheral Function Select register tables for
r8a7790, which prevent various function pins from being correctly
configured.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7778: fixup IRQ1A settings
Kuninori Morimoto [Tue, 14 May 2013 04:10:17 +0000 (21:10 -0700)]
sh-pfc: r8a7778: fixup IRQ1A settings

IP2[31] func2 is IRQ1A, not IRQ3A

Reported-by: Yusuke Goda <yusuke.goda.sx@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7779: add Ether pin groups
Sergei Shtylyov [Wed, 8 May 2013 23:17:33 +0000 (23:17 +0000)]
sh-pfc: r8a7779: add Ether pin groups

Add Ether RMII/LINK/MAGIC pin groups to R8A7779 PFC driver.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Laurent Pinchart<laurent.pinchart@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7778: add Ether pin groups
Sergei Shtylyov [Wed, 8 May 2013 23:15:50 +0000 (23:15 +0000)]
sh-pfc: r8a7778: add Ether pin groups

Add Ether RMII/LINK/MAGIC pin groups to R8A7778 PFC driver.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Laurent Pinchart<laurent.pinchart@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>