diff options
| author | Tom Rini | 2020-06-04 10:21:51 -0400 |
|---|---|---|
| committer | Tom Rini | 2020-06-04 10:21:51 -0400 |
| commit | c27178ba3649f539c9f1890ea147f4c5415f63b5 (patch) | |
| tree | 56ba0e3b96d99f609d033f6fc3f2bebb981c1e04 | |
| parent | 1b6ae82a5abb4cbedb0d6cb262526173f4efa486 (diff) | |
| parent | d32cbefc8ac82bd0206f806efb07df82c4b92d5b (diff) | |
Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians/u-boot-atmel
First set of u-boot-atmel fixes for 2020.07 cycle
This set includes just two small commits that fix a build warning and
add a missing serial node.
| -rw-r--r-- | arch/arm/dts/sama5d2.dtsi | 8 | ||||
| -rw-r--r-- | board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c | 2 | ||||
| -rw-r--r-- | board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c | 2 | ||||
| -rw-r--r-- | board/atmel/sama5d2_xplained/sama5d2_xplained.c | 2 |
4 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/dts/sama5d2.dtsi b/arch/arm/dts/sama5d2.dtsi index 5adc47b906b..6fb2cb25f98 100644 --- a/arch/arm/dts/sama5d2.dtsi +++ b/arch/arm/dts/sama5d2.dtsi @@ -746,6 +746,14 @@ status = "disabled"; }; + uart4: serial@fc00c000 { + compatible = "atmel,at91sam9260-usart"; + reg = <0xfc00c000 0x100>; + clocks = <&uart4_clk>; + clock-names = "usart"; + status = "disabled"; + }; + i2c1: i2c@fc028000 { compatible = "atmel,sama5d2-i2c"; reg = <0xfc028000 0x100>; diff --git a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c index f3816c83345..376562cd0e7 100644 --- a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c +++ b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c @@ -20,10 +20,12 @@ extern void at91_pda_detect(void); DECLARE_GLOBAL_DATA_PTR; +#ifdef CONFIG_CMD_USB static void board_usb_hw_init(void) { atmel_pio4_set_pio_output(AT91_PIO_PORTA, 27, 1); } +#endif #ifdef CONFIG_BOARD_LATE_INIT int board_late_init(void) diff --git a/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c b/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c index 4b3a703f260..b0a23b02db2 100644 --- a/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c +++ b/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c @@ -76,10 +76,12 @@ int board_late_init(void) } #endif +#ifdef CONFIG_CMD_USB static void board_usb_hw_init(void) { atmel_pio4_set_pio_output(AT91_PIO_PORTB, 12, ATMEL_PIO_PUEN_MASK); } +#endif #ifdef CONFIG_DEBUG_UART_BOARD_INIT static void board_uart0_hw_init(void) diff --git a/board/atmel/sama5d2_xplained/sama5d2_xplained.c b/board/atmel/sama5d2_xplained/sama5d2_xplained.c index 2116b788378..01636fb73d0 100644 --- a/board/atmel/sama5d2_xplained/sama5d2_xplained.c +++ b/board/atmel/sama5d2_xplained/sama5d2_xplained.c @@ -20,10 +20,12 @@ extern void at91_pda_detect(void); DECLARE_GLOBAL_DATA_PTR; +#ifdef CONFIG_CMD_USB static void board_usb_hw_init(void) { atmel_pio4_set_pio_output(AT91_PIO_PORTB, 10, 1); } +#endif #ifdef CONFIG_BOARD_LATE_INIT int board_late_init(void) |