sunxi: add/refresh patches for cubieboard2

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
SVN-Revision: 39218

diff --git a/target/linux/sunxi/patches-3.12/133-dt-sun7i-cb2-enable-i2c.patch b/target/linux/sunxi/patches-3.12/133-dt-sun7i-cb2-enable-i2c.patch
new file mode 100644 (file)
index 0000000..606bd73
--- /dev/null
+++ b/target/linux/sunxi/patches-3.12/133-dt-sun7i-cb2-enable-i2c.patch
@@ -0,0 +1,39 @@
+From ce0106c5bbf689949c752b2a389ee82721c0e5d6 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Sat, 31 Aug 2013 23:12:58 +0200
+Subject: [PATCH] ARM: sun7i: cubieboard2: Enable the I2C controllers
+
+The Cubieboard2 uses both the i2c0 and i2c1 controllers. Enable them in
+the DT.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+index 15e625e..5c51cb8 100644
+--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+@@ -48,6 +48,18 @@
+                       pinctrl-0 = <&uart0_pins_a>;
+                       status = "okay";
+               };
++
++              i2c0: i2c@01c2ac00 {
++                      pinctrl-names = "default";
++                      pinctrl-0 = <&i2c0_pins_a>;
++                      status = "okay";
++              };
++
++              i2c1: i2c@01c2b000 {
++                      pinctrl-names = "default";
++                      pinctrl-0 = <&i2c1_pins_a>;
++                      status = "okay";
++              };
+       };
+ 
+       leds {
+-- 
+1.8.5.1
+

diff --git a/target/linux/sunxi/patches-3.12/162-1-dt-sun7i-add-ehci-for-a20-olinuxino.patch b/target/linux/sunxi/patches-3.12/162-1-dt-sun7i-add-ehci-for-a20-olinuxino.patch
new file mode 100644 (file)
index 0000000..40706d2
--- /dev/null
+++ b/target/linux/sunxi/patches-3.12/162-1-dt-sun7i-add-ehci-for-a20-olinuxino.patch
@@ -0,0 +1,84 @@
+From 630ccdf33652f8e35b8c84e939d5a86fad9612e2 Mon Sep 17 00:00:00 2001
+From: arokux <arokux@gmail.com>
+Date: Thu, 19 Sep 2013 21:50:21 +0200
+Subject: [PATCH] ARM: sun7i: dt: Add USB EHCI bindings for A20-Olinuxino
+
+---
+ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 49 +++++++++++++++++++++++++
+ 1 file changed, 49 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+index ead3013..e6b1e26 100644
+--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
++++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+@@ -41,6 +41,20 @@
+                               allwinner,drive = <1>;
+                               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 {
+@@ -76,6 +90,15 @@
+               i2c2: i2c@01c2b400 {
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&i2c2_pins_a>;
++              };
++
++              ehci0: ehci0@0x01c14000 {
++                      vbus-supply = <&reg_usb1_vbus>;
++                      status = "okay";
++              };
++
++              ehci1: ehci1@0x01c1c000 {
++                      vbus-supply = <&reg_usb2_vbus>;
+                       status = "okay";
+               };
+       };
+@@ -91,4 +114,30 @@
+                       default-state = "on";
+               };
+       };
++
++      regulators {
++              compatible = "simple-bus";
++
++              reg_usb1_vbus: usb1-vbus {
++                      compatible = "regulator-fixed";
++                      pinctrl-names = "default";
++                      pinctrl-0 = <&usb1_vbus_pin>;
++                      regulator-name = "usb1-vbus";
++                      regulator-min-microvolt = <3300000>;
++                      regulator-max-microvolt = <3300000>;
++                      enable-active-high;
++                      gpio = <&pio 7 6 0>;
++              };
++
++              reg_usb2_vbus: usb2-vbus {
++                      compatible = "regulator-fixed";
++                      pinctrl-names = "default";
++                      pinctrl-0 = <&usb2_vbus_pin>;
++                      regulator-name = "usb2-vbus";
++                      regulator-min-microvolt = <3300000>;
++                      regulator-max-microvolt = <3300000>;
++                      enable-active-high;
++                      gpio = <&pio 7 3 0>;
++              };
++      };
+ };
+-- 
+1.8.4
+

diff --git a/target/linux/sunxi/patches-3.12/162-2-dt-sun7i-add-ehci-for-cb2.patch b/target/linux/sunxi/patches-3.12/162-2-dt-sun7i-add-ehci-for-cb2.patch
new file mode 100644 (file)
index 0000000..0f00c25
--- /dev/null
+++ b/target/linux/sunxi/patches-3.12/162-2-dt-sun7i-add-ehci-for-cb2.patch
@@ -0,0 +1,85 @@
+From 8ba068f40cce9612d2ac0879b6978274ab497d31 Mon Sep 17 00:00:00 2001
+From: arokux <arokux@gmail.com>
+Date: Thu, 19 Sep 2013 21:29:45 +0200
+Subject: [PATCH] ARM: sun7i: dt: Add USB EHCI bindings for Cubieboard2
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+Conflicts:
+       arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+---
+ arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 45 +++++++++++++++++++++++++++++
+ 1 file changed, 45 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+index a26711c..10ea99d 100644
+--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+@@ -54,6 +54,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 {
+@@ -71,6 +85,15 @@
+               i2c1: i2c@01c2b000 {
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&i2c1_pins_a>;
++              };
++
++              ehci0: ehci0@0x01c14000 {
++                      vbus-supply = <&reg_usb1_vbus>;
++                      status = "okay";
++              };
++
++              ehci1: ehci1@0x01c1c000 {
++                      vbus-supply = <&reg_usb2_vbus>;
+                       status = "okay";
+               };
+ 
+@@ -112,5 +135,27 @@
+                       gpio = <&pio 1 8 0>;
+                       enable-active-high;
+               };
++
++              reg_usb1_vbus: usb1-vbus {
++                      compatible = "regulator-fixed";
++                      pinctrl-names = "default";
++                      pinctrl-0 = <&usb1_vbus_pin>;
++                      regulator-name = "usb1-vbus";
++                      regulator-min-microvolt = <3300000>;
++                      regulator-max-microvolt = <3300000>;
++                      enable-active-high;
++                      gpio = <&pio 7 6 0>;
++              };
++
++              reg_usb2_vbus: usb2-vbus {
++                      compatible = "regulator-fixed";
++                      pinctrl-names = "default";
++                      pinctrl-0 = <&usb2_vbus_pin>;
++                      regulator-name = "usb2-vbus";
++                      regulator-min-microvolt = <3300000>;
++                      regulator-max-microvolt = <3300000>;
++                      enable-active-high;
++                      gpio = <&pio 7 3 0>;
++              };
+       };
+ };
+-- 
+1.8.5.1
+

