From 29a6053a0df13a5b4bba08f7e97252cfa6346252 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 16 May 2017 16:25:03 -0500 Subject: [PATCH] arm: nrf: dts: use label to generate NRF uart name Now that we can utilize label in the device tree we can convert to getting the device name for the NRF UART out of the device tree instead of from Kconfig. Signed-off-by: Kumar Gala --- drivers/serial/Kconfig.nrf5 | 8 -------- dts/arm/96b_carbon_nrf51.fixup | 1 + dts/arm/96b_nitrogen.fixup | 1 + dts/arm/arduino_101_ble.fixup | 1 + dts/arm/bbc_microbit.fixup | 1 + dts/arm/curie_ble.fixup | 1 + dts/arm/nordic/nrf51822.dtsi | 1 + dts/arm/nordic/nrf52832.dtsi | 1 + dts/arm/nordic/nrf52840.dtsi | 2 ++ dts/arm/nrf51_blenano.fixup | 1 + dts/arm/nrf51_pca10028.fixup | 1 + dts/arm/nrf52840_pca10056.fixup | 1 + dts/arm/nrf52_blenano2.fixup | 1 + dts/arm/nrf52_pca10040.fixup | 1 + dts/arm/quark_se_c1000_ble.fixup | 1 + 15 files changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/serial/Kconfig.nrf5 b/drivers/serial/Kconfig.nrf5 index 9ccfa8e091c..038ca0df785 100644 --- a/drivers/serial/Kconfig.nrf5 +++ b/drivers/serial/Kconfig.nrf5 @@ -16,14 +16,6 @@ menuconfig UART_NRF5 family processors. Note that there is only one UART controller on nRF5 ICs. -config UART_NRF5_NAME - string "Device Name for Nordic Semiconductor nRF5 UART" - default "UART_0" - depends on UART_NRF5 - help - This is the device name for UART, and is included in the device - struct. - config UART_NRF5_CLK_FREQ int default 16000000 diff --git a/dts/arm/96b_carbon_nrf51.fixup b/dts/arm/96b_carbon_nrf51.fixup index afcf87a74b5..59499a1540e 100644 --- a/dts/arm/96b_carbon_nrf51.fixup +++ b/dts/arm/96b_carbon_nrf51.fixup @@ -1,3 +1,4 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #define CONFIG_UART_NRF5_IRQ_PRI NORDIC_NRF_UART_40002000_IRQ_0_PRIORITY #define CONFIG_UART_NRF5_BAUD_RATE NORDIC_NRF_UART_40002000_CURRENT_SPEED +#define CONFIG_UART_NRF5_NAME NORDIC_NRF_UART_40002000_LABEL diff --git a/dts/arm/96b_nitrogen.fixup b/dts/arm/96b_nitrogen.fixup index 239d39e760d..8f304441dd8 100644 --- a/dts/arm/96b_nitrogen.fixup +++ b/dts/arm/96b_nitrogen.fixup @@ -1,3 +1,4 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #define CONFIG_UART_NRF5_IRQ_PRI NORDIC_NRF_UART_40002000_IRQ_0_PRIORITY #define CONFIG_UART_NRF5_BAUD_RATE NORDIC_NRF_UART_40002000_CURRENT_SPEED +#define CONFIG_UART_NRF5_NAME NORDIC_NRF_UART_40002000_LABEL diff --git a/dts/arm/arduino_101_ble.fixup b/dts/arm/arduino_101_ble.fixup index afcf87a74b5..59499a1540e 100644 --- a/dts/arm/arduino_101_ble.fixup +++ b/dts/arm/arduino_101_ble.fixup @@ -1,3 +1,4 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #define CONFIG_UART_NRF5_IRQ_PRI NORDIC_NRF_UART_40002000_IRQ_0_PRIORITY #define CONFIG_UART_NRF5_BAUD_RATE NORDIC_NRF_UART_40002000_CURRENT_SPEED +#define CONFIG_UART_NRF5_NAME NORDIC_NRF_UART_40002000_LABEL diff --git a/dts/arm/bbc_microbit.fixup b/dts/arm/bbc_microbit.fixup index afcf87a74b5..59499a1540e 100644 --- a/dts/arm/bbc_microbit.fixup +++ b/dts/arm/bbc_microbit.fixup @@ -1,3 +1,4 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #define CONFIG_UART_NRF5_IRQ_PRI NORDIC_NRF_UART_40002000_IRQ_0_PRIORITY #define CONFIG_UART_NRF5_BAUD_RATE NORDIC_NRF_UART_40002000_CURRENT_SPEED +#define CONFIG_UART_NRF5_NAME NORDIC_NRF_UART_40002000_LABEL diff --git a/dts/arm/curie_ble.fixup b/dts/arm/curie_ble.fixup index afcf87a74b5..59499a1540e 100644 --- a/dts/arm/curie_ble.fixup +++ b/dts/arm/curie_ble.fixup @@ -1,3 +1,4 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #define CONFIG_UART_NRF5_IRQ_PRI NORDIC_NRF_UART_40002000_IRQ_0_PRIORITY #define CONFIG_UART_NRF5_BAUD_RATE NORDIC_NRF_UART_40002000_CURRENT_SPEED +#define CONFIG_UART_NRF5_NAME NORDIC_NRF_UART_40002000_LABEL diff --git a/dts/arm/nordic/nrf51822.dtsi b/dts/arm/nordic/nrf51822.dtsi index f7445e5a850..61d22f3ee39 100644 --- a/dts/arm/nordic/nrf51822.dtsi +++ b/dts/arm/nordic/nrf51822.dtsi @@ -22,6 +22,7 @@ reg = <0x40002000 0x1000>; interrupts = <2 1>; status = "disabled"; + label = "UART_0"; }; }; }; diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi index d7658884d59..8534aa8b9e1 100644 --- a/dts/arm/nordic/nrf52832.dtsi +++ b/dts/arm/nordic/nrf52832.dtsi @@ -22,6 +22,7 @@ reg = <0x40002000 0x1000>; interrupts = <2 1>; status = "disabled"; + label = "UART_0"; }; }; }; diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi index fa13f3c5c54..78d00fd750e 100644 --- a/dts/arm/nordic/nrf52840.dtsi +++ b/dts/arm/nordic/nrf52840.dtsi @@ -22,6 +22,7 @@ reg = <0x40002000 0x1000>; interrupts = <2 1>; status = "disabled"; + label = "UART_0"; }; uart1: uart@40028000 { @@ -29,6 +30,7 @@ reg = <0x40028000 0x1000>; interrupts = <40 1>; status = "disabled"; + label = "UART_1"; }; }; }; diff --git a/dts/arm/nrf51_blenano.fixup b/dts/arm/nrf51_blenano.fixup index afcf87a74b5..59499a1540e 100644 --- a/dts/arm/nrf51_blenano.fixup +++ b/dts/arm/nrf51_blenano.fixup @@ -1,3 +1,4 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #define CONFIG_UART_NRF5_IRQ_PRI NORDIC_NRF_UART_40002000_IRQ_0_PRIORITY #define CONFIG_UART_NRF5_BAUD_RATE NORDIC_NRF_UART_40002000_CURRENT_SPEED +#define CONFIG_UART_NRF5_NAME NORDIC_NRF_UART_40002000_LABEL diff --git a/dts/arm/nrf51_pca10028.fixup b/dts/arm/nrf51_pca10028.fixup index afcf87a74b5..59499a1540e 100644 --- a/dts/arm/nrf51_pca10028.fixup +++ b/dts/arm/nrf51_pca10028.fixup @@ -1,3 +1,4 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #define CONFIG_UART_NRF5_IRQ_PRI NORDIC_NRF_UART_40002000_IRQ_0_PRIORITY #define CONFIG_UART_NRF5_BAUD_RATE NORDIC_NRF_UART_40002000_CURRENT_SPEED +#define CONFIG_UART_NRF5_NAME NORDIC_NRF_UART_40002000_LABEL diff --git a/dts/arm/nrf52840_pca10056.fixup b/dts/arm/nrf52840_pca10056.fixup index 239d39e760d..8f304441dd8 100644 --- a/dts/arm/nrf52840_pca10056.fixup +++ b/dts/arm/nrf52840_pca10056.fixup @@ -1,3 +1,4 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #define CONFIG_UART_NRF5_IRQ_PRI NORDIC_NRF_UART_40002000_IRQ_0_PRIORITY #define CONFIG_UART_NRF5_BAUD_RATE NORDIC_NRF_UART_40002000_CURRENT_SPEED +#define CONFIG_UART_NRF5_NAME NORDIC_NRF_UART_40002000_LABEL diff --git a/dts/arm/nrf52_blenano2.fixup b/dts/arm/nrf52_blenano2.fixup index 239d39e760d..8f304441dd8 100644 --- a/dts/arm/nrf52_blenano2.fixup +++ b/dts/arm/nrf52_blenano2.fixup @@ -1,3 +1,4 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #define CONFIG_UART_NRF5_IRQ_PRI NORDIC_NRF_UART_40002000_IRQ_0_PRIORITY #define CONFIG_UART_NRF5_BAUD_RATE NORDIC_NRF_UART_40002000_CURRENT_SPEED +#define CONFIG_UART_NRF5_NAME NORDIC_NRF_UART_40002000_LABEL diff --git a/dts/arm/nrf52_pca10040.fixup b/dts/arm/nrf52_pca10040.fixup index 239d39e760d..8f304441dd8 100644 --- a/dts/arm/nrf52_pca10040.fixup +++ b/dts/arm/nrf52_pca10040.fixup @@ -1,3 +1,4 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #define CONFIG_UART_NRF5_IRQ_PRI NORDIC_NRF_UART_40002000_IRQ_0_PRIORITY #define CONFIG_UART_NRF5_BAUD_RATE NORDIC_NRF_UART_40002000_CURRENT_SPEED +#define CONFIG_UART_NRF5_NAME NORDIC_NRF_UART_40002000_LABEL diff --git a/dts/arm/quark_se_c1000_ble.fixup b/dts/arm/quark_se_c1000_ble.fixup index afcf87a74b5..59499a1540e 100644 --- a/dts/arm/quark_se_c1000_ble.fixup +++ b/dts/arm/quark_se_c1000_ble.fixup @@ -1,3 +1,4 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #define CONFIG_UART_NRF5_IRQ_PRI NORDIC_NRF_UART_40002000_IRQ_0_PRIORITY #define CONFIG_UART_NRF5_BAUD_RATE NORDIC_NRF_UART_40002000_CURRENT_SPEED +#define CONFIG_UART_NRF5_NAME NORDIC_NRF_UART_40002000_LABEL