Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8dd523118bfbcaca5b67923ff6ee546e04a4db64

Authored by Ben Dooks
Committed by Russell King
1 parent 330d57fb98
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

[ARM] 3136/1: Anubis - fix map_desc initialisers 

Patch from Ben Dooks

Fix the map_desc initialisers for the Simtec Anubis
board to match the new initialiser scheme.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 1 changed file with 42 additions and 9 deletions Side-by-side Diff

arch/arm/mach-s3c2410/mach-anubis.c
Diff comments   View file @ 8dd5231
... ... @@ -56,8 +56,16 @@
56 56 static struct map_desc anubis_iodesc[] __initdata = {
57 57 /* ISA IO areas */
58 58  
59   - { (u32)S3C24XX_VA_ISA_BYTE, 0x0, SZ_16M, MT_DEVICE },
60   - { (u32)S3C24XX_VA_ISA_WORD, 0x0, SZ_16M, MT_DEVICE },
  59 + {
  60 + .virtual = (u32)S3C24XX_VA_ISA_BYTE,
  61 + .pfn = __phys_to_pfn(0x0),
  62 + .length = SZ_4M,
  63 + .type = MT_DEVICE
  64 + }, {
  65 + .virtual = (u32)S3C24XX_VA_ISA_WORD,
  66 + .pfn = __phys_to_pfn(0x0),
  67 + .length = SZ_4M, MT_DEVICE
  68 + },
61 69  
62 70 /* we could possibly compress the next set down into a set of smaller tables
63 71 * pagetables, but that would mean using an L2 section, and it still means
64 72  
... ... @@ -66,16 +74,41 @@
66 74  
67 75 /* CPLD control registers */
68 76  
69   - { (u32)ANUBIS_VA_CTRL1, ANUBIS_PA_CTRL1, SZ_4K, MT_DEVICE },
70   - { (u32)ANUBIS_VA_CTRL2, ANUBIS_PA_CTRL2, SZ_4K, MT_DEVICE },
  77 + {
  78 + .virtual = (u32)ANUBIS_VA_CTRL1,
  79 + .pfn = __phys_to_pfn(ANUBIS_PA_CTRL1),
  80 + .length = SZ_4K,
  81 + .type = MT_DEVICE
  82 + }, {
  83 + .virtual = (u32)ANUBIS_VA_CTRL2,
  84 + .pfn = __phys_to_pfn(ANUBIS_PA_CTRL2),
  85 + .length = SZ_4K,
  86 + .type =MT_DEVICE
  87 + },
71 88  
72 89 /* IDE drives */
73 90  
74   - { (u32)ANUBIS_IDEPRI, S3C2410_CS3, SZ_1M, MT_DEVICE },
75   - { (u32)ANUBIS_IDEPRIAUX, S3C2410_CS3+(1<<26), SZ_1M, MT_DEVICE },
76   -
77   - { (u32)ANUBIS_IDESEC, S3C2410_CS4, SZ_1M, MT_DEVICE },
78   - { (u32)ANUBIS_IDESECAUX, S3C2410_CS4+(1<<26), SZ_1M, MT_DEVICE },
  91 + {
  92 + .virtual = (u32)ANUBIS_IDEPRI,
  93 + .pfn = __phys_to_pfn(S3C2410_CS3),
  94 + .length = SZ_1M,
  95 + .type = MT_DEVICE
  96 + }, {
  97 + .virtual = (u32)ANUBIS_IDEPRIAUX,
  98 + .pfn = __phys_to_pfn(S3C2410_CS3+(1<<26)),
  99 + .length = SZ_1M,
  100 + .type = MT_DEVICE
  101 + }, {
  102 + .virtual = (u32)ANUBIS_IDESEC,
  103 + .pfn = __phys_to_pfn(S3C2410_CS4),
  104 + .length = SZ_1M,
  105 + .type = MT_DEVICE
  106 + }, {
  107 + .virtual = (u32)ANUBIS_IDESECAUX,
  108 + .pfn = __phys_to_pfn(S3C2410_CS4+(1<<26)),
  109 + .length = SZ_1M,
  110 + .type = MT_DEVICE
  111 + },
79 112 };
80 113  
81 114 #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK