aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2014-02-06 21:01:52 +0000
committerZoltan Herpai <wigyori@uid0.hu>2014-02-06 21:01:52 +0000
commit62cba268a217f0ce1da61455717098c7ca163d83 (patch)
tree7f3a02e117df23e0eef3c4d937ad4920fdc2d5fb /target/linux/sunxi
parent96007fee208aa6e4397a42afe74fbc65de5111a2 (diff)
downloadupstream-62cba268a217f0ce1da61455717098c7ca163d83.tar.gz
upstream-62cba268a217f0ce1da61455717098c7ca163d83.tar.bz2
upstream-62cba268a217f0ce1da61455717098c7ca163d83.zip
sunxi: various 3.13 usb changes - disable USB_DEBUG - rename reset compat property
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu> SVN-Revision: 39510
Diffstat (limited to 'target/linux/sunxi')
-rw-r--r--target/linux/sunxi/config-3.131
-rw-r--r--target/linux/sunxi/patches-3.13/202-reset-rename-compat-prop.patch47
2 files changed, 47 insertions, 1 deletions
diff --git a/target/linux/sunxi/config-3.13 b/target/linux/sunxi/config-3.13
index 0460b56f8b..a11024a3d8 100644
--- a/target/linux/sunxi/config-3.13
+++ b/target/linux/sunxi/config-3.13
@@ -389,7 +389,6 @@ CONFIG_UNINLINE_SPIN_UNLOCK=y
CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_COMMON=y
-CONFIG_USB_DEBUG=y
CONFIG_USB_EHCI_HCD=y
# CONFIG_USB_EHCI_HCD_PLATFORM is not set
CONFIG_USB_STORAGE=y
diff --git a/target/linux/sunxi/patches-3.13/202-reset-rename-compat-prop.patch b/target/linux/sunxi/patches-3.13/202-reset-rename-compat-prop.patch
new file mode 100644
index 0000000000..e4211ea5fa
--- /dev/null
+++ b/target/linux/sunxi/patches-3.13/202-reset-rename-compat-prop.patch
@@ -0,0 +1,47 @@
+From a1c859ab115c043662c2779d2e965bb09a90b8cb Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Tue, 17 Dec 2013 23:57:24 +0100
+Subject: [PATCH] ARM: sunxi-clock-reset: rename compat property
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ arch/arm/boot/dts/sun6i-a31.dtsi | 4 ++--
+ drivers/reset/reset-sunxi.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
+index 5256ad9..ab6ea43 100644
+--- a/arch/arm/boot/dts/sun6i-a31.dtsi
++++ b/arch/arm/boot/dts/sun6i-a31.dtsi
+@@ -220,13 +220,13 @@
+
+ apb1_rst: reset@01c202d0 {
+ #reset-cells = <1>;
+- compatible = "allwinner,sun6i-a31-clock-reset";
++ compatible = "allwinner,sun4i-clock-reset";
+ reg = <0x01c202d0 0x4>;
+ };
+
+ apb2_rst: reset@01c202d8 {
+ #reset-cells = <1>;
+- compatible = "allwinner,sun6i-a31-clock-reset";
++ compatible = "allwinner,sun4i-clock-reset";
+ reg = <0x01c202d8 0x4>;
+ };
+
+diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c
+index 695bd34..3db179c 100644
+--- a/drivers/reset/reset-sunxi.c
++++ b/drivers/reset/reset-sunxi.c
+@@ -138,7 +138,7 @@ void __init sun6i_reset_init(void)
+ * device model.
+ */
+ static const struct of_device_id sunxi_reset_dt_ids[] = {
+- { .compatible = "allwinner,sun6i-a31-clock-reset", },
++ { .compatible = "allwinner,sun4i-clock-reset", },
+ { /* sentinel */ },
+ };
+ MODULE_DEVICE_TABLE(of, sunxi_reset_dt_ids);
+--
+1.8.5.1
+