sunxi: move cubietruck dts into patches [3.14]

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43183 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/sunxi/files/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/target/linux/sunxi/files/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
deleted file mode 100644 (file)
index 8b14779..0000000
--- a/target/linux/sunxi/files/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2013 Oliver Schinagl
- *
- * 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:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-/dts-v1/;
-/include/ "sun7i-a20.dtsi"
-
-/ {
-       model = "Cubietech Cubietruck";
-       compatible = "cubietech,cubietruck", "allwinner,sun7i-a20";
-
-       soc@01c00000 {
-               pinctrl@01c20800 {
-                       led_pins_cubietruck: led_pins@0 {
-                               allwinner,pins = "PH7", "PH11", "PH20", "PH21";
-                               allwinner,function = "gpio_out";
-                               allwinner,drive = <0>;
-                               allwinner,pull = <0>;
-                       };
-
-                       usb1_vbus_pin: usb1_vbus_pin@0 {
-                                       allwinner,pins = "PH6";
-                                       allwinner,function = "gpio_out";
-                                       allwinner,drive = <0>;
-                                       allwinner,pull = <2>;
-                       };
-
-                       usb2_vbus_pin: usb2_vbus_pin@0 {
-                                       allwinner,pins = "PH3";
-                                       allwinner,function = "gpio_out";
-                                       allwinner,drive = <0>;
-                                       allwinner,pull = <2>;
-                       };
-               };
-
-               uart0: serial@01c28000 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&uart0_pins_a>;
-                       status = "okay";
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-               pinctrl-names = "default";
-               pinctrl-0 = <&led_pins_cubietruck>;
-
-               blue {
-                       label = "cubietruck:blue:usr";
-                       gpios = <&pio 7 21 0>;
-               };
-
-               orange {
-                       label = "cubietruck:orange:usr";
-                       gpios = <&pio 7 20 0>;
-               };
-
-               white {
-                       label = "cubietruck:white:usr";
-                       gpios = <&pio 7 11 0>;
-               };
-
-               green {
-                       label = "cubietruck:green:usr";
-                       gpios = <&pio 7 7 0>;
-               };
-       };
-};

diff --git a/target/linux/sunxi/patches-3.14/116-dt-sun7i-add-usb-to-cubietruck.patch b/target/linux/sunxi/patches-3.14/116-dt-sun7i-add-usb-to-cubietruck.patch
new file mode 100644 (file)
index 0000000..64af012
--- /dev/null
+++ b/target/linux/sunxi/patches-3.14/116-dt-sun7i-add-usb-to-cubietruck.patch
@@ -0,0 +1,24 @@
+diff -ruN old/arch/arm/boot/dts/sun7i-a20-cubietruck.dts new/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+--- old/arch/arm/boot/dts/sun7i-a20-cubietruck.dts     2014-09-06 01:34:59.000000000 +0200
++++ new/arch/arm/boot/dts/sun7i-a20-cubietruck.dts     2014-11-04 22:14:48.756886672 +0100
+@@ -26,6 +26,20 @@
+                               allwinner,drive = <0>;
+                               allwinner,pull = <0>;
+                       };
++
++                        usb1_vbus_pin: usb1_vbus_pin@0 {
++                                        allwinner,pins = "PH6";
++                                        allwinner,function = "gpio_out";
++                                        allwinner,drive = <0>;
++                                        allwinner,pull = <2>;
++                        };
++
++                        usb2_vbus_pin: usb2_vbus_pin@0 {
++                                        allwinner,pins = "PH3";
++                                        allwinner,function = "gpio_out";
++                                        allwinner,drive = <0>;
++                                        allwinner,pull = <2>;
++                        };
+               };
+ 
+               uart0: serial@01c28000 {