Commit graph

361,081 commits

Author SHA1 Message Date
Arnd Bergmann
5cc25d808e Renesas ARM-based SoC updates for v3.10
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJRRwdkAAoJENfPZGlqN0++O8UP+wUKtVnRxGnVDtOM5MZGUE8N
 bJeNmsz/z2On6k8KCyRFUkrw3jhoJnNrz3+fJEMSXASdqix5HO3zXXbMWASIUbiI
 y2g/blh6RmnEjogD4V/JxfjgH7Y3WaDqXIbgbetwYd4KmfqzGvNfi5Qmt4FA2iMV
 iP1DVgecRQ6tjhSp4oPCZ4o3xhCQfQu/20vkBhBIg1Bsmu7IOfGcLA3XObAopGBW
 iYAjs6daD5b3HSxVpeV7c7fYhGpZFRH8k3QqGUjRE6hI8ohpTNd+eEQHWXFHcbg5
 lvRSNM+Ic7xk//xxqJh1rle4W4VqTF/8jGWnC1WXI5dXV0kbdwO0D/gQCos7sQDw
 NaeEK5mFZQhGfbrlFx4WA/tWJKGJBCiRW1mOLLZ3MSDDKqeuTT7ngnvAWG9o5qBp
 jfczsGEiRKt4lySssB8fYg/HAICkFoxABShgmBVZTgjPbHpms0v51Q3fWkvOZpVy
 t3AOGBM70NEBiLyfylu8BUAe2ZE3/joPd0IA2rEEeAQESv28p/H00pQIBV1PrmTC
 3QNTmVcTOnfU/AsMa8fn2rI4R58ziU2kX854juIi+hadwVo7p1XFcYgiBZCbxtHC
 /9eSkYjW7g2TZAnClc3Zm9UNsS1I+zcYPD05Kl5iiw/yegeBLJ5E6PbigYHWlWdP
 jdzobzjCd6VlgGxJ17Rq
 =s7aA
 -----END PGP SIGNATURE-----

Merge tag 'renesas-soc-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

From Simon Horman <horms+renesas@verge.net.au>:

Renesas ARM-based SoC updates for v3.10

* tag 'renesas-soc-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (43 commits)
  r8a7779: Add Display Unit clock support
  ARM: shmobile: R8A7779: use gic_iid() in SATA IRQ resource
  ARM: mach-shmobile: r8a7779: add SATA support
  ARM: mach-shmobile: r8a7779: SATA DT configuration
  ARM: shmobile: r8a7779: add Thermal support on DT
  ARM: shmobile: tidyup chip series definition order for r8a7740/r8a7779
  ARM: shmobile: r8a7779: use gic_iid macro
  ARM: shmobile: r8a7779: fixup DT machine name
  ARM: shmobile: r8a7779: fixup dtsi typo
  ARM: shmobile: add gic_iid macro for ICCIAR / interrupt ID
  ARM: mach-shmobile: r8a7740: Add DT names to clock list
  ARM: shmobile: Remove unused hotplug.c
  ARM: shmobile: Rearrange r8a7779 cpu hotplug code
  ARM: shmobile: Use sh73a0-specific cpu disable code
  ARM: shmobile: Update r8a7779 to use scu_power_mode()
  ARM: shmobile: Update r8a7779 to check SCU for hotplug
  ARM: shmobile: Use R8A7779_SCU_BASE with TWD
  ARM: shmobile: Rework SH73A0_SCU_BASE IOMEM() usage
  ARM: shmobile: Fix base address readout in headsmp-scu.S
  ARM: shmobile: r8a7779: Remove lan from dtsi
  ...

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2013-03-21 17:58:04 +01:00
Arnd Bergmann
5f796cc900 Renesas ARM-based SoC defconfig updates for v3.10
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJRRv2LAAoJENfPZGlqN0++T70P/1PaxL3CMXUul4ygkEdZboPW
 dglydmndF6c/RBkUl6ZST5NN5jCjqSh3GcoX7EEzlolnlhZB/zaU8vPHk7tAoSzg
 1KF7/RJHFZcu8mgb6GkJoJZz5cM0RpzvLo+AEkpsMAM0uNzKBUpb94gxXIJijX2Z
 2Yr1rhuYJlVVto5ltr7TBLp8lDGiGOd4/fcHfIBu/JIuQDJ6tJhzfjcYZpCVlXDW
 9vvN8vmo/bkFBhHRKjc3vavupGmvXNaDkC1VsM9+zMZJjgI/yIhf+A02HGLV2Bkz
 r1aBiOfWNMK456aen/HaAObuKWDFFoeysGcX80iPEo6IAjQzELgKVbYlpGlYWJLp
 yWihu9io0NFPjUZoyV96fTmZuIqZTXsFgSzGWNRRWeMwafoVQCwg+7JWUD09sEHB
 eWkrXYvG5lsg+70ji/WQsbgfrPTB6aaRGsBb2zqoCLfjZ6jGUqyUkwWs+c66zNPl
 pBz3zw91DddCAlOSmDbSP+/OAYj8YibL8NQ2t+x9hZU+4hi8sTP9dErIyQFJit1K
 O6qVqUloTwpZ9xddeKutveXuRozKOry2VQL2QU8Wt3GFSfln18pWbe8Q8H+5bsxm
 ZxFtAQVv9gcG73VzaMuxuoZHNNYugvYCZTIsfiw/CkK6ZluVliknL7+RPXg60ggj
 3tLr1KPRO+t7MHmXeDhH
 =ecCy
 -----END PGP SIGNATURE-----

