dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 16:52:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians/u-boot-atmel

Browse Source 
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.
This commit is contained in:
Tom Rini
2020-06-04 10:21:51 -04:00
parent 1b6ae82a5a d32cbefc8a
commit c27178ba36
4 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/dts/sama5d2.dtsi
View File

@@ -746,6 +746,14 @@
status = "disabled"; status = "disabled";
}; };
uart4: serial@fc00c000 {
compatible = "atmel,at91sam9260-usart";
reg = <0xfc00c000 0x100>;
clocks = <&uart4_clk>;
clock-names = "usart";
status = "disabled";
};
i2c1: i2c@fc028000 { i2c1: i2c@fc028000 {
compatible = "atmel,sama5d2-i2c"; compatible = "atmel,sama5d2-i2c";
reg = <0xfc028000 0x100>; reg = <0xfc028000 0x100>;

2
board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c
View File

@@ -20,10 +20,12 @@ extern void at91_pda_detect(void);
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_CMD_USB
static void board_usb_hw_init(void) static void board_usb_hw_init(void)
{ {
atmel_pio4_set_pio_output(AT91_PIO_PORTA, 27, 1); atmel_pio4_set_pio_output(AT91_PIO_PORTA, 27, 1);
} }
#endif
#ifdef CONFIG_BOARD_LATE_INIT #ifdef CONFIG_BOARD_LATE_INIT
int board_late_init(void) int board_late_init(void)

2
board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c
View File

@@ -76,10 +76,12 @@ int board_late_init(void)
} }
#endif #endif
#ifdef CONFIG_CMD_USB
static void board_usb_hw_init(void) static void board_usb_hw_init(void)
{ {
atmel_pio4_set_pio_output(AT91_PIO_PORTB, 12, ATMEL_PIO_PUEN_MASK); atmel_pio4_set_pio_output(AT91_PIO_PORTB, 12, ATMEL_PIO_PUEN_MASK);
} }
#endif
#ifdef CONFIG_DEBUG_UART_BOARD_INIT #ifdef CONFIG_DEBUG_UART_BOARD_INIT
static void board_uart0_hw_init(void) static void board_uart0_hw_init(void)

2
board/atmel/sama5d2_xplained/sama5d2_xplained.c
View File

@@ -20,10 +20,12 @@ extern void at91_pda_detect(void);
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_CMD_USB
static void board_usb_hw_init(void) static void board_usb_hw_init(void)
{ {
atmel_pio4_set_pio_output(AT91_PIO_PORTB, 10, 1); atmel_pio4_set_pio_output(AT91_PIO_PORTB, 10, 1);
} }
#endif
#ifdef CONFIG_BOARD_LATE_INIT #ifdef CONFIG_BOARD_LATE_INIT
int board_late_init(void) int board_late_init(void)