lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'mxs/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes

Browse Source
This commit is contained in:
Arnd Bergmann
2011-12-06 14:18:36 +00:00
parent 58a394b3fa 7d8b894ca1
commit af72617279
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-mxs/include/mach/mx28.h
View File

@@ -104,8 +104,8 @@
#define MX28_INT_CAN1 9 #define MX28_INT_CAN1 9
#define MX28_INT_LRADC_TOUCH 10 #define MX28_INT_LRADC_TOUCH 10
#define MX28_INT_HSADC 13 #define MX28_INT_HSADC 13
#define MX28_INT_IRADC_THRESH0 14 #define MX28_INT_LRADC_THRESH0 14
#define MX28_INT_IRADC_THRESH1 15 #define MX28_INT_LRADC_THRESH1 15
#define MX28_INT_LRADC_CH0 16 #define MX28_INT_LRADC_CH0 16
#define MX28_INT_LRADC_CH1 17 #define MX28_INT_LRADC_CH1 17
#define MX28_INT_LRADC_CH2 18 #define MX28_INT_LRADC_CH2 18

1
arch/arm/mach-mxs/include/mach/mxs.h
View File

@@ -30,6 +30,7 @@
*/ */
#define cpu_is_mx23() ( \ #define cpu_is_mx23() ( \
machine_is_mx23evk() || \ machine_is_mx23evk() || \
machine_is_stmp378x() || \
0) 0)
#define cpu_is_mx28() ( \ #define cpu_is_mx28() ( \
machine_is_mx28evk() || \ machine_is_mx28evk() || \

2
arch/arm/mach-mxs/mach-m28evk.c
View File

@@ -361,6 +361,6 @@ static struct sys_timer m28evk_timer = {
MACHINE_START(M28EVK, "DENX M28 EVK") MACHINE_START(M28EVK, "DENX M28 EVK")
.map_io = mx28_map_io, .map_io = mx28_map_io,
.init_irq = mx28_init_irq, .init_irq = mx28_init_irq,
.init_machine = m28evk_init,
.timer = &m28evk_timer, .timer = &m28evk_timer,
.init_machine = m28evk_init,
MACHINE_END MACHINE_END

2
arch/arm/mach-mxs/mach-stmp378x_devb.c
View File

@@ -115,6 +115,6 @@ static struct sys_timer stmp378x_dvb_timer = {
MACHINE_START(STMP378X, "STMP378X") MACHINE_START(STMP378X, "STMP378X")
.map_io = mx23_map_io, .map_io = mx23_map_io,
.init_irq = mx23_init_irq, .init_irq = mx23_init_irq,
.init_machine = stmp378x_dvb_init,
.timer = &stmp378x_dvb_timer, .timer = &stmp378x_dvb_timer,
.init_machine = stmp378x_dvb_init,
MACHINE_END MACHINE_END

4
arch/arm/mach-mxs/module-tx28.c
View File

@@ -66,11 +66,11 @@ static const iomux_cfg_t tx28_fec1_pads[] __initconst = {
MX28_PAD_ENET0_CRS__ENET1_RX_EN, MX28_PAD_ENET0_CRS__ENET1_RX_EN,
}; };
static struct fec_platform_data tx28_fec0_data = { static const struct fec_platform_data tx28_fec0_data __initconst = {
.phy = PHY_INTERFACE_MODE_RMII, .phy = PHY_INTERFACE_MODE_RMII,
}; };
static struct fec_platform_data tx28_fec1_data = { static const struct fec_platform_data tx28_fec1_data __initconst = {
.phy = PHY_INTERFACE_MODE_RMII, .phy = PHY_INTERFACE_MODE_RMII,
}; };