summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-05-08 12:17:31 +0100
committerMark Brown <broonie@linaro.org>2014-05-08 12:17:31 +0100
commit86327bb880556ca2241b55e2f53c20377f0d082e (patch)
treed59f65d9c959b701b12b9c1c8d9bb2821de9d497 /arch
parentc9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff)
parent932616eed0308cbebbb20a079e4bed3674bf1117 (diff)
parenta09b2f0ba170dc89a67d6c4c4f027b37a085dad9 (diff)
downloadlinux-stable-86327bb880556ca2241b55e2f53c20377f0d082e.tar.gz
linux-stable-86327bb880556ca2241b55e2f53c20377f0d082e.tar.bz2
linux-stable-86327bb880556ca2241b55e2f53c20377f0d082e.zip
Merge tags 'renesas-clock-for-v3.16' and 'renesas-boards-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into asoc-rcar
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 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