diff --git a/target/linux/sunxi/patches-3.12/162-add-dt-ehci-for-a20-olinuxino.patch b/target/linux/sunxi/patches-3.12/162-add-dt-ehci-for-a20-olinuxino.patch
deleted file mode 100644 (file)
index 40706d2..0000000
--- a/target/linux/sunxi/patches-3.12/162-add-dt-ehci-for-a20-olinuxino.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 630ccdf33652f8e35b8c84e939d5a86fad9612e2 Mon Sep 17 00:00:00 2001
-From: arokux <arokux@gmail.com>
-Date: Thu, 19 Sep 2013 21:50:21 +0200
-Subject: [PATCH] ARM: sun7i: dt: Add USB EHCI bindings for A20-Olinuxino
-
----
- arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 49 +++++++++++++++++++++++++
- 1 file changed, 49 insertions(+)
-
-diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
-index ead3013..e6b1e26 100644
---- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
-+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
-@@ -41,6 +41,20 @@
-                               allwinner,drive = <1>;
-                               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 {
-@@ -76,6 +90,15 @@
-               i2c2: i2c@01c2b400 {
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&i2c2_pins_a>;
-+              };
-+
-+              ehci0: ehci0@0x01c14000 {
-+                      vbus-supply = <&reg_usb1_vbus>;
-+                      status = "okay";
-+              };
-+
-+              ehci1: ehci1@0x01c1c000 {
-+                      vbus-supply = <&reg_usb2_vbus>;
-                       status = "okay";
-               };
-       };
-@@ -91,4 +114,30 @@
-                       default-state = "on";
-               };
-       };
-+
-+      regulators {
-+              compatible = "simple-bus";
-+
-+              reg_usb1_vbus: usb1-vbus {
-+                      compatible = "regulator-fixed";
-+                      pinctrl-names = "default";
-+                      pinctrl-0 = <&usb1_vbus_pin>;
-+                      regulator-name = "usb1-vbus";
-+                      regulator-min-microvolt = <3300000>;
-+                      regulator-max-microvolt = <3300000>;
-+                      enable-active-high;
-+                      gpio = <&pio 7 6 0>;
-+              };
-+
-+              reg_usb2_vbus: usb2-vbus {
-+                      compatible = "regulator-fixed";
-+                      pinctrl-names = "default";
-+                      pinctrl-0 = <&usb2_vbus_pin>;
-+                      regulator-name = "usb2-vbus";
-+                      regulator-min-microvolt = <3300000>;
-+                      regulator-max-microvolt = <3300000>;
-+                      enable-active-high;
-+                      gpio = <&pio 7 3 0>;
-+              };
-+      };
- };
--- 
-1.8.4
-

diff --git a/target/linux/sunxi/patches-3.12/165-dt-usb-update-vbus-voltage.patch b/target/linux/sunxi/patches-3.12/165-dt-usb-update-vbus-voltage.patch
index 2fe2d21c00d8d5c71c2afb2c77f0e193c71cb766..0db0f2b8f60eab62951ca98ceb8d5fd35c426d37 100644 (file)
--- a/target/linux/sunxi/patches-3.12/165-dt-usb-update-vbus-voltage.patch
+++ b/target/linux/sunxi/patches-3.12/165-dt-usb-update-vbus-voltage.patch
@@ -78,5 +78,32 @@ index 4b73e3e..b255d1b 100644
                        enable-active-high;
                        gpio = <&pio 6 11 0>;
                };
+diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+index 10ea99d..144b11a 100644
+--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
++++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+@@ -141,8 +141,8 @@
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&usb1_vbus_pin>;
+                       regulator-name = "usb1-vbus";
+-                      regulator-min-microvolt = <3300000>;
+-                      regulator-max-microvolt = <3300000>;
++                      regulator-min-microvolt = <5000000>;
++                      regulator-max-microvolt = <5000000>;
+                       enable-active-high;
+                       gpio = <&pio 7 6 0>;
+               };
+@@ -152,8 +152,8 @@
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&usb2_vbus_pin>;
+                       regulator-name = "usb2-vbus";
+-                      regulator-min-microvolt = <3300000>;
+-                      regulator-max-microvolt = <3300000>;
++                      regulator-min-microvolt = <5000000>;
++                      regulator-max-microvolt = <5000000>;
+                       enable-active-high;
+                       gpio = <&pio 7 3 0>;
+               };
+-- 
 1.8.5.1