Geert Uytterhoeven [Thu, 28 Aug 2014 08:20:39 +0000 (10:20 +0200)]
ARM: shmobile: r8a73a4 dtsi: Add SoC-specific thermal compatible property
The thermal node used the generic compatible property only.
Add the SoC-specific one, to make it future proof.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
a2cfaa7458e714aa00be98c630afaa1a4766e2ad)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Thu, 28 Aug 2014 08:20:40 +0000 (10:20 +0200)]
ARM: shmobile: r8a7779 dtsi: Add SoC-specific thermal compatible property
The thermal node used the generic compatible property only.
Add the SoC-specific one, to make it future proof.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
4d50e6dd7a019993504a419d0057051788e477f1)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Steve Twiss [Fri, 22 Aug 2014 14:26:55 +0000 (15:26 +0100)]
devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg'
This patch series updates the device tree vendor prefix for
Dialog Semiconductor.
Various methods are currently used throughout the kernel: 'diasemi',
'dialog' and 'dlg'. Others have also been suggested.
This patch set aims to consolidate the usage of the vendor prefix to
use a common standard. The prefix 'dlg' is used.
Signed-off-by: Steve Twiss <stwiss.opensource@diasemi.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
(cherry picked from commit
bd597f47ca4bf7a522a0298a95c7f9b2f0a75b9e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
Simon Horman [Tue, 12 Aug 2014 00:04:42 +0000 (09:04 +0900)]
ARM: shmobile: r8a7740: Remove r8a7740_add_standard_devices_dt
Now that r8a7740_add_standard_devices_dt() is simply a wrapper
for a call to of_platform_populate() remove it and call
of_platform_populate() directly.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
433306747791845677ba662435a9bbbafaa21df3)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Tue, 12 Aug 2014 00:04:41 +0000 (09:04 +0900)]
ARM: shmobile: armadillo800eva-reference: Do not use r8a7740_add_standard_devices_dt()
Now that r8a7740_add_standard_devices_dt() is just a wrapper for
of_platform_populate() call the latter directly.
This is in preparation for removing r8a7740_add_standard_devices_dt().
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
5ebb4e849966e9cb3d5450773c86a1bf79e76f2d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Tue, 12 Aug 2014 00:04:39 +0000 (09:04 +0900)]
ARM: shmobile: armadillo800eva-reference: Enable CMT1 in device tree
Based on work by Magnus Damm
Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
1145eaabcf1d108993b5c7bea3d86bbef7143135)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Tue, 12 Aug 2014 00:04:38 +0000 (09:04 +0900)]
ARM: shmobile: r8a7740: Add CMT1 device to DT
Add the CMT1 counters to the r8a7740 device tree and make it
disabled by default.
Based on work by Magnus Damm.
Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
c10df265febc7e46a60b129756915ad1d4d13e27)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulrich Hecht [Fri, 8 Aug 2014 14:23:12 +0000 (16:23 +0200)]
ARM: shmobile: armadillo800eva-reference: add clock overrides to DTS
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
ae2a8cdd5c52b4e205cc1e5abca31168fb20dadb)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulrich Hecht [Fri, 8 Aug 2014 14:23:11 +0000 (16:23 +0200)]
ARM: shmobile: r8a7740: add MSTP clock assignments to DT
Assigns clocks to ether, i2c*, scif*, tpu, mmcif0, sdhi*, and fsi2.
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
4a7ae2e27e18cbbdd83fb7783cd62abb4a62f33b)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulrich Hecht [Fri, 8 Aug 2014 14:23:10 +0000 (16:23 +0200)]
ARM: shmobile: r8a7740: add SoC clocks to DTS
Declares the r8a7740 clocks supported by the legacy clock framework,
excluding those requiring extensions to the DIV6 driver.
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
d9ffd583bf345e2ea79a8ab8044df3a979349af7)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 20 Aug 2014 14:28:34 +0000 (16:28 +0200)]
ARM: shmobile: sh73a0 dtsi: Move interrupt-parent to the top
Add an "interrupt-parent = <&gic>;" at the top, which is inherited by
all child nodes, so the "interrupt-parent" properties can be removed
from the individual child nodes.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
f170b97c9ad0b8ba3e99f02cbadc7676383fee09)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 20 Aug 2014 14:31:02 +0000 (16:31 +0200)]
ARM: shmobile: r8a7791 dtsi: Remove superfluous interrupt-parent
There's already an "interrupt-parent = <&gic>;" at the top, which is
inherited by all child nodes, so the "interrupt-parent" property in
the sound node can be removed.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
5fb1453c2ff02ce5e5298351ff774e19f8d9dbb3)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 20 Aug 2014 14:28:32 +0000 (16:28 +0200)]
ARM: shmobile: r8a7790 dtsi: Remove superfluous interrupt-parent
There's already an "interrupt-parent = <&gic>;" at the top, which is
inherited by all child nodes, so the "interrupt-parent" property in
the sound node can be removed.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
980724eb5b56b43d0ff2c7a7f5cf6e5ba290d2e5)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 20 Aug 2014 14:28:31 +0000 (16:28 +0200)]
ARM: shmobile: r8a7779 dtsi: Remove superfluous interrupt-parent
There's already an "interrupt-parent = <&gic>;" at the top, which is
inherited by all child nodes, so the "interrupt-parent" properties in
the serial nodes can be removed.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
6a7147f53f29887e627d84c0a562c8bb87691e9d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 20 Aug 2014 13:39:23 +0000 (15:39 +0200)]
ARM: shmobile: Move legacy INTC definitions from irqs.h to intc.h
Move all definitions for legacy INTC from the common "irqs.h" to the
INTC-specific "intc.h".
Include "intc.h" in sh7372/sh73a0 CPU and board files where needed.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
[horms+renesas@verge.net.au: omitted whitespace change]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
86155b35d173317518458c6f9c0a3ea8c5324bed)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 20 Aug 2014 13:10:15 +0000 (22:10 +0900)]
ARM: shmobile: ape6evm: Remove duplicate CPUFreq bits
The CPUFreq platform device is already registered by
shmobile_init_late(), so get rid of ape6evm specific bits.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
664b4c172209f076866419a5a4162e4fc9631807)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 20 Aug 2014 13:07:07 +0000 (22:07 +0900)]
ARM: shmobile: sh73a0: Remove duplicate CPUFreq bits
The CPUFreq platform device is already registered by
shmobile_init_late(), so get rid of sh73a0 specific bits.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
aa0bdc303b0f8bc59fc0a0645560917810ba041b)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulrich Hecht [Fri, 8 Aug 2014 14:23:09 +0000 (16:23 +0200)]
ARM: shmobile: r8a7740: clock register bits
Contains the header file with the clock pulse generator and MSTP bits.
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
d6fb17ad7c9e0aa28ce0bc2e33790f9459677370)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 20 Aug 2014 13:03:30 +0000 (22:03 +0900)]
ARM: shmobile: kzm9g: Use shmobile_init_delay()
Adjust the KZM9G board support code to use shmobile_init_delay()
together with CPU Frequency settings from the DTS.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
fc35ca258c079411b64ed94e517eb04e7d89bc44)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 20 Aug 2014 13:03:21 +0000 (22:03 +0900)]
ARM: shmobile: bockw: Use shmobile_init_delay()
Adjust the BockW board support code to use shmobile_init_delay()
together with CPU Frequency settings from the DTS.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
ca609e666c47cceb64610ad703dda1bebafef605)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 20 Aug 2014 13:02:54 +0000 (22:02 +0900)]
ARM: shmobile: r8a7778: Use shmobile_init_delay()
Adjust the r8a7778 SoC support code to use shmobile_init_delay()
together with CPU Frequency settings from the DTS. Get rid of the
C code version.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
6fe950ebfd3a374c78ce66a335fce258648426a1)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 20 Aug 2014 13:02:45 +0000 (22:02 +0900)]
ARM: shmobile: sh73a0: Use shmobile_init_delay()
Adjust the sh73a0 SoC support code to use shmobile_init_delay()
together with CPU Frequency settings from the DTS. Get rid of the
C code version.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
5df622a56b7da3c54609f26cc6221ab3382efaaf)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 20 Aug 2014 13:03:12 +0000 (22:03 +0900)]
ARM: shmobile: Remove shmobile_setup_delay()
All ARM mach-shmobile SoCs and boards now rely on DTS for
CPU Frequency information, so remove the unused function
shmobile_setup_delay(). While at it, make the function
shmobile_setup_delay_hz() static.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
7dd4cfd7f8c2976a8d65022146386480474501ca)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 20 Aug 2014 13:03:03 +0000 (22:03 +0900)]
ARM: shmobile: r8a73a4: Use shmobile_init_delay()
Adjust the r8a73a4 SoC support code to use shmobile_init_delay()
together with CPU Frequency settings from the DTS. Get rid of the
C code version and r8a73a4_init_early() that now are unused.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
f5720080b51d61c33dc559fedab9a601930e95c1)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 20 Aug 2014 13:02:36 +0000 (22:02 +0900)]
ARM: shmobile: sh7372: Use shmobile_init_delay()
Adjust the sh7372 SoC support code to use shmobile_init_delay()
together with CPU Frequency settings from the DTS. Get rid of the
C code version.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
39b22e20a3086002c5abe0c569cf11a71bc17faf)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 20 Aug 2014 13:02:27 +0000 (22:02 +0900)]
ARM: shmobile: r8a7778: Update DTS to include CPU frequency
Add CPU Frequency information to the r8a7778 DTS file. This
will allow us to use the shared C code on r8a7778 and BockW
which reads out the clock frequency from DT and calculates the
delay settings from there.
Also add other missing CPU information to the r8a7778 DTS.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
869f92aed207f2f6e595ea41c841bd9ad0c0d0d4)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 20 Aug 2014 13:02:19 +0000 (22:02 +0900)]
ARM: shmobile: sh73a0: Update DTS to include CPU frequency
Add CPU Frequency information to the sh73a0 DTS file. This
will allow us to use the shared C code on sh73a0 and KZM9G
which reads out the clock frequency from DT and calculates the
delay settings from there.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
13bd825bdd5c087d156d294b427d05dcf9bff281)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 20 Aug 2014 13:02:10 +0000 (22:02 +0900)]
ARM: shmobile: sh7372: Update DTS to include CPU frequency
Add CPU Frequency information to the sh7372 DTS file. This
will allow us to use the shared C code on sh7372 and Mackerel
which reads out the clock frequency from DT and calculates the
delay settings from there.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
2340cd112933ee837aa83017a6da23c72565d501)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Mikhail Ulyanov [Tue, 19 Aug 2014 12:50:51 +0000 (16:50 +0400)]
ARM: shmobile: r8a7791: Add JPU clock dt and CPG define.
Signed-off-by: Mikhail Ulyanov <mikhail.ulyanov@cogentembedded.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
ed48b5d6fd339d145df5a6a1e48cf56ef265cf4f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Mikhail Ulyanov [Tue, 19 Aug 2014 12:50:49 +0000 (16:50 +0400)]
ARM: shmobile: r8a7790: Add JPU clock dt and CPG define.
Signed-off-by: Mikhail Ulyanov <mikhail.ulyanov@cogentembedded.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
da076a888ab19f13816372796ed231e7d6ff5fed)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Thu, 14 Aug 2014 21:36:28 +0000 (06:36 +0900)]
ARM: shmobile: bockw: Do not disable SUSPEND in defconfig
As of "ARM: shmobile: r8a7778: Add missing call to shmobile_init_late()"
suspend-to-ram is now supported on the r8a7778 SoC and thus the bockw
board.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
99923753e7c17a9c9d46bfe4d7fa543e426ec647)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 13 Aug 2014 11:56:57 +0000 (13:56 +0200)]
ARM: shmobile: sh73a0: Remove unneeded nr_irqs initialization
As per arch_probe_nr_irqs(), the default value is NR_IRQS, which maps to
NR_IRQS_LEGACY if CONFIG_SPARSE_IRQ=y.
Since SPARSE_IRQ is selected by both ARCH_MULTIPLATFORM and
ARCH_SHMOBILE_LEGACY, it's always enabled on shmobile.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
5ac9e7f35db00e630c9f95a1f73ac329371cdbbf)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 13 Aug 2014 11:56:56 +0000 (13:56 +0200)]
ARM: shmobile: sh7372: Remove unneeded nr_irqs initialization
As per arch_probe_nr_irqs(), the default value is NR_IRQS, which maps to
NR_IRQS_LEGACY if CONFIG_SPARSE_IRQ=y.
Since SPARSE_IRQ is selected by both ARCH_MULTIPLATFORM and
ARCH_SHMOBILE_LEGACY, it's always enabled on shmobile.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
ea2e46086969e11b759a8f2c111c9b007d1b35c9)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Fri, 8 Aug 2014 11:49:04 +0000 (20:49 +0900)]
ARM: shmobile: r8a7779: Remove NR_IRQS_LEGACY
Remove NR_IRQS_LEGACY from the r8a7779 generic machine
vector. The generic r8a7779 machine vector requires use
of Multiplatform, and in such case SPARSE_IRQ is enabled
by default. This in turns means that the default value
of .nr_irqs equals NR_IRQS and NR_IRQS_LEGACY. Because
of this we can simply remove NR_IRQS_LEGACY and move one
step closer to a cruft-free environment.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
93f05252514a8c7b6bf5a132f6b20f10215cb59c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Tue, 5 Aug 2014 13:21:29 +0000 (15:21 +0200)]
ARM: shmobile: dma: Use defines instead of hardcoded numbers
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
fe8abe0bc2afb20b126e7e0759081dc0df2cd60d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Thu, 31 Jul 2014 00:25:15 +0000 (09:25 +0900)]
ARM: shmobile: Rework multiplatform include workaround
Now when the majority of the include files have moved from
arch/arm/mach-shmobile/include/mach/ to arch/arm/mach-shmobile/
remove the header include file workaround in the Makefile...
... and add another workaround in irqs.h to cope with the fact
that <mach/irqs.h> needs to be where it is until the PFC code
has been updated to remove legacy non-DT interfaces.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
f2acab52e77650044b0772a6d7abbfef1eb4cede)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 30 Jul 2014 23:33:26 +0000 (08:33 +0900)]
ARM: shmobile: r7s72100: Add shmobile_init_late()
Extend r7s72100 SoC machine vector to include shmobile_init_late()
so Suspend-to-RAM and CPUIdle are setup as expected.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
9b0fd79af38cb1d68f5faf4fb528713116480e9f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 30 Jul 2014 23:33:08 +0000 (08:33 +0900)]
ARM: shmobile: r8a73a4: Add shmobile_init_late()
Extend r8a73a4 SoC machine vector to include shmobile_init_late()
so Suspend-to-RAM and CPUIdle are setup as expected.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
0592d1b5d296b0b6a24b7e48b7b48662164d3117)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 30 Jul 2014 23:32:50 +0000 (08:32 +0900)]
ARM: shmobile: r8a7778: Fix shmobile_init_late()
Fix r8a7778 SoC machine vector to include shmobile_init_late()
so Suspend-to-RAM and CPUIdle are setup and platform devices
are omitted as expected.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
7759a7a8e9b07a9046c1bdb2cd4c9ce197280392)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 30 Jul 2014 23:32:33 +0000 (08:32 +0900)]
ARM: shmobile: r8a7779: Fix shmobile_init_late()
Fix r8a7779 SoC machine vector to include shmobile_init_late()
so Suspend-to-RAM and CPUIdle are setup and platform devices
are omitted as expected.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
d5b00b90705d5fff53f611ba4746d79fedbb52be)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
arch/arm/mach-shmobile/setup-r8a7779.c
Magnus Damm [Wed, 30 Jul 2014 23:32:15 +0000 (08:32 +0900)]
ARM: shmobile: sh73a0: Add shmobile_init_late()
Extend sh73a0 SoC machine vector to include shmobile_init_late()
so Suspend-to-RAM and CPUIdle are setup as expected.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
e604d80971e65c7ae895a4b38caed3838cf07554)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 13 Aug 2014 11:56:58 +0000 (13:56 +0200)]
ARM: shmobile: kzm9g-reference: Remove unneeded nr_irqs initialization
As per arch_probe_nr_irqs(), the default value is NR_IRQS, which maps to
NR_IRQS_LEGACY if CONFIG_SPARSE_IRQ=y.
Since SPARSE_IRQ is selected by both ARCH_MULTIPLATFORM and
ARCH_SHMOBILE_LEGACY, it's always enabled on shmobile.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
3969d6490ba35b01f84bb12472c29c6029f7298b)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 13 Aug 2014 11:56:59 +0000 (13:56 +0200)]
ARM: shmobile: kzm9g: Remove unneeded nr_irqs initialization
As per arch_probe_nr_irqs(), the default value is NR_IRQS, which maps to
NR_IRQS_LEGACY if CONFIG_SPARSE_IRQ=y.
Since SPARSE_IRQ is selected by both ARCH_MULTIPLATFORM and
ARCH_SHMOBILE_LEGACY, it's always enabled on shmobile.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
f185a01b3877880135ea73ddfcec52bd9a4d4864)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Fri, 8 Aug 2014 11:49:13 +0000 (20:49 +0900)]
ARM: shmobile: marzen: Remove NR_IRQS_LEGACY
Remove NR_IRQS_LEGACY from the Marzen Reference code.
The Marzen Reference machine vector requires use of
Multiplatform, and in such case SPARSE_IRQ is enabled
by default. This in turns means that the default value
of .nr_irqs equals NR_IRQS and NR_IRQS_LEGACY. Because
of this we can simply remove NR_IRQS_LEGACY and move one
step closer to a cruft-free environment.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
322163c437b200b70ecb87ab102dfedce0ba0e91)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 30 Jul 2014 23:45:00 +0000 (08:45 +0900)]
ARM: shmobile: ape6evm: Use shmobile_init_delay()
The r8a73a4 DTS includes CPU Frequency information so
adjust the APE6EVM board code to use shmobile_init_delay()
instead of relying on CPU Frequency information included
in r8a73a4_init_delay() that is specified in C.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
911f7cec78af1445d4b0f5f79907cb5bd4522ce5)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 30 Jul 2014 23:33:17 +0000 (08:33 +0900)]
ARM: shmobile: ape6evm: Add shmobile_init_late()
Extend board specific APE6EVM reference machine vectors to include
shmobile_init_late() so Suspend-to-RAM and CPUIdle are setup as expected.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
509c42a5fce00f8769f68847580ba3c4dc884218)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 30 Jul 2014 23:32:59 +0000 (08:32 +0900)]
ARM: shmobile: bockw: Add shmobile_init_late()
Extend board specific Bock-W DT reference machine vector to include
shmobile_init_late() so Suspend-to-RAM and CPUIdle are setup as expected.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
6e15a3873aa9b4ab2980f781b05bfc5c99bf4b99)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 30 Jul 2014 23:32:41 +0000 (08:32 +0900)]
ARM: shmobile: marzen: Add shmobile_init_late()
Extend board specific Marzen DT reference machine vector to include
shmobile_init_late() so Suspend-to-RAM and CPUIdle are setup as expected.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
b9c9281339376521d0feb78c9051fedfbb3cf111)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 30 Jul 2014 23:32:24 +0000 (08:32 +0900)]
ARM: shmobile: kzm9g: Add shmobile_init_late()
Extend board specific KZM9D DT reference machine vector to include
shmobile_init_late() so Suspend-to-RAM and CPUIdle are setup as expected.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
eeed09e8116f9932b55aa284d109bdea1e2ddc46)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kevin Hilman [Thu, 14 Aug 2014 00:07:15 +0000 (17:07 -0700)]
ARM: shmobile: defconfig: enable initrd
Enable initrd support.
Signed-off-by: Kevin Hilman <khilman@linaro.org>
[horms+renesas@verge.net.au: dropped enabling atag dtb compat]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
874ee23c83d888f8824305c277e047c7799f30b9)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 2 Jul 2014 16:23:38 +0000 (18:23 +0200)]
ARM: shmobile: r7s72100: Remove legacy board support
There's no legacy board anymore, genmai now boots with multiplatform
support only. Remove the leftovers.
Makefile.boot portion pointed out by Paul Bolle.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Wolfram Sang <wsa@sang-engineering.com>
Cc: Paul Bolle <pebolle@tiscali.nl>
[horms+renesas@verge.net.au: squashed in patch containing
Makefile.boot change]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
ad8c3af8b75ff26c5c887f2101da653bdcd53a38)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 2 Jul 2014 16:23:37 +0000 (18:23 +0200)]
ARM: shmobile: r7s72100: genmai: Remove legacy board file
The genmai board now boots using DT and multiplatform kernel with the
same feature set as the legacy board. Remove the legacy board file and
the board Kconfig option.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
05104c266ae9a1673d92a068e2eeb0059db8c075)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
arch/arm/mach-shmobile/board-genmai.c
Laurent Pinchart [Wed, 2 Jul 2014 16:23:36 +0000 (18:23 +0200)]
ARM: shmobile: r7s72100: genmai: Remove reference board file
The genmai board now boots using the generic R7S72100 DT machine with
the same feature set as the board file. Remove the board file.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
71d03dabd6d3141872e23effd00345afe2ea2dab)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ben Dooks [Tue, 12 Aug 2014 20:18:26 +0000 (00:18 +0400)]
ARM: shmobile: lager: add VIN1/ADV7180 device nodes
Add the Lager board specific device node part for VIN1 (composite video in);
add the device node for Analog Devices ADV7180 video decoder to IIC2 bus.
Add the necessary subnodes to interconnect VIN1 and ADV7180 devices.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
[Sergei: rebased, edited changelog and summary]
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
d594c9775409a4276133db5e34dbd791329c5eae)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ben Dooks [Tue, 12 Aug 2014 20:16:18 +0000 (00:16 +0400)]
ARM: shmobile: r8a7790: add VIN device nodes
Add device nodes for the four video input controllers on the R8A7790.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
[Sergei: renamed VIN device nodes, edited changelog]
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
9f685bfc30edb4cba5d5ae142a9967cd0d74c40a)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 6 Aug 2014 12:59:09 +0000 (14:59 +0200)]
ARM: shmobile: r8a7790 dtsi: Enable DMA for MSIOF
Add register sets used for access by the DMA engine, and DMA properties to
the MSIOF nodes.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
fbff66886b9c5f657b6649a264551ac572fae0b7)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 6 Aug 2014 12:59:08 +0000 (14:59 +0200)]
ARM: shmobile: r8a7790 dtsi: Enable DMA for QSPI
Add a DMA property to the QSPI node
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
37cf3d61a94790c6f12c6e6e7a28640b8531a8af)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 6 Aug 2014 12:59:07 +0000 (14:59 +0200)]
ARM: shmobile: r8a7791 dtsi: Enable DMA for MSIOF
Add register sets used for access by the DMA engine, and DMA properties to
the MSIOF nodes.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
a5ce27f5f3285520496af0fe5282395ac07c4138)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 6 Aug 2014 12:59:06 +0000 (14:59 +0200)]
ARM: shmobile: r8a7791 dtsi: Enable DMA for QSPI
Add a DMA property to the QSPI node
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
591f2fa4eb0aae09cd76d276bb59e25824a7d408)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Fri, 18 Jul 2014 23:50:25 +0000 (01:50 +0200)]
ARM: shmobile: r8a7791: Add DMAC devices to DT
Instantiate the two system DMA controllers in the r8a7791 device tree.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
fde8feefc489652749920f18123ad9e48b427c5e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Fri, 18 Jul 2014 23:50:24 +0000 (01:50 +0200)]
ARM: shmobile: r8a7790: Add DMAC devices to DT
Instantiate the two system DMA controllers in the r8a7790 device tree.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
b9fea49c79f23212ff21ef2f305ea4ae865db860)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Fri, 18 Jul 2014 23:50:23 +0000 (01:50 +0200)]
ARM: shmobile: r8a7790: Add DMAC clocks to DT
Add the SYS-DMAC0 and SYS-DMAC1 clocks to the MSTP2 clock node. They
will be used by the upcoming DMAC DT nodes.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
c819acdab3bf02795db6d16a17426e21c99c3c28)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
sergei.shtylyov@cogentembedded.com [Wed, 6 Aug 2014 18:38:22 +0000 (22:38 +0400)]
ARM: shmobile: koelsch: add VIN1/ADV7180 DT support
Define the Koelsch board dependent part of the VIN1 device node. Add the device
node for Analog Devices ADV7180 video decoder to I2C2 bus. Add the necessary
subnodes to interconnect VIN1 and ADV7180 devices.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
2cf088105db14c00ad69df09b9b4a37c2370ff44)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Sergei Shtylyov [Sat, 2 Aug 2014 00:05:54 +0000 (04:05 +0400)]
ARM: shmobile: henninger: add VIN0/ADV7180 DT support
Define the Henninger board dependent part of the VIN0 device node. Add the
device node for Analog Devices ADV7180 video decoder to I2C2 bus. Add the
necessary subnodes to interconnect VIN0 and ADV7180 devices.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
8d62f4f75320db5e95d3610547a26e4487c30742)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Sergei Shtylyov [Sat, 2 Aug 2014 00:04:21 +0000 (04:04 +0400)]
ARM: shmobile: r8a7791: add VIN DT support
Define the generic R8A7791 parts of the VIN[0-2] device nodes. Add aliases for
the VIN[0-2] device nodes.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
0b8d1d579b4130f33a8776691453238839cb1973)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Thu, 14 Aug 2014 16:57:28 +0000 (18:57 +0200)]
ARM: shmobile: marzen_defconfig: Enable missing hardware support
Based on the DTS
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
6e3a4b191ee6db512c17197130b4e5170b3dabc3)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Thu, 14 Aug 2014 16:57:27 +0000 (18:57 +0200)]
ARM: shmobile: lager_defconfig: Enable missing hardware support
Based on the DTS
Notes:
- MTD_SPI_NOR is a dependency for MTD_M25P80 since commit
03e296f613affcc2671c1e86d8c25ecad867204e ("mtd: m25p80: use the SPI
nor framework") and commit
e43b20619bdb6c851dd7b49cbd15e52875a785d4
("mtd: spi-nor: shorten Kconfig naming").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
387ded8e60bcb6190492f90a3ef25e2bcb0a97a1)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Thu, 14 Aug 2014 16:57:26 +0000 (18:57 +0200)]
ARM: shmobile: kzm9g_defconfig: Enable missing hardware support
Based on the DTS
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
489610f3324dc1f94c816f4053215d7540871875)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Thu, 14 Aug 2014 16:57:25 +0000 (18:57 +0200)]
ARM: shmobile: koelsch_defconfig: Enable missing hardware support
Based on the DTS
Notes:
- MTD_SPI_NOR is a dependency for MTD_M25P80 since commit
03e296f613affcc2671c1e86d8c25ecad867204e ("mtd: m25p80: use the SPI
nor framework") and commit
e43b20619bdb6c851dd7b49cbd15e52875a785d4
("mtd: spi-nor: shorten Kconfig naming").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
1a194078571a0d060a230949cd1b4da259117ef0)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Thu, 14 Aug 2014 16:57:24 +0000 (18:57 +0200)]
ARM: shmobile: bockw_defconfig: Enable missing hardware support
Based on the DTS
Notes:
- MTD_SPI_NOR is a dependency for MTD_M25P80 since commit
03e296f613affcc2671c1e86d8c25ecad867204e ("mtd: m25p80: use the SPI
nor framework") and commit
e43b20619bdb6c851dd7b49cbd15e52875a785d4
("mtd: spi-nor: shorten Kconfig naming").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
4f0c320be6164ab39af42867aa1ccf69475850b7)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Thu, 14 Aug 2014 16:57:23 +0000 (18:57 +0200)]
ARM: shmobile: ape6evm_defconfig: Enable missing hardware support
Based on the DTS
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
2815d447f6538d11d0fbe88a2f3418905922ca0d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Thu, 14 Aug 2014 16:57:22 +0000 (18:57 +0200)]
ARM: shmobile: shmobile_defconfig: Enable missing hardware support
Based on the DTSes
Notes:
- MTD_SPI_NOR is a dependency for MTD_M25P80 since commit
03e296f613affcc2671c1e86d8c25ecad867204e ("mtd: m25p80: use the SPI
nor framework") and commit
e43b20619bdb6c851dd7b49cbd15e52875a785d4
("mtd: spi-nor: shorten Kconfig naming"),
- I2C_RIIC was enabled in the old genmai_defconfig.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
0f6442bef67d7f543d65d12e27006ceda8932b81)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 13 Aug 2014 11:45:00 +0000 (13:45 +0200)]
ARM: shmobile: r8a7778: Add missing call to shmobile_init_late()
Add the missing call to shmobile_init_late() to r8a7778_init_late().
This should make sure Suspend-to-RAM and CPUIdle are setup as expected
on bockw.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
54a06dde40f6a01e323d49390d78b8c9f1dfacc0)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 9 Jul 2014 13:12:44 +0000 (15:12 +0200)]
ARM: shmobile: genmai-reference: Enable MTU2 in device tree
No more device needs to be added from platform code when booting the
reference platform, move MTU2 registration from setup-r7s72100.c to
board-genmai.c and remove the now empty r7s72100_add_dt_devices()
function.
As the genmai_add_standard_devices() function is now identical to the
default init_machine implementation, remove it as well.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
9dddfcfacaadb5491b62233b893b510fa00da4e0)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
arch/arm/mach-shmobile/setup-r7s72100.c
Laurent Pinchart [Wed, 9 Jul 2014 13:12:40 +0000 (15:12 +0200)]
ARM: shmobile: r7s72100: Add MTU2 device to DT
Add the MTU2 counter to the r7s72100 device tree and make it disabled by
default.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
[horms+renesas@verge.net.au correct irq number]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
9162d39ccb9400bfaed85630cf517c85861faa6f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 9 Jul 2014 13:12:43 +0000 (15:12 +0200)]
ARM: shmobile: marzen-reference: Enable TMU0 in device tree
No more device needs to be added from platform code when booting the
reference platform, remove the now empty
r8a7779_add_standard_devices_dt() function completely.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
5ecd7a5185008723056a4b70815aa017272ca751)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 9 Jul 2014 13:12:42 +0000 (15:12 +0200)]
ARM: shmobile: koelsch-reference: Enable CMT0 in device tree
No more device needs to be added from platform code when booting the
reference platform, remove the now empty r8a7791_add_dt_devices()
function completely.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
6a1d9460df90f96e31922ad5c891c5c54a4c7f4e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 9 Jul 2014 13:12:41 +0000 (15:12 +0200)]
ARM: shmobile: lager-reference: Enable CMT0 in device tree
No more device needs to be added from platform code when booting the
reference platform, remove the now empty r8a7790_add_dt_devices()
function completely.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
247fd5ec6e9a41f9299df27be82104efc56e622b)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 9 Jul 2014 13:12:39 +0000 (15:12 +0200)]
ARM: shmobile: r8a7779: Add TMU devices to DT
Add the TMU0, TMU1 and TMU2 counters to the r8a7779 device tree and make
them disabled by default.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
ef890ea26a37884a21f592c3feccadb019e8a11b)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 9 Jul 2014 13:12:38 +0000 (15:12 +0200)]
ARM: shmobile: r8a7791: Add CMT devices to DT
Add the CMT0 and CMT1 counters to the r8a7791 device tree and make them
disabled by default.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
ceaa18949a190cf335408751cac0de2a0de0b9e7)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 9 Jul 2014 13:12:37 +0000 (15:12 +0200)]
ARM: shmobile: r8a7790: Add CMT devices to DT
Add the CMT0 and CMT1 counters to the r8a7790 device tree and make them
disabled by default.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
39cf6d73dc1ed11c7d5d2c96a0ccbbb868a7f3ce)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Jean Delvare [Wed, 5 Nov 2014 01:39:21 +0000 (09:39 +0800)]
watchdog: iTCO_wdt: Fix the parent device
The watchdog's parent is iTCO_wdt (the platform device) not lpc_ich
(the PCI device.) Setting the parent right makes it much easier for
the user to figure out which driver/module is handling the watchdog
device node.
Signed-off-by: Jean Delvare <jdelvare@suse.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
(cherry picked from commit
c90789baa8cec363093c5ec292c989b6f22d8f32)
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Jingoo Han [Wed, 5 Nov 2014 01:39:20 +0000 (09:39 +0800)]
watchdog: fix checkpatch warnings and error
Fix the following checkpatch warnings and error:
WARNING: quoted string split across lines
WARNING: braces {} are not necessary for single statement blocks
WARNING: __initdata should be placed after ibmasr_id_table[]
WARNING: please, no space before tabs
ERROR: do not initialise statics to 0 or NULL
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
(cherry picked from commit
5f5e19093b2fa592720810154f15ffe51aa9277f)
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Peter Tyser [Wed, 5 Nov 2014 01:39:19 +0000 (09:39 +0800)]
watchdog: iTCO_wdt: Add support for v3 silicon
Some new Atom's, eg Avoton and Bay Trail, have slightly different iTCO
functionality:
- The watchdog timer ticks at 1 second instead of .6 seconds
- Some 8 and 16-bit registers were combined into 32-bit registers
- Some registers were removed (DAT_IN, DAT_OUT, MESSAGE)
- The BOOT_STS field in TCO_STS was removed
- The NO_REBOOT bit is in the PMC area instead of GCS
Update the driver to support the above changes and bump the version to
1.11.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Tested-by: Rajat Jain <rajatjain@juniper.net>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
(cherry picked from commit
24b3a1670b47e75be633ae0b5c07945c446f9d29)
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
James Ralston [Wed, 5 Nov 2014 01:39:18 +0000 (09:39 +0800)]
mfd: lpc_ich: Add Device IDs for Intel 9 Series PCH
This patch adds the LPC Device IDs for the Intel 9 Series PCH.
Signed-off-by: James Ralston <james.d.ralston@intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
(cherry picked from commit
fea31042ff613145c7784e2ce454bf3c151b97ba)
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Alan Cox [Wed, 5 Nov 2014 01:39:17 +0000 (09:39 +0800)]
mfd: lpc_ich: Add PCI ID for Intel Braswell
This is the same as used in Baytrail so add the new PCI ID to the driver's
list of supported IDs.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
(cherry picked from commit
ff0c9da013d2c9f1ec232926a54e536ab48c6678)
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Guenter Roeck [Wed, 5 Nov 2014 01:39:16 +0000 (09:39 +0800)]
mfd: lpc_ich: Enable GPIO for Panther Point
Panther Point PCH GPIO configuration is similar to V5 PCHs.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
(cherry picked from commit
62cf2cdb99c7e870ab857bdd617e728790f8c43c)
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Peter Tyser [Wed, 5 Nov 2014 01:39:15 +0000 (09:39 +0800)]
mfd: lpc_ich: Add support for Intel Bay Trail SoC
This patch adds the LPC Controller Device IDs for Watchdog and GPIO for
the Intel Bay Trail Atom SoC.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
(cherry picked from commit
6111ec70357022ccd037399c13f69900431850b4)
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Peter Tyser [Wed, 5 Nov 2014 01:39:14 +0000 (09:39 +0800)]
mfd: lpc_ich: Add support for NM10 GPIO
The NM10's GPIO is compatible with ICH v7 GPIO.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Tested-by: Dan Weinlader <danw@vs-networks.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
(cherry picked from commit
117bbfe25cfc2e968be1f7976ac460a5cd3d734e)
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Peter Tyser [Wed, 5 Nov 2014 01:39:13 +0000 (09:39 +0800)]
mfd: lpc_ich: Change Avoton to iTCO v3
The register layout of the Avoton is compatible with the iTCO v3
register layout.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Tested-by: Rajat Jain <rajatjain@juniper.net>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
(cherry picked from commit
c48cf59878685cc06b71bb2a3ca17b61103c8de7)
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Peter Tyser [Wed, 5 Nov 2014 01:39:12 +0000 (09:39 +0800)]
mfd: lpc_ich: Add support for iTCO v3
Some newer Atom CPUs, eg Avoton and Bay Trail, use slightly different
register layouts for the iTCO than the current v1 and v2 iTCO.
Differences from previous iTCO versions include:
- The ACPI space is enabled in the "ACPI base address" register instead
of the "ACPI control register"
- The "no reboot" functionality is set in the "Power Management
Configuration" register instead of the "General Control and Status"
(GCS) register or PCI configuration space.
- The "ACPI Control Register" is not present on v3. The "Power
Management Configuration Base Address" register resides at the same
address is Avoton/Bay Trail.
To differentiate these newer chipsets create a new v3 iTCO version and
update the MFD driver to support them.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Tested-by: Rajat Jain <rajatjain@juniper.net>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
(cherry picked from commit
eb71d4dec4a5e010e34b9d7afdb5af41884c388e)
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Peter Tyser [Wed, 5 Nov 2014 01:39:11 +0000 (09:39 +0800)]
mfd: lpc_ich: Remove lpc_ich_cfg struct use
Future chipsets will use different register layouts that don't map
cleanly to the lpc_ich_cfg fields. Remove the lpc_ich_cfg struct and
add explicit fields to the higher level lpc_ich_priv structure.
This change should have no functional impact.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Tested-by: Rajat Jain <rajatjain@juniper.net>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
(cherry picked from commit
429b941abd503c8936e116c819362323aafdbd50)
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Peter Tyser [Wed, 5 Nov 2014 01:39:10 +0000 (09:39 +0800)]
mfd: lpc_ich: Only configure watchdog or GPIO when present
Some chipsets don't currently have GPIO support enabled. For these
chipsets don't go through the process of initializing the GPIO region.
Make the same change for the watchdog initialization for chipsets which
may not enable the WDT in the future.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Tested-by: Rajat Jain <rajatjain@juniper.net>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
(cherry picked from commit
f0776b8ce03ceb638c51b62f324844c71c446600)
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Peter Tyser [Wed, 5 Nov 2014 01:39:09 +0000 (09:39 +0800)]
mfd: lpc_ich: Fix ACPI enable bitmask
The original bitmask of 0x10 was incorrect and would result in a write
to a reserved read-only bit instead of enabling the ACPI I/O
region. Update it to the proper value of 0x80.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Tested-by: Rajat Jain <rajatjain@juniper.net>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
(cherry picked from commit
f5dccb15877b82a40950c6f752d5345c86189fc9)
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Vincent Donnefort [Wed, 5 Nov 2014 01:39:08 +0000 (09:39 +0800)]
mfd: lpc_ich: Add support for Intel Avoton GPIOs
Signed-off-by: Vincent Donnefort <vdonnefort@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
(cherry picked from commit
facd9939403cb5769190054a600474399e776e3a)
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Vincent Donnefort [Wed, 5 Nov 2014 01:39:07 +0000 (09:39 +0800)]
mfd: lpc_ich: Convert ICH GPIOs IDs to enum
All those IDs are arbitrary and so can be encapsulated into an enumeration.
Signed-off-by: Vincent Donnefort <vdonnefort@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
(cherry picked from commit
6cec365e3eba3dd8c864056d8d3fd9e73ab8dd7a)
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Paul Gortmaker [Wed, 5 Nov 2014 01:39:06 +0000 (09:39 +0800)]
mfd: Delete non-required instances of include <linux/init.h>
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
(cherry picked from commit
3c699105d0376c14940ce7cf561754a94cdff8dd)
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Alan Cox [Tue, 4 Nov 2014 08:55:25 +0000 (16:55 +0800)]
i2c: i801: Add PCI ID for Intel Braswell
The SMBus host controller is the same as used in Baytrail so add the new
PCI ID to the driver's list of supported IDs.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit
39e8e30ee544a62c148033d64a979028b958ca05)
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Jean Delvare [Tue, 4 Nov 2014 08:55:24 +0000 (16:55 +0800)]
i2c: i801: Add device ID for Intel Wildcat Point PCH
Signed-off-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit
b299de839157852c563b9f133c8b7e630545a9c3)
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Jean Delvare [Tue, 4 Nov 2014 08:55:23 +0000 (16:55 +0800)]
i2c: i801: Fix the alignment of the device table
A long name broke the alignment, shift the columns a bit to fix it and
make the table look nice again. While we're here, switch to the
standard comment style to make checkpatch happy, and use tabs instead
of spaces for column alignment.
Signed-off-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
(cherry picked from commit
ce3161106ab57afbfbe1c33d95bf4a569405983a)
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>