michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards: uart: Add UART6 for 96b_carbon

Browse source 
Enabled UART 6 on pin PC6 and PC7 for 96b_carbon

Signed-off-by: Sahaj Sarup <sahaj.sarup@linaro.org>
This commit is contained in:
Sahaj Sarup 2018-03-05 14:41:35 +05:30 • committed by Kumar Gala
commit 069fce7289
4 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
boards/arm/96b_carbon/96b_carbon.dts
View file

@ -32,6 +32,13 @@
status = "ok"; status = "ok";
}; };
&usart6 {
current-speed = <115200>;
pinctrl-0 = <&usart6_pins_a>;
pinctrl-names = "default";
status = "ok";
};
&i2c1 { &i2c1 {
status = "ok"; status = "ok";
clock-frequency = <I2C_BITRATE_FAST>; clock-frequency = <I2C_BITRATE_FAST>;

4
boards/arm/96b_carbon/pinmux.c
View file

@ -22,6 +22,10 @@ static const struct pin_config pinconf[] = {
{STM32_PIN_PA2, STM32F4_PINMUX_FUNC_PA2_USART2_TX}, {STM32_PIN_PA2, STM32F4_PINMUX_FUNC_PA2_USART2_TX},
{STM32_PIN_PA3, STM32F4_PINMUX_FUNC_PA3_USART2_RX}, {STM32_PIN_PA3, STM32F4_PINMUX_FUNC_PA3_USART2_RX},
#endif /* CONFIG_UART_STM32_PORT_2 */ #endif /* CONFIG_UART_STM32_PORT_2 */
#ifdef CONFIG_UART_STM32_PORT_6
{STM32_PIN_PC6, STM32F4_PINMUX_FUNC_PC6_USART6_TX},
{STM32_PIN_PC7, STM32F4_PINMUX_FUNC_PC7_USART6_RX},
#endif /* CONFIG_UART_STM32_PORT_6 */
#ifdef CONFIG_I2C_1 #ifdef CONFIG_I2C_1
{STM32_PIN_PB6, STM32F4_PINMUX_FUNC_PB6_I2C1_SCL}, {STM32_PIN_PB6, STM32F4_PINMUX_FUNC_PB6_I2C1_SCL},
{STM32_PIN_PB7, STM32F4_PINMUX_FUNC_PB7_I2C1_SDA}, {STM32_PIN_PB7, STM32F4_PINMUX_FUNC_PB7_I2C1_SDA},

2
drivers/serial/uart_stm32.c
View file

@ -426,7 +426,7 @@ UART_DEVICE_INIT_STM32(5, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_UART5)
#endif /* CONFIG_UART_STM32_PORT_5 */ #endif /* CONFIG_UART_STM32_PORT_5 */
#ifdef CONFIG_UART_STM32_PORT_6 #ifdef CONFIG_UART_STM32_PORT_6
UART_DEVICE_INIT_STM32(6, STM32_CLOCK_BUS_APB2, LL_APB2_GRP1_PERIPH_UART6) UART_DEVICE_INIT_STM32(6, STM32_CLOCK_BUS_APB2, LL_APB2_GRP1_PERIPH_USART6)
#endif /* CONFIG_UART_STM32_PORT_6 */ #endif /* CONFIG_UART_STM32_PORT_6 */
#ifdef CONFIG_UART_STM32_PORT_7 #ifdef CONFIG_UART_STM32_PORT_7

6
dts/arm/st/stm32f4-pinctrl.dtsi
View file

@ -45,6 +45,12 @@
tx = <STM32_PIN_PD8 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>; tx = <STM32_PIN_PD8 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
}; };
}; };
usart6_pins_a: usart6@0 {
rx_tx {
rx = <STM32_PIN_PC7 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUPDR_NO_PULL)>;
tx = <STM32_PIN_PC6 (STM32_PINMUX_ALT_FUNC_7 | STM32_PUSHPULL_NOPULL)>;
};
};
}; };
}; };
}; };