Merge tag 'renesas-defconfig-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

From Simon Horman <horms+renesas@verge.net.au>:

Renesas ARM-based SoC defconfig updates for v3.10

* tag 'renesas-defconfig-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: mach-shmobile: marzen: add SATA support
  ARM: shmobile: armadillo800eva: enable all errata for cache on defconfig
  ARM: mach-shmobile: kzm9g: do not enable REGULATOR_DUMMY in defconfig
  ARM: shmobile: armadillo800eva: enable NEON on defconfig
  ARM: shmobile: armadillo800eva: enable branch prediction on defconfig
  ARM: shmobile: kzm9g: defconfig: do not enable PREEMPT
  ARM: mach-shmobile: armadillo800eva: enable REGULATOR in defconfig
  ARM: mach-shmobile: mackerel: enable REGULATOR in defconfig
  ARM: mach-shmobile: mackerel: enable MMCIF and SDHI in defconfig

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2013-03-21 17:52:25 +01:00
Arnd Bergmann
f965ebdab6 Two fixes to the ux500 core machine:
- Enable the 128KB cache on DB8540
 - Bump the number of IRQs to the correct value
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iQIcBAABAgAGBQJRRxJFAAoJEEEQszewGV1zR/oP/ReSN9UayBO2xnaPTLmWUWE9
 u2ZAOJZ74CAgFONro8NyBXGsTMFof9V2X72irKqjxo+OSSW9SiREwerZ4mUNhCqG
 sp6lRaEc6o5csFfK1fZwMraASnOuj+WQ19hMBJhBgPh0MKBJL+3shtykkeNdLuTq
 EV/oq7fnvu4eVZxcLhasav8Wu/+aXTREiT5Cg172udCzuoFPi3jceSFAua+UKbjr
 YH22I5rzRQ5RIXv6veQ9w+/Mgd3zUUltBHPUaWUop02Bn/cv0Ppc9Xou4s0Qt0hi
 3sdSIj29XtBGkETJEHtBoY/fQTXfr/z7RC1ohgEE4JAT2qLEgTX3/UPFnHkNgtp+
 FjURTUTfW8eiPQqn5cCk1GWEtAtOl3cMbyVwvfwOgIC0AUQtHwR4y3EMAxw2vesI
 FqgGtP80VUkcP5rYC/71u1fBMjKoieJsDnUBRxmX3FoDA3iTqLYKYh31P2pDHgqF
 M8ZcYHG7Du5+Jc07AKqlIOkZzjqg3ikuE0LwVLcVzzNQyfrVjNumiIQRwhvBHVXW
 dKH1NC2J6IhjyycBP1s8JnwcxCy4UGptOR4DCAvnRaqOIawEKy9sv6F6mj5XuFs0
 U2ZPL35q2ALZsV/BZsTIHarL5C7QrJF+m+HVw0m+ElrQepszuNjDpBaZhVJ5K7Ba
 +h0hElo3geH7I3crL8Q7
 =0LOp
 -----END PGP SIGNATURE-----

