Skip to content

Commit 09d0c18

Browse files
committed
Merge branch 'at91-4.19-trunk/dt_sama5d2-icp' into linux-4.19-at91
2 parents e2083e4 + 7af253a commit 09d0c18

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

arch/arm/boot/dts/at91-sama5d2_icp.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
compatible = "microchip,sama5d2-icp", "atmel,sama5d2", "atmel,sama5";
1818

1919
aliases {
20-
serial0 = &uart0; /* DBGU */
21-
serial1 = &uart1; /* mikro BUS 1 */
20+
serial0 = &uart0; /* debug uart0 + mikro BUS 1 */
21+
serial1 = &uart1; /* mikro BUS 3 */
2222
serial3 = &uart3; /* mikro BUS 2 */
2323
serial5 = &uart5; /* flx2 */
2424
i2c0 = &i2c0;
@@ -50,7 +50,7 @@
5050

5151
ahb {
5252
usb0: gadget@300000 {
53-
atmel,vbus-gpio = <&pioA PIN_PD23 GPIO_ACTIVE_LOW>;
53+
atmel,vbus-gpio = <&pioA PIN_PD23 GPIO_ACTIVE_HIGH>;
5454
pinctrl-names = "default";
5555
pinctrl-0 = <&pinctrl_usba_vbus>;
5656
status = "okay";
@@ -489,7 +489,7 @@
489489
compatible = "atmel,24c32";
490490
reg = <0x50>;
491491
pagesize = <16>;
492-
status = "disabled";
492+
status = "okay";
493493
};
494494

495495
eeprom@52 {

0 commit comments

Comments
 (0)