Merge branch 'CVE-2014-7975' of git://git.kernel.org/pub/scm/linux/kernel/git/luto...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / sun6i-a31.dtsi

diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index e06fbfc55bb7ee6dee85d601bd3b12fdcac269b6..543f895d18d3c870446f52085095221566ef83a3 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -3,12 +3,48 @@
  *
  * Maxime Ripard <maxime.ripard@free-electrons.com>
  *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * 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.
  *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ *  a) This library 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 library 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 library; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * 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/ "skeleton.dtsi"
@@ -657,7 +693,6 @@
                        reg = <0x01c2ac00 0x400>;
                        interrupts = <0 6 4>;
                        clocks = <&apb2_gates 0>;
-                       clock-frequency = <100000>;
                        resets = <&apb2_rst 0>;
                        status = "disabled";
                        #address-cells = <1>;
@@ -669,7 +704,6 @@
                        reg = <0x01c2b000 0x400>;
                        interrupts = <0 7 4>;
                        clocks = <&apb2_gates 1>;
-                       clock-frequency = <100000>;
                        resets = <&apb2_rst 1>;
                        status = "disabled";
                        #address-cells = <1>;
@@ -681,7 +715,6 @@
                        reg = <0x01c2b400 0x400>;
                        interrupts = <0 8 4>;
                        clocks = <&apb2_gates 2>;
-                       clock-frequency = <100000>;
                        resets = <&apb2_rst 2>;
                        status = "disabled";
                        #address-cells = <1>;
@@ -693,7 +726,6 @@
                        reg = <0x01c2b800 0x400>;
                        interrupts = <0 9 4>;
                        clocks = <&apb2_gates 3>;
-                       clock-frequency = <100000>;
                        resets = <&apb2_rst 3>;
                        status = "disabled";
                        #address-cells = <1>;
@@ -787,6 +819,12 @@
                        interrupts = <1 9 0xf04>;
                };
 
+               rtc: rtc@01f00000 {
+                       compatible = "allwinner,sun6i-a31-rtc";
+                       reg = <0x01f00000 0x54>;
+                       interrupts = <0 40 4>, <0 41 4>;
+               };
+
                nmi_intc: interrupt-controller@01f00c0c {
                        compatible = "allwinner,sun6i-a31-sc-nmi";
                        interrupt-controller;