Merge tag 'ux500-core-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/soc

From Linus Walleij <linus.walleij@linaro.org>:

Two fixes to the ux500 core machine:
- Enable the 128KB cache on DB8540
- Bump the number of IRQs to the correct value

* tag 'ux500-core-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: mach-ux500: enable 128KB way L2 cache on DB8540
  ARM: ux500: bump arch nr of GPIOs

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2013-03-21 17:33:01 +01:00
Arnd Bergmann
b7ab76d20f Defconfig updates for ux500:
- Turn on the "heartbeat" LED trigger used by Snowball
 - Enable the EXT4_FS and LBDAF by default
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iQIcBAABAgAGBQJRRxqEAAoJEEEQszewGV1zxCEP/RaDinUUg6bbAi9WzvfBQNPR
 BwbNAhQufcfQ2cBMikBJ6wc0FqHtFxPQsOS2ROiCLnjV9hwpCeKR/0CLar9P3fSY
 EDJVrOBDlbmo671UC8PqR+OPy56oApqWA2GKnLhIlUVh6J9arRkRRWzj0ZmAW6Po
 bx60/OR/S/f8UHRJbVEpdWpLIczFnGR55nGjecsVim2o/UbPsP9PnFl1xeY4h6cR
 Ka9KiCVpdAhRvdYu2fSWt8nhvBnlG7I02j0sa+SXcxAWxclpBzeRK6I91wd6KI1a
 bYH8HuCa1nNhDluQjScVuzIrhiVHbZ5Gq2agOWyKxuuSKDjwS59FkX06RASflAz5
 B1dTwBqEOFnrNBs1A5p5j1PWXtgJPq9CJ9gQMd0nwTJFadDoWZBZcebG0M896eev
 m0P7fDmEhpE30l1MHIT95ESuhCmElwCTipdUleynbdpbh6eIMpdQ4RLPUU9Hrknl
 xBj++7MawL3qIlcW+1biVjpyKNxWIu+SX2swBPfWsaSyXazaiUumuolJXMIF3FYE
 Ge9v/oR6Sby+ZloraLGkigsV6KxYvapCV+sTqPBJ3CyHxlIxFxzgvGSkDvg4XNRb
 Sdnj1UnHr8vNTIToghjf7x8uO/UDHa2nHpmyAC68us6k6LscZN6XUrkd2ghRB/a+
 Wy505N8mJBW2cc2Zyp4r
 =b6FR
 -----END PGP SIGNATURE-----

Merge tag 'ux500-defconfig-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/soc

From Linus Walleij <linus.walleij@linaro.org>:

Defconfig updates for ux500:
- Turn on the "heartbeat" LED trigger used by Snowball
- Enable the EXT4_FS and LBDAF by default

* tag 'ux500-defconfig-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: enable ux500 EXT4_FS and LBDAF support by default
  ARM: ux500: Turn on the 'heartbeat' LED trigger

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2013-03-21 17:29:49 +01:00
Arnd Bergmann
54fb32c06e Merge branch 'prima2/soc' into next/soc
From Barry Song <Barry.Song@csr.com>:

SiRFatlas6 is much similar with SiRFprimaII with some changes about:
1. deleted l2 cache, sdmmc4, multimedia and so on
2. changed pinmux layout and clock layout
3. DMA access limitation disappears, that makes us not need DMA_ZONE
   on atlas6

