bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spi: Remove default value from platform-specific options

Browse Source 
This patch removes the default value from some platform/SoC specific
options which are declared in drivers/spi/Kconfig because 1) most of
the time they are not valid values and 2) the correct values are
already set in the SoC Kconfig.

It also moves the interrupt priority definition from the driver's
Kconfig to the platform's Kconfig since it is a platform-specific
configuration.

Change-Id: Ic992749b3210ed8a2e454edece41ceca5edbaf2e
Signed-off-by: Andre Guedes <andre.guedes@intel.com>
This commit is contained in:
Andre Guedes 2016-02-16 22:53:12 -02:00
parent 08ce5a5da7
commit 1eaaa6434b
2 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/soc/quark_se/Kconfig
View File

@ -217,6 +217,8 @@ config SPI_DW_PORT_0_REGS
default 0xb0001000
config SPI_DW_PORT_0_IRQ
default 2
config SPI_DW_PORT_0_PRI
default 2
config SPI_DW_PORT_1
def_bool y
@ -227,6 +229,8 @@ 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
config SPI_QMSI
@ -237,10 +241,14 @@ config SPI_QMSI_PORT_0
def_bool y
config SPI_QMSI_PORT_0_IRQ
default 2
config SPI_QMSI_PORT_0_PRI
default 2
config SPI_QMSI_PORT_1
def_bool y
config SPI_QMSI_PORT_1_IRQ
default 3
config SPI_QMSI_PORT_1_PRI
default 2
endif # SPI_QMSI
endif

30
drivers/spi/Kconfig
View File

