Merge tag 'at91-cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre...
authorOlof Johansson <olof@lixom.net>
Wed, 21 Jan 2015 23:17:56 +0000 (15:17 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 21 Jan 2015 23:17:56 +0000 (15:17 -0800)
Merge "at91: cleanup for 3.20 #2" from Nicolas Ferre:

Second batch of cleanup for 3.20:
- By reworking the PM code, we can remove the AT91 more specific initialization
- We are using DT for SRAM initialization now, so we can remove its explicit
  mapping
- The PMC clock driver now hosts IDLE function for at91rm9200 with other
  SoCs ones.

* tag 'at91-cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: (37 commits)
  ARM: at91: move at91rm9200_idle() to clk/at91/pmc.c
  ARM: at91: remove unused at91_init_sram
  ARM: at91: sama5d4: remove useless call to at91_init_sram
  ARM: at91: remove useless map_io
  ARM: at91: pm: prepare for multiplatform
  ARM: at91: pm: add UDP and UHP checks to newer SoCs
  ARM: at91: pm: use the mmio-sram pool to access SRAM
  ARM: at91: pm: rework cpu detection
  ARM: at91: dts: sama5d3: add ov2640 camera sensor support
  ARM: at91: dts: sama5d3: change name of pinctrl of ISI_MCK
  ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset}
  ARM: at91: dts: sama5d3: move the isi mck pin to mb
  ARM: at91: dts: sama5d3: add missing pins of isi
  ARM: at91: dts: sama5d3: split isi pinctrl
  ARM: at91: dts: sama5d3: add isi clock
  ARM: at91/dt: ethernut5: use at91sam9xe.dtsi
  ARM: at91/dt: Add a dtsi for at91sam9xe
  ARM: at91/dt: add SRAM nodes
  ARM: at91/dt: at91rm9200ek: enable RTC
  ARM: at91/dt: rm9200: add RTC node
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
46 files changed:
Documentation/arm/Atmel/README [new file with mode: 0644]
Documentation/devicetree/bindings/arm/atmel-at91.txt
MAINTAINERS
arch/arm/Kconfig.debug
arch/arm/boot/dts/at91rm9200.dtsi
arch/arm/boot/dts/at91rm9200ek.dts
arch/arm/boot/dts/at91sam9260.dtsi
arch/arm/boot/dts/at91sam9261.dtsi
arch/arm/boot/dts/at91sam9263.dtsi
arch/arm/boot/dts/at91sam9g20.dtsi
arch/arm/boot/dts/at91sam9g45.dtsi
arch/arm/boot/dts/at91sam9n12.dtsi
arch/arm/boot/dts/at91sam9rl.dtsi
arch/arm/boot/dts/at91sam9x5.dtsi
arch/arm/boot/dts/at91sam9xe.dtsi [new file with mode: 0644]
arch/arm/boot/dts/ethernut5.dts
arch/arm/boot/dts/sama5d3.dtsi
arch/arm/boot/dts/sama5d3xcm.dtsi
arch/arm/boot/dts/sama5d3xmb.dtsi
arch/arm/boot/dts/sama5d4.dtsi
arch/arm/include/debug/at91.S [new file with mode: 0644]
arch/arm/mach-at91/Kconfig
arch/arm/mach-at91/Makefile
arch/arm/mach-at91/at91rm9200.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9n12.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/at91sam9x5.c
arch/arm/mach-at91/board-dt-rm9200.c
arch/arm/mach-at91/board-dt-sam9.c
arch/arm/mach-at91/board-dt-sama5.c
arch/arm/mach-at91/generic.h
arch/arm/mach-at91/include/mach/at91_pio.h [deleted file]
arch/arm/mach-at91/include/mach/at91_rtt.h [deleted file]
arch/arm/mach-at91/include/mach/debug-macro.S [deleted file]
arch/arm/mach-at91/include/mach/memory.h [deleted file]
arch/arm/mach-at91/pm.c
arch/arm/mach-at91/sama5d3.c
arch/arm/mach-at91/sama5d4.c
arch/arm/mach-at91/setup.c
arch/arm/mach-at91/sysirq_mask.c [deleted file]
drivers/clk/at91/pmc.c
drivers/rtc/Kconfig

diff --git a/Documentation/arm/Atmel/README b/Documentation/arm/Atmel/README
new file mode 100644 (file)
index 0000000..c53a19b
--- /dev/null
@@ -0,0 +1,124 @@
+ARM Atmel SoCs (aka AT91)
+=========================
+
+
+Introduction
+------------
+This document gives useful information about the ARM Atmel SoCs that are
+currently supported in Linux Mainline (you know, the one on kernel.org).
+
+It is important to note that the Atmel | SMART ARM-based MPU product line is
+historically named "AT91" or "at91" throughout the Linux kernel development
+process even if this product prefix has completely disappeared from the
+official Atmel product name. Anyway, files, directories, git trees,
+git branches/tags and email subject always contain this "at91" sub-string.
+
+
+AT91 SoCs
+---------
+Documentation and detailled datasheet for each product are available on
+the Atmel website: http://www.atmel.com.
+
+  Flavors:
+    * ARM 920 based SoC
+      - at91rm9200
+        + Datasheet
+          http://www.atmel.com/Images/doc1768.pdf
+
+    * ARM 926 based SoCs
+      - at91sam9260
+        + Datasheet
+          http://www.atmel.com/Images/doc6221.pdf
+
+      - at91sam9xe
+        + Datasheet
+          http://www.atmel.com/Images/Atmel-6254-32-bit-ARM926EJ-S-Embedded-Microprocessor-SAM9XE_Datasheet.pdf
+
+      - at91sam9261
+        + Datasheet
+          http://www.atmel.com/Images/doc6062.pdf
+
+      - at91sam9263
+        + Datasheet
+          http://www.atmel.com/Images/Atmel_6249_32-bit-ARM926EJ-S-Microcontroller_SAM9263_Datasheet.pdf
+
+      - at91sam9rl
+        + Datasheet
+          http://www.atmel.com/Images/doc6289.pdf
+
+      - at91sam9g20
+        + Datasheet
+          http://www.atmel.com/Images/doc6384.pdf
+
+      - at91sam9g45 family
+        - at91sam9g45
+        - at91sam9g46
+        - at91sam9m10
+        - at91sam9m11 (device superset)
+        + Datasheet
+          http://www.atmel.com/Images/Atmel-6437-32-bit-ARM926-Embedded-Microprocessor-SAM9M11_Datasheet.pdf
+
+      - at91sam9x5 family (aka "The 5 series")
+        - at91sam9g15
+        - at91sam9g25
+        - at91sam9g35
+        - at91sam9x25
+        - at91sam9x35
+        + Datasheet (can be considered as covering the whole family)
+          http://www.atmel.com/Images/Atmel_11055_32-bit-ARM926EJ-S-Microcontroller_SAM9X35_Datasheet.pdf
+
+      - at91sam9n12
+        + Datasheet
+          http://www.atmel.com/Images/Atmel_11063_32-bit-ARM926EJ-S-Microcontroller_SAM9N12CN11CN12_Datasheet.pdf
+
+    * ARM Cortex-A5 based SoCs
+      - sama5d3 family
+        - sama5d31
+        - sama5d33
+        - sama5d34
+        - sama5d35
+        - sama5d36 (device superset)
+        + Datasheet
+          http://www.atmel.com/Images/Atmel-11121-32-bit-Cortex-A5-Microcontroller-SAMA5D3_Datasheet.pdf
+
+    * ARM Cortex-A5 + NEON based SoCs
+      - sama5d4 family
+        - sama5d41
+        - sama5d42
+        - sama5d43
+        - sama5d44 (device superset)
+        + Datasheet
+          http://www.atmel.com/Images/Atmel-11238-32-bit-Cortex-A5-Microcontroller-SAMA5D4_Datasheet.pdf
+
+
+Linux kernel information
+------------------------
+Linux kernel mach directory: arch/arm/mach-at91
+MAINTAINERS entry is: "ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES"
+
+
+Device Tree for AT91 SoCs and boards
+------------------------------------
+All AT91 SoCs are converted to Device Tree. Since Linux 3.19, these products
+must use this method to boot the Linux kernel.
+
+Work In Progress statement:
+Device Tree files and Device Tree bindings that apply to AT91 SoCs and boards are
+considered as "Unstable". To be completely clear, any at91 binding can change at
+any time. So, be sure to use a Device Tree Binary and a Kernel Image generated from
+the same source tree.
+Please refer to the Documentation/devicetree/bindings/ABI.txt file for a
+definition of a "Stable" binding/ABI.
+This statement will be removed by AT91 MAINTAINERS when appropriate.
+
+Naming conventions and best practice:
+- SoCs Device Tree Source Include files are named after the official name of
+  the product (at91sam9g20.dtsi or sama5d33.dtsi for instance).
+- Device Tree Source Include files (.dtsi) are used to collect common nodes that can be
+  shared across SoCs or boards (sama5d3.dtsi or at91sam9x5cm.dtsi for instance).
+  When collecting nodes for a particular peripheral or topic, the identifier have to
+  be placed at the end of the file name, separated with a "_" (at91sam9x5_can.dtsi
+  or sama5d3_gmac.dtsi for example).
+- board Device Tree Source files (.dts) are prefixed by the string "at91-" so
+  that they can be identified easily. Note that some files are historical exceptions
+  to this rule (sama5d3[13456]ek.dts, usb_a9g20.dts or animeo_ip.dts for example).
index 562cda9d86d9a9de78c617c67b38fa5313cc20cc..ad319f84f56018ba1297676c2a69586864a6b4e0 100644 (file)
@@ -24,6 +24,7 @@ compatible: must be one of:
     o "atmel,at91sam9g45"
     o "atmel,at91sam9n12"
     o "atmel,at91sam9rl"
