Commit 1797c8f1 authored by Anas Nashif's avatar Anas Nashif
Browse files

qmsi: uart: use built-in qmsi driver 



Change-Id: Ie19aee8dad8ba082891f92a2d42dc71f4ac34dbe
Signed-off-by: default avatarAnas Nashif <anas.nashif@intel.com>
parent b3e02b40

arch/x86/soc/quark_d2000/Kconfig.defconfig

+0 −47
Original line number Diff line number Diff line
@@ -58,60 +58,13 @@ config QMSI 
config QMSI_BUILTIN

	def_bool y



if UART_NS16550



config UART_NS16550_DLF

	def_bool y



config UART_NS16550_PORT_0

	def_bool y



if UART_NS16550_PORT_0



config UART_NS16550_PORT_0_NAME

	default "UART_0"

config UART_NS16550_PORT_0_IRQ_PRI

	default 3

config UART_NS16550_PORT_0_BAUD_RATE

	default 115200

config UART_NS16550_PORT_0_OPTIONS

	default 0

config UART_NS16550_PORT_0_DLF

	default 0x06



endif # UART_NS16550_PORT_0



config UART_NS16550_PORT_1

	def_bool y



if UART_NS16550_PORT_1



config UART_NS16550_PORT_1_NAME

	default "UART_1"

config UART_NS16550_PORT_1_IRQ_PRI

	default 3

config UART_NS16550_PORT_1_BAUD_RATE

	default 115200

config UART_NS16550_PORT_1_OPTIONS

	default 0

config UART_NS16550_PORT_1_DLF

	default 0x06



endif # UART_NS16550_PORT_1



endif # UART_NS16550



if UART_QMSI

config UART_QMSI_0

	def_bool y

config UART_QMSI_0_IRQ

	default 8

config UART_QMSI_0_IRQ_PRI

	default 0

config UART_QMSI_1

	def_bool y

config UART_QMSI_1_IRQ

	default 6

config UART_QMSI_1_IRQ_PRI

	default 0

endif # UART_QMSI

arch/x86/soc/quark_se/Kconfig.defconfig

+0 −41
Original line number Diff line number Diff line
@@ -255,51 +255,12 @@ config RTC_QMSI_IRQ_PRI 
	default 2

endif # RTC



if UART_NS16550



config UART_NS16550_PORT_0

	def_bool y



if UART_NS16550_PORT_0



config UART_NS16550_PORT_0_NAME

	default "UART_0"

config UART_NS16550_PORT_0_IRQ_PRI

	default 3

config UART_NS16550_PORT_0_BAUD_RATE

	default 115200

config UART_NS16550_PORT_0_OPTIONS

	default 0



endif # UART_NS16550_PORT_0



config UART_NS16550_PORT_1

	def_bool y



if UART_NS16550_PORT_1



config UART_NS16550_PORT_1_NAME

	default "UART_1"

config UART_NS16550_PORT_1_IRQ_PRI

	default 3

config UART_NS16550_PORT_1_BAUD_RATE

	default 115200

config UART_NS16550_PORT_1_OPTIONS

	default 0



endif # UART_NS16550_PORT_1



endif # UART_NS16550



if UART_QMSI



config UART_QMSI_0

	def_bool y



if UART_QMSI_0



config UART_QMSI_0_IRQ

	default 5

config UART_QMSI_0_IRQ_PRI

	default 3
@@ -310,8 +271,6 @@ config UART_QMSI_1 


if UART_QMSI_1



config UART_QMSI_1_IRQ

	default 6

config UART_QMSI_1_IRQ_PRI

	default 3

arch/x86/soc/quark_se/soc.c

+0 −22
Original line number Diff line number Diff line
@@ -100,25 +100,3 @@ SYS_INIT(arc_init, SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); 


#endif /*CONFIG_ARC_INIT*/

#ifdef CONFIG_UART_NS16550

#ifdef CONFIG_UART_INTERRUPT_DRIVEN



static int platform_uart_init(struct device *arg)

{

	ARG_UNUSED(arg);



#ifdef CONFIG_UART_NS16550_PORT_0

	SCSS_INTERRUPT->int_uart_mask[0] &= INT_UNMASK_IA;

#endif



#ifdef CONFIG_UART_NS16550_PORT_1

	SCSS_INTERRUPT->int_uart_mask[1] &= INT_UNMASK_IA;

#endif



	return 0;

}



SYS_INIT(platform_uart_init, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);



#endif /* CONFIG_UART_INTERRUPT_DRIVEN */

#endif /* CONFIG_UART_NS16550 */

boards/arduino_101/Kconfig.defconfig

+4 −4
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ config BLUETOOTH_NRF51_PM 
	def_bool y



config NBLE_UART_ON_DEV_NAME

        default UART_NS16550_PORT_0_NAME

        default UART_QMSI_0_NAME



endif
@@ -29,19 +29,19 @@ config BLUETOOTH_WAIT_NOP 
	def_bool y



config BLUETOOTH_UART_ON_DEV_NAME

        default UART_NS16550_PORT_0_NAME

        default UART_QMSI_0_NAME



endif



if UART_PIPE



config UART_PIPE_ON_DEV_NAME

	default UART_NS16550_PORT_1_NAME

	default UART_QMSI_1_NAME



endif



config BLUETOOTH_MONITOR_ON_DEV_NAME

	default UART_NS16550_PORT_1_NAME if BLUETOOTH_DEBUG_MONITOR

	default UART_QMSI_1_NAME if BLUETOOTH_DEBUG_MONITOR



if FLASH && SPI

boards/arduino_101/arduino_101_defconfig

+2 −3
Original line number Diff line number Diff line
@@ -5,9 +5,8 @@ CONFIG_CPU_MINUTEIA=y 
CONFIG_CONSOLE=y

CONFIG_UART_CONSOLE=y

CONFIG_SERIAL=y

CONFIG_UART_NS16550=y

CONFIG_UART_NS16550_PORT_0_BAUD_RATE=1000000

CONFIG_UART_NS16550_PORT_0_OPTIONS=1

CONFIG_UART_QMSI=y

CONFIG_UART_QMSI_0_BAUDRATE=1000000

CONFIG_PRINTK=y

CONFIG_IPM=y

CONFIG_IPM_QUARK_SE=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE