Commit Graph

1980 Commits

Author SHA1 Message Date
Olof Johansson
05e4681794 Second Round of Renesas ARM Based SoC r7s72100 CCF Updates for v3.16
r7s72100 (RZ/A1H) SoC based Genmai board
 * Remove non-multiplatform support from genmai-reference
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJTdrjHAAoJENfPZGlqN0++oPUP/0VM8qVNwLMSa0iDxxyno3V0
 OaiivXbMjMuZ7OjySK8T5uC2B4j76q0FX/zP4QS7b3ivdSTA/7LUkL4wd3lGebqX
 x+JphEOrIisEJnhjgHU3B3SPqAJ5zBFReH1uyYELVEBowP45GyTWai84+c4NIwQ8
 WMEfOs2dvSwJRSvyZeABczO1UdyksPlIDjqrCHylwjPZhTJNO/JaFFvTi5KgSBlj
 pBXPHv7oEFKcuno98jwxJAlP/jC6uoBRvdlwR7/64HUfePhylQSwHOIEcrDDvBR3
 ukDQ0mx8Y5Pk2Uv1YyRWnGx1/mUzjYItAE2dQFG3r6rIfPRcj1pKBM1oNYBPNiyP
 qvLmmIQ2Hy3d+4qDHPeaPejmZOkXyw1ZnG5FC1QJ3hUvpSe5iRLojfV9s+6mqa6v
 j06NwNk9D5CwqCTWbtiNrZU09wJusAyyAQSajqoGcbRXkEAfOxLwfZ3wS1LT+NZT
 rNHqb5bwkEz/adSpZ4QlZ5qWO8eWQ75sIZxMAneJ0rEY/3xEuqEDFdwHc+6I0Auu
 x57nZs0hBBSR4RuzF9vdoUny8tNg4qyznj5he8t6fcCtCaJKXyaZn+K/C34zuw+0
 RGcvH047dxzmbsjNMKfyqd04/GeBV5pNTqQ5RF+Ui6Xl6tHqnXYI0/CqRSkFQj37
 3v/kotj6ZSkk3w9x/+Ho
 =kWk7
 -----END PGP SIGNATURE-----

Merge tag 'renesas-r7s72100-ccf2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

Merge "Second Round of Renesas ARM Based SoC r7s72100 CCF Updates for v3.16"
from Simon Horman:

r7s72100 (RZ/A1H) SoC based Genmai board
* Remove non-multiplatform support from genmai-reference

* tag 'renesas-r7s72100-ccf2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Remove Genmai reference DTS
  ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB
  ARM: shmobile: Sync Genmai DTS with Genmai reference DTS
  ARM: shmobile: genmai-reference: Remove legacy clock support
  ARM: shmobile: Remove non-multiplatform Genmai reference support

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-21 22:05:52 -07:00
Olof Johansson
0db6542dd4 Renesas ARM Based r7s72100 SoC CCF Updates for v3.16
r7s72100 (RZ/A1H) SoC and its Genmai board
 * Add and use CCF support
 * Initislise SCIF, I2C and SPI via DT
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTdWCgAAoJENfPZGlqN0++KwYQALL3hcVIZghBDNjOct7w7HFp
 a6FAf6NVzlRkydB5Isn3OW0P8ivnhVKX6TcCzPDncXb9rh8hMwpeQHQO6gXajFwc
 Fb7AbDnchqH9Vqx7MFyPW/DkUcm/LYMIsMobDnBEIbK77971Sha5efqVDmB0ymuy
 b8C3AzQ9QXPzuzII04lDdjLv9n76NnB17/+ixrE6VYlPjqHiIOHKBiyPozEeNbPz
 okWmR01dHkf1gQfYj46HsdGbTgHRQ1RDjRXJnmBWeD61y53xvgb4PCUxbzgkDR1x
 T06LTuYX7GTBuPT8Nok+NM3Nbw5dEpCzX5HkW5KKgmHd2zfD73FN5WE6xAwwtSRX
 dzaKOfqonSsqCm1ZGcgHAMCbB4lfi4j8rgdDgvZ71qalDDes3W99pobXu2xYAG+v
 9tvW4IPMsJFYYReULjNCFYawfrlUwHKK6LCS8zLaBgvkAH9Smdy2f2FlDYsnk7xE
 j10SrUbhkds+moGqn/GX2PdWr45xvNvK3EqTN7TUsSaeO0i0kbDYggNzUhzs4QJ4
 f3QKTldxv+1yE8+mQXCd4etDIIG6ItSKI2739+C+tTeJ4sJ5B/WJJ/5B67nLDMZI
 pkZ9jmOWLluqCcgzybbxxlScc5EiAQ0iT/Dx764qs1RU5x0XIhgPR9q7hC4LcNjS
 AKvRT6W4D98mnwUMy0nH
 =Y38+
 -----END PGP SIGNATURE-----

Merge tag 'renesas-r7s72100-ccf-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

Merge "Renesas ARM Based r7s72100 SoC CCF Updates for v3.16" from Simon Horman:

r7s72100 (RZ/A1H) SoC and its Genmai board
* Add and use CCF support
* Initislise SCIF, I2C and SPI via DT

* tag 'renesas-r7s72100-ccf-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r7s72100: use workaround for non DT-clocks
  ARM: shmobile: Add forward declaration of struct clk to silence warning
  ARM: shmobile: r7s72100: remove SPI DT clocks from legacy clock support
  ARM: shmobile: r7s72100: add spi clocks to dtsi
  ARM: shmobile: r7s72100: remove I2C DT clocks from legacy clock support
  ARM: shmobile: r7s72100: add i2c clocks to dtsi
  ARM: shmobile: r7s72100: genmai: platform scif devices only for legacy support
  ARM: shmobile: r7s72100: genmai: add uart alias and activate scif2 as console
  ARM: shmobile: r7s72100: add scif nodes to dtsi
  ARM: shmobile: r7s72100: genmai: populate nodes for external clocks
  ARM: shmobile: r7s72100: add essential clock nodes to dtsi
  ARM: shmobile: r7s72100: document MSTP clock support

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-21 14:30:46 -07:00
Olof Johansson
bcafdb4fe8 Renesas ARM Based SoC dt-scif Updates for v3.16
r8a7791 (R-Car M2) based Koelsch board and
 r8a7790 (R-Car H1) based Lager board
 * Enable SCIF0 and SCIF1 serial ports in DT
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTdWHAAAoJENfPZGlqN0++CooP/R0lSwmJr0qRN6IarjTPnPNh
 R3yuLn2owGvtgF5N6tdsUeo9VrTWsS38QaW3F0Adn1xSF/ub+KwIpmpkelaqhYO/
 UZIa6q0hT9Jwj0n06lrn8esf+1fkLNQYqg3YHmJwq29EK+Hf1O3UYG+B4gOPvII7
 EkYRhALTZW4MO5iW5Ys5Vv9Ohs128PCsbxH+mP9RWVU2BzI12NUcQrnfk9GLvyoZ
 Y9JWddB/MQTPiWKs5DOlhr3PnZAbujJIKpt2jFJrfqgIARFGYpIFfoIk96eQPsvL
 LVPxrs2n7Y/HUTW1RCF2pOI+F/j1dJ+wggG2/tbn1zzNGjq/kYMeF5sOVXhDoCMQ
 JLDtJokp5WU3ttszuFnCOPVPILZQJLOh5rsZT81uncZdr91IuRHIHg6S6l4Yn4qI
 vH5BCm+j//WM/0Lp5Pa2OQQG1q0aALsstxiNxE7ZyYBMp81YuHJ6AKHf8k8ZbatG
 Cusb4WwWjV7ST+YElV/bUs2dz0daGEOSMexG72XqEnMza6ZnL2rdj0Gg4QtWuTw0
 FTFKsLBUalG8NzQtkNJ+g2GBZjlT03quaTJ+JMS+3r9EDWGMM/6o1yaeY5WKXWBw
 kTX6bnS/RLfBs0FSdhB3S2YpPB71wzM/kOTSdVRulbctE9ZJjRUMvENycPzWZfH8
 MSTGMpCjive8HsKcGdRb
 =gSwR
 -----END PGP SIGNATURE-----

Merge tag 'renesas-dt-scif-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

Merge "Renesas ARM Based SoC dt-scif Updates for v3.16" from Simon Horman:

r8a7791 (R-Car M2) based Koelsch board and
r8a7790 (R-Car H1) based Lager board
* Enable SCIF0 and SCIF1 serial ports in DT

