ARM: pxa: Introduce pxa[23]xx_map_io
Subsystems (7)
PATCH 1/13 ARM: pxa: Introduce pxa[23]xx_map_io
This patch introduces pxa2xx_map_io() and pxa3xx_map_io() to distinguish between PXA2xx and PXA3xx memory mapping.
Also, fixup for platforms broken after introducing pxa2xx_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 | 4 +- 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 | 37 ++++++++++++++++++++++++++++------- arch/arm/mach-pxa/generic.h | 3 +- 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/raumfeld.c | 6 ++-- arch/arm/mach-pxa/saar.c | 2 +- arch/arm/mach-pxa/spitz.c | 12 ++++++---- 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 +- 50 files changed, 104 insertions(+), 80 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 (); +pxa2xx_map_io ();iotable_init (balloon3_io_desc,ARRAY_SIZE (balloon3_io_desc)); }
arch/arm/mach-pxa/capc7117.c +1 -1
@@ -151,7 +151,7 @@ MACHINE_START(CAPC7117, .phys_io = 0x40000000, .boot_params = 0xa0000100, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, - .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 +2 -2
@@ -500,7 +500,7 @@ static struct map_desc cmx2xx_io_desc[] __initdata = {static void __init cmx2xx_map_io (void ) { -pxa_map_io (); +pxa2xx_map_io ();iotable_init (cmx2xx_io_desc,ARRAY_SIZE (cmx2xx_io_desc)); it8152_base_address =CMX2XX_IT8152_VIRT ;
@@ -508,7 +508,7 @@ static void __init cmx2xx_map_io(void)#else static void __init cmx2xx_map_io (void ) { -pxa_map_io (); +pxa2xx_map_io (); }#endif
arch/arm/mach-pxa/cm-x300.c +1 -1
@@ -859,7 +859,7 @@ MACHINE_START(CM_X300, "CM-X300 module") .phys_io = 0x40000000, .boot_params = 0xa0000100, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, - .map_io = pxa_map_io, + .map_io = pxa3xx_map_io, .init_irq = pxa3xx_init_irq, .timer = &pxa_timer, .init_machine = cm_x300_init,
arch/arm/mach-pxa/colibri-pxa270.c +2 -2
@@ -211,7 +211,7 @@ MACHINE_START(COLIBRI, "Toradex Colibri PXA270") .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = COLIBRI_SDRAM_BASE + 0x100, .init_machine = colibri_pxa270_init, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,MACHINE_END
@@ -221,7 +221,7 @@ MACHINE_START(INCOME, "Income s.r.o. SH-Dmaster PXA270 SBC") .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, .init_machine = colibri_pxa270_income_init, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,MACHINE_END
arch/arm/mach-pxa/colibri-pxa300.c +1 -1
@@ -190,7 +190,7 @@ MACHINE_START(COLIBRI300, "Toradex Colibri PXA300") .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .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
arch/arm/mach-pxa/colibri-pxa320.c +1 -1
@@ -259,7 +259,7 @@ MACHINE_START(COLIBRI320, "Toradex Colibri PXA320") .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .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
@@ -723,7 +723,7 @@ MACHINE_START(CORGI, "SHARP Corgi") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .fixup = fixup_corgi, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .init_irq = pxa25x_init_irq, .init_machine = corgi_init, .timer = &pxa_timer,
@@ -735,7 +735,7 @@ MACHINE_START(SHEPHERD, "SHARP Shepherd") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .fixup = fixup_corgi, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .init_irq = pxa25x_init_irq, .init_machine = corgi_init, .timer = &pxa_timer,
@@ -747,7 +747,7 @@ MACHINE_START(HUSKY, "SHARP Husky") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .fixup = fixup_corgi, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .init_irq = pxa25x_init_irq, .init_machine = corgi_init, .timer = &pxa_timer,
arch/arm/mach-pxa/csb726.c +1 -1
@@ -275,7 +275,7 @@ MACHINE_START(CSB726, "Cogent CSB726") .phys_io = 0x40000000, .boot_params = 0xa0000100, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .init_irq = pxa27x_init_irq, .init_machine = csb726_init, .timer = &pxa_timer,
arch/arm/mach-pxa/em-x270.c +2 -2
@@ -1303,7 +1303,7 @@ MACHINE_START(EM_X270, "Compulab EM-X270") .boot_params = 0xa0000100, .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .init_irq = pxa27x_init_irq, .timer = &pxa_timer, .init_machine = em_x270_init,
@@ -1313,7 +1313,7 @@ MACHINE_START(EXEDA, "Compulab eXeda") .boot_params = 0xa0000100, .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .init_irq = pxa27x_init_irq, .timer = &pxa_timer, .init_machine = em_x270_init,
arch/arm/mach-pxa/eseries.c +6 -6
@@ -183,7 +183,7 @@ MACHINE_START(E330, "Toshiba e330") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .nr_irqs = ESERIES_NR_IRQS, .init_irq = pxa25x_init_irq, .fixup = eseries_fixup,
@@ -234,7 +234,7 @@ MACHINE_START(E350, "Toshiba e350") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .nr_irqs = ESERIES_NR_IRQS, .init_irq = pxa25x_init_irq, .fixup = eseries_fixup,
@@ -358,7 +358,7 @@ MACHINE_START(E400, "Toshiba e400") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .nr_irqs = ESERIES_NR_IRQS, .init_irq = pxa25x_init_irq, .fixup = eseries_fixup,
@@ -548,7 +548,7 @@ MACHINE_START(E740, "Toshiba e740") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .nr_irqs = ESERIES_NR_IRQS, .init_irq = pxa25x_init_irq, .fixup = eseries_fixup,
@@ -741,7 +741,7 @@ MACHINE_START(E750, "Toshiba e750") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .nr_irqs = ESERIES_NR_IRQS, .init_irq = pxa25x_init_irq, .fixup = eseries_fixup,
@@ -938,7 +938,7 @@ MACHINE_START(E800, "Toshiba e800") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .nr_irqs = ESERIES_NR_IRQS, .init_irq = pxa25x_init_irq, .fixup = eseries_fixup,
arch/arm/mach-pxa/ezx.c +6 -6
@@ -801,7 +801,7 @@ MACHINE_START(EZX_A780, "Motorola EZX A780") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .nr_irqs = EZX_NR_IRQS, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,
@@ -868,7 +868,7 @@ MACHINE_START(EZX_E680, "Motorola EZX E680") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .nr_irqs = EZX_NR_IRQS, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,
@@ -935,7 +935,7 @@ MACHINE_START(EZX_A1200, "Motorola EZX A1200") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .nr_irqs = EZX_NR_IRQS, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,
@@ -1128,7 +1128,7 @@ MACHINE_START(EZX_A910, "Motorola EZX A910") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .nr_irqs = EZX_NR_IRQS, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,
@@ -1195,7 +1195,7 @@ MACHINE_START(EZX_E6, "Motorola EZX E6") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .nr_irqs = EZX_NR_IRQS, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,
@@ -1236,7 +1236,7 @@ MACHINE_START(EZX_E2, "Motorola EZX E2") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .nr_irqs = EZX_NR_IRQS, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,
arch/arm/mach-pxa/generic.c +29 -8
@@ -91,17 +91,12 @@ EXPORT_SYMBOL(get_memclk_frequency_10khz);* Note 2: 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 }, {/* Camera */ .virtual =0xfa000000 , .pfn =__phys_to_pfn (0x50000000 ),
@@ -120,8 +115,34 @@ static struct map_desc standard_io_desc[] __initdata = { } }; -void __init pxa_map_io (void ) +static struct map_desc pxa2xx_io_desc[]__initdata = { + {/* Mem Ctl */ + .virtual =0xf6000000 , + .pfn =__phys_to_pfn (0x48000000 ), + .length =0x00200000 , + .type =MT_DEVICE + } +}; + +static struct map_desc pxa3xx_io_desc[]__initdata = { + {/* Mem Ctl */ + .virtual =0xf6000000 , + .pfn =__phys_to_pfn (0x4a000000 ), + .length =0x00200000 , + .type =MT_DEVICE + } +}; + +void __init pxa2xx_map_io (void ) +{ +iotable_init (common_io_desc,ARRAY_SIZE (common_io_desc)); +iotable_init (pxa2xx_io_desc,ARRAY_SIZE (pxa2xx_io_desc)); +get_clk_frequency_khz (1 ); +} + +void __init pxa3xx_map_io (void ) { -iotable_init (standard_io_desc,ARRAY_SIZE (standard_io_desc)); +iotable_init (common_io_desc,ARRAY_SIZE (common_io_desc)); +iotable_init (pxa3xx_io_desc,ARRAY_SIZE (pxa3xx_io_desc));get_clk_frequency_khz (1 ); }
arch/arm/mach-pxa/generic.h +2 -1
@@ -20,7 +20,8 @@ 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 pxa2xx_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
@@ -227,7 +227,7 @@ MACHINE_START(GUMSTIX, "Gumstix") .phys_io = 0x40000000, .boot_params = 0xa0000100, /* match u-boot bi_boot_params */ .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .init_irq = pxa25x_init_irq, .timer = &pxa_timer, .init_machine = gumstix_init,
arch/arm/mach-pxa/h5000.c +1 -1
@@ -204,7 +204,7 @@ MACHINE_START(H5400, "HP iPAQ H5000") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .init_irq = pxa25x_init_irq, .timer = &pxa_timer, .init_machine = h5000_init,
arch/arm/mach-pxa/himalaya.c +1 -1
@@ -162,7 +162,7 @@ MACHINE_START(HIMALAYA, "HTC Himalaya") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .init_irq = pxa25x_init_irq, .init_machine = himalaya_init, .timer = &pxa_timer,
arch/arm/mach-pxa/hx4700.c +1 -1
@@ -873,7 +873,7 @@ MACHINE_START(H4700, "HP iPAQ HX4700") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .nr_irqs = HX4700_NR_IRQS, .init_irq = pxa27x_init_irq, .init_machine = hx4700_init,
arch/arm/mach-pxa/icontrol.c +1 -1
@@ -194,7 +194,7 @@ MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM") .phys_io = 0x40000000, .boot_params = 0xa0000100, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, - .map_io = pxa_map_io, + .map_io = pxa2xx_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 (); +pxa2xx_map_io ();iotable_init (idp_io_desc,ARRAY_SIZE (idp_io_desc)); }
arch/arm/mach-pxa/littleton.c +1 -1
@@ -440,7 +440,7 @@ MACHINE_START(LITTLETON, "Marvell Form Factor Development Platform (aka Littleto .phys_io = 0x40000000, .boot_params = 0xa0000100, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, - .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 (); +pxa2xx_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 (); +pxa2xx_map_io ();iotable_init (lubbock_io_desc,ARRAY_SIZE (lubbock_io_desc));PCFR |=PCFR_OPDE ;
arch/arm/mach-pxa/magician.c +1 -1
@@ -767,7 +767,7 @@ MACHINE_START(MAGICIAN, "HTC Magician") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_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 (); +pxa2xx_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
@@ -822,7 +822,7 @@ MACHINE_START(MIOA701, "MIO A701") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, - .map_io = &pxa_map_io, + .map_io = &pxa2xx_map_io, .init_irq = &pxa27x_init_irq, .init_machine = mioa701_machine_init, .timer = &pxa_timer,
arch/arm/mach-pxa/mp900.c +1 -1
@@ -96,7 +96,7 @@ MACHINE_START(NEC_MP900, "MobilePro900/C") .boot_params = 0xa0220100, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .timer = &pxa_timer, - .map_io = pxa_map_io, + .map_io = pxa2xx_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 (); +pxa2xx_map_io ();iotable_init (palmld_io_desc,ARRAY_SIZE (palmld_io_desc)); }
arch/arm/mach-pxa/palmt5.c +1 -1
@@ -205,7 +205,7 @@ MACHINE_START(PALMT5, "Palm Tungsten|T5") .phys_io = PALMT5_PHYS_IO_START, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .reserve = palmt5_reserve, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,
arch/arm/mach-pxa/palmtc.c +1 -1
@@ -415,7 +415,7 @@ MACHINE_START(PALMTC, "Palm Tungsten|C") .phys_io = 0x40000000, .boot_params = 0xa0000100, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .init_irq = pxa25x_init_irq, .timer = &pxa_timer, .init_machine = palmtc_init
arch/arm/mach-pxa/palmte2.c +1 -1
@@ -376,7 +376,7 @@ MACHINE_START(PALMTE2, "Palm Tungsten|E2") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .init_irq = pxa25x_init_irq, .timer = &pxa_timer, .init_machine = palmte2_init
arch/arm/mach-pxa/palmtreo.c +2 -2
@@ -444,7 +444,7 @@ MACHINE_START(TREO680, "Palm Treo 680") .phys_io = TREO_PHYS_IO_START, .io_pg_offst = io_p2v(0x40000000), .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .reserve = treo_reserve, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,
@@ -455,7 +455,7 @@ MACHINE_START(CENTRO, "Palm Centro 685") .phys_io = TREO_PHYS_IO_START, .io_pg_offst = io_p2v(0x40000000), .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_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 (); +pxa2xx_map_io ();iotable_init (palmtx_io_desc,ARRAY_SIZE (palmtx_io_desc)); }
arch/arm/mach-pxa/palmz72.c +1 -1
@@ -282,7 +282,7 @@ MACHINE_START(PALMZ72, "Palm Zire72") .phys_io = 0x40000000, .io_pg_offst = io_p2v(0x40000000), .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_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 (); +pxa2xx_map_io ();/* initialize sleep mode regs (wake-up sources, etc) */ PGSR0 =0x01308000 ;
arch/arm/mach-pxa/poodle.c +1 -1
@@ -468,7 +468,7 @@ MACHINE_START(POODLE, "SHARP Poodle") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .fixup = fixup_poodle, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .nr_irqs = POODLE_NR_IRQS, /* 4 for LoCoMo */ .init_irq = pxa25x_init_irq, .timer = &pxa_timer,
arch/arm/mach-pxa/raumfeld.c +3 -3
@@ -1087,7 +1087,7 @@ MACHINE_START(RAUMFELD_RC, "Raumfeld Controller") .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .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
@@ -1099,7 +1099,7 @@ MACHINE_START(RAUMFELD_CONNECTOR, "Raumfeld Connector") .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .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
@@ -1111,7 +1111,7 @@ MACHINE_START(RAUMFELD_SPEAKER, "Raumfeld Speaker") .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .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
@@ -599,7 +599,7 @@ MACHINE_START(SAAR, "PXA930 Handheld Platform (aka SAAR)") .phys_io = 0x40000000, .boot_params = 0xa0000100, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, - .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 +7 -5
@@ -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>
@@ -44,6 +45,7 @@#include <mach/pxa2xx_spi.h> #include <mach/spitz.h> #include <mach/sharpsl_pm.h> +#include <mach/pxa-smemc.h> #include <plat/i2c.h>
@@ -930,8 +932,8 @@ static void spitz_poweroff(void)static void spitz_restart (char mode,const char *cmd) {/* Bootloader magic for a reboot */ -if ((MSC0 &0xffff0000 ) ==0x7ff00000 ) -MSC0 = (MSC0 &0xffff ) |0x7ee00000 ; +if ((__raw_readl (MSC0 ) &0xffff0000 ) ==0x7ff00000 ) +__raw_writel ((__raw_readl (MSC0 ) &0xffff ) |0x7ee00000 ,MSC0 );spitz_poweroff (); }
@@ -982,7 +984,7 @@ MACHINE_START(SPITZ, "SHARP Spitz") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .fixup = spitz_fixup, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .init_irq = pxa27x_init_irq, .init_machine = spitz_init, .timer = &pxa_timer,
@@ -994,7 +996,7 @@ MACHINE_START(BORZOI, "SHARP Borzoi") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .fixup = spitz_fixup, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .init_irq = pxa27x_init_irq, .init_machine = spitz_init, .timer = &pxa_timer,
@@ -1006,7 +1008,7 @@ MACHINE_START(AKITA, "SHARP Akita") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .fixup = spitz_fixup, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .init_irq = pxa27x_init_irq, .init_machine = spitz_init, .timer = &pxa_timer,
arch/arm/mach-pxa/stargate2.c +2 -2
@@ -1000,7 +1000,7 @@ static void __init stargate2_init(void)MACHINE_START (INTELMOTE2 ,"IMOTE 2" ) .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .init_irq = pxa27x_init_irq, .timer = &pxa_timer, .init_machine = imote2_init,
@@ -1012,7 +1012,7 @@ MACHINE_ENDMACHINE_START (STARGATE2 ,"Stargate 2" ) .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .nr_irqs = STARGATE_NR_IRQS, .init_irq = pxa27x_init_irq, .timer = &pxa_timer,
arch/arm/mach-pxa/tavorevb.c +1 -1
@@ -492,7 +492,7 @@ MACHINE_START(TAVOREVB, "PXA930 Evaluation Board (aka TavorEVB)") .phys_io = 0x40000000, .boot_params = 0xa0000100, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, - .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
@@ -955,7 +955,7 @@ MACHINE_START(TOSA, "SHARP Tosa") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .fixup = fixup_tosa, - .map_io = pxa_map_io, + .map_io = pxa2xx_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 (); +pxa2xx_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 (); +pxa2xx_map_io ();iotable_init (viper_io_desc,ARRAY_SIZE (viper_io_desc));
arch/arm/mach-pxa/vpac270.c +1 -1
@@ -721,7 +721,7 @@ MACHINE_START(VPAC270, "Voipac PXA270") .phys_io = 0x40000000, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .init_irq = pxa27x_init_irq, .timer = &pxa_timer, .init_machine = vpac270_init
arch/arm/mach-pxa/xcep.c +1 -1
@@ -185,7 +185,7 @@ MACHINE_START(XCEP, "Iskratel XCEP") .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, .boot_params = 0xa0000100, .init_machine = xcep_init, - .map_io = pxa_map_io, + .map_io = pxa2xx_map_io, .init_irq = pxa25x_init_irq, .timer = &pxa_timer,MACHINE_END
arch/arm/mach-pxa/z2.c +1 -1
@@ -706,7 +706,7 @@ MACHINE_START(ZIPIT2, "Zipit Z2") .phys_io = 0x40000000, .boot_params = 0xa0000100, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, - .map_io = pxa_map_io, + .map_io = pxa2xx_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 (); +pxa2xx_map_io ();iotable_init (zeus_io_desc,ARRAY_SIZE (zeus_io_desc));
arch/arm/mach-pxa/zylonite.c +1 -1
@@ -414,7 +414,7 @@ MACHINE_START(ZYLONITE, "PXA3xx Platform Development Kit (aka Zylonite)") .phys_io = 0x40000000, .boot_params = 0xa0000100, .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, - .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.1
PATCH 2/13 ARM: pxa: Access SMEMC via virtual addresses
This is important because on PXA3xx, the physical mapping of SMEMC registers differs from the one on PXA2xx. In order to get PCMCIA working on both PXA2xx and PXA320, the PCMCIA driver was adjusted accordingly as well.
Also, various places in the kernel had to be patched to use __raw_read/__raw_write.
--- arch/arm/mach-pxa/cm-x2xx.c | 13 +++-- arch/arm/mach-pxa/cpufreq-pxa2xx.c | 10 ++-- arch/arm/mach-pxa/csb726.c | 7 ++- arch/arm/mach-pxa/generic.c | 9 ++-- arch/arm/mach-pxa/h5000.c | 9 ++-- arch/arm/mach-pxa/include/mach/pxa-smemc.h | 74 ++++++++++++++++++++++++++ arch/arm/mach-pxa/include/mach/pxa2xx-regs.h | 55 ------------------- arch/arm/mach-pxa/lpd270.c | 3 +- arch/arm/mach-pxa/lubbock.c | 3 +- arch/arm/mach-pxa/mainstone.c | 5 +- arch/arm/mach-pxa/pxa27x.c | 6 ++- arch/arm/mach-pxa/sleep.S | 2 +- arch/arm/mach-pxa/smemc.c | 51 ++++++------------ arch/arm/mach-pxa/stargate2.c | 3 +- arch/arm/mach-pxa/tosa.c | 7 ++- arch/arm/mach-pxa/trizeps4.c | 3 +- arch/arm/mach-pxa/xcep.c | 5 +- arch/arm/mach-pxa/zeus.c | 5 +- drivers/pcmcia/pxa2xx_base.c | 65 +++++++++++++++------- 19 files changed, 189 insertions(+), 146 deletions(-) create mode 100644 arch/arm/mach-pxa/include/mach/pxa-smemc.h
arch/arm/mach-pxa/cm-x2xx.c +7 -6
@@ -24,6 +24,7 @@#include <mach/pxa2xx-regs.h> #include <mach/audio.h> #include <mach/pxafb.h> +#include <mach/pxa-smemc.h> #include <asm/hardware/it8152.h>
@@ -392,9 +393,9 @@ static int cmx2xx_suspend(struct sys_device *dev, pm_message_t state)cmx2xx_pci_suspend ();/* save MSC registers */ - sleep_save_msc[0 ] =MSC0 ; - sleep_save_msc[1 ] =MSC1 ; - sleep_save_msc[2 ] =MSC2 ; + sleep_save_msc[0 ] =__raw_readl (MSC0 ); + sleep_save_msc[1 ] =__raw_readl (MSC1 ); + sleep_save_msc[2 ] =__raw_readl (MSC2 );/* setup power saving mode registers */ PCFR =0x0 ;
@@ -416,9 +417,9 @@ static int cmx2xx_resume(struct sys_device *dev)cmx2xx_pci_resume ();/* restore MSC registers */ -MSC0 = sleep_save_msc[0 ]; -MSC1 = sleep_save_msc[1 ]; -MSC2 = sleep_save_msc[2 ]; +__raw_writel (sleep_save_msc[0 ],MSC0 ); +__raw_writel (sleep_save_msc[1 ],MSC1 ); +__raw_writel (sleep_save_msc[2 ],MSC2 );return 0 ; }
arch/arm/mach-pxa/cpufreq-pxa2xx.c +6 -4
@@ -38,8 +38,10 @@#include <linux/cpufreq.h> #include <linux/err.h> #include <linux/regulator/consumer.h> +#include <linux/io.h> #include <mach/pxa2xx-regs.h> +#include <mach/pxa-smemc.h> #ifdef DEBUG static unsigned int freq_debug;
@@ -242,7 +244,7 @@ static void pxa27x_guess_max_freq(void)static void init_sdram_rows (void ) { -uint32_t mdcnfg =MDCNFG ; +uint32_t mdcnfg =__raw_readl (MDCNFG );unsigned int drac2 =0 , drac0 =0 ;if (mdcnfg & (MDCNFG_DE2 |MDCNFG_DE3 ))
@@ -331,8 +333,8 @@ static int pxa_set_target(struct cpufreq_policy *policy,* we need to preset the smaller DRI before the change. If we're * speeding up we need to set the larger DRI value after the change. */ - preset_mdrefr = postset_mdrefr =MDREFR ; -if ((MDREFR &MDREFR_DRI_MASK ) >mdrefr_dri (new_freq_mem)) { + preset_mdrefr = postset_mdrefr =__raw_readl (MDREFR ); +if ((__raw_readl (MDREFR ) &MDREFR_DRI_MASK ) >mdrefr_dri (new_freq_mem)) { preset_mdrefr = (preset_mdrefr & ~MDREFR_DRI_MASK ); preset_mdrefr |=mdrefr_dri (new_freq_mem); }
@@ -370,7 +372,7 @@ static int pxa_set_target(struct cpufreq_policy *policy, 3: nop \n\ " : "=&r" (unused) - : "r" (&MDREFR), "r" (cclkcfg), + : "r" (MDREFR), "r" (cclkcfg), "r" (preset_mdrefr), "r" (postset_mdrefr) : "r4", "r5");local_irq_restore (flags);
arch/arm/mach-pxa/csb726.c +4 -3
@@ -27,6 +27,7 @@#include <mach/ohci.h> #include <mach/pxa2xx-regs.h> #include <mach/audio.h> +#include <mach/pxa-smemc.h> #include "generic.h" #include "devices.h"
@@ -255,9 +256,9 @@ static struct platform_device *devices[] __initdata = {static void __init csb726_init (void ) {pxa2xx_mfp_config (ARRAY_AND_SIZE (csb726_pin_config)); -/* MSC1 = 0x7ffc3ffc; *//* LAN9215/EXP_CS */ -/* MSC2 = 0x06697ff4; *//* none/SM501 */ -MSC2 = (MSC2 & ~0xffff ) |0x7ff4 ;/* SM501 */ +/* __raw_writel(0x7ffc3ffc, MSC1); *//* LAN9215/EXP_CS */ +/* __raw_writel(0x06697ff4, MSC2); *//* none/SM501 */ +__raw_writel ((__raw_readl (MSC2 ) & ~0xffff ) |0x7ff4 ,MSC2 );/* SM501 */ pxa_set_ffuart_info (NULL );pxa_set_btuart_info (NULL );
arch/arm/mach-pxa/generic.c +5 -4
@@ -28,6 +28,7 @@#include <mach/reset.h> #include <mach/gpio.h> +#include <mach/pxa-smemc.h> #include "generic.h"
@@ -117,8 +118,8 @@ static struct map_desc common_io_desc[] __initdata = {static struct map_desc pxa2xx_io_desc[]__initdata = { {/* Mem Ctl */ - .virtual =0xf6000000 , - .pfn =__phys_to_pfn (0x48000000 ), + .virtual =PXA_SMEMC_VIRT , + .pfn =__phys_to_pfn (PXA2XX_SMEMC_BASE ), .length =0x00200000 , .type =MT_DEVICE }
@@ -126,8 +127,8 @@ static struct map_desc pxa2xx_io_desc[] __initdata = {static struct map_desc pxa3xx_io_desc[]__initdata = { {/* Mem Ctl */ - .virtual =0xf6000000 , - .pfn =__phys_to_pfn (0x4a000000 ), + .virtual =PXA_SMEMC_VIRT , + .pfn =__phys_to_pfn (PXA3XX_SMEMC_BASE ), .length =0x00200000 , .type =MT_DEVICE }
arch/arm/mach-pxa/h5000.c +5 -4
@@ -32,6 +32,7 @@#include <mach/pxa25x.h> #include <mach/h5000.h> #include <mach/udc.h> +#include <mach/pxa-smemc.h> #include "generic.h"
@@ -172,11 +173,11 @@ static unsigned long h5000_pin_config[] __initdata = {static void fix_msc (void ) { -MSC0 =0x129c24f2 ; -MSC1 =0x7ff424fa ; -MSC2 =0x7ff47ff4 ; +__raw_writel (0x129c24f2 ,MSC0 ); +__raw_writel (0x7ff424fa ,MSC1 ); +__raw_writel (0x7ff47ff4 ,MSC2 ); -MDREFR |=0x02080000 ; +__raw_writel (__raw_readl (MDREFR ) |0x02080000 ,MDREFR ); }/*
arch/arm/mach-pxa/include/mach/pxa-smemc.h new file +74 -0
74 lines not on this page · raw message
arch/arm/mach-pxa/include/mach/pxa2xx-regs.h +0 -55
61 lines not on this page · raw message
arch/arm/mach-pxa/lpd270.c +2 -1
@@ -46,6 +46,7 @@#include <mach/mmc.h> #include <mach/irda.h> #include <mach/ohci.h> +#include <mach/pxa-smemc.h> #include "generic.h" #include "devices.h"
@@ -463,7 +464,7 @@ static void __init lpd270_init(void)pxa_set_btuart_info (NULL );pxa_set_stuart_info (NULL ); - lpd270_flash_data[0 ].width = (BOOT_DEF &1 ) ?2 :4 ; + lpd270_flash_data[0 ].width = (__raw_readl (BOOT_DEF ) &1 ) ?2 :4 ; lpd270_flash_data[1 ].width =4 ;/*
arch/arm/mach-pxa/lubbock.c +2 -1
@@ -50,6 +50,7 @@#include <mach/pxafb.h> #include <mach/mmc.h> #include <mach/pm.h> +#include <mach/pxa-smemc.h> #include "generic.h" #include "clock.h"
@@ -525,7 +526,7 @@ static void __init lubbock_init(void)pxa_set_ac97_info (NULL ); lubbock_flash_data[0 ].width = lubbock_flash_data[1 ].width = - (BOOT_DEF &1 ) ?2 :4 ; + (__raw_readl (BOOT_DEF ) &1 ) ?2 :4 ;/* Compensate for the nROMBT switch which swaps the flash banks */ printk (KERN_NOTICE "Lubbock configured to boot from %s (bank %d)\n" , flashboot?"Flash" :"ROM" , flashboot);
arch/arm/mach-pxa/mainstone.c +3 -2
@@ -41,7 +41,7 @@#include <asm/mach/irq.h> #include <asm/mach/flash.h> -#include <plat/pxa27x.h> +#include <mach/pxa27x.h> #include <mach/gpio.h> #include <mach/mainstone.h> #include <mach/audio.h>
@@ -51,6 +51,7 @@#include <mach/irda.h> #include <mach/ohci.h> #include <plat/pxa27x_keypad.h> +#include <mach/pxa-smemc.h> #include "generic.h" #include "devices.h"
@@ -565,7 +566,7 @@ static void __init mainstone_init(void)pxa_set_btuart_info (NULL );pxa_set_stuart_info (NULL ); - mst_flash_data[0 ].width = (BOOT_DEF &1 ) ?2 :4 ; + mst_flash_data[0 ].width = (__raw_readl (BOOT_DEF ) &1 ) ?2 :4 ; mst_flash_data[1 ].width =4 ;/* Compensate for SW7 which swaps the flash banks */
arch/arm/mach-pxa/pxa27x.c +4 -2
@@ -17,6 +17,7 @@#include <linux/suspend.h> #include <linux/platform_device.h> #include <linux/sysdev.h> +#include <linux/io.h> #include <mach/hardware.h> #include <asm/irq.h>
@@ -27,6 +28,7 @@#include <mach/ohci.h> #include <mach/pm.h> #include <mach/dma.h> +#include <mach/pxa-smemc.h> #include <plat/i2c.h> #include "generic.h"
@@ -254,7 +256,7 @@ enum {void pxa27x_cpu_pm_save (unsigned long *sleep_save) { -SAVE (MDREFR ); + sleep_save[SLEEP_SAVE_MDREFR ] =__raw_readl (MDREFR );SAVE (PCFR );SAVE (CKEN );
@@ -263,7 +265,7 @@ void pxa27x_cpu_pm_save(unsigned long *sleep_save)void pxa27x_cpu_pm_restore (unsigned long *sleep_save) { -RESTORE (MDREFR ); +__raw_writel (sleep_save[SLEEP_SAVE_MDREFR ],MDREFR );RESTORE (PCFR );PSSR =PSSR_RDH |PSSR_PH ;
arch/arm/mach-pxa/sleep.S +1 -1
@@ -14,7 +14,7 @@ #include <linux/linkage.h> #include <asm/assembler.h> #include <mach/hardware.h> - +#include <mach/pxa-smemc.h> #include <mach/pxa2xx-regs.h> #define MDREFR_KDIV 0x200a4000 // all banks
arch/arm/mach-pxa/smemc.c +17 -34
77 lines not on this page · raw message
arch/arm/mach-pxa/stargate2.c +2 -1
@@ -48,6 +48,7 @@#include <mach/udc.h> #include <mach/pxa2xx_spi.h> #include <mach/pxa27x-udc.h> +#include <mach/pxa-smemc.h> #include <linux/spi/spi.h> #include <linux/mfd/da903x.h>
@@ -976,7 +977,7 @@ static void __init stargate2_init(void) {/* This is probably a board specific hack as this must be set prior to connecting the MFP stuff up. */ -MECR &= ~MECR_NOS ; +__raw_writel (__raw_readl (MECR ) & ~MECR_NOS ,MECR );pxa2xx_mfp_config (ARRAY_AND_SIZE (stargate2_pin_config));
arch/arm/mach-pxa/tosa.c +5 -2
@@ -46,6 +46,7 @@#include <mach/tosa_bt.h> #include <mach/pxa2xx_spi.h> #include <mach/audio.h> +#include <mach/pxa-smemc.h> #include <asm/mach/arch.h> #include <mach/tosa.h>
@@ -893,9 +894,11 @@ static void tosa_poweroff(void)static void tosa_restart (char mode,const char *cmd) { +uint32_t msc0 =__raw_readl (MSC0 ); +/* Bootloader magic for a reboot */ -if ((MSC0 &0xffff0000 ) ==0x7ff00000 ) -MSC0 = (MSC0 &0xffff ) |0x7ee00000 ; +if ((msc0 &0xffff0000 ) ==0x7ff00000 ) +__raw_writel ((msc0 &0xffff ) |0x7ee00000 ,MSC0 );tosa_poweroff (); }
arch/arm/mach-pxa/trizeps4.c +2 -1
@@ -47,6 +47,7 @@#include <mach/mmc.h> #include <mach/irda.h> #include <mach/ohci.h> +#include <mach/pxa-smemc.h> #include <plat/i2c.h> #include "generic.h"
@@ -542,7 +543,7 @@ static void __init trizeps4_map_io(void)pxa2xx_map_io ();iotable_init (trizeps4_io_desc,ARRAY_SIZE (trizeps4_io_desc)); -if ((MSC0 &0x8 ) && (BOOT_DEF &0x1 )) { +if ((__raw_readl (MSC0 ) &0x8 ) && (__raw_readl (BOOT_DEF ) &0x1 )) {/* if flash is 16 bit wide its a Trizeps4 WL */ __machine_arch_type =MACH_TYPE_TRIZEPS4WL ; trizeps4_flash_data[0 ].width =2 ;
arch/arm/mach-pxa/xcep.c +3 -2
@@ -31,6 +31,7 @@#include <mach/hardware.h> #include <mach/pxa2xx-regs.h> #include <mach/mfp-pxa25x.h> +#include <mach/pxa-smemc.h> #include "generic.h"
@@ -172,9 +173,9 @@ static void __init xcep_init(void)/* See Intel XScale Developer's Guide for details */ /* Set RDF and RDN to appropriate values (chip select 3 (smc91x)) */ -MSC1 = (MSC1 &0xffff ) |0xD5540000 ; +__raw_writel ((__raw_readl (MSC1 ) &0xffff ) |0xD5540000 ,MSC1 );/* Set RDF and RDN to appropriate values (chip select 5 (fpga)) */ -MSC2 = (MSC2 &0xffff ) |0x72A00000 ; +__raw_writel ((__raw_readl (MSC2 ) &0xffff ) |0x72A00000 ,MSC2 );platform_add_devices (ARRAY_AND_SIZE (devices));pxa_set_i2c_info (&xcep_i2c_platform_data);
arch/arm/mach-pxa/zeus.c +3 -2
@@ -47,6 +47,7 @@#include <mach/audio.h> #include <mach/arcom-pcmcia.h> #include <mach/zeus.h> +#include <mach/pxa-smemc.h> #include "generic.h"
@@ -828,8 +829,8 @@ static void __init zeus_init(void)pr_info ("Zeus CPLD V%dI%d\n" , (system_rev &0xf0 ) >>4 , (system_rev &0x0f ));/* Fix timings for dm9000s (CS1/CS2)*/ -MSC0 = (MSC0 &0xffff ) | (dm9000_msc <<16 ); -MSC1 = (MSC1 &0xffff0000 ) | dm9000_msc; +__raw_writel ((MSC0 &0xffff ) | (dm9000_msc <<16 ),MSC0 ); +__raw_writel ((MSC1 &0xffff0000 ) | dm9000_msc,MSC1 ); pm_power_off = zeus_power_off;zeus_setup_apm ();
drivers/pcmcia/pxa2xx_base.c +44 -21
138 lines not on this page · raw message
Signature · 1 line
1.7.1
Haojian Zhuang
maintainerPATCH 2/13 ARM: pxa: Access SMEMC via virtual addresses
Quoted 744 lines · Marek Vasut
This is important because on PXA3xx, the physical mapping of SMEMC registers differs from the one on PXA2xx. In order to get PCMCIA working on both PXA2xx and PXA320, the PCMCIA driver was adjusted accordingly as well.
Also, various places in the kernel had to be patched to use __raw_read/__raw_write.
Signed-off-by Marek Vasut <[email protected]>---
?arch/arm/mach-pxa/cm-x2xx.c ? ? ? ? ? ? ? ? ?| ? 13 +++-- ?arch/arm/mach-pxa/cpufreq-pxa2xx.c ? ? ? ? ? | ? 10 ++-- ?arch/arm/mach-pxa/csb726.c ? ? ? ? ? ? ? ? ? | ? ?7 ++- ?arch/arm/mach-pxa/generic.c ? ? ? ? ? ? ? ? ?| ? ?9 ++-- ?arch/arm/mach-pxa/h5000.c ? ? ? ? ? ? ? ? ? ?| ? ?9 ++-- ?arch/arm/mach-pxa/include/mach/pxa-smemc.h ? | ? 74 ++++++++++++++++++++++++++ ?arch/arm/mach-pxa/include/mach/pxa2xx-regs.h | ? 55 ------------------- ?arch/arm/mach-pxa/lpd270.c ? ? ? ? ? ? ? ? ? | ? ?3 +- ?arch/arm/mach-pxa/lubbock.c ? ? ? ? ? ? ? ? ?| ? ?3 +- ?arch/arm/mach-pxa/mainstone.c ? ? ? ? ? ? ? ?| ? ?5 +- ?arch/arm/mach-pxa/pxa27x.c ? ? ? ? ? ? ? ? ? | ? ?6 ++- ?arch/arm/mach-pxa/sleep.S ? ? ? ? ? ? ? ? ? ?| ? ?2 +- ?arch/arm/mach-pxa/smemc.c ? ? ? ? ? ? ? ? ? ?| ? 51 ++++++------------ ?arch/arm/mach-pxa/stargate2.c ? ? ? ? ? ? ? ?| ? ?3 +- ?arch/arm/mach-pxa/tosa.c ? ? ? ? ? ? ? ? ? ? | ? ?7 ++- ?arch/arm/mach-pxa/trizeps4.c ? ? ? ? ? ? ? ? | ? ?3 +- ?arch/arm/mach-pxa/xcep.c ? ? ? ? ? ? ? ? ? ? | ? ?5 +- ?arch/arm/mach-pxa/zeus.c ? ? ? ? ? ? ? ? ? ? | ? ?5 +- ?drivers/pcmcia/pxa2xx_base.c ? ? ? ? ? ? ? ? | ? 65 +++++++++++++++-------?19 files changed, 189 insertions(+), 146 deletions(-) ?create mode 100644
arch/arm/mach-pxa/include/mach/pxa-smemc.harch/arm/mach-pxa/cm-x2xx.c +0
-0@@ -24,6 +24,7 @@?#include <
mach/pxa2xx-regs.h>
?#include <mach/audio.h>
?#include <mach/pxafb.h>
+#include <mach/pxa-smemc.h>?#include <
asm/hardware/it8152.h>arch/arm/mach-pxa/cm-x2xx.c +0
-0@@ -392,9 +393,9 @@ static int cmx2xx_suspend(struct sys_device *dev, pm_message_t state) ? ? ? ?cmx2xx_pci_suspend();? ? ? ?/* save MSC registers */
- ? ? ? sleep_save_msc[0] = MSC0;
- ? ? ? sleep_save_msc[1] = MSC1;
- ? ? ? sleep_save_msc[2] = MSC2;
+ ? ? ? sleep_save_msc[0] =__raw_readl(MSC0);
+ ? ? ? sleep_save_msc[1] =__raw_readl(MSC1);
+ ? ? ? sleep_save_msc[2] =__raw_readl(MSC2);? ? ? ?/* setup power saving mode registers */
? ? ? ?PCFR =0x0;arch/arm/mach-pxa/cm-x2xx.c +0
-0@@ -416,9 +417,9 @@ static int cmx2xx_resume(struct sys_device *dev) ? ? ? ?cmx2xx_pci_resume();? ? ? ?/* restore MSC registers */
- ? ? ? MSC0 = sleep_save_msc[0];
- ? ? ? MSC1 = sleep_save_msc[1];
- ? ? ? MSC2 = sleep_save_msc[2];
+ ? ? ?__raw_writel(sleep_save_msc[0], MSC0);
+ ? ? ?__raw_writel(sleep_save_msc[1], MSC1);
+ ? ? ?__raw_writel(sleep_save_msc[2], MSC2);? ? ? ?return 0;
?}arch/arm/mach-pxa/cpufreq-pxa2xx.c +0
-0@@ -38,8 +38,10 @@?#include <
linux/cpufreq.h>
?#include <linux/err.h>
?#include <linux/regulator/consumer.h>
+#include <linux/io.h>?#include <
mach/pxa2xx-regs.h>
+#include <mach/pxa-smemc.h>?#ifdef DEBUG
?static unsigned intfreq_debug;arch/arm/mach-pxa/cpufreq-pxa2xx.c +1
-1@@ -242,7 +244,7 @@ static void pxa27x_guess_max_freq(void) ?static void init_sdram_rows(void) ?{ - ? ? ? uint32_t mdcnfg = MDCNFG; + ? ? ? uint32_t mdcnfg = __raw_readl(MDCNFG); ? ? ? ?unsigned int drac2 = 0, drac0 = 0; ? ? ? ?if (mdcnfg & (MDCNFG_DE2 | MDCNFG_DE3))@@ -331,8 +333,8 @@ static int pxa_set_target(struct cpufreq_policy *policy,? ? ? ? * we need to preset the smaller DRI before the change. ?If we're ? ? ? ? * speeding up we need to set the larger DRI value after the change. ? ? ? ? */
- ? ? ?preset_mdrefr=postset_mdrefr= MDREFR;
- ? ? ? if ((MDREFR &MDREFR_DRI_MASK) >mdrefr_dri(new_freq_mem)) {
+ ? ? ?preset_mdrefr=postset_mdrefr=__raw_readl(MDREFR);
+ ? ? ? if ((__raw_readl(MDREFR)&MDREFR_DRI_MASK) >mdrefr_dri(new_freq_mem)) { ? ? ? ? ? ? ? ?preset_mdrefr = (preset_mdrefr& ~MDREFR_DRI_MASK);
? ? ? ? ? ? ? ?preset_mdrefr |=mdrefr_dri(new_freq_mem);
? ? ? ?}arch/arm/mach-pxa/cpufreq-pxa2xx.c +0
-0@@ -370,7 +372,7 @@ static int pxa_set_target(struct cpufreq_policy *policy, ?3: ? ? ? ? ? ? nop ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? \n\? ? ? ? ?"
? ? ? ? ? ? ? ? ? ? : "=&r" (unused)
- ? ? ? ? ? ? ? ? ? ?: "r" (&MDREFR), "r" (cclkcfg),
+ ? ? ? ? ? ? ? ? ? ?: "r" (MDREFR), "r" (cclkcfg),
? ? ? ? ? ? ? ? ? ? ? "r" (preset_mdrefr), "r" (postset_mdrefr) ? ? ? ? ? ? ? ? ? ? : "r4", "r5");
? ? ? ?local_irq_restore(flags);arch/arm/mach-pxa/csb726.c +0
-0@@ -27,6 +27,7 @@?#include <
mach/ohci.h>
?#include <mach/pxa2xx-regs.h>
?#include <mach/audio.h>
+#include <mach/pxa-smemc.h>?#include "
generic.h"
?#include "devices.h"arch/arm/mach-pxa/csb726.c +3
-3@@ -255,9 +256,9 @@ static struct platform_device *devices[] __initdata = { ?static void __init csb726_init(void) ?{ ? ? ? ?pxa2xx_mfp_config(ARRAY_AND_SIZE(csb726_pin_config)); -/* ? ? MSC1 = 0x7ffc3ffc; *//* LAN9215/EXP_CS */ -/* ? ? MSC2 = 0x06697ff4; *//* none/SM501 */ - ? ? ? MSC2 = (MSC2 & ~0xffff) | 0x7ff4; /* SM501 */ +/* ? ? __raw_writel(0x7ffc3ffc, MSC1); *//* LAN9215/EXP_CS */ +/* ? ? __raw_writel(0x06697ff4, MSC2); *//* none/SM501 */ + ? ? ? __raw_writel((__raw_readl(MSC2) & ~0xffff) | 0x7ff4, MSC2); /* SM501 */ ? ? ? ?pxa_set_ffuart_info(NULL); ? ? ? ?pxa_set_btuart_info(NULL);arch/arm/mach-pxa/generic.c +0
-0@@ -28,6 +28,7 @@?#include <
mach/reset.h>
?#include <mach/gpio.h>
+#include <mach/pxa-smemc.h>?#include "
generic.h"arch/arm/mach-pxa/generic.c +0
-0@@ -117,8 +118,8 @@ static struct map_desc common_io_desc[] __initdata = { ?static struct map_desc pxa2xx_io_desc[] __initdata = {? ? ? ?{ ? ? ? /* Mem Ctl */
- ? ? ? ? ? ? ? .virtual ? ? ? ?= ?0xf6000000,
- ? ? ? ? ? ? ? .pfn ? ? ? ? ? ?=__phys_to_pfn(0x48000000),
+ ? ? ? ? ? ? ? .virtual ? ? ? ?= ?PXA_SMEMC_VIRT,
+ ? ? ? ? ? ? ? .pfn ? ? ? ? ? ?=__phys_to_pfn(PXA2XX_SMEMC_BASE), ? ? ? ? ? ? ? ?.length ? ? ? ? =0x00200000,
? ? ? ? ? ? ? ?.type ? ? ? ? ? =MT_DEVICE
? ? ? ?}arch/arm/mach-pxa/generic.c +0
-0@@ -126,8 +127,8 @@ static struct map_desc pxa2xx_io_desc[] __initdata = { ?static struct map_desc pxa3xx_io_desc[] __initdata = {? ? ? ?{ ? ? ? /* Mem Ctl */
- ? ? ? ? ? ? ? .virtual ? ? ? ?= ?0xf6000000,
- ? ? ? ? ? ? ? .pfn ? ? ? ? ? ?=__phys_to_pfn(0x4a000000),
+ ? ? ? ? ? ? ? .virtual ? ? ? ?= ?PXA_SMEMC_VIRT,
+ ? ? ? ? ? ? ? .pfn ? ? ? ? ? ?=__phys_to_pfn(PXA3XX_SMEMC_BASE), ? ? ? ? ? ? ? ?.length ? ? ? ? =0x00200000,
? ? ? ? ? ? ? ?.type ? ? ? ? ? =MT_DEVICE
? ? ? ?}arch/arm/mach-pxa/h5000.c +0
-0@@ -32,6 +32,7 @@?#include <
mach/pxa25x.h>
?#include <mach/h5000.h>
?#include <mach/udc.h>
+#include <mach/pxa-smemc.h>?#include "
generic.h"arch/arm/mach-pxa/h5000.c +4
-4@@ -172,11 +173,11 @@ static unsigned long h5000_pin_config[] __initdata = { ?static void fix_msc(void) ?{ - ? ? ? MSC0 = 0x129c24f2; - ? ? ? MSC1 = 0x7ff424fa; - ? ? ? MSC2 = 0x7ff47ff4; + ? ? ? __raw_writel(0x129c24f2, MSC0); + ? ? ? __raw_writel(0x7ff424fa, MSC1); + ? ? ? __raw_writel(0x7ff47ff4, MSC2); - ? ? ? MDREFR |= 0x02080000; + ? ? ? __raw_writel(__raw_readl(MDREFR) | 0x02080000, MDREFR); ?}?/*
arch/arm/mach-pxa/include/mach/pxa-smemc.h new file +74
-0@@ -0,0 +1,74 @@ +/* +* Static memory controller register definitions for PXA CPUs +* +* Copyright (C) 2010 Marek Vasut <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef __PXA_SMEMC_REGS_H +#define __PXA_SMEMC_REGS_H + +#define ? ? ? ?PXA2XX_SMEMC_BASE ? ? ? 0x48000000 +#define ? ? ? ?PXA3XX_SMEMC_BASE ? ? ? 0x4a000000 +#define ? ? ? ?PXA_SMEMC_VIRT ? ? ? ? ?0xf6000000 + +#define MDCNFG ? ? ? ? (PXA_SMEMC_VIRT + 0x00) ?/* SDRAM Configuration Register 0 */ +#define MDREFR ? ? ? ? (PXA_SMEMC_VIRT + 0x04) ?/* SDRAM Refresh Control Register */ +#define MSC0 ? ? ? ? ? (PXA_SMEMC_VIRT + 0x08) ?/* Static Memory Control Register 0 */ +#define MSC1 ? ? ? ? ? (PXA_SMEMC_VIRT + 0x0C) ?/* Static Memory Control Register 1 */ +#define MSC2 ? ? ? ? ? (PXA_SMEMC_VIRT + 0x10) ?/* Static Memory Control Register 2 */ +#define MECR ? ? ? ? ? (PXA_SMEMC_VIRT + 0x14) ?/* Expansion Memory (PCMCIA/Compact Flash) Bus Configuration */ +#define SXLCR ? ? ? ? ?(PXA_SMEMC_VIRT + 0x18) ?/* LCR value to be written to SDRAM-Timing Synchronous Flash */ +#define SXCNFG ? ? ? ? (PXA_SMEMC_VIRT + 0x1C) ?/* Synchronous Static Memory Control Register */ +#define SXMRS ? ? ? ? ?(PXA_SMEMC_VIRT + 0x24) ?/* MRS value to be written to Synchronous Flash or SMROM */ +#define MCMEM0 ? ? ? ? (PXA_SMEMC_VIRT + 0x28) ?/* Card interface Common Memory Space Socket 0 Timing */ +#define MCMEM1 ? ? ? ? (PXA_SMEMC_VIRT + 0x2C) ?/* Card interface Common Memory Space Socket 1 Timing */ +#define MCATT0 ? ? ? ? (PXA_SMEMC_VIRT + 0x30) ?/* Card interface Attribute Space Socket 0 Timing Configuration */ +#define MCATT1 ? ? ? ? (PXA_SMEMC_VIRT + 0x34) ?/* Card interface Attribute Space Socket 1 Timing Configuration */ +#define MCIO0 ? ? ? ? ?(PXA_SMEMC_VIRT + 0x38) ?/* Card interface I/O Space Socket 0 Timing Configuration */ +#define MCIO1 ? ? ? ? ?(PXA_SMEMC_VIRT + 0x3C) ?/* Card interface I/O Space Socket 1 Timing Configuration */ +#define MDMRS ? ? ? ? ?(PXA_SMEMC_VIRT + 0x40) ?/* MRS value to be written to SDRAM */ +#define BOOT_DEF ? ? ? (PXA_SMEMC_VIRT + 0x44) ?/* Read-Only Boot-Time Register. Contains BOOT_SEL and PKG_SEL */ +#define MEMCLKCFG ? ? ?(PXA_SMEMC_VIRT + 0x68)/* Clock Configuration */ +#define CSADRCFG0 ? ? ?(PXA_SMEMC_VIRT + 0x80)/* Address Configuration Register for CS0 */ +#define CSADRCFG1 ? ? ?(PXA_SMEMC_VIRT + 0x84)/* Address Configuration Register for CS1 */ +#define CSADRCFG2 ? ? ?(PXA_SMEMC_VIRT + 0x88)/* Address Configuration Register for CS2 */ +#define CSADRCFG3 ? ? ?(PXA_SMEMC_VIRT + 0x8C)/* Address Configuration Register for CS3 */ + +/* +* More handy macros for PCMCIA +* +* Arg is socket number +*/ +#define MCMEM (s) ? ? ? (PXA_SMEMC_VIRT + 0x28 + ((s)<<2)) ?/* Card interface Common Memory Space Socket s Timing */ +#define MCATT (s) ? ? ? (PXA_SMEMC_VIRT + 0x30 + ((s)<<2)) ?/* Card interface Attribute Space Socket s Timing Configuration */ +#define MCIO (s) ? ? ? ? ? ? ? ?(PXA_SMEMC_VIRT + 0x38 + ((s)<<2)) ?/* Card interface I/O Space Socket s Timing Configuration */ + +/* MECR register defines */ +#define MECR_NOS ? ? ? (1 << 0) ? ? ? ?/* Number Of Sockets: 0 -> 1 sock, 1 -> 2 sock */ +#define MECR_CIT ? ? ? (1 << 1) ? ? ? ?/* Card Is There: 0 -> no card, 1 -> card inserted */ + +#define MDCNFG_DE0 ? ? (1 << 0) ? ? ? ?/* SDRAM Bank 0 Enable */ +#define MDCNFG_DE1 ? ? (1 << 1) ? ? ? ?/* SDRAM Bank 1 Enable */ +#define MDCNFG_DE2 ? ? (1 << 16) ? ? ?/* SDRAM Bank 2 Enable */ +#define MDCNFG_DE3 ? ? (1 << 17) ? ? ?/* SDRAM Bank 3 Enable */ + +#define MDREFR_K0DB4 ? (1 << 29) ? ? ?/* SDCLK0 Divide by 4 Control/Status */ +#define MDREFR_K2FREE ?(1 << 25) ? ? ?/* SDRAM Free-Running Control */ +#define MDREFR_K1FREE ?(1 << 24) ? ? ?/* SDRAM Free-Running Control */ +#define MDREFR_K0FREE ?(1 << 23) ? ? ?/* SDRAM Free-Running Control */ +#define MDREFR_SLFRSH ?(1 << 22) ? ? ?/* SDRAM Self-Refresh Control/Status */ +#define MDREFR_APD ? ? (1 << 20) ? ? ?/* SDRAM/SSRAM Auto-Power-Down Enable */ +#define MDREFR_K2DB2 ? (1 << 19) ? ? ?/* SDCLK2 Divide by 2 Control/Status */ +#define MDREFR_K2RUN ? (1 << 18) ? ? ?/* SDCLK2 Run Control/Status */ +#define MDREFR_K1DB2 ? (1 << 17) ? ? ?/* SDCLK1 Divide by 2 Control/Status */ +#define MDREFR_K1RUN ? (1 << 16) ? ? ?/* SDCLK1 Run Control/Status */ +#define MDREFR_E1PIN ? (1 << 15) ? ? ?/* SDCKE1 Level Control/Status */ +#define MDREFR_K0DB2 ? (1 << 14) ? ? ?/* SDCLK0 Divide by 2 Control/Status */ +#define MDREFR_K0RUN ? (1 << 13) ? ? ?/* SDCLK0 Run Control/Status */ +#define MDREFR_E0PIN ? (1 << 12) ? ? ?/* SDCKE0 Level Control/Status */ + +#endif arch/arm/mach-pxa/include/mach/pxa2xx-regs.h +0
-0@@ -28,61 +28,6 @@?#define
PXA_CS5_PHYS?0x14000000?/*
- * Memory controller
- */arch/arm/mach-pxa/include/mach/pxa2xx-regs.h +0
-53- -#define MDCNFG ? ? ? ? __REG(0x48000000) ?/* SDRAM Configuration Register 0 */ -#define MDREFR ? ? ? ? __REG(0x48000004) ?/* SDRAM Refresh Control Register */ -#define MSC0 ? ? ? ? ? __REG(0x48000008) ?/* Static Memory Control Register 0 */ -#define MSC1 ? ? ? ? ? __REG(0x4800000C) ?/* Static Memory Control Register 1 */ -#define MSC2 ? ? ? ? ? __REG(0x48000010) ?/* Static Memory Control Register 2 */ -#define MECR ? ? ? ? ? __REG(0x48000014) ?/* Expansion Memory (PCMCIA/Compact Flash) Bus Configuration */ -#define SXLCR ? ? ? ? ?__REG(0x48000018) ?/* LCR value to be written to SDRAM-Timing Synchronous Flash */ -#define SXCNFG ? ? ? ? __REG(0x4800001C) ?/* Synchronous Static Memory Control Register */ -#define SXMRS ? ? ? ? ?__REG(0x48000024) ?/* MRS value to be written to Synchronous Flash or SMROM */ -#define MCMEM0 ? ? ? ? __REG(0x48000028) ?/* Card interface Common Memory Space Socket 0 Timing */ -#define MCMEM1 ? ? ? ? __REG(0x4800002C) ?/* Card interface Common Memory Space Socket 1 Timing */ -#define MCATT0 ? ? ? ? __REG(0x48000030) ?/* Card interface Attribute Space Socket 0 Timing Configuration */ -#define MCATT1 ? ? ? ? __REG(0x48000034) ?/* Card interface Attribute Space Socket 1 Timing Configuration */ -#define MCIO0 ? ? ? ? ?__REG(0x48000038) ?/* Card interface I/O Space Socket 0 Timing Configuration */ -#define MCIO1 ? ? ? ? ?__REG(0x4800003C) ?/* Card interface I/O Space Socket 1 Timing Configuration */ -#define MDMRS ? ? ? ? ?__REG(0x48000040) ?/* MRS value to be written to SDRAM */ -#define BOOT_DEF ? ? ? __REG(0x48000044) ?/* Read-Only Boot-Time Register. Contains BOOT_SEL and PKG_SEL */ - -/* -* More handy macros for PCMCIA -* -* Arg is socket number -*/ -#define MCMEM (s) ? ? ? __REG2(0x48000028, (s)<<2 ) ?/* Card interface Common Memory Space Socket s Timing */ -#define MCATT (s) ? ? ? __REG2(0x48000030, (s)<<2 ) ?/* Card interface Attribute Space Socket s Timing Configuration */ -#define MCIO (s) ? ? ? ? ? ? ? ?__REG2(0x48000038, (s)<<2 ) ?/* Card interface I/O Space Socket s Timing Configuration */ - -/* MECR register defines */ -#define MECR_NOS ? ? ? (1 << 0) ? ? ? ?/* Number Of Sockets: 0 -> 1 sock, 1 -> 2 sock */ -#define MECR_CIT ? ? ? (1 << 1) ? ? ? ?/* Card Is There: 0 -> no card, 1 -> card inserted */ - -#define MDCNFG_DE0 ? ? (1 << 0) ? ? ? ?/* SDRAM Bank 0 Enable */ -#define MDCNFG_DE1 ? ? (1 << 1) ? ? ? ?/* SDRAM Bank 1 Enable */ -#define MDCNFG_DE2 ? ? (1 << 16) ? ? ?/* SDRAM Bank 2 Enable */ -#define MDCNFG_DE3 ? ? (1 << 17) ? ? ?/* SDRAM Bank 3 Enable */ - -#define MDREFR_K0DB4 ? (1 << 29) ? ? ?/* SDCLK0 Divide by 4 Control/Status */ -#define MDREFR_K2FREE ?(1 << 25) ? ? ?/* SDRAM Free-Running Control */ -#define MDREFR_K1FREE ?(1 << 24) ? ? ?/* SDRAM Free-Running Control */ -#define MDREFR_K0FREE ?(1 << 23) ? ? ?/* SDRAM Free-Running Control */ -#define MDREFR_SLFRSH ?(1 << 22) ? ? ?/* SDRAM Self-Refresh Control/Status */ -#define MDREFR_APD ? ? (1 << 20) ? ? ?/* SDRAM/SSRAM Auto-Power-Down Enable */ -#define MDREFR_K2DB2 ? (1 << 19) ? ? ?/* SDCLK2 Divide by 2 Control/Status */ -#define MDREFR_K2RUN ? (1 << 18) ? ? ?/* SDCLK2 Run Control/Status */ -#define MDREFR_K1DB2 ? (1 << 17) ? ? ?/* SDCLK1 Divide by 2 Control/Status */ -#define MDREFR_K1RUN ? (1 << 16) ? ? ?/* SDCLK1 Run Control/Status */ -#define MDREFR_E1PIN ? (1 << 15) ? ? ?/* SDCKE1 Level Control/Status */ -#define MDREFR_K0DB2 ? (1 << 14) ? ? ?/* SDCLK0 Divide by 2 Control/Status */ -#define MDREFR_K0RUN ? (1 << 13) ? ? ?/* SDCLK0 Run Control/Status */ -#define MDREFR_E0PIN ? (1 << 12) ? ? ?/* SDCKE0 Level Control/Status */ - -/* ?* Power Manager
?*/arch/arm/mach-pxa/lpd270.c +0
-0@@ -46,6 +46,7 @@?#include <
mach/mmc.h>
?#include <mach/irda.h>
?#include <mach/ohci.h>
+#include <mach/pxa-smemc.h>?#include "
generic.h"
?#include "devices.h"arch/arm/mach-pxa/lpd270.c +1
-1@@ -463,7 +464,7 @@ static void __init lpd270_init(void) ? ? ? ?pxa_set_btuart_info(NULL); ? ? ? ?pxa_set_stuart_info(NULL); - ? ? ? lpd270_flash_data[0].width = (BOOT_DEF & 1) ? 2 : 4; + ? ? ? lpd270_flash_data[0].width = (__raw_readl(BOOT_DEF) & 1) ? 2 : 4; ? ? ? ?lpd270_flash_data[1].width = 4;? ? ? ?/*
arch/arm/mach-pxa/lubbock.c +0
-0@@ -50,6 +50,7 @@?#include <
mach/pxafb.h>
?#include <mach/mmc.h>
?#include <mach/pm.h>
+#include <mach/pxa-smemc.h>?#include "
generic.h"
?#include "clock.h"arch/arm/mach-pxa/lubbock.c +0
-0@@ -525,7 +526,7 @@ static void __init lubbock_init(void) ? ? ? ?pxa_set_ac97_info(NULL);? ? ? ?lubbock_flash_data[0].width = lubbock_flash_data[1].width =
- ? ? ? ? ? ? ? (BOOT_DEF& 1) ? 2 : 4;
+ ? ? ? ? ? ? ? (__raw_readl(BOOT_DEF)& 1) ? 2 : 4;
? ? ? ?/* Compensate for the nROMBT switch which swaps the flash banks */ ? ? ? ?printk(KERN_NOTICE "Lubbock configured to boot from %s (bank %d)\n", ? ? ? ? ? ? ? flashboot?"Flash":"ROM", flashboot);arch/arm/mach-pxa/mainstone.c +0
-0@@ -41,7 +41,7 @@?#include <
asm/mach/irq.h>
?#include <asm/mach/flash.h>arch/arm/mach-pxa/mainstone.c +1
-1-#include <plat/pxa27x.h> +#include <mach/pxa27x.h> ?#include <
mach/gpio.h>
?#include <mach/mainstone.h>
?#include <mach/audio.h>arch/arm/mach-pxa/mainstone.c +0
-0@@ -51,6 +51,7 @@?#include <
mach/irda.h>
?#include <mach/ohci.h>
?#include <plat/pxa27x_keypad.h>
+#include <mach/pxa-smemc.h>?#include "
generic.h"
?#include "devices.h"arch/arm/mach-pxa/mainstone.c +1
-1@@ -565,7 +566,7 @@ static void __init mainstone_init(void) ? ? ? ?pxa_set_btuart_info(NULL); ? ? ? ?pxa_set_stuart_info(NULL); - ? ? ? mst_flash_data[0].width = (BOOT_DEF & 1) ? 2 : 4; + ? ? ? mst_flash_data[0].width = (__raw_readl(BOOT_DEF) & 1) ? 2 : 4; ? ? ? ?mst_flash_data[1].width = 4;? ? ? ?/* Compensate for SW7 which swaps the flash banks */
arch/arm/mach-pxa/pxa27x.c +0
-0@@ -17,6 +17,7 @@?#include <
linux/suspend.h>
?#include <linux/platform_device.h>
?#include <linux/sysdev.h>
+#include <linux/io.h>?#include <
mach/hardware.h>
?#include <asm/irq.h>arch/arm/mach-pxa/pxa27x.c +0
-0@@ -27,6 +28,7 @@?#include <
mach/ohci.h>
?#include <mach/pm.h>
?#include <mach/dma.h>
+#include <mach/pxa-smemc.h>
?#include <plat/i2c.h>?#include "
generic.h"arch/arm/mach-pxa/pxa27x.c +2
-2@@ -254,7 +256,7 @@ enum { ?void pxa27x_cpu_pm_save(unsigned long *sleep_save) ?{ - ? ? ? SAVE(MDREFR); + ? ? ? sleep_save[SLEEP_SAVE_MDREFR] = __raw_readl(MDREFR); ? ? ? ?SAVE(PCFR); ? ? ? ?SAVE(CKEN);@@ -263,7 +265,7 @@ void pxa27x_cpu_pm_save(unsigned long *sleep_save) ?void pxa27x_cpu_pm_restore(unsigned long *sleep_save) ?{ - ? ? ? RESTORE(MDREFR); + ? ? ? __raw_writel(sleep_save[SLEEP_SAVE_MDREFR], MDREFR); ? ? ? ?RESTORE(PCFR); ? ? ? ?PSSR = PSSR_RDH | PSSR_PH;arch/arm/mach-pxa/sleep.S +0
-0@@ -14,7 +14,7 @@?#include <
linux/linkage.h>
?#include <asm/assembler.h>
?#include <mach/hardware.h>arch/arm/mach-pxa/sleep.S +1
-1- +#include <mach/pxa-smemc.h>?#include <
mach/pxa2xx-regs.h>?#define
MDREFR_KDIV? ?0x200a4000 ? ? ?// all banksarch/arm/mach-pxa/smemc.c +0
-0@@ -9,50 +9,37 @@?#include <
linux/sysdev.h>?#include <
mach/hardware.h>arch/arm/mach-pxa/smemc.c +1
-12- -#define SMEMC_PHYS_BASE ? ? ? ?(0x4A000000) -#define SMEMC_PHYS_SIZE ? ? ? ?(0x90) - -#define MSC0 ? ? ? ? ? (0x08) ?/* Static Memory Controller Register 0 */ -#define MSC1 ? ? ? ? ? (0x0C) ?/* Static Memory Controller Register 1 */ -#define SXCNFG ? ? ? ? (0x1C) ?/* Synchronous Static Memory Control Register */ -#define MEMCLKCFG ? ? ?(0x68) ?/* Clock Configuration */ -#define CSADRCFG0 ? ? ?(0x80) ?/* Address Configuration Register for CS0 */ -#define CSADRCFG1 ? ? ?(0x84) ?/* Address Configuration Register for CS1 */ -#define CSADRCFG2 ? ? ?(0x88) ?/* Address Configuration Register for CS2 */ -#define CSADRCFG3 ? ? ?(0x8C) ?/* Address Configuration Register for CS3 */ +#include <mach/pxa-smemc.h> ?#ifdef
CONFIG_PMarch/arm/mach-pxa/smemc.c +0
-2-static void __iomem *smemc_mmio_base; -?static unsigned long msc[2];
?static unsigned long sxcnfg, memclkcfg;
?static unsigned long csadrcfg[4];?static int
pxa3xx_smemc_suspend(struct sys_device *dev, pm_message_t state)?{
- ? ? ? msc[0] =__raw_readl(smemc_mmio_base + MSC0);
- ? ? ? msc[1] =__raw_readl(smemc_mmio_base + MSC1);
- ? ? ? sxcnfg =__raw_readl(smemc_mmio_base + SXCNFG);
- ? ? ? memclkcfg =__raw_readl(smemc_mmio_base + MEMCLKCFG);
- ? ? ? csadrcfg[0] =__raw_readl(smemc_mmio_base + CSADRCFG0);
- ? ? ? csadrcfg[1] =__raw_readl(smemc_mmio_base + CSADRCFG1);
- ? ? ? csadrcfg[2] =__raw_readl(smemc_mmio_base + CSADRCFG2);
- ? ? ? csadrcfg[3] =__raw_readl(smemc_mmio_base + CSADRCFG3);
+ ? ? ? msc[0] =__raw_readl(MSC0);
+ ? ? ? msc[1] =__raw_readl(MSC1);
+ ? ? ? sxcnfg =__raw_readl(SXCNFG);
+ ? ? ? memclkcfg =__raw_readl(MEMCLKCFG);
+ ? ? ? csadrcfg[0] =__raw_readl(CSADRCFG0);
+ ? ? ? csadrcfg[1] =__raw_readl(CSADRCFG1);
+ ? ? ? csadrcfg[2] =__raw_readl(CSADRCFG2);
+ ? ? ? csadrcfg[3] =__raw_readl(CSADRCFG3);? ? ? ?return 0;
?}?static int
pxa3xx_smemc_resume(struct sys_device *dev)?{
- ? ? ?__raw_writel(msc[0], smemc_mmio_base + MSC0);
- ? ? ?__raw_writel(msc[1], smemc_mmio_base + MSC1);
- ? ? ?__raw_writel(sxcnfg, smemc_mmio_base + SXCNFG);
- ? ? ?__raw_writel(memclkcfg, smemc_mmio_base + MEMCLKCFG);
- ? ? ?__raw_writel(csadrcfg[0], smemc_mmio_base + CSADRCFG0);
- ? ? ?__raw_writel(csadrcfg[1], smemc_mmio_base + CSADRCFG1);
- ? ? ?__raw_writel(csadrcfg[2], smemc_mmio_base + CSADRCFG2);
- ? ? ?__raw_writel(csadrcfg[3], smemc_mmio_base + CSADRCFG3);
+ ? ? ?__raw_writel(msc[0], MSC0);
+ ? ? ?__raw_writel(msc[1], MSC1);
+ ? ? ?__raw_writel(sxcnfg, SXCNFG);
+ ? ? ?__raw_writel(memclkcfg, MEMCLKCFG);
+ ? ? ?__raw_writel(csadrcfg[0], CSADRCFG0);
+ ? ? ?__raw_writel(csadrcfg[1], CSADRCFG1);
+ ? ? ?__raw_writel(csadrcfg[2], CSADRCFG2);
+ ? ? ?__raw_writel(csadrcfg[3], CSADRCFG3);? ? ? ?return 0;
?}arch/arm/mach-pxa/smemc.c +0
-4@@ -73,10 +60,6 @@ static int __init smemc_init(void) ? ? ? ?int ret = 0; ? ? ? ?if (cpu_is_pxa3xx()) { - ? ? ? ? ? ? ? smemc_mmio_base = ioremap(SMEMC_PHYS_BASE, SMEMC_PHYS_SIZE); - ? ? ? ? ? ? ? if (smemc_mmio_base == NULL) - ? ? ? ? ? ? ? ? ? ? ? return -ENODEV; - ? ? ? ? ? ? ? ?ret = sysdev_class_register(&smemc_sysclass); ? ? ? ? ? ? ? ?if (ret) ? ? ? ? ? ? ? ? ? ? ? ?return ret;arch/arm/mach-pxa/stargate2.c +0
-0@@ -48,6 +48,7 @@?#include <
mach/udc.h>
?#include <mach/pxa2xx_spi.h>
?#include <mach/pxa27x-udc.h>
+#include <mach/pxa-smemc.h>?#include <
linux/spi/spi.h>
?#include <linux/mfd/da903x.h>arch/arm/mach-pxa/stargate2.c +0
-0@@ -976,7 +977,7 @@ static void __init stargate2_init(void) ?{? ? ? ?/* This is probably a board specific hack as this must be set ? ? ? ? ? prior to connecting the MFP stuff up. */
- ? ? ? MECR &= ~MECR_NOS;
+ ? ? ?__raw_writel(__raw_readl(MECR) & ~MECR_NOS, MECR);? ? ? ?pxa2xx_mfp_config(ARRAY_AND_SIZE(stargate2_pin_config));
arch/arm/mach-pxa/tosa.c +0
-0@@ -46,6 +46,7 @@?#include <
mach/tosa_bt.h>
?#include <mach/pxa2xx_spi.h>
?#include <mach/audio.h>
+#include <mach/pxa-smemc.h>?#include <
asm/mach/arch.h>
?#include <mach/tosa.h>arch/arm/mach-pxa/tosa.c +2
-0@@ -893,9 +894,11 @@ static void tosa_poweroff(void) ?static void tosa_restart(char mode, const char *cmd) ?{ + ? ? ? uint32_t msc0 = __raw_readl(MSC0); +? ? ? ?/* Bootloader magic for a reboot */
- ? ? ?if((MSC0 & 0xffff0000) == 0x7ff00000)
- ? ? ? ? ? ? ? MSC0 = (MSC0 &0xffff) |0x7ee00000;
+ ? ? ?if((msc0 & 0xffff0000) == 0x7ff00000)
+ ? ? ? ? ? ? ?__raw_writel((msc0 & 0xffff) | 0x7ee00000, MSC0);? ? ? ?tosa_poweroff();
?}arch/arm/mach-pxa/trizeps4.c +0
-0@@ -47,6 +47,7 @@?#include <
mach/mmc.h>
?#include <mach/irda.h>
?#include <mach/ohci.h>
+#include <mach/pxa-smemc.h>
?#include <plat/i2c.h>?#include "
generic.h"arch/arm/mach-pxa/trizeps4.c +1
-1@@ -542,7 +543,7 @@ static void __init trizeps4_map_io(void) ? ? ? ?pxa2xx_map_io(); ? ? ? ?iotable_init(trizeps4_io_desc, ARRAY_SIZE(trizeps4_io_desc)); - ? ? ? if ((MSC0 & 0x8) && (BOOT_DEF & 0x1)) { + ? ? ? if ((__raw_readl(MSC0) & 0x8) && (__raw_readl(BOOT_DEF) & 0x1)) {? ? ? ? ? ? ? ?/* if flash is 16 bit wide its a Trizeps4 WL */ ? ? ? ? ? ? ? ?__machine_arch_type =
MACH_TYPE_TRIZEPS4WL; ? ? ? ? ? ? ? ?trizeps4_flash_data[0].width = 2;arch/arm/mach-pxa/xcep.c +0
-0@@ -31,6 +31,7 @@?#include <
mach/hardware.h>
?#include <mach/pxa2xx-regs.h>
?#include <mach/mfp-pxa25x.h>
+#include <mach/pxa-smemc.h>?#include "
generic.h"arch/arm/mach-pxa/xcep.c +0
-0@@ -172,9 +173,9 @@ static void __init xcep_init(void)? ? ? ?/* See Intel XScale Developer's Guide for details */
? ? ? ?/* Set RDF and RDN to appropriate values (chip select 3 (smc91x)) */
- ? ? ? MSC1 = (MSC1 &0xffff) |0xD5540000;
+ ? ? ?__raw_writel((__raw_readl(MSC1) & 0xffff) | 0xD5540000, MSC1); ? ? ? ?/* Set RDF and RDN to appropriate values (chip select 5 (fpga)) */
- ? ? ? MSC2 = (MSC2 &0xffff) |0x72A00000;
+ ? ? ?__raw_writel((__raw_readl(MSC2) & 0xffff) | 0x72A00000, MSC2);? ? ? ?platform_add_devices(ARRAY_AND_SIZE(devices)); ? ? ? ?pxa_set_i2c_info(&xcep_i2c_platform_data);
arch/arm/mach-pxa/zeus.c +0
-0@@ -47,6 +47,7 @@?#include <
mach/audio.h>
?#include <mach/arcom-pcmcia.h>
?#include <mach/zeus.h>
+#include <mach/pxa-smemc.h>?#include "
generic.h"arch/arm/mach-pxa/zeus.c +0
-0@@ -828,8 +829,8 @@ static void __init zeus_init(void) ? ? ? ?pr_info("Zeus CPLD V%dI%d\n", (system_rev & 0xf0) >> 4, (system_rev & 0x0f));? ? ? ?/* Fix timings for dm9000s (CS1/CS2)*/
- ? ? ? MSC0 = (MSC0 &0xffff) | (dm9000_msc<< 16);
- ? ? ? MSC1 = (MSC1 &0xffff0000) |dm9000_msc;
+ ? ? ?__raw_writel((MSC0 & 0xffff) | (dm9000_msc << 16), MSC0);
+ ? ? ?__raw_writel((MSC1 & 0xffff0000) | dm9000_msc, MSC1);? ? ? ?pm_power_off =
zeus_power_off;
? ? ? ?zeus_setup_apm();drivers/pcmcia/pxa2xx_base.c +0
-0@@ -26,6 +26,7 @@?#include <
linux/platform_device.h>?#include <
mach/hardware.h>
+#include <mach/pxa-smemc.h>
?#include <asm/io.h>
?#include <asm/irq.h>
?#include <asm/system.h>drivers/pcmcia/pxa2xx_base.c +15
-4@@ -116,37 +117,49 @@ static inline u_int pxa2xx_pcmcia_cmd_time(u_int mem_clk_10khz, ?static int pxa2xx_pcmcia_set_mcmem( int sock, int speed, int clock ) ?{ - ? ? ? MCMEM(sock) = ((pxa2xx_mcxx_setup(speed, clock) + ? ? ? uint32_t val; + + ? ? ? val = ((pxa2xx_mcxx_setup(speed, clock) ? ? ? ? ? ? ? ?& MCXX_SETUP_MASK) << MCXX_SETUP_SHIFT) ? ? ? ? ? ? ? ?| ((pxa2xx_mcxx_asst(speed, clock) ? ? ? ? ? ? ? ?& MCXX_ASST_MASK) << MCXX_ASST_SHIFT) ? ? ? ? ? ? ? ?| ((pxa2xx_mcxx_hold(speed, clock) ? ? ? ? ? ? ? ?& MCXX_HOLD_MASK) << MCXX_HOLD_SHIFT); + ? ? ? __raw_writel(val, MCMEM(sock)); + ? ? ? ?return 0; ?} ?static int pxa2xx_pcmcia_set_mcio( int sock, int speed, int clock ) ?{ - ? ? ? MCIO(sock) = ((pxa2xx_mcxx_setup(speed, clock) + ? ? ? uint32_t val; + + ? ? ? val = ((pxa2xx_mcxx_setup(speed, clock) ? ? ? ? ? ? ? ?& MCXX_SETUP_MASK) << MCXX_SETUP_SHIFT) ? ? ? ? ? ? ? ?| ((pxa2xx_mcxx_asst(speed, clock) ? ? ? ? ? ? ? ?& MCXX_ASST_MASK) << MCXX_ASST_SHIFT) ? ? ? ? ? ? ? ?| ((pxa2xx_mcxx_hold(speed, clock) ? ? ? ? ? ? ? ?& MCXX_HOLD_MASK) << MCXX_HOLD_SHIFT); + ? ? ? __raw_writel(val, MCIO(sock)); + ? ? ? ?return 0; ?} ?static int pxa2xx_pcmcia_set_mcatt( int sock, int speed, int clock ) ?{ - ? ? ? MCATT(sock) = ((pxa2xx_mcxx_setup(speed, clock) + ? ? ? uint32_t val; + + ? ? ? val = ((pxa2xx_mcxx_setup(speed, clock) ? ? ? ? ? ? ? ?& MCXX_SETUP_MASK) << MCXX_SETUP_SHIFT) ? ? ? ? ? ? ? ?| ((pxa2xx_mcxx_asst(speed, clock) ? ? ? ? ? ? ? ?& MCXX_ASST_MASK) << MCXX_ASST_SHIFT) ? ? ? ? ? ? ? ?| ((pxa2xx_mcxx_hold(speed, clock) ? ? ? ? ? ? ? ?& MCXX_HOLD_MASK) << MCXX_HOLD_SHIFT); + ? ? ? __raw_writel(val, MCATT(sock)); + ? ? ? ?return 0; ?}@@ -205,19 +218,18 @@ pxa2xx_pcmcia_frequency_change(struct soc_pcmcia_socket *skt, ?static void pxa2xx_configure_sockets(struct device *dev) ?{ ? ? ? ?struct pcmcia_low_level *ops = dev->platform_data; -? ? ? ?/*
? ? ? ? * We have at least one socket, so set MECR:CIT ? ? ? ? * (Card Is There)
? ? ? ? */
- ? ? ? MECR |=MECR_CIT;
+ ? ? ?uint32_tmecr =MECR_CIT;
Quoted 9 lines
? ? ? ?/* Set MECR:NOS (Number Of Sockets) */
? ? ? ?if ((ops->first+ops->nr) > 1 ||
? ? ? ? ? ?machine_is_viper() ||machine_is_arcom_zeus())
- ? ? ? ? ? ? ? MECR |=MECR_NOS;
- ? ? ? else
- ? ? ? ? ? ? ? MECR &= ~MECR_NOS;
+ ? ? ? ? ? ? ? mecr |=MECR_NOS;
+
+ ? ? ?__raw_writel(mecr, MECR);
In original, it only wants MECR |= MECR_NOS. But now, it becomes MECR = MECR_NOS. The meaning is changed.
Quoted 65 lines
?}
?static const char *skt_names[] = {
drivers/pcmcia/pxa2xx_base.c +24
-14@@ -272,14 +284,24 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev) ? ? ? ?struct soc_pcmcia_socket *skt; ? ? ? ?ops = (struct pcmcia_low_level *)dev->dev.platform_data; - ? ? ? if (!ops) - ? ? ? ? ? ? ? return -ENODEV; + ? ? ? if (!ops) { + ? ? ? ? ? ? ? ret = -ENODEV; + ? ? ? ? ? ? ? goto err0; + ? ? ? } + + ? ? ? if (cpu_is_pxa320() && ops->nr > 1) { + ? ? ? ? ? ? ? dev_err(&dev->dev, "pxa320 supports only one pcmcia slot"); + ? ? ? ? ? ? ? ret = -EINVAL; + ? ? ? ? ? ? ? goto err0; + ? ? ? } ? ? ? ?pxa2xx_drv_pcmcia_ops(ops); ? ? ? ?sinfo = kzalloc(SKT_DEV_INFO_SIZE(ops->nr), GFP_KERNEL); - ? ? ? if (!sinfo) - ? ? ? ? ? ? ? return -ENOMEM; + ? ? ? if (!sinfo) { + ? ? ? ? ? ? ? ret = -ENOMEM; + ? ? ? ? ? ? ? goto err0; + ? ? ? } ? ? ? ?sinfo->nskt = ops->nr;@@ -295,18 +317,19 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev) ? ? ? ? ? ? ? ?ret = pxa2xx_drv_pcmcia_add_one(skt); ? ? ? ? ? ? ? ?if (ret) - ? ? ? ? ? ? ? ? ? ? ? break; + ? ? ? ? ? ? ? ? ? ? ? goto err1; ? ? ? ?} - ? ? ? if (ret) { - ? ? ? ? ? ? ? while (--i >= 0) - ? ? ? ? ? ? ? ? ? ? ? soc_pcmcia_remove_one(&sinfo->skt[i]); - ? ? ? ? ? ? ? kfree(sinfo); - ? ? ? } else { - ? ? ? ? ? ? ? pxa2xx_configure_sockets(&dev->dev); - ? ? ? ? ? ? ? dev_set_drvdata(&dev->dev, sinfo); - ? ? ? } + ? ? ? pxa2xx_configure_sockets(&dev->dev); + ? ? ? dev_set_drvdata(&dev->dev, sinfo); + ? ? ? return 0; + +err1: + ? ? ? while (--i >= 0) + ? ? ? ? ? ? ? soc_pcmcia_remove_one(&sinfo->skt[i]); + ? ? ? kfree(sinfo); +err0: ? ? ? ?return ret; ?} --1.7.1
PATCH 2/13 ARM: pxa: Access SMEMC via virtual addresses
Dne Ne 10. ??jna 2010 02:31:24 Haojian Zhuang napsal(a):
Quoted 11 lines · Marek Vasut
Quoted 10 lines
This is important because on PXA3xx, the physical mapping of SMEMC registers differs from the one on PXA2xx. In order to get PCMCIA working on both PXA2xx and PXA320, the PCMCIA driver was adjusted accordingly as well.
Also, various places in the kernel had to be patched to use __raw_read/__raw_write.
Signed-off-by Marek Vasut <[email protected]>---
[SNIP]
Quoted 13 lines
Quoted 13 lines
(quoted diff) +0
-0@@ -205,19 +218,18 @@ pxa2xx_pcmcia_frequency_change(struct
soc_pcmcia_socket*skt, static voidpxa2xx_configure_sockets(struct device *dev){ struct pcmcia_low_level *ops = dev->platform_data;drivers/pcmcia/pxa2xx_base.c +1
-2-/* * We have at least one socket, so set MECR:CIT * (Card Is There) */ -MECR |=MECR_CIT ; +uint32_t mecr =MECR_CIT ;
Quoted 12 lines
drivers/pcmcia/pxa2xx_base.c pxa2xx_pcmcia_frequency_change(struct soc_pcmcia_socket *skt, · line 232
Quoted 9 lines
/* Set MECR:NOS (Number Of Sockets) */ if ((ops->first + ops->nr) > 1 || machine_is_viper() || machine_is_arcom_zeus())drivers/pcmcia/pxa2xx_base.c +3
-3-MECR |=MECR_NOS ; - else - MECR &= ~MECR_NOS; + mecr |=MECR_NOS ; + +__raw_writel (mecr,MECR );In original, it only wants MECR |=
MECR_NOS. But now, it becomes MECR =MECR_NOS. The meaning is changed.
The meaning is actually still the same, check the datasheet.
I admit the logic has changed a bit though.
Are you fine with having it this way ?
Cheers
Quoted 65 lines
Quoted 65 lines
}
static const char *skt_names[] = {
drivers/pcmcia/pxa2xx_base.c +23
-14@@ -272,14 +284,24 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev) struct soc_pcmcia_socket *skt; ops = (struct pcmcia_low_level *)dev->dev.platform_data; -if (!ops) -return -ENODEV ; +if (!ops) { + ret = -ENODEV ; + goto err0; + } + +if (cpu_is_pxa320 () && ops->nr >1 ) { +dev_err (&dev->dev,"pxa320 supports only one pcmcia slot"); + ret = -EINVAL; + goto err0; + }pxa2xx_drv_pcmcia_ops (ops); sinfo =kzalloc (SKT_DEV_INFO_SIZE (ops->nr),GFP_KERNEL ); -if (!sinfo) -return -ENOMEM ; +if (!sinfo) { + ret = -ENOMEM ; + goto err0; + } sinfo->nskt = ops->nr;@@ -295,18 +317,19 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev) ret =pxa2xx_drv_pcmcia_add_one (skt);if (ret) -break ; + goto err1; } -if (ret) { -while (--i >=0 ) -soc_pcmcia_remove_one (&sinfo->skt[i]); -kfree (sinfo); - }else { -pxa2xx_configure_sockets (&dev->dev); -dev_set_drvdata (&dev->dev, sinfo); - } +pxa2xx_configure_sockets (&dev->dev); +dev_set_drvdata (&dev->dev, sinfo); +return 0 ; + +err1: +while (--i >=0 ) +soc_pcmcia_remove_one (&sinfo->skt[i]); +kfree (sinfo); +err0:return ret; } --1.7.1
PATCH 3/13 ARM: pxa: Toradex Colibri PXA270 CF support
In reply to Marek VasutThis driver also contains structures to eventually support PXA320. This is planned to be added in a later patch.
--- arch/arm/mach-pxa/colibri-pxa270-evalboard.c | 18 ++ drivers/pcmcia/Kconfig | 2 +- drivers/pcmcia/Makefile | 1 + drivers/pcmcia/pxa2xx_colibri.c | 214 ++++++++++++++++++++++++++ 4 files changed, 234 insertions(+), 1 deletions(-) create mode 100644 drivers/pcmcia/pxa2xx_colibri.c
arch/arm/mach-pxa/colibri-pxa270-evalboard.c +18 -0
@@ -51,6 +51,24 @@ static mfp_cfg_t colibri_pxa270_evalboard_pin_config[] __initdata = {GPIO89_USBH1_PEN ,GPIO119_USBH2_PWR ,GPIO120_USBH2_PEN , + +/* PCMCIA */ + GPIO85_nPCE_1, + GPIO54_nPCE_2, + GPIO55_nPREG, + GPIO50_nPIOR, + GPIO51_nPIOW, + GPIO49_nPWE, + GPIO48_nPOE, + GPIO57_nIOIS16, + GPIO56_nPWAIT, +GPIO104_PSKTSEL , +GPIO53_GPIO ,/* RESET */ +GPIO83_GPIO ,/* BVD1 */ +GPIO82_GPIO ,/* BVD2 */ +GPIO1_GPIO ,/* READY */ +GPIO84_GPIO ,/* DETECT */ + GPIO107_GPIO, /* PPEN */ };/******************************************************************************
drivers/pcmcia/Kconfig +1 -1
@@ -215,7 +215,7 @@ config PCMCIA_PXA2XX depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \ || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \ || ARCOM_PCMCIA || ARCH_PXA_ESERIES || MACH_STARGATE2 \ - || MACH_VPAC270 || MACH_BALLOON3) + || MACH_VPAC270 || MACH_BALLOON3 || MACH_COLIBRI) select PCMCIA_SOC_COMMON help Say Y here to include support for the PXA2xx PCMCIA controller
drivers/pcmcia/Makefile +1 -0
@@ -70,6 +70,7 @@ pxa2xx-obj-$(CONFIG_MACH_E740) += pxa2xx_e740.o pxa2xx-obj-$(CONFIG_MACH_STARGATE2) += pxa2xx_stargate2.o pxa2xx-obj-$(CONFIG_MACH_VPAC270) += pxa2xx_vpac270.o pxa2xx-obj-$(CONFIG_MACH_BALLOON3) += pxa2xx_balloon3.o +pxa2xx-obj-$(CONFIG_MACH_COLIBRI) += pxa2xx_colibri.o obj-$(CONFIG_PCMCIA_PXA2XX) += pxa2xx_base.o $(pxa2xx-obj-y)
drivers/pcmcia/pxa2xx_colibri.c new file +214 -0
214 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH 4/13 ARM: pxa: Push Colibri evalboard MFP into module files
In reply to Marek VasutThis change -- pushing the MFP configuration back into Module files -- is necessary because some evalboards can be used with multiple modules, where MFP differs from module to module. Therefore MFP isn't board-specific, but module-specific and the module should preconfigure itself for the board.
(And there is also the C preprocesor limitation and conflicting #define-s)
--- arch/arm/mach-pxa/Kconfig | 8 +- arch/arm/mach-pxa/colibri-pxa270-evalboard.c | 61 ++++----------- arch/arm/mach-pxa/colibri-pxa270-income.c | 47 ----------- arch/arm/mach-pxa/colibri-pxa270.c | 96 ++++++++++++++++++++++ arch/arm/mach-pxa/colibri-pxa300.c | 61 ++++++--------- arch/arm/mach-pxa/colibri-pxa320.c | 112 ++++++++++---------------- arch/arm/mach-pxa/colibri-pxa3xx.c | 49 ----------- arch/arm/mach-pxa/include/mach/colibri.h | 6 ++ 8 files changed, 188 insertions(+), 252 deletions(-)
arch/arm/mach-pxa/Kconfig +4 -4
@@ -232,10 +232,6 @@ config MACH_COLIBRI bool "Toradex Colibri PXA270" select PXA27x -config MACH_COLIBRI_PXA270_EVALBOARD - bool "Toradex Colibri Evaluation Carrier Board support (PXA270)" - depends on MACH_COLIBRI - config MACH_COLIBRI_PXA270_INCOME bool "Income s.r.o. PXA270 SBC" depends on MACH_COLIBRI
@@ -253,6 +249,10 @@ config MACH_COLIBRI320 select PXA3xx select CPU_PXA320 +config MACH_COLIBRI_PXA270_EVALBOARD + bool "Toradex Colibri Evaluation Carrier Board support" + depends on MACH_COLIBRI || MACH_COLIBRI300 || MACH_COLIBRI320 + config MACH_VPAC270 bool "Voipac PXA270" select PXA27x
arch/arm/mach-pxa/colibri-pxa270-evalboard.c +15 -46
100 lines not on this page · raw message
arch/arm/mach-pxa/colibri-pxa270-income.c +0 -47
59 lines not on this page · raw message
arch/arm/mach-pxa/colibri-pxa270.c +96 -0
111 lines not on this page · raw message
arch/arm/mach-pxa/colibri-pxa300.c +24 -37
86 lines not on this page · raw message
arch/arm/mach-pxa/colibri-pxa320.c +43 -69
146 lines not on this page · raw message
arch/arm/mach-pxa/colibri-pxa3xx.c +0 -49
55 lines not on this page · raw message
arch/arm/mach-pxa/include/mach/colibri.h +6 -0
@@ -59,5 +59,11 @@ static inline void colibri_pxa3xx_init_nand(void) {}#define GPIO0_COLIBRI_PXA270_SD_DETECT 0#define GPIO113_COLIBRI_PXA270_TS_IRQ 113 +/* GPIO definitions for Colibri PXA300/310 */ +#define GPIO39_COLIBRI_PXA300_SD_DETECT 39 + +/* GPIO definitions for Colibri PXA320 */ +#define GPIO28_COLIBRI_PXA320_SD_DETECT 28 +#endif /* _COLIBRI_H_ */
Signature · 1 line
1.7.1
PATCH 5/13 ARM: pxa: Add M41T00 RTC support into Colibri evalboard
In reply to Marek Vasut--- arch/arm/mach-pxa/colibri-pxa270-evalboard.c | 23 +++++++++++++++++++++++ arch/arm/mach-pxa/colibri-pxa270.c | 4 ++++ arch/arm/mach-pxa/colibri-pxa300.c | 4 ++++ arch/arm/mach-pxa/colibri-pxa320.c | 4 ++++ 4 files changed, 35 insertions(+), 0 deletions(-)
arch/arm/mach-pxa/colibri-pxa270-evalboard.c +23 -0
@@ -19,6 +19,7 @@#include <asm/mach-types.h> #include <mach/hardware.h> #include <asm/mach/arch.h> +#include <linux/i2c.h> #include <mach/pxa27x.h> #include <mach/colibri.h>
@@ -26,6 +27,8 @@#include <mach/ohci.h> #include <mach/pxa27x-udc.h> +#include <plat/i2c.h> +#include "generic.h" #include "devices.h"
@@ -87,6 +90,25 @@ static void __init colibri_pxa270_uhc_init(void)static inline void colibri_pxa270_uhc_init (void ) {}#endif +/****************************************************************************** +* I2C RTC +******************************************************************************/ +#if defined(CONFIG_RTC_DRV_DS1307 ) || defined(CONFIG_RTC_DRV_DS1307_MODULE ) +static struct i2c_board_info __initdata colibri_pxa270_i2c_devs[] = { + { +I2C_BOARD_INFO ("m41t00" ,0x68 ), + }, +}; + +static void __init colibri_pxa270_rtc_init (void ) +{ +pxa_set_i2c_info (NULL ); +i2c_register_board_info (0 ,ARRAY_AND_SIZE (colibri_pxa270_i2c_devs)); +} +#else +static inline void colibri_pxa270_rtc_init (void ) {} +#endif +void __init colibri_pxa270_evalboard_init (void ) {pxa_set_ffuart_info (NULL );
@@ -95,4 +117,5 @@ void __init colibri_pxa270_evalboard_init(void)colibri_pxa270_mmc_init ();colibri_pxa270_uhc_init (); +colibri_pxa270_rtc_init (); }
arch/arm/mach-pxa/colibri-pxa270.c +4 -0
@@ -73,6 +73,10 @@ static mfp_cfg_t colibri_pxa270_evalboard_pin_config[] __initdata = {GPIO1_GPIO ,/* READY */ GPIO84_GPIO ,/* DETECT */ GPIO107_GPIO ,/* PPEN */ + +/* I2C */ +GPIO117_I2C_SCL , + GPIO118_I2C_SDA, };#else static mfp_cfg_t colibri_pxa270_evalboard_pin_config[]__initdata = {};
arch/arm/mach-pxa/colibri-pxa300.c +4 -0
@@ -46,6 +46,10 @@ static mfp_cfg_t colibri_pxa300_evalboard_pin_config[] __initdata = {/* UHC */ GPIO0_2_USBH_PEN ,GPIO1_2_USBH_PWR , + +/* I2C */ +GPIO21_I2C_SCL , + GPIO22_I2C_SDA, };#else static mfp_cfg_t colibri_pxa300_evalboard_pin_config[]__initdata = {};
arch/arm/mach-pxa/colibri-pxa320.c +4 -0
@@ -69,6 +69,10 @@ static mfp_cfg_t colibri_pxa320_evalboard_pin_config[] __initdata = {/* UHC */ GPIO2_2_USBH_PEN ,GPIO3_2_USBH_PWR , + +/* I2C */ +GPIO32_I2C_SCL , + GPIO33_I2C_SDA, };#else static mfp_cfg_t colibri_pxa320_evalboard_pin_config[]__initdata = {};
Signature · 1 line
1.7.1
PATCH 6/13 ARM: pxa: Rename Colibri evalboard
In reply to Marek VasutRename colibri-pxa270-evalboard to colibri-evalboard as this board is used with all Colibri modules.
--- arch/arm/mach-pxa/Kconfig | 2 +- arch/arm/mach-pxa/Makefile | 2 +- arch/arm/mach-pxa/colibri-evalboard.c | 121 ++++++++++++++++++++++++++ arch/arm/mach-pxa/colibri-pxa270-evalboard.c | 121 -------------------------- arch/arm/mach-pxa/colibri-pxa270.c | 6 +- arch/arm/mach-pxa/colibri-pxa300.c | 4 +- arch/arm/mach-pxa/colibri-pxa320.c | 4 +- arch/arm/mach-pxa/include/mach/colibri.h | 8 +- 8 files changed, 134 insertions(+), 134 deletions(-) create mode 100644 arch/arm/mach-pxa/colibri-evalboard.c delete mode 100644 arch/arm/mach-pxa/colibri-pxa270-evalboard.c
arch/arm/mach-pxa/Kconfig +1 -1
@@ -249,7 +249,7 @@ config MACH_COLIBRI320 select PXA3xx select CPU_PXA320 -config MACH_COLIBRI_PXA270_EVALBOARD +config MACH_COLIBRI_EVALBOARD bool "Toradex Colibri Evaluation Carrier Board support" depends on MACH_COLIBRI || MACH_COLIBRI300 || MACH_COLIBRI320
arch/arm/mach-pxa/Makefile +1 -1
@@ -60,7 +60,7 @@ obj-$(CONFIG_MACH_LOGICPD_PXA270) += lpd270.o obj-$(CONFIG_MACH_PCM027) += pcm027.o obj-$(CONFIG_MACH_PCM990_BASEBOARD) += pcm990-baseboard.o obj-$(CONFIG_MACH_COLIBRI) += colibri-pxa270.o -obj-$(CONFIG_MACH_COLIBRI_PXA270_EVALBOARD) += colibri-pxa270-evalboard.o +obj-$(CONFIG_MACH_COLIBRI_EVALBOARD) += colibri-evalboard.o obj-$(CONFIG_MACH_COLIBRI_PXA270_INCOME) += colibri-pxa270-income.o obj-$(CONFIG_MACH_COLIBRI300) += colibri-pxa3xx.o colibri-pxa300.o obj-$(CONFIG_MACH_COLIBRI320) += colibri-pxa3xx.o colibri-pxa320.o
arch/arm/mach-pxa/colibri-evalboard.c new file +121 -0
121 lines not on this page · raw message
arch/arm/mach-pxa/colibri-pxa270-evalboard.c deleted +0 -121
121 lines not on this page · raw message
arch/arm/mach-pxa/colibri-pxa270.c +3 -3
@@ -35,7 +35,7 @@/****************************************************************************** * Evaluation board MFP ******************************************************************************/ -#ifdef CONFIG_MACH_COLIBRI_PXA270_EVALBOARD +#ifdef CONFIG_MACH_COLIBRI_EVALBOARD static mfp_cfg_t colibri_pxa270_evalboard_pin_config[]__initdata = {/* MMC */ GPIO32_MMC_CLK,
@@ -281,10 +281,10 @@ static void __init colibri_pxa270_init(void)colibri_pxa270_tsc_init ();switch (colibri_pxa270_baseboard) { -case COLIBRI_PXA270_EVALBOARD : +case COLIBRI_EVALBOARD :pxa2xx_mfp_config (ARRAY_AND_SIZE ( colibri_pxa270_evalboard_pin_config)); -colibri_pxa270_evalboard_init (); +colibri_evalboard_init ();break ;case COLIBRI_PXA270_INCOME :pxa2xx_mfp_config (ARRAY_AND_SIZE (income_pin_config));
arch/arm/mach-pxa/colibri-pxa300.c +2 -2
@@ -32,7 +32,7 @@#include "devices.h" -#ifdef CONFIG_MACH_COLIBRI_PXA270_EVALBOARD +#ifdef CONFIG_MACH_COLIBRI_EVALBOARD static mfp_cfg_t colibri_pxa300_evalboard_pin_config[]__initdata = {/* MMC */ GPIO7_MMC1_CLK,
@@ -173,7 +173,7 @@ void __init colibri_pxa300_init(void)/* Evalboard init */ pxa3xx_mfp_config (ARRAY_AND_SIZE (colibri_pxa300_evalboard_pin_config)); -colibri_pxa270_evalboard_init (); +colibri_evalboard_init (); }MACHINE_START (COLIBRI300 ,"Toradex Colibri PXA300" )
arch/arm/mach-pxa/colibri-pxa320.c +2 -2
@@ -35,7 +35,7 @@#include "generic.h" #include "devices.h" -#ifdef CONFIG_MACH_COLIBRI_PXA270_EVALBOARD +#ifdef CONFIG_MACH_COLIBRI_EVALBOARD static mfp_cfg_t colibri_pxa320_evalboard_pin_config[]__initdata = {/* MMC */ GPIO22_MMC1_CLK,
@@ -229,7 +229,7 @@ void __init colibri_pxa320_init(void)/* Evalboard init */ pxa3xx_mfp_config (ARRAY_AND_SIZE (colibri_pxa320_evalboard_pin_config)); -colibri_pxa270_evalboard_init (); +colibri_evalboard_init (); }MACHINE_START (COLIBRI320 ,"Toradex Colibri PXA320" )
arch/arm/mach-pxa/include/mach/colibri.h +4 -4
@@ -9,14 +9,14 @@*/ enum { -COLIBRI_PXA270_EVALBOARD =0 , +COLIBRI_EVALBOARD =0 ,COLIBRI_PXA270_INCOME , }; -#if defined(CONFIG_MACH_COLIBRI_PXA270_EVALBOARD ) -extern void colibri_pxa270_evalboard_init (void ); +#if defined(CONFIG_MACH_COLIBRI_EVALBOARD ) +extern void colibri_evalboard_init (void );#else -static inline void colibri_pxa270_evalboard_init (void ) {} +static inline void colibri_evalboard_init (void ) {}#endif #if defined(CONFIG_MACH_COLIBRI_PXA270_INCOME )
Signature · 1 line
1.7.1
PATCH 7/13 ARM: pxa: Colibri PXA320 PCMCIA driver
In reply to Marek Vasut--- arch/arm/mach-pxa/colibri-pxa320.c | 21 +++++++++++++++++++++ drivers/pcmcia/Kconfig | 3 ++- drivers/pcmcia/Makefile | 1 + drivers/pcmcia/pxa2xx_colibri.c | 17 ++++++++++++++++- 4 files changed, 40 insertions(+), 2 deletions(-)
arch/arm/mach-pxa/colibri-pxa320.c +21 -0
@@ -73,6 +73,27 @@ static mfp_cfg_t colibri_pxa320_evalboard_pin_config[] __initdata = {/* I2C */ GPIO32_I2C_SCL ,GPIO33_I2C_SDA , + +/* PCMCIA */ +MFP_CFG (GPIO59 ,AF7 ),/* PRST ; AF7 to tristate */ +MFP_CFG (GPIO61 ,AF7 ),/* PCE1 ; AF7 to tristate */ +MFP_CFG (GPIO60 ,AF7 ),/* PCE2 ; AF7 to tristate */ +MFP_CFG (GPIO62 ,AF7 ),/* PCD ; AF7 to tristate */ +MFP_CFG (GPIO56 ,AF7 ),/* PSKTSEL ; AF7 to tristate */ +GPIO27_GPIO ,/* RDnWR ; input/tristate */ +GPIO50_GPIO ,/* PREG ; input/tristate */ +GPIO2_RDY , +GPIO5_NPIOR , +GPIO6_NPIOW , +GPIO7_NPIOS16 , +GPIO8_NPWAIT , +GPIO29_GPIO ,/* PRDY (READY GPIO) */ +GPIO57_GPIO ,/* PPEN (POWER GPIO) */ +GPIO81_GPIO ,/* PCD (DETECT GPIO) */ +GPIO77_GPIO ,/* PRST (RESET GPIO) */ +GPIO53_GPIO ,/* PBVD1 */ +GPIO79_GPIO ,/* PBVD2 */ + GPIO54_GPIO, /* POE */ };#else static mfp_cfg_t colibri_pxa320_evalboard_pin_config[]__initdata = {};
drivers/pcmcia/Kconfig +2 -1
@@ -215,7 +215,8 @@ config PCMCIA_PXA2XX depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \ || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \ || ARCOM_PCMCIA || ARCH_PXA_ESERIES || MACH_STARGATE2 \ - || MACH_VPAC270 || MACH_BALLOON3 || MACH_COLIBRI) + || MACH_VPAC270 || MACH_BALLOON3 || MACH_COLIBRI \ + || MACH_COLIBRI320) select PCMCIA_SOC_COMMON help Say Y here to include support for the PXA2xx PCMCIA controller
drivers/pcmcia/Makefile +1 -0
@@ -71,6 +71,7 @@ pxa2xx-obj-$(CONFIG_MACH_STARGATE2) += pxa2xx_stargate2.o pxa2xx-obj-$(CONFIG_MACH_VPAC270) += pxa2xx_vpac270.o pxa2xx-obj-$(CONFIG_MACH_BALLOON3) += pxa2xx_balloon3.o pxa2xx-obj-$(CONFIG_MACH_COLIBRI) += pxa2xx_colibri.o +pxa2xx-obj-$(CONFIG_MACH_COLIBRI320) += pxa2xx_colibri.o obj-$(CONFIG_PCMCIA_PXA2XX) += pxa2xx_base.o $(pxa2xx-obj-y)
drivers/pcmcia/pxa2xx_colibri.c +16 -1
@@ -27,6 +27,13 @@#define COLIBRI270_DETECT_GPIO 84#define COLIBRI270_READY_GPIO 1 +#define COLIBRI320_RESET_GPIO 77 +#define COLIBRI320_PPEN_GPIO 57 +#define COLIBRI320_BVD1_GPIO 53 +#define COLIBRI320_BVD2_GPIO 79 +#define COLIBRI320_DETECT_GPIO 81 +#define COLIBRI320_READY_GPIO 29 + static struct { int reset_gpio; int ppen_gpio;
@@ -186,6 +193,14 @@ static int __init colibri_pcmcia_init(void) colibri_pcmcia_gpio.bvd2_gpio =COLIBRI270_BVD2_GPIO ; colibri_pcmcia_gpio.detect_gpio =COLIBRI270_DETECT_GPIO ; colibri_pcmcia_gpio.ready_gpio =COLIBRI270_READY_GPIO ; +/* Colibri PXA320 */ + }else if (machine_is_colibri320 ()) { + colibri_pcmcia_gpio.reset_gpio =COLIBRI320_RESET_GPIO ; + colibri_pcmcia_gpio.ppen_gpio =COLIBRI320_PPEN_GPIO ; + colibri_pcmcia_gpio.bvd1_gpio =COLIBRI320_BVD1_GPIO ; + colibri_pcmcia_gpio.bvd2_gpio =COLIBRI320_BVD2_GPIO ; + colibri_pcmcia_gpio.detect_gpio =COLIBRI320_DETECT_GPIO ; + colibri_pcmcia_gpio.ready_gpio =COLIBRI320_READY_GPIO ; } ret = platform_device_add_data(colibri_pcmcia_device,
@@ -209,6 +224,6 @@ module_init(colibri_pcmcia_init);module_exit (colibri_pcmcia_exit);MODULE_AUTHOR ("Marek Vasut <[email protected]>" ); -MODULE_DESCRIPTION ("PCMCIA support for Toradex Colibri PXA270" ); +MODULE_DESCRIPTION ("PCMCIA support for Toradex Colibri PXA270/PXA320" );MODULE_ALIAS ("platform:pxa2xx-pcmcia" );MODULE_LICENSE ("GPL" );
Signature · 1 line
1.7.1
PATCH 8/13 ARM: pxa: Modularize Palm Tungsten|C
In reply to Marek Vasut--- arch/arm/mach-pxa/palmtc.c | 147 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 116 insertions(+), 31 deletions(-)
arch/arm/mach-pxa/palmtc.c +116 -31
@@ -25,6 +25,7 @@#include <linux/power_supply.h> #include <linux/gpio_keys.h> #include <linux/mtd/physmap.h> +#include <linux/usb/gpio_vbus.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
@@ -116,6 +117,7 @@ static unsigned long palmtc_pin_config[] __initdata = {/****************************************************************************** * SD/MMC card controller ******************************************************************************/ +#if defined(CONFIG_MMC_PXA ) || defined(CONFIG_MMC_PXA_MODULE )static struct pxamci_platform_data palmtc_mci_platform_data = { .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .gpio_power = GPIO_NR_PALMTC_SD_POWER,
@@ -124,9 +126,18 @@ static struct pxamci_platform_data palmtc_mci_platform_data = { .detect_delay_ms = 200, }; +static void __init palmtc_mmc_init (void ) +{ +pxa_set_mci_info (&palmtc_mci_platform_data); +} +#else +static inline void palmtc_mmc_init (void ) {} +#endif +/****************************************************************************** * GPIO keys ******************************************************************************/ +#if defined(CONFIG_KEYBOARD_GPIO ) || defined(CONFIG_KEYBOARD_GPIO_MODULE )static struct gpio_keys_button palmtc_pxa_buttons[] = { {KEY_F8 ,GPIO_NR_PALMTC_HOTSYNC_BUTTON ,1 ,"HotSync Button" ,EV_KEY ,1 }, };
@@ -144,9 +155,18 @@ static struct platform_device palmtc_pxa_keys = { }, }; +static void __init palmtc_keys_init (void ) +{ +platform_device_register (&palmtc_pxa_keys); +} +#else +static inline void palmtc_keys_init (void ) {} +#endif +/****************************************************************************** * Backlight ******************************************************************************/ +#if defined(CONFIG_BACKLIGHT_PWM ) || defined(CONFIG_BACKLIGHT_PWM_MODULE )static int palmtc_backlight_init (struct device *dev) {int ret;
@@ -196,17 +216,35 @@ static struct platform_device palmtc_backlight = { }, }; +static void __init palmtc_pwm_init (void ) +{ +platform_device_register (&palmtc_backlight); +} +#else +static inline void palmtc_pwm_init (void ) {} +#endif +/****************************************************************************** * IrDA ******************************************************************************/ +#if defined(CONFIG_IRDA ) || defined(CONFIG_IRDA_MODULE )static struct pxaficp_platform_data palmtc_ficp_platform_data = { .gpio_pwdown =GPIO_NR_PALMTC_IR_DISABLE , .transceiver_cap =IR_SIRMODE |IR_OFF , }; +static void __init palmtc_irda_init (void ) +{ +pxa_set_ficp_info (&palmtc_ficp_platform_data); +} +#else +static inline void palmtc_irda_init (void ) {} +#endif +/****************************************************************************** * Keyboard ******************************************************************************/ +#if defined(CONFIG_KEYBOARD_MATRIX ) || defined(CONFIG_KEYBOARD_MATRIX_MODULE )static const uint32_t palmtc_matrix_keys[] = {KEY (0 ,0 ,KEY_F1 ), KEY(0, 1, KEY_X),
@@ -290,27 +328,63 @@ static struct platform_device palmtc_keyboard = { .platform_data = &palmtc_keypad_platform_data, }, }; +static void __init palmtc_mkp_init (void ) +{ +platform_device_register (&palmtc_keyboard); +} +#else +static inline void palmtc_mkp_init (void ) {} +#endif /****************************************************************************** * UDC ******************************************************************************/ -static struct pxa2xx_udc_mach_info palmtc_udc_info__initdata = { +#if defined(CONFIG_USB_GADGET_PXA25X )||defined(CONFIG_USB_GADGET_PXA25X_MODULE ) +static struct gpio_vbus_mach_info palmtc_udc_info = { .gpio_vbus =GPIO_NR_PALMTC_USB_DETECT_N , .gpio_vbus_inverted =1 , .gpio_pullup =GPIO_NR_PALMTC_USB_POWER , }; +static struct platform_device palmtc_gpio_vbus = { + .name ="gpio-vbus" , + .id =-1 , + .dev = { + .platform_data = &palmtc_udc_info, + }, +}; + +static void __init palmtc_udc_init (void ) +{ +platform_device_register (&palmtc_gpio_vbus); +}; +#else +static inline void palmtc_udc_init (void ) {} +#endif +/****************************************************************************** * Touchscreen / Battery / GPIO-extender ******************************************************************************/ -static struct platform_device palmtc_ucb1400_core = { +#if defined(CONFIG_TOUCHSCREEN_UCB1400 ) || \ + defined(CONFIG_TOUCHSCREEN_UCB1400_MODULE ) +static struct platform_device palmtc_ucb1400_device = { .name ="ucb1400_core" , .id =-1 , }; +static void __init palmtc_ts_init (void ) +{ +pxa_set_ac97_info (NULL ); +platform_device_register (&palmtc_ucb1400_device); +} +#else +static inline void palmtc_ts_init (void ) {} +#endif +/****************************************************************************** * NOR Flash ******************************************************************************/ +#if defined(CONFIG_MTD_PHYSMAP ) || defined(CONFIG_MTD_PHYSMAP_MODULE )static struct resource palmtc_flash_resource = { .start =PXA_CS0_PHYS , .end = PXA_CS0_PHYS + SZ_16M - 1,
@@ -356,24 +430,33 @@ static struct platform_device palmtc_flash = { }, }; +static void __init palmtc_nor_init (void ) +{ +platform_device_register (&palmtc_flash); +} +#else +static inline void palmtc_nor_init (void ) {} +#endif +/****************************************************************************** * Framebuffer ******************************************************************************/ +#if defined(CONFIG_FB_PXA ) || defined(CONFIG_FB_PXA_MODULE )static struct pxafb_mode_info palmtc_lcd_modes[] = { -{ - .pixclock =115384 , - .xres =320 , - .yres =320 , - .bpp =16 , - - .left_margin =27 , - .right_margin =7 , - .upper_margin =7 , - .lower_margin =8 , - - .hsync_len =6 , - .vsync_len =1 , -}, + { + .pixclock =115384 , + .xres =320 , + .yres =320 , + .bpp =16 , + + .left_margin =27 , + .right_margin =7 , + .upper_margin =7 , + .lower_margin =8 , + + .hsync_len =6 , + .vsync_len =1 , + }, }; static struct pxafb_mach_info palmtc_lcd_screen = {
@@ -382,17 +465,17 @@ static struct pxafb_mach_info palmtc_lcd_screen = { .lcd_conn = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL, }; +static void __init palmtc_lcd_init (void ) +{ +set_pxa_fb_info (&palmtc_lcd_screen); +} +#else +static inline void palmtc_lcd_init (void ) {} +#endif +/****************************************************************************** * Machine init ******************************************************************************/ -static struct platform_device *devices[]__initdata = { - &palmtc_backlight, - &palmtc_ucb1400_core, - &palmtc_keyboard, - &palmtc_pxa_keys, - &palmtc_flash, -}; -static void __init palmtc_init (void ) {pxa2xx_mfp_config (ARRAY_AND_SIZE (palmtc_pin_config));
@@ -402,13 +485,15 @@ static void __init palmtc_init(void)pxa_set_stuart_info (NULL );pxa_set_hwuart_info (NULL ); -set_pxa_fb_info (&palmtc_lcd_screen); -pxa_set_mci_info (&palmtc_mci_platform_data); -pxa_set_udc_info (&palmtc_udc_info); -pxa_set_ac97_info (NULL ); -pxa_set_ficp_info (&palmtc_ficp_platform_data); - -platform_add_devices (devices,ARRAY_SIZE (devices)); +palmtc_mmc_init (); +palmtc_keys_init (); +palmtc_pwm_init (); +palmtc_irda_init (); +palmtc_mkp_init (); +palmtc_udc_init (); +palmtc_ts_init (); +palmtc_nor_init (); +palmtc_lcd_init (); };MACHINE_START (PALMTC ,"Palm Tungsten|C" )
Signature · 1 line
1.7.1
PATCH 9/13 UCB1400: Pass ucb1400-gpio data through ac97 bus
In reply to Marek Vasut--- drivers/gpio/ucb1400_gpio.c | 19 ++++++------------- drivers/mfd/ucb1400_core.c | 5 +++++ include/linux/ucb1400.h | 19 ++++++------------- 3 files changed, 17 insertions(+), 26 deletions(-)
drivers/gpio/ucb1400_gpio.c +6 -13
@@ -12,8 +12,6 @@#include <linux/module.h> #include <linux/ucb1400.h> -struct ucb1400_gpio_data *ucbdata; -static int ucb1400_gpio_dir_in (struct gpio_chip *gc,unsigned off) {struct ucb1400_gpio *gpio;
@@ -50,7 +48,7 @@ static int ucb1400_gpio_probe(struct platform_device *dev)struct ucb1400_gpio *ucb = dev->dev.platform_data;int err =0 ; -if (!(ucbdata && ucbdata->gpio_offset)) { +if (!(ucb && ucb->gpio_offset)) { err = -EINVAL ; goto err; }
@@ -58,7 +56,7 @@ static int ucb1400_gpio_probe(struct platform_device *dev)platform_set_drvdata (dev, ucb); ucb->gc.label ="ucb1400_gpio" ; - ucb->gc.base = ucbdata->gpio_offset; + ucb->gc.base = ucb->gpio_offset; ucb->gc.ngpio =10 ; ucb->gc.owner =THIS_MODULE ;
@@ -72,8 +70,8 @@ static int ucb1400_gpio_probe(struct platform_device *dev)if (err) goto err; -if (ucbdata && ucbdata->gpio_setup) - err = ucbdata->gpio_setup (&dev->dev, ucb->gc.ngpio); +if (ucb && ucb->gpio_setup) + err = ucb->gpio_setup (&dev->dev, ucb->gc.ngpio); err:return err;
@@ -85,8 +83,8 @@ static int ucb1400_gpio_remove(struct platform_device *dev)int err =0 ;struct ucb1400_gpio *ucb =platform_get_drvdata (dev); -if (ucbdata && ucbdata->gpio_teardown) { - err = ucbdata->gpio_teardown (&dev->dev, ucb->gc.ngpio); +if (ucb && ucb->gpio_teardown) { + err = ucb->gpio_teardown (&dev->dev, ucb->gc.ngpio);if (err)return err; }
@@ -113,11 +111,6 @@ static void __exit ucb1400_gpio_exit(void)platform_driver_unregister (&ucb1400_gpio_driver); } -void __init ucb1400_gpio_set_data (struct ucb1400_gpio_data *data) -{ - ucbdata = data; -} -module_init (ucb1400_gpio_init);module_exit (ucb1400_gpio_exit);
drivers/mfd/ucb1400_core.c +5 -0
@@ -75,6 +75,11 @@ static int ucb1400_core_probe(struct device *dev)/* GPIO */ ucb_gpio.ac97 = ac97; +if (pdata) { + ucb_gpio.gpio_setup = pdata->gpio_setup; + ucb_gpio.gpio_teardown = pdata->gpio_teardown; + ucb_gpio.gpio_offset = pdata->gpio_offset; + } ucb->ucb1400_gpio =platform_device_alloc ("ucb1400_gpio" ,-1 );if (!ucb->ucb1400_gpio) { err = -ENOMEM ;
include/linux/ucb1400.h +6 -13
@@ -83,15 +83,12 @@#define UCB_ID 0x7e#define UCB_ID_1400 0x4304 -struct ucb1400_gpio_data { -int gpio_offset; -int (*gpio_setup)(struct device *dev,int ngpio); -int (*gpio_teardown)(struct device *dev,int ngpio); -}; -struct ucb1400_gpio {struct gpio_chip gc;struct snd_ac97 *ac97; +int gpio_offset; +int (*gpio_setup)(struct device *dev,int ngpio); +int (*gpio_teardown)(struct device *dev,int ngpio); };struct ucb1400_ts {
@@ -112,6 +109,9 @@ struct ucb1400 {struct ucb1400_pdata {int irq; +int gpio_offset; +int (*gpio_setup)(struct device *dev,int ngpio); +int (*gpio_teardown)(struct device *dev,int ngpio); };static inline u16 ucb1400_reg_read (struct snd_ac97 *ac97,u16 reg)
@@ -163,11 +163,4 @@ static inline void ucb1400_adc_disable(struct snd_ac97 *ac97)unsigned int ucb1400_adc_read (struct snd_ac97 *ac97,u16 adc_channel,int adcsync); - -#ifdef CONFIG_GPIO_UCB1400 -void __init ucb1400_gpio_set_data (struct ucb1400_gpio_data *data); -#else -static inline void ucb1400_gpio_set_data (struct ucb1400_gpio_data *data) {} -#endif -#endif
Signature · 1 line
1.7.1
PATCH 10/13 ARM: pxa: Correct touch IRQ passing to UCB1400 on vpac270
In reply to Marek Vasut--- arch/arm/mach-pxa/vpac270.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-)
arch/arm/mach-pxa/vpac270.c +5 -7
@@ -430,20 +430,18 @@ static inline void vpac270_eth_init(void) {}******************************************************************************/ #if defined(CONFIG_TOUCHSCREEN_UCB1400 ) || \ defined(CONFIG_TOUCHSCREEN_UCB1400_MODULE ) -static pxa2xx_audio_ops_t vpac270_ac97_pdata = { - .reset_gpio =95 , -}; -static struct ucb1400_pdata vpac270_ucb1400_pdata = { .irq =IRQ_GPIO (GPIO113_VPAC270_TS_IRQ ), }; +static pxa2xx_audio_ops_t vpac270_ac97_pdata = { + .reset_gpio =95 , + .codec_pdata = { &vpac270_ucb1400_pdata, }, +}; +static struct platform_device vpac270_ucb1400_device = { .name ="ucb1400_core" , .id =-1 , - .dev = { - .platform_data = &vpac270_ucb1400_pdata, - }, };static void __init vpac270_ts_init (void )
Signature · 1 line
1.7.1
PATCH 11/13 ARM: pxa: Pass GPIO offset to ucb1400-gpio on PalmTC
In reply to Marek Vasut--- arch/arm/mach-pxa/palmtc.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-)
arch/arm/mach-pxa/palmtc.c +9 -1
@@ -367,6 +367,14 @@ static inline void palmtc_udc_init(void) {}******************************************************************************/ #if defined(CONFIG_TOUCHSCREEN_UCB1400 ) || \ defined(CONFIG_TOUCHSCREEN_UCB1400_MODULE ) +static struct ucb1400_pdata palmtc_ucb1400_pdata = { + .gpio_offset =PALMTC_UCB1400_GPIO_OFFSET , +}; + +static pxa2xx_audio_ops_t palmtc_ac97_pdata = { + .codec_pdata = { &palmtc_ucb1400_pdata, }, +}; +static struct platform_device palmtc_ucb1400_device = { .name ="ucb1400_core" , .id = -1,
@@ -374,7 +382,7 @@ static struct platform_device palmtc_ucb1400_device = {static void __init palmtc_ts_init (void ) { -pxa_set_ac97_info (NULL ); +pxa_set_ac97_info (&palmtc_ac97_pdata);platform_device_register (&palmtc_ucb1400_device); }#else
Signature · 1 line
1.7.1
PATCH 12/13 ARM: pxa: Add gpio-leds and vibrator support to PalmTC
In reply to Marek Vasut--- arch/arm/mach-pxa/palmtc.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-)
arch/arm/mach-pxa/palmtc.c +41 -0
@@ -390,6 +390,46 @@ static inline void palmtc_ts_init(void) {}#endif /****************************************************************************** +* LEDs +******************************************************************************/ +#if defined(CONFIG_LEDS_GPIO ) || defined(CONFIG_LEDS_GPIO_MODULE ) +struct gpio_led palmtc_gpio_leds[] = { +{ + .name ="palmtc:green:user" , + .default_trigger ="none" , + .gpio =GPIO_NR_PALMTC_LED_POWER , + .active_low =1 , +}, { + .name ="palmtc:vibra:vibra" , + .default_trigger ="none" , + .gpio =GPIO_NR_PALMTC_VIBRA_POWER , + .active_low =1 , +} + +}; + +static struct gpio_led_platform_data palmtc_gpio_led_info = { + .leds = palmtc_gpio_leds, + .num_leds =ARRAY_SIZE (palmtc_gpio_leds), +}; + +static struct platform_device palmtc_leds = { + .name ="leds-gpio" , + .id =-1 , + .dev = { + .platform_data = &palmtc_gpio_led_info, + } +}; + +static void __init palmtc_leds_init (void ) +{ +platform_device_register (&palmtc_leds); +} +#else +static inline void palmtc_leds_init (void ) {} +#endif + +/****************************************************************************** * NOR Flash ******************************************************************************/ #if defined(CONFIG_MTD_PHYSMAP ) || defined(CONFIG_MTD_PHYSMAP_MODULE )
@@ -502,6 +542,7 @@ static void __init palmtc_init(void)palmtc_ts_init ();palmtc_nor_init ();palmtc_lcd_init (); +palmtc_leds_init (); };MACHINE_START (PALMTC ,"Palm Tungsten|C" )
Signature · 1 line
1.7.1
Haojian Zhuang
maintainerPATCH 12/13 ARM: pxa: Add gpio-leds and vibrator support to PalmTC
Quoted 18 lines · Marek Vasut
Signed-off-by Marek Vasut <[email protected]>---
?arch/arm/mach-pxa/palmtc.c | ? 41 +++++++++++++++++++++++++++++++++++++++++ ?1 files changed, 41 insertions(+), 0 deletions(-)arch/arm/mach-pxa/palmtc.c +0
-0@@ -390,6 +390,46 @@ static inline void palmtc_ts_init(void) {}?#endif
?/******************************************************************************
+ * LEDs
+ ******************************************************************************/arch/arm/mach-pxa/palmtc.c +3
-0+#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE) +struct gpio_led palmtc_gpio_leds[] = { +{
arch/arm/mach-pxa/palmtc.c
Quoted 10 lines
arch/arm/mach-pxa/palmtc.c +10
-0+ ? ? ? .name ? ? ? ? ? ? ? ? ? = "palmtc:green:user", + ? ? ? .default_trigger ? ? ? ?= "none", + ? ? ? .gpio ? ? ? ? ? ? ? ? ? = GPIO_NR_PALMTC_LED_POWER, + ? ? ? .active_low ? ? ? ? ? ? = 1, +}, { + ? ? ? .name ? ? ? ? ? ? ? ? ? = "palmtc:vibra:vibra", + ? ? ? .default_trigger ? ? ? ?= "none", + ? ? ? .gpio ? ? ? ? ? ? ? ? ? = GPIO_NR_PALMTC_VIBRA_POWER, + ? ? ? .active_low ? ? ? ? ? ? = 1, +}
Do you need to use a tab before contents in structure?
Quoted 40 lines
arch/arm/mach-pxa/palmtc.c +25
-0+ +}; + +static struct gpio_led_platform_data palmtc_gpio_led_info = { + ? ? ? .leds ? ? ? ? ? = palmtc_gpio_leds, + ? ? ? .num_leds ? ? ? = ARRAY_SIZE(palmtc_gpio_leds), +}; + +static struct platform_device palmtc_leds = { + ? ? ? .name ? = "leds-gpio", + ? ? ? .id ? ? = -1, + ? ? ? .dev ? ?= { + ? ? ? ? ? ? ? .platform_data ?= &palmtc_gpio_led_info, + ? ? ? } +}; + +static void __init palmtc_leds_init (void ) +{ + ? ? ? platform_device_register(&palmtc_leds); +} +#else +static inline void palmtc_leds_init (void ) {} +#endif + +/****************************************************************************** ?* NOR Flash ?******************************************************************************/ ?#if
defined(CONFIG_MTD_PHYSMAP)||defined(CONFIG_MTD_PHYSMAP_MODULE)arch/arm/mach-pxa/palmtc.c +1
-1@@ -502,6 +542,7 @@ static void __init palmtc_init(void) ? ? ? ?palmtc_ts_init(); ? ? ? ?palmtc_nor_init(); ? ? ? ?palmtc_lcd_init(); + ? ? ? palmtc_leds_init(); ?}; ?MACHINE_START(PALMTC, "Palm Tungsten|C") --1.7.1
PATCH 12/13 ARM: pxa: Add gpio-leds and vibrator support to PalmTC
Dne Ne 10. ??jna 2010 02:34:48 Haojian Zhuang napsal(a):
Quoted 25 lines · Marek Vasut
Quoted 24 lines
Signed-off-by Marek Vasut <[email protected]>--- arch/arm/mach-pxa/palmtc.c | 41+++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-)
arch/arm/mach-pxa/palmtc.c +1
-0@@ -390,6 +390,46 @@ static inline void palmtc_ts_init(void) {}#endif /*********************************************************************** ******* + * LEDs +************************************************************************ ******/ +#if defined(CONFIG_LEDS_GPIO) ||
defined(CONFIG_LEDS_GPIO_MODULE)+structgpio_ledpalmtc_gpio_leds[] = {arch/arm/mach-pxa/palmtc.c +5
-0+{ + .name = "palmtc:green:user", + .default_trigger = "none", + .gpio = GPIO_NR_PALMTC_LED_POWER, + .active_low = 1,
Quoted 8 lines
arch/arm/mach-pxa/palmtc.c static inline void palmtc_ts_init(void) {} · line 407
Quoted 6 lines
arch/arm/mach-pxa/palmtc.c +6
-0+}, { + .name = "palmtc:vibra:vibra", + .default_trigger = "none", + .gpio = GPIO_NR_PALMTC_VIBRA_POWER, + .active_low = 1, +}Do you need to use a tab before contents in structure?
I dunno if checkpatch warns about it, but I'm used to it and it looks better.
Quoted 40 lines
Quoted 40 lines
arch/arm/mach-pxa/palmtc.c +25
-0+ +}; + +static struct gpio_led_platform_data palmtc_gpio_led_info = { + .leds = palmtc_gpio_leds, + .num_leds =ARRAY_SIZE (palmtc_gpio_leds), +}; + +static struct platform_device palmtc_leds = { + .name ="leds-gpio" , + .id =-1 , + .dev = { + .platform_data = &palmtc_gpio_led_info, + } +}; + +static void __init palmtc_leds_init (void ) +{ +platform_device_register (&palmtc_leds); +} +#else +static inline void palmtc_leds_init (void ) {} +#endif + +/*********************************************************************** ******* * NOR Flash
************************************************************************
******/ #ifdefined(CONFIG_MTD_PHYSMAP)||defined(CONFIG_MTD_PHYSMAP_MODULE)@@ -502,6 +542,7 @@ static void__initpalmtc_init(void)palmtc_ts_init(); palmtc_nor_init(); palmtc_lcd_init();+
palmtc_leds_init();
};
MACHINE_START(PALMTC, "Palm Tungsten|C")
--
1.7.1
PATCH 13/13 ARM: pxa: Fix pxa2xx-flash section mismatch
In reply to Marek Vasut--- drivers/mtd/maps/pxa2xx-flash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/mtd/maps/pxa2xx-flash.c +1 -1
@@ -51,7 +51,7 @@ struct pxa2xx_flash_info {static const char *probes[] = {"RedBoot" ,"cmdlinepart" ,NULL }; -static int __init pxa2xx_flash_probe (struct platform_device *pdev) +static int __devinit pxa2xx_flash_probe (struct platform_device *pdev) {struct flash_platform_data *flash = pdev->dev.platform_data;struct pxa2xx_flash_info *info;
Signature · 1 line
1.7.1
Haojian Zhuang
maintainerPATCH 13/13 ARM: pxa: Fix pxa2xx-flash section mismatch
Quoted 19 lines · Marek Vasut
Signed-off-by Marek Vasut <[email protected]>---
?drivers/mtd/maps/pxa2xx-flash.c | ? ?2 +-
?1 files changed, 1 insertions(+), 1 deletions(-)drivers/mtd/maps/pxa2xx-flash.c +1
-2@@ -51,7 +51,7 @@ struct pxa2xx_flash_info { ?static const char *probes[] = { "RedBoot", "cmdlinepart", NULL }; -static int __init pxa2xx_flash_probe (struct platform_device *pdev) +static int __devinit pxa2xx_flash_probe (struct platform_device *pdev) ?{ ? ? ? ?struct flash_platform_data *flash = pdev->dev.platform_data; ? ? ? ?struct pxa2xx_flash_info *info; --
Quoted 3 lines
1.7.1
Acked.
PATCH 13/13 ARM: pxa: Fix pxa2xx-flash section mismatch
Dne Ne 10. ??jna 2010 02:32:42 Haojian Zhuang napsal(a):
Quoted 14 lines · Marek Vasut
Quoted 13 lines
Signed-off-by Marek Vasut <[email protected]>--- drivers/mtd/maps/pxa2xx-flash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)(quoted diff) +0
-0
b/drivers/mtd/maps/pxa2xx-flash.cindex dd90880..d8ae634 100644drivers/mtd/maps/pxa2xx-flash.c +0
-0@@ -51,7 +51,7 @@ struct pxa2xx_flash_info {static const char *probes[] = {"RedBoot" ,"cmdlinepart" ,NULL };
Quoted 9 lines
Quoted 7 lines
drivers/mtd/maps/pxa2xx-flash.c +1
-2-static int __init pxa2xx_flash_probe (struct platform_device *pdev) +static int __devinit pxa2xx_flash_probe (struct platform_device *pdev) {struct flash_platform_data *flash = pdev->dev.platform_data;struct pxa2xx_flash_info *info; --1.7.1
Acked.
Can you please send me a formal acked-by line for the patches you acked ? Thanks and sorry for the bugging :)
PATCH 1/13 ARM: pxa: Introduce pxa[23]xx_map_io
In reply to Marek VasutHi Marek,
Quoted 29 lines · Marek Vasut
This patch introduces
pxa2xx_map_io()andpxa3xx_map_io()to distinguish between PXA2xx and PXA3xx memory mapping.Also, fixup for platforms broken after introducing
pxa2xx_map_io()andpxa3xx_map_io()is included.Signed-off-by Marek Vasut <[email protected]>---
arch/arm/mach-pxa/spitz.c +2
-0@@ -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> @@ -44,6 +45,7 @@#include <mach/pxa2xx_spi.h> #include <mach/spitz.h> #include <mach/sharpsl_pm.h> +#include <mach/pxa-smemc.h> #include <plat/i2c.h>
arch/arm/mach-pxa/spitz.c static void spitz_poweroff(void) · line 936
Quoted 7 lines
arch/arm/mach-pxa/spitz.c +2
-2@@ -930,8 +932,8 @@ static void spitz_poweroff(void)static void spitz_restart (char mode,const char *cmd) {/* Bootloader magic for a reboot */ -if ((MSC0 &0xffff0000 ) ==0x7ff00000 ) -MSC0 = (MSC0 &0xffff ) |0x7ee00000 ; +if ((__raw_readl (MSC0 ) &0xffff0000 ) ==0x7ff00000 ) +__raw_writel ((__raw_readl (MSC0 ) &0xffff ) |0x7ee00000 ,MSC0 );
I believe, this is not related to the subject...
Signature · 2 lines
Regards, Igor.
PATCH 1/13 ARM: pxa: Introduce pxa[23]xx_map_io
Dne Ne 10. ??jna 2010 09:38:29 Igor Grinberg napsal(a):
Quoted 41 lines
Hi Marek,
Quoted 38 lines · Marek Vasut
This patch introduces
pxa2xx_map_io()andpxa3xx_map_io()to distinguish between PXA2xx and PXA3xx memory mapping.Also, fixup for platforms broken after introducing
pxa2xx_map_io()andpxa3xx_map_io()is included.Signed-off-by Marek Vasut <[email protected]>---
arch/arm/mach-pxa/spitz.c +1
-0@@ -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>arch/arm/mach-pxa/spitz.c +1
-0@@ -44,6 +45,7 @@#include <mach/pxa2xx_spi.h> #include <mach/spitz.h> #include <mach/sharpsl_pm.h> +#include <mach/pxa-smemc.h> #include <
plat/i2c.h>arch/arm/mach-pxa/spitz.c +0
-0@@ -930,8 +932,8 @@ static void spitz_poweroff(void)static void spitz_restart (char mode,const char *cmd) {
Quoted 8 lines
arch/arm/mach-pxa/spitz.c static void spitz_poweroff(void) · line 936
Quoted 6 lines
arch/arm/mach-pxa/spitz.c +2
-2/* Bootloader magic for a reboot */ -if ((MSC0 &0xffff0000 ) ==0x7ff00000 ) -MSC0 = (MSC0 &0xffff ) |0x7ee00000 ; +if ((__raw_readl (MSC0 ) &0xffff0000 ) ==0x7ff00000 ) +__raw_writel ((__raw_readl (MSC0 ) &0xffff ) |0x7ee00000 ,MSC0 );I believe, this is not related to the subject...
Thanks a lot, I got this fixed in my tree, will send a v2.