diff --git a/arch/arm/include/tiva/tm4c_irq.h b/arch/arm/include/tiva/tm4c_irq.h index 616898ee85b..d6486aad93b 100644 --- a/arch/arm/include/tiva/tm4c_irq.h +++ b/arch/arm/include/tiva/tm4c_irq.h @@ -193,14 +193,14 @@ # define TIVA_IRQ_GPIOP6 (138) /* Vector 138: GPIO Port P6 */ # define TIVA_IRQ_GPIOP7 (139) /* Vector 139: GPIO Port P7 */ -# define TIVA_IRQ_GPIOPQ (140) /* Vector 140: GPIO Port Q (Summary or Q0) */ -# define TIVA_IRQ_GPIOPQ1 (141) /* Vector 141: GPIO Port Q1 */ -# define TIVA_IRQ_GPIOPQ2 (142) /* Vector 142: GPIO Port Q2 */ -# define TIVA_IRQ_GPIOPQ3 (143) /* Vector 143: GPIO Port Q3 */ -# define TIVA_IRQ_GPIOPQ4 (144) /* Vector 144: GPIO Port Q4 */ -# define TIVA_IRQ_GPIOPQ5 (145) /* Vector 145: GPIO Port Q5 */ -# define TIVA_IRQ_GPIOPQ6 (146) /* Vector 146: GPIO Port Q6 */ -# define TIVA_IRQ_GPIOPQ7 (147) /* Vector 147: GPIO Port Q7 */ +# define TIVA_IRQ_GPIOQ (140) /* Vector 140: GPIO Port Q (Summary or Q0) */ +# define TIVA_IRQ_GPIOQ1 (141) /* Vector 141: GPIO Port Q1 */ +# define TIVA_IRQ_GPIOQ2 (142) /* Vector 142: GPIO Port Q2 */ +# define TIVA_IRQ_GPIOQ3 (143) /* Vector 143: GPIO Port Q3 */ +# define TIVA_IRQ_GPIOQ4 (144) /* Vector 144: GPIO Port Q4 */ +# define TIVA_IRQ_GPIOQ5 (145) /* Vector 145: GPIO Port Q5 */ +# define TIVA_IRQ_GPIOQ6 (146) /* Vector 146: GPIO Port Q6 */ +# define TIVA_IRQ_GPIOQ7 (147) /* Vector 147: GPIO Port Q7 */ # define TIVA_RESERVED_148 (148) /* Vector 148: Reserved */ # define TIVA_RESERVED_149 (149) /* Vector 149: Reserved */ diff --git a/arch/arm/src/tiva/chip/tiva_flash.h b/arch/arm/src/tiva/chip/tiva_flash.h index cd921d02b74..f80a3f9d403 100644 --- a/arch/arm/src/tiva/chip/tiva_flash.h +++ b/arch/arm/src/tiva/chip/tiva_flash.h @@ -49,7 +49,8 @@ /* FLASH dimensions ****************************************************************/ #if defined(CONFIG_ARCH_CHIP_LM3S6965) || defined(CONFIG_ARCH_CHIP_LM4F120) || \ - defined(CONFIG_ARCH_CHIP_LM3S8962) || defined(CONFIG_ARCH_CHIP_LM3S9B96) + defined(CONFIG_ARCH_CHIP_LM3S8962) || defined(CONFIG_ARCH_CHIP_LM3S9B96) || \ + defined(CONFIG_ARCH_CHIP_TM4C123GH6ZRB) # define TIVA_FLASH_NPAGES 256 # define TIVA_FLASH_PAGESIZE 1024 #else diff --git a/arch/arm/src/tiva/chip/tiva_gpio.h b/arch/arm/src/tiva/chip/tiva_gpio.h index 8ad87066317..c6039d6b190 100644 --- a/arch/arm/src/tiva/chip/tiva_gpio.h +++ b/arch/arm/src/tiva/chip/tiva_gpio.h @@ -47,6 +47,13 @@ * Pre-processor Definitions ************************************************************************************/ +#define TIVA_GPIOK_BASE TIVA_GPIOKAHB_BASE +#define TIVA_GPIOL_BASE TIVA_GPIOLAHB_BASE +#define TIVA_GPIOM_BASE TIVA_GPIOMAHB_BASE +#define TIVA_GPION_BASE TIVA_GPIONAHB_BASE +#define TIVA_GPIOP_BASE TIVA_GPIOPAHB_BASE +#define TIVA_GPIOQ_BASE TIVA_GPIOQAHB_BASE + /* GPIO Register Offsets ************************************************************/ #define TIVA_GPIO_DATA_OFFSET 0x000 /* GPIO Data */ diff --git a/arch/arm/src/tiva/chip/tm4c_pinmap.h b/arch/arm/src/tiva/chip/tm4c_pinmap.h index 4e54fa36887..a38659b78e8 100644 --- a/arch/arm/src/tiva/chip/tm4c_pinmap.h +++ b/arch/arm/src/tiva/chip/tm4c_pinmap.h @@ -92,7 +92,7 @@ # define GPIO_ADC_AIN22 (GPIO_FUNC_ANINPUT | GPIO_PORTN | GPIO_PIN_1) # define GPIO_ADC_AIN23 (GPIO_FUNC_ANINPUT | GPIO_PORTN | GPIO_PIN_0) -# define GPIO_CAN0_RX_1` (GPIO_FUNC_PFINPUT | GPIO_ALT_1 | GPIO_PORTN | GPIO_PIN_0) +# define GPIO_CAN0_RX_1 (GPIO_FUNC_PFINPUT | GPIO_ALT_1 | GPIO_PORTN | GPIO_PIN_0) # define GPIO_CAN0_RX_2 (GPIO_FUNC_PFINPUT | GPIO_ALT_3 | GPIO_PORTF | GPIO_PIN_0) # define GPIO_CAN0_RX_3 (GPIO_FUNC_PFINPUT | GPIO_ALT_8 | GPIO_PORTB | GPIO_PIN_4) # define GPIO_CAN0_RX_4 (GPIO_FUNC_PFINPUT | GPIO_ALT_8 | GPIO_PORTE | GPIO_PIN_4) @@ -228,8 +228,8 @@ # define GPIO_M1_PWM_FAULT2_2 (GPIO_FUNC_PFINPUT | GPIO_ALT_6 | GPIO_PORTK | GPIO_PIN_2) # define GPIO_M1_PWM_FAULT3 (GPIO_FUNC_PFINPUT | GPIO_ALT_6 | GPIO_PORTK | GPIO_PIN_3) -# define GPIO_NMI (GPIO_FUNC_PFIO | GPIO_ALT_8 | GPIO_PORTD | GPIO_PIN_7) -# define GPIO_NMI (GPIO_FUNC_PFIO | GPIO_ALT_8 | GPIO_PORTF | GPIO_PIN_0) +# define GPIO_NMI_1 (GPIO_FUNC_PFIO | GPIO_ALT_8 | GPIO_PORTD | GPIO_PIN_7) +# define GPIO_NMI_2 (GPIO_FUNC_PFIO | GPIO_ALT_8 | GPIO_PORTF | GPIO_PIN_0) # define GPIO_QEI0_IDX_1 (GPIO_FUNC_PFIO | GPIO_ALT_5 | GPIO_PORTH | GPIO_PIN_1) # define GPIO_QEI0_IDX_2 (GPIO_FUNC_PFIO | GPIO_ALT_5 | GPIO_PORTJ | GPIO_PIN_2) diff --git a/arch/arm/src/tiva/chip/tm4c_vectors.h b/arch/arm/src/tiva/chip/tm4c_vectors.h index 28f58eedfed..ef8e72b1c61 100644 --- a/arch/arm/src/tiva/chip/tm4c_vectors.h +++ b/arch/arm/src/tiva/chip/tm4c_vectors.h @@ -74,7 +74,7 @@ VECTOR(tiva_ssi0, TIVA_IRQ_SSI0) /* Vector 23: SSI 0 */ VECTOR(tiva_i2c0, TIVA_IRQ_I2C0) /* Vector 24: I2C 0 */ VECTOR(tiva_pwm0_fault, TIVA_IRQ_PWM0_FAULT) /* Vector 25: PWM0 Fault */ -VECTOR(tiva_pwm0_fault, TIVA_IRQ_PWM0_FAULT) /* Vector 26: PWM0 Generator 0 */ +VECTOR(tiva_pwm0_gen0, TIVA_IRQ_PWM0_GEN0) /* Vector 26: PWM0 Generator 0 */ VECTOR(tiva_pwm0_gen1, TIVA_IRQ_PWM0_GEN1) /* Vector 27: PWM0 Generator 1 */ VECTOR(tiva_pwm0_gen2, TIVA_IRQ_PWM0_GEN2) /* Vector 28: PWM0 Generator 2 */ VECTOR(tiva_qei0, TIVA_IRQ_QEI0) /* Vector 29: QEI0 */ diff --git a/configs/tm4c123g-launchpad/src/tmfc123g-launchpad.h b/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h similarity index 100% rename from configs/tm4c123g-launchpad/src/tmfc123g-launchpad.h rename to configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h