kernel: update 3.10 to 3.10.17
[openwrt/openwrt.git] / target / linux / mxs / patches / 200-duckbill.patch
1 --- a/arch/arm/boot/dts/Makefile
2 +++ b/arch/arm/boot/dts/Makefile
3 @@ -131,6 +131,7 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb
4 imx28-cfa10037.dtb \
5 imx28-cfa10049.dtb \
6 imx28-evk.dtb \
7 + imx28-duckbill.dtb \
8 imx28-m28evk.dtb \
9 imx28-sps1.dtb \
10 imx28-tx28.dtb
11 --- a/arch/arm/mach-mxs/mach-mxs.c
12 +++ b/arch/arm/mach-mxs/mach-mxs.c
13 @@ -175,6 +175,7 @@ enum mac_oui {
14 OUI_FSL,
15 OUI_DENX,
16 OUI_CRYSTALFONTZ,
17 + OUI_I2SE,
18 };
19
20 static void __init update_fec_mac_prop(enum mac_oui oui)
21 @@ -229,6 +230,11 @@ static void __init update_fec_mac_prop(e
22 macaddr[1] = 0xb9;
23 macaddr[2] = 0xe1;
24 break;
25 + case OUI_I2SE:
26 + macaddr[0] = 0x00;
27 + macaddr[1] = 0x01;
28 + macaddr[2] = 0x87;
29 + break;
30 }
31 val = ocotp[i];
32 macaddr[3] = (val >> 16) & 0xff;
33 @@ -362,6 +368,11 @@ static void __init cfa10037_init(void)
34 update_fec_mac_prop(OUI_CRYSTALFONTZ);
35 }
36
37 +static void __init duckbill_init(void)
38 +{
39 + update_fec_mac_prop(OUI_I2SE);
40 +}
41 +
42 static void __init mxs_machine_init(void)
43 {
44 if (of_machine_is_compatible("fsl,imx28-evk"))
45 @@ -372,6 +383,8 @@ static void __init mxs_machine_init(void
46 cfa10037_init();
47 else if (of_machine_is_compatible("crystalfontz,cfa10049"))
48 cfa10049_init();
49 + else if (of_machine_is_compatible("i2se,duckbill"))
50 + duckbill_init();
51
52 of_platform_populate(NULL, of_default_bus_match_table,
53 mxs_auxdata_lookup, NULL);