projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2728701)
[ARM] pxa/cm-x300: fix ffuart registration
authorIgor Grinberg <grinberg@compulab.co.il>
Tue, 20 Jul 2010 07:58:52 +0000 (10:58 +0300)
committerEric Miao <eric.y.miao@gmail.com>
Thu, 5 Aug 2010 06:34:58 +0000 (14:34 +0800)
ffuart is available on cm-x300 only with pxa300.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Cc: stable <stable@kernel.org>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
arch/arm/mach-pxa/cm-x300.c patch | blob | blame | history

diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c
index 8d227b4e15f34c523172a43a29717b747cf2aec5..c70e6c2f4e7c47daf9c8a595bf6fafd11f2971d7 100644 (file)
--- a/arch/arm/mach-pxa/cm-x300.c
+++ b/arch/arm/mach-pxa/cm-x300.c
@@ -746,9 +746,10 @@ static void __init cm_x300_init(void)
 {
        cm_x300_init_mfp();
 
-       pxa_set_ffuart_info(NULL);
        pxa_set_btuart_info(NULL);
        pxa_set_stuart_info(NULL);
+       if (cpu_is_pxa300())
+               pxa_set_ffuart_info(NULL);
 
        cm_x300_init_da9030();
        cm_x300_init_dm9000();