diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-09-05 16:26:40 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-05 16:26:40 -0400 |
commit | 6ce041aba36c6f4702cd4f6efb7af3ceb3eb9e35 (patch) | |
tree | cac60ba1592bda6dcfede622e350e6c1337c395a /Documentation | |
parent | 52addcf9d6669fa439387610bc65c92fa0980cef (diff) | |
parent | 405a72c5e78b5c560c8b2711d4000fa5eb063e1b (diff) |
Merge tag 'at91-drivers' of git://github.com/at91linux/linux-at91 into next/drivers
Merge "First batch of AT91 drivers for 3.18" from Nicolas Ferre:
- reset, poweroff and ram drivers are moved to their proper
location instead of being in mach-at91 directory. They now use
the appropriate frameworks.
- big amount of removal of these machine specific drivers and use
of the newly created drivers. This lead to an overhaul of the setup.c AT91
startup code.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'at91-drivers' of git://github.com/at91linux/linux-at91: (31 commits)
power: reset: at91-poweroff: fix wakeup status register index
ARM: at91/power/reset: fix Kconfig "depends on" directive
ARM: at91: fix ramc standby function registration
ARM: at91: Remove rstc and shdwc headers
ARM: at91: Remove rstc and shdwnc global base addresses
ARM: at91/pm: Remove show_reset_status function
ARM: at91: Remove poweroff code
ARM: at91: Register the poweroff driver
ARM: at91: Remove poweroff DT probing
ARM: at91: Remove reset code from the machine code
ARM: at91: Call at91_register_devices in the board files
ARM: at91: Probe the reset driver
ARM: at91/soc: Introduce register_devices callback
ARM: at91: Remove the old-style reset probing
ARM: at91: Rework ramc mapping code
ARM: at91: setup: Switch to pr_fmt
ARM: at91: remove old irq material
ARM: at91: make use of the new AIC driver for dt enabled boards
ARM: at91: enclose at91_aic_xx calls in IS_ENABLED(CONFIG_OLD_IRQ_AT91) blocks
ARM: at91: introduce OLD_IRQ_AT91 Kconfig option
...
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/arm/atmel-at91.txt | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.txt b/Documentation/devicetree/bindings/arm/atmel-at91.txt index 16f60b41c147..6e3e3e5c611f 100644 --- a/Documentation/devicetree/bindings/arm/atmel-at91.txt +++ b/Documentation/devicetree/bindings/arm/atmel-at91.txt | |||
@@ -61,8 +61,8 @@ RAMC SDRAM/DDR Controller required properties: | |||
61 | - compatible: Should be "atmel,at91rm9200-sdramc", | 61 | - compatible: Should be "atmel,at91rm9200-sdramc", |
62 | "atmel,at91sam9260-sdramc", | 62 | "atmel,at91sam9260-sdramc", |
63 | "atmel,at91sam9g45-ddramc", | 63 | "atmel,at91sam9g45-ddramc", |
64 | "atmel,sama5d3-ddramc", | ||
64 | - reg: Should contain registers location and length | 65 | - reg: Should contain registers location and length |
65 | For at91sam9263 and at91sam9g45 you must specify 2 entries. | ||
66 | 66 | ||
67 | Examples: | 67 | Examples: |
68 | 68 | ||
@@ -71,12 +71,6 @@ Examples: | |||
71 | reg = <0xffffe800 0x200>; | 71 | reg = <0xffffe800 0x200>; |
72 | }; | 72 | }; |
73 | 73 | ||
74 | ramc0: ramc@ffffe400 { | ||
75 | compatible = "atmel,at91sam9g45-ddramc"; | ||
76 | reg = <0xffffe400 0x200 | ||
77 | 0xffffe600 0x200>; | ||
78 | }; | ||
79 | |||
80 | SHDWC Shutdown Controller | 74 | SHDWC Shutdown Controller |
81 | 75 | ||
82 | required properties: | 76 | required properties: |