mirror of
https://github.com/torvalds/linux
synced 2024-10-22 19:25:51 +00:00
1247034ea6
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAABAgAGBQJRu5FQAAoJEAf03oE53VmQB40H/RfSFjAMRak2yPSb+4Cw2038 3BQ7iDowps/jJwD7D79SZOY44X+dOMfGO5Pj9C1J61y5ThhiS3QDFnpfzHb74Cl8 AHLRI9ugG496pdKk6aWjAq4oJozDBrwznnwTJpZshrkSkfOklHjhd/Z5uTIBW3pn gQL9tbcTmjqhemhRB160ZHaJebMZBDZgAtft4pVt2JFjXZCokkHLxpf57z4S79D9 RJ84AU/o2IlQnrcY8fwnyWiU9LNeFzEF+bhNH7XiSoN5suTAdIN6grmHvkqdbSon GCiAGp2samBoewnSa+Je32jXdqHORnxHZ6gaZsj+WOnz8zqJG7VNpc4KCJs0Hos= =MvZy -----END PGP SIGNATURE----- Merge tag 'at91-drivers' of git://github.com/at91linux/linux-at91 into next/drivers From Nicolas Ferre: Adding the DT support to USB gadget High-Speed aka usba. * tag 'at91-drivers' of git://github.com/at91linux/linux-at91: USB: gadget: atmel_usba: add DT support USB: gadget: atmel_usba: allow multi instance USB: gadget: atmel_usba: move global struct usba_ep usba_ep to struct usba_udc ARM: at91: udpate defconfigs ARM: at91: dt: switch to standard IRQ flag defines ARM: at91: dt: switch to pinctrl to pre-processor ARM: at91: dt: add pinctrl pre-processor define ARM: at91: dt: switch to standard GPIO flag defines. ARM: at91: dt: use #include for all device trees Signed-off-by: Olof Johansson <olof@lixom.net> Conflicts: arch/arm/boot/dts/at91sam9260.dtsi arch/arm/boot/dts/sama5d3.dtsi
31 lines
596 B
Plaintext
31 lines
596 B
Plaintext
/*
|
|
* at91sam9x25ek.dts - Device Tree file for AT91SAM9X25-EK board
|
|
*
|
|
* Copyright (C) 2012 Atmel,
|
|
* 2012 Nicolas Ferre <nicolas.ferre@atmel.com>
|
|
*
|
|
* Licensed under GPLv2 or later.
|
|
*/
|
|
/dts-v1/;
|
|
#include "at91sam9x25.dtsi"
|
|
#include "at91sam9x5ek.dtsi"
|
|
|
|
/ {
|
|
model = "Atmel AT91SAM9X25-EK";
|
|
compatible = "atmel,at91sam9x25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
|
|
|
|
ahb {
|
|
apb {
|
|
macb0: ethernet@f802c000 {
|
|
phy-mode = "rmii";
|
|
status = "okay";
|
|
};
|
|
|
|
macb1: ethernet@f8030000 {
|
|
phy-mode = "rmii";
|
|
status = "okay";
|
|
};
|
|
};
|
|
};
|
|
};
|