openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

This resolves a panic-on-boot regression introduced by me when incorrectly 

updating TMU clock definitions.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJRItU8AAoJENfPZGlqN0++O+oP/1+1KGakwdAJV4J7szdO1AGa
 qGWynrXh58vfOm/P1a/CbqqFUqQiPS/RdZtreVQrhxk/7e6RdwO++PjbU7yH6p5p
 L0OUJMfQCZdPA4sWhK7rY02P8B/63knGi5r2rVqX+WqdKBTwB481vjCMPYbMHADb
 zZO3j3jijrPpvKIdWPoWJIDUjECa9f141MkWLvM8aFEBQ6epk/BEqahzpQBJIQW+
 SE8B8Jw2rpoThTRC118gV8aHy+QiRSVkfzPprSAL9wAzcZFh1mKldhOC3NbQk9E0
 H+Bu/fQtlQlk7yuFGaUSRD/w5FyCNbif6LhwZN/ya60mwRZWIk34T8a1R7ngDu6u
 /6w8qWE0hSkPe7rhUo3kBfC72hn7D3es8O1mNTVdN7kVL17pmsq2O72UbRjIr3P1
 p96T7UioeIllPp9GkxSWFynG7gzZecuAh2dXYK7KAAcH7v5Lp5pO6rrLURiBU6SE
 pMrSNhoOE8BbyvDCh9lh+maCMi1uS1S58Gw3rvYIBatf/wT6nkOKNsH/igjs/Wzr
 7YtbC+bEDI6zEfUwaoMM6IMRychW7+S/CmLqQNnvVFrwVaE9cjCmoGvjOsaUwg5i
 0rSzNFbfhb6BwXM/B28VnhyhLnb9S62xb5vEh8K1W9mYji2M42KdpDv2B6v4eh6r
 aq8ITv4mPipV6AfftXkh
 =G/UN
 -----END PGP SIGNATURE-----

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

This resolves a panic-on-boot regression introduced by me when incorrectly
updating TMU clock definitions.

* tag 'renesas-soc5-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7779: Correct TMU clock support again

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2013-02-19 16:36:42 +01:00
parent b0db321ba1 f9047306fd
commit 001c5c4aaa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-shmobile/clock-r8a7779.c
View File

@ -161,8 +161,8 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("ehci-platform.0", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */
CLKDEV_DEV_ID("ohci-platform.0", &mstp_clks[MSTP100]), /* USB OHCI port0/1 */
CLKDEV_DEV_ID("sh_tmu.0", &mstp_clks[MSTP016]), /* TMU00 */
CLKDEV_DEV_ID("sh_tmu.1", &mstp_clks[MSTP015]), /* TMU01 */
CLKDEV_DEV_ID("sh_tmu.2", &mstp_clks[MSTP014]), /* TMU02 */
CLKDEV_DEV_ID("sh_tmu.1", &mstp_clks[MSTP016]), /* TMU01 */
CLKDEV_DEV_ID("sh_tmu.2", &mstp_clks[MSTP016]), /* TMU02 */
CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP030]), /* I2C0 */
CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP029]), /* I2C1 */
CLKDEV_DEV_ID("i2c-rcar.2", &mstp_clks[MSTP028]), /* I2C2 */