+    o "atmel,at91sam9xe"
  * "atmel,sama5" for SoCs using a Cortex-A5, shall be extended with the specific
    SoC family:
     o "atmel,sama5d3" shall be extended with the specific SoC compatible:
@@ -136,3 +137,19 @@ Example:
                compatible = "atmel,at91sam9260-rstc";
                reg = <0xfffffd00 0x10>;
        };
+
+Special Function Registers (SFR)
+
+Special Function Registers (SFR) manage specific aspects of the integrated
+memory, bridge implementations, processor and other functionality not controlled
+elsewhere.
+
+required properties:
+- compatible: Should be "atmel,<chip>-sfr", "syscon".
+  <chip> can be "sama5d3" or "sama5d4".
+- reg: Should contain registers location and length
+
+       sfr@f0038000 {
+               compatible = "atmel,sama5d3-sfr", "syscon";
+               reg = <0xf0038000 0x60>;
+       };
index 3589d67437f867e121bc36b0ff2b92e758499c04..8c25979a3c43eef38da5cc2d5b4e2d5976b61801 100644 (file)
@@ -877,6 +877,7 @@ F:  arch/arm/boot/dts/at91*.dts
 F:     arch/arm/boot/dts/at91*.dtsi
 F:     arch/arm/boot/dts/sama*.dts
 F:     arch/arm/boot/dts/sama*.dtsi
+F:     arch/arm/include/debug/at91.S
 
 ARM/ATMEL AT91 Clock Support
 M:     Boris Brezillon <boris.brezillon@free-electrons.com>
index 15fb262677aed60f0d5f057ba5c032585b732f1c..dc2b768edb8a932e4e940f7fab85a99888551483 100644 (file)
@@ -115,15 +115,18 @@ choice
                    0x80024000      | 0xf0024000     | UART9
 
        config AT91_DEBUG_LL_DBGU0
-               bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10 and 9rl"
+               bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10, 9rl, 9x5, 9n12"
+               select DEBUG_AT91_UART
                depends on HAVE_AT91_DBGU0
 
        config AT91_DEBUG_LL_DBGU1
-               bool "Kernel low-level debugging on 9263 and 9g45"
+               bool "Kernel low-level debugging on 9263, 9g45 and sama5d3"
+               select DEBUG_AT91_UART
                depends on HAVE_AT91_DBGU1
 
        config AT91_DEBUG_LL_DBGU2
                bool "Kernel low-level debugging on sama5d4"
+               select DEBUG_AT91_UART
                depends on HAVE_AT91_DBGU2
 
        config DEBUG_BCM2835
@@ -1204,6 +1207,8 @@ config DEBUG_LL_INCLUDE
        string
        default "debug/sa1100.S" if DEBUG_SA1100
        default "debug/8250.S" if DEBUG_LL_UART_8250 || DEBUG_UART_8250
+       default "debug/at91.S" if AT91_DEBUG_LL_DBGU0 || AT91_DEBUG_LL_DBGU1 || \
+                               AT91_DEBUG_LL_DBGU2
        default "debug/asm9260.S" if DEBUG_ASM9260_UART
        default "debug/clps711x.S" if DEBUG_CLPS711X_UART1 || DEBUG_CLPS711X_UART2
        default "debug/meson.S" if DEBUG_MESON_UARTAO
index 6c97d4af61eec9e36da60ab3257c508e0ef3ba7e..21c2b504f977d16088ce290386ba73ddb4333b6b 100644 (file)
                };
        };
 
+       sram: sram@00200000 {
+               compatible = "mmio-sram";
+               reg = <0x00200000 0x4000>;
+       };
+
        ahb {
                compatible = "simple-bus";
                #address-cells = <1>;
                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                        };
 
+                       rtc: rtc@fffffe00 {
+                               compatible = "atmel,at91rm9200-rtc";
+                               reg = <0xfffffe00 0x40>;
+                               interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+                               status = "disabled";
+                       };
+
                        tcb0: timer@fffa0000 {
                                compatible = "atmel,at91rm9200-tcb";
                                reg = <0xfffa0000 0x100>;
index 43eb779dd6f6f5c077ade770b838fadda2171c38..2a5d21247d7ea38a40440e75c009e6f92ee252f2 100644 (file)
                        dbgu: serial@fffff200 {
                                status = "okay";
                        };
+
+                       rtc: rtc@fffffe00 {
+                               status = "okay";
+                       };
                };
 
                usb0: ohci@00300000 {
index dd1313cbc3149516cd7f32e173683337e025abae..fff0ee69aab495361898b503268fd300a02832c1 100644 (file)
                };
        };
 
+       sram0: sram@002ff000 {
+               compatible = "mmio-sram";
+               reg = <0x002ff000 0x2000>;
+       };
+
        ahb {
                compatible = "simple-bus";
                #address-cells = <1>;
index cdb9ed6121091db2915cbb4fed0286a2120eadcd..e247b0b5fdab2fe1cb41e57fd51450ae723256dd 100644 (file)
                };
        };
 
+       sram: sram@00300000 {
+               compatible = "mmio-sram";
+               reg = <0x00300000 0x28000>;
+       };
+
        ahb {
                compatible = "simple-bus";
                #address-cells = <1>;
index 1467750e3377d161bddff0cfcce1f35d91c9261b..8a210d5033b1c18e73e3c92a25427b6c5f6c6cc1 100644 (file)
                };
        };
 
+       sram0: sram@00300000 {
+               compatible = "mmio-sram";
+               reg = <0x00300000 0x14000>;
+       };
+
+       sram1: sram@00500000 {
+               compatible = "mmio-sram";
+               reg = <0x00300000 0x4000>;
+       };
+
        ahb {
                compatible = "simple-bus";
                #address-cells = <1>;
                                                reg = <17>;
                                        };
 
-                                       ac91_clk: ac97_clk {
+                                       ac97_clk: ac97_clk {
                                                #clock-cells = <0>;
                                                reg = <18>;
                                        };
index a50ee587a7af61a863aec77412d09c1dd2f519f7..f5930161816371128530533b70ff298fa64cfb0a 100644 (file)
                reg = <0x20000000 0x08000000>;
        };
 
+       sram0: sram@002ff000 {
+               status = "disabled";
+       };
+
+       sram1: sram@002fc000 {
+               compatible = "mmio-sram";
+               reg = <0x002fc000 0x8000>;
+       };
+
        ahb {
                apb {
                        i2c0: i2c@fffac000 {
index 2a8da8a884b44d37117d73d14a88aa026dbbfe5a..ee80aa9c0759c17f178965181fb28f2a562f6b13 100644 (file)
                };
        };
 
+       sram: sram@00300000 {
+               compatible = "mmio-sram";
+               reg = <0x00300000 0x10000>;
+       };
+
        ahb {
                compatible = "simple-bus";
                #address-cells = <1>;
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00700000 0x100000>;
                        interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
-                       //TODO
                        clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
                        clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
                        status = "disabled";
                        compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
                        reg = <0x00800000 0x100000>;
                        interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
-                       //TODO
                        clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
                        clock-names = "usb_clk", "ehci_clk", "hclk", "uhpck";
                        status = "disabled";
index 68eb9aded1648e7078d7097eaedbf829ed151561..c2666a7cb5b19b547d31f11d58d5af1c13d36acb 100644 (file)
                };
        };
 