* prima2/soc:
  ARM/dts: prima2: add .dtsi for atlas6 and .dts for atla6-evb board
  arm: prima2: add new SiRFatlas6 machine in common board

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2013-03-18 17:16:37 +01:00
Barry Song
5fa2f9af76 ARM/dts: prima2: add .dtsi for atlas6 and .dts for atla6-evb board
atlas6.dtsi is basically a copy of prima2.dtsi as most components are
compatible with prima2 except that:
1. node of l2 cache is deleted
2. node multimedia engine is deleted
3. node of sata is deleted
4. node of sdmmc4 is deleted
5. powervr is moved to "powervr,sgx510"
6. pinctrl is moved to atlas6 as pinmux layout has big changes in
   atlas6
7. clock is moved to atlas6 as clock layout has changes in atlas6

Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Jiansong Chen <Jiansong.Chen@csr.com>
2013-03-18 17:15:33 +01:00
Barry Song
d4fe49e545 arm: prima2: add new SiRFatlas6 machine in common board
SiRFatlas6's machine definition is almost seem with SiRFprimaII
except that prima2 has a 256MB DMA zone.
This patch adds SiRFatlas6 machine in common board files, and
also adds atlas6 arch node in Kconfig.

Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2013-03-18 17:15:26 +01:00
Hongbo Zhang
441e248c1d ARM: ux500: enable ux500 EXT4_FS and LBDAF support by default
EXT4 file system and LBDAF are used commonly, should be enabled by default.

Signed-off-by: Hongbo Zhang <hongbo.zhang@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-03-18 14:44:06 +01:00
Lee Jones
7d224e6482 ARM: ux500: Turn on the 'heartbeat' LED trigger
The heartbeat LED trigger provides an excellent debugging tool
when hacking on development boards. Here we enable it on all
u8500 based platforms. This will pulse the User LED on the
Snowball low-cost development board only.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-03-18 14:44:06 +01:00
Maxime Coquelin
0f2fa40e46 ARM: mach-ux500: enable 128KB way L2 cache on DB8540
DB8540 L2 was configured with 64KB way size, but it has 128KB as AP9540.

Fix this by modifying ux500_l2x0_init() to use 128KB way size for all
cpus in the x540 family.

Signed-off-by: Maxime Coquelin <maxime.coquelin@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-03-18 13:49:58 +01:00
Linus Walleij
cca438b57e ARM: ux500: bump arch nr of GPIOs
Set the number of GPIOs for Ux500 to 392. Reasoning:

- Internal pinctrl "Nomadik" SoC: 288 GPIOs
- Then each Ux500 system has one or two GPIO expanders at
  maximum 24 GPIOs each:
  TC35892 expander: 24 GPIOs
  STMPE1601 or 1801 Expander: 24 GPIOs
- Then AB8500/AB8505/AB8540: 56 GPIOs

Sum: maximum 392 GPIOs - no more no less.

Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-03-18 13:49:58 +01:00
Phil Edworthy
d75bc78b50 r8a7779: Add Display Unit clock support
Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
[Rename device from to rcarfb to rcar-du]
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
[Manual conflict resolution]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-18 21:22:34 +09:00
Vladimir Barinov
db30abdf3c ARM: mach-shmobile: marzen: add SATA support
Add SATA support to marzen_defconfig.

Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-14 10:28:07 +01:00
Kuninori Morimoto
e0ef0984ae ARM: shmobile: armadillo800eva: enable all errata for cache on defconfig
Some errata for cache had not enabled on current
Armadillo800eva defconfig.
This patch enables these.
Special thanks to Ishiyama-san

