ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io()
Subsystems (3)
PATCH 1/1 ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io()
This patch introduces pxa2xx_map_io() and pxa3xx_map_io() to distinguish between PXA25x/PXA27x and PXA3xx memory mapping.
Also, fixup for platforms broken after introducing pxa{25x,27x}_map_io() and pxa3xx_map_io() is included.
--- arch/arm/mach-pxa/balloon3.c | 2 +- arch/arm/mach-pxa/capc7117.c | 2 +- arch/arm/mach-pxa/cm-x2xx.c | 13 +++++++++++-- arch/arm/mach-pxa/cm-x300.c | 2 +- arch/arm/mach-pxa/colibri-pxa270.c | 4 ++-- arch/arm/mach-pxa/colibri-pxa300.c | 2 +- arch/arm/mach-pxa/colibri-pxa320.c | 2 +- arch/arm/mach-pxa/corgi.c | 6 +++--- arch/arm/mach-pxa/csb726.c | 2 +- arch/arm/mach-pxa/em-x270.c | 4 ++-- arch/arm/mach-pxa/eseries.c | 12 ++++++------ arch/arm/mach-pxa/ezx.c | 12 ++++++------ arch/arm/mach-pxa/generic.c | 21 ++++----------------- arch/arm/mach-pxa/generic.h | 4 ++++ arch/arm/mach-pxa/gumstix.c | 2 +- arch/arm/mach-pxa/h5000.c | 2 +- arch/arm/mach-pxa/himalaya.c | 2 +- arch/arm/mach-pxa/hx4700.c | 2 +- arch/arm/mach-pxa/icontrol.c | 2 +- arch/arm/mach-pxa/idp.c | 2 +- arch/arm/mach-pxa/littleton.c | 2 +- arch/arm/mach-pxa/lpd270.c | 2 +- arch/arm/mach-pxa/lubbock.c | 2 +- arch/arm/mach-pxa/magician.c | 2 +- arch/arm/mach-pxa/mainstone.c | 2 +- arch/arm/mach-pxa/mioa701.c | 2 +- arch/arm/mach-pxa/mp900.c | 2 +- arch/arm/mach-pxa/palmld.c | 2 +- arch/arm/mach-pxa/palmt5.c | 2 +- arch/arm/mach-pxa/palmtc.c | 2 +- arch/arm/mach-pxa/palmte2.c | 2 +- arch/arm/mach-pxa/palmtreo.c | 4 ++-- arch/arm/mach-pxa/palmtx.c | 2 +- arch/arm/mach-pxa/palmz72.c | 2 +- arch/arm/mach-pxa/pcm027.c | 2 +- arch/arm/mach-pxa/poodle.c | 2 +- arch/arm/mach-pxa/pxa25x.c | 16 ++++++++++++++++ arch/arm/mach-pxa/pxa27x.c | 21 +++++++++++++++++++++ arch/arm/mach-pxa/pxa3xx.c | 16 ++++++++++++++++ arch/arm/mach-pxa/raumfeld.c | 6 +++--- arch/arm/mach-pxa/saar.c | 2 +- arch/arm/mach-pxa/spitz.c | 7 ++++--- arch/arm/mach-pxa/stargate2.c | 4 ++-- arch/arm/mach-pxa/tavorevb.c | 2 +- arch/arm/mach-pxa/tavorevb3.c | 2 +- arch/arm/mach-pxa/tosa.c | 2 +- arch/arm/mach-pxa/trizeps4.c | 2 +- arch/arm/mach-pxa/viper.c | 2 +- arch/arm/mach-pxa/vpac270.c | 2 +- arch/arm/mach-pxa/xcep.c | 2 +- arch/arm/mach-pxa/z2.c | 2 +- arch/arm/mach-pxa/zeus.c | 2 +- arch/arm/mach-pxa/zylonite.c | 2 +- 53 files changed, 140 insertions(+), 86 deletions(-)
arch/arm/mach-pxa/balloon3.c +1 -1
@@ -802,7 +802,7 @@ static struct map_desc balloon3_io_desc[] __initdata = {static void __init balloon3_map_io (void ) { -pxa_map_io (); +pxa27x_map_io ();iotable_init (balloon3_io_desc,ARRAY_SIZE (balloon3_io_desc)); }
arch/arm/mach-pxa/capc7117.c +1 -1
@@ -149,7 +149,7 @@ static void __init capc7117_init(void)MACHINE_START (CAPC7117 ,"Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa3xx_map_io, .init_irq = pxa3xx_init_irq, .timer = &pxa_timer, .init_machine = capc7117_init
arch/arm/mach-pxa/cm-x2xx.c +11 -2
@@ -500,7 +500,12 @@ static struct map_desc cmx2xx_io_desc[] __initdata = {static void __init cmx2xx_map_io (void ) { -pxa_map_io (); +if (cpu_is_pxa25x ()) +pxa25x_map_io (); + +if (cpu_is_pxa27x ()) +pxa27x_map_io (); +iotable_init (cmx2xx_io_desc,ARRAY_SIZE (cmx2xx_io_desc)); it8152_base_address =CMX2XX_IT8152_VIRT ;
@@ -508,7 +513,11 @@ static void __init cmx2xx_map_io(void)#else static void __init cmx2xx_map_io (void ) { -pxa_map_io (); +if (cpu_is_pxa25x ()) +pxa25x_map_io (); + +if (cpu_is_pxa27x ()) +pxa27x_map_io (); }#endif
arch/arm/mach-pxa/cm-x300.c +0 -0
@@ -857,7 +857,7 @@ static void __init cm_x300_fixup(struct
machine_desc *mdesc, struct tag *tags,
MACHINE_START(CM_X300, "CM-X300 module")
.boot_params = 0xa0000100,
- .map_io = pxa_map_io,
+ .map_io = pxa3xx_map_io,
.init_irq = pxa3xx_init_irq,
.timer = &pxa_timer,
.init_machine = cm_x300_init,
(quoted diff) +0 -0
b/arch/arm/mach-pxa/colibri-pxa270.c
index bc04510..73205bc 100644
arch/arm/mach-pxa/colibri-pxa270.c +2 -2
@@ -209,7 +209,7 @@ static void __init colibri_pxa270_income_init(void)MACHINE_START (COLIBRI ,"Toradex Colibri PXA270" ) .boot_params = COLIBRI_SDRAM_BASE + 0x100, .init_machine = colibri_pxa270_init, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,MACHINE_END
@@ -217,7 +217,7 @@ MACHINE_ENDMACHINE_START (INCOME ,"Income s.r.o. SH-Dmaster PXA270 SBC" ) .boot_params = 0xa0000100, .init_machine = colibri_pxa270_income_init, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,MACHINE_END
(quoted diff) +0 -0
b/arch/arm/mach-pxa/colibri-pxa300.c
index a70b256..d039bd1 100644
arch/arm/mach-pxa/colibri-pxa300.c +1 -1
@@ -188,7 +188,7 @@ void __init colibri_pxa300_init(void)MACHINE_START (COLIBRI300 ,"Toradex Colibri PXA300" ) .boot_params = COLIBRI_SDRAM_BASE + 0x100, .init_machine = colibri_pxa300_init, - .map_io = pxa_map_io, + .map_io = pxa3xx_map_io, .init_irq = pxa3xx_init_irq, .timer = &pxa_timer,MACHINE_END
(quoted diff) +0 -0
b/arch/arm/mach-pxa/colibri-pxa320.c
index ca5f29e..ccb2c59 100644
arch/arm/mach-pxa/colibri-pxa320.c +1 -1
@@ -257,7 +257,7 @@ void __init colibri_pxa320_init(void)MACHINE_START (COLIBRI320 ,"Toradex Colibri PXA320" ) .boot_params = COLIBRI_SDRAM_BASE + 0x100, .init_machine = colibri_pxa320_init, - .map_io = pxa_map_io, + .map_io = pxa3xx_map_io, .init_irq = pxa3xx_init_irq, .timer = &pxa_timer,MACHINE_END
arch/arm/mach-pxa/corgi.c +3 -3
@@ -721,7 +721,7 @@ static void __init fixup_corgi(struct machine_desc *desc,#ifdef CONFIG_MACH_CORGI MACHINE_START (CORGI ,"SHARP Corgi" ) .fixup = fixup_corgi, - .map_io = pxa_map_io, + .map_io = pxa25x_map_io, .init_irq = pxa25x_init_irq, .init_machine = corgi_init, .timer = &pxa_timer,
@@ -731,7 +731,7 @@ MACHINE_END#ifdef CONFIG_MACH_SHEPHERD MACHINE_START (SHEPHERD ,"SHARP Shepherd" ) .fixup = fixup_corgi, - .map_io = pxa_map_io, + .map_io = pxa25x_map_io, .init_irq = pxa25x_init_irq, .init_machine = corgi_init, .timer = &pxa_timer,
@@ -741,7 +741,7 @@ MACHINE_END#ifdef CONFIG_MACH_HUSKY MACHINE_START (HUSKY ,"SHARP Husky" ) .fixup = fixup_corgi, - .map_io = pxa_map_io, + .map_io = pxa25x_map_io, .init_irq = pxa25x_init_irq, .init_machine = corgi_init, .timer = &pxa_timer,
arch/arm/mach-pxa/csb726.c +1 -1
@@ -273,7 +273,7 @@ static void __init csb726_init(void)MACHINE_START (CSB726 ,"Cogent CSB726" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .init_irq = pxa27x_init_irq, .init_machine = csb726_init, .timer = &pxa_timer,
arch/arm/mach-pxa/em-x270.c +2 -2
@@ -1301,7 +1301,7 @@ static void __init em_x270_init(void)MACHINE_START (EM_X270 ,"Compulab EM-X270" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .init_irq = pxa27x_init_irq, .timer = &pxa_timer, .init_machine = em_x270_init,
@@ -1309,7 +1309,7 @@ MACHINE_ENDMACHINE_START (EXEDA ,"Compulab eXeda" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .init_irq = pxa27x_init_irq, .timer = &pxa_timer, .init_machine = em_x270_init,
arch/arm/mach-pxa/eseries.c +6 -6
@@ -181,7 +181,7 @@ static void __init e330_init(void)MACHINE_START (E330 ,"Toshiba e330" )/* Maintainer: Ian Molton (spyro at f2s.com) */ .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa25x_map_io, .nr_irqs = ESERIES_NR_IRQS, .init_irq = pxa25x_init_irq, .fixup = eseries_fixup,
@@ -230,7 +230,7 @@ static void __init e350_init(void)MACHINE_START (E350 ,"Toshiba e350" )/* Maintainer: Ian Molton (spyro at f2s.com) */ .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa25x_map_io, .nr_irqs = ESERIES_NR_IRQS, .init_irq = pxa25x_init_irq, .fixup = eseries_fixup,
@@ -352,7 +352,7 @@ static void __init e400_init(void)MACHINE_START (E400 ,"Toshiba e400" )/* Maintainer: Ian Molton (spyro at f2s.com) */ .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa25x_map_io, .nr_irqs = ESERIES_NR_IRQS, .init_irq = pxa25x_init_irq, .fixup = eseries_fixup,
@@ -540,7 +540,7 @@ static void __init e740_init(void)MACHINE_START (E740 ,"Toshiba e740" )/* Maintainer: Ian Molton (spyro at f2s.com) */ .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa25x_map_io, .nr_irqs = ESERIES_NR_IRQS, .init_irq = pxa25x_init_irq, .fixup = eseries_fixup,
@@ -731,7 +731,7 @@ static void __init e750_init(void)MACHINE_START (E750 ,"Toshiba e750" )/* Maintainer: Ian Molton (spyro at f2s.com) */ .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa25x_map_io, .nr_irqs = ESERIES_NR_IRQS, .init_irq = pxa25x_init_irq, .fixup = eseries_fixup,
@@ -926,7 +926,7 @@ static void __init e800_init(void)MACHINE_START (E800 ,"Toshiba e800" )/* Maintainer: Ian Molton (spyro at f2s.com) */ .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa25x_map_io, .nr_irqs = ESERIES_NR_IRQS, .init_irq = pxa25x_init_irq, .fixup = eseries_fixup,
arch/arm/mach-pxa/ezx.c +6 -6
@@ -799,7 +799,7 @@ static void __init a780_init(void)MACHINE_START (EZX_A780 ,"Motorola EZX A780" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .nr_irqs = EZX_NR_IRQS, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,
@@ -864,7 +864,7 @@ static void __init e680_init(void)MACHINE_START (EZX_E680 ,"Motorola EZX E680" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .nr_irqs = EZX_NR_IRQS, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,
@@ -929,7 +929,7 @@ static void __init a1200_init(void)MACHINE_START (EZX_A1200 ,"Motorola EZX A1200" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .nr_irqs = EZX_NR_IRQS, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,
@@ -1120,7 +1120,7 @@ static void __init a910_init(void)MACHINE_START (EZX_A910 ,"Motorola EZX A910" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .nr_irqs = EZX_NR_IRQS, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,
@@ -1185,7 +1185,7 @@ static void __init e6_init(void)MACHINE_START (EZX_E6 ,"Motorola EZX E6" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .nr_irqs = EZX_NR_IRQS, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,
@@ -1224,7 +1224,7 @@ static void __init e2_init(void)MACHINE_START (EZX_E2 ,"Motorola EZX E2" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .nr_irqs = EZX_NR_IRQS, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,
arch/arm/mach-pxa/generic.c +4 -17
@@ -86,27 +86,15 @@ EXPORT_SYMBOL(get_memclk_frequency_10khz);/* * Intel PXA2xx internal register mapping. * -* Note 1: not all PXA2xx variants implement all those addresses. -* -* Note 2: virtual 0xfffe0000-0xffffffff is reserved for the vector table -* and cache flush area. +* Note: virtual 0xfffe0000-0xffffffff is reserved for the vector table +* and cache flush area. */ -static struct map_desc standard_io_desc[]__initdata = { +static struct map_desc common_io_desc[]__initdata = { {/* Devs */ .virtual =0xf2000000 , .pfn =__phys_to_pfn (0x40000000 ), .length =0x02000000 , .type =MT_DEVICE - }, {/* Mem Ctl */ - .virtual =0xf6000000 , - .pfn =__phys_to_pfn (0x48000000 ), - .length =0x00200000 , - .type =MT_DEVICE - }, {/* IMem ctl */ - .virtual =0xfe000000 , - .pfn =__phys_to_pfn (0x58000000 ), - .length =0x00100000 , - .type =MT_DEVICE }, {/* UNCACHED_PHYS_0 */ .virtual =0xff000000 , .pfn =__phys_to_pfn (0x00000000 ),
@@ -117,6 +105,5 @@ static struct map_desc standard_io_desc[] __initdata = {void __init pxa_map_io (void ) { -iotable_init (standard_io_desc,ARRAY_SIZE (standard_io_desc)); -get_clk_frequency_khz (1 ); +iotable_init (ARRAY_AND_SIZE (common_io_desc)); }
arch/arm/mach-pxa/generic.h +4 -0
@@ -20,7 +20,11 @@ extern void __init pxa26x_init_irq(void);#endif extern void __init pxa27x_init_irq (void );extern void __init pxa3xx_init_irq (void ); +extern void __init pxa_map_io (void ); +extern void __init pxa25x_map_io (void ); +extern void __init pxa27x_map_io (void ); +extern void __init pxa3xx_map_io (void );extern unsigned int get_clk_frequency_khz (int info);
arch/arm/mach-pxa/gumstix.c +1 -1
@@ -225,7 +225,7 @@ static void __init gumstix_init(void)MACHINE_START (GUMSTIX ,"Gumstix" ) .boot_params = 0xa0000100, /* match u-boot bi_boot_params */ - .map_io = pxa_map_io, + .map_io = pxa25x_map_io, .init_irq = pxa25x_init_irq, .timer = &pxa_timer, .init_machine = gumstix_init,
arch/arm/mach-pxa/h5000.c +1 -1
@@ -202,7 +202,7 @@ static void __init h5000_init(void)MACHINE_START (H5400 ,"HP iPAQ H5000" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa25x_map_io, .init_irq = pxa25x_init_irq, .timer = &pxa_timer, .init_machine = h5000_init,
arch/arm/mach-pxa/himalaya.c +1 -1
@@ -160,7 +160,7 @@ static void __init himalaya_init(void)MACHINE_START (HIMALAYA ,"HTC Himalaya" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa25x_map_io, .init_irq = pxa25x_init_irq, .init_machine = himalaya_init, .timer = &pxa_timer,
arch/arm/mach-pxa/hx4700.c +1 -1
@@ -871,7 +871,7 @@ static void __init hx4700_init(void)MACHINE_START (H4700 ,"HP iPAQ HX4700" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .nr_irqs = HX4700_NR_IRQS, .init_irq = pxa27x_init_irq, .init_machine = hx4700_init,
arch/arm/mach-pxa/icontrol.c +1 -1
@@ -192,7 +192,7 @@ static void __init icontrol_init(void)MACHINE_START (ICONTROL ,"iControl/SafeTcam boards using Embedian MXM-8x10 CoM" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa3xx_map_io, .init_irq = pxa3xx_init_irq, .timer = &pxa_timer, .init_machine = icontrol_init
arch/arm/mach-pxa/idp.c +1 -1
@@ -187,7 +187,7 @@ static struct map_desc idp_io_desc[] __initdata = {static void __init idp_map_io (void ) { -pxa_map_io (); +pxa25x_map_io ();iotable_init (idp_io_desc,ARRAY_SIZE (idp_io_desc)); }
arch/arm/mach-pxa/littleton.c +0 -0
@@ -438,7 +438,7 @@ static void __init littleton_init(void) MACHINE_START(LITTLETON, "Marvell Form Factor Development Platform
(aka Littleton)")
.boot_params = 0xa0000100,
- .map_io = pxa_map_io,
+ .map_io = pxa3xx_map_io,
.nr_irqs = LITTLETON_NR_IRQS,
.init_irq = pxa3xx_init_irq,
.timer = &pxa_timer,
arch/arm/mach-pxa/lpd270.c +1 -1
@@ -495,7 +495,7 @@ static struct map_desc lpd270_io_desc[] __initdata = {static void __init lpd270_map_io (void ) { -pxa_map_io (); +pxa27x_map_io ();iotable_init (lpd270_io_desc,ARRAY_SIZE (lpd270_io_desc));/* for use I SRAM as framebuffer. */
arch/arm/mach-pxa/lubbock.c +1 -1
@@ -549,7 +549,7 @@ static struct map_desc lubbock_io_desc[] __initdata = {static void __init lubbock_map_io (void ) { -pxa_map_io (); +pxa25x_map_io ();iotable_init (lubbock_io_desc,ARRAY_SIZE (lubbock_io_desc));PCFR |=PCFR_OPDE ;
arch/arm/mach-pxa/magician.c +1 -1
@@ -765,7 +765,7 @@ static void __init magician_init(void)MACHINE_START (MAGICIAN ,"HTC Magician" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .nr_irqs = MAGICIAN_NR_IRQS, .init_irq = pxa27x_init_irq, .init_machine = magician_init,
arch/arm/mach-pxa/mainstone.c +1 -1
@@ -614,7 +614,7 @@ static struct map_desc mainstone_io_desc[] __initdata = {static void __init mainstone_map_io (void ) { -pxa_map_io (); +pxa27x_map_io ();iotable_init (mainstone_io_desc,ARRAY_SIZE (mainstone_io_desc));/* for use I SRAM as framebuffer. */
arch/arm/mach-pxa/mioa701.c +1 -1
@@ -820,7 +820,7 @@ static void mioa701_machine_exit(void)MACHINE_START (MIOA701 ,"MIO A701" ) .boot_params = 0xa0000100, - .map_io = &pxa_map_io, + .map_io = &pxa27x_map_io, .init_irq = &pxa27x_init_irq, .init_machine = mioa701_machine_init, .timer = &pxa_timer,
arch/arm/mach-pxa/mp900.c +1 -1
@@ -94,7 +94,7 @@ static void __init mp900c_init(void)MACHINE_START (NEC_MP900 ,"MobilePro900/C" ) .boot_params = 0xa0220100, .timer = &pxa_timer, - .map_io = pxa_map_io, + .map_io = pxa25x_map_io, .init_irq = pxa25x_init_irq, .init_machine = mp900c_init,MACHINE_END
arch/arm/mach-pxa/palmld.c +1 -1
@@ -313,7 +313,7 @@ static struct map_desc palmld_io_desc[] __initdata = {static void __init palmld_map_io (void ) { -pxa_map_io (); +pxa27x_map_io ();iotable_init (palmld_io_desc,ARRAY_SIZE (palmld_io_desc)); }
arch/arm/mach-pxa/palmt5.c +1 -1
@@ -203,7 +203,7 @@ static void __init palmt5_init(void)MACHINE_START (PALMT5 ,"Palm Tungsten|T5" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .reserve = palmt5_reserve, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,
arch/arm/mach-pxa/palmtc.c +1 -1
@@ -413,7 +413,7 @@ static void __init palmtc_init(void)MACHINE_START (PALMTC ,"Palm Tungsten|C" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa25x_map_io, .init_irq = pxa25x_init_irq, .timer = &pxa_timer, .init_machine = palmtc_init
arch/arm/mach-pxa/palmte2.c +1 -1
@@ -374,7 +374,7 @@ static void __init palmte2_init(void)MACHINE_START (PALMTE2 ,"Palm Tungsten|E2" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa25x_map_io, .init_irq = pxa25x_init_irq, .timer = &pxa_timer, .init_machine = palmte2_init
arch/arm/mach-pxa/palmtreo.c +2 -2
@@ -442,7 +442,7 @@ static void __init centro_init(void)MACHINE_START (TREO680 ,"Palm Treo 680" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .reserve = treo_reserve, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,
@@ -451,7 +451,7 @@ MACHINE_ENDMACHINE_START (CENTRO ,"Palm Centro 685" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .reserve = treo_reserve, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,
arch/arm/mach-pxa/palmtx.c +1 -1
@@ -333,7 +333,7 @@ static struct map_desc palmtx_io_desc[] __initdata = {static void __init palmtx_map_io (void ) { -pxa_map_io (); +pxa27x_map_io ();iotable_init (palmtx_io_desc,ARRAY_SIZE (palmtx_io_desc)); }
arch/arm/mach-pxa/palmz72.c +1 -1
@@ -280,7 +280,7 @@ static void __init palmz72_init(void)MACHINE_START (PALMZ72 ,"Palm Zire72" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .init_irq = pxa27x_init_irq, .timer = &pxa_timer, .init_machine = palmz72_init
arch/arm/mach-pxa/pcm027.c +1 -1
@@ -244,7 +244,7 @@ static void __init pcm027_init(void)static void __init pcm027_map_io (void ) { -pxa_map_io (); +pxa27x_map_io ();/* initialize sleep mode regs (wake-up sources, etc) */ PGSR0 =0x01308000 ;
arch/arm/mach-pxa/poodle.c +1 -1
@@ -466,7 +466,7 @@ static void __init fixup_poodle(struct machine_desc *desc,MACHINE_START (POODLE ,"SHARP Poodle" ) .fixup = fixup_poodle, - .map_io = pxa_map_io, + .map_io = pxa25x_map_io, .nr_irqs = POODLE_NR_IRQS, /* 4 for LoCoMo */ .init_irq = pxa25x_init_irq, .timer = &pxa_timer,
arch/arm/mach-pxa/pxa25x.c +16 -0
@@ -320,6 +320,22 @@ void __init pxa26x_init_irq(void) }#endif +static struct map_desc pxa25x_io_desc[]__initdata = { + {/* Mem Ctl */ + .virtual =0xf6000000 , + .pfn =__phys_to_pfn (0x48000000 ), + .length =0x00200000 , + .type =MT_DEVICE + }, +}; + +void __init pxa25x_map_io (void ) +{ +pxa_map_io (); +iotable_init (ARRAY_AND_SIZE (pxa25x_io_desc)); +pxa25x_get_clk_frequency_khz (1 ); +} +static struct platform_device *pxa25x_devices[]__initdata = { &pxa25x_device_udc, &pxa_device_pmu,
arch/arm/mach-pxa/pxa27x.c +21 -0
@@ -370,6 +370,27 @@ void __init pxa27x_init_irq(void)pxa_init_gpio (IRQ_GPIO_2_x,2 ,120 , pxa27x_set_wake); } +static struct map_desc pxa27x_io_desc[]__initdata = { + {/* Mem Ctl */ + .virtual =0xf6000000 , + .pfn =__phys_to_pfn (0x48000000 ), + .length =0x00200000 , + .type =MT_DEVICE + }, {/* IMem ctl */ + .virtual =0xfe000000 , + .pfn =__phys_to_pfn (0x58000000 ), + .length =0x00100000 , + .type =MT_DEVICE + }, +}; + +void __init pxa27x_map_io (void ) +{ +pxa_map_io (); +iotable_init (ARRAY_AND_SIZE (pxa27x_io_table)); +pxa27x_get_clk_frequency_khz (1 ); +} +/* * device registration specific to PXA27x. */
arch/arm/mach-pxa/pxa3xx.c +16 -0
@@ -580,6 +580,22 @@ void __init pxa3xx_init_irq(void)pxa_init_gpio (IRQ_GPIO_2_x,2 ,127 ,NULL ); } +static struct map_desc pxa3xx_io_desc[]__initdata = { + {/* Mem Ctl */ + .virtual =0xf6000000 , + .pfn =__phys_to_pfn (0x4a000000 ), + .length =0x00200000 , + .type =MT_DEVICE + } +}; + +void __init pxa3xx_map_io (void ) +{ +pxa_map_io (); +iotable_init (ARRAY_AND_SIZE (common_io_desc)); +pxa3xx_get_clk_frequency_khz (1 ); +} +/* * device registration specific to PXA3xx. */
arch/arm/mach-pxa/raumfeld.c +3 -3
@@ -1085,7 +1085,7 @@ static void __init raumfeld_speaker_init(void)MACHINE_START (RAUMFELD_RC ,"Raumfeld Controller" ) .boot_params = RAUMFELD_SDRAM_BASE + 0x100, .init_machine = raumfeld_controller_init, - .map_io = pxa_map_io, + .map_io = pxa3xx_map_io, .init_irq = pxa3xx_init_irq, .timer = &pxa_timer,MACHINE_END
@@ -1095,7 +1095,7 @@ MACHINE_ENDMACHINE_START (RAUMFELD_CONNECTOR ,"Raumfeld Connector" ) .boot_params = RAUMFELD_SDRAM_BASE + 0x100, .init_machine = raumfeld_connector_init, - .map_io = pxa_map_io, + .map_io = pxa3xx_map_io, .init_irq = pxa3xx_init_irq, .timer = &pxa_timer,MACHINE_END
@@ -1105,7 +1105,7 @@ MACHINE_ENDMACHINE_START (RAUMFELD_SPEAKER ,"Raumfeld Speaker" ) .boot_params = RAUMFELD_SDRAM_BASE + 0x100, .init_machine = raumfeld_speaker_init, - .map_io = pxa_map_io, + .map_io = pxa3xx_map_io, .init_irq = pxa3xx_init_irq, .timer = &pxa_timer,MACHINE_END
arch/arm/mach-pxa/saar.c +1 -1
@@ -597,7 +597,7 @@ static void __init saar_init(void)MACHINE_START (SAAR ,"PXA930 Handheld Platform (aka SAAR)" )/* Maintainer: Eric Miao <[email protected]> */ .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa3xx_map_io, .init_irq = pxa3xx_init_irq, .timer = &pxa_timer, .init_machine = saar_init,
arch/arm/mach-pxa/spitz.c +4 -3
@@ -27,6 +27,7 @@#include <linux/mtd/sharpsl.h> #include <linux/input/matrix_keypad.h> #include <linux/regulator/machine.h> +#include <linux/io.h> #include <asm/setup.h> #include <asm/mach-types.h>
@@ -980,7 +981,7 @@ static void __init spitz_fixup(struct machine_desc *desc,#ifdef CONFIG_MACH_SPITZ MACHINE_START (SPITZ ,"SHARP Spitz" ) .fixup = spitz_fixup, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .init_irq = pxa27x_init_irq, .init_machine = spitz_init, .timer = &pxa_timer,
@@ -990,7 +991,7 @@ MACHINE_END#ifdef CONFIG_MACH_BORZOI MACHINE_START (BORZOI ,"SHARP Borzoi" ) .fixup = spitz_fixup, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .init_irq = pxa27x_init_irq, .init_machine = spitz_init, .timer = &pxa_timer,
@@ -1000,7 +1001,7 @@ MACHINE_END#ifdef CONFIG_MACH_AKITA MACHINE_START (AKITA ,"SHARP Akita" ) .fixup = spitz_fixup, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .init_irq = pxa27x_init_irq, .init_machine = spitz_init, .timer = &pxa_timer,
arch/arm/mach-pxa/stargate2.c +2 -2
@@ -998,7 +998,7 @@ static void __init stargate2_init(void)#ifdef CONFIG_MACH_INTELMOTE2 MACHINE_START (INTELMOTE2 ,"IMOTE 2" ) - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .init_irq = pxa27x_init_irq, .timer = &pxa_timer, .init_machine = imote2_init,
@@ -1008,7 +1008,7 @@ MACHINE_END#ifdef CONFIG_MACH_STARGATE2 MACHINE_START (STARGATE2 ,"Stargate 2" ) - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .nr_irqs = STARGATE_NR_IRQS, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,
arch/arm/mach-pxa/tavorevb.c +1 -1
@@ -490,7 +490,7 @@ static void __init tavorevb_init(void)MACHINE_START (TAVOREVB ,"PXA930 Evaluation Board (aka TavorEVB)" )/* Maintainer: Eric Miao <[email protected]> */ .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa3xx_map_io, .init_irq = pxa3xx_init_irq, .timer = &pxa_timer, .init_machine = tavorevb_init,
arch/arm/mach-pxa/tavorevb3.c +1 -1
@@ -128,7 +128,7 @@ static void __init evb3_init(void)MACHINE_START (TAVOREVB3 ,"PXA950 Evaluation Board (aka TavorEVB3)" ) .phys_io = 0x40000000, .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa3xx_map_io, .nr_irqs = TAVOREVB3_NR_IRQS, .init_irq = pxa3xx_init_irq, .timer = &pxa_timer,
arch/arm/mach-pxa/tosa.c +1 -1
@@ -953,7 +953,7 @@ static void __init fixup_tosa(struct machine_desc *desc,MACHINE_START (TOSA ,"SHARP Tosa" ) .fixup = fixup_tosa, - .map_io = pxa_map_io, + .map_io = pxa25x_map_io, .nr_irqs = TOSA_NR_IRQS, .init_irq = pxa25x_init_irq, .init_machine = tosa_init,
arch/arm/mach-pxa/trizeps4.c +1 -1
@@ -539,7 +539,7 @@ static void __init trizeps4_init(void)static void __init trizeps4_map_io (void ) { -pxa_map_io (); +pxa27x_map_io ();iotable_init (trizeps4_io_desc,ARRAY_SIZE (trizeps4_io_desc));if ((MSC0 &0x8 ) && (BOOT_DEF &0x1 )) {
arch/arm/mach-pxa/viper.c +1 -1
@@ -983,7 +983,7 @@ static struct map_desc viper_io_desc[] __initdata = {static void __init viper_map_io (void ) { -pxa_map_io (); +pxa25x_map_io ();iotable_init (viper_io_desc,ARRAY_SIZE (viper_io_desc));
arch/arm/mach-pxa/vpac270.c +1 -1
@@ -719,7 +719,7 @@ static void __init vpac270_init(void)MACHINE_START (VPAC270 ,"Voipac PXA270" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .init_irq = pxa27x_init_irq, .timer = &pxa_timer, .init_machine = vpac270_init
arch/arm/mach-pxa/xcep.c +1 -1
@@ -183,7 +183,7 @@ static void __init xcep_init(void)MACHINE_START (XCEP ,"Iskratel XCEP" ) .boot_params = 0xa0000100, .init_machine = xcep_init, - .map_io = pxa_map_io, + .map_io = pxa25x_map_io, .init_irq = pxa25x_init_irq, .timer = &pxa_timer,MACHINE_END
arch/arm/mach-pxa/z2.c +1 -1
@@ -704,7 +704,7 @@ static void __init z2_init(void)MACHINE_START (ZIPIT2 ,"Zipit Z2" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa27x_map_io, .init_irq = pxa27x_init_irq, .timer = &pxa_timer, .init_machine = z2_init,
arch/arm/mach-pxa/zeus.c +1 -1
@@ -883,7 +883,7 @@ static struct map_desc zeus_io_desc[] __initdata = {static void __init zeus_map_io (void ) { -pxa_map_io (); +pxa27x_map_io ();iotable_init (zeus_io_desc,ARRAY_SIZE (zeus_io_desc));
arch/arm/mach-pxa/zylonite.c +1 -1
@@ -412,7 +412,7 @@ static void __init zylonite_init(void)MACHINE_START (ZYLONITE ,"PXA3xx Platform Development Kit (aka Zylonite)" ) .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa3xx_map_io, .nr_irqs = ZYLONITE_NR_IRQS, .init_irq = pxa3xx_init_irq, .timer = &pxa_timer,
Signature · 1 line
1.7.0.4