Commit Graph

30525 Commits

Author SHA1 Message Date
Laurent Pinchart
31c46cbf5b ARM: shmobile: Use #include in device tree sources
In order to allow usage of the preprocessor in the SoC device tree
sources, switch from /include/ to #include.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:27:06 +09:00
Kuninori Morimoto
8c6639665d ARM: shmobile: bockw: enable HSPI0 on DTS
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:27:05 +09:00
Kuninori Morimoto
a50da08569 ARM: shmobile: r8a7778: add HSPI suppport on DTSI
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:27:05 +09:00
Kuninori Morimoto
ae4273ec7b ARM: shmobile: r8a7778: add I2C support on DTSI
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:27:04 +09:00
Takashi Yoshii
fdf6fd2205 ARM: shmobile: emev2: Add clock tree description in DT
Add minimum clock tree description to .dts file.
This provides same set of clocks as current sh-clkfwk version .c
code does.

Signed-off-by: Takashi Yoshii <takasi-y@ops.dti.ne.jp>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:27:04 +09:00
Kuninori Morimoto
f56d51fcaf ARM: shmobile: lager: tidyup DT node naming
According to ePAPR spec,
this patch tidies up DT node name.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:27:03 +09:00
Kuninori Morimoto
6220c5197e ARM: shmobile: marzen: tidyup DT node naming
According to ePAPR spec,
this patch tidies up DT node name.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:27:03 +09:00
Kuninori Morimoto
fb9c1ce47c ARM: shmobile: bockw: tidyup DT node naming
According to ePAPR spec,
this patch tidies up DT node name.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:27:02 +09:00
Kuninori Morimoto
26adf1a79e ARM: shmobile: kzm9g: tidyup DT node naming
According to ePAPR spec,
this patch tidies up DT node name.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:27:02 +09:00
Kuninori Morimoto
eeafbdf325 ARM: shmobile: ape6evm: tidyup DT node naming
According to ePAPR spec,
this patch tidies up DT node name.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:27:01 +09:00
Kuninori Morimoto
e63763b9b5 ARM: shmobile: armadillo: tidyup DT node naming
According to ePAPR spec,
this patch tidies up DT node name.

This patch removed un-used "touchscreen" label

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:27:01 +09:00
Kuninori Morimoto
33f6be3bf6 ARM: shmobile: sh73a0: tidyup DT node naming
According to ePAPR spec,
this patch tidies up DT node name and related clock.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:27:00 +09:00
Kuninori Morimoto
b718aa4483 ARM: shmobile: r8a7790: tidyup DT node naming
According to ePAPR spec,
this patch tidies up DT node name and related clock.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:27:00 +09:00
Kuninori Morimoto
2624705ceb ARM: shmobile: r8a7779: tidyup DT node naming
According to ePAPR spec,
this patch tidies up DT node name and related clock.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:26:59 +09:00
Kuninori Morimoto
14e1d9147d ARM: shmobile: r8a7778: tidyup DT node naming
According to ePAPR spec,
this patch tidies up DT node name and related clock.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:26:58 +09:00
Kuninori Morimoto
43304a5f51 ARM: shmobile: r8a73a4: tidyup DT node naming
According to ePAPR spec,
this patch tidies up DT node name and related clock.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:26:58 +09:00
Kuninori Morimoto
7d907894bf ARM: shmobile: r8a7740: tidyup DT node naming
According to ePAPR spec,
this patch tidies up DT node name and related clock.