+       sram: sram@00300000 {
+               compatible = "mmio-sram";
+               reg = <0x00300000 0x8000>;
+       };
+
        ahb {
                compatible = "simple-bus";
                #address-cells = <1>;
                                status = "disabled";
                        };
 
+                       rtc@fffffeb0 {
+                               compatible = "atmel,at91rm9200-rtc";
+                               reg = <0xfffffeb0 0x40>;
+                               interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+                               status = "disabled";
+                       };
+
                        pwm0: pwm@f8034000 {
                                compatible = "atmel,at91sam9rl-pwm";
                                reg = <0xf8034000 0x300>;
index 72424371413e7404f2a87455e34c0014603adf4e..40f645b8fe25699d51904e5bdcaba8251375686a 100644 (file)
                };
        };
 
+       sram: sram@00300000 {
+               compatible = "mmio-sram";
+               reg = <0x00300000 0x10000>;
+       };
+
        ahb {
                compatible = "simple-bus";
                #address-cells = <1>;
index bbb3ba65165f5b7f2ca132ab2787c87da2b25897..818dabdd8c0e08e3089092f27117c1927bc6122f 100644 (file)
                };
        };
 
+       sram: sram@00300000 {
+               compatible = "mmio-sram";
+               reg = <0x00300000 0x8000>;
+       };
+
        ahb {
                compatible = "simple-bus";
                #address-cells = <1>;
diff --git a/arch/arm/boot/dts/at91sam9xe.dtsi b/arch/arm/boot/dts/at91sam9xe.dtsi
new file mode 100644 (file)
index 0000000..0278f63
--- /dev/null
@@ -0,0 +1,60 @@
+/*
+ * at91sam9xe.dtsi - Device Tree Include file for AT91SAM9XE family SoC
+ *
+ *  Copyright (C) 2015 Atmel,
+ *                2015 Alexandre Belloni <alexandre.Belloni@free-electrons.com>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "at91sam9260.dtsi"
+
+/ {
+       model = "Atmel AT91SAM9XE family SoC";
+       compatible = "atmel,at91sam9xe", "atmel,at91sam9260";
+
+       sram0: sram@002ff000 {
+               status = "disabled";
+       };
+
+       sram1: sram@00300000 {
+               compatible = "mmio-sram";
+               reg = <0x00300000 0x4000>;
+       };
+};
index 8f941c2db7c654e864dd0c2420d0786e95d4fd7f..243044343ee86595fad1af40ec8f9f6749e0bf63 100644 (file)
@@ -6,7 +6,7 @@
  * Licensed under GPLv2.
  */
 /dts-v1/;
-#include "at91sam9260.dtsi"
+#include "at91sam9xe.dtsi"
 
 / {
        model = "Ethernut 5";
index 5f4144d1e3a1e97adc8b6648b5dabab5a6c10a13..261311bdf65bcb601ee5824b57ea3dcf68920db2 100644 (file)
                };
        };
 
+       sram: sram@00300000 {
+               compatible = "mmio-sram";
+               reg = <0x00300000 0x20000>;
+       };
+
        ahb {
                compatible = "simple-bus";
                #address-cells = <1>;
                                compatible = "atmel,at91sam9g45-isi";
                                reg = <0xf0034000 0x4000>;
                                interrupts = <37 IRQ_TYPE_LEVEL_HIGH 5>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&pinctrl_isi_data_0_7>;
+                               clocks = <&isi_clk>;
+                               clock-names = "isi_clk";
                                status = "disabled";
+                               port {
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+                               };
+                       };
+
+                       sfr: sfr@f0038000 {
+                               compatible = "atmel,sama5d3-sfr", "syscon";
+                               reg = <0xf0038000 0x60>;
                        };
 
                        mmc1: mmc@f8000000 {
                                };
 
                                isi {
-                                       pinctrl_isi: isi-0 {
+                                       pinctrl_isi_data_0_7: isi-0-data-0-7 {
                                                atmel,pins =
                                                        <AT91_PIOA 16 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PA16 periph C ISI_D0, conflicts with LCDDAT16 */
                                                         AT91_PIOA 17 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PA17 periph C ISI_D1, conflicts with LCDDAT17 */
                                                         AT91_PIOA 23 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PA23 periph C ISI_D7, conflicts with LCDDAT23, PWML1 */
                                                         AT91_PIOC 30 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PC30 periph C ISI_PCK, conflicts with UTXD0 */
                                                         AT91_PIOA 31 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PA31 periph C ISI_HSYNC, conflicts with TWCK0, UTXD1 */
-                                                        AT91_PIOA 30 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PA30 periph C ISI_VSYNC, conflicts with TWD0, URXD1 */
-                                                        AT91_PIOC 29 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PC29 periph C ISI_PD8, conflicts with URXD0, PWMFI2 */
+                                                        AT91_PIOA 30 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PA30 periph C ISI_VSYNC, conflicts with TWD0, URXD1 */
+                                       };
+
+                                       pinctrl_isi_data_8_9: isi-0-data-8-9 {
+                                               atmel,pins =
+                                                       <AT91_PIOC 29 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PC29 periph C ISI_PD8, conflicts with URXD0, PWMFI2 */
                                                         AT91_PIOC 28 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC28 periph C ISI_PD9, conflicts with SPI1_NPCS3, PWMFI0 */
                                        };
-                                       pinctrl_isi_pck_as_mck: isi_pck_as_mck-0 {
+
+                                       pinctrl_isi_data_10_11: isi-0-data-10-11 {
                                                atmel,pins =
-                                                       <AT91_PIOD 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD31 periph B ISI_MCK */
+                                                       <AT91_PIOC 27 AT91_PERIPH_C AT91_PINCTRL_NONE   /* PC27 periph C ISI_PD10, conflicts with SPI1_NPCS2, TWCK1 */
+                                                        AT91_PIOC 26 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC26 periph C ISI_PD11, conflicts with SPI1_NPCS1, TWD1 */
                                        };
                                };
 
index cfcd200b0c177967f91d9c26e4372d4f1f514b27..7d6babdab03911aa089d08946df6f9e66e9bd590 100644 (file)
                d2 {
                        label = "d2";
                        gpios = <&pioE 25 GPIO_ACTIVE_LOW>;     /* PE25, conflicts with A25, RXD2 */
+                       linux,default-trigger = "heartbeat";
                };
        };
 };
index 49c10d33df302b7d967f0861c1424f636026a943..9fdb8a07b1456c3f5ef9e062a051583dc622c5bd 100644 (file)
                                };
                        };
 
+                       i2c1: i2c@f0018000 {
+                               ov2640: camera@0x30 {
+                                       compatible = "ovti,ov2640";
+                                       reg = <0x30>;
+                                       pinctrl-names = "default";
+                                       pinctrl-0 = <&pinctrl_pck1_as_isi_mck &pinctrl_sensor_power &pinctrl_sensor_reset>;
+                                       resetb-gpios = <&pioE 24 GPIO_ACTIVE_LOW>;
+                                       pwdn-gpios = <&pioE 29 GPIO_ACTIVE_HIGH>;
+                                       /* use pck1 for the master clock of ov2640 */
+                                       clocks = <&pck1>;
+                                       clock-names = "xvclk";
+                                       assigned-clocks = <&pck1>;
+                                       assigned-clock-rates = <25000000>;
+
+                                       port {
+                                               ov2640_0: endpoint {
+                                                       remote-endpoint = <&isi_0>;
+                                                       bus-width = <8>;
+                                               };
+                                       };
+                               };
+                       };
+
                        usart1: serial@f0020000 {
                                dmas = <0>, <0>;        /*  Do not use DMA for usart1 */
                                pinctrl-names = "default";
                        };
 
                        isi: isi@f0034000 {
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_isi &pinctrl_isi_pck_as_mck &pinctrl_isi_power &pinctrl_isi_reset>;
+                               port {
+                                       isi_0: endpoint {
+                                               remote-endpoint = <&ov2640_0>;
+                                               bus-width = <8>;
+                                       };
+                               };
                        };
 
                        mmc1: mmc@f8000000 {
                                                        <AT91_PIOD 30 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD30 periph B */
                                        };
 
