ARM: pxa: Access SMEMC via virtual addresses
Subsystems (4)
PATCH v3 1/1 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.
Signed-off-by Marek Vasut <[email protected]>
Acked-by Haojian Zhuang <[email protected]>
---
v3: Fix remaining mistakes Russell pointed out (not reading MSC0 in zeus.c, MECR problems in pcmcia).
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 | 1 + arch/arm/mach-pxa/h5000.c | 9 ++-- arch/arm/mach-pxa/include/mach/pxa2xx-regs.h | 55 ------------------- arch/arm/mach-pxa/include/mach/smemc.h | 74 ++++++++++++++++++++++++++ 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/pxa25x.c | 5 +- arch/arm/mach-pxa/pxa27x.c | 10 ++-- arch/arm/mach-pxa/pxa3xx.c | 5 +- arch/arm/mach-pxa/sleep.S | 2 +- arch/arm/mach-pxa/smemc.c | 51 ++++++------------ arch/arm/mach-pxa/spitz.c | 6 ++- 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 | 28 +++++++--- 22 files changed, 173 insertions(+), 137 deletions(-) create mode 100644 arch/arm/mach-pxa/include/mach/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/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/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 ((preset_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/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 +1 -0
@@ -28,6 +28,7 @@#include <mach/reset.h> #include <mach/gpio.h> +#include <mach/smemc.h> #include "generic.h"
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/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/pxa2xx-regs.h +0 -55
61 lines not on this page · raw message
arch/arm/mach-pxa/include/mach/smemc.h new file +74 -0
74 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/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/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/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/pxa25x.c +3 -2
@@ -30,6 +30,7 @@#include <mach/reset.h> #include <mach/pm.h> #include <mach/dma.h> +#include <mach/smemc.h> #include <asm/mach/map.h>
@@ -324,8 +325,8 @@ void __init pxa26x_init_irq(void)static struct map_desc pxa25x_io_desc[]__initdata = { {/* Mem Ctl */ - .virtual =0xf6000000 , - .pfn =__phys_to_pfn (0x48000000 ), + .virtual =SMEMC_VIRT , + .pfn =__phys_to_pfn (PXA2XX_SMEMC_BASE ), .length =0x00200000 , .type =MT_DEVICE },
arch/arm/mach-pxa/pxa27x.c +6 -4
@@ -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/smemc.h> #include <plat/i2c.h>
@@ -257,7 +259,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 );
@@ -266,7 +268,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 ;
@@ -375,8 +377,8 @@ void __init pxa27x_init_irq(void)static struct map_desc pxa27x_io_desc[]__initdata = { {/* Mem Ctl */ - .virtual =0xf6000000 , - .pfn =__phys_to_pfn (0x48000000 ), + .virtual =SMEMC_VIRT , + .pfn =__phys_to_pfn (PXA2XX_SMEMC_BASE ), .length =0x00200000 , .type =MT_DEVICE }, {/* IMem ctl */
arch/arm/mach-pxa/pxa3xx.c +3 -2
@@ -30,6 +30,7 @@#include <mach/pm.h> #include <mach/dma.h> #include <mach/regs-intc.h> +#include <mach/smemc.h> #include <plat/i2c.h> #include <asm/mach/map.h>
@@ -584,8 +585,8 @@ void __init pxa3xx_init_irq(void)static struct map_desc pxa3xx_io_desc[]__initdata = { {/* Mem Ctl */ - .virtual =0xf6000000 , - .pfn =__phys_to_pfn (0x4a000000 ), + .virtual =SMEMC_VIRT , + .pfn =__phys_to_pfn (PXA3XX_SMEMC_BASE ), .length =0x00200000 , .type =MT_DEVICE }
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/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/spitz.c +4 -2
@@ -45,6 +45,7 @@#include <mach/pxa2xx_spi.h> #include <mach/spitz.h> #include <mach/sharpsl_pm.h> +#include <mach/smemc.h> #include <plat/i2c.h>
@@ -930,9 +931,10 @@ static void spitz_poweroff(void)static void spitz_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 );spitz_poweroff (); }
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/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/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/smemc.h> #include <plat/i2c.h> #include "generic.h"
@@ -542,7 +543,7 @@ static void __init trizeps4_map_io(void)pxa27x_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/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/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 ((__raw_readl (MSC0 ) &0xffff ) | (dm9000_msc <<16 ),MSC0 ); +__raw_writel ((__raw_readl (MSC1 ) &0xffff0000 ) | dm9000_msc,MSC1 ); pm_power_off = zeus_power_off;zeus_setup_apm ();
drivers/pcmcia/pxa2xx_base.c +20 -8
@@ -26,6 +26,7 @@#include <linux/platform_device.h> #include <mach/hardware.h> +#include <mach/smemc.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/system.h>
@@ -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_t mecr =__raw_readl (MECR_CIT );/* 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 ); }static const char *skt_names[] = {
Signature · 1 line
1.7.2.3