Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-17 22:49:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-arm

Browse source
This commit is contained in:
Wolfgang Denk 2010-01-12 23:47:03 +01:00
commit 2ff6922280
29 changed files with 725 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
board/davinci/common/misc.c
View file

@ -155,3 +155,34 @@ int davinci_configure_pin_mux(const struct pinmux_config *pins,
return 0;
}
/*
* Configure multiple pinmux resources.
*
* Takes an pinmux_resource array of pinmux_config and pin counts:
*
* const struct pinmux_resource pinmuxes[] = {
* PINMUX_ITEM(uart_pins),
* PINMUX_ITEM(i2c_pins),
* };
*
* The number of items in the array must be passed (ARRAY_SIZE can provide
* this value conveniently).
*
* Each item entry is configured in the defined order. If configuration
* of any item fails, -1 is returned and none of the following items are
* configured. On success, 0 is returned.
*/
int davinci_configure_pin_mux_items(const struct pinmux_resource *item,
const int n_items)
{
int i;
for (i = 0; i < n_items; i++) {
if (davinci_configure_pin_mux(item[i].pins,
item[i].n_pins) != 0)
return -1;
}
return 0;
}

13
board/davinci/common/misc.h
View file

@ -34,8 +34,21 @@ struct pinmux_config {
unsigned char field; /* field number */
};
/* pin table definition */
struct pinmux_resource {
const struct pinmux_config *pins;
const int n_pins;
};
#define PINMUX_ITEM(item) { \
.pins = item, \
.n_pins = ARRAY_SIZE(item) \
}
int dvevm_read_mac_address(uint8_t *buf);
void dv_configure_mac_address(uint8_t *rom_enetaddr);
int davinci_configure_pin_mux(const struct pinmux_config *pins, int n_pins);
int davinci_configure_pin_mux_items(const struct pinmux_resource *item,
int n_items);
#endif /* __MISC_H */

2
board/logicpd/zoom1/zoom1.c
View file

@ -63,7 +63,7 @@ int board_init(void)
int misc_init_r(void)
{
twl4030_power_init();
twl4030_led_init();
twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON);
dieid_num_r();
/*

2
board/logicpd/zoom2/zoom2.c
View file

@ -149,7 +149,7 @@ int misc_init_r(void)
{
zoom2_identify();
twl4030_power_init();
twl4030_led_init();
twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON);
dieid_num_r();
/*

2
board/overo/overo.c
View file

@ -67,7 +67,7 @@ int board_init(void)
int misc_init_r(void)
{
twl4030_power_init();
twl4030_led_init();
twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON);
#if defined(CONFIG_CMD_NET)
setup_net_chip();

3
board/pandora/pandora.c
View file

@ -65,8 +65,7 @@ int misc_init_r(void)
struct gpio *gpio5_base = (struct gpio *)OMAP34XX_GPIO5_BASE;
struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE;
twl4030_power_init();
twl4030_led_init();
twl4030_led_init(TWL4030_LED_LEDEN_LEDBON);
/* Configure GPIOs to output */
writel(~(GPIO14 | GPIO15 | GPIO16 | GPIO23), &gpio1_base->oe);

2
board/ti/beagle/beagle.c
View file

@ -107,7 +107,7 @@ int misc_init_r(void)
struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE;
twl4030_power_init();
twl4030_led_init();
twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON);
/* Configure GPIOs to output */
writel(~(GPIO23 | GPIO10 | GPIO8 | GPIO2 | GPIO1), &gpio6_base->oe);

2
board/timll/devkit8000/devkit8000.c
View file

@ -76,7 +76,7 @@ int misc_init_r(void)
twl4030_power_init();
#ifdef CONFIG_TWL4030_LED
twl4030_led_init();
twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON);
#endif
#ifdef CONFIG_DRIVER_DM9000

18
drivers/misc/twl4030_led.c
View file

@ -34,19 +34,15 @@
#include <twl4030.h>
#define LEDAON (0x1 << 0)
#define LEDBON (0x1 << 1)
#define LEDAPWM (0x1 << 4)
#define LEDBPWM (0x1 << 5)
void twl4030_led_init(void)
void twl4030_led_init(unsigned char ledon_mask)
{
unsigned char byte;
/* LEDs need to have corresponding PWMs enabled */
if (ledon_mask & TWL4030_LED_LEDEN_LEDAON)
ledon_mask |= TWL4030_LED_LEDEN_LEDAPWM;
if (ledon_mask & TWL4030_LED_LEDEN_LEDBON)
ledon_mask |= TWL4030_LED_LEDEN_LEDBPWM;
/* enable LED */
byte = LEDBPWM | LEDAPWM | LEDBON | LEDAON;
twl4030_i2c_write_u8(TWL4030_CHIP_LED, byte,
twl4030_i2c_write_u8(TWL4030_CHIP_LED, ledon_mask,
TWL4030_LED_LEDEN);
}

27
drivers/mtd/nand/davinci_nand.c
View file

@ -179,26 +179,21 @@ static void nand_davinci_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int c
static void nand_davinci_enable_hwecc(struct mtd_info *mtd, int mode)
{
int dummy;
u_int32_t val;
dummy = emif_regs->NANDF1ECC;
(void)readl(&(emif_regs->NANDFECC[CONFIG_SYS_NAND_CS - 2]));
/* FIXME: only chipselect 0 is supported for now */
emif_regs->NANDFCR |= 1 << 8;
val = readl(&emif_regs->NANDFCR);
val |= DAVINCI_NANDFCR_NAND_ENABLE(CONFIG_SYS_NAND_CS);
val |= DAVINCI_NANDFCR_1BIT_ECC_START(CONFIG_SYS_NAND_CS);
writel(val, &emif_regs->NANDFCR);
}
static u_int32_t nand_davinci_readecc(struct mtd_info *mtd, u_int32_t region)
{
u_int32_t ecc = 0;
if (region == 1)
ecc = emif_regs->NANDF1ECC;
else if (region == 2)
ecc = emif_regs->NANDF2ECC;
else if (region == 3)
ecc = emif_regs->NANDF3ECC;
else if (region == 4)
ecc = emif_regs->NANDF4ECC;
ecc = readl(&(emif_regs->NANDFECC[region - 1]));
return(ecc);
}
@ -320,8 +315,12 @@ static void nand_davinci_4bit_enable_hwecc(struct mtd_info *mtd, int mode)
* Start a new ECC calculation for reading or writing 512 bytes
* of data.
*/
val = (emif_regs->NANDFCR & ~(3 << 4)) | (1 << 12);
emif_regs->NANDFCR = val;
val = readl(&emif_regs->NANDFCR);
val &= ~DAVINCI_NANDFCR_4BIT_ECC_SEL_MASK;
val |= DAVINCI_NANDFCR_NAND_ENABLE(CONFIG_SYS_NAND_CS);
val |= DAVINCI_NANDFCR_4BIT_ECC_SEL(CONFIG_SYS_NAND_CS);
val |= DAVINCI_NANDFCR_4BIT_ECC_START;
writel(val, &emif_regs->NANDFCR);
break;
case NAND_ECC_READSYN:
val = emif_regs->NAND4BITECC1;

13
include/asm-arm/arch-davinci/emif_defs.h
View file

@ -51,10 +51,7 @@ typedef struct {
dv_reg NANDFCR;
dv_reg NANDFSR;
u_int8_t RSVD1[8];
dv_reg NANDF1ECC;
dv_reg NANDF2ECC;
dv_reg NANDF3ECC;
dv_reg NANDF4ECC;
dv_reg NANDFECC[4];
u_int8_t RSVD2[60];
dv_reg NAND4BITECCLOAD;
dv_reg NAND4BITECC1;
@ -68,4 +65,12 @@ typedef struct {
} emif_registers;
typedef emif_registers *emifregs;
#define DAVINCI_NANDFCR_NAND_ENABLE(n) (1 << (n-2))
#define DAVINCI_NANDFCR_4BIT_ECC_SEL_MASK (3 << 4)
#define DAVINCI_NANDFCR_4BIT_ECC_SEL(n) ((n-2) << 4)
#define DAVINCI_NANDFCR_1BIT_ECC_START(n) (1 << (8 + (n-2)))
#define DAVINCI_NANDFCR_4BIT_ECC_START (1 << 12)
#define DAVINCI_NANDFCR_4BIT_CALC_START (1 << 13)
#endif

631
include/asm-arm/mach-types.h
View file

@ -1772,7 +1772,7 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_WDG002 1785
#define MACH_TYPE_SG560ADSL 1786
#define MACH_TYPE_NEXTIO_N2800_ICA 1787
#define MACH_TYPE_MACH_MARVELL_NEW1 1788
#define MACH_TYPE_DOVE_DB 1788
#define MACH_TYPE_MARVELL_NEWDB 1789
#define MACH_TYPE_VANDIHUD 1790
#define MACH_TYPE_MAGX_E8 1791
@ -2532,7 +2532,7 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_C3AX03 2549
#define MACH_TYPE_MXT_TD60 2550
#define MACH_TYPE_ESYX 2551
#define MACH_TYPE_DOVE_DB 2552
#define MACH_TYPE_DOVE_DB2 2552
#define MACH_TYPE_BULLDOG 2553
#define MACH_TYPE_DERELL_ME2000 2554
#define MACH_TYPE_BCMRING_BASE 2555
@ -2547,6 +2547,53 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_BCMRING_SP_WQVGA 2564
#define MACH_TYPE_BCMRING_CUSTOM 2565
#define MACH_TYPE_ACER_S200 2566
#define MACH_TYPE_BT270 2567
#define MACH_TYPE_ISEO 2568
#define MACH_TYPE_CEZANNE 2569
#define MACH_TYPE_LUCCA 2570
#define MACH_TYPE_SUPERSMART 2571
#define MACH_TYPE_CS_MISANO 2572
#define MACH_TYPE_MAGNOLIA2 2573
#define MACH_TYPE_EMXX 2574
#define MACH_TYPE_OUTLAW 2575
#define MACH_TYPE_RIOT_BEI2 2576
#define MACH_TYPE_RIOT_VOX 2577
#define MACH_TYPE_RIOT_X37 2578
#define MACH_TYPE_MEGA25MX 2579
#define MACH_TYPE_BENZINA2 2580
#define MACH_TYPE_IGNITE 2581
#define MACH_TYPE_FOGGIA 2582
#define MACH_TYPE_AREZZO 2583
#define MACH_TYPE_LEICA_SKYWALKER 2584
#define MACH_TYPE_JACINTO2_JAMR 2585
#define MACH_TYPE_GTS_NOVA 2586
#define MACH_TYPE_P3600 2587
#define MACH_TYPE_DLT2 2588
#define MACH_TYPE_DF3120 2589
#define MACH_TYPE_ECUCORE_9G20 2590
#define MACH_TYPE_NAUTEL_LPC3240 2591
#define MACH_TYPE_GLACIER 2592
#define MACH_TYPE_PHRAZER_BULLDOG 2593
#define MACH_TYPE_OMAP3_BULLDOG 2594
#define MACH_TYPE_PCA101 2595
#define MACH_TYPE_BUZZC 2596
#define MACH_TYPE_SASIE2 2597
#define MACH_TYPE_DAVINCI_CIO 2598
#define MACH_TYPE_SMARTMETER_DL 2599
#define MACH_TYPE_WZL6410 2600
#define MACH_TYPE_WZL6410M 2601
#define MACH_TYPE_WZL6410F 2602
#define MACH_TYPE_WZL6410I 2603
#define MACH_TYPE_SPACECOM1 2604
#define MACH_TYPE_PINGU920 2605
#define MACH_TYPE_BRAVOC 2606
#define MACH_TYPE_CYBO2440 2607
#define MACH_TYPE_VDSSW 2608
#define MACH_TYPE_ROMULUS 2609
#define MACH_TYPE_OMAP_MAGIC 2610
#define MACH_TYPE_ELTD100 2611
#define MACH_TYPE_CAPC7117 2612
#define MACH_TYPE_SWAN 2613
#ifdef CONFIG_ARCH_EBSA110
# ifdef machine_arch_type
@ -23668,14 +23715,14 @@ extern unsigned int __machine_arch_type;
# define machine_is_nextio_n2800_ica() (0)
#endif
#ifdef CONFIG_MACH_MACH_MARVELL_NEW1
#ifdef CONFIG_MACH_DOVE_DB
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_MACH_MARVELL_NEW1
# define machine_arch_type MACH_TYPE_DOVE_DB
# endif
# define machine_is_dove_db() (machine_arch_type == MACH_TYPE_MACH_MARVELL_NEW1)
# define machine_is_dove_db() (machine_arch_type == MACH_TYPE_DOVE_DB)
#else
# define machine_is_dove_db() (0)
#endif
@ -30851,9 +30898,9 @@ extern unsigned int __machine_arch_type;
# else
# define machine_arch_type MACH_TYPE_SIENNA
# endif
# define machine_is_sienna() (machine_arch_type == MACH_TYPE_SIENNA)
# define machine_is_siena() (machine_arch_type == MACH_TYPE_SIENNA)
#else
# define machine_is_sienna() (0)
# define machine_is_siena() (0)
#endif
#ifdef CONFIG_MACH_HTC_EXCALIBUR_S620
@ -32788,14 +32835,14 @@ extern unsigned int __machine_arch_type;
# define machine_is_esyx() (0)
#endif
#ifdef CONFIG_MACH_DOVE_DB
#ifdef CONFIG_MACH_DOVE_DB2
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_DOVE_DB
# define machine_arch_type MACH_TYPE_DOVE_DB2
# endif
# define machine_is_dove_db2() (machine_arch_type == MACH_TYPE_DOVE_DB)
# define machine_is_dove_db2() (machine_arch_type == MACH_TYPE_DOVE_DB2)
#else
# define machine_is_dove_db2() (0)
#endif
@ -32968,6 +33015,570 @@ extern unsigned int __machine_arch_type;
# define machine_is_acer_s200() (0)
#endif
#ifdef CONFIG_MACH_BT270
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_BT270
# endif
# define machine_is_bt270() (machine_arch_type == MACH_TYPE_BT270)
#else
# define machine_is_bt270() (0)
#endif
#ifdef CONFIG_MACH_ISEO
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_ISEO
# endif
# define machine_is_iseo() (machine_arch_type == MACH_TYPE_ISEO)
#else
# define machine_is_iseo() (0)
#endif
#ifdef CONFIG_MACH_CEZANNE
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_CEZANNE
# endif
# define machine_is_cezanne() (machine_arch_type == MACH_TYPE_CEZANNE)
#else
# define machine_is_cezanne() (0)
#endif
#ifdef CONFIG_MACH_LUCCA
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_LUCCA
# endif
# define machine_is_lucca() (machine_arch_type == MACH_TYPE_LUCCA)
#else
# define machine_is_lucca() (0)
#endif
#ifdef CONFIG_MACH_SUPERSMART
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_SUPERSMART
# endif
# define machine_is_supersmart() (machine_arch_type == MACH_TYPE_SUPERSMART)
#else
# define machine_is_supersmart() (0)
#endif
#ifdef CONFIG_MACH_CS_MISANO
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_CS_MISANO
# endif
# define machine_is_arm11_board() (machine_arch_type == MACH_TYPE_CS_MISANO)
#else
# define machine_is_arm11_board() (0)
#endif
#ifdef CONFIG_MACH_MAGNOLIA2
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_MAGNOLIA2
# endif
# define machine_is_magnolia2() (machine_arch_type == MACH_TYPE_MAGNOLIA2)
#else
# define machine_is_magnolia2() (0)
#endif
#ifdef CONFIG_MACH_EMXX
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_EMXX
# endif
# define machine_is_emxx() (machine_arch_type == MACH_TYPE_EMXX)
#else
# define machine_is_emxx() (0)
#endif
#ifdef CONFIG_MACH_OUTLAW
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_OUTLAW
# endif
# define machine_is_outlaw() (machine_arch_type == MACH_TYPE_OUTLAW)
#else
# define machine_is_outlaw() (0)
#endif
#ifdef CONFIG_MACH_RIOT_BEI2
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_RIOT_BEI2
# endif
# define machine_is_riot_bei2() (machine_arch_type == MACH_TYPE_RIOT_BEI2)
#else
# define machine_is_riot_bei2() (0)
#endif
#ifdef CONFIG_MACH_RIOT_VOX
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_RIOT_VOX
# endif
# define machine_is_riot_vox() (machine_arch_type == MACH_TYPE_RIOT_VOX)
#else
# define machine_is_riot_vox() (0)
#endif
#ifdef CONFIG_MACH_RIOT_X37
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_RIOT_X37
# endif
# define machine_is_riot_x37() (machine_arch_type == MACH_TYPE_RIOT_X37)
#else
# define machine_is_riot_x37() (0)
#endif
#ifdef CONFIG_MACH_MEGA25MX
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_MEGA25MX
# endif
# define machine_is_mega25mx() (machine_arch_type == MACH_TYPE_MEGA25MX)
#else
# define machine_is_mega25mx() (0)
#endif
#ifdef CONFIG_MACH_BENZINA2
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_BENZINA2
# endif
# define machine_is_benzina2() (machine_arch_type == MACH_TYPE_BENZINA2)
#else
# define machine_is_benzina2() (0)
#endif
#ifdef CONFIG_MACH_IGNITE
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_IGNITE
# endif
# define machine_is_ignite() (machine_arch_type == MACH_TYPE_IGNITE)
#else
# define machine_is_ignite() (0)
#endif
#ifdef CONFIG_MACH_FOGGIA
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_FOGGIA
# endif
# define machine_is_foggia() (machine_arch_type == MACH_TYPE_FOGGIA)
#else
# define machine_is_foggia() (0)
#endif
#ifdef CONFIG_MACH_AREZZO
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_AREZZO
# endif
# define machine_is_arezzo() (machine_arch_type == MACH_TYPE_AREZZO)
#else
# define machine_is_arezzo() (0)
#endif
#ifdef CONFIG_MACH_LEICA_SKYWALKER
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_LEICA_SKYWALKER
# endif
# define machine_is_leica_skywalker() (machine_arch_type == MACH_TYPE_LEICA_SKYWALKER)
#else
# define machine_is_leica_skywalker() (0)
#endif
#ifdef CONFIG_MACH_JACINTO2_JAMR
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_JACINTO2_JAMR
# endif
# define machine_is_jacinto2_jamr() (machine_arch_type == MACH_TYPE_JACINTO2_JAMR)
#else
# define machine_is_jacinto2_jamr() (0)
#endif
#ifdef CONFIG_MACH_GTS_NOVA
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_GTS_NOVA
# endif
# define machine_is_gts_nova() (machine_arch_type == MACH_TYPE_GTS_NOVA)
#else
# define machine_is_gts_nova() (0)
#endif
#ifdef CONFIG_MACH_P3600
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_P3600
# endif
# define machine_is_p3600() (machine_arch_type == MACH_TYPE_P3600)
#else
# define machine_is_p3600() (0)
#endif
#ifdef CONFIG_MACH_DLT2
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_DLT2
# endif
# define machine_is_dlt2() (machine_arch_type == MACH_TYPE_DLT2)
#else
# define machine_is_dlt2() (0)
#endif
#ifdef CONFIG_MACH_DF3120
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_DF3120
# endif
# define machine_is_df3120() (machine_arch_type == MACH_TYPE_DF3120)
#else
# define machine_is_df3120() (0)
#endif
#ifdef CONFIG_MACH_ECUCORE_9G20
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_ECUCORE_9G20
# endif
# define machine_is_ecucore_9g20() (machine_arch_type == MACH_TYPE_ECUCORE_9G20)
#else
# define machine_is_ecucore_9g20() (0)
#endif
#ifdef CONFIG_MACH_NAUTEL_LPC3240
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_NAUTEL_LPC3240
# endif
# define machine_is_nautel_lpc3240() (machine_arch_type == MACH_TYPE_NAUTEL_LPC3240)
#else
# define machine_is_nautel_lpc3240() (0)
#endif
#ifdef CONFIG_MACH_GLACIER
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_GLACIER
# endif
# define machine_is_glacier() (machine_arch_type == MACH_TYPE_GLACIER)
#else
# define machine_is_glacier() (0)
#endif
#ifdef CONFIG_MACH_PHRAZER_BULLDOG
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_PHRAZER_BULLDOG
# endif
# define machine_is_phrazer_bulldog() (machine_arch_type == MACH_TYPE_PHRAZER_BULLDOG)
#else
# define machine_is_phrazer_bulldog() (0)
#endif
#ifdef CONFIG_MACH_OMAP3_BULLDOG
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_OMAP3_BULLDOG
# endif
# define machine_is_omap3_bulldog() (machine_arch_type == MACH_TYPE_OMAP3_BULLDOG)
#else
# define machine_is_omap3_bulldog() (0)
#endif
#ifdef CONFIG_MACH_PCA101
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_PCA101
# endif
# define machine_is_pca101() (machine_arch_type == MACH_TYPE_PCA101)
#else
# define machine_is_pca101() (0)
#endif
#ifdef CONFIG_MACH_BUZZC
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_BUZZC
# endif
# define machine_is_buzzc() (machine_arch_type == MACH_TYPE_BUZZC)
#else
# define machine_is_buzzc() (0)
#endif
#ifdef CONFIG_MACH_SASIE2
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_SASIE2
# endif
# define machine_is_sasie2() (machine_arch_type == MACH_TYPE_SASIE2)
#else
# define machine_is_sasie2() (0)
#endif
#ifdef CONFIG_MACH_DAVINCI_CIO
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_DAVINCI_CIO
# endif
# define machine_is_davinci_cio() (machine_arch_type == MACH_TYPE_DAVINCI_CIO)
#else
# define machine_is_davinci_cio() (0)
#endif
#ifdef CONFIG_MACH_SMARTMETER_DL
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_SMARTMETER_DL
# endif
# define machine_is_smartmeter_dl() (machine_arch_type == MACH_TYPE_SMARTMETER_DL)
#else
# define machine_is_smartmeter_dl() (0)
#endif
#ifdef CONFIG_MACH_WZL6410
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_WZL6410
# endif
# define machine_is_wzl6410() (machine_arch_type == MACH_TYPE_WZL6410)
#else
# define machine_is_wzl6410() (0)
#endif
#ifdef CONFIG_MACH_WZL6410M
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_WZL6410M
# endif
# define machine_is_wzl6410m() (machine_arch_type == MACH_TYPE_WZL6410M)
#else
# define machine_is_wzl6410m() (0)
#endif
#ifdef CONFIG_MACH_WZL6410F
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_WZL6410F
# endif
# define machine_is_wzl6410f() (machine_arch_type == MACH_TYPE_WZL6410F)
#else
# define machine_is_wzl6410f() (0)
#endif
#ifdef CONFIG_MACH_WZL6410I
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_WZL6410I
# endif
# define machine_is_wzl6410i() (machine_arch_type == MACH_TYPE_WZL6410I)
#else
# define machine_is_wzl6410i() (0)
#endif
#ifdef CONFIG_MACH_SPACECOM1
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_SPACECOM1
# endif
# define machine_is_spacecom1() (machine_arch_type == MACH_TYPE_SPACECOM1)
#else
# define machine_is_spacecom1() (0)
#endif
#ifdef CONFIG_MACH_PINGU920
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_PINGU920
# endif
# define machine_is_pingu920() (machine_arch_type == MACH_TYPE_PINGU920)
#else
# define machine_is_pingu920() (0)
#endif
#ifdef CONFIG_MACH_BRAVOC
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_BRAVOC
# endif
# define machine_is_bravoc() (machine_arch_type == MACH_TYPE_BRAVOC)
#else
# define machine_is_bravoc() (0)
#endif
#ifdef CONFIG_MACH_CYBO2440
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_CYBO2440
# endif
# define machine_is_cybo2440() (machine_arch_type == MACH_TYPE_CYBO2440)
#else
# define machine_is_cybo2440() (0)
#endif
#ifdef CONFIG_MACH_VDSSW
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_VDSSW
# endif
# define machine_is_vdssw() (machine_arch_type == MACH_TYPE_VDSSW)
#else
# define machine_is_vdssw() (0)
#endif
#ifdef CONFIG_MACH_ROMULUS
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_ROMULUS
# endif
# define machine_is_romulus() (machine_arch_type == MACH_TYPE_ROMULUS)
#else
# define machine_is_romulus() (0)
#endif
#ifdef CONFIG_MACH_OMAP_MAGIC
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_OMAP_MAGIC
# endif
# define machine_is_omap_magic() (machine_arch_type == MACH_TYPE_OMAP_MAGIC)
#else
# define machine_is_omap_magic() (0)
#endif
#ifdef CONFIG_MACH_ELTD100
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_ELTD100
# endif
# define machine_is_eltd100() (machine_arch_type == MACH_TYPE_ELTD100)
#else
# define machine_is_eltd100() (0)
#endif
#ifdef CONFIG_MACH_CAPC7117
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_CAPC7117
# endif
# define machine_is_capc7117() (machine_arch_type == MACH_TYPE_CAPC7117)
#else
# define machine_is_capc7117() (0)
#endif
#ifdef CONFIG_MACH_SWAN
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
# define machine_arch_type MACH_TYPE_SWAN
# endif
# define machine_is_swan() (machine_arch_type == MACH_TYPE_SWAN)
#else
# define machine_is_swan() (0)
#endif
/*
* These have not yet been registered
*/

4
include/configs/apollon.h
View file

@ -185,10 +185,8 @@
/*
* Miscellaneous configurable options
*/
#define V_PROMPT "Apollon # "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_PROMPT V_PROMPT
#define CONFIG_SYS_PROMPT "Apollon # "
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)

1
include/configs/davinci_dm355evm.h
View file

@ -66,6 +66,7 @@
/* NAND: socketed, two chipselects, normally 2 GBytes */
#define CONFIG_NAND_DAVINCI
#define CONFIG_SYS_NAND_CS 2
#define CONFIG_SYS_NAND_USE_FLASH_BBT
#define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST
#define CONFIG_SYS_NAND_PAGE_2K

1
include/configs/davinci_dm355leopard.h
View file

@ -65,6 +65,7 @@
/* NAND */
#define CONFIG_NAND_DAVINCI
#define CONFIG_SYS_NAND_CS 2
#define CONFIG_SYS_NAND_USE_FLASH_BBT
#define CONFIG_SYS_NAND_HW_ECC

1
include/configs/davinci_dm365evm.h
View file

@ -74,6 +74,7 @@
/* NAND: socketed, two chipselects, normally 2 GBytes */
#define CONFIG_NAND_DAVINCI
#define CONFIG_SYS_NAND_CS 2
#define CONFIG_SYS_NAND_USE_FLASH_BBT
#define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST
#define CONFIG_SYS_NAND_PAGE_2K

1
include/configs/davinci_dm6467evm.h
View file

@ -75,6 +75,7 @@
#define CONFIG_SYS_NO_FLASH
#ifdef CONFIG_SYS_USE_NAND
#define CONFIG_NAND_DAVINCI
#define CONFIG_SYS_NAND_CS 2
#undef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB */

1
include/configs/davinci_dvevm.h
View file

@ -114,6 +114,7 @@
/*=====================*/
#ifdef CONFIG_SYS_USE_NAND
#define CONFIG_NAND_DAVINCI
#define CONFIG_SYS_NAND_CS 2
#undef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_SYS_NO_FLASH
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */

1
include/configs/davinci_schmoogie.h
View file

@ -83,6 +83,7 @@
#undef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_SYS_NO_FLASH
#define CONFIG_NAND_DAVINCI
#define CONFIG_SYS_NAND_CS 2
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
#define CONFIG_ENV_SECT_SIZE 2048 /* Env sector Size */
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */

1
include/configs/davinci_sffsdr.h
View file

@ -78,6 +78,7 @@
#undef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_SYS_NO_FLASH
#define CONFIG_NAND_DAVINCI
#define CONFIG_SYS_NAND_CS 2
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
#define CONFIG_ENV_SECT_SIZE 2048 /* Env sector Size */
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */

1
include/configs/davinci_sonata.h
View file

@ -114,6 +114,7 @@
/*=====================*/
#ifdef CONFIG_SYS_USE_NAND
#define CONFIG_NAND_DAVINCI
#define CONFIG_SYS_NAND_CS 2
#undef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_SYS_NO_FLASH
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */

12
include/configs/omap2420h4.h
View file

@ -164,14 +164,12 @@
/*
* Miscellaneous configurable options
*/
#ifdef CONFIG_APTIX
#define V_PROMPT "OMAP2420 Aptix # "
#else
#define V_PROMPT "OMAP242x H4 # "
#endif
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_PROMPT V_PROMPT
#ifdef CONFIG_APTIX
# define CONFIG_SYS_PROMPT "OMAP2420 Aptix # "
#else
# define CONFIG_SYS_PROMPT "OMAP242x H4 # "
#endif
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)

4
include/configs/omap3_beagle.h
View file

@ -230,12 +230,10 @@
/*
* Miscellaneous configurable options
*/
#define V_PROMPT "OMAP3 beagleboard.org # "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_SYS_PROMPT V_PROMPT
#define CONFIG_SYS_PROMPT "OMAP3 beagleboard.org # "
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \

4
include/configs/omap3_evm.h
View file

@ -234,12 +234,10 @@
/*
* Miscellaneous configurable options
*/
#define V_PROMPT "OMAP3_EVM # "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_SYS_PROMPT V_PROMPT
#define CONFIG_SYS_PROMPT "OMAP3_EVM # "
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \

4
include/configs/omap3_overo.h
View file

@ -200,12 +200,10 @@
/*
* Miscellaneous configurable options
*/
#define V_PROMPT "Overo # "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_SYS_PROMPT V_PROMPT
#define CONFIG_SYS_PROMPT "Overo # "
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \

4
include/configs/omap3_pandora.h
View file

@ -191,12 +191,10 @@
/*
* Miscellaneous configurable options
*/
#define V_PROMPT "Pandora # "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_SYS_PROMPT V_PROMPT
#define CONFIG_SYS_PROMPT "Pandora # "
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \

3
include/configs/omap3_sdp3430.h
View file

