diff options
| author | Zoltan Herpai <wigyori@uid0.hu> | 2014-11-04 23:14:11 +0000 |
|---|---|---|
| committer | Zoltan Herpai <wigyori@uid0.hu> | 2014-11-04 23:14:11 +0000 |
| commit | 135c8f4b1abd064c630ef52a4563bb636c7375ad (patch) | |
| tree | 9c0810395a3e01dbf73ad35416b96ef7b7f107fd /target/linux/sunxi | |
| parent | 1ac401f4312485dfb19fcbfde3198ba21b45ea00 (diff) | |
| download | upstream-135c8f4b1abd064c630ef52a4563bb636c7375ad.tar.gz upstream-135c8f4b1abd064c630ef52a4563bb636c7375ad.tar.bz2 upstream-135c8f4b1abd064c630ef52a4563bb636c7375ad.zip | |
sunxi: move cubietruck dts into patches [3.14]
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
SVN-Revision: 43183
Diffstat (limited to 'target/linux/sunxi')
| -rw-r--r-- | target/linux/sunxi/files/arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 77 | ||||
| -rw-r--r-- | target/linux/sunxi/patches-3.14/116-dt-sun7i-add-usb-to-cubietruck.patch | 24 |
2 files changed, 24 insertions, 77 deletions
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 index 8b1477926b..0000000000 --- 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 index 0000000000..64af012484 --- /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 { |