Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 272843
b: refs/heads/master
c: 87d022c
h: refs/heads/master
i:
  272841: 669791d
  272839: 7a93747
v: v3
  • Loading branch information
Wolfram Sang authored and Sascha Hauer committed Aug 23, 2011
1 parent 7c9428a commit 59c753e
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a4de0424a175d25dc5259eb5bc6be56c7cf9d356
refs/heads/master: 87d022cc494dd4dd86d15cb149fa721ac3b45969
4 changes: 4 additions & 0 deletions trunk/arch/arm/mach-mxs/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ config MACH_STMP378X_DEVB
select MXS_HAVE_AMBA_DUART
select MXS_HAVE_PLATFORM_AUART
select MXS_HAVE_PLATFORM_MXS_MMC
select MXS_HAVE_PLATFORM_RTC_STMP3XXX
help
Include support for STMP378x-devb platform. This includes specific
configurations for the board and its peripherals.
Expand All @@ -34,6 +35,7 @@ config MACH_MX23EVK
select MXS_HAVE_PLATFORM_AUART
select MXS_HAVE_PLATFORM_MXS_MMC
select MXS_HAVE_PLATFORM_MXSFB
select MXS_HAVE_PLATFORM_RTC_STMP3XXX
help
Include support for MX23EVK platform. This includes specific
configurations for the board and its peripherals.
Expand All @@ -50,6 +52,7 @@ config MACH_MX28EVK
select MXS_HAVE_PLATFORM_MXSFB
select MXS_HAVE_PLATFORM_MXS_SAIF
select MXS_HAVE_PLATFORM_MXS_I2C
select MXS_HAVE_PLATFORM_RTC_STMP3XXX
select MXS_OCOTP
help
Include support for MX28EVK platform. This includes specific
Expand All @@ -65,6 +68,7 @@ config MODULE_TX28
select MXS_HAVE_PLATFORM_MXS_I2C
select MXS_HAVE_PLATFORM_MXS_MMC
select MXS_HAVE_PLATFORM_MXS_PWM
select MXS_HAVE_PLATFORM_RTC_STMP3XXX

config MACH_TX28
bool "Ka-Ro TX28 module"
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-mxs/mach-mx23evk.c
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ static void __init mx23evk_init(void)
gpio_set_value(MX23EVK_BL_ENABLE, 1);

mx23_add_mxsfb(&mx23evk_mxsfb_pdata);
mx23_add_rtc_stmp3xxx();
}

static void __init mx23evk_timer_init(void)
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-mxs/mach-mx28evk.c
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,7 @@ static void __init mx28evk_init(void)
if (ret)
pr_warn("failed to request gpio mmc1-slot-power: %d\n", ret);
mx28_add_mxs_mmc(1, &mx28evk_mmc_pdata[1]);
mx28_add_rtc_stmp3xxx();

gpio_led_register_device(0, &mx28evk_led_data);
}
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-mxs/mach-stmp378x_devb.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ static void __init stmp378x_dvb_init(void)

mx23_add_duart();
mx23_add_auart0();
mx23_add_rtc_stmp3xxx();

/* power on mmc slot */
ret = gpio_request_one(STMP378X_DEVB_MMC0_SLOT_POWER,
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-mxs/mach-tx28.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ static void __init tx28_stk5v3_init(void)
i2c_register_board_info(0, tx28_stk5v3_i2c_boardinfo,
ARRAY_SIZE(tx28_stk5v3_i2c_boardinfo));
mx28_add_mxs_mmc(0, &tx28_mmc0_pdata);
mx28_add_rtc_stmp3xxx();
}

static void __init tx28_timer_init(void)
Expand Down

0 comments on commit 59c753e

Please sign in to comment.