Commit 573774a9 authored by Wojciech Bober's avatar Wojciech Bober Committed by Jukka Rissanen
Browse files

drivers/net/ieee802154: Change configuration prefix 

This commit changes Kconfig prefix for ieee802154 drivers to
IEEE802154_*. This is done for consistency with config prefixes
used in other subsystems.

Change-Id: Ibbb4d96d2b748f4f13135bde85304ec34c5a90a6
Signed-off-by: default avatarWojciech Bober <wojciech.bober@nordicsemi.no>
parent 8db13f90

boards/arm/frdm_k64f/pinmux.c

+1 −1
Changes for boards/arm/frdm_k64f/pinmux.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static int frdm_k64f_pinmux_init(struct device *dev) 
	pinmux_pin_set(porte, 26, PORT_PCR_MUX(kPORT_MuxAsGpio));

	pinmux_pin_set(portb, 21, PORT_PCR_MUX(kPORT_MuxAsGpio));



#ifdef CONFIG_NXP_MCR20A

#ifdef CONFIG_IEEE802154_MCR20A

	/* FRDM-MCR20A Reset (D5) */

	pinmux_pin_set(porta,  2, PORT_PCR_MUX(kPORT_MuxAsGpio));

	/* FRDM-MCR20A IRQ_B (D2) */

boards/x86/quark_se_c1000_devboard/Kconfig.defconfig

+9 −9
Changes for boards/x86/quark_se_c1000_devboard/Kconfig.defconfig: 9 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -46,26 +46,26 @@ endif 
config BLUETOOTH_MONITOR_ON_DEV_NAME

	default UART_QMSI_1_NAME if BLUETOOTH_DEBUG_MONITOR



if TI_CC2520_LEGACY || TI_CC2520 || TI_CC2520_RAW

if IEEE802154_CC2520_LEGACY || IEEE802154_CC2520 || IEEE802154_CC2520_RAW



config SPI

	def_bool y

config GPIO

	def_bool y



config TI_CC2520_SPI_DRV_NAME

config IEEE802154_CC2520_SPI_DRV_NAME

	default SPI_1_NAME

config TI_CC2520_SPI_FREQ

config IEEE802154_CC2520_SPI_FREQ

	default 4

config TI_CC2520_SPI_SLAVE

config IEEE802154_CC2520_SPI_SLAVE

	default 1





if GPIO_QMSI



config TI_CC2520_GPIO_0_NAME

config IEEE802154_CC2520_GPIO_0_NAME

	default GPIO_QMSI_0_NAME

config TI_CC2520_GPIO_1_NAME

config IEEE802154_CC2520_GPIO_1_NAME

	default GPIO_QMSI_1_NAME



endif # GPIO_QMSI
@@ -77,14 +77,14 @@ config SPI_1_CS_GPIO_PORT 
	default GPIO_QMSI_0_NAME

config SPI_1_CS_GPIO_PIN

	default 11

config TI_CC2520_GPIO_0_NAME

config IEEE802154_CC2520_GPIO_0_NAME

	string

	default GPIO_QMSI_0_NAME

config TI_CC2520_GPIO_1_NAME

config IEEE802154_CC2520_GPIO_1_NAME

	string

	default GPIO_QMSI_1_NAME

endif



endif # TI_CC2520_LEGACY || TI_CC2520 || TI_CC2520_RAW

endif # IEEE802154_CC2520_LEGACY || IEEE802154_CC2520 || IEEE802154_CC2520_RAW



endif # BOARD_QUARK_SE_C1000_DEVBOARD

boards/x86/quark_se_c1000_devboard/board.c

+8 −6
Changes for boards/x86/quark_se_c1000_devboard/board.c: 8 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ 
#include <device.h>

#include <init.h>



#if defined(CONFIG_TI_CC2520_LEGACY) || \

	defined(CONFIG_TI_CC2520) || \

	defined(CONFIG_TI_CC2520_RAW)

#if defined(CONFIG_IEEE802154_CC2520_LEGACY) || \

	defined(CONFIG_IEEE802154_CC2520) || \

	defined(CONFIG_IEEE802154_CC2520_RAW)



#include <ieee802154/cc2520.h>

#include <gpio.h>
@@ -34,7 +34,7 @@ struct cc2520_gpio_configuration *cc2520_configure_gpios(void) 
				  GPIO_INT_ACTIVE_HIGH | GPIO_INT_DEBOUNCE);

	struct device *gpio;



	gpio = device_get_binding(CONFIG_TI_CC2520_GPIO_1_NAME);

	gpio = device_get_binding(CONFIG_IEEE802154_CC2520_GPIO_1_NAME);

	gpio_pin_configure(gpio, cc2520_gpios[CC2520_GPIO_IDX_VREG_EN].pin,

			   flags_noint_out);

	gpio_pin_configure(gpio, cc2520_gpios[CC2520_GPIO_IDX_RESET].pin,
@@ -43,7 +43,7 @@ struct cc2520_gpio_configuration *cc2520_configure_gpios(void) 
	cc2520_gpios[CC2520_GPIO_IDX_VREG_EN].dev = gpio;

	cc2520_gpios[CC2520_GPIO_IDX_RESET].dev = gpio;



	gpio = device_get_binding(CONFIG_TI_CC2520_GPIO_0_NAME);

	gpio = device_get_binding(CONFIG_IEEE802154_CC2520_GPIO_0_NAME);

	gpio_pin_configure(gpio, cc2520_gpios[CC2520_GPIO_IDX_SFD].pin,

			   flags_int_in);

	gpio_pin_configure(gpio, cc2520_gpios[CC2520_GPIO_IDX_FIFOP].pin,
@@ -61,4 +61,6 @@ struct cc2520_gpio_configuration *cc2520_configure_gpios(void) 
	return cc2520_gpios;

}



#endif /* CONFIG_TI_CC2520_LEGACY || CONFIG_TI_CC2520 || CONFIG_TI_CC2520_RAW */
 
#endif /* CONFIG_IEEE802154_CC2520_LEGACY || CONFIG_IEEE802154_CC2520 ||

	* CONFIG_IEEE802154_CC2520_RAW

	*/

boards/x86/quark_se_c1000_devboard/board.h

+6 −4
Changes for boards/x86/quark_se_c1000_devboard/board.h: 6 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ 
#define LED0_GPIO_PORT  CONFIG_GPIO_QMSI_0_NAME

#define LED0_GPIO_PIN   25



#if defined(CONFIG_TI_CC2520_LEGACY) || \

	defined(CONFIG_TI_CC2520) || \

	defined(CONFIG_TI_CC2520_RAW)

#if defined(CONFIG_IEEE802154_CC2520_LEGACY) || \

	defined(CONFIG_IEEE802154_CC2520) || \

	defined(CONFIG_IEEE802154_CC2520_RAW)



/* GPIO numbers where the TI cc2520 chip is connected to */

#define CC2520_GPIO_VREG_EN	0  /* PIN ?, ATP_AON_INT0 (out) */
@@ -33,7 +33,9 @@ 
#define CC2520_GPIO_CCA		6  /* PIN 6, GPIO6 (in) */

#define CC2520_GPIO_SFD		29 /* PIN 33, GPIO29 (in) */



#endif /* CONFIG_TI_CC2520_LEGACY || CONFIG_TI_CC2520 || CONFIG_TI_CC2520_RAW */

#endif /* CONFIG_IEEE802154_CC2520_LEGACY || CONFIG_IEEE802154_CC2520 ||

	* CONFIG_IEEE802154_CC2520_RAW

	*/



#if defined(CONFIG_USB)

/* GPIO driver name */

drivers/ieee802154/Kconfig

+4 −4
Changes for drivers/ieee802154/Kconfig: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -58,16 +58,16 @@ source "drivers/ieee802154/Kconfig.cc2520" 


source "drivers/ieee802154/Kconfig.mcr20a"



menuconfig UPIPE_15_4

menuconfig IEEE802154_UPIPE

	bool "UART PIPE fake radio driver support for QEMU"

	depends on BOARD_QEMU_X86

	select NETWORKING

	select UART_PIPE

	default n



config UPIPE_15_4_DRV_NAME

config IEEE802154_UPIPE_DRV_NAME

	string "UART PIPE Driver name"

	default "upipe_15_4"

	depends on UPIPE_15_4

	default "IEEE802154_UPIPE"

	depends on IEEE802154_UPIPE



endmenu

CRA Git | Maintained and supported by SUSTech CRA and CCSE