@ -267,12 +267,11 @@
/*
* Miscellaneous configurable options
*/
#define V_PROMPT "OMAP34XX SDP # "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_SYS_PROMPT V_PROMPT
#define CONFIG_SYS_PROMPT "OMAP34XX SDP # "
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \

4
include/configs/omap3_zoom1.h
View file

@ -215,12 +215,10 @@
/*
* Miscellaneous configurable options
*/
#define V_PROMPT "OMAP3 Zoom1# "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_SYS_PROMPT V_PROMPT
#define CONFIG_SYS_PROMPT "OMAP3 Zoom1 # "
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \

6
include/twl4030.h
View file

@ -306,6 +306,10 @@
/* LED */
#define TWL4030_LED_LEDEN 0xEE
#define TWL4030_LED_LEDEN_LEDAON (1 << 0)
#define TWL4030_LED_LEDEN_LEDBON (1 << 1)
#define TWL4030_LED_LEDEN_LEDAPWM (1 << 4)
#define TWL4030_LED_LEDEN_LEDBPWM (1 << 5)
/* Keypad */
#define TWL4030_KEYPAD_KEYP_CTRL_REG 0xD2
@ -504,7 +508,7 @@ void twl4030_power_mmc_init(void);
/*
* LED
*/
void twl4030_led_init(void);
void twl4030_led_init(unsigned char ledon_mask);
/*
* USB