Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0264f1603904dbee3196abc748a53fb0b23b8046

Authored by Paul Mundt
Committed by Paul Mundt
1 parent 652b9672cf
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

sh: Tidy up L-BOX area5 addresses. 

L-BOX can use the normal PA_AREA5_IO, there's no reason for it to
reproduce it.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

Showing 2 changed files with 4 additions and 8 deletions Side-by-side Diff

arch/sh/boards/lboxre2/setup.c
Diff comments   View file @ 0264f16
... ... @@ -15,6 +15,7 @@
15 15 #include <linux/platform_device.h>
16 16 #include <linux/pata_platform.h>
17 17 #include <asm/machvec.h>
  18 +#include <asm/addrspace.h>
18 19 #include <asm/lboxre2.h>
19 20 #include <asm/io.h>
20 21  
... ... @@ -53,7 +54,7 @@
53 54 unsigned long paddrbase, psize;
54 55  
55 56 /* open I/O area window */
56   - paddrbase = virt_to_phys((void*)CONFIG_CF0_BASE_ADDR);
  57 + paddrbase = virt_to_phys((void*)PA_AREA5_IO);
57 58 psize = PAGE_SIZE;
58 59 prot = PAGE_KERNEL_PCC( 1 , _PAGE_PCC_IO16);
59 60 cf0_io_base = (u32)p3_ioremap(paddrbase, psize, prot.pgprot);
include/asm-sh/lboxre2.h
Diff comments   View file @ 0264f16
... ... @@ -2,8 +2,6 @@
2 2 #define __ASM_SH_LBOXRE2_H
3 3  
4 4 /*
5   - * linux/include/asm-sh/lbox.h
6   - *
7 5 * Copyright (C) 2007 Nobuhiro Iwamatsu
8 6 *
9 7 * NTT COMWARE L-BOX RE2 support
... ... @@ -14,11 +12,8 @@
14 12 *
15 13 */
16 14  
17   -#define CONFIG_CF0_BASE_ADDR 0xb4000000 /* Boot only */
18   -#define CONFIG_CF1_BASE_ADDR 0xb8000000
19   -
20   -#define IRQ_CF1 9 /* CF1 */
21   -#define IRQ_CF0 10 /* CF0 */
  15 +#define IRQ_CF1 9 /* CF1 */
  16 +#define IRQ_CF0 10 /* CF0 */
22 17 #define IRQ_INTD 11 /* INTD */
23 18 #define IRQ_ETH1 12 /* Ether1 */
24 19 #define IRQ_ETH0 13 /* Ether0 */