[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-448-gbe428ad
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-448-gbe428ad
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2013-09-19 18:23:26
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via be428adca76ec97958af7b0a28e2861e80d1c95f (commit)
via 535e51f7e66e061055504f90cdf7734bf19385a8 (commit)
from 2a1f5d4a52feb5936d676ada9447d71cc1d64afe (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit be428adca76ec97958af7b0a28e2861e80d1c95f
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Thu Sep 19 20:23:40 2013 +0200
[LINUX] APF28: fix mac address detection
commit 535e51f7e66e061055504f90cdf7734bf19385a8
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Thu Sep 19 20:22:12 2013 +0200
[LINUX] APF28: add 3.11 / 3.11.1 support
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf28/apf28-linux-3.11.1.config | 1 +
...8-linux-3.10.config => apf28-linux-3.11.config} | 4 +-
...0443-armadeus-apf28-fix_mac_address_issue.patch | 47 ++++++++++++++++++++
3 files changed, 50 insertions(+), 2 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.11.1.config
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.config => apf28-linux-3.11.config} (98%)
create mode 100644 patches/linux/3.11/0443-armadeus-apf28-fix_mac_address_issue.patch
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.11.1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.11.1.config
new file mode 120000
index 0000000..fe420fd
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.11.1.config
@@ -0,0 +1 @@
+apf28-linux-3.11.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.11.config
similarity index 98%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-3.11.config
index 3b2e691..2393a05 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.11.config
@@ -104,6 +104,7 @@ CONFIG_SPI_SPIDEV=m
CONFIG_GPIO_SYSFS=y
CONFIG_HWMON=m
CONFIG_WATCHDOG=y
+CONFIG_STMP3XXX_RTC_WATCHDOG=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_MEDIA_SUPPORT=m
@@ -129,8 +130,6 @@ CONFIG_USB_ACM=y
CONFIG_USB_PRINTER=y
CONFIG_USB_WDM=y
CONFIG_USB_STORAGE=y
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_UDC=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DEBUG_FILES=y
CONFIG_USB_ETH=m
@@ -146,6 +145,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_LEDS_TRIGGER_BACKLIGHT=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_STMP=y
CONFIG_DMADEVICES=y
CONFIG_MXS_DMA=y
CONFIG_STAGING=y
diff --git a/patches/linux/3.11/0443-armadeus-apf28-fix_mac_address_issue.patch b/patches/linux/3.11/0443-armadeus-apf28-fix_mac_address_issue.patch
new file mode 100644
index 0000000..d71338a
--- /dev/null
+++ b/patches/linux/3.11/0443-armadeus-apf28-fix_mac_address_issue.patch
@@ -0,0 +1,47 @@
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+Index: linux-3.11.1/arch/arm/mach-mxs/mach-mxs.c
+===================================================================
+--- linux-3.11.1.orig/arch/arm/mach-mxs/mach-mxs.c
++++ linux-3.11.1/arch/arm/mach-mxs/mach-mxs.c
+@@ -156,6 +156,7 @@ enum mac_oui {
+ OUI_FSL,
+ OUI_DENX,
+ OUI_CRYSTALFONTZ,
++ OUI_ARMADEUS,
+ };
+
+ static void __init update_fec_mac_prop(enum mac_oui oui)
+@@ -210,6 +211,11 @@ static void __init update_fec_mac_prop(e
+ macaddr[1] = 0xb9;
+ macaddr[2] = 0xe1;
+ break;
++ case OUI_ARMADEUS:
++ macaddr[0] = 0x00;
++ macaddr[1] = 0x1e;
++ macaddr[2] = 0xac;
++ break;
+ }
+ val = ocotp[i];
+ macaddr[3] = (val >> 16) & 0xff;
+@@ -235,6 +241,11 @@ static void __init imx28_evk_init(void)
+ mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0);
+ }
+
++static void __init imx28_apf28_init(void)
++{
++ update_fec_mac_prop(OUI_ARMADEUS);
++}
++
+ static int apx4devkit_phy_fixup(struct phy_device *phy)
+ {
+ phy->dev_flags |= MICREL_PHY_50MHZ_CLK;
+@@ -433,6 +444,8 @@ static void __init mxs_machine_init(void
+ imx28_evk_init();
+ else if (of_machine_is_compatible("bluegiga,apx4devkit"))
+ apx4devkit_init();
++ else if (of_machine_is_compatible("armadeus,imx28-apf28"))
++ imx28_apf28_init();
+ else if (of_machine_is_compatible("crystalfontz,cfa10037") ||
+ of_machine_is_compatible("crystalfontz,cfa10049") ||
+ of_machine_is_compatible("crystalfontz,cfa10055") ||
hooks/post-receive
--
armadeus
|
