diff options
| author | Kristoffer Ericson <kristoffer.ericson@gmail.com> | 2010-10-21 19:22:56 +0200 |
|---|---|---|
| committer | Kristoffer Ericson <kristoffer.ericson@gmail.com> | 2011-12-10 15:47:16 +0100 |
| commit | 87862535dbea6ff9d53464bcbfc4678dd411bc55 (patch) | |
| tree | 470e73a8324d7db88aa1d351de4ef062654928c8 | |
| parent | 8cf7158ad4e7bda1c1d722ba22b407c83c8e68ea (diff) | |
| download | linux-hpc-87862535dbea6ff9d53464bcbfc4678dd411bc55.tar.gz | |
/arch/arm/mach-sa1100/jornada720.c :
Add flashrom support inside an ifdef. We will eventually
move this into the bootloader but until then.
Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
| -rw-r--r-- | arch/arm/mach-sa1100/jornada720.c | 45 |
1 files changed, 10 insertions, 35 deletions
diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c index c97cb4bee5aeef..f3cc2a3d1514cb 100644 --- a/arch/arm/mach-sa1100/jornada720.c +++ b/arch/arm/mach-sa1100/jornada720.c @@ -36,7 +36,14 @@ #include "generic.h" #define SBI_SKCR __REG(SA1111_VBASE) - +#define MDCNFG __REG(0xA0000000) +#define MDCAS00 __REG(0xA0000004) +#define MDCAS01 __REG(0xA0000008) +#define MDCAS02 __REG(0xA000000C) +#define MDCAS20 __REG(0xA0000020); +#define MDCAS21 __REG(0xA0000024); +#define MDCAS22 __REG(0xA0000028); +#define SMCNFG __REG(0xA0000030); /* * HP Documentation referred in this file: * http://www.jlime.com/downloads/development/docs/jornada7xx/jornada720.txt @@ -268,37 +275,7 @@ static int __init jornada720_init(void) int ret = -ENODEV; int i; - printk(KERN_INFO "HP Jornada 710/720/728 Machine Init\n"); - -/* - * PIN Settings from wince - * - * (GPDR) PINs configured as outputs (all others are inputs) - * GPIO8, GPIO11, GPIO17, GPIO19, GPIO20, GPIO21, GPIO24, GPIO25, GPIO27 - * - * (GPSR) PINs configures as outputs with level high - * GPIO11, GPIO20, GPIO25 - * - * (GPCR) PINs configured as pin level low - * GPIO08, GPIO17, GPIO19, GPIO21, GPIO24, GPIO27 - * - * (GRER) PINs configured to detect rising edge GPIOs - * GPIO01, GPIO15, GPIO18 - * - * (GFER) PINs configured to detect falling edge GPIOs - * GPIO15, GPIO18 - * - * (GAFR) PINs configure to use alternate function - * GPIO21, GPIO22, GPIO27 - * - * (PPDR) PIN directions (default after reset is input) - * LDD(0,1,2,3) = General Purpose Output - * - * (PPSR) Pin Directions - * LDD(4,5,6) - * L_BIAS - */ - +#ifdef CONFIG_SA1100_JORNADA720_FLASHROM sa1110_mb_disable(); /* we want to use gpio20 as input to drive the clock of our uart 3 */ @@ -317,9 +294,6 @@ static int __init jornada720_init(void) SBI_SKCR = 0x2083; mdelay(200); -// SBI_SKCR = (SKCR_OE_EN | SKCR_PLL_BYPASS | SKCR_RDYEN | SKCR_RCLKEN); -// PPDR = 0x000049FF; - /* Reset the MCU */ PPSR &= (PPC_L_FCLK | 0x80 | PPC_LDD(1) | PPC_LDD(0)); udelay(1000); @@ -341,6 +315,7 @@ static int __init jornada720_init(void) while(Ser4SSSR & SSSR_RNE) i = Ser4SSDR; +#endif ret = platform_add_devices(devices, ARRAY_SIZE(devices)); return ret; |