* tag 'renesas-dt-scif-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: koelsch: Enable SCIF0 and SCIF1 serial ports in DT
  ARM: shmobile: lager: Enable SCIF0 and SCIF1 serial ports in DT

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-21 14:26:44 -07:00
Olof Johansson
82711e7b46 Renesas SoC Clock Cleanups for v3.16
Work from Laurent Pinchart to switch all Renesas platforms to the new style
 CMT, MTU2 and TMU device platform data. This is in preparation for
 initialising these devices using DT on ARM Based Renesas SoCs.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTcdAFAAoJENfPZGlqN0++JFEP/3l31Q8CEWp0e6mNoUWzNmqS
 dhwuB6mEXs3n5WkDNrN/3O4sKwDp5dPvjrNOqn2Tc1nb/Bb+wsZr4G8oGdOI/XMS
 BY5mCQ66tpqrFUyoWpOH1oHdh6gvqX4ULyNgkEAQR8XAI125NYTydHvoAhQghJEy
 bmdhgtFUcJyjIJ2doku0uWlpoKEihrOZ/5GUwBkNw30wBs2bp9jvp+jOosvtypuA
 UrA7Xi0Mtm0hhyGIOawbeiP+yvzLOu7ORDa+e8F5fKZ0rituPmKyDWcDIkYh6aNp
 WCoo4B6qOFtRILNGxcbnq9jDSpHoMUFGmWaoohcnVhQ+zxwvEyW7NkMCd0mH/7/u
 EPUn9svnXY6cXzq+WfBNRazK6AwQuCc4NTU7j0iy19ZOIlFltpz+9HpuZ1uxDYzA
 g+gmfJ887khBahIXluWHrGibf4td7dCdfsrUZtNamHqonlDCiINa+b7a/qovdbhJ
 u1jK4pDQlDLqhAoAXvWaV8zzwuXelQpZl3smTA7/Id5jEncbdzjQRR21klskXPSK
 5PZV8EbCkFDS0keOfIF4+do0p36kLj3N/7tC6d7z17BnieE3GuQ9gFb8MjOKLJq2
 biRpJ5/ruxIAjY/bngpwse+arC29Rt/9jH9bJ35lrRnAfSQQqCInOBc1EhY7go6y
 iVpI+VhLrLsxC/3d+r/M
 =6i4y
 -----END PGP SIGNATURE-----

Merge tag 'renesas-clock-cleanup2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

Merge "Renesas SoC Clock Cleanups for v3.16" from Simon Horman:

Work from Laurent Pinchart to switch all Renesas platforms to the new style
CMT, MTU2 and TMU device platform data. This is in preparation for
initialising these devices using DT on ARM Based Renesas SoCs.

* tag 'renesas-clock-cleanup2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r7s72100: Switch to new style MTU2 device
  sh: Switch to new style MTU2 device
  ARM: shmobile: r8a7779: Switch to new style TMU device
  ARM: shmobile: r8a7778: Switch to new style TMU device
  ARM: shmobile: r8a7740: Switch to new style TMU device
  ARM: shmobile: sh73a0: Switch to new style TMU device
  ARM: shmobile: sh7372: Switch to new style TMU device
  sh: Switch to new style TMU device
  ARM: shmobile: r8a7791: Switch to new style CMT device
  ARM: shmobile: r8a7790: Switch to new style CMT device
  ARM: shmobile: r8a7740: Switch to new style CMT device
  ARM: shmobile: r8a73a4: Switch to new style CMT device
  ARM: shmobile: sh73a0: Switch to new style CMT device
  ARM: shmobile: sh7372: Switch to new style CMT device
  sh: Switch to new style CMT device

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-21 14:05:58 -07:00
Olof Johansson
b4c6ed1386 Second Round of Renesas ARM Based SoC Boards Updates for v3.16
r8a7740 (R-Mobile A1) based Armadillo800 EVA board
 * Minor cleanup of the Armadillo legacy board code
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTcxp4AAoJENfPZGlqN0++2H0QAJKflhmqKrhRArHETnUOFEVL
 rGNJO+es0eXcNt5YNRi1rTt41TtwntJvpfPZgd+5vKCG9ozBw8stc60FmrvrzHzh
 B+LXPv2MBy/wD7A5rE+xas8gafgpH6C5sjWlIB50rTLoZ+oHZCmhoUMYspWHWHLN
 eBV4KgHRXgKYfngm8OChYpxGTOrU+4XUcHRp3EeduTBOP8hMV1eaNXORIvTUDS6C
 7gCQK7Fv9szahMeI2VuzP1kgFU23I4wxil0GUN1otIuWiRXnS+DVRp64mNh8bBbj
 +fuEy8cdmwptYChzR87y5+3etSpRow1qBw4/zuSvzG6sOgJpxne18/pvnNK/jkpM
 RTbuq92xdhlX85zH+Ii1fIc2Ke3Fw17WX9augFAhjD9BhobKzROJ6qP34HFf1AjN
 Jz9hkS+13KNb3FDtLt1/ZhbUmSJVWqqGK+CQUSLMmBbStAHdbzEf+SDGDN74fDw8
 VFWsGgANxLcJT7DVh8Eq2LpQppmt9rd/6HccMLNsSfeFd3nuyafbTLDCDoxYpN4K
 t6afqB8EWZj7w3F5tEqwhmOom70zPU5n/7t1TKcn+Sb1wetMBVeqkKvQ7stF0Kq7
 M1fCAWlrxbdbHGeznSbMzz3bdorqoStLe9SozcN1YyGOdBcZR7Tet/my2r9djQEA
 t3s1Z742PtNka+n5LRJ+
 =Ll63
 -----END PGP SIGNATURE-----

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

Merge "Second Round of Renesas ARM Based SoC Boards Updates for v3.16" from
Simon Horman:

r8a7740 (R-Mobile A1) based Armadillo800 EVA board
* Minor cleanup of the Armadillo legacy board code

* tag 'renesas-boards2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Minor cleanup of the Armadillo legacy board code

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-19 22:39:05 -07:00
Wolfram Sang
23f679fa6d 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>
2014-05-17 09:06:19 +09:00
Wolfram Sang
88351216f5 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>
2014-05-17 09:06:11 +09:00
Wolfram Sang
551f80a5c9 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>
2014-05-17 09:06:04 +09:00
Wolfram Sang
9fbb1ae01b 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>
2014-05-14 11:42:55 +09:00
Geert Uytterhoeven
1f9c7a691f 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>
2014-05-14 11:42:55 +09:00
Wolfram Sang
3158e053ff 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>
2014-05-14 11:42:54 +09:00
Wolfram Sang
316b935378 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>
2014-05-14 11:42:53 +09:00
Wolfram Sang
d45b21c902 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>
2014-05-14 11:42:52 +09:00
Laurent Pinchart
5ba55fa81a 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>
2014-05-14 09:56:38 +09:00
Laurent Pinchart
4e9c4877aa 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>
2014-05-14 09:56:35 +09:00
Magnus Damm
fd105ecf17 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>
2014-05-11 20:59:57 +09:00
Laurent Pinchart
c17fcfbcc0 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>
2014-05-11 19:35:28 +09:00
Laurent Pinchart
e4ae34e285 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>
2014-05-11 19:35:28 +09:00
Laurent Pinchart
535ef0d957 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>
2014-05-11 19:35:28 +09:00
Laurent Pinchart
8ec72e4606 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>
2014-05-11 19:35:28 +09:00
Laurent Pinchart
3df592bc33 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>
2014-05-11 19:35:28 +09:00
Laurent Pinchart
8e8236a9d8 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>
2014-05-11 19:35:28 +09:00
Laurent Pinchart
356af68bf4 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>
2014-05-11 19:35:27 +09:00
Laurent Pinchart
711ee6c8de 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>
2014-05-11 19:35:27 +09:00
Laurent Pinchart
e0ad56a35e 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>
2014-05-11 19:35:27 +09:00
Laurent Pinchart
52065ef71e 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>
2014-05-11 19:35:27 +09:00
Laurent Pinchart
652256fd47 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>
2014-05-11 19:35:27 +09:00
Laurent Pinchart
386f60aae3 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>
2014-05-11 19:35:26 +09:00
Olof Johansson
71e878fed8 Renesas ARM Based SoC Boards Updates for v3.16
r8a7791 (R-Car M2) based Koelsch board
 * Enable Quad SPI transfers for the SPI FLASH
 * Clock workarounds for Ether, I2C, MSIOF, Quad SPI and SDHI
 * Use shmobile_clk_workaround()
 
 r8a7790 (R-Car H2) based Lager board
 * Enable Quad SPI transfers for the SPI FLASH
 * Switch to use dai info for R-Car sound
 * Clock workarounds for Ether, MSIOF, MMCIF, Quad SPI and SDHI
 * Use shmobile_clk_workaround()
 
 r8a7778 (R-Car M1) based Bock-W board
 * Switch to use dai info for R-Car sound
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJTUFdsAAoJENfPZGlqN0++5uwP/3rxeWGp+SsD/RMiXC1Iydtt
 5H+EBUz5AEGKdWs/3ce6QsbvztO/9/uDNU4oqG35bwpRDfy3wiKph2I7Ulh17WVC
 2LyAqGOtNWOm4MWQ0DZfuPpSOjAhXnzsX+nVD6S2zk4hVvQxyxzvRKW0ANm2GunX
 yBFWk1pR6UArJinEAr2lWTso0mvSct0RYY8SjbtWhV3QJHbV0L4jLCVZGjvwNT1l
 omkvsE1xMbTBqdsxxlh+IR+yJLQIh/dd88ULY563Ljr5DSe0LVgTVZBN78hKaXWO
 68O4wnqV6jHEIRmnF4AqbYTiE79H6PN2SgwwPuugb8V2NKhD629xnC9O/FNJg/zC
 Mp0hyjQxd6sqaXwOk2316iCmrW4WhfqMCc+4TvHKe4m2yiE53iBXApLC7ulV6GpB
 Vm+4ZXQiuGXfs13UiQ2a/KLa4zOSuRIsy2kk4YyTKIAm6t4xatMTbcPigG4BYeNT
 QbdiugcdQAS02jbGx5AUhKeVjpHvCdW+bB0m8XbEgOYlMl7THQD5gQzIGfDpihFa
 0pinm6TJkeYAciTO5ggqx01v4BkZw9HrcCd3FY1VLkMdgnGbwPCrdSOuQBKDlFWp
 cjpCH317b1y8gvDD7e7MD/8PmyqzeiK0e5AHyFcAS6mPLrA1uGnji+6UzYmfIc63
 i5/GSuIeZKD78/roM5Zu
 =GATq
 -----END PGP SIGNATURE-----

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

Merge "Renesas ARM Based SoC Boards Updates for v3.16" from Simon Horman:

r8a7791 (R-Car M2) based Koelsch board
* Enable Quad SPI transfers for the SPI FLASH
* Clock workarounds for Ether, I2C, MSIOF, Quad SPI and SDHI
* Use shmobile_clk_workaround()

r8a7790 (R-Car H2) based Lager board
* Enable Quad SPI transfers for the SPI FLASH
* Switch to use dai info for R-Car sound
* Clock workarounds for Ether, MSIOF, MMCIF, Quad SPI and SDHI
* Use shmobile_clk_workaround()

r8a7778 (R-Car M1) based Bock-W board
* Switch to use dai info for R-Car sound

* tag 'renesas-boards-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: lager legacy: Enable Quad SPI transfers for the SPI FLASH
  ARM: shmobile: koelsch legacy: Enable Quad SPI transfers for the SPI FLASH
  ARM: shmobile: lager: switch to use dai info for R-Car sound
  ARM: shmobile: bockw: switch to use dai info for R-Car sound
  ARM: shmobile: bockw: remove old style audio clock
  ARM: shmobile: Add Koelsch clock workarounds for SDHI
  ARM: shmobile: Add Lager clock workarounds for SDHI and MMCIF
  ARM: shmobile: lager-reference: Work around core clock issues
  ARM: shmobile: koelsch-reference: Annotate clk_enables as __initconst
  ARM: shmobile: koelsch-reference: Work around core clock issues
  ARM: shmobile: lager: Annotate clk_names with __initconst
  ARM: shmobile: koelsch: Annotate clk_names with __initconst
  ARM: shmobile: Use shmobile_clk_workaround() on Koelsch
  ARM: shmobile: Use shmobile_clk_workaround() on Lager

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-05 14:14:29 -07:00
Olof Johansson
e80c9c2c2d Merge branch 'renesas/clock' into next/boards
* renesas/clock:
  ARM: shmobile: r8a7790: remove old style audio clock
  ARM: shmobile: r8a7778: remove old style audio clock
  ARM: shmobile: r8a7791: Rename VSP1_SY clocks to VSP1_S
  ARM: shmobile: r8a7790: Rename VSP1_(SY|RT) clocks to VSP1_(S|R)
  ARM: shmobile: r8a7791: Fix the I2C clocks parents in legacy code
  ARM: shmobile: r8a7790: Fix the I2C clocks parents in legacy code
  ARM: shmobile: Introduce shmobile_clk_workaround()
  ARM: shmobile: r8a7791: Use rcar_gen2_read_mode_pins() helper
2014-05-05 14:14:24 -07:00
Linus Torvalds
3fe89d2e76 ARM: SoC fixes for 3.15-rc3:
Since we didn't get around to collect fixes in time for -rc2 over
 the easter vacation, this one is unfortunately a bit larger than
 we'd like for an -rc3 merge. A large set of the changes is in the
 device tree sources, so I'm splitting out the description between
 code changes and DT changes. Aside from omap and versatile express,
 the actual code bugs are sporadic and trivial. Here is an overview:
 
   imx:
    - fix video clock settings
    - fix one clock refcounting bug
 
   omap:
    - update defconfig for renamed USB PHY driver
    - fix error handling in gpmc
    - fix N900 video initialization regression
    - fix reression in hwmod code from missing braces
    - fix am43xx and omap3 clocks
    - remove bogus write to voltage control register
 
   pxa:
    - fix build regression from 3.13 header cleanup
 
   rockchip:
    - fix a misleading printk string
 
   shmobile:
    - fix incorrect sound setting on multiple machines
 
   spear:
    - remove incorrect __init section annotation
 
   tegra:
    - remove a stale Kconfig entry
 
   u300:
    - update defconfig
 
   ux500:
    - enable common wireless and sensor drivers in defconfig
    - more defconfig updates
 
   vexpress:
    - fix voltage calculation for opp
    - fix reboot hang and warning
    - fix out-of-bounds array access
    - improve error handling in clock driver
 
   overall:
    - always select CLKSRC_OF in multiplatform builds
 
 And these are the devicetree related changes:
 
   imx:
    - add missing #clock-cell properties
    - fix pinctrl setting in imx6sl-evk
    - fix video endpoint on imx53
    - remove obsolete lvds-channel nodes (multiple patches)
    - add missing second stmpe node
    - fix usb host mode on dmo-edmqmx6 (multiple patches)
    - fix gic node #address-cells to match usage
    - add missing legacy IRQ map for PCIe
    - fix microsom pincontrol setting for rgmii
    - fix fatal typo in touchscreen DT usage for mx5
    - list all RAM present on m53evk and mx53qsb
 
   omap:
    - fix bug in DT handling of gpmc external bus
    - add DT for older revision of beagleboard
    - fix regression after DT node name fixes
    - remove obsolete properties for gpmc
    - fix pinmux comment to match DT it refers to
    - fix newly added dra7xx clock node data
    - add missing clock for USB PHY
 
   mvebu:
    - add missing clock for mdio node
    - fix nonstandard vendor prefixes on i2c nodes
 
   rockchip:
    - fix pin control setting for uart
 
   shmobile:
    - fix typo in DT data for pin control (multiple patches)
    - fix gic node #address-cells to match usage
 
   tegra:
    - fix clock and uart DT representation to match hardware
 
   zynq:
    - add DT nodes for newly added driver
    - add DT properties required for cpufreq-ondemand
 
   overall:
    - restore alphabetic order in Makefile
    - grammar fixes in bindings
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIVAwUAU1pK92CrR//JCVInAQLerA/9GwLHJIBU6osKnZtIWDYPhYj81uRxgF5Q
 qtaUdsSoDQmIiW8tzJL0VUBJQfSpPtf4hsIPh5dMKclalx+0kca3zpPepo58rvEP
 zG39OIK/fBsmD/eVkz0y3lG5BUu9/1gkpnM8jSEmkDWqcNX8wQoOeHSrWXWzEk1G
 2eZlXsYr9OVuIGRx14wnINvPuD2Z75zEXA7KDbDuYqauQvVojj5wH6s8R7Ujy7e1
 +NGCThkLJUF2wid+6QmVk9D6tQXyVxmf+cr080n58LmOmoVnoFkCjs5gaUUIP8Zb
 nM97PQly0s1JIRn+9jF7+U0KNyp9eec7Ogc00tpvvBmQI2kVfHfSRROLq+tDGu1t
 nEEy52X/QVgWWY+1qUl+gqIWWmMTpniDF1pd/5jP3jKXUc/sM7OfLGQaTP4O7sR6
 5MlfvqvSO/EaMeWEvX4e8+Z+2dY1qFZUYk7VtamqmOegzkcDjAiJ3aQNozuqq9JH
 TTHbA2Em9VGC1LlAMAg7h46rM//npCeJ0Q5yjuFk093UBEbAF4HWO2PFNrdohKzC
 Yz/R+vkvGeQ98K/4jj4UIyjcB4PUX+DRrozC10i2XCQh+UIYdgC4dFQz1nH/4iQS
 CrdSRmDvpZDjSFV5m4+QVkaEsTJnXX6vV62VBVRcSLkqyfPABWj1y9c2L3K8kfBJ
 6nbficflFqE=
 =PPo/
 -----END PGP SIGNATURE-----

Merge tag 'fixes-3.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Arnd Bergmann:
 "Since we didn't get around to collect fixes in time for -rc2 over the
  easter vacation, this one is unfortunately a bit larger than we'd like
  for an -rc3 merge.

  A large set of the changes is in the device tree sources, so I'm
  splitting out the description between code changes and DT changes.
  Aside from omap and versatile express, the actual code bugs are and
  trivial.  Here is an overview:

  imx:
   - fix video clock settings
   - fix one clock refcounting bug

  omap:
   - update defconfig for renamed USB PHY driver
   - fix error handling in gpmc
   - fix N900 video initialization regression
   - fix reression in hwmod code from missing braces
   - fix am43xx and omap3 clocks
   - remove bogus write to voltage control register

  pxa:
   - fix build regression from 3.13 header cleanup

  rockchip:
   - fix a misleading printk string

  shmobile:
   - fix incorrect sound setting on multiple machines

  spear:
   - remove incorrect __init section annotation

  tegra:
   - remove a stale Kconfig entry

  u300:
   - update defconfig

  ux500:
   - enable common wireless and sensor drivers in defconfig
   - more defconfig updates

  vexpress:
   - fix voltage calculation for opp
   - fix reboot hang and warning
   - fix out-of-bounds array access
   - improve error handling in clock driver

  overall:
   - always select CLKSRC_OF in multiplatform builds

  And these are the devicetree related changes:

  imx:
   - add missing #clock-cell properties
   - fix pinctrl setting in imx6sl-evk
   - fix video endpoint on imx53
   - remove obsolete lvds-channel nodes (multiple patches)
   - add missing second stmpe node
   - fix usb host mode on dmo-edmqmx6 (multiple patches)
   - fix gic node #address-cells to match usage
   - add missing legacy IRQ map for PCIe
   - fix microsom pincontrol setting for rgmii
   - fix fatal typo in touchscreen DT usage for mx5
   - list all RAM present on m53evk and mx53qsb

  omap:
   - fix bug in DT handling of gpmc external bus
   - add DT for older revision of beagleboard
   - fix regression after DT node name fixes
   - remove obsolete properties for gpmc
   - fix pinmux comment to match DT it refers to
   - fix newly added dra7xx clock node data
   - add missing clock for USB PHY

  mvebu:
   - add missing clock for mdio node
   - fix nonstandard vendor prefixes on i2c nodes

  rockchip:
   - fix pin control setting for uart

  shmobile:
   - fix typo in DT data for pin control (multiple patches)
   - fix gic node #address-cells to match usage

  tegra:
   - fix clock and uart DT representation to match hardware

  zynq:
   - add DT nodes for newly added driver
   - add DT properties required for cpufreq-ondemand

  overall:
   - restore alphabetic order in Makefile
   - grammar fixes in bindings"

