michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/spi: Remove unused legacy options

Browse source 
These have been osbolete for some time already.

Fixes #11064

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2018-11-05 11:26:56 +01:00 • committed by Kumar Gala
commit d658e03488
5 changed files with 2 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

9
boards/arc/arduino_101_sss/Kconfig.defconfig
View file

@ -16,15 +16,6 @@ if FLASH && SPI
config SPI_FLASH_W25QXXDV config SPI_FLASH_W25QXXDV
def_bool y def_bool y
config SPI_CS_GPIO
def_bool y
config SPI_0_CS_GPIO_PIN
default 24
config SPI_0_CS_GPIO_PORT
default "GPIO_2"
config SPI_FLASH_W25QXXDV_SPI_NAME config SPI_FLASH_W25QXXDV_SPI_NAME
default "SPI_2" default "SPI_2"

4
boards/x86/arduino_101/pinmux.c
View file

@ -116,7 +116,7 @@ static void _pinmux_defaults(u32_t base)
u32_t mux_config[PINMUX_MAX_REGISTERS] = { 0, 0, 0, 0, 0 }; u32_t mux_config[PINMUX_MAX_REGISTERS] = { 0, 0, 0, 0, 0 };
int i = 0; int i = 0;
#if !defined(CONFIG_SPI_1) && !defined(CONFIG_SPI_CS_GPIO) #if !defined(CONFIG_SPI_1)
PIN_CONFIG(mux_config, 0, PINMUX_FUNC_B); PIN_CONFIG(mux_config, 0, PINMUX_FUNC_B);
#endif #endif
PIN_CONFIG(mux_config, 1, PINMUX_FUNC_B); PIN_CONFIG(mux_config, 1, PINMUX_FUNC_B);
@ -136,9 +136,7 @@ static void _pinmux_defaults(u32_t base)
PIN_CONFIG(mux_config, 42, PINMUX_FUNC_B); PIN_CONFIG(mux_config, 42, PINMUX_FUNC_B);
PIN_CONFIG(mux_config, 43, PINMUX_FUNC_B); PIN_CONFIG(mux_config, 43, PINMUX_FUNC_B);
PIN_CONFIG(mux_config, 44, PINMUX_FUNC_B); PIN_CONFIG(mux_config, 44, PINMUX_FUNC_B);
#ifndef CONFIG_SPI_CS_GPIO
PIN_CONFIG(mux_config, 45, PINMUX_FUNC_B); PIN_CONFIG(mux_config, 45, PINMUX_FUNC_B);
#endif
#endif #endif
PIN_CONFIG(mux_config, 55, PINMUX_FUNC_B); PIN_CONFIG(mux_config, 55, PINMUX_FUNC_B);
PIN_CONFIG(mux_config, 56, PINMUX_FUNC_B); PIN_CONFIG(mux_config, 56, PINMUX_FUNC_B);

4
boards/x86/tinytile/pinmux.c
View file

@ -116,7 +116,7 @@ static void _pinmux_defaults(u32_t base)
u32_t mux_config[PINMUX_MAX_REGISTERS] = { 0, 0, 0, 0, 0 }; u32_t mux_config[PINMUX_MAX_REGISTERS] = { 0, 0, 0, 0, 0 };
int i = 0; int i = 0;
#if !defined(CONFIG_SPI_1) && !defined(CONFIG_SPI_CS_GPIO) #if !defined(CONFIG_SPI_1)
PIN_CONFIG(mux_config, 0, PINMUX_FUNC_B); PIN_CONFIG(mux_config, 0, PINMUX_FUNC_B);
#endif #endif
PIN_CONFIG(mux_config, 1, PINMUX_FUNC_B); PIN_CONFIG(mux_config, 1, PINMUX_FUNC_B);
@ -136,9 +136,7 @@ static void _pinmux_defaults(u32_t base)
PIN_CONFIG(mux_config, 42, PINMUX_FUNC_B); PIN_CONFIG(mux_config, 42, PINMUX_FUNC_B);
PIN_CONFIG(mux_config, 43, PINMUX_FUNC_B); PIN_CONFIG(mux_config, 43, PINMUX_FUNC_B);
PIN_CONFIG(mux_config, 44, PINMUX_FUNC_B); PIN_CONFIG(mux_config, 44, PINMUX_FUNC_B);
#ifndef CONFIG_SPI_CS_GPIO
PIN_CONFIG(mux_config, 45, PINMUX_FUNC_B); PIN_CONFIG(mux_config, 45, PINMUX_FUNC_B);
#endif
#endif #endif
PIN_CONFIG(mux_config, 55, PINMUX_FUNC_B); PIN_CONFIG(mux_config, 55, PINMUX_FUNC_B);
PIN_CONFIG(mux_config, 56, PINMUX_FUNC_B); PIN_CONFIG(mux_config, 56, PINMUX_FUNC_B);

30
drivers/spi/Kconfig
View file

@ -66,16 +66,6 @@ config SPI_0_IRQ_PRI
int "Port 0 interrupt priority" int "Port 0 interrupt priority"
depends on !HAS_DTS_SPI depends on !HAS_DTS_SPI
config SPI_0_CS_GPIO_PORT
string "The GPIO port which is used to control CS"
depends on SPI_CS_GPIO
default "GPIO_0"
config SPI_0_CS_GPIO_PIN
int "The GPIO PIN which is used to act as a CS pin"
depends on SPI_CS_GPIO
default 0
endif # SPI_0 endif # SPI_0
config SPI_1 config SPI_1
@ -105,16 +95,6 @@ config SPI_1_IRQ_PRI
int "Port 1 interrupt priority" int "Port 1 interrupt priority"
depends on !HAS_DTS_SPI depends on !HAS_DTS_SPI
config SPI_1_CS_GPIO_PORT
string "The GPIO port which is used to control CS"
depends on SPI_CS_GPIO
default "GPIO_0"
config SPI_1_CS_GPIO_PIN
int "The GPIO PIN which is used to act as a CS pin"
depends on SPI_CS_GPIO
default 0
endif # SPI_1 endif # SPI_1
config SPI_2 config SPI_2
@ -144,16 +124,6 @@ config SPI_2_IRQ_PRI
int "Port 2 interrupt priority" int "Port 2 interrupt priority"
depends on !HAS_DTS_SPI depends on !HAS_DTS_SPI
config SPI_2_CS_GPIO_PORT
string "The GPIO port which is used to control CS"
depends on SPI_CS_GPIO
default "GPIO_0"
config SPI_2_CS_GPIO_PIN
int "The GPIO PIN which is used to act as a CS pin"
depends on SPI_CS_GPIO
default 0
endif # SPI_2 endif # SPI_2
config SPI_3 config SPI_3

3
samples/drivers/spi_fujitsu_fram/prj.conf
View file

@ -3,6 +3,3 @@ CONFIG_PRINTK=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_SPI_CS_GPIO=y
CONFIG_SPI_1_CS_GPIO_PORT="GPIO_0"
CONFIG_SPI_1_CS_GPIO_PIN=20