-                                       pinctrl_isi_reset: isi_reset-0 {
+                                       pinctrl_pck1_as_isi_mck: pck1_as_isi_mck-0 {
+                                               atmel,pins =
+                                                       <AT91_PIOD 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD31 periph B ISI_MCK */
+                                       };
+
+                                       pinctrl_sensor_reset: sensor_reset-0 {
                                                atmel,pins =
                                                        <AT91_PIOE 24 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;   /* PE24 gpio */
                                        };
 
-                                       pinctrl_isi_power: isi_power-0 {
+                                       pinctrl_sensor_power: sensor_power-0 {
                                                atmel,pins =
                                                        <AT91_PIOE 29 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>; /* PE29 gpio */
                                        };
index 1b0f30c2c4a58d907aafd9d54e80d11e80d5722c..1b4fe4e1972130e3687f6d2090265ce42f699878 100644 (file)
                };
        };
 
+       ns_sram: sram@00210000 {
+               compatible = "mmio-sram";
+               reg = <0x00210000 0x10000>;
+       };
+
        ahb {
                compatible = "simple-bus";
                #address-cells = <1>;
                                status = "disabled";
                        };
 
+                       sfr: sfr@f8028000 {
+                               compatible = "atmel,sama5d4-sfr", "syscon";
+                               reg = <0xf8028000 0x60>;
+                       };
+
                        mmc1: mmc@fc000000 {
                                compatible = "atmel,hsmci";
                                reg = <0xfc000000 0x600>;
diff --git a/arch/arm/include/debug/at91.S b/arch/arm/include/debug/at91.S
new file mode 100644 (file)
index 0000000..80a6501
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+ *  Copyright (C) 2003-2005 SAN People
+ *
+ * Debugging macro include header
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+*/
+
+#if defined(CONFIG_AT91_DEBUG_LL_DBGU0)
+#define AT91_DBGU 0xfffff200 /* AT91_BASE_DBGU0 */
+#elif defined(CONFIG_AT91_DEBUG_LL_DBGU1)
+#define AT91_DBGU 0xffffee00 /* AT91_BASE_DBGU1 */
+#else
+/* On sama5d4, use USART3 as low level serial console */
+#define AT91_DBGU 0xfc00c000 /* SAMA5D4_BASE_USART3 */
+#endif
+
+/* Keep in sync with mach-at91/include/mach/hardware.h */
+#define AT91_IO_P2V(x) ((x) - 0x01000000)
+
+#define AT91_DBGU_SR           (0x14)  /* Status Register */
+#define AT91_DBGU_THR          (0x1c)  /* Transmitter Holding Register */
+#define AT91_DBGU_TXRDY                (1 << 1)        /* Transmitter Ready */
+#define AT91_DBGU_TXEMPTY      (1 << 9)        /* Transmitter Empty */
+
+       .macro  addruart, rp, rv, tmp
+       ldr     \rp, =AT91_DBGU                         @ System peripherals (phys address)
+       ldr     \rv, =AT91_IO_P2V(AT91_DBGU)            @ System peripherals (virt address)
+       .endm
+
+       .macro  senduart,rd,rx
+       strb    \rd, [\rx, #(AT91_DBGU_THR)]            @ Write to Transmitter Holding Register
+       .endm
+
+       .macro  waituart,rd,rx
+1001:  ldr     \rd, [\rx, #(AT91_DBGU_SR)]             @ Read Status Register
+       tst     \rd, #AT91_DBGU_TXRDY                   @ DBGU_TXRDY = 1 when ready to transmit
+       beq     1001b
+       .endm
+
+       .macro  busyuart,rd,rx
+1001:  ldr     \rd, [\rx, #(AT91_DBGU_SR)]             @ Read Status Register
+       tst     \rd, #AT91_DBGU_TXEMPTY                 @ DBGU_TXEMPTY = 1 when transmission complete
+       beq     1001b
+       .endm
+
index 2395c68b3e327094fa7048228bc1067173ac4c99..b7dcef50db23a04a0e7b7a21f34baf65b15ad1f4 100644 (file)
@@ -174,18 +174,11 @@ config SOC_AT91SAM9N12
 # ----------------------------------------------------------
 endif # SOC_SAM_V4_V5
 
-config MACH_AT91RM9200_DT
-       def_bool SOC_AT91RM9200
-
-config MACH_AT91SAM9_DT
-       def_bool SOC_AT91SAM9
-
-# ----------------------------------------------------------
-
 comment "AT91 Feature Selections"
 
 config AT91_SLOW_CLOCK
        bool "Suspend-to-RAM disables main oscillator"
+       select SRAM
        depends on SUSPEND
        help
          Select this if you want Suspend-to-RAM to save the most power
index 7b6424d40764560310bbea92cbbdbde06c88c881..8ef7d9a2e8557463e88e382ee81b48820969c509 100644 (file)
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-obj-y          := setup.o sysirq_mask.o
+obj-y          := setup.o
 
 obj-$(CONFIG_SOC_AT91SAM9)     += sam9_smc.o
 
@@ -19,8 +19,8 @@ obj-$(CONFIG_SOC_SAMA5D3)     += sama5d3.o
 obj-$(CONFIG_SOC_SAMA5D4)      += sama5d4.o
 
 # AT91SAM board with device-tree
-obj-$(CONFIG_MACH_AT91RM9200_DT) += board-dt-rm9200.o
-obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o
+obj-$(CONFIG_SOC_AT91RM9200) += board-dt-rm9200.o
+obj-$(CONFIG_SOC_AT91SAM9) += board-dt-sam9.o
 
 # SAMA5 board with device-tree
 obj-$(CONFIG_SOC_SAMA5)                += board-dt-sama5.o
index b5291694753513cd02e64cabe1f566eab04d9201..3be1963f5c564746d84eb81352e41f9c0f73c9de 100644 (file)
 #include "soc.h"
 #include "generic.h"
 
-static void at91rm9200_idle(void)
-{
-       /*
-        * Disable the processor clock.  The processor will be automatically
-        * re-enabled by an interrupt or by a reset.
-        */
-       at91_pmc_write(AT91_PMC_SCDR, AT91_PMC_PCK);
-}
 
 static void at91rm9200_restart(enum reboot_mode reboot_mode, const char *cmd)
 {
@@ -42,11 +34,6 @@ static void at91rm9200_restart(enum reboot_mode reboot_mode, const char *cmd)
 /* --------------------------------------------------------------------
  *  AT91RM9200 processor initialization
  * -------------------------------------------------------------------- */
-static void __init at91rm9200_map_io(void)
-{
-       /* Map peripherals */
-       at91_init_sram(0, AT91RM9200_SRAM_BASE, AT91RM9200_SRAM_SIZE);
-}
 
 static void __init at91rm9200_initialize(void)
 {
@@ -54,8 +41,6 @@ static void __init at91rm9200_initialize(void)
        arm_pm_restart = at91rm9200_restart;
 }
 
-
 AT91_SOC_START(at91rm9200)
-       .map_io = at91rm9200_map_io,
        .init = at91rm9200_initialize,
 AT91_SOC_END
index 78137c24d90b9dddfd0d5a1be75a267a5402768d..ab9841c8b0d5d544b9caae7009edd6cc4fb25d56 100644 (file)
  *  AT91SAM9260 processor initialization
  * -------------------------------------------------------------------- */
 
-static void __init at91sam9xe_map_io(void)
-{
-       unsigned long sram_size;
-
-       switch (at91_soc_initdata.cidr & AT91_CIDR_SRAMSIZ) {
-               case AT91_CIDR_SRAMSIZ_32K:
-                       sram_size = 2 * SZ_16K;
-                       break;
-               case AT91_CIDR_SRAMSIZ_16K:
-               default:
-                       sram_size = SZ_16K;
-       }
-
-       at91_init_sram(0, AT91SAM9XE_SRAM_BASE, sram_size);
-}
-
-static void __init at91sam9260_map_io(void)
-{
-       if (cpu_is_at91sam9xe())
-               at91sam9xe_map_io();
-       else if (cpu_is_at91sam9g20())
-               at91_init_sram(0, AT91SAM9G20_SRAM_BASE, AT91SAM9G20_SRAM_SIZE);
-       else
-               at91_init_sram(0, AT91SAM9260_SRAM_BASE, AT91SAM9260_SRAM_SIZE);
-}
-
 static void __init at91sam9260_initialize(void)
 {
        arm_pm_idle = at91sam9_idle;
-
-       at91_sysirq_mask_rtt(AT91SAM9260_BASE_RTT);
 }
 
 AT91_SOC_START(at91sam9260)
-       .map_io = at91sam9260_map_io,
        .init = at91sam9260_initialize,
 AT91_SOC_END
index d29953ecb0c441aa7fcdf814a708df3c8ba10a53..2029096b93fa925b1c8508e3c44eb5762a88c82d 100644 (file)
  *  AT91SAM9261 processor initialization
  * -------------------------------------------------------------------- */
 
-static void __init at91sam9261_map_io(void)
-{
-       if (cpu_is_at91sam9g10())
-               at91_init_sram(0, AT91SAM9G10_SRAM_BASE, AT91SAM9G10_SRAM_SIZE);
-       else
-               at91_init_sram(0, AT91SAM9261_SRAM_BASE, AT91SAM9261_SRAM_SIZE);
-}
-
 static void __init at91sam9261_initialize(void)
 {
        arm_pm_idle = at91sam9_idle;
-
-       at91_sysirq_mask_rtt(AT91SAM9261_BASE_RTT);
 }
 
 AT91_SOC_START(at91sam9261)
-       .map_io = at91sam9261_map_io,
        .init = at91sam9261_initialize,
 AT91_SOC_END
index e7ad148640837d45a9038e58cf7610e3cf35e2a6..1fe672a055139ac757d605177178cd4551a52145 100644 (file)
  *  AT91SAM9263 processor initialization
  * -------------------------------------------------------------------- */
 
-static void __init at91sam9263_map_io(void)
-{
-       at91_init_sram(0, AT91SAM9263_SRAM0_BASE, AT91SAM9263_SRAM0_SIZE);
-       at91_init_sram(1, AT91SAM9263_SRAM1_BASE, AT91SAM9263_SRAM1_SIZE);
-}
-
 static void __init at91sam9263_initialize(void)
 {
        arm_pm_idle = at91sam9_idle;
-
-       at91_sysirq_mask_rtt(AT91SAM9263_BASE_RTT0);
-       at91_sysirq_mask_rtt(AT91SAM9263_BASE_RTT1);
 }
 
 AT91_SOC_START(at91sam9263)
-       .map_io = at91sam9263_map_io,
        .init = at91sam9263_initialize,
 AT91_SOC_END
index b6117bea9a6f2a4333028bff3000080b39380645..d0493df40a13b64654410a03587ef32d1215e85a 100644 (file)
@@ -11,7 +11,6 @@
  */
 
 #include <asm/system_misc.h>
-#include <asm/irq.h>
 #include <mach/hardware.h>
 
 #include "soc.h"
 /* --------------------------------------------------------------------
  *  AT91SAM9G45 processor initialization
  * -------------------------------------------------------------------- */
-
-static void __init at91sam9g45_map_io(void)
-{
-       at91_init_sram(0, AT91SAM9G45_SRAM_BASE, AT91SAM9G45_SRAM_SIZE);
-}
-
 static void __init at91sam9g45_initialize(void)
 {
        arm_pm_idle = at91sam9_idle;
-
-       at91_sysirq_mask_rtc(AT91SAM9G45_BASE_RTC);
-       at91_sysirq_mask_rtt(AT91SAM9G45_BASE_RTT);
 }
 
 AT91_SOC_START(at91sam9g45)
-       .map_io = at91sam9g45_map_io,
        .init = at91sam9g45_initialize,
 AT91_SOC_END
index dee569b1987ee7c8f5dee1f08fa4e1d99a8927cb..b5ea69a3eaf6c2ce2555f325fa35dfed584bbe3e 100644 (file)
  *  AT91SAM9N12 processor initialization
  * -------------------------------------------------------------------- */
 
-static void __init at91sam9n12_map_io(void)
-{
-       at91_init_sram(0, AT91SAM9N12_SRAM_BASE, AT91SAM9N12_SRAM_SIZE);
-}
-
-static void __init at91sam9n12_initialize(void)
-{
-       at91_sysirq_mask_rtc(AT91SAM9N12_BASE_RTC);
-}
-
 AT91_SOC_START(at91sam9n12)
-       .map_io = at91sam9n12_map_io,
-       .init = at91sam9n12_initialize,
 AT91_SOC_END
index f25b9aec9c50fd6c297876f3b755816ef9342c4e..33acae30bb0bdbafeba960299c31769cbdf55737 100644 (file)
@@ -10,7 +10,6 @@
  */
 
 #include <asm/system_misc.h>
-#include <asm/irq.h>
 #include <mach/cpu.h>
 #include <mach/at91_dbgu.h>
 #include <mach/hardware.h>
  *  AT91SAM9RL processor initialization
  * -------------------------------------------------------------------- */
 
-static void __init at91sam9rl_map_io(void)
-{
-       unsigned long sram_size;
-
-       switch (at91_soc_initdata.cidr & AT91_CIDR_SRAMSIZ) {
-               case AT91_CIDR_SRAMSIZ_32K:
-                       sram_size = 2 * SZ_16K;
-                       break;
-               case AT91_CIDR_SRAMSIZ_16K:
-               default:
-                       sram_size = SZ_16K;
-       }
-
-       /* Map SRAM */
-       at91_init_sram(0, AT91SAM9RL_SRAM_BASE, sram_size);
-}
-
 static void __init at91sam9rl_initialize(void)
 {
        arm_pm_idle = at91sam9_idle;
-
-       at91_sysirq_mask_rtc(AT91SAM9RL_BASE_RTC);
-       at91_sysirq_mask_rtt(AT91SAM9RL_BASE_RTT);
 }
 
 AT91_SOC_START(at91sam9rl)
-       .map_io = at91sam9rl_map_io,
        .init = at91sam9rl_initialize,
 AT91_SOC_END
index f0d5a69a7237d66b5936906bb7196546d0a1b48e..7b60a529db0180109ea5fd3a22e9e9ca7edff665 100644 (file)
  *  AT91SAM9x5 processor initialization
  * -------------------------------------------------------------------- */
 
-static void __init at91sam9x5_map_io(void)
-{
-       at91_init_sram(0, AT91SAM9X5_SRAM_BASE, AT91SAM9X5_SRAM_SIZE);
-}
-
-static void __init at91sam9x5_initialize(void)
-{
-       at91_sysirq_mask_rtc(AT91SAM9X5_BASE_RTC);
-}
-
-/* --------------------------------------------------------------------
- *  Interrupt initialization
- * -------------------------------------------------------------------- */
-
 AT91_SOC_START(at91sam9x5)
-       .map_io = at91sam9x5_map_io,
-       .init = at91sam9x5_initialize,
 AT91_SOC_END
index 76dfe8f9af5042f8a6375cd3d49a8062214310e7..5f82a65153e197c80a1072da2dc92b6d8de9ae47 100644 (file)
@@ -14,6 +14,7 @@
 #include <linux/gpio.h>
 #include <linux/of.h>
 #include <linux/of_irq.h>
+#include <linux/of_platform.h>
 #include <linux/clk-provider.h>
 
 #include <asm/setup.h>
@@ -30,6 +31,15 @@ static void __init at91rm9200_dt_timer_init(void)
        at91rm9200_timer_init();
 }
 
+static void __init rm9200_dt_device_init(void)
+{
+       at91_rm9200_pm_init();
+
+       of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
+
+
 static const char *at91rm9200_dt_board_compat[] __initdata = {
        "atmel,at91rm9200",
        NULL
@@ -38,6 +48,7 @@ static const char *at91rm9200_dt_board_compat[] __initdata = {
 DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)")
        .init_time      = at91rm9200_dt_timer_init,
        .map_io         = at91_map_io,
-       .init_early     = at91rm9200_dt_initialize,
+       .init_early     = at91_dt_initialize,
+       .init_machine   = rm9200_dt_device_init,
        .dt_compat      = at91rm9200_dt_board_compat,
 MACHINE_END
index f99246aa9b38c60c6fc3aed9ead01dbee1d6c996..0fe1ced608c58257a29301dac9152cca88c83c3a 100644 (file)
@@ -13,6 +13,7 @@
 #include <linux/gpio.h>
 #include <linux/of.h>
 #include <linux/of_irq.h>
+#include <linux/of_platform.h>
 #include <linux/clk-provider.h>
 
 #include <asm/setup.h>
 
 #include "generic.h"
 
+static void __init sam9_dt_device_init(void)
+{
+       at91_sam9260_pm_init();
+       of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
 static const char *at91_dt_board_compat[] __initdata = {
        "atmel,at91sam9",
        NULL
@@ -32,5 +39,25 @@ DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM (Device Tree)")
        /* Maintainer: Atmel */
        .map_io         = at91_map_io,
        .init_early     = at91_dt_initialize,
+       .init_machine   = sam9_dt_device_init,
        .dt_compat      = at91_dt_board_compat,
 MACHINE_END
+
+static void __init sam9g45_dt_device_init(void)
+{
+       at91_sam9g45_pm_init();
+       of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
+static const char *at91_9g45_board_compat[] __initconst = {
+       "atmel,at91sam9g45",
+       NULL
+};
+
+DT_MACHINE_START(at91sam9g45_dt, "Atmel AT91SAM9G45")
+       /* Maintainer: Atmel */
+       .map_io         = at91_map_io,
+       .init_early     = at91_dt_initialize,
+       .init_machine   = sam9g45_dt_device_init,
+       .dt_compat      = at91_9g45_board_compat,
+MACHINE_END
index 8fb9ef5333f17648d8a28aaa0385badc9c0ed65a..44d372a22a29d29ba0dbb0cafda7270545c4feca 100644 (file)
@@ -28,6 +28,7 @@
 
 static void __init sama5_dt_device_init(void)
 {
+       at91_sam9260_pm_init();
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
index d53324210adf62310d15a191380eed7b3e2e6e9e..44fc725edcf1668e3c5a03cade7507363da3212a 100644 (file)
  /* Map io */
 extern void __init at91_map_io(void);
 extern void __init at91_alt_map_io(void);
-extern void __init at91_init_sram(int bank, unsigned long base,
-                                 unsigned int length);
 
  /* Processors */
-extern void __init at91rm9200_set_type(int type);
-extern void __init at91rm9200_dt_initialize(void);
 extern void __init at91_dt_initialize(void);
 
- /* Interrupts */
-extern void __init at91_sysirq_mask_rtc(u32 rtc_base);
-extern void __init at91_sysirq_mask_rtt(u32 rtt_base);
-
  /* Timer */
 extern void at91rm9200_timer_init(void);
 
 /* idle */
+extern void at91rm9200_idle(void);
 extern void at91sam9_idle(void);
 
 /* Matrix */
 extern void at91_ioremap_matrix(u32 base_addr);
+
+
+#ifdef CONFIG_PM
+extern void __init at91_rm9200_pm_init(void);
+extern void __init at91_sam9260_pm_init(void);
+extern void __init at91_sam9g45_pm_init(void);
+#else
+void __init at91_rm9200_pm_init(void) { }
+void __init at91_sam9260_pm_init(void) { }
+void __init at91_sam9g45_pm_init(void) { }
+#endif
+
 #endif /* _AT91_GENERIC_H */
diff --git a/arch/arm/mach-at91/include/mach/at91_pio.h b/arch/arm/mach-at91/include/mach/at91_pio.h
deleted file mode 100644 (file)
index 7b73662..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * arch/arm/mach-at91/include/mach/at91_pio.h
- *
- * Copyright (C) 2005 Ivan Kokshaysky
- * Copyright (C) SAN People
- *
- * Parallel I/O Controller (PIO) - System peripherals registers.
- * Based on AT91RM9200 datasheet revision E.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#ifndef AT91_PIO_H
-#define AT91_PIO_H
-
-#define PIO_PER                0x00    /* Enable Register */
-#define PIO_PDR                0x04    /* Disable Register */
-#define PIO_PSR                0x08    /* Status Register */
-#define PIO_OER                0x10    /* Output Enable Register */
-#define PIO_ODR                0x14    /* Output Disable Register */
-#define PIO_OSR                0x18    /* Output Status Register */
-#define PIO_IFER       0x20    /* Glitch Input Filter Enable */
-#define PIO_IFDR       0x24    /* Glitch Input Filter Disable */
-#define PIO_IFSR       0x28    /* Glitch Input Filter Status */
-#define PIO_SODR       0x30    /* Set Output Data Register */
-#define PIO_CODR       0x34    /* Clear Output Data Register */
-#define PIO_ODSR       0x38    /* Output Data Status Register */
-#define PIO_PDSR       0x3c    /* Pin Data Status Register */
-#define PIO_IER                0x40    /* Interrupt Enable Register */
-#define PIO_IDR                0x44    /* Interrupt Disable Register */
-#define PIO_IMR                0x48    /* Interrupt Mask Register */
-#define PIO_ISR                0x4c    /* Interrupt Status Register */
-#define PIO_MDER       0x50    /* Multi-driver Enable Register */
-#define PIO_MDDR       0x54    /* Multi-driver Disable Register */
-#define PIO_MDSR       0x58    /* Multi-driver Status Register */
-#define PIO_PUDR       0x60    /* Pull-up Disable Register */
-#define PIO_PUER       0x64    /* Pull-up Enable Register */
-#define PIO_PUSR       0x68    /* Pull-up Status Register */
-#define PIO_ASR                0x70    /* Peripheral A Select Register */
-#define PIO_ABCDSR1    0x70    /* Peripheral ABCD Select Register 1 [some sam9 only] */
-#define PIO_BSR                0x74    /* Peripheral B Select Register */
-#define PIO_ABCDSR2    0x74    /* Peripheral ABCD Select Register 2 [some sam9 only] */
-#define PIO_ABSR       0x78    /* AB Status Register */
-#define PIO_IFSCDR     0x80    /* Input Filter Slow Clock Disable Register */
-#define PIO_IFSCER     0x84    /* Input Filter Slow Clock Enable Register */
-#define PIO_IFSCSR     0x88    /* Input Filter Slow Clock Status Register */
-#define PIO_SCDR       0x8c    /* Slow Clock Divider Debouncing Register */
-#define                PIO_SCDR_DIV    (0x3fff <<  0)          /* Slow Clock Divider Mask */
-#define PIO_PPDDR      0x90    /* Pad Pull-down Disable Register */
-#define PIO_PPDER      0x94    /* Pad Pull-down Enable Register */
-#define PIO_PPDSR      0x98    /* Pad Pull-down Status Register */
-#define PIO_OWER       0xa0    /* Output Write Enable Register */
-#define PIO_OWDR       0xa4    /* Output Write Disable Register */
-#define PIO_OWSR       0xa8    /* Output Write Status Register */
-#define PIO_AIMER      0xb0    /* Additional Interrupt Modes Enable Register */
-#define PIO_AIMDR      0xb4    /* Additional Interrupt Modes Disable Register */
-#define PIO_AIMMR      0xb8    /* Additional Interrupt Modes Mask Register */
-#define PIO_ESR                0xc0    /* Edge Select Register */
-#define PIO_LSR                0xc4    /* Level Select Register */
-#define PIO_ELSR       0xc8    /* Edge/Level Status Register */
-#define PIO_FELLSR     0xd0    /* Falling Edge/Low Level Select Register */
-#define PIO_REHLSR     0xd4    /* Rising Edge/ High Level Select Register */
-#define PIO_FRLHSR     0xd8    /* Fall/Rise - Low/High Status Register */
-#define PIO_SCHMITT    0x100   /* Schmitt Trigger Register */
-
-#define ABCDSR_PERIPH_A        0x0
-#define ABCDSR_PERIPH_B        0x1
-#define ABCDSR_PERIPH_C        0x2
-#define ABCDSR_PERIPH_D        0x3
-
-#define SAMA5D3_PIO_DRIVER1            0x118  /*PIO Driver 1 register offset*/
-#define SAMA5D3_PIO_DRIVER2            0x11C  /*PIO Driver 2 register offset*/
-
-#define AT91SAM9X5_PIO_DRIVER1 0x114  /*PIO Driver 1 register offset*/
-#define AT91SAM9X5_PIO_DRIVER2 0x118  /*PIO Driver 2 register offset*/
-
-#endif
diff --git a/arch/arm/mach-at91/include/mach/at91_rtt.h b/arch/arm/mach-at91/include/mach/at91_rtt.h
deleted file mode 100644 (file)
index 7ec75de..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * arch/arm/mach-at91/include/mach/at91_rtt.h
- *
- * Copyright (C) 2007 Andrew Victor
- * Copyright (C) 2007 Atmel Corporation.
- *
- * Real-time Timer (RTT) - System peripherals regsters.
- * Based on AT91SAM9261 datasheet revision D.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#ifndef AT91_RTT_H
-#define AT91_RTT_H
-
-#define AT91_RTT_MR            0x00                    /* Real-time Mode Register */
-#define                AT91_RTT_RTPRES         (0xffff << 0)           /* Real-time Timer Prescaler Value */
-#define                AT91_RTT_ALMIEN         (1 << 16)               /* Alarm Interrupt Enable */
-#define                AT91_RTT_RTTINCIEN      (1 << 17)               /* Real Time Timer Increment Interrupt Enable */
-#define                AT91_RTT_RTTRST         (1 << 18)               /* Real Time Timer Restart */
-
-#define AT91_RTT_AR            0x04                    /* Real-time Alarm Register */
-#define                AT91_RTT_ALMV           (0xffffffff)            /* Alarm Value */
-
-#define AT91_RTT_VR            0x08                    /* Real-time Value Register */
-#define                AT91_RTT_CRTV           (0xffffffff)            /* Current Real-time Value */
-
-#define AT91_RTT_SR            0x0c                    /* Real-time Status Register */
-#define                AT91_RTT_ALMS           (1 << 0)                /* Real-time Alarm Status */
-#define                AT91_RTT_RTTINC         (1 << 1)                /* Real-time Timer Increment */
-
-#endif
diff --git a/arch/arm/mach-at91/include/mach/debug-macro.S b/arch/arm/mach-at91/include/mach/debug-macro.S
deleted file mode 100644 (file)
index 2103a90..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * arch/arm/mach-at91/include/mach/debug-macro.S
- *
- *  Copyright (C) 2003-2005 SAN People
- *
- * Debugging macro include header
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
-
-#include <mach/hardware.h>
-#include <mach/at91_dbgu.h>
-
-#if defined(CONFIG_AT91_DEBUG_LL_DBGU0)
-#define AT91_DBGU AT91_BASE_DBGU0
-#elif defined(CONFIG_AT91_DEBUG_LL_DBGU1)
-#define AT91_DBGU AT91_BASE_DBGU1
-#else
-/* On sama5d4, use USART3 as low level serial console */
-#define AT91_DBGU SAMA5D4_BASE_USART3
-#endif
-
-       .macro  addruart, rp, rv, tmp
-       ldr     \rp, =AT91_DBGU                         @ System peripherals (phys address)
-       ldr     \rv, =AT91_IO_P2V(AT91_DBGU)            @ System peripherals (virt address)
-       .endm
-
-       .macro  senduart,rd,rx
-       strb    \rd, [\rx, #(AT91_DBGU_THR)]            @ Write to Transmitter Holding Register
-       .endm
-
-       .macro  waituart,rd,rx
-1001:  ldr     \rd, [\rx, #(AT91_DBGU_SR)]             @ Read Status Register
-       tst     \rd, #AT91_DBGU_TXRDY                   @ DBGU_TXRDY = 1 when ready to transmit
-       beq     1001b
-       .endm
-
-       .macro  busyuart,rd,rx
-1001:  ldr     \rd, [\rx, #(AT91_DBGU_SR)]             @ Read Status Register
-       tst     \rd, #AT91_DBGU_TXEMPTY                 @ DBGU_TXEMPTY = 1 when transmission complete
-       beq     1001b
-       .endm
-
diff --git a/arch/arm/mach-at91/include/mach/memory.h b/arch/arm/mach-at91/include/mach/memory.h
deleted file mode 100644 (file)
index 401c207..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * arch/arm/mach-at91/include/mach/memory.h
- *
- *  Copyright (C) 2004 SAN People
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __ASM_ARCH_MEMORY_H
-#define __ASM_ARCH_MEMORY_H
-
-#include <mach/hardware.h>
-
-#endif
index 9b15169a1c624a182cc2431f9d9040c0034e978d..81f2f12d3cc1546d669d66c2451fca01ae4123b2 100644 (file)
 #include <linux/suspend.h>
 #include <linux/sched.h>
 #include <linux/proc_fs.h>
+#include <linux/genalloc.h>
 #include <linux/interrupt.h>
 #include <linux/sysfs.h>
 #include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/clk/at91_pmc.h>
 #include "generic.h"
 #include "pm.h"
 
+static struct {
+       unsigned long uhp_udp_mask;
+       int memctrl;
+} at91_pm_data;
+
 static void (*at91_pm_standby)(void);
 
 static int at91_pm_valid_state(suspend_state_t state)
@@ -71,17 +79,9 @@ static int at91_pm_verify_clocks(void)
        scsr = at91_pmc_read(AT91_PMC_SCSR);
 
        /* USB must not be using PLLB */
-       if (cpu_is_at91rm9200()) {
-               if ((scsr & (AT91RM9200_PMC_UHP | AT91RM9200_PMC_UDP)) != 0) {
-                       pr_err("AT91: PM - Suspend-to-RAM with USB still active\n");
-                       return 0;
-               }
-       } else if (cpu_is_at91sam9260() || cpu_is_at91sam9261() || cpu_is_at91sam9263()
-                       || cpu_is_at91sam9g20() || cpu_is_at91sam9g10()) {
-               if ((scsr & (AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP)) != 0) {
-                       pr_err("AT91: PM - Suspend-to-RAM with USB still active\n");
-                       return 0;
-               }
+       if ((scsr & at91_pm_data.uhp_udp_mask) != 0) {
+               pr_err("AT91: PM - Suspend-to-RAM with USB still active\n");
+               return 0;
        }
 
        /* PCK0..PCK3 must be disabled, or configured to use clk32k */
@@ -149,18 +149,13 @@ static int at91_pm_enter(suspend_state_t state)
                         * turning off the main oscillator; reverse on wakeup.
                         */
                        if (slow_clock) {
-                               int memctrl = AT91_MEMCTRL_SDRAMC;
-
-                               if (cpu_is_at91rm9200())
-                                       memctrl = AT91_MEMCTRL_MC;
-                               else if (cpu_is_at91sam9g45())
-                                       memctrl = AT91_MEMCTRL_DDRSDR;
 #ifdef CONFIG_AT91_SLOW_CLOCK
                                /* copy slow_clock handler to SRAM, and call it */
                                memcpy(slow_clock, at91_slow_clock, at91_slow_clock_sz);
 #endif
                                slow_clock(at91_pmc_base, at91_ramc_base[0],
-                                          at91_ramc_base[1], memctrl);
+                                          at91_ramc_base[1],
+                                          at91_pm_data.memctrl);
                                break;
                        } else {
                                pr_info("AT91: PM - no slow clock mode enabled ...\n");
@@ -229,23 +224,85 @@ void at91_pm_set_standby(void (*at91_standby)(void))
        }
 }
 
-static int __init at91_pm_init(void)
+#ifdef CONFIG_AT91_SLOW_CLOCK
+static void __init at91_pm_sram_init(void)
+{
+       struct gen_pool *sram_pool;
+       phys_addr_t sram_pbase;
+       unsigned long sram_base;
+       struct device_node *node;
+       struct platform_device *pdev;
+
+       node = of_find_compatible_node(NULL, NULL, "mmio-sram");
+       if (!node) {
+               pr_warn("%s: failed to find sram node!\n", __func__);
+               return;
+       }
+
+       pdev = of_find_device_by_node(node);
+       if (!pdev) {
+               pr_warn("%s: failed to find sram device!\n", __func__);
+               goto put_node;
+       }
+
+       sram_pool = dev_get_gen_pool(&pdev->dev);
+       if (!sram_pool) {
+               pr_warn("%s: sram pool unavailable!\n", __func__);
+               goto put_node;
+       }
+
+       sram_base = gen_pool_alloc(sram_pool, at91_slow_clock_sz);
+       if (!sram_base) {
+               pr_warn("%s: unable to alloc ocram!\n", __func__);
+               goto put_node;
+       }
+
+       sram_pbase = gen_pool_virt_to_phys(sram_pool, sram_base);
+       slow_clock = __arm_ioremap_exec(sram_pbase, at91_slow_clock_sz, false);
+
+put_node:
+       of_node_put(node);
+}
+#endif
+
+
+static void __init at91_pm_init(void)
 {
 #ifdef CONFIG_AT91_SLOW_CLOCK
-       slow_clock = (void *) (AT91_IO_VIRT_BASE - at91_slow_clock_sz);
+       at91_pm_sram_init();
 #endif
 
        pr_info("AT91: Power Management%s\n", (slow_clock ? " (with slow clock mode)" : ""));
 
-       /* AT91RM9200 SDRAM low-power mode cannot be used with self-refresh. */
-       if (cpu_is_at91rm9200())
-               at91_ramc_write(0, AT91RM9200_SDRAMC_LPR, 0);
-       
        if (at91_cpuidle_device.dev.platform_data)
                platform_device_register(&at91_cpuidle_device);
 
        suspend_set_ops(&at91_pm_ops);
+}
 
-       return 0;
+void __init at91_rm9200_pm_init(void)
+{
+       /*
+        * AT91RM9200 SDRAM low-power mode cannot be used with self-refresh.
+        */
+       at91_ramc_write(0, AT91RM9200_SDRAMC_LPR, 0);
+
+       at91_pm_data.uhp_udp_mask = AT91RM9200_PMC_UHP | AT91RM9200_PMC_UDP;
+       at91_pm_data.memctrl = AT91_MEMCTRL_MC;
+
+       at91_pm_init();
+}
+
+void __init at91_sam9260_pm_init(void)
+{
+       at91_pm_data.memctrl = AT91_MEMCTRL_SDRAMC;
+       at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP;
+       return at91_pm_init();
+}
+
+void __init at91_sam9g45_pm_init(void)
+{
+       at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP;
+       at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR;
+       return at91_pm_init();
 }
-arch_initcall(at91_pm_init);
index 3d775d08de08def15011e449bca421fe19dc0f95..b7c64ca7107f74b701e15aa641e6676f1b6a2354 100644 (file)
  *  AT91SAM9x5 processor initialization
  * -------------------------------------------------------------------- */
 
-static void __init sama5d3_map_io(void)
-{
-       at91_init_sram(0, SAMA5D3_SRAM_BASE, SAMA5D3_SRAM_SIZE);
-}
-
-static void __init sama5d3_initialize(void)
-{
-       at91_sysirq_mask_rtc(SAMA5D3_BASE_RTC);
-}
-
 AT91_SOC_START(sama5d3)
-       .map_io = sama5d3_map_io,
-       .init = sama5d3_initialize,
 AT91_SOC_END
index 7638509639f4b4da2f0337f8cf62af216496fe56..fa127fb792215c8296ed4986c0583f35880f4c63 100644 (file)
@@ -56,7 +56,6 @@ static struct map_desc at91_io_desc[] __initdata = {
 static void __init sama5d4_map_io(void)
 {
        iotable_init(at91_io_desc, ARRAY_SIZE(at91_io_desc));
-       at91_init_sram(0, SAMA5D4_NS_SRAM_BASE, SAMA5D4_NS_SRAM_SIZE);
 }
 
 AT91_SOC_START(sama5d4)
index ce25e85720fb695eedef9650d097693e1a714dde..4c184285d38f4b181722b3db496a6ba2e4bd471a 100644 (file)
@@ -31,40 +31,9 @@ struct at91_init_soc __initdata at91_boot_soc;
 struct at91_socinfo at91_soc_initdata;
 EXPORT_SYMBOL(at91_soc_initdata);
 
-void __init at91rm9200_set_type(int type)
-{
-       if (type == ARCH_REVISON_9200_PQFP)
-               at91_soc_initdata.subtype = AT91_SOC_RM9200_PQFP;
-       else
-               at91_soc_initdata.subtype = AT91_SOC_RM9200_BGA;
-
-       pr_info("filled in soc subtype: %s\n",
-               at91_get_soc_subtype(&at91_soc_initdata));
-}
-
 void __iomem *at91_ramc_base[2];
 EXPORT_SYMBOL_GPL(at91_ramc_base);
 
-static struct map_desc sram_desc[2] __initdata;
-
-void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
-{
-       struct map_desc *desc = &sram_desc[bank];
-
-       desc->virtual = (unsigned long)AT91_IO_VIRT_BASE - length;
-       if (bank > 0)
-               desc->virtual -= sram_desc[bank - 1].length;
-
-       desc->pfn = __phys_to_pfn(base);
-       desc->length = length;
-       desc->type = MT_MEMORY_RWX_NONCACHED;
-
-       pr_info("sram at 0x%lx of 0x%x mapped at 0x%lx\n",
-               base, length, desc->virtual);
-
-       iotable_init(desc, 1);
-}
-
 static struct map_desc at91_io_desc __initdata __maybe_unused = {
        .virtual        = (unsigned long)AT91_VA_BASE_SYS,
        .pfn            = __phys_to_pfn(AT91_BASE_SYS),
@@ -429,13 +398,6 @@ static void at91_dt_ramc(void)
        at91_pm_set_standby(standby);
 }
 
-void __init at91rm9200_dt_initialize(void)
-{
-       at91_dt_ramc();
-
-       at91_boot_soc.init();
-}
-
 void __init at91_dt_initialize(void)
 {
        at91_dt_ramc();
diff --git a/arch/arm/mach-at91/sysirq_mask.c b/arch/arm/mach-at91/sysirq_mask.c
deleted file mode 100644 (file)
index f8bc351..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * sysirq_mask.c - System-interrupt masking
- *
- * Copyright (C) 2013 Johan Hovold <jhovold@gmail.com>
- *
- * Functions to disable system interrupts from backup-powered peripherals.
- *
- * The RTC and RTT-peripherals are generally powered by backup power (VDDBU)
- * and are not reset on wake-up, user, watchdog or software reset. This means
- * that their interrupts may be enabled during early boot (e.g. after a user
- * reset).
- *
- * As the RTC and RTT share the system-interrupt line with the PIT, an
- * interrupt occurring before a handler has been installed would lead to the
- * system interrupt being disabled and prevent the system from booting.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <linux/io.h>
-#include <mach/at91_rtt.h>
-
-#include "generic.h"
-
-#define AT91_RTC_IDR           0x24    /* Interrupt Disable Register */
-#define AT91_RTC_IMR           0x28    /* Interrupt Mask Register */
-#define AT91_RTC_IRQ_MASK      0x1f    /* Available IRQs mask */
-
-void __init at91_sysirq_mask_rtc(u32 rtc_base)
-{
-       void __iomem *base;
-
-       base = ioremap(rtc_base, 64);
-       if (!base)
-               return;
-
-       /*
-        * sam9x5 SoCs have the following errata:
-        * "RTC: Interrupt Mask Register cannot be used
-        *  Interrupt Mask Register read always returns 0."
-        *
-        * Hence we're not relying on IMR values to disable
-        * interrupts.
-        */
-       writel_relaxed(AT91_RTC_IRQ_MASK, base + AT91_RTC_IDR);
-       (void)readl_relaxed(base + AT91_RTC_IMR);       /* flush */
-
-       iounmap(base);
-}
-
-void __init at91_sysirq_mask_rtt(u32 rtt_base)
-{
-       void __iomem *base;
-       void __iomem *reg;
-       u32 mode;
-
-       base = ioremap(rtt_base, 16);
-       if (!base)
-               return;
-
-       reg = base + AT91_RTT_MR;
-
-       mode = readl_relaxed(reg);
-       if (mode & (AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN)) {
-               pr_info("AT91: Disabling rtt irq\n");
-               mode &= ~(AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN);
-               writel_relaxed(mode, reg);
-               (void)readl_relaxed(reg);                       /* flush */
-       }
-
-       iounmap(base);
-}
index 386999b4f8eb2d20b3af4195a6beac8c7221efe3..f07c8152e5cc42aa660f5c83c6c6470ee2e68502 100644 (file)
 void __iomem *at91_pmc_base;
 EXPORT_SYMBOL_GPL(at91_pmc_base);
 
+void at91rm9200_idle(void)
+{
+       /*
+        * Disable the processor clock.  The processor will be automatically
+        * re-enabled by an interrupt or by a reset.
+        */
+       at91_pmc_write(AT91_PMC_SCDR, AT91_PMC_PCK);
+}
+
 void at91sam9_idle(void)
 {
        at91_pmc_write(AT91_PMC_SCDR, AT91_PMC_PCK);
index f15cddfeb8971d4d466ace178fec6bc61eb9a086..f211dfb7b91368ffc2a2d9897e56c38c2a6d48a7 100644 (file)
@@ -1141,34 +1141,6 @@ config RTC_DRV_AT91SAM9
          probably want to use the real RTC block instead of the "RTT as an
          RTC" driver.
 
-config RTC_DRV_AT91SAM9_RTT
-       int
-       range 0 1
-       default 0
-       depends on RTC_DRV_AT91SAM9
-       help
-         This option is only relevant for legacy board support and
-         won't be used when booting a DT board.
-
-         More than one RTT module is available. You can choose which
-         one will be used as an RTC. The default of zero is normally
-         OK to use, though some systems use that for non-RTC purposes.
-
-config RTC_DRV_AT91SAM9_GPBR
-       int
-       range 0 3
-       default 0
-       prompt "Backup Register Number"
-       depends on RTC_DRV_AT91SAM9
-       help
-         This option is only relevant for legacy board support and
-         won't be used when booting a DT board.
-
-         The RTC driver needs to use one of the General Purpose Backup
-         Registers (GPBRs) as well as the RTT. You can choose which one
-         will be used. The default of zero is normally OK to use, but
-         on some systems other software needs to use that register.
-
 config RTC_DRV_AU1XXX
        tristate "Au1xxx Counter0 RTC support"
        depends on MIPS_ALCHEMY