diff options
Diffstat (limited to 'arch/arm/mach-at91')
| -rw-r--r-- | arch/arm/mach-at91/at91rm9200_time.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91sam9263_devices.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-at91/clock.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/board.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/setup.c | 12 |
5 files changed, 8 insertions, 12 deletions
diff --git a/arch/arm/mach-at91/at91rm9200_time.c b/arch/arm/mach-at91/at91rm9200_time.c index b4021b5038..63975071f1 100644 --- a/arch/arm/mach-at91/at91rm9200_time.c +++ b/arch/arm/mach-at91/at91rm9200_time.c @@ -40,7 +40,7 @@ static void __iomem *st = IOMEM(AT91RM9200_BASE_ST); * the updates as seen by the CPU don't seem to be strictly monotonic. * Waiting until we read the same value twice avoids glitching. */ -uint64_t at91rm9200_clocksource_read(void) +static uint64_t at91rm9200_clocksource_read(void) { unsigned long x1, x2; diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c index a67345f05d..c7e4962a93 100644 --- a/arch/arm/mach-at91/at91sam9263_devices.c +++ b/arch/arm/mach-at91/at91sam9263_devices.c @@ -396,6 +396,9 @@ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) } else { /* MCI1 */ start = AT91SAM9263_BASE_MCI1; + /* CLK */ + at91_set_A_periph(AT91_PIN_PA6, 0); + if (data->slot_b) { /* CMD */ at91_set_A_periph(AT91_PIN_PA21, 1); diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c index 9d2e3a3acc..d2691acae3 100644 --- a/arch/arm/mach-at91/clock.c +++ b/arch/arm/mach-at91/clock.c @@ -22,6 +22,7 @@ #include <mach/hardware.h> #include <mach/at91_pmc.h> #include <mach/cpu.h> +#include <mach/board.h> #include "clock.h" #include "generic.h" diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h index 0f2c269732..886f81e9ad 100644 --- a/arch/arm/mach-at91/include/mach/board.h +++ b/arch/arm/mach-at91/include/mach/board.h @@ -64,6 +64,8 @@ struct atmel_nand_data { u8 cle; /* address line number connected to CLE */ u8 bus_width_16; /* buswidth is 16 bit */ u8 ecc_mode; /* NAND_ECC_* */ + u8 ecc_strength; /* number of bits to correct per ECC step */ + u8 ecc_size_shift; /* data bytes covered by a single ECC step.*/ u8 on_flash_bbt; /* Use flash based bbt */ u8 has_pmecc; /* Use PMECC */ u8 bus_on_d0; diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index adc614c42c..cb79eb26b8 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c @@ -15,6 +15,7 @@ #include <mach/cpu.h> #include <mach/at91_dbgu.h> #include <mach/at91_rstc.h> +#include <mach/board.h> #include "generic.h" @@ -24,17 +25,6 @@ void __initdata (*at91_boot_soc)(void); struct at91_socinfo at91_soc_initdata; EXPORT_SYMBOL(at91_soc_initdata); -void __init at91rm9200_set_type(int type) -{ - if (type == ARCH_REVISON_9200_PQFP) - at91_soc_initdata.subtype = AT91_SOC_RM9200_PQFP; - else - at91_soc_initdata.subtype = AT91_SOC_RM9200_BGA; - - pr_info("AT91: filled in soc subtype: %s\n", - at91_get_soc_subtype(&at91_soc_initdata)); -} - static void __init soc_detect(u32 dbgu_base) { u32 cidr, socid; |