* tag 'fixes-3.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (66 commits)
  ARM: vexpress/TC2: Convert OPP voltage to uV before storing
  power/reset: vexpress: Fix restart/power off operation
  dt: tegra: remove non-existent clock IDs
  clk: tegra: remove non-existent clocks
  ARM: tegra: remove UART5/UARTE from tegra124.dtsi
  ARM: tegra: remove TEGRA_EMC_SCALING_ENABLE
  ARM: Tidy up DTB Makefile entries
  ARM: fix missing CLKSRC_OF on multi-platform
  ARM: spear: add __init to spear_clocksource_init()
  ARM: pxa: hx4700.h: include "irqs.h" for PXA_NR_BUILTIN_GPIO
  arm/mach-vexpress: array accessed out of bounds
  clk: vexpress: NULL dereference on error path
  ARM: OMAP2+: Fix GPMC remap for devices using an offset
  ARM: zynq: dt: Add I2C nodes to Zynq device tree
  ARM: zynq: DT: Add 'clock-latency' property
  ARM: OMAP2+: Fix oops for GPMC free
  ARM: dts: Add support for the BeagleBoard xM A/B
  ARM: dts: Grammar /that will/it will/
  ARM: dts: Grammar /is uses/ is used/
  ARM: OMAP2+: Fix config name for USB3 PHY
  ...
2014-04-25 13:02:02 -07:00
Simon Horman
d3a088d459 Renesas ARM Based SoC Clock Updates for v3.16
SH Mobile shared clock code
 * Introduce shmobile_clk_workaround()
 
 r8a7791 (R-Car M2) SoC
 * Rename VSP1_SY clocks to VSP1_S
 * Correct the I2C clocks parents
 
 r8a7790 (R-Car H2) SoC
 * Remove old style audio clock
 * Rename VSP1_(SY|RT) clocks to VSP1_(S|R)
 * Fix the I2C clocks parents
 
 r8a7778 (R-Car M1) SoC
 * Remove old style audio clock
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJTTxwIAAoJENfPZGlqN0++fygQAI+a2/56324u5uiT5lpGcmWh
 UHvDhNErnvPNWZzBox3dDq9+fAqRQNnfPrFV3lrhJsf/EycofOKA+l86bG9XXCYK
 GMEnjOgGwwl4QbyUD1I8D2UksnlkBnU+Msau+vafwQC9CgM2yqoMbKsM//GxEoww
 YQ1TQZpSDjNXOopnT7rXmIq6gP//GzafnfaPr7eKW/YRwAdrDJ7b3rAIfUMxBidO
 yxPew8etQHlD6HVeD/KYfZRt81KzHAeStM8VktSO9Q41ZxQ/rlEbkQwYVOYKkpi9
 UthRC1pIG4xGibtYq7b0b3zMHkJLw/TVecLsOAP5Km90qcKeGZ6yBj3xmOGfyFJX
 LbcrD6HrCNuFs+wHKd6XwKyFKGvSit4WWgzMzP5AsCcMWtCG+AyF4Zrx7nyflaGy
 +f45No1heXAi0dGr/RgfsxcOnClXsgz49Cdf3xJLXoLzjECc/xufu+XteG+w+cBb
 JMU/UXOLVuX/JUa/ukPokaHNNWqWe9QvcsAf91L+Bba5D8MnYw1ZP0CfqyyR3Ox3
 5wCK+lb7/uNKdlENS4QNJ/JfZBN0PBlf5EUscSMFHoPzWp0cHYeUGtYQ25jZIVTr
 VhzMmtU9YiHuqGMrh3Q2f0U0WbeoxBlIaEBO3FQK9maqlElZy+svoLg0px9jgZpB
 R5+ndfWrVRCW5x+tpp9D
 =bARP
 -----END PGP SIGNATURE-----

Merge tag 'renesas-clock-for-v3.16' into cmt-mtu2-tmu-cleanups-for-v3.16

Renesas ARM Based SoC Clock Updates for v3.16

SH Mobile shared clock code
* Introduce shmobile_clk_workaround()

r8a7791 (R-Car M2) SoC
* Rename VSP1_SY clocks to VSP1_S
* Correct the I2C clocks parents

r8a7790 (R-Car H2) SoC
* Remove old style audio clock
* Rename VSP1_(SY|RT) clocks to VSP1_(S|R)
* Fix the I2C clocks parents

r8a7778 (R-Car M1) SoC
* Remove old style audio clock
2014-04-23 09:59:40 +09:00
Geert Uytterhoeven
a09b2f0ba1 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>
2014-04-15 08:13:22 +09:00
Geert Uytterhoeven
4d4a0ff30c 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>
2014-04-15 08:11:03 +09:00
Simon Horman
3dedc5f5b1 ARM: shmobile: r8a7778: Use clks as MSTP007 parent
According to the documentation the parent clock of
MSTP007 should be clks not clkp.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-04-14 21:14:36 +01:00
Kuninori Morimoto
50f359d738 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>
2014-04-14 12:50:24 +09:00
Kuninori Morimoto
a3f50d1bdd 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>
2014-04-14 12:50:19 +09:00
Kuninori Morimoto
115897dab0 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>
2014-04-14 12:50:14 +09:00
Kuninori Morimoto
932616eed0 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>
2014-04-14 12:49:43 +09:00
Kuninori Morimoto
a9d83bd6ab 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>
2014-04-14 12:49:38 +09:00
Kuninori Morimoto
7b707277e7 ARM: shmobile: armadillo800eva: fixup SND_SOC_DAIFMT_CBx_CFx flags
c7a507eea1
(ASoC: fsi: fixup SND_SOC_DAIFMT_CBx_CFx flags)
exchanged sound flags, but armadillo800eva flags needs IB_NF.
The recorded sound will be noise without this patch.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-04-14 12:48:34 +09:00
Kuninori Morimoto
9f85ff849c ARM: shmobile: lager: fixup SND_SOC_DAIFMT_CBx_CFx flags
e150828940
(ASoC: rcar: fixup SND_SOC_DAIFMT_CBx_CFx flags)
corrected SND_SOC_DAIFMT_CBx_CFx definition.
But then, Lager board was maintenanced other branch.
This patch correct SND_SOC_DAIFMT_CBx_CFx flag for lager

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-04-14 12:46:59 +09:00
Magnus Damm
f278ea78be ARM: shmobile: Add Koelsch clock workarounds for SDHI
Add SDHI0, SDHI1 and SDHI2 to the clock workaround list for
Koelsch multiplatform. Without these additional lines wakeup
from Suspend-to-RAM never happens.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-04-14 11:30:40 +09:00
Magnus Damm
f98b55d730 ARM: shmobile: Add Lager clock workarounds for SDHI and MMCIF
Add MMCIF1, SDHI0 and SDHI2 to the clock workaround list for
Lager multiplatform. Without these additional lines wakeup
from Suspend-to-RAM never happens.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-04-14 11:30:40 +09:00
Simon Horman
aa5de826af ARM: shmobile: lager-reference: Work around core clock issues
Due to issues with runtime PM clock management, clocks not explicitly
managed by their drivers may not be enabled at all, or be inadvertently
disabled by the clk_disable_unused() late initcall.

Until this is fixed, add a temporary workaround, calling
shmobile_clk_workaround() with enable == true.

For now this enables the clocks for: ether, msiof1, qspi_mod, and
thermal. More clocks can be added if needed.

Based on work for the koelsch board by Geert Uytterhoeven.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
2014-04-14 11:30:40 +09:00
Simon Horman
9e7b83c221 ARM: shmobile: koelsch-reference: Annotate clk_enables as __initconst
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2014-04-14 11:30:40 +09:00
Geert Uytterhoeven
53cf0cf7ba ARM: shmobile: koelsch-reference: Work around core clock issues
Due to issues with runtime PM clock management, clocks not explicitly
managed by their drivers may not be enabled at all, or be inadvertently
disabled by the clk_disable_unused() late initcall.

Until this is fixed, add a temporary workaround, calling
shmobile_clk_workaround() with enable == true.

For now this enables the clocks for: ether, i2c2, msiof0, qspi_mod, and
thermal. More clocks can be added if needed.

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-04-14 11:30:39 +09:00
Simon Horman
f71c77286b ARM: shmobile: lager: Annotate clk_names with __initconst
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2014-04-14 11:30:39 +09:00
Simon Horman
f6f98b3e44 ARM: shmobile: koelsch: Annotate clk_names with __initconst
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
2014-04-14 11:30:39 +09:00
Magnus Damm
89aff406db ARM: shmobile: Use shmobile_clk_workaround() on Koelsch
Convert the Koelsch DT reference code to use the newly introduced
function shmobile_clk_workaround().

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-04-14 11:30:39 +09:00