forked from Sricharanti/sricharan
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'at91-3.4-base2+cleanup' of git://github.com/at91linux/l…
…inux-at91 into at91/staging/base2+cleanup * 'at91-3.4-base2+cleanup' of git://github.com/at91linux/linux-at91: (20 commits) ARM: at91: properly sort dtb files in Makefile.boot ARM: at91: add at91sam9g25ek.dts in Makefile.boot ARM: at91/board-dt: drop default console Atmel: move console default platform_device to serial driver ARM: at91: merge SRAM Memory banks thanks to mirroring ARM: at91: finally drop at91_sys_read/write ARM: at91/rtc-at91sam9: pass the GPBR to use via resources ARM: at91:rtc/rtc-at91sam9: ioremap register bank ARM: at91/rtc-at91sam9: each SoC can select the RTT device to use ARM: at91/PMC: make register base soc independent ARM: at91/PMC: move assignment out of printf ARM: at91/pm_slowclock: add runtime detection of memory contoller ARM: at91: make sdram/ddr register base soc independent ARM: at91: move at91rm9200 sdramc defines to at91rm9200_sdramc.h ARM: at91/pm_slowclock: function slow_clock() accepts parameters ARM: at91/pm_slowclock: rename register to named define ARM: at91/ST: remove not needed casts ARM: at91: make ST (System Timer) soc independent ARM: at91: make matrix register base soc independent ARM: at91/at91x40: remove use of at91_sys_read/write Based on top of the at91/9x5, rmk/for-armsoc, at91/device-board, at91/pm_cleanup and at91/base. Signed-off-by: Arnd Bergmann <[email protected]>
- Loading branch information
Showing
217 changed files
with
2,873 additions
and
5,606 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -510,17 +510,3 @@ Why: The pci_scan_bus_parented() interface creates a new root bus. The | |
convert to using pci_scan_root_bus() so they can supply a list of | ||
bus resources when the bus is created. | ||
Who: Bjorn Helgaas <[email protected]> | ||
|
||
---------------------------- | ||
|
||
What: The CAP9 SoC family will be removed | ||
When: 3.4 | ||
Files: arch/arm/mach-at91/at91cap9.c | ||
arch/arm/mach-at91/at91cap9_devices.c | ||
arch/arm/mach-at91/include/mach/at91cap9.h | ||
arch/arm/mach-at91/include/mach/at91cap9_matrix.h | ||
arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h | ||
arch/arm/mach-at91/board-cap9adk.c | ||
Why: The code is not actively maintained and platforms are now hard to find. | ||
Who: Nicolas Ferre <[email protected]> | ||
Jean-Christophe PLAGNIOL-VILLARD <[email protected]> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
/* | ||
* at91sam9g25ek.dts - Device Tree file for AT91SAM9G25-EK board | ||
* | ||
* Copyright (C) 2012 Atmel, | ||
* 2012 Nicolas Ferre <[email protected]> | ||
* | ||
* Licensed under GPLv2 or later. | ||
*/ | ||
/dts-v1/; | ||
/include/ "at91sam9x5.dtsi" | ||
/include/ "at91sam9x5cm.dtsi" | ||
|
||
/ { | ||
model = "Atmel AT91SAM9G25-EK"; | ||
compatible = "atmel,at91sam9g25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; | ||
|
||
chosen { | ||
bootargs = "128M console=ttyS0,115200 mtdparts=atmel_nand:8M(bootstrap/uboot/kernel)ro,-(rootfs) root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs"; | ||
}; | ||
|
||
ahb { | ||
apb { | ||
dbgu: serial@fffff200 { | ||
status = "okay"; | ||
}; | ||
|
||
usart0: serial@f801c000 { | ||
status = "okay"; | ||
}; | ||
|
||
macb0: ethernet@f802c000 { | ||
phy-mode = "rmii"; | ||
status = "okay"; | ||
}; | ||
}; | ||
}; | ||
}; |
Oops, something went wrong.