Ben Dooks [Wed, 4 Jun 2014 11:42:10 +0000 (12:42 +0100)]
mmc: sh-mmcif: use devm_ for clock management
Use the devm_clk_get() code to get the clock and allow it to be freed
automatically on release.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit
5337a334e4f4f1e9384054e34e08ffab9be93c81)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ben Dooks [Wed, 4 Jun 2014 11:42:09 +0000 (12:42 +0100)]
mmc: sh-mmcif: use devm_ for ioremap
Start tidying the probe/release code by using devm_ioremap_resource() to
map the IO registers.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit
402de61c9ef9aff9990f6629cc7527827db331e0)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ben Dooks [Wed, 4 Jun 2014 11:42:08 +0000 (12:42 +0100)]
mmc: sh-mmcif: update to print version and bus clock rate on probe
Change the initial print to show chip version and the bus rate it is
working at instead of the driver version. This is more useful information
as we already know which driver version from the kernel it is in.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit
ba09ab6ba9d2ec27cd68e8cf655ac163cd4d5f6a)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Yoshihiro Shimoda [Wed, 28 May 2014 11:23:26 +0000 (20:23 +0900)]
Documentation: dt-bindings: update xhci-platform DT binding for R-Car H2 and M2
This commit extends the compatible string list of the xhci-platform
binding with the new "renesas,xhci-r8a7790" and "renesas,xhci-r8a7791"
compatible strings. It is used to describe the xHCI controller which
is available in the R-Car H2 and M2 SoCs.
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
c7c1ce8061c0dc5b848e5df0ba459dbbf78057d7)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Gregory CLEMENT [Thu, 15 May 2014 10:17:34 +0000 (12:17 +0200)]
Documentation: dt-bindings: update xhci-platform DT binding
This commit extends the compatible string list of the xhci-platform
binding with the new "armada-375-xhci" and "armada-380-xhci"
compatible strings. It is used to describe the XHCI controller which
is available in the Armada 375 and 38x SoCs.
It also indicates that an optional 'clocks' property is now supported.
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
023bfe83e278dca17abc491f8e1182211edb0559)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Wed, 11 Jun 2014 06:41:03 +0000 (23:41 -0700)]
ASoC: rsnd: fixup index of src/dst mod when capture
Index of dma name should use -1, not +1 when capture case.
Thank you Dan.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
4cf612780cec81317a0278b28679a8b69ea8f09c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Fri, 23 May 2014 06:25:54 +0000 (23:25 -0700)]
ASoC: rsnd: add rsnd_gen_dma_addr() for DMAC addr
The DMAC src/dst addr needs to be set from driver when DT case.
(It was set from SoC/DMAEngine code when non-DT case)
This patch adds rsnd_gen_dma_addr() to set DMAC src/dst addr.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
ad32d0c7b0e993433df152ae747652647eb65a27)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Fri, 23 May 2014 06:25:49 +0000 (23:25 -0700)]
ASoC: rsnd: care DMA slave channel name for DT
Renesas sound driver is supporting to use DMAEngine.
But, DMA slave channel name "tx", "rx" is not enough
in DT case.
Becuase, it has many ports and path combination.
This patch adds rsnd_dma_of_name() to find
DMA channel name, for example
memory to SSI0 is "mem_ssi0",
SSI0 to memory is "ssi0_mem",
SSI0 to SRC0 is "ssi0_src0",
SRC0 to SSI0 is "src0_ssi0",
SRC0 to DVC0 is "src0_dvc0"...
Renesas sound want to use PIO transfer mode for some reasons.
It will be PIO tranfer mode if device node doesn't have
DMA settings.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
199e7688bdf7d188d70c3432c96ec13d8a14b341)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Fri, 23 May 2014 06:25:43 +0000 (23:25 -0700)]
ASoC: rsnd: module name is unified
Renesas sound driver uses many modules (= SSI/SRC/DVC),
and each module had own name.
But, each module name can be used as several purpose,
like clock name, DMA name etc...
This patch uses common name for each module.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
8aefda5046f417c551e3acdeb2cf37949a4b75e9)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Fri, 23 May 2014 06:25:37 +0000 (23:25 -0700)]
ASoC: rsnd: remove rsnd_src_non_ops
Renesas sound driver is supporting Gen1/Gen2.
SRC probe can return error if it was unknown
generation.
Now, rsnd_src_non_ops is not needed.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
033e7ed85b8513db4efacbdf0f22db2bed4ff405)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Fri, 23 May 2014 06:25:30 +0000 (23:25 -0700)]
ASoC: rsnd: save platform_device instead of device
DT DMA support needs struct platform_device pointer,
and it can get struct device pointer from platform_device.
Save platform_device instead of device.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
9f464f8e076e6fcc8d249e76d84f4fb99c1fecff)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Fri, 23 May 2014 06:24:59 +0000 (23:24 -0700)]
ASoC: rsnd: DT node clean up by using the of_node_put()
Driver needs to call of_node_put() after of_get_chile_by_name()
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
f451e48d8e1cae07d55b4a5b558c008cd4dc9a73)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Mon, 12 May 2014 23:10:20 +0000 (01:10 +0200)]
ASoC: rsnd: Fix warnings due to improper printk formats
Use the %pap printk specifier to print resource_size_t variables. This
fixes warnings on platforms where resource_size_t has a different size
than int.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
e6b0d896ab0597d37422cae3cef3e789431549eb)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Fri, 9 May 2014 00:44:49 +0000 (17:44 -0700)]
ASoC: rsnd: add DVC support
This patch adds DVC (Digital Volume Controller)
support which is member of CMD unit.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
bff58ea4f43d9b4a9fd6fb05fabc8f50f68131f5)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Fri, 9 May 2014 00:44:41 +0000 (17:44 -0700)]
ASoC: rsnd: enable to use multi parameter on rsnd_dai_call/rsnd_mod_call
rsnd_mod_ops would like to come to use multi parameter.
modify macro to enable it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
68b6af3656a1f3303cca094a19e26653fad1853a)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Fri, 9 May 2014 00:44:29 +0000 (17:44 -0700)]
ASoC: rsnd: remove duplicate parameter from rsnd_mod_ops
Now, it can get rsnd_dai_stream pointer from rsnd_mod.
Remove duplicate parameter from rsnd_mod_ops
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
b42fccf69cd7153d1158c85137ec718d7309e074)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Fri, 9 May 2014 00:44:14 +0000 (17:44 -0700)]
ASoC: rsnd: add rsnd_get_adinr()
SRC module needs ADINR register settings,
but, it has many similar xxx_ADINR register,
and needs same settings.
This patch adds rsnd_get_adinr() to sharing code.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
d7bdbc5d9e4e813522f46632527826211270b9d0)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Fri, 9 May 2014 00:43:26 +0000 (17:43 -0700)]
ASoC: rsnd: add rsnd_path_parse() macro
Current R-Car sound supports only SRC/SSI,
but, other module will be supported.
This patch adds rsnd_path_parse() macro to share code
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
739f9502fdd7c7202123ded842415a0392b7dc40)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Thu, 8 May 2014 08:59:26 +0000 (01:59 -0700)]
ASoC: rsnd: remove compatibility code
Now, all platform is using new style rsnd_dai_platform_info.
Keeping compatibility is no longer needed.
We can cleanup code.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
29e69fd2cd6f55233f64f600ad55ce2b661784d1)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Thu, 8 May 2014 08:59:00 +0000 (01:59 -0700)]
ASoC: rsnd: remove old clock style support
All platform which used old style was
switched to new style.
R-Car sound can remove old style clock support,
use device dependent clock now.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
5e392ea0da04d4206d56ec1479565fb42a044b57)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Arnd Bergmann [Tue, 29 Apr 2014 11:18:30 +0000 (19:18 +0800)]
ASoC: sh: Migo-R sound needs I2C
The WM8978 driver needs I2C to be enabled, so the
SND_SIU_MIGOR option also requires this.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Xia Kaixu <kaixu.xia@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit
7b6ad9e85bad73bac3ce799864e0e3a66a0469e2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Shinobu Uehara [Tue, 22 Jul 2014 05:04:29 +0000 (22:04 -0700)]
ARM: shmobile: r8a7791: Fix SD2CKCR register address
59e79895b95892863617ce630fbda467f2470575
(ARM: shmobile: r8a7791: Add clocks)
added r8a7791 SD clocks when v3.14.
2c60a7df72711fb8b4be1e6aa651ab166a8931bc
(ARM: shmobile: Add SDHI devices for Koelsch DTS)
enabled SD on r8a7791 Koelsch when v3.15.
1299df03d7191ab4356c995dde8b912d3c8922e9
(ARM: shmobile: henninger: add SDHI0/2 DT support)
enable SD on r8a7791 Henninger when v3.16.
But r8a7791 SD clock had wrong address.
This patch fixup it.
[Kuninori Morimoto: tidyup for upstreaming]
Signed-off-by: Shinobu Uehara <shinobu.uehara.xc@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
c9b227723d051184b9e78f20c75ae2f9d44a6ea2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Will Deacon [Tue, 27 May 2014 22:26:35 +0000 (23:26 +0100)]
ARM: kconfig: allow PCI support to be selected with ARCH_MULTIPLATFORM
When targetting ARCH_MULTIPLATFORM, we may include support for SoCs with
PCI-capable devices (e.g. mach-virt with virtio-pci).
This patch allows PCI support to be selected for these SoCs by selecting
CONFIG_MIGHT_HAVE_PCI when CONFIG_ARCH_MULTIPLATFORM=y and removes the
individual selections from multi-platform enabled SoCs.
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
(cherry picked from commit
08d38bebb4dcd6414944f8277ea5ea30010664fe)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
arch/arm/mach-bcm/Kconfig
arch/arm/mach-cns3xxx/Kconfig
arch/arm/mach-imx/Kconfig
Kuninori Morimoto [Wed, 28 May 2014 02:57:16 +0000 (19:57 -0700)]
ARM: shmobile: armadillo800eva: fixup HDMI sound flags setting
c7a507eea1db1430476289f525f9c853d5d485e8
(ASoC: fsi: fixup SND_SOC_DAIFMT_CBx_CFx flags)
fixuped FSI driver's behavior
which didn't match to ALSA flags.
But, it didn't care about armadillo800eva HDMI sound flags.
This patch fixed it.
Reported-by: Bui Duc Phuc(Fukuda) <bd-phuc@jinso.co.jp>
Reported-by: Hiep Cao Minh <cm-hiep@jinso.co.jp>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
730359857f5f0e1fac9881c63d389d73adb5f416)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Wed, 28 May 2014 01:52:34 +0000 (10:52 +0900)]
ARM: shmobile: r8a7779: Add clock index macros for DT sources
Add macros usable by device tree sources to reference r8a7779 clocks by
index.
Based on work for the r8a7791 SoC by Laurent Pinchart.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
(cherry picked from commit
b59e869674f5b6779c65ddb13cf799cd01c07072)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Naoki MATSUMOTO [Thu, 15 May 2014 11:17:44 +0000 (20:17 +0900)]
USB: delete CONFIG_USB_DEVICEFS from defconfig
It no longer occurs in Kconfig.
USB: remove CONFIG_USB_DEVICEFS(
fb28d58b) leaked remove defconfig.
Signed-off-by: Naoki MATSUMOTO <nekomatu+linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
3a0d89d3f80df15fee3802e030d51f1848269a01)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Fri, 16 May 2014 12:10:16 +0000 (14:10 +0200)]
ARM: shmobile: Remove Genmai reference DTS
Now that the DTS file r7s72100-genmai.dts can be used with
board-genmai.c and board-genmai-reference.c, proceed with removing
r7s72100-genmai-reference.dts.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
a5176e0d9de31a54e08468f21c15dc08e006857f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Fri, 16 May 2014 12:10:15 +0000 (14:10 +0200)]
ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB
Let the multiplatform Genmai support boot with the unified DTS.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
23f679fa6de3b3f7e1d9e1d8eaeafa5167a55a17)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
arch/arm/boot/dts/Makefile
Wolfram Sang [Fri, 16 May 2014 12:10:14 +0000 (14:10 +0200)]
ARM: shmobile: Sync Genmai DTS with Genmai reference DTS
Copy the device nodes from Genmai reference into the Genmai device tree
file. This will allow us to use a single DTS file regardless of kernel
configuration. In case of legacy C board code the device nodes may or
may not be used, but in the multiplatform case all the DT device nodes
will be used.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
2606f47be55fd4545ed9236467682c636fd23f9d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Fri, 16 May 2014 12:10:13 +0000 (14:10 +0200)]
ARM: shmobile: genmai-reference: Remove legacy clock support
genmai-reference is now only built for multiplatform which means that
CCF comes with the package. Remove unused legacy code ifdefs to clean up
the code.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
88351216f595786a24ff6cb7df7b101811981c78)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Fri, 16 May 2014 12:10:12 +0000 (14:10 +0200)]
ARM: shmobile: Remove non-multiplatform Genmai reference support
Now that r7s72100 has CCF support, remove the legacy Genmai reference
Kconfig bits for the non-multiplatform case.
Starting from this commit Genmai board support is always enabled via
CONFIG_MACH_GENMAI, and CONFIG_ARCH_MULTIPLATFORM is used to select
between board-genmai.c and board-genmai-reference.c
The file board-genmai-reference.c can no longer be used together with
the legacy sh-clk clock framework, instead CCF is used.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
551f80a5c915c4615cd4065ad4db5cf68f765b97)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
arch/arm/boot/dts/Makefile
Geert Uytterhoeven [Wed, 14 May 2014 14:41:12 +0000 (16:41 +0200)]
ARM: shmobile: r8a7740 dtsi: Remove duplicate interrupt-parent property
Caused by interaction between commit
08ec67b50db7ca8c9077e67ca23850cdc5bfc716 ("ARM: shmobile: r8a7740 dtsi:
Add Ethernet support") and commit
9ff254adc1e32db46000a33b8ecbc4d7047672be
("ARM: shmobile: dts: Move interrupt-parent property to root 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
3fa3985e624aea24334abc9a33b484c3d316e64e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Tue, 13 May 2014 06:59:18 +0000 (15:59 +0900)]
ARM: shmobile: Set clock frequency in HZ from OF nodes
shmobile_init_delay() looks for OF "clock-frequency" to determine
the delay which is set by calling shmobile_setup_delay().
Unfortunately this seems to be incorrect in detail as
"clock-frequency" node values are in HZ whereas the frequency
argument to shmobile_setup_delay() is in MHz.
Provide a variant of shmobile_setup_delay() that accepts HZ to
correct this problem.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
f492b81777c93b33afe892b424e022022b5bc297)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Wed, 14 May 2014 01:10:15 +0000 (03:10 +0200)]
ARM: shmobile: r7s72100: use workaround for non DT-clocks
MTU2 is not yet prepared for DT usage, so use the common workaround via
clkdev for now.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
9fbb1ae01b878e2cce9626fa6fdc9e5dcefeb6b5)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 14 May 2014 01:10:16 +0000 (03:10 +0200)]
ARM: shmobile: Add forward declaration of struct clk to silence warning
arch/arm/mach-shmobile/board-genmai-reference.c:23:0:
arch/arm/mach-shmobile/include/mach/clock.h:19:54: warning: 'struct clk' declared inside parameter list [enabled by default]
arch/arm/mach-shmobile/include/mach/clock.h:19:54: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
1f9c7a691fefc2158bed4d5403422cc9b99ca335)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Wed, 14 May 2014 01:10:14 +0000 (03:10 +0200)]
ARM: shmobile: r7s72100: remove SPI DT clocks from legacy clock support
Not used anymore since we switched to CCF.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
3158e053ff45ed36d531d775cf0040642b91b606)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Wed, 14 May 2014 01:10:13 +0000 (03:10 +0200)]
ARM: shmobile: r7s72100: add spi clocks to dtsi
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
52eed4f5c267bd50d870f9c63d0a83d6f83d8bab)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Wed, 14 May 2014 01:10:12 +0000 (03:10 +0200)]
ARM: shmobile: r7s72100: remove I2C DT clocks from legacy clock support
Not used anymore since we switched to CCF.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
316b9353784386aedc4f2643dfdfda30da268b0b)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Wed, 14 May 2014 01:10:11 +0000 (03:10 +0200)]
ARM: shmobile: r7s72100: add i2c clocks to dtsi
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
d165566b8dc425e52a4f2c19c27c63d9807128b2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Wed, 14 May 2014 01:10:10 +0000 (03:10 +0200)]
ARM: shmobile: r7s72100: genmai: platform scif devices only for legacy support
We have now DT support for SCIF, so use the platform_device
initialization only for the legacy support.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
d45b21c9021d7de7941b00f0902a9401fb32a3d9)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Wed, 14 May 2014 01:10:09 +0000 (03:10 +0200)]
ARM: shmobile: r7s72100: genmai: add uart alias and activate scif2 as console
We keep the UART naming backwards compatible with the legacy version.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
5be13fefdb83c15ed69eb032dfe011162d1a5269)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Wed, 14 May 2014 01:10:08 +0000 (03:10 +0200)]
ARM: shmobile: r7s72100: add scif nodes to dtsi
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
4c84c1b3accabdfb7aa8e98a4644c94df0703bb0)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Wed, 14 May 2014 01:10:07 +0000 (03:10 +0200)]
ARM: shmobile: r7s72100: genmai: populate nodes for external clocks
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
5f76a5699f52052468e006e6c58010c5183b8386)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Wed, 14 May 2014 01:10:06 +0000 (03:10 +0200)]
ARM: shmobile: r7s72100: add essential clock nodes to dtsi
Only essential clocks are added for now. Other clocks will be added when
needed.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
b6face404f38f783c4428d953efa4eeb68d7cc24)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 30 Apr 2014 00:31:46 +0000 (02:31 +0200)]
ARM: shmobile: koelsch: Enable SCIF0 and SCIF1 serial ports in DT
SCIF0 and SCIF1 are used as debug serial ports. Enable them and
configure pinmuxing appropriately. We can now remove the clkdev
registration hack for SCIF devices from the Koelsch reference board
file.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
[horms+renesas@verge.net.au: added aliases to avoid device renumbering]
[horms+renesas@verge.net.au: resolved conflicts]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
5ba55fa81aee9493928c245f142a0bfe9f32d02f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 30 Apr 2014 00:31:45 +0000 (02:31 +0200)]
ARM: shmobile: lager: Enable SCIF0 and SCIF1 serial ports in DT
SCIF0 and SCIF1 are used as debug serial ports. Enable them and
configure pinmuxing appropriately. We can now remove the clkdev
registration hack for SCIF devices from the Lager reference board file.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
[horms+renesas@verge.net.au: updated changelog to remove references to
device renaming]
[horms+renesas@verge.net.au: resolved conflicts]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
4e9c4877aacc134b568e480eb8998de58b43d63e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
arch/arm/boot/dts/r8a7790-lager.dts
Magnus Damm [Sun, 11 May 2014 23:10:50 +0000 (08:10 +0900)]
ARM: shmobile: Use shmobile_init_late() on r8a7740
Hook up ->init_late for r8a7740 to initialize Suspend-to-RAM
and CPUIdle in case of C-code less board support for r8a7740.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
34b9fa401eeef4e388bb7563110733c73c452c80)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Wed, 15 May 2013 02:57:30 +0000 (11:57 +0900)]
ARM: shmobile: marzen-reference: Set SMSC lan to use irq-push-pull
This change makes the DTS consistent with the platform data
that exists in board-marzen.c.
Empirically it does not appear to be necessary.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
c9af5428be0cea61a34fa8d5dda83d4c57a03b06)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 23 Apr 2014 08:25:28 +0000 (10:25 +0200)]
ARM: shmobile: r8a7791 dtsi: Add GPIO clocks
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
4faf9c5e56d1326067f5faca551eb67ecf76696c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 23 Apr 2014 08:25:27 +0000 (10:25 +0200)]
ARM: shmobile: r8a7790 dtsi: Add GPIO clocks
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
81f6883f0b1bbb1dbca34cc65257f823acb55cbd)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 30 Apr 2014 00:41:28 +0000 (02:41 +0200)]
ARM: shmobile: dts: Move interrupt-parent property to root node
There's no need to duplicate the interrupt-parent property in all DT
nodes as the kernel automatically walks parent nodes to find the
property. Specify it once in the root node only.
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
9ff254adc1e32db46000a33b8ecbc4d7047672be)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Sun, 11 May 2014 23:25:37 +0000 (08:25 +0900)]
ARM: shmobile: Remove unused r8a7791_init_early()
Remove the now unused r8a7791_init_early() function.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
595e9b00fb81f971d84ff451861423d02c39d060)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Sun, 11 May 2014 23:25:27 +0000 (08:25 +0900)]
ARM: shmobile: Use r8a7791 DT CPU Frequency for Koelsch
Convert the Koelsch board support to use shmobile_init_delay()
to be able to migrate away from per-SoC delay setup functions.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
7e99497cf5e7b46ff5f434beae45f6f35005e8b6)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Sun, 11 May 2014 23:25:18 +0000 (08:25 +0900)]
ARM: shmobile: Use r8a7791 DT CPU Frequency in common case
Convert the common C-code-less r8a7791 DT board support
to use shmobile_init_delay() to be able to migrate away
from per-SoC delay setup functions.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
648c687a6a43a6473caedba4785a16537bd21bfb)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 7 May 2014 23:37:53 +0000 (08:37 +0900)]
ARM: shmobile: Minor cleanup of the Armadillo legacy board code
Cleanup the legacy Armadillo board code slightly by
removing the pointless eva_add_early_devices() function
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
fd105ecf17fe459d979f336a7389d87172a1cf6d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 7 May 2014 23:32:56 +0000 (08:32 +0900)]
ARM: shmobile: Remove unused r8a7740_init_delay()
Remove the now unused r8a7740_init_delay() function.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Tested-by: Geert Uytterhoeven <geert@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
bf901fbd9040effe4aa1389f78efcc1c2736a44b)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 7 May 2014 23:32:47 +0000 (08:32 +0900)]
ARM: shmobile: Use r8a7740 DT CPU Frequency for Armadillo DT Ref
Convert the Armadillo r8a7740 DT reference board support
to use shmobile_init_delay() to be able to migrate away
from per-SoC delay setup functions.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Tested-by: Geert Uytterhoeven <geert@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
e568802d13eb1dbcbe688aa4e7cf1db866a52e3e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 7 May 2014 23:32:38 +0000 (08:32 +0900)]
ARM: shmobile: Use r8a7740 DT CPU Frequency in common case
Convert the common C-code-less r8a7740 DT board support
to use shmobile_init_delay() to be able to migrate away
from per-SoC delay setup functions.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Tested-by: Geert Uytterhoeven <geert@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
a0c1fb0c285d9aa5f9d078449cfa37883a3f5a91)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Magnus Damm [Wed, 7 May 2014 23:32:29 +0000 (08:32 +0900)]
ARM: shmobile: Add r8a7740 Maximum CPU Frequency to DTS
Add 800 MHz to the r8a7740 DTS to describe the maximum CPU frequency.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Tested-by: Geert Uytterhoeven <geert@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
63575d8cd5cba0c657ac5c18f75e91e2e30cc0eb)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 23 Apr 2014 11:15:22 +0000 (13:15 +0200)]
ARM: shmobile: r7s72100: Switch to new style MTU2 device
The MTU2 (Multi-Function Timer Pulse Unit 2) driver implements a new
style of platform data that handles the timer as a single device with
multiple channel. Switch from the old-style platform data to the
new-style platform data.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
c17fcfbcc0f6b4f3cae761149e1a6108dd6750e7)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 23 Apr 2014 11:15:20 +0000 (13:15 +0200)]
ARM: shmobile: r8a7779: Switch to new style TMU device
The TMU (Timer Unit) driver implements a new style of platform data that
handles the timer as a single device with multiple channel. Switch from
the old-style platform data to the new-style platform data.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
e4ae34e285b1c102686cb1c2a39ef93f930bf8f4)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Fri, 2 May 2014 18:21:25 +0000 (20:21 +0200)]
ARM: shmobile: r8a7778: Switch to new style TMU device
The TMU (Timer Unit) driver implements a new style of platform data that
handles the timer as a single device with multiple channel. Switch from
the old-style platform data to the new-style platform data.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
535ef0d9575b0809915341481ef3bac6bb5d0aaa)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 23 Apr 2014 11:15:18 +0000 (13:15 +0200)]
ARM: shmobile: r8a7740: Switch to new style TMU device
The TMU (Timer Unit) driver implements a new style of platform data that
handles the timer as a single device with multiple channel. Switch from
the old-style platform data to the new-style platform data.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
8ec72e46067d237dd60a08582e6427159c3f4b5f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 23 Apr 2014 11:15:17 +0000 (13:15 +0200)]
ARM: shmobile: sh73a0: Switch to new style TMU device
The TMU (Timer Unit) driver implements a new style of platform data that
handles the timer as a single device with multiple channel. Switch from
the old-style platform data to the new-style platform data.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
3df592bc335a6efe30c88c9e39d29ceb5c20bbfb)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 23 Apr 2014 11:15:16 +0000 (13:15 +0200)]
ARM: shmobile: sh7372: Switch to new style TMU device
The TMU (Timer Unit) driver implements a new style of platform data that
handles the timer as a single device with multiple channel. Switch from
the old-style platform data to the new-style platform data.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
8e8236a9d86e5cf5979be13c3063d2381fbed285)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 23 Apr 2014 11:15:14 +0000 (13:15 +0200)]
ARM: shmobile: r8a7791: Switch to new style CMT device
The CMT (Compare Match Timer) driver implements a new style of platform
data that handles the timer as a single device with multiple channel.
Switch from the old-style platform data to the new-style platform data.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
[horms+renesas@verge.net.au resolved conflict: use clk_names]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
356af68bf483e4564f75a35287a8f5f39d31041f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 23 Apr 2014 11:15:13 +0000 (13:15 +0200)]
ARM: shmobile: r8a7790: Switch to new style CMT device
The CMT (Compare Match Timer) driver implements a new style of platform
data that handles the timer as a single device with multiple channel.
Switch from the old-style platform data to the new-style platform data.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
[horms+renesas@verge.net.au resolved conflict: use clk_names]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
711ee6c8dee1df265773786cd0ec96f2cae5c189)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 23 Apr 2014 11:15:12 +0000 (13:15 +0200)]
ARM: shmobile: r8a7740: Switch to new style CMT device
The CMT (Compare Match Timer) driver implements a new style of platform
data that handles the timer as a single device with multiple channel.
Switch from the old-style platform data to the new-style platform data.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
e0ad56a35e02fe16f12cc18867903f8462d587bf)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 23 Apr 2014 11:15:11 +0000 (13:15 +0200)]
ARM: shmobile: r8a73a4: Switch to new style CMT device
The CMT (Compare Match Timer) driver implements a new style of platform
data that handles the timer as a single device with multiple channel.
Switch from the old-style platform data to the new-style platform data.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
52065ef71e2c4da9e9661da68915741afc72ec1d)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 23 Apr 2014 11:15:10 +0000 (13:15 +0200)]
ARM: shmobile: sh73a0: Switch to new style CMT device
The CMT (Compare Match Timer) driver implements a new style of platform
data that handles the timer as a single device with multiple channel.
Switch from the old-style platform data to the new-style platform data.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
652256fd475053f7fd8c2cd3e85f37be96d594db)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Wed, 23 Apr 2014 11:15:09 +0000 (13:15 +0200)]
ARM: shmobile: sh7372: Switch to new style CMT device
The CMT (Compare Match Timer) driver implements a new style of platform
data that handles the timer as a single device with multiple channel.
Switch from the old-style platform data to the new-style platform data.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
386f60aae35271efa4dc7c407f65269b7cb71edb)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 7 May 2014 20:32:28 +0000 (22:32 +0200)]
ARM: shmobile: r8a7740: Correct name of DT Ethernet clock
The preferred node name in DT for an Ethernet device is "ethernet".
"sh-eth" was used in preliminary and incomplete bindings.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
93131c36d49e932151a5f482f50ea40f3f0c987f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 7 May 2014 20:32:30 +0000 (22:32 +0200)]
ARM: shmobile: armadillo-reference dts: Add Ethernet support
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
15d89dc9bfde872885c6226d86fb25676cbedfb3)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Wed, 7 May 2014 20:32:29 +0000 (22:32 +0200)]
ARM: shmobile: r8a7740 dtsi: Add Ethernet support
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
08ec67b50db7ca8c9077e67ca23850cdc5bfc716)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Sergei Shtylyov [Tue, 6 May 2014 20:47:59 +0000 (00:47 +0400)]
ARM: shmobile: henninger: add MSIOF0 DT support
Define the Henninger board dependent part of the MSIOF0 device node.
Add device node for Renesas R2A11302FT PMIC for which no bindings exist yet.
Based on the Koelsch MSIOF device tree patch by Geert Uytterhoeven.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
667366bff7c4d38c6efa60f2e32d13c26a58d7d4)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Sergei Shtylyov [Mon, 5 May 2014 22:45:31 +0000 (02:45 +0400)]
ARM: shmobile: henninger: add QSPI DT support
Define the Henninger board dependent part of the QSPI device node.
Add device nodes for Spansion S25FL512S SPI flash and MTD partitions on it.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
f59838d448356feb4f0ce70785a49045d842c9c3)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Sergei Shtylyov [Sat, 3 May 2014 17:04:34 +0000 (21:04 +0400)]
ARM: shmobile: henninger: add SDHI0/2 DT support
Define the Henninger board dependent part of the SDHI0/2 device nodes along with
the necessary voltage regulators (note that the Vcc regulators are dummy -- they
are required but don't actually exist on the board). Also, GPIOs have to be used
for the CD and WP signals due to the SDHI driver constraints...
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
1299df03d7191ab4356c995dde8b912d3c8922e9)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Sergei Shtylyov [Thu, 1 May 2014 22:56:33 +0000 (02:56 +0400)]
ARM: shmobile: henninger: specify EXTAL frequency
When creating the initial device tree for the Henninger board, I've overlooked
that EXTAL frequency needs to be overridden there. The 'sh-sci' driver managed
to work somehow but the SDHI driver that I've tried to enable just hanged with
the default EXTAL frequency of 0...
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
2af0d93762e91d4496cc2e63761c70ae9f50f997)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Sergei Shtylyov [Fri, 25 Apr 2014 22:51:27 +0000 (02:51 +0400)]
ARM: shmobile: henninger: enable SATA0
Enable SATA0 device for the Henninger board.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
5a62ec57004f1a434bfd3feed43e447b5780baf6)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Sergei Shtylyov [Thu, 24 Apr 2014 22:44:12 +0000 (02:44 +0400)]
ARM: shmobile: henninger: add Ether DT support
Define the Henninger board dependent part of the Ether device node.
Enable DHCP and NFS root for the kernel booting.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
26b0d2cf73cb5091962c81598a36346d05e9ba83)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Sergei Shtylyov [Thu, 24 Apr 2014 22:42:41 +0000 (02:42 +0400)]
ARM: shmobile: henninger: initial device tree
Add the initial device tree for the R8A7791 SoC based Henninger board. SCIF0
serial port support is included, so that the serial console can work.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
4b37ab033e6f8c9750f98fefe9bdc341b6943268)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Ulf Hansson [Fri, 11 Apr 2014 15:26:41 +0000 (17:26 +0200)]
ARM: shmobile: Ignore callbacks for subsys generic_pm_domain_data
There are no active users of these callbacks, thus there are no benefit
of trying to invoke them.
Cc: Simon Horman <horms@verge.net.au>
Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
ab496b9d259e754f5d646219e4f032b274b9fffe)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Tue, 15 Apr 2014 12:51:50 +0000 (14:51 +0200)]
ARM: shmobile: armadillo-reference dts: Seiko Instruments, Inc is "sii"
Use "sii,s35390a" instead of "seiko,s35390a", cfr.
Documentation/devicetree/bindings/i2c/trivial-devices.txt and
Documentation/devicetree/bindings/vendor-prefixes.txt.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
dd485ab9a88267f4db0d58ace23b19e876ebf8ac)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Tue, 15 Apr 2014 12:33:58 +0000 (14:33 +0200)]
ARM: shmobile: r8a7740: Make r8a7740_meram_workaround() __init
It's called from eva_init() only, which is __init
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
bb6c3d58c36adb205b4bf233fd1c4079e02a6811)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Tue, 15 Apr 2014 12:33:59 +0000 (14:33 +0200)]
ARM: shmobile: sh7372: Call sh7372_add_early_devices() instead of open coding
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
1fba31f047639a6c7accf4f6d075a6cf9eacecc0)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Tue, 15 Apr 2014 12:33:57 +0000 (14:33 +0200)]
ARM: shmobile: r8a7740: Remove unused r8a7740_add_early_devices_dt()
It was removed in commit
744fdc8dc0e22cc5b61ee1bcde9375f188daa330 ("ARM:
shmobile: r8a7740: Prepare for reference DT setup"), but accidentally
resurrected in commit
88378837780166d67a11142cd6f76596c0a2d8c3 ("ARM:
shmobile: Remove unused r8a7740 auxdata table").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
72dc392ae5bbad3477053ac4c5708dba6706ffa0)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Mon, 14 Apr 2014 17:35:59 +0000 (19:35 +0200)]
ARM: shmobile: lager legacy: Enable Quad SPI transfers for the SPI FLASH
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
a09b2f0ba170dc89a67d6c4c4f027b37a085dad9)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Mon, 14 Apr 2014 17:36:00 +0000 (19:36 +0200)]
ARM: shmobile: lager dts: Enable Quad SPI transfers for the SPI FLASH
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
9909d2cb41a9c752cbbef5d9fb57d80a7196e951)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Mon, 14 Apr 2014 17:35:58 +0000 (19:35 +0200)]
ARM: shmobile: koelsch dts: Enable Quad SPI transfers for the SPI FLASH
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
ed56083acfe7c872318b8321c7d0e25a6b520371)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Geert Uytterhoeven [Mon, 14 Apr 2014 17:35:57 +0000 (19:35 +0200)]
ARM: shmobile: koelsch legacy: Enable Quad SPI transfers for the SPI FLASH
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
4d4a0ff30c39b82c1dc549f2cc7a62b514431e64)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Mon, 14 Apr 2014 00:57:12 +0000 (17:57 -0700)]
ARM: shmobile: lager: switch to use dai info for R-Car sound
Now, R-Car sound driver supports dai info settings.
switch to use it
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
50f359d7389be354b46d781f3b234d3008d20f2f)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Mon, 14 Apr 2014 00:57:05 +0000 (17:57 -0700)]
ARM: shmobile: bockw: switch to use dai info for R-Car sound
Now, R-Car sound driver supports dai info settings.
switch to use it
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
a3f50d1bdd47dfa07cb42f7d954739389664f166)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Mon, 14 Apr 2014 00:56:57 +0000 (17:56 -0700)]
ARM: shmobile: bockw: remove old style audio clock
Current audio clock didn't have dependency to device/driver,
but, it was not good design for DT support.
To avoid branch merge conflict issue,
it is using this load map, and this patch is 3) part.
1) add new style clock in platform
2) add new style clock method in driver
3) remove old tyle clock from platform
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
115897dab004f580fc8b4c6bab057940ccb64989)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Mon, 14 Apr 2014 00:56:50 +0000 (17:56 -0700)]
ARM: shmobile: r8a7790: remove old style audio clock
Current sound driver moves to new style clock,
but is keeping compatiblity at this point.
Move to new style on r8a7790
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
932616eed0308cbebbb20a079e4bed3674bf1117)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Kuninori Morimoto [Mon, 14 Apr 2014 00:56:42 +0000 (17:56 -0700)]
ARM: shmobile: r8a7778: remove old style audio clock
Current sound driver moves to new style clock,
but is keeping compatiblity at this point.
Move to new style on r8a7778
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
a9d83bd6abc00e14e2db1660e2c7d889745bb3aa)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Tue, 25 Mar 2014 18:56:29 +0000 (19:56 +0100)]
ARM: shmobile: r8a7790: add IIC(B) cores to dtsi
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
05f3991622013692b8ef428a6703663331544248)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Wolfram Sang [Tue, 11 Mar 2014 21:24:37 +0000 (22:24 +0100)]
ARM: shmobile: r8a7790: add IIC(B) clocks to dtsi
Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
[horms+renesas@verge.net.au resolved conflicts]
[horms+renesas@verge.net.au consistently use space as separator]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
17465149d8a1a3b7a00f02796d7d364522d0383b)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Tue, 1 Apr 2014 11:02:18 +0000 (13:02 +0200)]
ARM: shmobile: r8a7791: Fix the I2C clocks parents in DT
All I2C clocks derive from the HP clock, not from the P clock. Fix them.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
11b48db9321d11c623155a1c82544988508f9aca)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart [Tue, 1 Apr 2014 11:02:17 +0000 (13:02 +0200)]
ARM: shmobile: r8a7790: Fix the I2C clocks parents in DT
All I2C clocks derive from the HP clock, not from the P clock. Fix them.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
3672b059e3a8582171863e1c588059a37aa56b75)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman [Tue, 8 Apr 2014 00:21:35 +0000 (09:21 +0900)]
ARM: shmobile: lager: Correct setting of ethernet PHY LED mode
The correct binding is "micrel,led-mode", not "led-mode".
This corrects an error which was introduced when setting of ethernet PHY
LED mode was added by
82e62182d59bd1d0 ("ARM: shmobile: lager: Set ethernet
PHY LED mode").
This makes the lager code consistent with the koelsch code which was added
by
ae00d12a032490b3 ("ARM: shmobile: koelsch: Set ethernet PHY LED mode").
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit
1c47a6aae8bc6113463c47e9b8d35e35e97411b2)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>