1 files changed, 96 insertions, 29 deletions

diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
index a281d259b9b8..8f74a649576d 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -3,17 +3,57 @@
  *
  * Oliver Schinagl <oliver@schinagl.nl>
  *
- * 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 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.
+ *
+ *     You should have received a copy of the GNU General Public
+ *     License along with this file; 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.
  */
 
 /dts-v1/;
-/include/ "sun7i-a20.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun7i-a20.dtsi"
+#include "sunxi-common-regulators.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
         model = "Cubietech Cubietruck";
@@ -25,7 +65,7 @@
                         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
                         vmmc-supply = <&reg_vcc3v3>;
                         bus-width = <4>;
-                        cd-gpios = <&pio 7 1 0>; /* PH1 */
+                        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
                         cd-inverted;
                         status = "okay";
                 };
@@ -70,35 +110,35 @@
                 pinctrl@01c20800 {
                         mmc3_pins_a: mmc3@0 {
                                 /* AP6210 requires pull-up */
-                                allwinner,pull = <1>;
+                                allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
                         };
 
                         vmmc3_pin_cubietruck: vmmc3_pin@0 {
                                 allwinner,pins = "PH9";
                                 allwinner,function = "gpio_out";
-                                allwinner,drive = <0>;
-                                allwinner,pull = <0>;
+                                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+                                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                         };
 
                         ahci_pwr_pin_cubietruck: ahci_pwr_pin@1 {
                                 allwinner,pins = "PH12";
                                 allwinner,function = "gpio_out";
-                                allwinner,drive = <0>;
-                                allwinner,pull = <0>;
+                                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+                                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                         };
 
                         led_pins_cubietruck: led_pins@0 {
                                 allwinner,pins = "PH7", "PH11", "PH20", "PH21";
                                 allwinner,function = "gpio_out";
-                                allwinner,drive = <0>;
-                                allwinner,pull = <0>;
+                                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+                                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                         };
 
                         usb0_vbus_pin_a: usb0_vbus_pin@0 {
                                 allwinner,pins = "PH17";
                                 allwinner,function = "gpio_out";
-                                allwinner,drive = <0>;
-                                allwinner,pull = <0>;
+                                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+                                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                         };
                 };
 
@@ -126,13 +166,9 @@
                         status = "okay";
 
                         axp209: pmic@34 {
-                                compatible = "x-powers,axp209";
                                 reg = <0x34>;
                                 interrupt-parent = <&nmi_intc>;
-                                interrupts = <0 8>;
-
-                                interrupt-controller;
-                                #interrupt-cells = <1>;
+                                interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
                         };
                 };
 
@@ -168,34 +204,34 @@
 
                 blue {
                         label = "cubietruck:blue:usr";
-                        gpios = <&pio 7 21 0>;
+                        gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>;
                 };
 
                 orange {
                         label = "cubietruck:orange:usr";
-                        gpios = <&pio 7 20 0>;
+                        gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>;
                 };
 
                 white {
                         label = "cubietruck:white:usr";
-                        gpios = <&pio 7 11 0>;
+                        gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>;
                 };
 
                 green {
                         label = "cubietruck:green:usr";
-                        gpios = <&pio 7 7 0>;
+                        gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>;
                 };
         };
 
         reg_ahci_5v: ahci-5v {
                 pinctrl-0 = <&ahci_pwr_pin_cubietruck>;
-                gpio = <&pio 7 12 0>;
+                gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>;
                 status = "okay";
         };
 
         reg_usb0_vbus: usb0-vbus {
                 pinctrl-0 = <&usb0_vbus_pin_a>;
-                gpio = <&pio 7 17 0>;
+                gpio = <&pio 7 17 GPIO_ACTIVE_HIGH>;
                 status = "okay";
         };
 
@@ -215,6 +251,37 @@
                 regulator-min-microvolt = <3300000>;
                 regulator-max-microvolt = <3300000>;
                 enable-active-high;
-                gpio = <&pio 7 9 0>;
+                gpio = <&pio 7 9 GPIO_ACTIVE_HIGH>;
         };
 };
+
+#include "axp209.dtsi"
+
+&cpu0 {
+        cpu-supply = <&reg_dcdc2>;
+};
+
+&reg_dcdc2 {
+        regulator-always-on;
+        regulator-min-microvolt = <1000000>;
+        regulator-max-microvolt = <1450000>;
+        regulator-name = "vdd-cpu";
+};
+
+&reg_dcdc3 {
+        regulator-always-on;
+        regulator-min-microvolt = <1000000>;
+        regulator-max-microvolt = <1400000>;
+        regulator-name = "vdd-int-dll";
+};
+
+&reg_ldo1 {
+        regulator-name = "vdd-rtc";
+};
+
+&reg_ldo2 {
+        regulator-always-on;
+        regulator-min-microvolt = <3000000>;
+        regulator-max-microvolt = <3000000>;
+        regulator-name = "avcc";
+};