Reported-by: Kiyoshi Ishiyama <kiyoshi.ishiyama.wg@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-14 10:28:07 +01:00
Simon Horman
54725e0203 ARM: mach-shmobile: kzm9g: do not enable REGULATOR_DUMMY in defconfig
Don't enable REGULATOR_DUMMY, it is only intended for development / testing.
There doesn't seem to be any value in setting it here and doing
so was an error on my part.

Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-14 10:28:06 +01:00
Kuninori Morimoto
4861d68aa5 ARM: shmobile: armadillo800eva: enable NEON on defconfig
The application / library will be stopped by illegal instruction
on current Armaddilo800eva board,
since defconfig doesn't have CONFIG_NEON.
This patch enabled it.
Special thanks to Ishiyama-san

Reported-by: Kiyoshi Ishiyama <kiyoshi.ishiyama.wg@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Kiyoshi Ishiyama <kiyoshi.ishiyama.wg@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-14 10:28:05 +01:00
Kuninori Morimoto
59dd2a2a0a ARM: shmobile: armadillo800eva: enable branch prediction on defconfig
Because defconfig disabled ARM branch prediction
by CONFIG_CPU_BPREDICT_DISABLE,
Armadillo800eva's Bogomips and Loop were not good performance.
This patch enabled Arm branch prediction.
Special thanks to Ishiyama-san

Reported-by: Kiyoshi Ishiyama <kiyoshi.ishiyama.wg@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Kiyoshi Ishiyama <kiyoshi.ishiyama.wg@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-14 10:28:04 +01:00
Simon Horman
358c14d235 ARM: shmobile: kzm9g: defconfig: do not enable PREEMPT
The motivation for this change is:

* It is consistent with all other shmobile boards and;
* Allows the kzm9g-reference code to work with CONFIG_SMP
  and thus the new defconfig

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-14 10:28:04 +01:00
Simon Horman
fcd05e1563 ARM: mach-shmobile: armadillo800eva: enable REGULATOR in defconfig
As well as being a generally sane thing to do this
is required for MMCIF to function in conjunction with
"ARM: shmobile: switch SDHI0 to GPIO regulator on armadillo800eva".

Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-14 10:28:03 +01:00
Simon Horman
2d81a59575 ARM: mach-shmobile: mackerel: enable REGULATOR in defconfig
As well as being a generally sane thing to do this
is required for MMCIF to function in conjunction with
" ARM: shmobile: streamline mackerel SD and MMC devices".

Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-14 10:28:03 +01:00
Simon Horman
53ed916db9 ARM: mach-shmobile: mackerel: enable MMCIF and SDHI in defconfig
I'm unsure why this isn't already the case.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-14 10:28:02 +01:00
Sergei Shtylyov
d60cd5f16b ARM: shmobile: R8A7779: use gic_iid() in SATA IRQ resource
Commit "ARM: shmobile: r8a7779: use gic_iid macro" switched R8A7779 platform
devices to using gic_iid() macro instead of gic_spi() but commit "ARM: mach-
shmobile: r8a7779: add SATA support" added another use of gic_spi(). Convert
the SATA IRQ resource to using gic_iid().

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:22 +09:00
Vladimir Barinov
a7b9837c77 ARM: mach-shmobile: r8a7779: add SATA support
Add SATA clock for r8a7779 SoC (for both device tree and usual cases).
Register SATA controller as a "late" platform device on r8a7779 SoC.

Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:22 +09:00
Vladimir Barinov
7840a65a03 ARM: mach-shmobile: r8a7779: SATA DT configuration
Allow configuration of the r8a7779 SoC SATA controller using a flattened device
tree.

Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:22 +09:00
Kuninori Morimoto
25a65975fc ARM: shmobile: r8a7779: add Thermal support on DT
76cc188749
(thermal: rcar: add Device Tree support)
supported rcar_thermal DT probing.

rcar thermal driver doesn't support IRQ on r8a7779 chip
since it is using old design IRQ.
R-Car/R-Mobile next generation chips are using new design IRQ,
and rcar thermal driver is supporting these.

This patch adds rcar_thermal DT support for r8a7779 without IRQ.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:22 +09:00
Kuninori Morimoto
195f962201 ARM: shmobile: tidyup chip series definition order for r8a7740/r8a7779
move r8a7740_meram_workaround() to r8a7740 area
from r8a7779 area

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:22 +09:00
Kuninori Morimoto
dbe95ad00b ARM: shmobile: r8a7779: use gic_iid macro
"ARM: shmobile: add gic_iid macro for ICCIAR / interrupt ID"
enabled to use gic_iid macro.
This patch exchange current GIC interrupt setting
from gic_spi() to gic_iid()

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
[ horms+renesas@verge.net.au: Updated git commit id in changelog ]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:22 +09:00
Kuninori Morimoto
abe0e14b0b ARM: shmobile: r8a7779: fixup DT machine name
r8a7779 is not sh73a0

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:21 +09:00
Kuninori Morimoto
349f556edd ARM: shmobile: r8a7779: fixup dtsi typo
r8a7779 is not r8a7740 chip

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:21 +09:00
Kuninori Morimoto
652f945278 ARM: shmobile: add gic_iid macro for ICCIAR / interrupt ID
R-Car H1 datasheet GIC number is indicating
GIC ICCIAR / interrupt ID number, not SPI number,
but current marzen board code is using gic_spi() with
un-understandable calculation.

This patch adds new gic_iid() macro which means
ICCIAR / interrupt ID, and used the number
currently written on datasheet.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
[ horms+renesas@verge.net.au: Split board-marzen.c portion into a separate patch ]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:21 +09:00
Bastian Hecht
386e9464fa ARM: mach-shmobile: r8a7740: Add DT names to clock list
This adds temporarily the alternative device names to the clock list
that are used when booting via Device Tree setup.

Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:21 +09:00
Magnus Damm
5e4460fcc8 ARM: shmobile: Remove unused hotplug.c
Each CPU Hotplug implementation for mach-shmobile
is now self-contained, so this change removes unused
helper code in hotplug.c. The two CPU Hotplug capable
SoCs sh73a0 and r8a7779 remain unchanged.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:21 +09:00
Magnus Damm
fd0865c3f7 ARM: shmobile: Rearrange r8a7779 cpu hotplug code
Update the r8a7779 SMP code and CPU Hotplug in particular
to follow the same style as sh73a0. This means dropping
__maybe_unused for #ifdef CONFIG_HOTPLUG_CPU.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:21 +09:00
Magnus Damm
eebadd6764 ARM: shmobile: Use sh73a0-specific cpu disable code
Convert the sh73a0 CPU Hotplug code to use a local
implementation of ->cpu_disable(). With this change
in place the sh73a0 SMP code does no longer depend
on hotplug.c.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:21 +09:00
Magnus Damm
8bbcd729d2 ARM: shmobile: Update r8a7779 to use scu_power_mode()
Update the SMP code for R8A7779 to make use of the
shared SCU function scu_power_mode() together with
the early setup code in shmobile_secondary_vector_scu.

With this patch in place the secondary CPUs modify the
SCU setting during early boot instead of letting other
CPUs deal with the coherency setting before boot. In
other words, we used to setup coherency before boot
in r8a7779_boot_secondary() but that bit is now instead
handled by the code in shmobile_secondary_vector_scu.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:21 +09:00
Magnus Damm
bbf2627c77 ARM: shmobile: Update r8a7779 to check SCU for hotplug
Update the r8a7779 CPU Hotplug code to use SCU PSR
to wait for the target CPU core. Previously the
shared code in hotplug.c was used to let cpu_kill()
wait for cpu_die(). With this change in place the
r8a7779 SMP code does not depend on hotplug.c anymore.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:21 +09:00
Magnus Damm
abf88136f7 ARM: shmobile: Use R8A7779_SCU_BASE with TWD
Rework the IOMEM() usage for the SCU base address in the
case of r8a7779. Adjusts the TWD to use R8A7779_SCU_BASE.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:20 +09:00
Magnus Damm
76853504c3 ARM: shmobile: Rework SH73A0_SCU_BASE IOMEM() usage
Rework the IOMEM() usage for the SCU base address in the
case of sh73a0. Removes recently introduced build warnings:

arch/arm/mach-shmobile/smp-sh73a0.c:45:15: warning: initialization makes integer from pointer without a cast [enabled by default]
arch/arm/mach-shmobile/smp-sh73a0.c:45:15: warning: (near initialization for 'twd_local_timer.res[0].start') [enabled by default]
arch/arm/mach-shmobile/smp-sh73a0.c:45:15: warning: initialization makes integer from pointer without a cast [enabled by default]
/arch/arm/mach-shmobile/smp-sh73a0.c:45:15: warning: (near initialization for 'twd_local_timer.res[0].end') [enabled by default]

Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:20 +09:00
Magnus Damm
73e5709875 ARM: shmobile: Fix base address readout in headsmp-scu.S
Rework the early SCU setup code in headsmp-scu.S to read
the base address in the same way as we use to fetch the
address of the invalidation function.

Reported-by: Bastian Hecht <hechtb@gmail.com>
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:20 +09:00
Simon Horman
8819ce4b88 ARM: shmobile: r8a7779: Remove lan from dtsi
The ethernet controller is not part of the r8a7779 SoC.

Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:20 +09:00
Simon Horman
e792120264 ARM: shmobile: r8a7779: Do not initialise i2c as an early device
It is sufficient to initialise i2c as a late device.

Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:20 +09:00
Simon Horman
916ddc355f ARM: shmobile: r8a7779: Do not use early devices with DT reference
Do not initialise any early devices when using the minimal DT reference
code. Only the delay needs to be initialised.

Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:20 +09:00
Simon Horman
3b00f93426 ARM: shmobile: sh73a0: Do not use early devices with DT reference
Do not initialise any early devices when using the minimal DT reference
code. Only the delay needs to be initialised.

Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:20 +09:00
Simon Horman
e4e240841d ARM: shmobile: sh73a0: Remove warning about SMP
Remove warning about SMP not working with the
clock initialisation sheme used for reference DT.

This is resolved by not selecting CONFIG_PREEMPT.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:20 +09:00
Simon Horman
f998950788 ARM: shmobile: sh73a0: Add smp ops to DT_MACHINE_START
This a board to be brought up with SMP enabled
without a board file present.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:20 +09:00
Simon Horman
4eca134f71 ARM: shmobile: sh73a0: Remove sh73a0_init_irq_dt()
This is not needed as irq_set_wake is
only used for suspend to ram which is not
a requirement for bringing up boards using DT.

Reported-by: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:19 +09:00
Guennadi Liakhovetski
8a444474ef ARM: shmobile: sh73a0: fix Z and ZG clock hierarchy
Z and ZG clocks on sh73a0 have pll0 as their parent, not pll1.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:19 +09:00
Magnus Damm
342ab8741c ARM: shmobile: Make EMEV2 setup functions static
Adjust emev2_init_delay() and emev2_add_standard_devices_dt()
to become static. They are not used outside this file anyway.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:19 +09:00
Magnus Damm
1af4b3fa19 ARM: shmobile: Update EMEV2 to use scu_power_mode()
Update the SMP code for EMEV2 to make use of the
shared SCU function scu_power_mode() together with
the early setup code in shmobile_secondary_vector_scu.

With this patch in place the secondary CPUs modify the
SCU setting during early boot instead of letting other
CPUs deal with the coherency setting before boot. In
other words, we used to setup coherency before boot
in emev2_boot_secondary() but that bit is now instead
handled by the code in shmobile_secondary_vector_scu.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:19 +09:00
Magnus Damm
4c8228455d ARM: shmobile: Common shmobile_scu_base in headsmp-scu.S
Update the code in headsmp-scu.S to use a global
shmobile_scu_base variable both for convenient SCU
base address storage and for the early SCU setup
code in shmobile_secondary_vector_scu.

With this patch applied r8a7779, sh73a0 and EMEV2
all make use of the global shmobile_scu_base
variable. However only sh73a0 makes use of the SCU
bring up code in shmobile_secondary_vector_scu.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-03-13 02:13:19 +09:00