This patch also adds missing SDHI2 entry

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:26:57 +09:00
Kuninori Morimoto
00bf591c3f ARM: shmobile: marzen: add SDHI support on DTS
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:26:57 +09:00
Kuninori Morimoto
c4866e70a9 ARM: shmobile: r8a7779: add SDHI support on DTSI
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:26:56 +09:00
Kuninori Morimoto
9d0395a5e1 ARM: shmobile: bockw: add SDHI support on DTS
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:26:56 +09:00
Kuninori Morimoto
04cbd88902 ARM: shmobile: r8a7778: add SDHI support on DTSI
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:26:55 +09:00
Kuninori Morimoto
9ebe54baf8 ARM: shmobile: bockw: fixup MMC pin conflict on DTS
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:26:55 +09:00
Kuninori Morimoto
14cdd83a6d ARM: shmobile: bockw: add MMCIF support on DTS
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:26:54 +09:00
Kuninori Morimoto
f7b9017579 ARM: shmobile: r8a7778: add MMCIF support on DTSI
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:26:54 +09:00
Kuninori Morimoto
dbece02b34 ARM: shmobile: bockw: remove manual PFC settings on reference
Current Bock-W reference is calling PFC initializer manually,
but now, it can use DTS PFC.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:26:53 +09:00
Kuninori Morimoto
8ed1f8a5e1 ARM: shmobile: bockw: add default PFC settings on DTS
SCIF0 PFC setting is needed as default

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:26:53 +09:00
Laurent Pinchart
80d01feec9 ARM: shmobile: r8a7778: Fix pin control device address in DT
The PFC device is erroneously declared at address 0xfffc000 instead of
0xfffc0000. Fix it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:26:52 +09:00
Magnus Damm
1919a0a4b4 ARM: shmobile: r8a7791 Koelsch DT reference DTS bits
Add DTS for the DT reference version of the Koelsch board support.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:26:51 +09:00
Magnus Damm
ab87e3fc0b ARM: shmobile: r8a7791 GPIO device tree node
Add GPIO controllers to the r8a7791 DTSI file.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:26:51 +09:00
Magnus Damm
55146927a7 ARM: shmobile: r8a7791 PFC device tree node
Add a DT node for the r8a7791 PFC device.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:26:50 +09:00
Kuninori Morimoto
02b4a748c7 ARM: shmobile: lager: add MMCIF support on DTS
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:26:50 +09:00
Kuninori Morimoto
4a46beadec ARM: shmobile: lager: add default PFC settings on DTS
SCIF0/SCIF1 PFC setting is needed as default

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:26:49 +09:00
Kuninori Morimoto
6363070ef7 ARM: shmobile: r8a7779: tidyup I2C driver name on DTSI
10e8d4f6dd
(ARM: mach-shmobile: r8a7779: Minimal setup using DT)
added I2C driver, but it was SH-Mobile I2C.
R-Car H1 needs R-Car I2C driver.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:26:49 +09:00
Kuninori Morimoto
3acb51b921 ARM: shmobile: r8a7778: add I2C support on DTSI
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:26:48 +09:00
Simon Horman
fee05eb3d2 ARM: shmobile: r8a7779: add HSPI clock support for DT
Based on work for the r8a7778 SoC by Kuninori Morimoto.

Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:20:15 +09:00
Kuninori Morimoto
605dfb0b5f ARM: shmobile: r8a7740: add FSI clock support for DT
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:20:15 +09:00
Kuninori Morimoto
b3cc52eb9e ARM: shmobile: r8a7790: add SSI MSTP clocks
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:20:14 +09:00
Kuninori Morimoto
b42831843e ARM: shmobile: r8a7778: add HPBIFx DMAEngine support
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 17:20:14 +09:00
Simon Horman
42a1ba525d ARM: shmobile: Select AUTO_ZRELADDR for EMEV2
Since ("ARM: shmobile: Remove legacy KZM9D board code")
It is now necessary for AUTO_ZRELADDR to be selected
in order for the kernel to build with kzm9d_defconfig.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 16:57:40 +09:00
Kuninori Morimoto
eb7a91749f ARM: shmobile: r8a7790: tidyup clock table order
SuperH lookups clock is using CLKDEV_CON/DEV/ICK_ID() macro
for a long term.
But in these days, the ICK clock is defined in random place.
This patch arranges it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 16:52:21 +09:00
Kuninori Morimoto
d59f4be9d0 ARM: shmobile: r8a7790: fixup I2C clock source
I2C clock is based on P clock, not HP clock

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 16:52:20 +09:00
Kuninori Morimoto
31ac8e47e9 ARM: shmobile: r8a7790: care EXTAL divider settings
EXTAL clock frequency needs 1/2 when
(MD14, MD13, MD19) = (1, x, x).

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 16:52:20 +09:00
Magnus Damm
8476cee684 ARM: shmobile: Add r8a7791 clocks for thermal devices
Add the r8a7791 thermal device as legacy clocks.

Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 16:52:19 +09:00
Magnus Damm
887e840770 ARM: shmobile: Add r8a7791 thermal platform device
Add a thermal platform device for the legacy case
on the r8a7791 SoC. This keeps the r8a7791 in sync
with the r8a7790 sister device.

Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 16:52:19 +09:00
Magnus Damm
9654fd7322 ARM: shmobile: Add r8a7790 clocks for thermal devices
Add the r8a7790 DT thermal device to the legacy clocks.

Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 16:52:18 +09:00
Laurent Pinchart
bf98c1eac1 ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY
SH-Mobile platforms are transitioning from non-multiplatform to
multiplatform kernel. A new ARCH_SHMOBILE_MULTI configuration symbol has
been created to group all multiplatform-enabled SH-Mobile SoCs. The
existing ARCH_SHMOBILE configuration symbol groups SoCs that haven't
been converted yet.

This arrangement works fine for the arch/ code, but lots of drivers
needed on both ARCH_SHMOBILE and ARCH_SHMOBILE_MULTI depend on
ARCH_SHMOBILE only. In order to avoid changing them, rename
ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY, and create a new boolean
ARCH_SHMOBILE configuration symbol that is selected by both
ARCH_SHMOBILE_LEGACY and ARCH_SHMOBILE_MULTI.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 16:52:18 +09:00
Laurent Pinchart
cf4f85ccd5 ARM: shmobile: r8a7791: Add DU and LVDS clocks
The ZX parent clock isn't implemented yet, add it as well.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-10 16:52:17 +09:00
Magnus Damm
81fd1b6879 ARM: shmobile: Select USE_OF on EMEV2
Now when the legacy KZM9D board code is gone, make sure
USE_OF is selected in case of the EMEV2 SoC.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-04 15:11:17 +09:00
Kuninori Morimoto
6c334d232a ARM: shmobile: r8a7778: add HSPI clock support for DT
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-04 15:11:16 +09:00
Magnus Damm
59032702ea ARM: shmobile: Remove legacy platform devices from EMEV2 SoC code
Now when KZM9D legacy C board support code is
gone then remove emev2_add_standard_devices()
and all the platform devices from setup-emev2.c.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-12-04 15:11:16 +09:00