diff options
author | Simon Horman <horms@verge.net.au> | 2011-04-26 23:17:15 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 23:15:20 -0400 |
commit | f61831ee61525a82e382b600622c3b35671a92f2 (patch) | |
tree | 590672722d861fb1bb5cb5dfa5be5f63ededc802 /arch/arm/mach-shmobile | |
parent | 8b1aaeaf54f1bcaa0bbec6bb170db367c998d27c (diff) |
ARM: mach-shmobile: ap4evb, mackerel: fixup scif initialisation for zboot
* Set receive enable and transmit enable bits of SCASCR0 (E6C400089).
Values previously written to this register was bogus.
Curiously earlyprintk works with the previous code.
* Remove duplicate initialisation of GPIO port 152, SCIFA0_TXD (0xE6053098).
This should have no effect other than to very slightly reduce the amount of
code.
Reported-by: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/head-ap4evb.txt | 3 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/head-mackerel.txt | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/head-ap4evb.txt b/arch/arm/mach-shmobile/include/mach/head-ap4evb.txt index 3029aba38688..9f134dfeffdc 100644 --- a/arch/arm/mach-shmobile/include/mach/head-ap4evb.txt +++ b/arch/arm/mach-shmobile/include/mach/head-ap4evb.txt | |||
@@ -87,8 +87,7 @@ WAIT 1, 0xFE40009C | |||
87 | ED 0xFE400354, 0x01AD8002 | 87 | ED 0xFE400354, 0x01AD8002 |
88 | 88 | ||
89 | LIST "SCIF0 - Serial port for earlyprintk" | 89 | LIST "SCIF0 - Serial port for earlyprintk" |
90 | EB 0xE6053098, 0x11 | ||
91 | EB 0xE6053098, 0xe1 | 90 | EB 0xE6053098, 0xe1 |
92 | EW 0xE6C40000, 0x0000 | 91 | EW 0xE6C40000, 0x0000 |
93 | EB 0xE6C40004, 0x19 | 92 | EB 0xE6C40004, 0x19 |
94 | EW 0xE6C40008, 0x3000 | 93 | EW 0xE6C40008, 0x0030 |
diff --git a/arch/arm/mach-shmobile/include/mach/head-mackerel.txt b/arch/arm/mach-shmobile/include/mach/head-mackerel.txt index 3029aba38688..9f134dfeffdc 100644 --- a/arch/arm/mach-shmobile/include/mach/head-mackerel.txt +++ b/arch/arm/mach-shmobile/include/mach/head-mackerel.txt | |||
@@ -87,8 +87,7 @@ WAIT 1, 0xFE40009C | |||
87 | ED 0xFE400354, 0x01AD8002 | 87 | ED 0xFE400354, 0x01AD8002 |
88 | 88 | ||
89 | LIST "SCIF0 - Serial port for earlyprintk" | 89 | LIST "SCIF0 - Serial port for earlyprintk" |
90 | EB 0xE6053098, 0x11 | ||
91 | EB 0xE6053098, 0xe1 | 90 | EB 0xE6053098, 0xe1 |
92 | EW 0xE6C40000, 0x0000 | 91 | EW 0xE6C40000, 0x0000 |
93 | EB 0xE6C40004, 0x19 | 92 | EB 0xE6C40004, 0x19 |
94 | EW 0xE6C40008, 0x3000 | 93 | EW 0xE6C40008, 0x0030 |