projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
arm
/
mach-imx
/
mach-kzm_arm11_01.c
diff --git
a/arch/arm/mach-imx/mach-kzm_arm11_01.c
b/arch/arm/mach-imx/mach-kzm_arm11_01.c
index
31df436
..
ab847e2
100644
(file)
--- a/
arch/arm/mach-imx/mach-kzm_arm11_01.c
+++ b/
arch/arm/mach-imx/mach-kzm_arm11_01.c
@@
-63,7
+63,7
@@
*/
#define KZM_ARM11_16550 (MX31_CS4_BASE_ADDR + 0x1050)
*/
#define KZM_ARM11_16550 (MX31_CS4_BASE_ADDR + 0x1050)
-#if
defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE
)
+#if
IS_ENABLED(CONFIG_SERIAL_8250
)
/*
* KZM-ARM11-01 has an external UART on FPGA
*/
/*
* KZM-ARM11-01 has an external UART on FPGA
*/
@@
-141,7
+141,7
@@
static inline int kzm_init_ext_uart(void)
/*
* SMSC LAN9118
*/
/*
* SMSC LAN9118
*/
-#if
defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE
)
+#if
IS_ENABLED(CONFIG_SMSC911X
)
static struct smsc911x_platform_config kzm_smsc9118_config = {
.phy_interface = PHY_INTERFACE_MODE_MII,
.irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH,
static struct smsc911x_platform_config kzm_smsc9118_config = {
.phy_interface = PHY_INTERFACE_MODE_MII,
.irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH,
@@
-201,7
+201,7
@@
static inline int kzm_init_smsc9118(void)
}
#endif
}
#endif
-#if
defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE
)
+#if
IS_ENABLED(CONFIG_SERIAL_IMX
)
static const struct imxuart_platform_data uart_pdata __initconst = {
.flags = IMXUART_HAVE_RTSCTS,
};
static const struct imxuart_platform_data uart_pdata __initconst = {
.flags = IMXUART_HAVE_RTSCTS,
};
@@
-245,13
+245,17
@@
static void __init kzm_board_init(void)
mxc_iomux_setup_multiple_pins(kzm_pins,
ARRAY_SIZE(kzm_pins), "kzm");
mxc_iomux_setup_multiple_pins(kzm_pins,
ARRAY_SIZE(kzm_pins), "kzm");
- kzm_init_ext_uart();
- kzm_init_smsc9118();
kzm_init_imx_uart();
pr_info("Clock input source is 26MHz\n");
}
kzm_init_imx_uart();
pr_info("Clock input source is 26MHz\n");
}
+static void __init kzm_late_init(void)
+{
+ kzm_init_ext_uart();
+ kzm_init_smsc9118();
+}
+
/*
* This structure defines static mappings for the kzm-arm11-01 board.
*/
/*
* This structure defines static mappings for the kzm-arm11-01 board.
*/
@@
-291,5
+295,6
@@
MACHINE_START(KZM_ARM11_01, "Kyoto Microcomputer Co., Ltd. KZM-ARM11-01")
.init_irq = mx31_init_irq,
.init_time = kzm_timer_init,
.init_machine = kzm_board_init,
.init_irq = mx31_init_irq,
.init_time = kzm_timer_init,
.init_machine = kzm_board_init,
+ .init_late = kzm_late_init,
.restart = mxc_restart,
MACHINE_END
.restart = mxc_restart,
MACHINE_END