Merge branch 'at91' into devel
This commit is contained in:
Коммит
bd78512e5c
|
@ -156,6 +156,8 @@ static struct atmel_nand_data __initdata afeb9260_nand_data = {
|
||||||
* MCI (SD/MMC)
|
* MCI (SD/MMC)
|
||||||
*/
|
*/
|
||||||
static struct at91_mmc_data __initdata afeb9260_mmc_data = {
|
static struct at91_mmc_data __initdata afeb9260_mmc_data = {
|
||||||
|
.det_pin = AT91_PIN_PC9,
|
||||||
|
.wp_pin = AT91_PIN_PC4,
|
||||||
.slot_b = 1,
|
.slot_b = 1,
|
||||||
.wire4 = 1,
|
.wire4 = 1,
|
||||||
};
|
};
|
||||||
|
@ -164,6 +166,8 @@ static struct at91_mmc_data __initdata afeb9260_mmc_data = {
|
||||||
|
|
||||||
static struct i2c_board_info __initdata afeb9260_i2c_devices[] = {
|
static struct i2c_board_info __initdata afeb9260_i2c_devices[] = {
|
||||||
{
|
{
|
||||||
|
I2C_BOARD_INFO("tlv320aic23", 0x1a),
|
||||||
|
}, {
|
||||||
I2C_BOARD_INFO("fm3130", 0x68),
|
I2C_BOARD_INFO("fm3130", 0x68),
|
||||||
}, {
|
}, {
|
||||||
I2C_BOARD_INFO("24c64", 0x50),
|
I2C_BOARD_INFO("24c64", 0x50),
|
||||||
|
@ -196,6 +200,8 @@ static void __init afeb9260_board_init(void)
|
||||||
/* I2C */
|
/* I2C */
|
||||||
at91_add_device_i2c(afeb9260_i2c_devices,
|
at91_add_device_i2c(afeb9260_i2c_devices,
|
||||||
ARRAY_SIZE(afeb9260_i2c_devices));
|
ARRAY_SIZE(afeb9260_i2c_devices));
|
||||||
|
/* Audio */
|
||||||
|
at91_add_device_ssc(AT91SAM9260_ID_SSC, ATMEL_SSC_TX);
|
||||||
}
|
}
|
||||||
|
|
||||||
MACHINE_START(AFEB9260, "Custom afeb9260 board")
|
MACHINE_START(AFEB9260, "Custom afeb9260 board")
|
||||||
|
|
|
@ -218,6 +218,13 @@ static struct gpio_led ek_leds[] = {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static struct i2c_board_info __initdata ek_i2c_devices[] = {
|
||||||
|
{
|
||||||
|
I2C_BOARD_INFO("24c512", 0x50),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
static void __init ek_board_init(void)
|
static void __init ek_board_init(void)
|
||||||
{
|
{
|
||||||
/* Serial */
|
/* Serial */
|
||||||
|
@ -235,7 +242,7 @@ static void __init ek_board_init(void)
|
||||||
/* MMC */
|
/* MMC */
|
||||||
at91_add_device_mmc(0, &ek_mmc_data);
|
at91_add_device_mmc(0, &ek_mmc_data);
|
||||||
/* I2C */
|
/* I2C */
|
||||||
at91_add_device_i2c(NULL, 0);
|
at91_add_device_i2c(ek_i2c_devices, ARRAY_SIZE(ek_i2c_devices));
|
||||||
/* LEDs */
|
/* LEDs */
|
||||||
at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
|
at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
|
||||||
/* PCK0 provides MCLK to the WM8731 */
|
/* PCK0 provides MCLK to the WM8731 */
|
||||||
|
|
Загрузка…
Ссылка в новой задаче