qmsi: aon_counters: use built-in qmsi driver (f4feacf8) · Commits · Wenxi XU / zephyr

arch/x86/soc/quark_d2000/Kconfig.defconfig

+9 −6

Original line number	Diff line number	Diff line
		@@ -197,6 +197,15 @@ config AIO_QMSI_COMPARATOR
		def_bool y
		endif

		if COUNTER
		config AON_COUNTER_QMSI
		def_bool y
		config AON_TIMER_QMSI
		def_bool y
		config AON_TIMER_IRQ_PRI
		default 0
		endif

		if GPIO_QMSI
		config GPIO_QMSI_0
		def_bool y
		@@ -215,12 +224,6 @@ config SPI_QMSI_PORT_0_PRI
		default 0
		endif # SPI_QMSI

		if AON_TIMER_QMSI
		config AON_TIMER_IRQ
		default 3
		config AON_TIMER_IRQ_PRI
		default 0
		endif # AON_TIMER_QMSI

		if SOC_FLASH_QMSI
		config SOC_FLASH_QMSI_SYS_SIZE

+12 −8

Original line number	Diff line number	Diff line
		@@ -191,6 +191,18 @@ endif # CLOCK_CONTROL_QUARK_SE

		endif # CLOCK_CONTROL


		if COUNTER
		config AON_COUNTER_QMSI
		def_bool y
		config AON_TIMER_QMSI
		def_bool y
		config AON_TIMER_IRQ_PRI
		default 2

		endif


		if SPI

		config SPI_DW
		@@ -370,14 +382,6 @@ config UART_CONSOLE_ON_DEV_NAME

		endif

		if AON_TIMER_QMSI

		config AON_TIMER_IRQ
		default 28
		config AON_TIMER_IRQ_PRI
		default 2

		endif # AON_TIMER_QMSI

		if SOC_FLASH_QMSI
		config SOC_FLASH_QMSI_SYS_SIZE

+2 −8

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ menuconfig COUNTER
		config AON_COUNTER_QMSI
		bool
		prompt "AON counter driver"
		depends on COUNTER && QMSI_DRIVERS
		depends on COUNTER && QMSI
		default n
		help
		Enable support for AON counter.
		@@ -40,7 +40,7 @@ config AON_COUNTER_QMSI_DEV_NAME
		config AON_TIMER_QMSI
		bool
		prompt "AON periodic timer driver"
		depends on COUNTER && QMSI_DRIVERS
		depends on COUNTER && QMSI
		default n
		help
		Enable support for AON periodic timer.
		@@ -52,12 +52,6 @@ config AON_TIMER_QMSI_DEV_NAME
		help
		Specify the device name for AON timer driver.

		config AON_TIMER_IRQ
		int "Interrupt number"
		depends on AON_TIMER_QMSI
		help
		aon timer interrupt number

		config AON_TIMER_IRQ_PRI
		int "Interrupt priority"
		depends on AON_TIMER_QMSI

+0 −2

Original line number	Diff line number	Diff line
		ccflags-$(CONFIG_QMSI_DRIVERS) +=-I$(CONFIG_QMSI_INSTALL_PATH)/include

		obj-$(CONFIG_AON_COUNTER_QMSI) += counter_qmsi_aon.o
		obj-$(CONFIG_AON_TIMER_QMSI) += counter_qmsi_aonpt.o

+2 −2

Original line number	Diff line number	Diff line
		@@ -119,11 +119,11 @@ static int aon_timer_init(struct device *dev)
		driver_data->callback_user_data = NULL;
		driver_data->timer_callback = NULL;

		IRQ_CONNECT(CONFIG_AON_TIMER_IRQ,
		IRQ_CONNECT(QM_IRQ_AONPT_0,
		CONFIG_AON_TIMER_IRQ_PRI, qm_aonpt_isr_0,
		NULL, IOAPIC_EDGE \| IOAPIC_HIGH);

		irq_enable(CONFIG_AON_TIMER_IRQ);
		irq_enable(QM_IRQ_AONPT_0);

		QM_SCSS_INT->int_aon_timer_mask &= ~BIT(0);