aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mxs/patches/200-duckbill.patch
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2013-11-12 12:48:10 +0000
committerZoltan Herpai <wigyori@uid0.hu>2013-11-12 12:48:10 +0000
commit036f4ed4db4f5b0f13b535e0dc57ffbe56b9811f (patch)
tree129eec1bbec300b6ad41c2297d91fe4b7a428ac3 /target/linux/mxs/patches/200-duckbill.patch
parent7ad5350dfb47b92052201f9eb8c3257af6800bfc (diff)
downloadupstream-036f4ed4db4f5b0f13b535e0dc57ffbe56b9811f.tar.gz
upstream-036f4ed4db4f5b0f13b535e0dc57ffbe56b9811f.tar.bz2
upstream-036f4ed4db4f5b0f13b535e0dc57ffbe56b9811f.zip
mxs: bump kernel to 3.12 - remove DCP patch as it's in mainline now (dts patch will stay) - refresh Duckbill patch - update kmod-usb-chipidea
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu> SVN-Revision: 38780
Diffstat (limited to 'target/linux/mxs/patches/200-duckbill.patch')
-rw-r--r--target/linux/mxs/patches/200-duckbill.patch36
1 files changed, 19 insertions, 17 deletions
diff --git a/target/linux/mxs/patches/200-duckbill.patch b/target/linux/mxs/patches/200-duckbill.patch
index 34160561db..0ca7c9eba2 100644
--- a/target/linux/mxs/patches/200-duckbill.patch
+++ b/target/linux/mxs/patches/200-duckbill.patch
@@ -1,16 +1,18 @@
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -131,6 +131,7 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb
- imx28-cfa10037.dtb \
- imx28-cfa10049.dtb \
+diff -ruN orig/arch/arm/boot/dts/Makefile new/arch/arm/boot/dts/Makefile
+--- orig/arch/arm/boot/dts/Makefile 2013-11-04 00:41:51.000000000 +0100
++++ new/arch/arm/boot/dts/Makefile 2013-11-11 14:38:07.108808212 +0100
+@@ -159,6 +159,7 @@
+ imx28-cfa10057.dtb \
+ imx28-cfa10058.dtb \
imx28-evk.dtb \
+ imx28-duckbill.dtb \
imx28-m28evk.dtb \
imx28-sps1.dtb \
imx28-tx28.dtb
---- a/arch/arm/mach-mxs/mach-mxs.c
-+++ b/arch/arm/mach-mxs/mach-mxs.c
-@@ -175,6 +175,7 @@ enum mac_oui {
+diff -ruN orig/arch/arm/mach-mxs/mach-mxs.c new/arch/arm/mach-mxs/mach-mxs.c
+--- orig/arch/arm/mach-mxs/mach-mxs.c 2013-11-04 00:41:51.000000000 +0100
++++ new/arch/arm/mach-mxs/mach-mxs.c 2013-11-11 14:40:07.555397389 +0100
+@@ -159,6 +159,7 @@
OUI_FSL,
OUI_DENX,
OUI_CRYSTALFONTZ,
@@ -18,7 +20,7 @@
};
static void __init update_fec_mac_prop(enum mac_oui oui)
-@@ -229,6 +230,11 @@ static void __init update_fec_mac_prop(e
+@@ -213,6 +214,11 @@
macaddr[1] = 0xb9;
macaddr[2] = 0xe1;
break;
@@ -30,8 +32,8 @@
}
val = ocotp[i];
macaddr[3] = (val >> 16) & 0xff;
-@@ -362,6 +368,11 @@ static void __init cfa10037_init(void)
- update_fec_mac_prop(OUI_CRYSTALFONTZ);
+@@ -423,6 +429,11 @@
+ return 0;
}
+static void __init duckbill_init(void)
@@ -41,13 +43,13 @@
+
static void __init mxs_machine_init(void)
{
- if (of_machine_is_compatible("fsl,imx28-evk"))
-@@ -372,6 +383,8 @@ static void __init mxs_machine_init(void
- cfa10037_init();
- else if (of_machine_is_compatible("crystalfontz,cfa10049"))
- cfa10049_init();
+ struct device_node *root;
+@@ -459,6 +470,8 @@
+ apx4devkit_init();
+ else if (of_machine_is_compatible("crystalfontz,cfa10036"))
+ crystalfontz_init();
+ else if (of_machine_is_compatible("i2se,duckbill"))
+ duckbill_init();
of_platform_populate(NULL, of_default_bus_match_table,
- mxs_auxdata_lookup, NULL);
+ NULL, parent);