qmsi: spi: use built-in qmsi driver (a6915c07) · Commits · Wenxi XU / zephyr

arch/x86/soc/quark_d2000/Kconfig.defconfig

+4 −4

Original line number	Diff line number	Diff line
		@@ -153,14 +153,14 @@ config ADC_QMSI
		def_bool y
		endif

		if SPI_QMSI
		if SPI
		config SPI_QMSI
		def_bool y
		config SPI_QMSI_PORT_0
		def_bool y
		config SPI_QMSI_PORT_0_IRQ
		default 7
		config SPI_QMSI_PORT_0_PRI
		default 0
		endif # SPI_QMSI
		endif # SPI

		if SOC_FLASH_QMSI
		config SOC_FLASH_QMSI_SYS_SIZE

+1 −69

Original line number	Diff line number	Diff line
		@@ -143,89 +143,21 @@ endif


		if SPI

		config SPI_DW
		def_bool y

		if SPI_DW

		config SPI_DW_CLOCK_GATE
		def_bool n

		if SPI_DW_CLOCK_GATE

		config SPI_DW_CLOCK_GATE_DRV_NAME
		default CLOCK_CONTROL_QUARK_SE_PERIPHERAL_DRV_NAME

		endif # SPI_DW_CLOCK_GATE

		config SPI_DW_PORT_0
		def_bool y

		if SPI_DW_PORT_0

		config SPI_DW_PORT_0_CLOCK_GATE_SUBSYS
		default 14
		depends on SPI_DW_CLOCK_GATE
		config SPI_DW_PORT_0_REGS
		default 0xb0001000
		config SPI_DW_PORT_0_IRQ
		default 2
		config SPI_DW_PORT_0_PRI
		default 2

		endif # SPI_DW_PORT_0

		config SPI_DW_PORT_1
		def_bool y

		if SPI_DW_PORT_1

		config SPI_DW_PORT_1_CLOCK_GATE_SUBSYS
		default 15
		depends on SPI_DW_CLOCK_GATE
		config SPI_DW_PORT_1_REGS
		default 0xb0001400
		config SPI_DW_PORT_1_IRQ
		default 3
		config SPI_DW_PORT_1_PRI
		default 2

		endif # SPI_DW_PORT_1

		endif # SPI_DW

		config SPI_QMSI
		def_bool n

		if SPI_QMSI
		def_bool y

		config SPI_QMSI_PORT_0
		def_bool y

		if SPI_QMSI_PORT_0

		config SPI_QMSI_PORT_0_IRQ
		default 2
		config SPI_QMSI_PORT_0_PRI
		default 2

		endif # SPI_QMSI_PORT_0

		config SPI_QMSI_PORT_1
		def_bool y

		if SPI_QMSI_PORT_1

		config SPI_QMSI_PORT_1_IRQ
		default 3
		config SPI_QMSI_PORT_1_PRI
		default 2

		endif # SPI_QMSI_PORT_1

		endif # SPI_QMSI

		endif # SPI

		if ADC

+1 −0

Original line number	Diff line number	Diff line
		@@ -8,4 +8,5 @@ obj-$(CONFIG_AON_COUNTER_QMSI) += drivers/qm_aon_counters.o
		obj-$(CONFIG_GPIO_QMSI) += drivers/qm_gpio.o
		obj-$(CONFIG_ADC_QMSI) += drivers/qm_adc.o
		obj-$(CONFIG_UART_QMSI) += drivers/qm_uart.o
		obj-$(CONFIG_SPI_QMSI) += drivers/qm_spi.o
		obj-$(CONFIG_SOC_FLASH_QMSI) += drivers/qm_flash.o

+1 −11

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@

		menuconfig SPI_QMSI
		bool "QMSI driver for SPI controller"
		depends on SPI && QMSI_DRIVERS
		depends on SPI && QMSI
		default n
		help
		SPI driver implementation using QMSI library. QMSI is the
		@@ -46,11 +46,6 @@ config SPI_QMSI_PORT_0_DRV_NAME
		depends on SPI_QMSI_PORT_0
		default "SPI_0"

		config SPI_QMSI_PORT_0_IRQ
		int
		prompt "Port 0 interrupt"
		depends on SPI_QMSI_PORT_0

		config SPI_QMSI_PORT_0_PRI
		int
		prompt "Port 0 interrupt priority"
		@@ -81,11 +76,6 @@ config SPI_QMSI_PORT_1_DRV_NAME
		depends on SPI_QMSI_PORT_1
		default "SPI_1"

		config SPI_QMSI_PORT_1_IRQ
		int
		prompt "Port 1 interrupt"
		depends on SPI_QMSI_PORT_1

		config SPI_QMSI_PORT_1_PRI
		int
		prompt "Port 0 interrupt priority"

+4 −4

Original line number	Diff line number	Diff line
		@@ -261,20 +261,20 @@ static int spi_qmsi_init(struct device *dev)

		switch (spi_config->spi) {
		case QM_SPI_MST_0:
		IRQ_CONNECT(CONFIG_SPI_QMSI_PORT_0_IRQ,
		IRQ_CONNECT(QM_IRQ_SPI_MASTER_0,
		CONFIG_SPI_QMSI_PORT_0_PRI, qm_spi_master_0_isr,
		0, IOAPIC_LEVEL \| IOAPIC_HIGH);
		irq_enable(CONFIG_SPI_QMSI_PORT_0_IRQ);
		irq_enable(QM_IRQ_SPI_MASTER_0);
		clk_periph_enable(CLK_PERIPH_CLK \| CLK_PERIPH_SPI_M0_REGISTER);
		QM_SCSS_INT->int_spi_mst_0_mask &= ~BIT(0);
		break;

		#ifdef CONFIG_SPI_QMSI_PORT_1
		case QM_SPI_MST_1:
		IRQ_CONNECT(CONFIG_SPI_QMSI_PORT_1_IRQ,
		IRQ_CONNECT(QM_IRQ_SPI_MASTER_1,
		CONFIG_SPI_QMSI_PORT_1_PRI, qm_spi_master_1_isr,
		0, IOAPIC_LEVEL \| IOAPIC_HIGH);
		irq_enable(CONFIG_SPI_QMSI_PORT_1_IRQ);
		irq_enable(QM_IRQ_SPI_MASTER_1);
		clk_periph_enable(CLK_PERIPH_CLK \| CLK_PERIPH_SPI_M1_REGISTER);
		QM_SCSS_INT->int_spi_mst_1_mask &= ~BIT(0);
		break;