diff options
| author | Olof Johansson <olof@lixom.net> | 2013-03-05 01:33:21 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-03-05 01:35:01 (GMT) |
| commit | 260a8e507a8e066b52e299224296cd6fe370932e (patch) | |
| tree | b66d6f8d2f2a4f8343e0ce962550326de7750dfc /arch/arm/boot | |
| parent | 984b839337da1eb7b4a4fb50e24cf28c2b473862 (diff) | |
| parent | 0545c798e9bb7fe29606681653c20d68e47f4840 (diff) | |
| download | linux-fsl-qoriq-260a8e507a8e066b52e299224296cd6fe370932e.tar.xz | |
Merge tag 'imx-fixes-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
From Shawn Guo:
The imx fixes for 3.9:
- move early resume code out of .data section to fix allyesconfig
failure since c08e20d (arm: Add v7_invalidate_l1 to cache-v7.S)
gets merged
- Fix incorrect DISP1_DAT_21 number in imx53-mba53 disp1-grp1
* tag 'imx-fixes-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: dts: imx53-mba53: fix fsl,pins for disp1-grp1
ARM: mach-imx: move early resume code out of the .data section
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/imx53-mba53.dts | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx53-mba53.dts b/arch/arm/boot/dts/imx53-mba53.dts index e54fffd..468c0a1 100644 --- a/arch/arm/boot/dts/imx53-mba53.dts +++ b/arch/arm/boot/dts/imx53-mba53.dts @@ -42,10 +42,9 @@ fsl,pins = <689 0x10000 /* DISP1_DRDY */ 482 0x10000 /* DISP1_HSYNC */ 489 0x10000 /* DISP1_VSYNC */ - 684 0x10000 /* DISP1_DAT_0 */ 515 0x10000 /* DISP1_DAT_22 */ 523 0x10000 /* DISP1_DAT_23 */ - 543 0x10000 /* DISP1_DAT_21 */ + 545 0x10000 /* DISP1_DAT_21 */ 553 0x10000 /* DISP1_DAT_20 */ 558 0x10000 /* DISP1_DAT_19 */ 564 0x10000 /* DISP1_DAT_18 */ |