kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM i.MX fixes for v3.8-rc

Browse source 
This fixes a compile failure on imx_v4_v5_defconfig and a regression
 introduced with enabling the MIPI clocks on i.MX51. Also one rather
 cosmetic fix for the i.MX27 dts file.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABCAAGBQJQzvUaAAoJEPFlmONMx+ezQToQAIYV3iMRY8kO7jsEORwwi3Ww
 GUygWZHJBv1p1sw/tysE68HwAstEicrWfbgicHr2JuirD2puAwYNWLkMFAQ12XWE
 8zE6rFz1aKT32gtqaaJiVZgK0wVy/0druSP+vecXbHO0qUDd09+laJShQBDxAnYz
 /ONycb2+CZygVaqbcyyQ4Wi0ngYyJv+a4AWZDiZT3fn1gIzkEKPBotNGg8Us+O1d
 jnG0dPXDa0OGGTW1vnmBbkRE4knxoDHXg4p7XMRQnqiqQGI4tkMT2gebJYtbjZw2
 nu5i7W8dDdeQq2K512LdiUxj6wEEAETEYWNn0Xblq46BppAb0BIgXPabSDc4i+RW
 Ni1ldykUaXmIs3tzsbC1YGgAPcZs/Afk9tRKUFgaBMiI2mEVf8GNMwEqjRx1aeDg
 5NluUgG+BGS/hMkuXMWdX5exjAmlP49B4dptOGl2bsjdX/2D7Zfj7FUQhjlicCU7
 8IPUZWlu94HwisbPZwynbecV0OPlVsyQRazEw2VA+2epCL3qwpkhvz6Y+P1aoCQ1
 k36Mb3dkfe9j/dUHGJhyxCscl/jFfAVc0m5YKR7QGC12tX1BGEyIrPKJYzGcXJWX
 8PJ1mE6JnkT865UhAeBb0wBCgScYI6/Glko+dBI1O9QSaAtlh5kdUHNekgKz/LtN
 eXU/tR3O9XoqgVx04ehn
 =A/4o
 -----END PGP SIGNATURE-----

Merge tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes

From Sascha Hauer:

ARM i.MX fixes for v3.8-rc

This fixes a compile failure on imx_v4_v5_defconfig and a regression
introduced with enabling the MIPI clocks on i.MX51. Also one rather
cosmetic fix for the i.MX27 dts file.

* tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: imx: Move platform-mx2-emma to arch/arm/mach-imx/devices
  ARM i.MX51 clock: Fix regression since enabling MIPI/HSP clocks
  ARM: dts: mx27: Fix the AIPI bus for FEC
This commit is contained in:
Olof Johansson 2012-12-17 18:40:51 -08:00
commit 1dc1d2e948
5 changed files with 39 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/arm/boot/dts/imx27-3ds.dts
View file

@ -21,17 +21,17 @@
};
soc {
aipi@10000000 { /* aipi */
aipi@10000000 { /* aipi1 */
uart1: serial@1000a000 {
fsl,uart-has-rtscts;
status = "okay";
};
};
fec@1002b000 {
aipi@10020000 { /* aipi2 */
ethernet@1002b000 {
status = "okay";
};
};
};
};

13
arch/arm/boot/dts/imx27-phytec-phycore.dts
View file

@ -21,8 +21,7 @@
};
soc {
aipi@10000000 { /* aipi */
aipi@10000000 { /* aipi1 */
serial@1000a000 {
fsl,uart-has-rtscts;
status = "okay";
@ -38,10 +37,6 @@
status = "okay";
};
ethernet@1002b000 {
status = "okay";
};
i2c@1001d000 {
clock-frequency = <400000>;
status = "okay";
@ -60,6 +55,12 @@
};
};
};
aipi@10020000 { /* aipi2 */
ethernet@1002b000 {
status = "okay";
};
};
};
nor_flash@c0000000 {

11
arch/arm/boot/dts/imx27.dtsi
View file

@ -55,7 +55,7 @@
compatible = "fsl,aipi-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x10000000 0x10000000>;
reg = <0x10000000 0x20000>;
ranges;
wdog: wdog@10002000 {
@ -211,6 +211,15 @@
status = "disabled";
};
};
aipi@10020000 { /* AIPI2 */
compatible = "fsl,aipi-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x10020000 0x20000>;
ranges;
fec: ethernet@1002b000 {
compatible = "fsl,imx27-fec";
reg = <0x1002b000 0x4000>;

16
arch/arm/mach-imx/clk-imx51-imx53.c
View file

@ -319,6 +319,7 @@ int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
unsigned long rate_ckih1, unsigned long rate_ckih2)
{
int i;
u32 val;
struct device_node *np;
clk[pll1_sw] = imx_clk_pllv2("pll1_sw", "osc", MX51_DPLL1_BASE);
@ -390,6 +391,21 @@ int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
imx_print_silicon_rev("i.MX51", mx51_revision());
clk_disable_unprepare(clk[iim_gate]);
/*
* Reference Manual says: Functionality of CCDR[18] and CLPCR[23] is no
* longer supported. Set to one for better power saving.
*
* The effect of not setting these bits is that MIPI clocks can't be
* enabled without the IPU clock being enabled aswell.
*/
val = readl(MXC_CCM_CCDR);
val |= 1 << 18;
writel(val, MXC_CCM_CCDR);
val = readl(MXC_CCM_CLPCR);
val |= 1 << 23;
writel(val, MXC_CCM_CLPCR);
return 0;
}

4
arch/arm/plat-mxc/devices/platform-mx2-emma.c → arch/arm/mach-imx/devices/platform-mx2-emma.c
View file

@ -6,8 +6,8 @@
* the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation.
*/
#include <mach/hardware.h>
#include <mach/devices-common.h>
#include "../hardware.h"
#include "devices-common.h"
#define imx_mx2_emmaprp_data_entry_single(soc) \
{ \