@ -116,35 +116,29 @@ config SPI_INTEL_PORT_0_DRV_NAME
config SPI_INTEL_PORT_0_BUS
int "Port 0 PCI Bus"
depends on SPI_INTEL_PORT_0 && PCI
default 0
config SPI_INTEL_PORT_0_DEV
int "Port 0 PCI Dev"
depends on SPI_INTEL_PORT_0 && PCI
default 0
config SPI_INTEL_PORT_0_FUNCTION
int "Port 0 PCI function"
depends on SPI_INTEL_PORT_0 && PCI
default 0
config SPI_INTEL_PORT_0_REGS
hex
prompt "Port 0 registers address"
depends on SPI_INTEL_PORT_0
default 0x00000000
config SPI_INTEL_PORT_0_IRQ
int
prompt "Port 0 interrupt"
depends on SPI_INTEL_PORT_0
default 0
config SPI_INTEL_PORT_0_PRI
int
prompt "Port 0 interrupt priority"
depends on SPI_INTEL_PORT_0
default 2
config SPI_INTEL_PORT_0_CS_GPIO_PORT
string
@ -174,35 +168,29 @@ config SPI_INTEL_PORT_1_DRV_NAME
config SPI_INTEL_PORT_1_BUS
int "Port 1 PCI Bus"
depends on SPI_INTEL_PORT_1 && PCI
default 0
config SPI_INTEL_PORT_1_DEV
int "Port 1 PCI Dev"
depends on SPI_INTEL_PORT_1 && PCI
default 0
config SPI_INTEL_PORT_1_FUNCTION
int "Port 1 PCI function"
depends on SPI_INTEL_PORT_1 && PCI
default 0
config SPI_INTEL_PORT_1_REGS
hex
prompt "Port 1 registers address"
depends on SPI_INTEL_PORT_1
default 0x00000000
config SPI_INTEL_PORT_1_IRQ
int
prompt "Port 1 interrupt"
depends on SPI_INTEL_PORT_1
default 0
config SPI_INTEL_PORT_1_PRI
int
prompt "Port 0 interrupt priority"
depends on SPI_INTEL_PORT_1
default 2
config SPI_INTEL_PORT_1_CS_GPIO_PORT
string
@ -308,7 +296,6 @@ config SPI_DW_PORT_0
config SPI_DW_PORT_0_CLOCK_GATE_SUBSYS
int "Clock controller's subsystem"
depends on SPI_DW_CLOCK_GATE
default 0
config SPI_DW_PORT_0_CS_GPIO_PORT
string
@ -331,12 +318,10 @@ config SPI_DW_PORT_0_REGS
hex
prompt "Port 0 registers address"
depends on SPI_DW_PORT_0
default 0x00000000
config SPI_DW_PORT_0_IRQ
int "Port 0 interrupt"
depends on SPI_DW_PORT_0 && SPI_DW_INTERRUPT_SINGLE_LINE
default 0
help
Interrupt number dedicated to the controller. Valid if only the
controller routes all interrupt through a unique line.
@ -344,7 +329,6 @@ config SPI_DW_PORT_0_IRQ
config SPI_DW_PORT_0_ERROR_IRQ
int "Port 0 ERROR Interrupt"
depends on SPI_DW_PORT_0 && SPI_DW_INTERRUPT_SEPARATED_LINES
default 0
help
Interrupt number dedicated to the ERROR interrupt only. RX and TX
interrupt numbers need to be set as well.
@ -352,7 +336,6 @@ config SPI_DW_PORT_0_ERROR_IRQ
config SPI_DW_PORT_0_RX_IRQ
int "Port 0 RX Interrupt"
depends on SPI_DW_PORT_0 && SPI_DW_INTERRUPT_SEPARATED_LINES
default 0
help
Interrupt number dedicated to the RX interrupt only. TX and ERROR
interrupt numbers need to be set as well.
@ -360,7 +343,6 @@ config SPI_DW_PORT_0_RX_IRQ
config SPI_DW_PORT_0_TX_IRQ
int "Port 0 TX Interrupt"
depends on SPI_DW_PORT_0 && SPI_DW_INTERRUPT_SEPARATED_LINES
default 0
help
Interrupt number dedicated to the TX interrupt only. RX and ERROR
interrupt numbers need to be set as well.
@ -369,7 +351,6 @@ config SPI_DW_PORT_0_PRI
int
prompt "Port 0 interrupt priority"
depends on SPI_DW_PORT_0
default 2
config SPI_DW_PORT_1
bool
@ -382,7 +363,6 @@ config SPI_DW_PORT_1
config SPI_DW_PORT_1_CLOCK_GATE_SUBSYS
int "Clock controller's subsystem"
depends on SPI_DW_CLOCK_GATE
default 0
config SPI_DW_PORT_1_CS_GPIO_PORT
string
@ -405,12 +385,10 @@ config SPI_DW_PORT_1_REGS
hex
prompt "Port 1 registers address"
depends on SPI_DW_PORT_1
default 0x00000000
config SPI_DW_PORT_1_IRQ
int "Port 1 interrupt"
depends on SPI_DW_PORT_1 && SPI_DW_INTERRUPT_SINGLE_LINE
default 0
help
Interrupt number dedicated to the controller. Valid if only the
controller routes all interrupt through a unique line.
@ -418,7 +396,6 @@ config SPI_DW_PORT_1_IRQ
config SPI_DW_PORT_1_ERROR_IRQ
int "Port 1 ERROR Interrupt"
depends on SPI_DW_PORT_1 && SPI_DW_INTERRUPT_SEPARATED_LINES
default 0
help
Interrupt number dedicated to the ERROR interrupt only. RX and TX
interrupt numbers need to be set as well.
@ -426,7 +403,6 @@ config SPI_DW_PORT_1_ERROR_IRQ
config SPI_DW_PORT_1_RX_IRQ
int "Port 1 RX Interrupt"
depends on SPI_DW_PORT_1 && SPI_DW_INTERRUPT_SEPARATED_LINES
default 0
help
Interrupt number dedicated to the RX interrupt only. TX and ERROR
interrupt numbers need to be set as well.
@ -434,7 +410,6 @@ config SPI_DW_PORT_1_RX_IRQ
config SPI_DW_PORT_1_TX_IRQ
int "Port 1 TX Interrupt"
depends on SPI_DW_PORT_1 && SPI_DW_INTERRUPT_SEPARATED_LINES
default 0
help
Interrupt number dedicated to the TX interrupt only. RX and ERROR
interrupt numbers need to be set as well.
@ -443,7 +418,6 @@ config SPI_DW_PORT_1_PRI
int
prompt "Port 1 interrupt priority"
depends on SPI_DW_PORT_1
default 2
config SPI_QMSI
bool "QMSI driver for SPI controller"
@ -485,13 +459,11 @@ config SPI_QMSI_PORT_0_IRQ
int
prompt "Port 0 interrupt"
depends on SPI_QMSI_PORT_0
default 0
config SPI_QMSI_PORT_0_PRI
int
prompt "Port 0 interrupt priority"
depends on SPI_QMSI_PORT_0
default 2
config SPI_QMSI_PORT_0_CS_GPIO_PORT
string
@ -522,13 +494,11 @@ config SPI_QMSI_PORT_1_IRQ
int
prompt "Port 1 interrupt"
depends on SPI_QMSI_PORT_1
default 0
config SPI_QMSI_PORT_1_PRI
int
prompt "Port 0 interrupt priority"
depends on SPI_QMSI_PORT_1
default 2
config SPI_QMSI_PORT_1_CS_GPIO_PORT
string