From 15898fca9c2354e40211a466fe11ce3fb65407e5 Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Mon, 19 Jun 2017 20:12:07 -0500 Subject: [PATCH] dts: Rename k64f-uart to kinetis-uart Multiple Kinetis SoCs have the same uart hardware as the k64 and can use the same mcux driver, so rename the dts to be more generic. Signed-off-by: Maureen Helm --- dts/arm/frdm_k64f.fixup | 36 +++++++++---------- dts/arm/hexiwear_k64.fixup | 36 +++++++++---------- dts/arm/nxp/nxp_k6x.dtsi | 12 +++---- .../{k64uart.yaml => nxp,kinetis-uart.yaml} | 8 ++--- 4 files changed, 46 insertions(+), 46 deletions(-) rename dts/arm/yaml/{k64uart.yaml => nxp,kinetis-uart.yaml} (83%) diff --git a/dts/arm/frdm_k64f.fixup b/dts/arm/frdm_k64f.fixup index 8997930ded2..71cb0905202 100644 --- a/dts/arm/frdm_k64f.fixup +++ b/dts/arm/frdm_k64f.fixup @@ -1,25 +1,25 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS -#define CONFIG_UART_MCUX_0_BAUD_RATE NXP_K64F_UART_4006A000_CURRENT_SPEED -#define CONFIG_UART_MCUX_0_IRQ_PRI NXP_K64F_UART_4006A000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_0_NAME NXP_K64F_UART_4006A000_LABEL +#define CONFIG_UART_MCUX_0_BAUD_RATE NXP_KINETIS_UART_4006A000_CURRENT_SPEED +#define CONFIG_UART_MCUX_0_IRQ_PRI NXP_KINETIS_UART_4006A000_IRQ_0_PRIORITY +#define CONFIG_UART_MCUX_0_NAME NXP_KINETIS_UART_4006A000_LABEL -#define CONFIG_UART_MCUX_1_BAUD_RATE NXP_K64F_UART_4006B000_CURRENT_SPEED -#define CONFIG_UART_MCUX_1_IRQ_PRI NXP_K64F_UART_4006B000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_1_NAME NXP_K64F_UART_4006B000_LABEL +#define CONFIG_UART_MCUX_1_BAUD_RATE NXP_KINETIS_UART_4006B000_CURRENT_SPEED +#define CONFIG_UART_MCUX_1_IRQ_PRI NXP_KINETIS_UART_4006B000_IRQ_0_PRIORITY +#define CONFIG_UART_MCUX_1_NAME NXP_KINETIS_UART_4006B000_LABEL -#define CONFIG_UART_MCUX_2_BAUD_RATE NXP_K64F_UART_4006C000_CURRENT_SPEED -#define CONFIG_UART_MCUX_2_IRQ_PRI NXP_K64F_UART_4006C000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_2_NAME NXP_K64F_UART_4006C000_LABEL +#define CONFIG_UART_MCUX_2_BAUD_RATE NXP_KINETIS_UART_4006C000_CURRENT_SPEED +#define CONFIG_UART_MCUX_2_IRQ_PRI NXP_KINETIS_UART_4006C000_IRQ_0_PRIORITY +#define CONFIG_UART_MCUX_2_NAME NXP_KINETIS_UART_4006C000_LABEL -#define CONFIG_UART_MCUX_3_BAUD_RATE NXP_K64F_UART_4006D000_CURRENT_SPEED -#define CONFIG_UART_MCUX_3_IRQ_PRI NXP_K64F_UART_4006D000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_3_NAME NXP_K64F_UART_4006D000_LABEL +#define CONFIG_UART_MCUX_3_BAUD_RATE NXP_KINETIS_UART_4006D000_CURRENT_SPEED +#define CONFIG_UART_MCUX_3_IRQ_PRI NXP_KINETIS_UART_4006D000_IRQ_0_PRIORITY +#define CONFIG_UART_MCUX_3_NAME NXP_KINETIS_UART_4006D000_LABEL -#define CONFIG_UART_MCUX_4_BAUD_RATE NXP_K64F_UART_400EA000_CURRENT_SPEED -#define CONFIG_UART_MCUX_4_IRQ_PRI NXP_K64F_UART_400EA000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_4_NAME NXP_K64F_UART_400EA000_LABEL +#define CONFIG_UART_MCUX_4_BAUD_RATE NXP_KINETIS_UART_400EA000_CURRENT_SPEED +#define CONFIG_UART_MCUX_4_IRQ_PRI NXP_KINETIS_UART_400EA000_IRQ_0_PRIORITY +#define CONFIG_UART_MCUX_4_NAME NXP_KINETIS_UART_400EA000_LABEL -#define CONFIG_UART_MCUX_5_BAUD_RATE NXP_K64F_UART_400EB000_CURRENT_SPEED -#define CONFIG_UART_MCUX_5_IRQ_PRI NXP_K64F_UART_400EB000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_5_NAME NXP_K64F_UART_400EB000_LABEL +#define CONFIG_UART_MCUX_5_BAUD_RATE NXP_KINETIS_UART_400EB000_CURRENT_SPEED +#define CONFIG_UART_MCUX_5_IRQ_PRI NXP_KINETIS_UART_400EB000_IRQ_0_PRIORITY +#define CONFIG_UART_MCUX_5_NAME NXP_KINETIS_UART_400EB000_LABEL diff --git a/dts/arm/hexiwear_k64.fixup b/dts/arm/hexiwear_k64.fixup index 8997930ded2..71cb0905202 100644 --- a/dts/arm/hexiwear_k64.fixup +++ b/dts/arm/hexiwear_k64.fixup @@ -1,25 +1,25 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS -#define CONFIG_UART_MCUX_0_BAUD_RATE NXP_K64F_UART_4006A000_CURRENT_SPEED -#define CONFIG_UART_MCUX_0_IRQ_PRI NXP_K64F_UART_4006A000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_0_NAME NXP_K64F_UART_4006A000_LABEL +#define CONFIG_UART_MCUX_0_BAUD_RATE NXP_KINETIS_UART_4006A000_CURRENT_SPEED +#define CONFIG_UART_MCUX_0_IRQ_PRI NXP_KINETIS_UART_4006A000_IRQ_0_PRIORITY +#define CONFIG_UART_MCUX_0_NAME NXP_KINETIS_UART_4006A000_LABEL -#define CONFIG_UART_MCUX_1_BAUD_RATE NXP_K64F_UART_4006B000_CURRENT_SPEED -#define CONFIG_UART_MCUX_1_IRQ_PRI NXP_K64F_UART_4006B000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_1_NAME NXP_K64F_UART_4006B000_LABEL +#define CONFIG_UART_MCUX_1_BAUD_RATE NXP_KINETIS_UART_4006B000_CURRENT_SPEED +#define CONFIG_UART_MCUX_1_IRQ_PRI NXP_KINETIS_UART_4006B000_IRQ_0_PRIORITY +#define CONFIG_UART_MCUX_1_NAME NXP_KINETIS_UART_4006B000_LABEL -#define CONFIG_UART_MCUX_2_BAUD_RATE NXP_K64F_UART_4006C000_CURRENT_SPEED -#define CONFIG_UART_MCUX_2_IRQ_PRI NXP_K64F_UART_4006C000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_2_NAME NXP_K64F_UART_4006C000_LABEL +#define CONFIG_UART_MCUX_2_BAUD_RATE NXP_KINETIS_UART_4006C000_CURRENT_SPEED +#define CONFIG_UART_MCUX_2_IRQ_PRI NXP_KINETIS_UART_4006C000_IRQ_0_PRIORITY +#define CONFIG_UART_MCUX_2_NAME NXP_KINETIS_UART_4006C000_LABEL -#define CONFIG_UART_MCUX_3_BAUD_RATE NXP_K64F_UART_4006D000_CURRENT_SPEED -#define CONFIG_UART_MCUX_3_IRQ_PRI NXP_K64F_UART_4006D000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_3_NAME NXP_K64F_UART_4006D000_LABEL +#define CONFIG_UART_MCUX_3_BAUD_RATE NXP_KINETIS_UART_4006D000_CURRENT_SPEED +#define CONFIG_UART_MCUX_3_IRQ_PRI NXP_KINETIS_UART_4006D000_IRQ_0_PRIORITY +#define CONFIG_UART_MCUX_3_NAME NXP_KINETIS_UART_4006D000_LABEL -#define CONFIG_UART_MCUX_4_BAUD_RATE NXP_K64F_UART_400EA000_CURRENT_SPEED -#define CONFIG_UART_MCUX_4_IRQ_PRI NXP_K64F_UART_400EA000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_4_NAME NXP_K64F_UART_400EA000_LABEL +#define CONFIG_UART_MCUX_4_BAUD_RATE NXP_KINETIS_UART_400EA000_CURRENT_SPEED +#define CONFIG_UART_MCUX_4_IRQ_PRI NXP_KINETIS_UART_400EA000_IRQ_0_PRIORITY +#define CONFIG_UART_MCUX_4_NAME NXP_KINETIS_UART_400EA000_LABEL -#define CONFIG_UART_MCUX_5_BAUD_RATE NXP_K64F_UART_400EB000_CURRENT_SPEED -#define CONFIG_UART_MCUX_5_IRQ_PRI NXP_K64F_UART_400EB000_IRQ_0_PRIORITY -#define CONFIG_UART_MCUX_5_NAME NXP_K64F_UART_400EB000_LABEL +#define CONFIG_UART_MCUX_5_BAUD_RATE NXP_KINETIS_UART_400EB000_CURRENT_SPEED +#define CONFIG_UART_MCUX_5_IRQ_PRI NXP_KINETIS_UART_400EB000_IRQ_0_PRIORITY +#define CONFIG_UART_MCUX_5_NAME NXP_KINETIS_UART_400EB000_LABEL diff --git a/dts/arm/nxp/nxp_k6x.dtsi b/dts/arm/nxp/nxp_k6x.dtsi index 25d7abb4129..ad07196ebf0 100644 --- a/dts/arm/nxp/nxp_k6x.dtsi +++ b/dts/arm/nxp/nxp_k6x.dtsi @@ -106,7 +106,7 @@ }; uart0: uart@4006a000 { - compatible = "nxp,k64f-uart"; + compatible = "nxp,kinetis-uart"; reg = <0x4006a000 0x1000>; interrupts = <31 0>, <32 0>; interrupt-names = "status", "error"; @@ -119,7 +119,7 @@ }; uart1: uart@4006b000 { - compatible = "nxp,k64f-uart"; + compatible = "nxp,kinetis-uart"; reg = <0x4006b000 0x1000>; interrupts = <33 0>, <34 0>; interrupt-names = "status", "error"; @@ -129,7 +129,7 @@ }; uart2: uart@4006c000 { - compatible = "nxp,k64f-uart"; + compatible = "nxp,kinetis-uart"; reg = <0x4006c000 0x1000>; interrupts = <35 0>, <36 0>; interrupt-names = "status", "error"; @@ -139,7 +139,7 @@ }; uart3: uart@4006d000 { - compatible = "nxp,k64f-uart"; + compatible = "nxp,kinetis-uart"; reg = <0x4006d000 0x1000>; interrupts = <37 0>, <38 0>; interrupt-names = "status", "error"; @@ -149,7 +149,7 @@ }; uart4: uart@400ea000 { - compatible = "nxp,k64f-uart"; + compatible = "nxp,kinetis-uart"; reg = <0x400ea000 0x1000>; interrupts = <66 0>, <67 0>; interrupt-names = "status", "error"; @@ -159,7 +159,7 @@ }; uart5: uart@400eb000 { - compatible = "nxp,k64f-uart"; + compatible = "nxp,kinetis-uart"; reg = <0x400eb000 0x1000>; interrupts = <68 0>, <69 0>; interrupt-names = "status", "error"; diff --git a/dts/arm/yaml/k64uart.yaml b/dts/arm/yaml/nxp,kinetis-uart.yaml similarity index 83% rename from dts/arm/yaml/k64uart.yaml rename to dts/arm/yaml/nxp,kinetis-uart.yaml index 2593a119f17..400bfcd86b2 100644 --- a/dts/arm/yaml/k64uart.yaml +++ b/dts/arm/yaml/nxp,kinetis-uart.yaml @@ -1,10 +1,10 @@ --- -title: K64 Uart -id: nxp,k64f-uart +title: Kinetis UART +id: nxp,kinetis-uart version: 0.1 description: > - This binding gives a base representation of the K64 UART + This binding gives a base representation of the Kinetis UART inherits: - !include uart.yaml @@ -14,7 +14,7 @@ properties: type: string category: required description: compatible strings - constraint: "nxp,k64f-uart" + constraint: "nxp,kinetis-uart" - reg: type: array