diff --git a/arch/arm/soc/ti_simplelink/cc32xx/Kconfig.defconfig.cc3200 b/arch/arm/soc/ti_simplelink/cc32xx/Kconfig.defconfig.cc3200 index 2e16c30b0c8..e219919e146 100644 --- a/arch/arm/soc/ti_simplelink/cc32xx/Kconfig.defconfig.cc3200 +++ b/arch/arm/soc/ti_simplelink/cc32xx/Kconfig.defconfig.cc3200 @@ -11,15 +11,6 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC int default 80000000 -if !HAS_DTS -config SRAM_SIZE - default 240 - -config FLASH_SIZE - default 0 - -endif # !HAS_DTS - config NUM_IRQS int # must be >= the highest interrupt number used @@ -29,13 +20,6 @@ config NUM_IRQS config CC3200SDK_LIBRARY def_bool n -if !HAS_DTS -if UART_CC32XX -config UART_CC32XX_IRQ_PRI - default 3 -endif # UART_CC32XX -endif # !HAS_DTS - if GPIO config GPIO_CC32XX diff --git a/arch/arm/soc/ti_simplelink/cc32xx/Kconfig.defconfig.series b/arch/arm/soc/ti_simplelink/cc32xx/Kconfig.defconfig.series index 69bc0296f36..d5a5ca1799d 100644 --- a/arch/arm/soc/ti_simplelink/cc32xx/Kconfig.defconfig.series +++ b/arch/arm/soc/ti_simplelink/cc32xx/Kconfig.defconfig.series @@ -8,13 +8,4 @@ source "arch/arm/soc/ti_simplelink/cc32xx/Kconfig.defconfig.cc32*" config SOC_SERIES default cc32xx -if !HAS_DTS -config SRAM_BASE_ADDRESS - default 0x20004000 - -config NUM_IRQ_PRIO_BITS - int - default 3 -endif # !HAS_DTS - endif # SOC_SERIES_CC32XX diff --git a/drivers/serial/Kconfig.cc32xx b/drivers/serial/Kconfig.cc32xx index 1f8c3b6df19..5b755fdc81d 100644 --- a/drivers/serial/Kconfig.cc32xx +++ b/drivers/serial/Kconfig.cc32xx @@ -13,17 +13,3 @@ config UART_CC32XX_NAME depends on UART_CC32XX help This is the UART's device name binding. - -if !HAS_DTS -config UART_CC32XX_IRQ_PRI - depends on UART_CC32XX - int "IRQ priority from UART controller" - -config UART_CC32XX_BAUDRATE - depends on UART_CC32XX - int "UART_0 baud rate" - default 115200 - help - This option sets the baud rate for the CC32XX UART. - -endif # !HAS_DTS diff --git a/drivers/serial/uart_cc32xx.c b/drivers/serial/uart_cc32xx.c index 0bceab988a6..6fb07e009b1 100644 --- a/drivers/serial/uart_cc32xx.c +++ b/drivers/serial/uart_cc32xx.c @@ -36,7 +36,7 @@ static void uart_cc32xx_isr(void *arg); #endif static const struct uart_device_config uart_cc32xx_dev_cfg_0 = { - .base = (void *)UART_CC32XX_BASE_ADDRESS, + .base = (void *)TI_CC32XX_UART_4000C000_BASE_ADDRESS, .sys_clk_freq = CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC, }; @@ -62,7 +62,7 @@ static int uart_cc32xx_init(struct device *dev) /* This also calls MAP_UARTEnable() to enable the FIFOs: */ MAP_UARTConfigSetExpClk((unsigned long)config->base, MAP_PRCMPeripheralClockGet(PRCM_UARTA0), - CONFIG_UART_CC32XX_BAUDRATE, + TI_CC32XX_UART_4000C000_BAUD_RATE, (UART_CONFIG_WLEN_8 | UART_CONFIG_STOP_ONE | UART_CONFIG_PAR_NONE)); MAP_UARTFlowControlSet((unsigned long)config->base, @@ -75,11 +75,11 @@ static int uart_cc32xx_init(struct device *dev) MAP_UARTIntClear((unsigned long)config->base, (UART_INT_RX | UART_INT_TX)); - IRQ_CONNECT(EXCEPTION_UARTA0, - CONFIG_UART_CC32XX_IRQ_PRI, + IRQ_CONNECT(TI_CC32XX_UART_4000C000_IRQ_0, + TI_CC32XX_UART_4000C000_IRQ_0_PRIORITY, uart_cc32xx_isr, DEVICE_GET(uart_cc32xx_0), 0); - irq_enable(EXCEPTION_UARTA0); + irq_enable(TI_CC32XX_UART_4000C000_IRQ_0); #endif return 0; } diff --git a/dts/arm/cc3200_launchxl.fixup b/dts/arm/cc3200_launchxl.fixup index 76123bbeb26..1dea2fa9aaa 100644 --- a/dts/arm/cc3200_launchxl.fixup +++ b/dts/arm/cc3200_launchxl.fixup @@ -1,6 +1 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS - -#define EXCEPTION_UARTA0 TI_CC32XX_UART_4000C000_IRQ_0 -#define CONFIG_UART_CC32XX_IRQ_PRI TI_CC32XX_UART_4000C000_IRQ_0_PRIORITY -#define UART_CC32XX_BASE_ADDRESS TI_CC32XX_UART_4000C000_BASE_ADDRESS -#define CONFIG_UART_CC32XX_BAUDRATE TI_CC32XX_UART_4000C000_BAUD_RATE