From 806813bb6aa7685841c47237e791ef58b743a3e3 Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Fri, 3 Jan 2020 14:51:54 -0600 Subject: [PATCH] drivers: i2c: Refactor mcux i2c driver to use generated dts macros Refactors the mcux lpi2c driver to use generated device tree macros directly. Removes now unused dts fixup macros from kinetis socs. Signed-off-by: Maureen Helm --- drivers/i2c/i2c_mcux.c | 14 ++++++++------ soc/arm/nxp_kinetis/k2x/dts_fixup.h | 12 ------------ soc/arm/nxp_kinetis/k6x/dts_fixup.h | 12 ------------ soc/arm/nxp_kinetis/k8x/dts_fixup.h | 24 ------------------------ soc/arm/nxp_kinetis/kl2x/dts_fixup.h | 12 ------------ soc/arm/nxp_kinetis/kv5x/dts_fixup.h | 12 ------------ soc/arm/nxp_kinetis/kwx/dts_fixup.h | 12 ------------ 7 files changed, 8 insertions(+), 90 deletions(-) diff --git a/drivers/i2c/i2c_mcux.c b/drivers/i2c/i2c_mcux.c index a4ce85d5504..657a3c66b4e 100644 --- a/drivers/i2c/i2c_mcux.c +++ b/drivers/i2c/i2c_mcux.c @@ -202,15 +202,16 @@ static const struct i2c_driver_api i2c_mcux_driver_api = { static void i2c_mcux_config_func_ ## n(struct device *dev); \ \ static const struct i2c_mcux_config i2c_mcux_config_ ## n = { \ - .base = (I2C_Type *)DT_I2C_MCUX_ ## n ## _BASE_ADDRESS, \ + .base = (I2C_Type *)DT_NXP_KINETIS_I2C_I2C_ ## n ## _BASE_ADDRESS,\ .clock_source = I2C ## n ## _CLK_SRC, \ .irq_config_func = i2c_mcux_config_func_ ## n, \ - .bitrate = DT_I2C_MCUX_ ## n ## _BITRATE, \ + .bitrate = DT_NXP_KINETIS_I2C_I2C_ ## n ## _CLOCK_FREQUENCY,\ }; \ \ static struct i2c_mcux_data i2c_mcux_data_ ## n; \ \ - DEVICE_AND_API_INIT(i2c_mcux_ ## n, DT_I2C_ ## n ## _NAME, \ + DEVICE_AND_API_INIT(i2c_mcux_ ## n, \ + DT_NXP_KINETIS_I2C_I2C_ ## n ## _LABEL, \ &i2c_mcux_init, &i2c_mcux_data_ ## n, \ &i2c_mcux_config_ ## n, POST_KERNEL, \ CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ @@ -218,11 +219,12 @@ static const struct i2c_driver_api i2c_mcux_driver_api = { \ static void i2c_mcux_config_func_ ## n(struct device *dev) \ { \ - IRQ_CONNECT(DT_I2C_MCUX_ ## n ## _IRQ, \ - DT_I2C_MCUX_ ## n ## _IRQ_PRI, i2c_mcux_isr, \ + IRQ_CONNECT(DT_NXP_KINETIS_I2C_I2C_ ## n ## _IRQ_0, \ + DT_NXP_KINETIS_I2C_I2C_ ## n ## _IRQ_0_PRIORITY,\ + i2c_mcux_isr, \ DEVICE_GET(i2c_mcux_ ## n), 0); \ \ - irq_enable(DT_I2C_MCUX_ ## n ## _IRQ); \ + irq_enable(DT_NXP_KINETIS_I2C_I2C_ ## n ## _IRQ_0); \ } #ifdef CONFIG_I2C_0 diff --git a/soc/arm/nxp_kinetis/k2x/dts_fixup.h b/soc/arm/nxp_kinetis/k2x/dts_fixup.h index 6840f2caf68..cdc45021106 100644 --- a/soc/arm/nxp_kinetis/k2x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/k2x/dts_fixup.h @@ -44,18 +44,6 @@ #define DT_SIM_BASE_ADDRESS DT_NXP_KINETIS_SIM_40047000_BASE_ADDRESS #define DT_SIM_NAME DT_NXP_KINETIS_SIM_40047000_LABEL -#define DT_I2C_0_NAME DT_NXP_KINETIS_I2C_40066000_LABEL -#define DT_I2C_MCUX_0_BASE_ADDRESS DT_NXP_KINETIS_I2C_40066000_BASE_ADDRESS -#define DT_I2C_MCUX_0_IRQ DT_NXP_KINETIS_I2C_40066000_IRQ_0 -#define DT_I2C_MCUX_0_IRQ_PRI DT_NXP_KINETIS_I2C_40066000_IRQ_0_PRIORITY -#define DT_I2C_MCUX_0_BITRATE DT_NXP_KINETIS_I2C_40066000_CLOCK_FREQUENCY - -#define DT_I2C_1_NAME DT_NXP_KINETIS_I2C_40067000_LABEL -#define DT_I2C_MCUX_1_BASE_ADDRESS DT_NXP_KINETIS_I2C_40067000_BASE_ADDRESS -#define DT_I2C_MCUX_1_IRQ DT_NXP_KINETIS_I2C_40067000_IRQ_0 -#define DT_I2C_MCUX_1_IRQ_PRI DT_NXP_KINETIS_I2C_40067000_IRQ_0_PRIORITY -#define DT_I2C_MCUX_1_BITRATE DT_NXP_KINETIS_I2C_40067000_CLOCK_FREQUENCY - #define DT_FLASH_DEV_BASE_ADDRESS DT_NXP_KINETIS_FTFE_40020000_BASE_ADDRESS #define DT_FLASH_DEV_NAME DT_NXP_KINETIS_FTFE_40020000_LABEL diff --git a/soc/arm/nxp_kinetis/k6x/dts_fixup.h b/soc/arm/nxp_kinetis/k6x/dts_fixup.h index 8b169561da9..93ac86ccfff 100644 --- a/soc/arm/nxp_kinetis/k6x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/k6x/dts_fixup.h @@ -78,18 +78,6 @@ #define DT_MCG_NAME DT_NXP_KINETIS_MCG_40064000_LABEL -#define DT_I2C_0_NAME DT_NXP_KINETIS_I2C_40066000_LABEL -#define DT_I2C_MCUX_0_BASE_ADDRESS DT_NXP_KINETIS_I2C_40066000_BASE_ADDRESS -#define DT_I2C_MCUX_0_IRQ DT_NXP_KINETIS_I2C_40066000_IRQ_0 -#define DT_I2C_MCUX_0_IRQ_PRI DT_NXP_KINETIS_I2C_40066000_IRQ_0_PRIORITY -#define DT_I2C_MCUX_0_BITRATE DT_NXP_KINETIS_I2C_40066000_CLOCK_FREQUENCY - -#define DT_I2C_1_NAME DT_NXP_KINETIS_I2C_40067000_LABEL -#define DT_I2C_MCUX_1_BASE_ADDRESS DT_NXP_KINETIS_I2C_40067000_BASE_ADDRESS -#define DT_I2C_MCUX_1_IRQ DT_NXP_KINETIS_I2C_40067000_IRQ_0 -#define DT_I2C_MCUX_1_IRQ_PRI DT_NXP_KINETIS_I2C_40067000_IRQ_0_PRIORITY -#define DT_I2C_MCUX_1_BITRATE DT_NXP_KINETIS_I2C_40067000_CLOCK_FREQUENCY - #define DT_FLASH_DEV_BASE_ADDRESS DT_NXP_KINETIS_FTFE_40020000_BASE_ADDRESS #define DT_FLASH_DEV_NAME DT_NXP_KINETIS_FTFE_40020000_LABEL diff --git a/soc/arm/nxp_kinetis/k8x/dts_fixup.h b/soc/arm/nxp_kinetis/k8x/dts_fixup.h index 7ab7fac482e..36e0af50efe 100644 --- a/soc/arm/nxp_kinetis/k8x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/k8x/dts_fixup.h @@ -31,30 +31,6 @@ #define DT_ENTROPY_MCUX_TRNG_NAME DT_NXP_KINETIS_TRNG_400A0000_LABEL #define CONFIG_ENTROPY_NAME DT_NXP_KINETIS_TRNG_400A0000_LABEL -#define DT_I2C_0_NAME DT_NXP_KINETIS_I2C_40066000_LABEL -#define DT_I2C_MCUX_0_BASE_ADDRESS DT_NXP_KINETIS_I2C_40066000_BASE_ADDRESS -#define DT_I2C_MCUX_0_IRQ DT_NXP_KINETIS_I2C_40066000_IRQ_0 -#define DT_I2C_MCUX_0_IRQ_PRI DT_NXP_KINETIS_I2C_40066000_IRQ_0_PRIORITY -#define DT_I2C_MCUX_0_BITRATE DT_NXP_KINETIS_I2C_40066000_CLOCK_FREQUENCY - -#define DT_I2C_1_NAME DT_NXP_KINETIS_I2C_40067000_LABEL -#define DT_I2C_MCUX_1_BASE_ADDRESS DT_NXP_KINETIS_I2C_40067000_BASE_ADDRESS -#define DT_I2C_MCUX_1_IRQ DT_NXP_KINETIS_I2C_40067000_IRQ_0 -#define DT_I2C_MCUX_1_IRQ_PRI DT_NXP_KINETIS_I2C_40067000_IRQ_0_PRIORITY -#define DT_I2C_MCUX_1_BITRATE DT_NXP_KINETIS_I2C_40067000_CLOCK_FREQUENCY - -#define DT_I2C_2_NAME DT_NXP_KINETIS_I2C_400E6000_LABEL -#define DT_I2C_MCUX_2_BASE_ADDRESS DT_NXP_KINETIS_I2C_400E6000_BASE_ADDRESS -#define DT_I2C_MCUX_2_IRQ DT_NXP_KINETIS_I2C_400E6000_IRQ_0 -#define DT_I2C_MCUX_2_IRQ_PRI DT_NXP_KINETIS_I2C_400E6000_IRQ_0_PRIORITY -#define DT_I2C_MCUX_2_BITRATE DT_NXP_KINETIS_I2C_400E6000_CLOCK_FREQUENCY - -#define DT_I2C_3_NAME DT_NXP_KINETIS_I2C_400E7000_LABEL -#define DT_I2C_MCUX_3_BASE_ADDRESS DT_NXP_KINETIS_I2C_400E7000_BASE_ADDRESS -#define DT_I2C_MCUX_3_IRQ DT_NXP_KINETIS_I2C_400E7000_IRQ_0 -#define DT_I2C_MCUX_3_IRQ_PRI DT_NXP_KINETIS_I2C_400E7000_IRQ_0_PRIORITY -#define DT_I2C_MCUX_3_BITRATE DT_NXP_KINETIS_I2C_400E7000_CLOCK_FREQUENCY - #define DT_RTC_0_NAME DT_NXP_KINETIS_RTC_4003D000_LABEL #define DT_RTC_MCUX_0_NAME DT_NXP_KINETIS_RTC_4003D000_LABEL #define DT_RTC_MCUX_0_BASE_ADDRESS DT_NXP_KINETIS_RTC_4003D000_BASE_ADDRESS diff --git a/soc/arm/nxp_kinetis/kl2x/dts_fixup.h b/soc/arm/nxp_kinetis/kl2x/dts_fixup.h index 9d405e00a99..5c6b3834bae 100644 --- a/soc/arm/nxp_kinetis/kl2x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/kl2x/dts_fixup.h @@ -14,18 +14,6 @@ #define DT_SIM_BASE_ADDRESS DT_NXP_KINETIS_SIM_40047000_BASE_ADDRESS #define DT_SIM_NAME DT_NXP_KINETIS_SIM_40047000_LABEL -#define DT_I2C_0_NAME DT_NXP_KINETIS_I2C_40066000_LABEL -#define DT_I2C_MCUX_0_BASE_ADDRESS DT_NXP_KINETIS_I2C_40066000_BASE_ADDRESS -#define DT_I2C_MCUX_0_IRQ DT_NXP_KINETIS_I2C_40066000_IRQ_0 -#define DT_I2C_MCUX_0_IRQ_PRI DT_NXP_KINETIS_I2C_40066000_IRQ_0_PRIORITY -#define DT_I2C_MCUX_0_BITRATE DT_NXP_KINETIS_I2C_40066000_CLOCK_FREQUENCY - -#define DT_I2C_1_NAME DT_NXP_KINETIS_I2C_40067000_LABEL -#define DT_I2C_MCUX_1_BASE_ADDRESS DT_NXP_KINETIS_I2C_40067000_BASE_ADDRESS -#define DT_I2C_MCUX_1_IRQ DT_NXP_KINETIS_I2C_40067000_IRQ_0 -#define DT_I2C_MCUX_1_IRQ_PRI DT_NXP_KINETIS_I2C_40067000_IRQ_0_PRIORITY -#define DT_I2C_MCUX_1_BITRATE DT_NXP_KINETIS_I2C_40067000_CLOCK_FREQUENCY - #define DT_FLASH_DEV_BASE_ADDRESS DT_NXP_KINETIS_FTFA_40020000_BASE_ADDRESS #define DT_FLASH_DEV_NAME DT_NXP_KINETIS_FTFA_40020000_LABEL diff --git a/soc/arm/nxp_kinetis/kv5x/dts_fixup.h b/soc/arm/nxp_kinetis/kv5x/dts_fixup.h index aa6e3413c25..eb14c5be403 100644 --- a/soc/arm/nxp_kinetis/kv5x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/kv5x/dts_fixup.h @@ -23,18 +23,6 @@ #define DT_ADC_0_IRQ_PRI DT_NXP_KINETIS_ADC16_4003B000_IRQ_0_PRIORITY #define DT_ADC_0_NAME DT_NXP_KINETIS_ADC16_4003B000_LABEL -#define DT_I2C_0_NAME DT_NXP_KINETIS_I2C_40066000_LABEL -#define DT_I2C_MCUX_0_BASE_ADDRESS DT_NXP_KINETIS_I2C_40066000_BASE_ADDRESS -#define DT_I2C_MCUX_0_IRQ DT_NXP_KINETIS_I2C_40066000_IRQ_0 -#define DT_I2C_MCUX_0_IRQ_PRI DT_NXP_KINETIS_I2C_40066000_IRQ_0_PRIORITY -#define DT_I2C_MCUX_0_BITRATE DT_NXP_KINETIS_I2C_40066000_CLOCK_FREQUENCY - -#define DT_I2C_1_NAME DT_NXP_KINETIS_I2C_40067000_LABEL -#define DT_I2C_MCUX_1_BASE_ADDRESS DT_NXP_KINETIS_I2C_40067000_BASE_ADDRESS -#define DT_I2C_MCUX_1_IRQ DT_NXP_KINETIS_I2C_40067000_IRQ_0 -#define DT_I2C_MCUX_1_IRQ_PRI DT_NXP_KINETIS_I2C_40067000_IRQ_0_PRIORITY -#define DT_I2C_MCUX_1_BITRATE DT_NXP_KINETIS_I2C_40067000_CLOCK_FREQUENCY - #define DT_SPI_0_NAME DT_NXP_KINETIS_DSPI_4002C000_LABEL #define DT_SPI_0_BASE_ADDRESS DT_NXP_KINETIS_DSPI_4002C000_BASE_ADDRESS #define DT_SPI_0_IRQ DT_NXP_KINETIS_DSPI_4002C000_IRQ_0 diff --git a/soc/arm/nxp_kinetis/kwx/dts_fixup.h b/soc/arm/nxp_kinetis/kwx/dts_fixup.h index 71d07cef634..007fcad5c7d 100644 --- a/soc/arm/nxp_kinetis/kwx/dts_fixup.h +++ b/soc/arm/nxp_kinetis/kwx/dts_fixup.h @@ -7,18 +7,6 @@ #define DT_ADC_0_IRQ_PRI DT_NXP_KINETIS_ADC16_4003B000_IRQ_0_PRIORITY #define DT_ADC_0_NAME DT_NXP_KINETIS_ADC16_4003B000_LABEL -#define DT_I2C_0_NAME DT_NXP_KINETIS_I2C_40066000_LABEL -#define DT_I2C_MCUX_0_BASE_ADDRESS DT_NXP_KINETIS_I2C_40066000_BASE_ADDRESS -#define DT_I2C_MCUX_0_IRQ DT_NXP_KINETIS_I2C_40066000_IRQ_0 -#define DT_I2C_MCUX_0_IRQ_PRI DT_NXP_KINETIS_I2C_40066000_IRQ_0_PRIORITY -#define DT_I2C_MCUX_0_BITRATE DT_NXP_KINETIS_I2C_40066000_CLOCK_FREQUENCY - -#define DT_I2C_1_NAME DT_NXP_KINETIS_I2C_40067000_LABEL -#define DT_I2C_MCUX_1_BASE_ADDRESS DT_NXP_KINETIS_I2C_40067000_BASE_ADDRESS -#define DT_I2C_MCUX_1_IRQ DT_NXP_KINETIS_I2C_40067000_IRQ_0 -#define DT_I2C_MCUX_1_IRQ_PRI DT_NXP_KINETIS_I2C_40067000_IRQ_0_PRIORITY -#define DT_I2C_MCUX_1_BITRATE DT_NXP_KINETIS_I2C_40067000_CLOCK_FREQUENCY - #define DT_SIM_BASE_ADDRESS DT_NXP_KINETIS_SIM_40047000_BASE_ADDRESS #define DT_SIM_NAME DT_NXP_KINETIS_SIM_40047000_LABEL