armadeus-commitlog Mailing List for armadeus (Page 50)
Brought to you by:
sszy
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: jorasse <jo...@us...> - 2014-02-01 00:04:36
|
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 d28349106bbffebe8afdf1aa0fc459a7f48ef0ab (commit)
from cbdd5d720cf3496ef7e4f21fe465c2bfeac84103 (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 d28349106bbffebe8afdf1aa0fc459a7f48ef0ab
Author: Eric Jarrige <eri...@ar...>
Date: Sat Feb 1 01:03:32 2014 +0100
[LINUX] 3.13: apf51dev: add user button wakeup behavior
-----------------------------------------------------------------------
Summary of changes:
...dts-apf51dev-add_gpio_key_wakeup_behavior.patch | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
create mode 100644 patches/linux/3.13/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
diff --git a/patches/linux/3.13/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch b/patches/linux/3.13/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
new file mode 100644
index 0000000..b64b7a6
--- /dev/null
+++ b/patches/linux/3.13/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
@@ -0,0 +1,17 @@
+add wakeup capabilities to the apf51dev user button
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+
+Index: linux-3.13.1/arch/arm/boot/dts/imx51-apf51dev.dts
+===================================================================
+--- linux-3.13.1.ori/arch/arm/boot/dts/imx51-apf51dev.dts 2014-02-01 00:46:14.000000000 +0100
++++ linux-3.13.1/arch/arm/boot/dts/imx51-apf51dev.dts 2014-02-01 00:57:01.000000000 +0100
+@@ -50,6 +50,7 @@
+ label = "user";
+ gpios = <&gpio1 3 0>;
+ linux,code = <256>; /* BTN_0 */
++ gpio-key,wakeup;
+ };
+ };
+
+--
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-31 23:45:08
|
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 cbdd5d720cf3496ef7e4f21fe465c2bfeac84103 (commit)
from 813b3db3e0217cf4650f0dab23264433d627703e (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 cbdd5d720cf3496ef7e4f21fe465c2bfeac84103
Author: Eric Jarrige <eri...@ar...>
Date: Sat Feb 1 00:44:48 2014 +0100
[LINUX] 3.13: apf27: add user button wakeup behavior
-----------------------------------------------------------------------
Summary of changes:
...us-dts-apf27-add_gpio_key_wakeup_behavior.patch | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
create mode 100644 patches/linux/3.13/0222-armadeus-dts-apf27-add_gpio_key_wakeup_behavior.patch
diff --git a/patches/linux/3.13/0222-armadeus-dts-apf27-add_gpio_key_wakeup_behavior.patch b/patches/linux/3.13/0222-armadeus-dts-apf27-add_gpio_key_wakeup_behavior.patch
new file mode 100644
index 0000000..000e58c
--- /dev/null
+++ b/patches/linux/3.13/0222-armadeus-dts-apf27-add_gpio_key_wakeup_behavior.patch
@@ -0,0 +1,17 @@
+add wakeup capabilities to the apf27 user button
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+
+Index: linux-3.13.1/arch/arm/boot/dts/imx27-apf27dev.dts
+===================================================================
+--- linux-3.13.1/arch/arm/boot/dts/imx27-apf27dev.dts
++++ linux-3.13.1/arch/arm/boot/dts/imx27-apf27dev.dts
+@@ -43,6 +43,7 @@
+ label = "user";
+ gpios = <&gpio6 13 0>;
+ linux,code = <276>; /* BTN_EXTRA */
++ gpio-key,wakeup;
+ };
+ };
+
+--
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-31 18:06:01
|
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 813b3db3e0217cf4650f0dab23264433d627703e (commit)
from f047802b9dcf067514d1abfc6578ea67d6c39f6b (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 813b3db3e0217cf4650f0dab23264433d627703e
Author: Eric Jarrige <eri...@ar...>
Date: Fri Jan 31 19:05:50 2014 +0100
[LINUX] 3.13: apf28: add wakeup behavior to the apf28 user key
-----------------------------------------------------------------------
Summary of changes:
.../3.13/0420-armadeus-Add-apf28dev-dts.patch | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/patches/linux/3.13/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.13/0420-armadeus-Add-apf28dev-dts.patch
index 1f642b1..96dafba 100644
--- a/patches/linux/3.13/0420-armadeus-Add-apf28dev-dts.patch
+++ b/patches/linux/3.13/0420-armadeus-Add-apf28dev-dts.patch
@@ -40,7 +40,7 @@ Index: linux-3.13-rc2/arch/arm/boot/dts/imx28-apf28dev.dts
};
};
-@@ -177,4 +187,14 @@
+@@ -177,4 +187,15 @@
brightness-levels = <0 4 8 16 32 64 128 255>;
default-brightness-level = <6>;
};
@@ -52,6 +52,7 @@ Index: linux-3.13-rc2/arch/arm/boot/dts/imx28-apf28dev.dts
+ label = "User button";
+ gpios = <&gpio0 17 0>;
+ linux,code = <0x100>;
++ gpio-key,wakeup;
+ };
+ };
};
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-31 17:57:49
|
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 f047802b9dcf067514d1abfc6578ea67d6c39f6b (commit)
from db6f0a47e10f3d8f10da8a427c12b34bf7f8aecb (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 f047802b9dcf067514d1abfc6578ea67d6c39f6b
Author: Eric Jarrige <eri...@ar...>
Date: Fri Jan 31 18:57:33 2014 +0100
[LINUX] apf28: add missing gpio-key driver to the kernel 3.13 and 3.12
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf28/apf28-linux-3.12.config | 1 +
.../device/armadeus/apf28/apf28-linux-3.13.config | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.config
index 137bd12..f7a3d49 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.config
@@ -81,6 +81,7 @@ CONFIG_RT73USB=m
CONFIG_ZD1211RW=m
CONFIG_INPUT_JOYDEV=y
CONFIG_INPUT_EVDEV=y
+CONFIG_KEYBOARD_GPIO=y
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_UINPUT=m
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.config
index 4ebea21..46bc4bf 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.config
@@ -79,6 +79,7 @@ CONFIG_RT73USB=m
CONFIG_ZD1211RW=m
CONFIG_INPUT_JOYDEV=y
CONFIG_INPUT_EVDEV=y
+CONFIG_KEYBOARD_GPIO=y
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_UINPUT=m
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-01-31 10:27:40
|
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 db6f0a47e10f3d8f10da8a427c12b34bf7f8aecb (commit)
via dd8ed28de506489893be40674f9d1a3816ab68a9 (commit)
via 7c559555eceb1a0c2cacf908f4f0002d2792cefa (commit)
via bad2426f451acdf6e8083f9e5f0233a0d4b455c6 (commit)
via a20fa73d8a8be2a0ed3d188d50748c20498d42ae (commit)
via a98794720669e52c5ece5e8105db6bd17fc70395 (commit)
from 47b63799c7ca33a85bbc8cbfef7f21cd32be971a (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 db6f0a47e10f3d8f10da8a427c12b34bf7f8aecb
Author: Sébastien Szymanski <ss...@us...>
Date: Fri Jan 31 11:22:51 2014 +0100
[LINUX] 3.13: apf6: add wifi to device tree.
commit dd8ed28de506489893be40674f9d1a3816ab68a9
Author: Sébastien Szymanski <ss...@us...>
Date: Fri Jan 31 11:11:33 2014 +0100
[BUILDROOT] apf6: enable CONFIG_NL80211_TESTMODE and CONFIG_CFG80211_WEXT by
default.
commit 7c559555eceb1a0c2cacf908f4f0002d2792cefa
Author: Sébastien Szymanski <ss...@us...>
Date: Fri Jan 31 11:07:17 2014 +0100
[LINUX] 3.13: apf6: add device tree support to wl12xx drivers. These
patches are from Luciano Coelho [1].
[1] http://marc.info/?l=linux-wireless&m=137518992525285&w=3
commit bad2426f451acdf6e8083f9e5f0233a0d4b455c6
Author: Sébastien Szymanski <ss...@us...>
Date: Fri Jan 31 10:33:26 2014 +0100
[LINUX] 3.13: apf6: split device trees and add apf6dl device tree.
commit a20fa73d8a8be2a0ed3d188d50748c20498d42ae
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Jan 30 14:22:05 2014 +0100
[BUILDROOT] apf6: add wireless drivers to default linux config file.
commit a98794720669e52c5ece5e8105db6bd17fc70395
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Jan 29 15:28:59 2014 +0100
[LINUX] 3.13: apf6q: add HCILL protocol support.
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf6q/apf6q-linux-3.13.config | 8 +-
...madeus-add-apf6q-and-apf6dl-device-trees.patch} | 107 ++++++++--
...6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch | 116 +++++++++++
...-remove-pwr_in_suspend-from-platform-data.patch | 92 +++++++++
...-instead-of-enumerations-for-pdata-clocks.patch | 208 ++++++++++++++++++++
...al-device-tree-support-to-the-sdio-module.patch | 143 ++++++++++++++
...-8-wlcore-sdio-add-wilink-clock-providers.patch | 75 +++++++
...8-wlcore-sdio-get-clocks-from-device-tree.patch | 115 +++++++++++
...heck-if-we-got-correct-clock-data-from-DT.patch | 124 ++++++++++++
...cumentation-dt-bindings-TI-WiLink-modules.patch | 105 ++++++++++
10 files changed, 1072 insertions(+), 21 deletions(-)
rename patches/linux/3.13/{0450-armadeus-add-apf6q-devicetree.patch => 0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch} (68%)
create mode 100644 patches/linux/3.13/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
create mode 100644 patches/linux/3.13/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
create mode 100644 patches/linux/3.13/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
create mode 100644 patches/linux/3.13/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
create mode 100644 patches/linux/3.13/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch
create mode 100644 patches/linux/3.13/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
create mode 100644 patches/linux/3.13/0495-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
create mode 100644 patches/linux/3.13/0496-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
diff --git a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config
index 0f82522..5fbf6b1 100644
--- a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config
+++ b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config
@@ -71,7 +71,10 @@ CONFIG_BT_HCIBTSDIO=m
CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_LL=y
CONFIG_CFG80211=y
+CONFIG_NL80211_TESTMODE=y
+CONFIG_CFG80211_WEXT=y
CONFIG_MAC80211=y
CONFIG_RFKILL=y
CONFIG_RFKILL_INPUT=y
@@ -127,7 +130,10 @@ CONFIG_SMC91X=y
CONFIG_SMC911X=y
CONFIG_SMSC911X=y
# CONFIG_NET_VENDOR_STMICRO is not set
-CONFIG_BRCMFMAC=m
+# CONFIG_RTL_CARDS is not set
+CONFIG_WL_TI=y
+CONFIG_WL12XX=m
+CONFIG_WLCORE_SDIO=m
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_EVBUG=m
diff --git a/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch b/patches/linux/3.13/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
similarity index 68%
rename from patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
rename to patches/linux/3.13/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index 28db349..97b773f 100644
--- a/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
+++ b/patches/linux/3.13/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -2,7 +2,11 @@ Index: linux-3.13/arch/arm/boot/dts/Makefile
===================================================================
--- linux-3.13.orig/arch/arm/boot/dts/Makefile
+++ linux-3.13/arch/arm/boot/dts/Makefile
-@@ -139,6 +139,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
+@@ -136,9 +136,11 @@ dtb-$(CONFIG_ARCH_MXC) += \
+ imx53-mba53.dtb \
+ imx53-qsb.dtb \
+ imx53-smd.dtb \
++ imx6dl-apf6dev.dtb \
imx6dl-sabreauto.dtb \
imx6dl-sabresd.dtb \
imx6dl-wandboard.dtb \
@@ -10,11 +14,11 @@ Index: linux-3.13/arch/arm/boot/dts/Makefile
imx6q-arm2.dtb \
imx6q-phytec-pbab01.dtb \
imx6q-sabreauto.dtb \
-Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dtsi
+Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.13/arch/arm/boot/dts/imx6q-apf6.dtsi
-@@ -0,0 +1,66 @@
++++ linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
+@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -26,17 +30,61 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dtsi
+ *
+ */
+
++/dts-v1/;
+#include "imx6q.dtsi"
++#include "imx6qdl-apf6.dtsi"
++#include "imx6qdl-apf6dev.dtsi"
+
+/ {
-+ model = "Armadeus APF6 i.MX6 Quad Board";
-+ compatible = "armadeus,imx6q-apf6", "fsl,imx6q";
++ model = "Armadeus APF6Dev i.MX6 Quad / Dual Board";
++ compatible = "armadeus,imx6q-apf6dev", "armadeus,imx6q-apf6", "fsl,imx6q";
+
+ memory {
+ reg = <0x10000000 0x80000000>;
+ };
+};
+
++&sata {
++ status = "okay";
++};
+Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+===================================================================
+--- /dev/null
++++ linux-3.13/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+@@ -0,0 +1,76 @@
++/*
++ * Copyright 2014 Armadeus Systems
++ *
++ * Author: Armadeus Systems <su...@ar...>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ */
++
++/ {
++ wlan {
++ compatible = "ti,wilink6";
++ interrupt-parent = <&gpio2>;
++ interrupts = <10 0x4>; /* gpio line 43, high level triggered */
++ clocks = <&refclock>, <&tcxoclock>;
++ clock-names = "refclock", "tcxoclock";
++
++ refclock: refclock {
++ compatible = "ti,wilink-clock";
++ #clock-cells = <0>;
++ clock-frequency = <38400000>;
++ };
++
++ tcxoclock: tcxoclock {
++ compatible = "ti,wilink-clock";
++ #clock-cells = <0>;
++ clock-frequency = <38400000>;
++ };
++ };
++};
++
+&iomuxc {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_hog>;
@@ -44,8 +92,7 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dtsi
+ hog {
+ pinctrl_hog: hoggrp {
+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x80000000 /* WL_EN */
-+ MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x80000000 /* BT_EN */
++ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x80000000 /* WL_IRQ */
+ >;
+ };
+
@@ -81,11 +128,11 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dtsi
+ //non-removable;
+ status = "okay";
+};
-Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
-+++ linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
-@@ -0,0 +1,171 @@
++++ linux-3.13/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+@@ -0,0 +1,162 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -96,13 +143,8 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
+ * published by the Free Software Foundation.
+ *
+ */
-+/dts-v1/;
-+#include "imx6q-apf6.dtsi"
+
+/ {
-+ model = "Armadeus APF6Dev i.MX6 Quad Board";
-+ compatible = "armadeus,imx6q-apf6dev", "armadeus,imx6q-apf6", "fsl,imx6q";
-+
+ regulators {
+ compatible = "simple-bus";
+
@@ -145,10 +187,6 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
+ };
+};
+
-+&sata {
-+ status = "okay";
-+};
-+
+&hdmi {
+ ddc = <&i2c1>;
+ status = "okay";
@@ -257,3 +295,32 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
+ cd-gpios = <&gpio1 2 0>;
+ status = "okay";
+};
+Index: linux-3.13/arch/arm/boot/dts/imx6dl-apf6dev.dts
+===================================================================
+--- /dev/null
++++ linux-3.13/arch/arm/boot/dts/imx6dl-apf6dev.dts
+@@ -0,0 +1,24 @@
++/*
++ * Copyright 2014 Armadeus Systems
++ *
++ * Author: Armadeus Systems <su...@ar...>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ */
++
++/dts-v1/;
++#include "imx6dl.dtsi"
++#include "imx6qdl-apf6.dtsi"
++#include "imx6qdl-apf6dev.dtsi"
++
++/ {
++ model = "Armadeus APF6Dev i.MX6 Dual Light Board";
++ compatible = "armadeus,imx6dl-apf6dev", "armadeus,imx6dl-apf6", "fsl,imx6dl";
++
++ memory {
++ reg = <0x10000000 0x40000000>;
++ };
++};
diff --git a/patches/linux/3.13/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch b/patches/linux/3.13/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
new file mode 100644
index 0000000..c4ddb08
--- /dev/null
+++ b/patches/linux/3.13/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
@@ -0,0 +1,116 @@
+Index: linux-3.13/drivers/net/wireless/ti/wlcore/debugfs.c
+===================================================================
+--- linux-3.13.orig/drivers/net/wireless/ti/wlcore/debugfs.c
++++ linux-3.13/drivers/net/wireless/ti/wlcore/debugfs.c
+@@ -502,7 +502,7 @@ static ssize_t driver_state_read(struct
+ DRIVER_STATE_PRINT_HEX(irq);
+ /* TODO: ref_clock and tcxo_clock were moved to wl12xx priv */
+ DRIVER_STATE_PRINT_HEX(hw_pg_ver);
+- DRIVER_STATE_PRINT_HEX(platform_quirks);
++ DRIVER_STATE_PRINT_HEX(irq_flags);
+ DRIVER_STATE_PRINT_HEX(chip.id);
+ DRIVER_STATE_PRINT_STR(chip.fw_ver_str);
+ DRIVER_STATE_PRINT_STR(chip.phy_fw_ver_str);
+Index: linux-3.13/drivers/net/wireless/ti/wlcore/main.c
+===================================================================
+--- linux-3.13.orig/drivers/net/wireless/ti/wlcore/main.c
++++ linux-3.13/drivers/net/wireless/ti/wlcore/main.c
+@@ -27,6 +27,7 @@
+ #include <linux/vmalloc.h>
+ #include <linux/wl12xx.h>
+ #include <linux/interrupt.h>
++#include <linux/irq.h>
+
+ #include "wlcore.h"
+ #include "debug.h"
+@@ -529,7 +530,7 @@ static int wlcore_irq_locked(struct wl12
+ * In case edge triggered interrupt must be used, we cannot iterate
+ * more than once without introducing race conditions with the hardirq.
+ */
+- if (wl->platform_quirks & WL12XX_PLATFORM_QUIRK_EDGE_IRQ)
++ if (wl->irq_flags & IRQF_TRIGGER_RISING)
+ loopcount = 1;
+
+ wl1271_debug(DEBUG_IRQ, "IRQ work");
+@@ -5893,7 +5894,6 @@ struct ieee80211_hw *wlcore_alloc_hw(siz
+ wl->ap_ps_map = 0;
+ wl->ap_fw_ps_map = 0;
+ wl->quirks = 0;
+- wl->platform_quirks = 0;
+ wl->system_hlid = WL12XX_SYSTEM_HLID;
+ wl->active_sta_count = 0;
+ wl->active_link_count = 0;
+@@ -6034,7 +6034,7 @@ static void wlcore_nvs_cb(const struct f
+ struct platform_device *pdev = wl->pdev;
+ struct wlcore_platdev_data *pdev_data = dev_get_platdata(&pdev->dev);
+ struct wl12xx_platform_data *pdata = pdev_data->pdata;
+- unsigned long irqflags;
++
+ int ret;
+ irq_handler_t hardirq_fn = NULL;
+
+@@ -6062,18 +6062,15 @@ static void wlcore_nvs_cb(const struct f
+ wlcore_adjust_conf(wl);
+
+ wl->irq = platform_get_irq(pdev, 0);
+- wl->platform_quirks = pdata->platform_quirks;
+ wl->if_ops = pdev_data->if_ops;
+
+- if (wl->platform_quirks & WL12XX_PLATFORM_QUIRK_EDGE_IRQ) {
+- irqflags = IRQF_TRIGGER_RISING;
+- hardirq_fn = wlcore_hardirq;
+- } else {
+- irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT;
+- }
++ hardirq_fn = wlcore_hardirq;
++
++ wl->irq_flags = irq_get_trigger_type(wl->irq);
++ wl->irq_flags |= IRQF_ONESHOT;
+
+ ret = request_threaded_irq(wl->irq, hardirq_fn, wlcore_irq,
+- irqflags, pdev->name, wl);
++ wl->irq_flags, pdev->name, wl);
+ if (ret < 0) {
+ wl1271_error("request_irq() failed: %d", ret);
+ goto out_free_nvs;
+Index: linux-3.13/drivers/net/wireless/ti/wlcore/wlcore.h
+===================================================================
+--- linux-3.13.orig/drivers/net/wireless/ti/wlcore/wlcore.h
++++ linux-3.13/drivers/net/wireless/ti/wlcore/wlcore.h
+@@ -186,6 +186,8 @@ struct wl1271 {
+
+ int irq;
+
++ int irq_flags;
++
+ spinlock_t wl_lock;
+
+ enum wlcore_state state;
+@@ -393,9 +395,6 @@ struct wl1271 {
+ /* Quirks of specific hardware revisions */
+ unsigned int quirks;
+
+- /* Platform limitations */
+- unsigned int platform_quirks;
+-
+ /* number of currently active RX BA sessions */
+ int ba_rx_session_count;
+
+Index: linux-3.13/include/linux/wl12xx.h
+===================================================================
+--- linux-3.13.orig/include/linux/wl12xx.h
++++ linux-3.13/include/linux/wl12xx.h
+@@ -55,13 +55,9 @@ struct wl12xx_platform_data {
+ bool use_eeprom;
+ int board_ref_clock;
+ int board_tcxo_clock;
+- unsigned long platform_quirks;
+ bool pwr_in_suspend;
+ };
+
+-/* Platform does not support level trigger interrupts */
+-#define WL12XX_PLATFORM_QUIRK_EDGE_IRQ BIT(0)
+-
+ #ifdef CONFIG_WILINK_PLATFORM_DATA
+
+ int wl12xx_set_platform_data(const struct wl12xx_platform_data *data);
diff --git a/patches/linux/3.13/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch b/patches/linux/3.13/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
new file mode 100644
index 0000000..340e8e4
--- /dev/null
+++ b/patches/linux/3.13/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
@@ -0,0 +1,92 @@
+From patchwork Tue Jul 30 13:04:31 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [v4,3/8] wlcore: remove pwr_in_suspend from platform data
+From: Luciano Coelho <co...@ti...>
+X-Patchwork-Id: 2835678
+Message-Id: <137...@ti...>
+To: <lin...@vg...>, <to...@at...>,
+ <ns...@ti...>
+Cc: <co...@ti...>, <lu...@co...>, <mtu...@li...>,
+ <mar...@ar...>, <ba...@ti...>, <gra...@li...>,
+ <rob...@ca...>, <dev...@li...>,
+ <lin...@vg...>, <lin...@vg...>,
+ <lin...@vg...>,
+ <lin...@li...>, <nm...@ti...>,
+ <mar...@gm...>
+Date: Tue, 30 Jul 2013 16:04:31 +0300
+
+The pwr_in_suspend flag depends on the MMC settings which can be
+retrieved from the SDIO subsystem, so it doesn't need to be part of
+the platform data structure. Move it to the platform device data that
+is passed from SDIO to wlcore.
+
+Signed-off-by: Luciano Coelho <co...@ti...>
+Reviewed-by: Felipe Balbi <ba...@ti...>
+
+---
+drivers/net/wireless/ti/wlcore/main.c | 3 +--
+ drivers/net/wireless/ti/wlcore/sdio.c | 2 +-
+ drivers/net/wireless/ti/wlcore/wlcore_i.h | 1 +
+ include/linux/wl12xx.h | 1 -
+ 4 files changed, 3 insertions(+), 4 deletions(-)
+
+Index: linux-3.13/drivers/net/wireless/ti/wlcore/main.c
+===================================================================
+--- linux-3.13.orig/drivers/net/wireless/ti/wlcore/main.c
++++ linux-3.13/drivers/net/wireless/ti/wlcore/main.c
+@@ -6033,7 +6033,6 @@ static void wlcore_nvs_cb(const struct f
+ struct wl1271 *wl = context;
+ struct platform_device *pdev = wl->pdev;
+ struct wlcore_platdev_data *pdev_data = dev_get_platdata(&pdev->dev);
+- struct wl12xx_platform_data *pdata = pdev_data->pdata;
+
+ int ret;
+ irq_handler_t hardirq_fn = NULL;
+@@ -6081,7 +6080,7 @@ static void wlcore_nvs_cb(const struct f
+ if (!ret) {
+ wl->irq_wake_enabled = true;
+ device_init_wakeup(wl->dev, 1);
+- if (pdata->pwr_in_suspend)
++ if (pdev_data->pwr_in_suspend)
+ wl->hw->wiphy->wowlan = &wlcore_wowlan_support;
+ }
+ #endif
+Index: linux-3.13/drivers/net/wireless/ti/wlcore/sdio.c
+===================================================================
+--- linux-3.13.orig/drivers/net/wireless/ti/wlcore/sdio.c
++++ linux-3.13/drivers/net/wireless/ti/wlcore/sdio.c
+@@ -260,7 +260,7 @@ static int wl1271_probe(struct sdio_func
+ dev_dbg(glue->dev, "sdio PM caps = 0x%x\n", mmcflags);
+
+ if (mmcflags & MMC_PM_KEEP_POWER)
+- pdev_data->pdata->pwr_in_suspend = true;
++ pdev_data->pwr_in_suspend = true;
+
+ sdio_set_drvdata(func, glue);
+
+Index: linux-3.13/drivers/net/wireless/ti/wlcore/wlcore_i.h
+===================================================================
+--- linux-3.13.orig/drivers/net/wireless/ti/wlcore/wlcore_i.h
++++ linux-3.13/drivers/net/wireless/ti/wlcore/wlcore_i.h
+@@ -209,6 +209,7 @@ struct wl1271_if_operations {
+ struct wlcore_platdev_data {
+ struct wl12xx_platform_data *pdata;
+ struct wl1271_if_operations *if_ops;
++ bool pwr_in_suspend;
+ };
+
+ #define MAX_NUM_KEYS 14
+Index: linux-3.13/include/linux/wl12xx.h
+===================================================================
+--- linux-3.13.orig/include/linux/wl12xx.h
++++ linux-3.13/include/linux/wl12xx.h
+@@ -55,7 +55,6 @@ struct wl12xx_platform_data {
+ bool use_eeprom;
+ int board_ref_clock;
+ int board_tcxo_clock;
+- bool pwr_in_suspend;
+ };
+
+ #ifdef CONFIG_WILINK_PLATFORM_DATA
diff --git a/patches/linux/3.13/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch b/patches/linux/3.13/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
new file mode 100644
index 0000000..a5ea16a
--- /dev/null
+++ b/patches/linux/3.13/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
@@ -0,0 +1,208 @@
+From patchwork Tue Jul 30 13:04:32 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [v4,
+ 4/8] wl12xx: use frequency instead of enumerations for pdata clocks
+From: Luciano Coelho <co...@ti...>
+X-Patchwork-Id: 2835657
+Message-Id: <137...@ti...>
+To: <lin...@vg...>, <to...@at...>,
+ <ns...@ti...>
+Cc: <co...@ti...>, <lu...@co...>, <mtu...@li...>,
+ <mar...@ar...>, <ba...@ti...>, <gra...@li...>,
+ <rob...@ca...>, <dev...@li...>,
+ <lin...@vg...>, <lin...@vg...>,
+ <lin...@vg...>,
+ <lin...@li...>, <nm...@ti...>,
+ <mar...@gm...>
+Date: Tue, 30 Jul 2013 16:04:32 +0300
+
+Instead of defining an enumeration with the FW specific values for the
+different clock rates, use the actual frequency instead. Also add a
+boolean to specify whether the clock is XTAL or not.
+
+Change all board files to reflect this.
+
+Additionally, this reverts commit 26f45c (ARM: OMAP2+: Legacy support
+for wl12xx when booted with devicetree), since this is not be needed
+anymore, now that DT support for WiLink is implemented.
+
+Cc: Tony Lindgren <to...@at...>
+Cc: Sekhar Nori <ns...@ti...>
+Signed-off-by: Luciano Coelho <co...@ti...>
+Reviewed-by: Felipe Balbi <ba...@ti...>
+
+---
+arch/arm/mach-davinci/board-da850-evm.c | 3 +-
+ arch/arm/mach-omap2/board-omap3evm.c | 3 +-
+ arch/arm/mach-omap2/board-zoom-peripherals.c | 3 +-
+ arch/arm/mach-omap2/devices.c | 39 -------------------
+ drivers/net/wireless/ti/wl12xx/main.c | 58 +++++++++++++++++++++++++++-
+ drivers/net/wireless/ti/wl12xx/wl12xx.h | 28 ++++++++++++++
+ include/linux/wl12xx.h | 27 ++-----------
+ 7 files changed, 93 insertions(+), 68 deletions(-)
+
+Index: linux-3.13/drivers/net/wireless/ti/wl12xx/main.c
+===================================================================
+--- linux-3.13.orig/drivers/net/wireless/ti/wl12xx/main.c
++++ linux-3.13/drivers/net/wireless/ti/wl12xx/main.c
+@@ -1711,6 +1711,43 @@ static struct ieee80211_sta_ht_cap wl12x
+ },
+ };
+
++static const struct wl12xx_clock wl12xx_refclock_table[] = {
++ { 19200000, false, WL12XX_REFCLOCK_19 },
++ { 26000000, false, WL12XX_REFCLOCK_26 },
++ { 26000000, true, WL12XX_REFCLOCK_26_XTAL },
++ { 38400000, false, WL12XX_REFCLOCK_38 },
++ { 38400000, true, WL12XX_REFCLOCK_38_XTAL },
++ { 52000000, false, WL12XX_REFCLOCK_52 },
++ { 0, false, 0 }
++};
++
++static const struct wl12xx_clock wl12xx_tcxoclock_table[] = {
++ { 16368000, true, WL12XX_TCXOCLOCK_16_368 },
++ { 16800000, true, WL12XX_TCXOCLOCK_16_8 },
++ { 19200000, true, WL12XX_TCXOCLOCK_19_2 },
++ { 26000000, true, WL12XX_TCXOCLOCK_26 },
++ { 32736000, true, WL12XX_TCXOCLOCK_32_736 },
++ { 33600000, true, WL12XX_TCXOCLOCK_33_6 },
++ { 38400000, true, WL12XX_TCXOCLOCK_38_4 },
++ { 52000000, true, WL12XX_TCXOCLOCK_52 },
++ { 0, false, 0 }
++};
++
++static int wl12xx_get_clock_idx(const struct wl12xx_clock *table,
++ u32 freq, bool xtal)
++{
++ int i = 0;
++
++ while(table[i].freq != 0) {
++ if ((table[i].freq == freq) &&
++ (table[i].xtal == xtal))
++ return table[i].hw_idx;
++ i++;
++ };
++
++ return -EINVAL;
++}
++
+ static int wl12xx_setup(struct wl1271 *wl)
+ {
+ struct wl12xx_priv *priv = wl->priv;
+@@ -1732,7 +1769,16 @@ static int wl12xx_setup(struct wl1271 *w
+ wl12xx_conf_init(wl);
+
+ if (!fref_param) {
+- priv->ref_clock = pdata->board_ref_clock;
++ priv->ref_clock = wl12xx_get_clock_idx(wl12xx_refclock_table,
++ pdata->ref_clock_freq,
++ pdata->ref_clock_xtal);
++ if (priv->ref_clock < 0) {
++ wl1271_error("Invalid ref_clock frequency (%d Hz, %s)",
++ pdata->ref_clock_freq,
++ pdata->ref_clock_xtal ? "XTAL" : "not XTAL");
++
++ return priv->ref_clock;
++ }
+ } else {
+ if (!strcmp(fref_param, "19.2"))
+ priv->ref_clock = WL12XX_REFCLOCK_19;
+@@ -1751,7 +1797,15 @@ static int wl12xx_setup(struct wl1271 *w
+ }
+
+ if (!tcxo_param) {
+- priv->tcxo_clock = pdata->board_tcxo_clock;
++ priv->tcxo_clock = wl12xx_get_clock_idx(wl12xx_tcxoclock_table,
++ pdata->tcxo_clock_freq,
++ true);
++ if (priv->tcxo_clock < 0) {
++ wl1271_error("Invalid tcxo_clock frequency (%d Hz)",
++ pdata->tcxo_clock_freq);
++
++ return priv->tcxo_clock;
++ }
+ } else {
+ if (!strcmp(tcxo_param, "19.2"))
+ priv->tcxo_clock = WL12XX_TCXOCLOCK_19_2;
+Index: linux-3.13/drivers/net/wireless/ti/wl12xx/wl12xx.h
+===================================================================
+--- linux-3.13.orig/drivers/net/wireless/ti/wl12xx/wl12xx.h
++++ linux-3.13/drivers/net/wireless/ti/wl12xx/wl12xx.h
+@@ -79,4 +79,32 @@ struct wl12xx_priv {
+ struct wl127x_rx_mem_pool_addr *rx_mem_addr;
+ };
+
++/* Reference clock values */
++enum {
++ WL12XX_REFCLOCK_19 = 0, /* 19.2 MHz */
++ WL12XX_REFCLOCK_26 = 1, /* 26 MHz */
++ WL12XX_REFCLOCK_38 = 2, /* 38.4 MHz */
++ WL12XX_REFCLOCK_52 = 3, /* 52 MHz */
++ WL12XX_REFCLOCK_38_XTAL = 4, /* 38.4 MHz, XTAL */
++ WL12XX_REFCLOCK_26_XTAL = 5, /* 26 MHz, XTAL */
++};
++
++/* TCXO clock values */
++enum {
++ WL12XX_TCXOCLOCK_19_2 = 0, /* 19.2MHz */
++ WL12XX_TCXOCLOCK_26 = 1, /* 26 MHz */
++ WL12XX_TCXOCLOCK_38_4 = 2, /* 38.4MHz */
++ WL12XX_TCXOCLOCK_52 = 3, /* 52 MHz */
++ WL12XX_TCXOCLOCK_16_368 = 4, /* 16.368 MHz */
++ WL12XX_TCXOCLOCK_32_736 = 5, /* 32.736 MHz */
++ WL12XX_TCXOCLOCK_16_8 = 6, /* 16.8 MHz */
++ WL12XX_TCXOCLOCK_33_6 = 7, /* 33.6 MHz */
++};
++
++struct wl12xx_clock {
++ u32 freq;
++ bool xtal;
++ u8 hw_idx;
++};
++
+ #endif /* __WL12XX_PRIV_H__ */
+Index: linux-3.13/include/linux/wl12xx.h
+===================================================================
+--- linux-3.13.orig/include/linux/wl12xx.h
++++ linux-3.13/include/linux/wl12xx.h
+@@ -26,35 +26,14 @@
+
+ #include <linux/err.h>
+
+-/* Reference clock values */
+-enum {
+- WL12XX_REFCLOCK_19 = 0, /* 19.2 MHz */
+- WL12XX_REFCLOCK_26 = 1, /* 26 MHz */
+- WL12XX_REFCLOCK_38 = 2, /* 38.4 MHz */
+- WL12XX_REFCLOCK_52 = 3, /* 52 MHz */
+- WL12XX_REFCLOCK_38_XTAL = 4, /* 38.4 MHz, XTAL */
+- WL12XX_REFCLOCK_26_XTAL = 5, /* 26 MHz, XTAL */
+-};
+-
+-/* TCXO clock values */
+-enum {
+- WL12XX_TCXOCLOCK_19_2 = 0, /* 19.2MHz */
+- WL12XX_TCXOCLOCK_26 = 1, /* 26 MHz */
+- WL12XX_TCXOCLOCK_38_4 = 2, /* 38.4MHz */
+- WL12XX_TCXOCLOCK_52 = 3, /* 52 MHz */
+- WL12XX_TCXOCLOCK_16_368 = 4, /* 16.368 MHz */
+- WL12XX_TCXOCLOCK_32_736 = 5, /* 32.736 MHz */
+- WL12XX_TCXOCLOCK_16_8 = 6, /* 16.8 MHz */
+- WL12XX_TCXOCLOCK_33_6 = 7, /* 33.6 MHz */
+-};
+-
+ struct wl12xx_platform_data {
+ void (*set_power)(bool enable);
+ /* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */
+ int irq;
+ bool use_eeprom;
+- int board_ref_clock;
+- int board_tcxo_clock;
++ int ref_clock_freq; /* in Hertz */
++ bool ref_clock_xtal; /* specify whether the clock is XTAL or not */
++ int tcxo_clock_freq; /* in Hertz, tcxo is always XTAL */
+ };
+
+ #ifdef CONFIG_WILINK_PLATFORM_DATA
diff --git a/patches/linux/3.13/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch b/patches/linux/3.13/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
new file mode 100644
index 0000000..f2f3b79
--- /dev/null
+++ b/patches/linux/3.13/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
@@ -0,0 +1,143 @@
+From patchwork Tue Jul 30 13:04:33 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [v4,5/8] wlcore: add initial device tree support to the sdio module
+From: Luciano Coelho <co...@ti...>
+X-Patchwork-Id: 2835682
+Message-Id: <137...@ti...>
+To: <lin...@vg...>, <to...@at...>,
+ <ns...@ti...>
+Cc: <co...@ti...>, <lu...@co...>, <mtu...@li...>,
+ <mar...@ar...>, <ba...@ti...>, <gra...@li...>,
+ <rob...@ca...>, <dev...@li...>,
+ <lin...@vg...>, <lin...@vg...>,
+ <lin...@vg...>,
+ <lin...@li...>, <nm...@ti...>,
+ <mar...@gm...>
+Date: Tue, 30 Jul 2013 16:04:33 +0300
+
+If platform data is not available, try to get the required information
+from the device tree. Register an OF match table and parse the
+appropriate device tree nodes.
+
+Parse interrupt property only, for now.
+
+Signed-off-by: Luciano Coelho <co...@ti...>
+Reviewed-by: Felipe Balbi <ba...@ti...>
+
+---
+drivers/net/wireless/ti/wlcore/sdio.c | 69 ++++++++++++++++++++++++++++++++---
+ 1 file changed, 63 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c
+index 4c7e8ac..9370d7e 100644
+--- a/drivers/net/wireless/ti/wlcore/sdio.c
++++ b/drivers/net/wireless/ti/wlcore/sdio.c
+@@ -30,7 +30,7 @@
+ #include <linux/mmc/sdio_ids.h>
+ #include <linux/mmc/card.h>
+ #include <linux/mmc/host.h>
+-#include <linux/gpio.h>
++#include <linux/of_irq.h>
+ #include <linux/wl12xx.h>
+ #include <linux/pm_runtime.h>
+ #include <linux/printk.h>
+@@ -214,6 +214,43 @@ static struct wl1271_if_operations sdio_ops = {
+ .set_block_size = wl1271_sdio_set_block_size,
+ };
+
++static struct wl12xx_platform_data *wlcore_get_pdata_from_of(struct device *dev)
++{
++ struct wl12xx_platform_data *pdata;
++ struct device_node *np = dev->of_node;
++
++ if (!np) {
++ np = of_find_matching_node(NULL, dev->driver->of_match_table);
++ if (!np) {
++ dev_notice(dev, "device tree node not available\n");
++ pdata = ERR_PTR(-ENODEV);
++ goto out;
++ }
++ }
++
++ pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
++ if (!pdata) {
++ dev_err(dev, "can't allocate platform data\n");
++ pdata = ERR_PTR(-ENODEV);
++ goto out;
++ }
++
++ pdata->irq = irq_of_parse_and_map(np, 0);
++ if (pdata->irq < 0) {
++ dev_err(dev, "can't get interrupt gpio from the device tree\n");
++ goto out_free;
++ }
++
++ goto out;
++
++out_free:
++ kfree(pdata);
++ pdata = ERR_PTR(-ENODEV);
++
++out:
++ return pdata;
++}
++
+ static int wl1271_probe(struct sdio_func *func,
+ const struct sdio_device_id *id)
+ {
+@@ -248,11 +285,22 @@ static int wl1271_probe(struct sdio_func *func,
+ /* Use block mode for transferring over one block size of data */
+ func->card->quirks |= MMC_QUIRK_BLKSZ_FOR_BYTE_MODE;
+
++ /* The pdata allocated here is freed when the device is freed,
++ * so we don't need an additional out label to free it in case
++ * of error further on.
++ */
++
++ /* Try to get legacy platform data from the board file */
+ pdev_data->pdata = wl12xx_get_platform_data();
+ if (IS_ERR(pdev_data->pdata)) {
+- ret = PTR_ERR(pdev_data->pdata);
+- dev_err(glue->dev, "missing wlan platform data: %d\n", ret);
+- goto out_free_glue;
++ dev_info(&func->dev,
++ "legacy platform data not found, trying device tree\n");
++
++ pdev_data->pdata = wlcore_get_pdata_from_of(&func->dev);
++ if (IS_ERR(pdev_data->pdata)) {
++ dev_err(&func->dev, "can't get platform data\n");
++ goto out_free_glue;
++ }
+ }
+
+ /* if sdio can keep power while host is suspended, enable wow */
+@@ -386,16 +434,25 @@ static const struct dev_pm_ops wl1271_sdio_pm_ops = {
+ };
+ #endif
+
++static const struct of_device_id wlcore_sdio_of_match_table[] = {
++ { .compatible = "ti,wilink6" },
++ { .compatible = "ti,wilink7" },
++ { .compatible = "ti,wilink8" },
++ { }
++};
++MODULE_DEVICE_TABLE(of, wlcore_sdio_of_match_table);
++
+ static struct sdio_driver wl1271_sdio_driver = {
+ .name = "wl1271_sdio",
+ .id_table = wl1271_devices,
+ .probe = wl1271_probe,
+ .remove = wl1271_remove,
+-#ifdef CONFIG_PM
+ .drv = {
++#ifdef CONFIG_PM
+ .pm = &wl1271_sdio_pm_ops,
+- },
+ #endif
++ .of_match_table = of_match_ptr(wlcore_sdio_of_match_table),
++ },
+ };
+
+ static int __init wl1271_init(void)
diff --git a/patches/linux/3.13/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch b/patches/linux/3.13/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch
new file mode 100644
index 0000000..cb6bf97
--- /dev/null
+++ b/patches/linux/3.13/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch
@@ -0,0 +1,75 @@
+From patchwork Tue Jul 30 13:04:34 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [v4,6/8] wlcore: sdio: add wilink clock providers
+From: Luciano Coelho <co...@ti...>
+X-Patchwork-Id: 2835651
+Message-Id: <137...@ti...>
+To: <lin...@vg...>, <to...@at...>,
+ <ns...@ti...>
+Cc: <co...@ti...>, <lu...@co...>, <mtu...@li...>,
+ <mar...@ar...>, <ba...@ti...>, <gra...@li...>,
+ <rob...@ca...>, <dev...@li...>,
+ <lin...@vg...>, <lin...@vg...>,
+ <lin...@vg...>,
+ <lin...@li...>, <nm...@ti...>,
+ <mar...@gm...>
+Date: Tue, 30 Jul 2013 16:04:34 +0300
+
+Add refclock and tcxoclock as clock providers in WiLink. These clocks
+are not accesible outside the WiLink module, but they are registered
+in the clock framework anyway. Only the WiLink chip consumes these
+clocks.
+
+In theory, the WiLink chip could be connected to external clocks
+instead of using these internal clocks, so make the clock consumer
+code generic enough. If external clocks are used, then the internal
+clock device tree nodes are not necessary, but the external ones must
+be specified.
+
+Signed-off-by: Luciano Coelho <co...@ti...>
+Reviewed-by: Felipe Balbi <ba...@ti...>
+
+---
+drivers/net/wireless/ti/wlcore/sdio.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c
+index 9370d7e..980bf3d 100644
+--- a/drivers/net/wireless/ti/wlcore/sdio.c
++++ b/drivers/net/wireless/ti/wlcore/sdio.c
+@@ -34,6 +34,7 @@
+ #include <linux/wl12xx.h>
+ #include <linux/pm_runtime.h>
+ #include <linux/printk.h>
++#include <linux/clk-provider.h>
+
+ #include "wlcore.h"
+ #include "wl12xx_80211.h"
+@@ -214,10 +215,15 @@ static struct wl1271_if_operations sdio_ops = {
+ .set_block_size = wl1271_sdio_set_block_size,
+ };
+
++static const struct of_device_id wlcore_sdio_of_clk_match_table[] = {
++ { .compatible = "ti,wilink-clock" },
++};
++
+ static struct wl12xx_platform_data *wlcore_get_pdata_from_of(struct device *dev)
+ {
+ struct wl12xx_platform_data *pdata;
+ struct device_node *np = dev->of_node;
++ struct device_node *clock_node;
+
+ if (!np) {
+ np = of_find_matching_node(NULL, dev->driver->of_match_table);
+@@ -241,6 +247,9 @@ static struct wl12xx_platform_data *wlcore_get_pdata_from_of(struct device *dev)
+ goto out_free;
+ }
+
++ for_each_matching_node(clock_node, wlcore_sdio_of_clk_match_table)
++ of_fixed_clk_setup(clock_node);
++
+ goto out;
+
+ out_free:
diff --git a/patches/linux/3.13/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch b/patches/linux/3.13/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
new file mode 100644
index 0000000..5ab8759
--- /dev/null
+++ b/patches/linux/3.13/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
@@ -0,0 +1,115 @@
+From patchwork Tue Jul 30 13:04:35 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [v4,7/8] wlcore: sdio: get clocks from device tree
+From: Luciano Coelho <co...@ti...>
+X-Patchwork-Id: 2835643
+Message-Id: <137...@ti...>
+To: <lin...@vg...>, <to...@at...>,
+ <ns...@ti...>
+Cc: <co...@ti...>, <lu...@co...>, <mtu...@li...>,
+ <mar...@ar...>, <ba...@ti...>, <gra...@li...>,
+ <rob...@ca...>, <dev...@li...>,
+ <lin...@vg...>, <lin...@vg...>,
+ <lin...@vg...>,
+ <lin...@li...>, <nm...@ti...>,
+ <mar...@gm...>
+Date: Tue, 30 Jul 2013 16:04:35 +0300
+
+Read the clock nodes from the device tree and use them to set the
+frequency for the refclock and the tcxo clock.
+
+Also, call sdio_set_drvdata() earlier, so the glue is already set in
+the driver data when we call wlcore_get_pdata_from_of() and we don't
+need to pass it as a parameter.
+
+Signed-off-by: Luciano Coelho <co...@ti...>
+Reviewed-by: Felipe Balbi <ba...@ti...>
+
+---
+drivers/net/wireless/ti/wlcore/sdio.c | 36 +++++++++++++++++++++++++++++++++--
+ 1 file changed, 34 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c
+index 980bf3d..60fce49 100644
+--- a/drivers/net/wireless/ti/wlcore/sdio.c
++++ b/drivers/net/wireless/ti/wlcore/sdio.c
+@@ -53,6 +53,7 @@ static bool dump = false;
+ struct wl12xx_sdio_glue {
+ struct device *dev;
+ struct platform_device *core;
++ struct clk *refclock, *tcxoclock;
+ };
+
+ static const struct sdio_device_id wl1271_devices[] = {
+@@ -224,6 +225,7 @@ static struct wl12xx_platform_data *wlcore_get_pdata_from_of(struct device *dev)
+ struct wl12xx_platform_data *pdata;
+ struct device_node *np = dev->of_node;
+ struct device_node *clock_node;
++ struct wl12xx_sdio_glue *glue = sdio_get_drvdata(dev_to_sdio_func(dev));
+
+ if (!np) {
+ np = of_find_matching_node(NULL, dev->driver->of_match_table);
+@@ -250,6 +252,26 @@ static struct wl12xx_platform_data *wlcore_get_pdata_from_of(struct device *dev)
+ for_each_matching_node(clock_node, wlcore_sdio_of_clk_match_table)
+ of_fixed_clk_setup(clock_node);
+
++ /* TODO: make sure we have this when needed (ie. for WL6 and WL7) */
++ glue->refclock = of_clk_get_by_name(np, "refclock");
++ if (IS_ERR(glue->refclock)) {
++ dev_err(dev, "couldn't find refclock on the device tree\n");
++ glue->refclock = NULL;
++ } else {
++ clk_prepare_enable(glue->refclock);
++ pdata->ref_clock_freq = clk_get_rate(glue->refclock);
++ }
++
++ /* TODO: make sure we have this when needed (ie. for WL7) */
++ glue->tcxoclock = of_clk_get_by_name(np, "tcxoclock");
++ if (IS_ERR(glue->tcxoclock)) {
++ dev_err(dev, "couldn't find tcxoclock on the device tree\n");
++ glue->tcxoclock = NULL;
++ } else {
++ clk_prepare_enable(glue->tcxoclock);
++ pdata->ref_clock_freq = clk_get_rate(glue->tcxoclock);
++ }
++
+ goto out;
+
+ out_free:
+@@ -294,6 +316,8 @@ static int wl1271_probe(struct sdio_func *func,
+ /* Use block mode for transferring over one block size of data */
+ func->card->quirks |= MMC_QUIRK_BLKSZ_FOR_BYTE_MODE;
+
++ sdio_set_drvdata(func, glue);
++
+ /* The pdata allocated here is freed when the device is freed,
+ * so we don't need an additional out label to free it in case
+ * of error further on.
+@@ -319,8 +343,6 @@ static int wl1271_probe(struct sdio_func *func,
+ if (mmcflags & MMC_PM_KEEP_POWER)
+ pdev_data->pwr_in_suspend = true;
+
+- sdio_set_drvdata(func, glue);
+-
+ /* Tell PM core that we don't need the card to be powered now */
+ pm_runtime_put_noidle(&func->dev);
+
+@@ -387,6 +409,16 @@ static void wl1271_remove(struct sdio_func *func)
+ {
+ struct wl12xx_sdio_glue *glue = sdio_get_drvdata(func);
+
++ if (glue->refclock) {
++ clk_disable_unprepare(glue->refclock);
++ clk_put(glue->refclock);
++ }
++
++ if (glue->tcxoclock) {
++ clk_disable_unprepare(glue->tcxoclock);
++ clk_put(glue->tcxoclock);
++ }
++
+ /* Undo decrement done above in wl1271_probe */
+ pm_runtime_get_noresume(&func->dev);
+
diff --git a/patches/linux/3.13/0495-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch b/patches/linux/3.13/0495-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
new file mode 100644
index 0000000..7dce7cd
--- /dev/null
+++ b/patches/linux/3.13/0495-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
@@ -0,0 +1,124 @@
+From patchwork Tue Jul 30 13:04:36 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [v4,8/8] wlcore/wl12xx: check if we got correct clock data from DT
+From: Luciano Coelho <co...@ti...>
+X-Patchwork-Id: 2835647
+Message-Id: <137...@ti...>
+To: <lin...@vg...>, <to...@at...>,
+ <ns...@ti...>
+Cc: <co...@ti...>, <lu...@co...>, <mtu...@li...>,
+ <mar...@ar...>, <ba...@ti...>, <gra...@li...>,
+ <rob...@ca...>, <dev...@li...>,
+ <lin...@vg...>, <lin...@vg...>,
+ <lin...@vg...>,
+ <lin...@li...>, <nm...@ti...>,
+ <mar...@gm...>
+Date: Tue, 30 Jul 2013 16:04:36 +0300
+
+The fref and the tcxo clocks settings are optional in some platforms.
+WiLink8 doesn't need either, so we don't check the values. WiLink 6
+only needs the fref clock, so we check that it is valid or return with
+an error. WiLink7 needs both clocks, if either is not available we
+return with an error.
+
+Signed-off-by: Luciano Coelho <co...@ti...>
+Reviewed-by: Felipe Balbi <ba...@ti...>
+
+---
+drivers/net/wireless/ti/wl12xx/main.c | 20 +++++++++++++++++---
+ drivers/net/wireless/ti/wlcore/sdio.c | 4 ----
+ 2 files changed, 17 insertions(+), 7 deletions(-)
+
+diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
+index a6c2a14..60d2ff4 100644
+--- a/drivers/net/wireless/ti/wl12xx/main.c
++++ b/drivers/net/wireless/ti/wl12xx/main.c
+@@ -927,6 +927,11 @@ static int wl128x_boot_clk(struct wl1271 *wl, int *selected_clock)
+ u16 sys_clk_cfg;
+ int ret;
+
++ if ((priv->ref_clock < 0) || (priv->tcxo_clock < 0)) {
++ wl1271_error("Missing fref and/or tcxo clock settings\n");
++ return -EINVAL;
++ }
++
+ /* For XTAL-only modes, FREF will be used after switching from TCXO */
+ if (priv->ref_clock == WL12XX_REFCLOCK_26_XTAL ||
+ priv->ref_clock == WL12XX_REFCLOCK_38_XTAL) {
+@@ -976,6 +981,11 @@ static int wl127x_boot_clk(struct wl1271 *wl)
+ u32 clk;
+ int ret;
+
++ if (priv->ref_clock < 0) {
++ wl1271_error("Missing fref clock settings\n");
++ return -EINVAL;
++ }
++
+ if (WL127X_PG_GET_MAJOR(wl->hw_pg_ver) < 3)
+ wl->quirks |= WLCORE_QUIRK_END_OF_TRANSACTION;
+
+@@ -1758,7 +1768,7 @@ static int wl12xx_setup(struct wl1271 *wl)
+ wlcore_set_ht_cap(wl, IEEE80211_BAND_5GHZ, &wl12xx_ht_cap);
+ wl12xx_conf_init(wl);
+
+- if (!fref_param) {
++ if (!fref_param && (pdata->ref_clock_freq > 0)) {
+ priv->ref_clock = wl12xx_get_clock_idx(wl12xx_refclock_table,
+ pdata->ref_clock_freq,
+ pdata->ref_clock_xtal);
+@@ -1769,6 +1779,8 @@ static int wl12xx_setup(struct wl1271 *wl)
+
+ return priv->ref_clock;
+ }
++ } else if (!fref_param) {
++ priv->ref_clock = -EINVAL;
+ } else {
+ if (!strcmp(fref_param, "19.2"))
+ priv->ref_clock = WL12XX_REFCLOCK_19;
+@@ -1786,7 +1798,7 @@ static int wl12xx_setup(struct wl1271 *wl)
+ wl1271_error("Invalid fref parameter %s", fref_param);
+ }
+
+- if (!tcxo_param) {
++ if (!fref_param && (pdata->tcxo_clock_freq > 0)) {
+ priv->tcxo_clock = wl12xx_get_clock_idx(wl12xx_tcxoclock_table,
+ pdata->tcxo_clock_freq,
+ true);
+@@ -1796,7 +1808,9 @@ static int wl12xx_setup(struct wl1271 *wl)
+
+ return priv->tcxo_clock;
+ }
+- } else {
++ } else if (!fref_param) {
++ priv->tcxo_clock = -EINVAL;
++ }else {
+ if (!strcmp(tcxo_param, "19.2"))
+ priv->tcxo_clock = WL12XX_TCXOCLOCK_19_2;
+ else if (!strcmp(tcxo_param, "26"))
+diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c
+index 60fce49..c76eb66 100644
+--- a/drivers/net/wireless/ti/wlcore/sdio.c
++++ b/drivers/net/wireless/ti/wlcore/sdio.c
+@@ -252,20 +252,16 @@ static struct wl12xx_platform_data *wlcore_get_pdata_from_of(struct device *dev)
+ for_each_matching_node(clock_node, wlcore_sdio_of_clk_match_table)
+ of_fixed_clk_setup(clock_node);
+
+- /* TODO: make sure we have this when needed (ie. for WL6 and WL7) */
+ glue->refclock = of_clk_get_by_name(np, "refclock");
+ if (IS_ERR(glue->refclock)) {
+- dev_err(dev, "couldn't find refclock on the device tree\n");
+ glue->refclock = NULL;
+ } else {
+ clk_prepare_enable(glue->refclock);
+ pdata->ref_clock_freq = clk_get_rate(glue->refclock);
+ }
+
+- /* TODO: make sure we have this when needed (ie. for WL7) */
+ glue->tcxoclock = of_clk_get_by_name(np, "tcxoclock");
+ if (IS_ERR(glue->tcxoclock)) {
+- dev_err(dev, "couldn't find tcxoclock on the device tree\n");
+ glue->tcxoclock = NULL;
+ } else {
+ clk_prepare_enable(glue->tcxoclock);
diff --git a/patches/linux/3.13/0496-v3-Documentation-dt-bindings-TI-WiLink-modules.patch b/patches/linux/3.13/0496-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
new file mode 100644
index 0000000..8bd3e21
--- /dev/null
+++ b/patches/linux/3.13/0496-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
@@ -0,0 +1,105 @@
+From patchwork Tue Jul 30 20:21:08 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [v3] Documentation: dt: bindings: TI WiLink modules
+From: Luciano Coelho <co...@ti...>
+X-Patchwork-Id: 2835916
+Message-Id: <137...@ti...>
+To: <dev...@vg...>, <lin...@vg...>
+Cc: <mtu...@li...>, <mar...@ar...>, <ba...@ti...>,
+ <gra...@li...>, <rob...@ca...>,
+ <lin...@vg...>, <lin...@vg...>,
+ <lin...@vg...>,
+ <lin...@li...>, <to...@at...>,
+ <nm...@ti...>, <lau...@id...>
+Date: Tue, 30 Jul 2013 23:21:08 +0300
+
+Add device tree bindings documentation for the TI WiLink modules.
+Currently only the WLAN part of the WiLink6, WiLink7 and WiLink8
+modules is supported.
+
+Signed-off-by: Luciano Coelho <co...@ti...>
+Reviewed-by: Laurent Pinchart <lau...@id...>
+
+---
+In v3, use IRQ_TYPE_LEVEL_HIGH in the example, as suggested by Laurent.
+
+ .../devicetree/bindings/net/wireless/ti-wilink.txt | 68 ++++++++++++++++++++++
+ 1 file changed, 68 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/net/wireless/ti-wilink.txt
+
+diff --git a/Documentation/devicetree/bindings/net/wireless/ti-wilink.txt b/Documentation/devicetree/bindings/net/wireless/ti-wilink.txt
+new file mode 100644
+index 0000000..aafebb1
+--- /dev/null
++++ b/Documentation/devicetree/bindings/net/wireless/ti-wilink.txt
+@@ -0,0 +1,68 @@
++TI WiLink Wireless Modules Device Tree Bindings
++===============================================
++
++The WiLink modules provide wireless connectivity, such as WLAN,
++Bluetooth, FM and NFC.
++
++There are several different modules available, which can be grouped by
++their generation: WiLink6, WiLink7 and WiLink8. WiLink4 is not
++currently supported with device tree.
++
++Currently, only the WLAN portion of the modules is supported with
++device tree.
++
++Required properties:
++--------------------
++
++- compatible: should be "ti,wilink6", "ti,wilink7" or "ti,wilink8"
++- interrupt-parent: the interrupt controller
++- interrupts: out-of-band WLAN interrupt
++ See the interrupt controller's bindings documentation for
++ detailed definition.
++
++Optional properties:
++--------------------
++
++- clocks: list of clocks needed by the chip as follows:
++
++ refclock: the internal WLAN reference clock frequency (required for
++ WiLink6 and WiLink7; not used for WiLink8).
++
++ tcxoclock: the internal WLAN TCXO clock frequency (required for
++ WiLink7 not used for WiLink6 and WiLink8).
++
++ The clocks must be defined and named accordingly. For example:
++
++ clocks = <&refclock>
++ clock-names = "refclock";
++
++ refclock: refclock {
++ compatible = "ti,wilink-clock";
++ #clock-cells = <0>;
++ clock-frequency = <38400000>;
++ };
++
++ Some modules that contain the WiLink chip provide clocks in the
++ module itself. In this case, we define a "ti,wilink-clock" as shown
++ above. But any other clock could in theory be used, so the proper
++ clock definition should be used.
++
++
++Example:
++--------
++
++Example definition that can be used in OMAP4 Panda:
++
++wlan {
++ compatible = "ti,wilink6";
++ interrupt-parent = <&gpio2>;
++ interrupts = <21 IRQ_TYPE_LEVEL_HIGH>; /* gpio line 53 */
++ clocks = <&refclock>;
++ clock-names = "refclock";
++
++ refclock: refclock {
++ compatible = "ti,wilink-clock";
++ #clock-cells = <0>;
++ clock-frequency = <38400000>;
++ };
++};
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-30 21:47:14
|
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 47b63799c7ca33a85bbc8cbfef7f21cd32be971a (commit)
via 01cccf748ab1f4e8eb831b72a13ac1f5ea7cd379 (commit)
via 8bc58363606711b45882d0d169c56eac3a57dc4f (commit)
via 45cecfc8065f0f39164a179d3294077c07b03c75 (commit)
from 8064a40a56ba52e7aa82550b5a5926a638ee73dc (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 47b63799c7ca33a85bbc8cbfef7f21cd32be971a
Merge: 01cccf7 8064a40
Author: Eric Jarrige <eri...@ar...>
Date: Thu Jan 30 22:46:54 2014 +0100
Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code
commit 01cccf748ab1f4e8eb831b72a13ac1f5ea7cd379
Author: Philippe Reynes <tr...@ya...>
Date: Thu Jan 30 18:05:18 2014 +0100
[LINUX] 3.13: move to 3.13.1
commit 8bc58363606711b45882d0d169c56eac3a57dc4f
Author: Philippe Reynes <tr...@ya...>
Date: Tue Jan 28 21:40:08 2014 +0100
[LINUX] 3.10: move to 3.10.28
commit 45cecfc8065f0f39164a179d3294077c07b03c75
Author: Philippe Reynes <tr...@ya...>
Date: Tue Jan 28 19:35:16 2014 +0100
[LINUX] 3.12: move to 3.12.9
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...x-3.10.27.config => apf27-linux-3.10.28.config} | 0
...nux-3.12.8.config => apf27-linux-3.12.9.config} | 0
.../armadeus/apf27/apf27-linux-3.13.1.config | 1 +
...x-3.10.27.config => apf28-linux-3.10.28.config} | 0
...nux-3.12.8.config => apf28-linux-3.12.9.config} | 0
.../armadeus/apf28/apf28-linux-3.13.1.config | 1 +
...x-3.10.27.config => apf51-linux-3.10.28.config} | 0
...nux-3.12.8.config => apf51-linux-3.12.9.config} | 0
.../armadeus/apf51/apf51-linux-3.13.1.config | 1 +
patches/linux/{3.10.27 => 3.10.28} | 0
patches/linux/{3.12.8 => 3.12.9} | 0
patches/linux/3.13.1 | 1 +
15 files changed, 10 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.27.config => apf27-linux-3.10.28.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.12.8.config => apf27-linux-3.12.9.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.13.1.config
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.27.config => apf28-linux-3.10.28.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.12.8.config => apf28-linux-3.12.9.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.13.1.config
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.27.config => apf51-linux-3.10.28.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.12.8.config => apf51-linux-3.12.9.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.13.1.config
rename patches/linux/{3.10.27 => 3.10.28} (100%)
rename patches/linux/{3.12.8 => 3.12.9} (100%)
create mode 120000 patches/linux/3.13.1
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index d540dc4..a3affc9 100644
--- a/buildroot/configs/apf27mainline_defconfig
+++ b/buildroot/configs/apf27mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.13"
+BR2_DEFAULT_KERNEL_VERSION="3.13.1"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -34,7 +34,7 @@ BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.1"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf28mainline_defconfig b/buildroot/configs/apf28mainline_defconfig
index f0b3a3c..64c4f8c 100644
--- a/buildroot/configs/apf28mainline_defconfig
+++ b/buildroot/configs/apf28mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.13"
+BR2_DEFAULT_KERNEL_VERSION="3.13.1"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -35,7 +35,7 @@ BR2_CPU_NAME="imx28"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.1"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index b6caeac..5b85b41 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -7,7 +7,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.13"
+BR2_DEFAULT_KERNEL_VERSION="3.13.1"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -97,7 +97,7 @@ BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.1"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.27.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.28.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.27.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.28.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.8.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.9.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.12.8.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.12.9.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.1.config
new file mode 120000
index 0000000..556e9d4
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.1.config
@@ -0,0 +1 @@
+apf27-linux-3.13.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.27.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.28.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.27.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.28.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.8.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.9.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.12.8.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.12.9.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.1.config
new file mode 120000
index 0000000..fad58f6
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.1.config
@@ -0,0 +1 @@
+apf28-linux-3.13.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.27.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.28.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.27.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.28.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.8.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.9.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.12.8.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.12.9.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.13.1.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.13.1.config
new file mode 120000
index 0000000..90856dc
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.13.1.config
@@ -0,0 +1 @@
+apf51-linux-3.13.config
\ No newline at end of file
diff --git a/patches/linux/3.10.27 b/patches/linux/3.10.28
similarity index 100%
rename from patches/linux/3.10.27
rename to patches/linux/3.10.28
diff --git a/patches/linux/3.12.8 b/patches/linux/3.12.9
similarity index 100%
rename from patches/linux/3.12.8
rename to patches/linux/3.12.9
diff --git a/patches/linux/3.13.1 b/patches/linux/3.13.1
new file mode 120000
index 0000000..3a4f41e
--- /dev/null
+++ b/patches/linux/3.13.1
@@ -0,0 +1 @@
+3.13
\ No newline at end of file
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-01-28 07:55:58
|
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 8064a40a56ba52e7aa82550b5a5926a638ee73dc (commit)
via c3f91fbe9a504a50be2d3ce4b07d0fffe321321c (commit)
from d766221b51a1769038ec8eb8dee026550c263f9f (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 8064a40a56ba52e7aa82550b5a5926a638ee73dc
Author: Sébastien Szymanski <ss...@us...>
Date: Tue Jan 28 08:55:55 2014 +0100
[BUILDROOT] apf6q: add bluez to default config file.
commit c3f91fbe9a504a50be2d3ce4b07d0fffe321321c
Author: Sébastien Szymanski <ss...@us...>
Date: Tue Jan 28 08:51:54 2014 +0100
[LINUX] 3.13: apf6q: add bluetooth drivers to default linux config file
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6q_defconfig | 1 +
.../device/armadeus/apf6q/apf6q-linux-3.13.config | 9 +++++++++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/buildroot/configs/apf6q_defconfig b/buildroot/configs/apf6q_defconfig
index f604be2..1556959 100644
--- a/buildroot/configs/apf6q_defconfig
+++ b/buildroot/configs/apf6q_defconfig
@@ -25,6 +25,7 @@ BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y
BR2_PACKAGE_TSLIB=y
+BR2_PACKAGE_BLUEZ_UTILS=y
BR2_PACKAGE_DROPBEAR=y
BR2_PACKAGE_IW=y
BR2_PACKAGE_WPA_SUPPLICANT=y
diff --git a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config
index 1e8d6ae..0f82522 100644
--- a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config
+++ b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config
@@ -62,6 +62,15 @@ CONFIG_IP_PNP_DHCP=y
# CONFIG_INET_LRO is not set
CONFIG_IPV6=y
CONFIG_NETFILTER=y
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_HIDP=m
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
CONFIG_CFG80211=y
CONFIG_MAC80211=y
CONFIG_RFKILL=y
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-01-27 17:14:10
|
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 d766221b51a1769038ec8eb8dee026550c263f9f (commit)
from 35349ba33819c2c6eb06567fbeab79cfce341ad2 (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 d766221b51a1769038ec8eb8dee026550c263f9f
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Jan 27 14:03:32 2014 +0100
[LINUX] imx6q: apf6: move pwm3 node from apf6 device tree to apf6dev device tree.
-----------------------------------------------------------------------
Summary of changes:
.../3.13/0450-armadeus-add-apf6q-devicetree.patch | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch b/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
index fedaa5a..28db349 100644
--- a/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
+++ b/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
@@ -14,7 +14,7 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dtsi
===================================================================
--- /dev/null
+++ linux-3.13/arch/arm/boot/dts/imx6q-apf6.dtsi
-@@ -0,0 +1,72 @@
+@@ -0,0 +1,66 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -81,17 +81,11 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dtsi
+ //non-removable;
+ status = "okay";
+};
-+
-+&pwm3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_pwm3_1>;
-+ status = "okay";
-+};
Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
--- /dev/null
+++ linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
-@@ -0,0 +1,165 @@
+@@ -0,0 +1,171 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -217,6 +211,12 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
+ status = "okay";
+};
+
++&pwm3 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pwm3_1>;
++ status = "okay";
++};
++
+/* GPS */
+&uart1 {
+ pinctrl-names = "default";
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-26 13:03:14
|
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 35349ba33819c2c6eb06567fbeab79cfce341ad2 (commit)
from bffa0fc04c61898486501ae26d87c3c3e0ac4d38 (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 35349ba33819c2c6eb06567fbeab79cfce341ad2
Author: Philippe Reynes <tr...@ya...>
Date: Sun Jan 26 12:55:38 2014 +0100
[LINUX] 3.13: move to 3.13
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 +-
buildroot/configs/apf28mainline_defconfig | 4 +-
buildroot/configs/apf51mainline_defconfig | 4 +-
.../armadeus/apf27/apf27-linux-3.13-rc8.config | 1 -
.../armadeus/apf28/apf28-linux-3.13-rc8.config | 1 -
.../armadeus/apf51/apf51-linux-3.13-rc8.config | 274 --------------------
patches/linux/3.13-rc8 | 1 -
7 files changed, 6 insertions(+), 283 deletions(-)
delete mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.13-rc8.config
delete mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.13-rc8.config
delete mode 100644 buildroot/target/device/armadeus/apf51/apf51-linux-3.13-rc8.config
delete mode 120000 patches/linux/3.13-rc8
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 6e038c9..d540dc4 100644
--- a/buildroot/configs/apf27mainline_defconfig
+++ b/buildroot/configs/apf27mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12.8"
+BR2_DEFAULT_KERNEL_VERSION="3.13"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -34,7 +34,7 @@ BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf28mainline_defconfig b/buildroot/configs/apf28mainline_defconfig
index 7ba0d87..f0b3a3c 100644
--- a/buildroot/configs/apf28mainline_defconfig
+++ b/buildroot/configs/apf28mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12.8"
+BR2_DEFAULT_KERNEL_VERSION="3.13"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -35,7 +35,7 @@ BR2_CPU_NAME="imx28"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index aacc6a5..b6caeac 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -7,7 +7,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12.8"
+BR2_DEFAULT_KERNEL_VERSION="3.13"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -97,7 +97,7 @@ BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.13-rc8.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.13-rc8.config
deleted file mode 120000
index 556e9d4..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.13-rc8.config
+++ /dev/null
@@ -1 +0,0 @@
-apf27-linux-3.13.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.13-rc8.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.13-rc8.config
deleted file mode 120000
index fad58f6..0000000
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.13-rc8.config
+++ /dev/null
@@ -1 +0,0 @@
-apf28-linux-3.13.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.13-rc8.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.13-rc8.config
deleted file mode 100644
index fd2729f..0000000
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.13-rc8.config
+++ /dev/null
@@ -1,274 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-# CONFIG_LOCALVERSION_AUTO is not set
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_EMBEDDED=y
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_BSD_DISKLABEL=y
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_MXC=y
-CONFIG_MXC_IRQ_PRIOR=y
-CONFIG_MACH_IMX51_DT=y
-CONFIG_ARM_THUMBEE=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_IMX=y
-CONFIG_CPU_IDLE=y
-CONFIG_VFP=y
-CONFIG_NEON=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_SUSPEND is not set
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-CONFIG_IPV6=y
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_MCP251X=m
-CONFIG_BT=m
-CONFIG_BT_L2CAP=y
-CONFIG_BT_SCO=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_HIDP=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_CFG80211=m
-CONFIG_MAC80211=m
-CONFIG_MAC80211_RC_PID=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_FW_LOADER=m
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_MXC=y
-CONFIG_MTD_UBI=y
-CONFIG_MISC_DEVICES=y
-CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_AT25=y
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_SCH=y
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_NETDEVICES=y
-CONFIG_MII=y
-CONFIG_SMSC_PHY=y
-CONFIG_NET_ETHERNET=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-CONFIG_RTL8187=m
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_RT2X00=m
-CONFIG_RT73USB=m
-CONFIG_ZD1211RW=m
-CONFIG_INPUT_JOYDEV=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_IMX=m
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_WM831X=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_WM831X_ON=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_8250=m
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_IMX=y
-CONFIG_SPI=y
-CONFIG_SPI_IMX=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_WM831X=m
-CONFIG_POWER_SUPPLY=m
-CONFIG_WM831X_BACKUP=m
-CONFIG_WM831X_POWER=m
-CONFIG_HWMON=m
-CONFIG_SENSORS_AS1531=m
-CONFIG_SENSORS_WM831X=m
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_NOWAYOUT=y
-CONFIG_WM831X_WATCHDOG=m
-CONFIG_IMX2_WDT=y
-CONFIG_MFD_WM831X_I2C=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_DRM=y
-CONFIG_MFD_IMX_IPU_V3=y
-CONFIG_MEDIA_SUPPORT=m
-CONFIG_VIDEO_DEV=m
-# CONFIG_RC_CORE is not set
-# CONFIG_MEDIA_TUNER_SIMPLE is not set
-# CONFIG_MEDIA_TUNER_TDA8290 is not set
-# CONFIG_MEDIA_TUNER_TDA827X is not set
-# CONFIG_MEDIA_TUNER_TDA18271 is not set
-# CONFIG_MEDIA_TUNER_TDA9887 is not set
-# CONFIG_MEDIA_TUNER_TEA5761 is not set
-# CONFIG_MEDIA_TUNER_TEA5767 is not set
-# CONFIG_MEDIA_TUNER_MT20XX is not set
-# CONFIG_MEDIA_TUNER_MT2060 is not set
-# CONFIG_MEDIA_TUNER_MT2266 is not set
-# CONFIG_MEDIA_TUNER_MT2131 is not set
-# CONFIG_MEDIA_TUNER_QT1010 is not set
-# CONFIG_MEDIA_TUNER_XC2028 is not set
-# CONFIG_MEDIA_TUNER_XC5000 is not set
-# CONFIG_MEDIA_TUNER_MXL5005S is not set
-# CONFIG_MEDIA_TUNER_MXL5007T is not set
-# CONFIG_MEDIA_TUNER_MC44S803 is not set
-# CONFIG_MEDIA_TUNER_MAX2165 is not set
-# CONFIG_MEDIA_TUNER_TDA18218 is not set
-CONFIG_VIDEO_VIVI=m
-CONFIG_USB_VIDEO_CLASS=m
-# CONFIG_RADIO_ADAPTERS is not set
-CONFIG_FB=y
-CONFIG_FB_MX5=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_SOUND=m
-# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-CONFIG_SND=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-# CONFIG_SND_DRIVERS is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_USB is not set
-CONFIG_SND_SOC=m
-CONFIG_SND_IMX_SOC=m
-CONFIG_SND_SOC_APF51_DEV_WM8960=m
-CONFIG_USB=y
-CONFIG_USB_DEBUG=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_SUSPEND=y
-CONFIG_USB_OTG=y
-# CONFIG_USB_OTG_WHITELIST is not set
-CONFIG_USB_MON=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_MXC=y
-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_CHIPIDEA_HOST=y
-CONFIG_USB_PHY=y
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_USB_GPIO_VBUS=y
-CONFIG_USB_ULPI=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_DEBUG_FILES=y
-CONFIG_USB_GADGET_DEBUG_FS=y
-CONFIG_USB_ETH=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_CDC_COMPOSITE=m
-CONFIG_USB_G_MULTI=m
-CONFIG_USB_G_MULTI_CDC=y
-CONFIG_USB_G_HID=m
-CONFIG_MMC=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MMC_SDHCI_ESDHC_IMX=y
-CONFIG_MMC_SPI=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_WM831X_STATUS=m
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_MXC=y
-CONFIG_RTC_DRV_WM831X=y
-CONFIG_STAGING=y
-CONFIG_DRM_IMX=y
-CONFIG_DRM_IMX_FB_HELPER=y
-CONFIG_DRM_IMX_PARALLEL_DISPLAY=y
-CONFIG_DRM_IMX_TVE=y
-CONFIG_DRM_IMX_IPUV3_CORE=y
-CONFIG_DRM_IMX_IPUV3=y
-CONFIG_IIO=m
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT2_FS_XIP=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_CMODE_NONE=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_NFS_V4=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_DEBUG_FS=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
diff --git a/patches/linux/3.13-rc8 b/patches/linux/3.13-rc8
deleted file mode 120000
index 3a4f41e..0000000
--- a/patches/linux/3.13-rc8
+++ /dev/null
@@ -1 +0,0 @@
-3.13
\ No newline at end of file
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-24 15:58:20
|
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 bffa0fc04c61898486501ae26d87c3c3e0ac4d38 (commit)
from 5e0c42b3eef8c7bcd329b8d3eed8ca61d43f7667 (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 bffa0fc04c61898486501ae26d87c3c3e0ac4d38
Author: Eric Jarrige <eri...@ar...>
Date: Fri Jan 24 16:58:06 2014 +0100
[BUILROOT] remove unsupported command uboot-clean - use uboot-rebuild instead
-----------------------------------------------------------------------
Summary of changes:
.../178-uboot-add-missing-UBOOT_CLEAN_CMDS.patch | 29 --------------------
1 files changed, 0 insertions(+), 29 deletions(-)
delete mode 100644 patches/buildroot/2013.11/178-uboot-add-missing-UBOOT_CLEAN_CMDS.patch
diff --git a/patches/buildroot/2013.11/178-uboot-add-missing-UBOOT_CLEAN_CMDS.patch b/patches/buildroot/2013.11/178-uboot-add-missing-UBOOT_CLEAN_CMDS.patch
deleted file mode 100644
index 146fc11..0000000
--- a/patches/buildroot/2013.11/178-uboot-add-missing-UBOOT_CLEAN_CMDS.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-uboot: add missing UBOOT_CLEAN_CMDS
-
-Signed-off-by: Eric Jarrige <eri...@ar...>
----
- boot/uboot/uboot.mk | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
-index db9de8d..0a0f762 100644
---- a/boot/uboot/uboot.mk
-+++ b/boot/uboot/uboot.mk
-@@ -113,6 +113,14 @@ define UBOOT_INSTALL_IMAGES_CMDS
- -o $(BINARIES_DIR)/uboot-env.bin $(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE))
- endef
-
-+define UBOOT_CLEAN_CMDS
-+ $(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) \
-+ $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
-+ clean
-+ rm -f $(@D)/$(UBOOT_BIN)
-+
-+endef
-+
- define UBOOT_INSTALL_OMAP_IFT_IMAGE
- cp -dpf $(@D)/$(UBOOT_BIN_IFT) $(BINARIES_DIR)/
- endef
---
-1.7.0.4
-
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-24 15:12:46
|
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 5e0c42b3eef8c7bcd329b8d3eed8ca61d43f7667 (commit)
from b81c67e3186d8e215f8b6fc89bb113a44579a96f (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 5e0c42b3eef8c7bcd329b8d3eed8ca61d43f7667
Author: Eric Jarrige <eri...@ar...>
Date: Fri Jan 24 16:12:31 2014 +0100
[BUILD] do not delete final firmware and uboot binary images
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/rootfs/post_image_creation.sh | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
index f8a067a..ca64cb8 100755
--- a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
@@ -22,7 +22,10 @@ if [ "$2" != "" ]; then
# New BR
# Cleanup if previous build
- rm -f $1/$2*
+ rm -f $1/$2-rootfs.*
+ rm -f $1/$2-linux.bin
+ rm -f $1/$2.dtb
+
# rootfs
for rootfstype in ubi ubifs tar jffs2; do
symlink_image $1 rootfs.$rootfstype $2-rootfs.$rootfstype
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-01-24 13:35:02
|
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 b81c67e3186d8e215f8b6fc89bb113a44579a96f (commit)
from 8b3cebd4f1196cf5937a46ba37a3fc672f1abd0c (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 b81c67e3186d8e215f8b6fc89bb113a44579a96f
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Jan 23 14:39:11 2014 +0100
[LINUX] 3.13: apf6q: add PWM3 to device tree
-----------------------------------------------------------------------
Summary of changes:
.../3.13/0450-armadeus-add-apf6q-devicetree.patch | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch b/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
index 9485d08..fedaa5a 100644
--- a/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
+++ b/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
@@ -14,7 +14,7 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dtsi
===================================================================
--- /dev/null
+++ linux-3.13/arch/arm/boot/dts/imx6q-apf6.dtsi
-@@ -0,0 +1,66 @@
+@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -81,6 +81,12 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dtsi
+ //non-removable;
+ status = "okay";
+};
++
++&pwm3 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pwm3_1>;
++ status = "okay";
++};
Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
--- /dev/null
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-24 10:40:34
|
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 8b3cebd4f1196cf5937a46ba37a3fc672f1abd0c (commit)
from 6c02e499aa0add4bb96e131c1fd0f71c0d0b6061 (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 8b3cebd4f1196cf5937a46ba37a3fc672f1abd0c
Author: Eric Jarrige <eri...@ar...>
Date: Fri Jan 24 11:40:19 2014 +0100
[LINUX] 3.13: apf27: add i2c eeprom 24c02 and i2c2 bus to device tree
-----------------------------------------------------------------------
Summary of changes:
...1-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch | 43 ++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
create mode 100644 patches/linux/3.13/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
diff --git a/patches/linux/3.13/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch b/patches/linux/3.13/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
new file mode 100644
index 0000000..6659197
--- /dev/null
+++ b/patches/linux/3.13/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
@@ -0,0 +1,43 @@
+add i2c eeprom and i2c2 bus to apf27.dts
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+
+Index: linux-3.12.7/arch/arm/boot/dts/imx27-apf27dev.dts
+===================================================================
+--- linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27dev.dts
++++ linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27dev.dts
+@@ -125,12 +125,6 @@
+ };
+ };
+
+-&i2c2 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_i2c2_1>;
+- status = "okay";
+-};
+-
+ &iomuxc {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_hog>;
+--- linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27.dts
++++ linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27.dts
+@@ -64,6 +64,18 @@
+ status = "okay";
+ };
+
++&i2c2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c2_1>;
++ status = "okay";
++
++ eeprom@50 {
++ compatible = "atmel,24c02";
++ reg = <0x50>;
++ pagesize = <8>;
++ };
++};
++
+ &nfc {
+ status = "okay";
+ nand-bus-width = <16>;
+--
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-23 22:42:19
|
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 6c02e499aa0add4bb96e131c1fd0f71c0d0b6061 (commit)
from 8321e057df9718006fb37eb5451757005e06b146 (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 6c02e499aa0add4bb96e131c1fd0f71c0d0b6061
Author: Eric Jarrige <eri...@ar...>
Date: Thu Jan 23 23:42:09 2014 +0100
[LINUX] 3.13: apf27: remove obsolet patch - not used with Open Firmware / DT
-----------------------------------------------------------------------
Summary of changes:
...rmadeus-mx27-imxfb-fix_pwm_contrast_issue.patch | 65 --------------------
1 files changed, 0 insertions(+), 65 deletions(-)
delete mode 100644 patches/linux/3.13/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
diff --git a/patches/linux/3.13/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch b/patches/linux/3.13/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
deleted file mode 100644
index 1172852..0000000
--- a/patches/linux/3.13/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 1dcc1e25e2f0fd1eb9daf54385485d802aaa370d Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Mon, 15 Jul 2013 12:31:14 +0200
-Subject: [PATCH] Pin contrast level is always high when LPCR PCD is equal to
- 0. By setting per3clk_div to have a 134 MHz clock, PCD is
- greater than 0 and the PWM is working.
-
-Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
----
- drivers/video/imxfb.c | 10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
-
-Index: linux-3.11-rc3/drivers/video/imxfb.c
-===================================================================
---- linux-3.11-rc3.orig/drivers/video/imxfb.c
-+++ linux-3.11-rc3/drivers/video/imxfb.c
-@@ -137,6 +137,7 @@ struct imxfb_rgb {
- enum imxfb_type {
- IMX1_FB,
- IMX21_FB,
-+ IMX27_FB,
- };
-
- struct imxfb_info {
-@@ -189,6 +190,9 @@ static struct platform_device_id imxfb_d
- .name = "imx21-fb",
- .driver_data = IMX21_FB,
- }, {
-+ .name = "imx27-fb",
-+ .driver_data = IMX27_FB,
-+ }, {
- /* sentinel */
- }
- };
-@@ -202,6 +206,9 @@ static struct of_device_id imxfb_of_dev_
- .compatible = "fsl,imx21-fb",
- .data = &imxfb_devtype[IMX21_FB],
- }, {
-+ .compatible = "fsl,imx27-fb",
-+ .data = &imxfb_devtype[IMX27_FB],
-+ }, {
- /* sentinel */
- }
- };
-@@ -866,6 +873,7 @@ static int imxfb_probe(struct platform_d
- const struct of_device_id *of_id;
- int ret, i;
- int bytes_per_pixel;
-+ unsigned long per3clk;
-
- dev_info(&pdev->dev, "i.MX Framebuffer driver\n");
-
-@@ -959,6 +967,12 @@ static int imxfb_probe(struct platform_d
- goto failed_getclock;
- }
-
-+ if (fbi->devtype == IMX27_FB) {
-+ per3clk = clk_round_rate(fbi->clk_per, 134000000);
-+ if (clk_set_rate(fbi->clk_per, per3clk))
-+ pr_debug("mx2fb: Unable to set clock to %lu\n", per3clk);
-+ }
-+
- fbi->regs = ioremap(res->start, resource_size(res));
- if (fbi->regs == NULL) {
- dev_err(&pdev->dev, "Cannot map frame buffer registers\n");
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-23 22:39:06
|
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 8321e057df9718006fb37eb5451757005e06b146 (commit)
from e18c8311d2ae5cc6e2c0ac92fc73f6ff79c9c7ac (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 8321e057df9718006fb37eb5451757005e06b146
Author: Eric Jarrige <eri...@ar...>
Date: Thu Jan 23 23:38:53 2014 +0100
[LINUX] 3.13: apf27: fix LCD backlight/brightness adjustment
-----------------------------------------------------------------------
Summary of changes:
...armadeus-imx27-apf27dev-add_imxfb_support.patch | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/patches/linux/3.13/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch b/patches/linux/3.13/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
index a59a9e5..4b03ada 100644
--- a/patches/linux/3.13/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
+++ b/patches/linux/3.13/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
@@ -30,7 +30,7 @@ Index: linux-3.13-rc1/arch/arm/boot/dts/imx27-apf27dev.dts
&fb {
display = <&display>;
-+ fsl,pwmr = <0x00a903ff>;
++ fsl,pwmr = <0x00a90580>;
fsl,dmacr = <0x00020010>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_imxfb1_1>;
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-23 14:15:33
|
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 e18c8311d2ae5cc6e2c0ac92fc73f6ff79c9c7ac (commit)
via 587b751d350ed6b05d3e3227505f4f3a30c3db2d (commit)
from 67c99a9a1f37c11a95dd0ea178af3e253f761e12 (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 e18c8311d2ae5cc6e2c0ac92fc73f6ff79c9c7ac
Merge: 587b751 67c99a9
Author: Eric Jarrige <eri...@ar...>
Date: Thu Jan 23 15:14:14 2014 +0100
Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code
commit 587b751d350ed6b05d3e3227505f4f3a30c3db2d
Author: Eric Jarrige <eri...@ar...>
Date: Thu Jan 23 15:14:03 2014 +0100
[LINUX] 3.13: apf27: remove legacy non DT based config
-----------------------------------------------------------------------
Summary of changes:
.../3.13/0200-armadeus-add_apf27_module.patch | 360 -----
.../0201-armadeus-add_apf27dev_baseboard.patch | 1510 --------------------
...armadeus-mx27-ehci-mxc-add_per_clk_enable.patch | 49 -
3 files changed, 0 insertions(+), 1919 deletions(-)
delete mode 100644 patches/linux/3.13/0200-armadeus-add_apf27_module.patch
delete mode 100644 patches/linux/3.13/0201-armadeus-add_apf27dev_baseboard.patch
delete mode 100644 patches/linux/3.13/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
diff --git a/patches/linux/3.13/0200-armadeus-add_apf27_module.patch b/patches/linux/3.13/0200-armadeus-add_apf27_module.patch
deleted file mode 100644
index add80a1..0000000
--- a/patches/linux/3.13/0200-armadeus-add_apf27_module.patch
+++ /dev/null
@@ -1,360 +0,0 @@
-The APF27 is an i.M27 based SOM (System On Module) that can be plugged on
-several docking/development boards. Here only basic module support
-is added (Ethernet, Serial, NAND Flash, USB OTG).
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-Signed-off-by: Eric Jarrige <eri...@ar...>
-Signed-off-by: Nicolas Colombain <nic...@ar...>
----
- arch/arm/mach-imx/Kconfig | 13 ++
- arch/arm/mach-imx/Makefile | 1 +
- arch/arm/mach-imx/mach-apf27.c | 258 +++++++++++++++++++++++++++
- arch/arm/plat-mxc/include/mach/uncompress.h | 1 +
- 4 files changed, 273 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/mach-imx/mach-apf27.c
-
-Index: linux-3.9.1/arch/arm/mach-imx/Kconfig
-===================================================================
---- linux-3.9.1.orig/arch/arm/mach-imx/Kconfig
-+++ linux-3.9.1/arch/arm/mach-imx/Kconfig
-@@ -492,6 +492,21 @@ config MACH_IMX27_DT
- Include support for Freescale i.MX27 based platforms
- using the device tree for discovery
-
-+config MACH_APF27
-+ bool "Armadeus Systems APF27"
-+ select SOC_IMX27
-+ select IMX_HAVE_PLATFORM_FSL_USB2_UDC
-+ select IMX_HAVE_PLATFORM_MXC_EHCI
-+ select IMX_HAVE_PLATFORM_IMX2_WDT
-+ select IMX_HAVE_PLATFORM_IMX_I2C
-+ select IMX_HAVE_PLATFORM_IMX_UART
-+ select IMX_HAVE_PLATFORM_MXC_NAND
-+ select IMX_HAVE_PLATFORM_IMX_FB
-+ select MXC_ULPI if USB_ULPI
-+ help
-+ Include support for APF27 platform. This includes specific
-+ configurations for the module and its peripherals.
-+
- endif
-
- if ARCH_MULTI_V6
-Index: linux-3.9.1/arch/arm/mach-imx/Makefile
-===================================================================
---- linux-3.9.1.orig/arch/arm/mach-imx/Makefile
-+++ linux-3.9.1/arch/arm/mach-imx/Makefile
-@@ -70,6 +70,7 @@ obj-$(CONFIG_MACH_PCA100) += mach-pca100
- obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_td60.o
- obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o
- obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
-+obj-$(CONFIG_MACH_APF27) += mach-apf27.o
-
- # i.MX31 based machines
- obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o
-Index: linux-3.9.1/arch/arm/mach-imx/mach-apf27.c
-===================================================================
---- /dev/null
-+++ linux-3.9.1/arch/arm/mach-imx/mach-apf27.c
-@@ -0,0 +1,290 @@
-+ /*
-+ * Support for the APF27 System On Module
-+ *
-+ * Copyright (C) 2008-2012 Armadeus Systems <su...@ar...>
-+ *
-+ * Based on code which is:
-+ * Copyright 2007 Robert Schwebel <r.s...@pe...>, Pengutronix
-+ * Copyright (C) 2008 Juergen Beisert (ke...@pe...)
-+ * Copyright 2009 Freescale Semiconductor, Inc. All Rights Reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA 02110-1301, USA.
-+ */
-+
-+#include <linux/platform_device.h>
-+#include <linux/i2c.h>
-+#include <linux/serial.h>
-+#include <linux/delay.h>
-+#include <linux/clk.h>
-+#include <linux/usb/otg.h>
-+#include <linux/usb/ulpi.h>
-+#include <linux/phy.h>
-+
-+#include <asm/mach/flash.h>
-+#include <asm/mach/arch.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/time.h>
-+
-+#include "hardware.h"
-+#include "common.h"
-+#include "devices-imx27.h"
-+#include "iomux-mx27.h"
-+#include "ulpi.h"
-+
-+
-+static const int apf27_pins[] __initconst = {
-+ /* UART1 */
-+ PE12_PF_UART1_TXD,
-+ PE13_PF_UART1_RXD,
-+ /* USB_OTG */
-+ PE0_PF_USBOTG_NXT,
-+ PE1_PF_USBOTG_STP,
-+ PE2_PF_USBOTG_DIR,
-+ PE24_PF_USBOTG_CLK,
-+ PE25_PF_USBOTG_DATA7,
-+ PC7_PF_USBOTG_DATA5,
-+ PC8_PF_USBOTG_DATA6,
-+ PC9_PF_USBOTG_DATA0,
-+ PC10_PF_USBOTG_DATA2,
-+ PC11_PF_USBOTG_DATA1,
-+ PC12_PF_USBOTG_DATA4,
-+ PC13_PF_USBOTG_DATA3,
-+ /* UART3 */
-+ PE8_PF_UART3_TXD,
-+ PE9_PF_UART3_RXD,
-+ PE10_PF_UART3_CTS,
-+ PE11_PF_UART3_RTS,
-+ /* ETHERNET */
-+ PD0_AIN_FEC_TXD0,
-+ PD1_AIN_FEC_TXD1,
-+ PD2_AIN_FEC_TXD2,
-+ PD3_AIN_FEC_TXD3,
-+ PD4_AOUT_FEC_RX_ER,
-+ PD5_AOUT_FEC_RXD1,
-+ PD6_AOUT_FEC_RXD2,
-+ PD7_AOUT_FEC_RXD3,
-+ PD8_AF_FEC_MDIO,
-+ PD9_AIN_FEC_MDC,
-+ PD10_AOUT_FEC_CRS,
-+ PD11_AOUT_FEC_TX_CLK,
-+ PD12_AOUT_FEC_RXD0,
-+ PD13_AOUT_FEC_RX_DV,
-+ PD14_AOUT_FEC_RX_CLK,
-+ PD15_AOUT_FEC_COL,
-+ PD16_AIN_FEC_TX_ER,
-+ PF23_AIN_FEC_TX_EN,
-+ /* I2C2 */
-+ PC5_PF_I2C2_SDA,
-+ PC6_PF_I2C2_SCL,
-+};
-+
-+/* APF27 has an "on module" Ethernet transceiver */
-+int lan8700_wakeup(struct phy_device *phydev)
-+{
-+#define LAN87xx_SPECIAL_REG 0x12
-+
-+ int rc = phy_read(phydev, LAN87xx_SPECIAL_REG);
-+
-+ phy_write(phydev, LAN87xx_SPECIAL_REG, rc | 0xE0);
-+ phy_write(phydev, MII_BMCR, BMCR_RESET);
-+ udelay(1000);
-+ return 0;
-+}
-+
-+/* APF27 has a Micron 128MiB 1,8V NAND flash, 16 bits width */
-+/* Need of partitions table until U-Boot is synchro with mainline Linux ?? */
-+static struct mtd_partition apf27_nand_partitions[] = {
-+ {
-+ .name = "u-boot",
-+ .offset = 0x0,
-+ .size = 1024*1024,
-+ }, {
-+ .name = "env",
-+ .offset = MTDPART_OFS_APPEND,
-+ .size = 512*1024,
-+ }, {
-+ .name = "env2",
-+ .offset = MTDPART_OFS_APPEND,
-+ .size = 512*1024,
-+ }, {
-+ .name = "firmware",
-+ .offset = MTDPART_OFS_APPEND,
-+ .size = 512*1024,
-+ }, {
-+ .name = "dtb",
-+ .offset = MTDPART_OFS_APPEND,
-+ .size = 512*1024,
-+ }, {
-+ .name = "kernel",
-+ .offset = MTDPART_OFS_APPEND,
-+ .size = 5*1024*1024,
-+ }, {
-+ .name = "rootfs",
-+ .offset = MTDPART_OFS_APPEND,
-+ .size = MTDPART_SIZ_FULL,
-+ },
-+};
-+
-+static const struct mxc_nand_platform_data apf27_nand_board_info __initconst = {
-+ .width = 2,
-+ .hw_ecc = 1,
-+ .flash_bbt = 1, /* we handle Bad Block Table */
-+ .parts = apf27_nand_partitions,
-+ .nr_parts = ARRAY_SIZE(apf27_nand_partitions),
-+};
-+
-+/* APF27 has an I2C EEPROM on I2C2 Bus */
-+static const struct imxi2c_platform_data apf27_i2c_1_data __initconst = {
-+ .bitrate = 100000,
-+};
-+
-+static struct i2c_board_info apf27_i2c_devices_bus1[] = {
-+ {
-+ I2C_BOARD_INFO("24c02", 0x50),
-+ },
-+};
-+
-+/* APF27 has an RS232 debug port/console on UART1 with "on module"
-+ transceiver */
-+static struct imxuart_platform_data uart0_pdata = {
-+ .flags = 0,
-+};
-+
-+/* APF27 has an "on module" transceiver for UART3 */
-+static struct imxuart_platform_data uart2_pdata = {
-+ .flags = IMXUART_HAVE_RTSCTS,
-+};
-+
-+/* APF27 has an "on module" transceiver for USB OTG */
-+static int otg_mode_host = 1;
-+
-+static int __init apf27_otg_mode(char *options)
-+{
-+ if (!strcmp(options, "host"))
-+ otg_mode_host = 1;
-+ else if (!strcmp(options, "device"))
-+ otg_mode_host = 0;
-+ else
-+ pr_info("otg_mode neither \"host\" nor \"device\". "
-+ "Defaulting to host\n");
-+
-+ return 0;
-+}
-+__setup("otg_mode=", apf27_otg_mode);
-+
-+static void apf27_usbotg_phy_init(void)
-+{
-+#define USBCTRL_OFFSET 0x600
-+#define USBCTRL_UIE_BIT (1 << 28)
-+#define USBCTRL_WIE_BIT (1 << 27)
-+#define USBCMD_OFFSET 0x140
-+#define USBCMD_RST_BIT (1 << 1)
-+#define PORTSC1_OFFSET 0x184
-+#define PORTSC_PTS_MASK (3 << 30)
-+#define PORTSC_PTS_ULPI (2 << 30)
-+
-+ unsigned int reg;
-+
-+ /* Tweak power/wake up handling */
-+ reg = readl(MX27_IO_ADDRESS(MX27_USB_BASE_ADDR + USBCTRL_OFFSET));
-+ reg |= USBCTRL_WIE_BIT | USBCTRL_UIE_BIT;
-+ writel(reg, MX27_IO_ADDRESS(MX27_USB_BASE_ADDR + USBCTRL_OFFSET));
-+
-+ /* Select ULPI PHY */
-+ reg = readl(MX27_IO_ADDRESS(MX27_USB_BASE_ADDR + PORTSC1_OFFSET));
-+ reg = (reg & ~PORTSC_PTS_MASK) | PORTSC_PTS_ULPI;
-+ printk("---%s %d\n", __func__, __LINE__);
-+ writel(reg, MX27_IO_ADDRESS(MX27_USB_BASE_ADDR + PORTSC1_OFFSET));
-+ mdelay(10);
-+
-+ printk("---%s %d\n", __func__, __LINE__);
-+ /* Reset PHY */
-+ reg = readl(MX27_IO_ADDRESS(MX27_USB_BASE_ADDR + USBCMD_OFFSET));
-+ reg |= USBCMD_RST_BIT;
-+ writel(reg, MX27_IO_ADDRESS(MX27_USB_BASE_ADDR + USBCMD_OFFSET));
-+ mdelay(10);
-+}
-+
-+static int apf27_otg_init(struct platform_device *pdev)
-+{
-+ int ret;
-+
-+ ret = mx27_initialize_usb_hw(pdev->id, MXC_EHCI_INTERFACE_DIFF_UNI);
-+ apf27_usbotg_phy_init(); /* PHY is in powerdown mode by default */
-+
-+ return ret;
-+}
-+
-+static struct mxc_usbh_platform_data otg_pdata __initdata = {
-+ .init = apf27_otg_init,
-+ .portsc = MXC_EHCI_MODE_ULPI,
-+};
-+
-+static const struct fsl_usb2_platform_data otg_device_pdata __initconst = {
-+ .operating_mode = FSL_USB2_DR_DEVICE,
-+ .phy_mode = FSL_USB2_PHY_ULPI,
-+};
-+
-+static void __init apf27_init(void)
-+{
-+ int ret;
-+
-+ imx27_soc_init();
-+ ret = mxc_gpio_setup_multiple_pins(apf27_pins,
-+ ARRAY_SIZE(apf27_pins), "APF27");
-+ if (ret)
-+ printk(KERN_ERR "apf27: Failed to setup pins (%d)\n", ret);
-+
-+ imx27_add_imx_uart0(&uart0_pdata);
-+ imx27_add_imx_uart2(&uart2_pdata);
-+
-+ /* bring lan8700 out of power down mode */
-+ phy_register_fixup_for_id("imx27-fec-1:1f", lan8700_wakeup);
-+ imx27_add_fec(NULL);
-+
-+ imx27_add_mxc_nand(&apf27_nand_board_info);
-+
-+ imx27_add_imx2_wdt();
-+
-+ if (otg_mode_host) {
-+ otg_pdata.otg = imx_otg_ulpi_create(ULPI_OTG_DRVVBUS |
-+ ULPI_OTG_DRVVBUS_EXT);
-+ if (otg_pdata.otg)
-+ imx27_add_mxc_ehci_otg(&otg_pdata);
-+ }
-+ if (!otg_mode_host)
-+ imx27_add_fsl_usb2_udc(&otg_device_pdata);
-+
-+ i2c_register_board_info(1, apf27_i2c_devices_bus1,
-+ ARRAY_SIZE(apf27_i2c_devices_bus1));
-+ imx27_add_imx_i2c(1, &apf27_i2c_1_data);
-+}
-+
-+static void __init apf27_timer_init(void)
-+{
-+ mx27_clocks_init(26000000); /* init ext ref, even if not used */
-+}
-+
-+MACHINE_START(APF27, "Armadeus APF27")
-+ /* Maintainer: Julien Boibessot <jul...@ar...> */
-+ .atag_offset = 0x100,
-+ .map_io = mx27_map_io,
-+ .init_early = imx27_init_early,
-+ .init_irq = mx27_init_irq,
-+ .handle_irq = imx27_handle_irq,
-+ .init_time = apf27_timer_init,
-+ .init_machine = apf27_init,
-+ .restart = mxc_restart,
-+MACHINE_END
-Index: linux-3.9.1/arch/arm/tools/mach-types
-===================================================================
---- linux-3.9.1.orig/arch/arm/tools/mach-types
-+++ linux-3.9.1/arch/arm/tools/mach-types
-@@ -297,6 +297,7 @@ smdk2416 MACH_SMDK2416 SMDK2416 1685
- wbd111 MACH_WBD111 WBD111 1690
- mv2120 MACH_MV2120 MV2120 1693
- mx51_3ds MACH_MX51_3DS MX51_3DS 1696
-+apf27 MACH_APF27 APF27 1698
- imx27lite MACH_IMX27LITE IMX27LITE 1701
- usb_a9260 MACH_USB_A9260 USB_A9260 1709
- usb_a9263 MACH_USB_A9263 USB_A9263 1710
diff --git a/patches/linux/3.13/0201-armadeus-add_apf27dev_baseboard.patch b/patches/linux/3.13/0201-armadeus-add_apf27dev_baseboard.patch
deleted file mode 100644
index 11b2aa1..0000000
--- a/patches/linux/3.13/0201-armadeus-add_apf27dev_baseboard.patch
+++ /dev/null
@@ -1,1510 +0,0 @@
-
-Adds support for Armadeus Systems APF27Dev baseboard and APW extension board.
-
-Signed-off-by: Fabien Marteau <fab...@ar...>
-Signed-off-by: Julien Boibessot <jul...@ar...>
-Signed-off-by: Nicolas Colombain <nic...@ar...>
-Signed-off-by: Eric Jarrige <eri...@ar...>
-Signed-off-by: Jeremie Scheer <jer...@ar...>
-Signed-off-by: Kevin Joly <jol...@gm...>
-
-Index: linux-3.8-rc1/arch/arm/mach-imx/apf27-dev.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8-rc1/arch/arm/mach-imx/apf27-dev.c 2013-01-02 12:12:28.000000000 +0100
-@@ -0,0 +1,1009 @@
-+ /*
-+ * apf27-dev.c
-+ * Support for AFP27 module's development baseboard
-+ *
-+ * Copyright (C) 2009-2012 Armadeus Systems
-+ * Authors: Julien Boibessot <jul...@ar...>
-+ * Nicolas Colombain <nic...@ar...>
-+ *
-+ * Based on code which is:
-+ * Copyright 2007 Robert Schwebel <r.s...@pe...>, Pengutronix
-+ * Copyright (C) 2009 Sascha Hauer (ke...@pe...)
-+ * + Freescale
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ */
-+
-+#define IMX_NEEDS_DEPRECATED_SYMBOLS
-+
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spidev.h>
-+#include <linux/gpio_keys.h>
-+#include <linux/i2c.h>
-+#include <linux/input.h>
-+#include <linux/leds.h>
-+#include <linux/serial.h>
-+#include <linux/delay.h>
-+#include <linux/irq.h>
-+#include <linux/cpufreq.h>
-+#include <linux/clk.h>
-+#include <linux/dma-mapping.h>
-+#ifdef CONFIG_FB_IMX
-+#include <linux/platform_data/video-imxfb.h>
-+#endif
-+
-+#include <asm/io.h>
-+#include <linux/gpio.h> /* gpio_to_irq */
-+#include <asm/mach/arch.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/time.h>
-+#include <linux/fb.h>
-+#ifdef CONFIG_MAX1027
-+#include <linux/spi/max1027.h>
-+#endif
-+//#ifdef CONFIG_TSC2102
-+#include <linux/spi/tsc2102.h>
-+//#endif
-+#include <linux/can/platform/mcp251x.h>
-+#if 0
-+#include "../../../drivers/armadeus/pwm/pwm.h"
-+#include <mach/imx_dam.h>
-+#include <mach/imx_sound.h>
-+#include <mach/imx-alsa.h>
-+#include <mach/imx_cam.h>
-+#endif
-+//#include <mach/ssi.h>
-+
-+#ifdef CONFIG_AD9889
-+#include <media/ad9889.h>
-+#endif
-+
-+#include <media/soc_camera.h>
-+#if defined(CONFIG_CPU_FREQ_IMX27) || defined(CONFIG_CPU_FREQ_IMX27_MODULE)
-+#include "cpufreq_imx.h"
-+#endif
-+//#include <mach/board-apf27.h>
-+#include <asm/mach/map.h>
-+
-+#include "devices-imx27.h"
-+#include "common.h"
-+#include "hardware.h"
-+#include "iomux-mx27.h"
-+#include "ulpi.h"
-+//#include "crm_regs.h"
-+#include "mx27.h"
-+
-+#define VA_GPIO_BASE MX27_IO_ADDRESS(MX27_GPIO_BASE_ADDR)
-+
-+#if defined(CONFIG_FB_IMX)
-+extern void apf27_lcd_init(void);
-+#endif
-+#ifdef CONFIG_MACH_APF27_DEV_EXT
-+extern void apf27dev_extension_init(void);
-+extern void apf27dev_extension_resume(void);
-+extern void apf27dev_extension_suspend(void);
-+#endif
-+
-+#ifdef CONFIG_ARMADEUS_MAX1027_MODULE
-+#define CONFIG_ARMADEUS_MAX1027 1
-+#endif
-+#ifdef CONFIG_SPI_TSC2102_MODULE
-+#define CONFIG_SPI_TSC2102 1
-+#endif
-+#ifdef CONFIG_CAN_MCP251X_MODULE
-+#define CONFIG_CAN_MCP251X 1
-+#endif
-+#ifdef CONFIG_SPI_SPIDEV_MODULE
-+#define CONFIG_SPI_SPIDEV 1
-+#endif
-+#ifdef CONFIG_IMX_BACKLIGHT_MODULE
-+#define CONFIG_IMX_BACKLIGHT
-+#endif
-+#ifdef CONFIG_VIDEO_AD9889_MODULE
-+#define CONFIG_VIDEO_AD9889 1
-+#endif
-+#ifdef CONFIG_VIDEO_MX27_MODULE
-+#define CONFIG_VIDEO_MX27 1
-+#endif
-+#ifdef CONFIG_SOC_CAMERA_OV96XX_MODULE
-+#define CONFIG_SOC_CAMERA_OV96XX 1
-+#endif
-+#ifdef CONFIG_ARMADEUS_PWM_DRIVER_MODULE
-+#define CONFIG_PWM
-+#endif
-+
-+#define TSC2101_INT 17
-+#define CONFIG_SPI_MXC_SELECT1
-+
-+#define SPI1_SS0 IMX_GPIO_NR(4, 28)
-+#define TSC2101_INT_GPIO IMX_GPIO_NR(6, TSC2101_INT)
-+#define USER_LED IMX_GPIO_NR(6, 14) /* PF14 */
-+#define USER_BUTTON IMX_GPIO_NR(6, 13) /* PF13 */
-+
-+static int apf27dev_pins[] = {
-+ /* I2C1 */
-+ PD17_PF_I2C_DATA,
-+ PD18_PF_I2C_CLK,
-+ /* USBH1 */
-+ PB22_PF_USBH1_SUSP,
-+ PB23_PF_USB_PWR,
-+ PB24_PF_USB_OC,
-+ PB25_PF_USBH1_RCV,
-+ PB26_PF_USBH1_FS,
-+ PB27_PF_USBH1_OE,
-+ PB28_PF_USBH1_TXDM,
-+ PB29_PF_USBH1_TXDP,
-+ PB30_PF_USBH1_RXDM,
-+ PB31_PF_USBH1_RXDP,
-+ /* SPI1 */
-+#ifdef CONFIG_SPI_MXC_SELECT1
-+ /* PD28_PF_CSPI1_SS0, Preferably use CS pin as GPIO */
-+ PD29_PF_CSPI1_SCLK,
-+ PD30_PF_CSPI1_MISO,
-+ PD31_PF_CSPI1_MOSI,
-+ SPI1_SS0 | GPIO_GPIO | GPIO_OUT,
-+#endif
-+ /* SPI2 */
-+#ifdef CONFIG_SPI_MXC_SELECT2
-+ /* PD19_PF_CSPI2_SS2,
-+ PD20_PF_CSPI2_SS1, Preferably use CS pin as GPIO
-+ PD21_PF_CSPI2_SS0, */
-+ PD22_PF_CSPI2_SCLK,
-+ PD23_PF_CSPI2_MISO,
-+ PD24_PF_CSPI2_MOSI,
-+#endif
-+ /* SPI3 */
-+#ifdef CONFIG_SPI_MXC_SELECT3
-+ /*
-+ PE21_AF_CSPI3_SS,
-+ Preferably use CS pin as GPIO
-+ */
-+ PE23_AF_CSPI3_SCLK,
-+ PE18_AF_CSPI3_MISO,
-+ PE22_AF_CSPI3_MOSI,
-+#endif
-+ /* UART2 (J8 connector / multiplexed with Keypad) */
-+#ifdef CONFIG_SERIAL_IMX_UART2
-+# ifdef CONFIG_SERIAL_IMX_UART2_USE_RTSCTS
-+ PE3_PF_UART2_CTS,
-+ PE4_PF_UART2_RTS,
-+# endif
-+ PE6_PF_UART2_TXD,
-+ PE7_PF_UART2_RXD,
-+#endif
-+ /* UART5 (J9 connector / multiplexed with CSI) */
-+#ifdef CONFIG_SERIAL_IMX_UART5
-+ PB18_AF_UART5_TXD,
-+ PB19_AF_UART5_RXD,
-+# ifdef CONFIG_SERIAL_IMX_UART5_USE_RTSCTS
-+ PB20_AF_UART5_CTS,
-+ PB21_AF_UART5_RTS,
-+# endif
-+#endif
-+ /* UART6 (J9 connector / multiplexed with CSI) */
-+#ifdef CONFIG_SERIAL_IMX_UART6
-+ PB10_AF_UART6_TXD,
-+ PB11_AF_UART6_RXD,
-+# ifdef CONFIG_SERIAL_IMX_UART6_USE_RTSCTS
-+ PB12_AF_UART6_CTS,
-+ PB13_AF_UART6_RTS,
-+# endif
-+#endif
-+ /* SSI1 */
-+ PC20_PF_SSI1_FS,
-+ PC21_PF_SSI1_RXD,
-+ PC22_PF_SSI1_TXD,
-+ PC23_PF_SSI1_CLK,
-+ /* SDHC2 */
-+ PB4_PF_SD2_D0,
-+ PB5_PF_SD2_D1,
-+ PB6_PF_SD2_D2,
-+ PB7_PF_SD2_D3,
-+ PB8_PF_SD2_CMD,
-+ PB9_PF_SD2_CLK,
-+ /* GPIOs */
-+ /* CS can be used as GPIO too, if communication with TSC is deactivated (thanks
-+ to TXB0108 chip (U23). INT pin can't and so must be reserved in any case */
-+ TSC2101_INT_GPIO | GPIO_IN | GPIO_GPIO,
-+ USER_LED | GPIO_GPIO | GPIO_OUT,
-+ USER_BUTTON | GPIO_GPIO | GPIO_IN,
-+};
-+
-+
-+#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
-+static struct gpio_keys_button apf27dev_gpio_keys[] = {
-+ {
-+ .code = BTN_EXTRA, /* See include/linux/input.h */
-+ .gpio = USER_BUTTON,
-+ .active_low = 1,
-+ .desc = "s1", /* Button description*/
-+ .wakeup = 0,
-+ },
-+};
-+
-+static struct gpio_keys_platform_data apf27dev_gpio_keys_data = {
-+ .buttons = apf27dev_gpio_keys,
-+ .nbuttons = ARRAY_SIZE(apf27dev_gpio_keys),
-+};
-+
-+static struct platform_device apf27dev_gpio_keys_device = {
-+ .name = "gpio-keys",
-+ .id = -1,
-+ .dev = {
-+ .platform_data = &apf27dev_gpio_keys_data,
-+ },
-+};
-+#endif /* CONFIG_KEYBOARD_GPIO */
-+
-+#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)
-+static struct gpio_led apf27dev_led[] = {
-+ {
-+ .name = "apfdev:green:user",
-+ .default_trigger = "heartbeat",
-+ .gpio = USER_LED,
-+ .active_low = 1,
-+ },
-+};
-+
-+static struct gpio_led_platform_data apf27dev_led_data = {
-+ .num_leds = ARRAY_SIZE(apf27dev_led),
-+ .leds = apf27dev_led
-+};
-+
-+static struct platform_device apf27dev_led_dev = {
-+ .name = "leds-gpio",
-+ .id = -1,
-+ .dev = {
-+ .platform_data = &apf27dev_led_data,
-+ },
-+};
-+#endif /* CONFIG_LEDS_GPIO */
-+
-+#ifdef CONFIG_I2C
-+
-+/* APF27Dev makes I2C1 bus available */
-+
-+static struct imxi2c_platform_data apf27dev_i2c0_data __initconst = {
-+ .bitrate = 400000,
-+};
-+
-+/* I2C1 devices: RTC & Optionnal Camera */
-+# ifdef CONFIG_SOC_CAMERA_OV96XX
-+static struct soc_camera_link ov96xx_iclink; /* declared later */
-+#endif
-+
-+static struct i2c_board_info apf27dev_i2c0_devices[] = {
-+ [0] = {
-+ /* APF27Dev has an RTC */
-+ .type = "ds1374",
-+ .addr = 0x68, /* E0=0, E1=1, E2=0 */
-+ },
-+# ifdef CONFIG_SOC_CAMERA_OV96XX
-+ [1] = {
-+ .type = "ov96xx",
-+ .addr = 0x30,
-+ .platform_data = &ov96xx_iclink,
-+ },
-+# endif
-+};
-+
-+
-+/* APF27Dev has an optionnal HDMI video output (controlled with I2C2) */
-+# ifdef CONFIG_VIDEO_AD9889
-+#define AD9889_INT 15
-+
-+static int ad9889_pins[] = {
-+ (GPIO_PORTC | GPIO_IN | GPIO_GPIO | AD9889_INT),
-+};
-+
-+static int ad9889_init(void)
-+{
-+ return mxc_gpio_setup_multiple_pins(ad9889_pins, ARRAY_SIZE(ad9889_pins),
-+ "AD9889");
-+}
-+
-+static int ad9889_exit(void)
-+{
-+ mxc_gpio_release_multiple_pins(ad9889_pins, ARRAY_SIZE(ad9889_pins));
-+
-+ return 0;
-+}
-+
-+struct ad9889_fb_data {
-+ struct fb_var_screeninfo var;
-+ int PA31_GIUS_old_state;
-+};
-+
-+static struct ad9889_fb_data apf27_ad9889_fb_data;
-+extern void console_lock(void);
-+extern void console_unlock(void);
-+
-+static void ad9889_display_connected(void)
-+{
-+ struct fb_var_screeninfo temp_var;
-+ struct fb_info *info = registered_fb[0];
-+
-+ apf27_ad9889_fb_data.PA31_GIUS_old_state = 0;
-+ /* make sure the LCD OE_ACD pin is correctly configured */
-+ if (__raw_readl(VA_GPIO_BASE + MXC_GIUS(0)) & 0x80000000) {
-+ apf27_ad9889_fb_data.PA31_GIUS_old_state = 1;
-+ mxc_gpio_mode(PA31_PF_OE_ACD);
-+ }
-+
-+ /* save old FB params */
-+ memcpy(&apf27_ad9889_fb_data.var, &info->var, sizeof(struct fb_var_screeninfo));
-+ memcpy(&temp_var, &info->var, sizeof(struct fb_var_screeninfo));
-+
-+ /* set new FB params */
-+ temp_var.xres = 640;
-+ temp_var.yres = 480;
-+ temp_var.xres_virtual = 640;
-+ temp_var.yres_virtual = 480;
-+ temp_var.pixclock = 37538;
-+ temp_var.left_margin = 47;
-+ temp_var.right_margin = 47; /* at least 3 & 1 */
-+ temp_var.upper_margin = 33;
-+ temp_var.lower_margin = 10;
-+ temp_var.hsync_len = 63;
-+ temp_var.vsync_len = 2;
-+# ifdef CONFIG_FB_MXC
-+ temp_var.sync = FB_SYNC_OE_ACT_HIGH; /* -> Will change PCR */
-+# endif
-+ temp_var.vmode = FB_VMODE_NONINTERLACED,
-+ temp_var.nonstd = 0;
-+
-+ console_lock();
-+ /* tel the FB client that params have been changed */
-+ info->flags |= FBINFO_MISC_USEREVENT;
-+ /* set new params */
-+ fb_set_var(info, &temp_var);
-+ info->flags &= ~FBINFO_MISC_USEREVENT;
-+ console_unlock();
-+}
-+
-+static void ad9889_display_disconnected(void)
-+{
-+ struct fb_info *info = registered_fb[0];
-+
-+ /* restore LCD OE_ACD pin */
-+ if (apf27_ad9889_fb_data.PA31_GIUS_old_state)
-+ mxc_gpio_mode(GPIO_PORTA | 31 | GPIO_OUT| GPIO_GPIO);
-+
-+ console_lock();
-+ /* inform the console that the FB params have been changed */
-+ info->flags |= FBINFO_MISC_USEREVENT;
-+ /* restore old FB params */
-+ fb_set_var(info, &apf27_ad9889_fb_data.var);
-+ info->flags &= ~FBINFO_MISC_USEREVENT;
-+ console_unlock();
-+}
-+
-+static struct ad9889_config apf27_ad9889_config = {
-+ .init = ad9889_init,
-+ .exit = ad9889_exit,
-+ .display_connected = ad9889_display_connected,
-+ .display_disconnected = ad9889_display_disconnected,
-+ .data = &apf27_ad9889_fb_data,
-+ .EDID_I2C_addr = 0x3f
-+};
-+# endif /* CONFIG_VIDEO_AD9889 */
-+
-+
-+/* I2C2 devices */
-+static struct i2c_board_info apf27dev_i2c1_devices[] = {
-+# ifdef CONFIG_VIDEO_AD9889
-+ [0] = {
-+ .type = "ad9889",
-+ .addr = 0x39,
-+ .platform_data = &apf27_ad9889_config,
-+ .irq = IRQ_GPIOC(AD9889_INT)
-+ },
-+# endif
-+};
-+#endif /* CONFIG_I2C */
-+
-+
-+/* UART2 signals are available on J8 connector (multiplexed with Keypad) */
-+#ifdef CONFIG_SERIAL_IMX_UART2
-+static struct imxuart_platform_data uart1_pdata = {
-+# ifdef CONFIG_SERIAL_IMX_UART2_USE_RTSCTS
-+ .flags = IMXUART_HAVE_RTSCTS,
-+# else
-+ .flags = 0,
-+# endif
-+};
-+#endif
-+
-+
-+/* UART5 signals are available on J9 connector (multiplexed with CSI) */
-+#ifdef CONFIG_SERIAL_IMX_UART5
-+static struct imxuart_platform_data uart4_pdata = {
-+#ifdef CONFIG_SERIAL_IMX_UART5_USE_RTSCTS
-+ .flags = IMXUART_HAVE_RTSCTS,
-+#else
-+ .flags = 0,
-+#endif
-+};
-+#endif
-+
-+/* UART6 signals are available on J9 connector (multiplexed with CSI) */
-+#ifdef CONFIG_SERIAL_IMX_UART6
-+static struct imxuart_platform_data uart5_pdata = {
-+#ifdef CONFIG_SERIAL_IMX_UART6_USE_RTSCTS
-+ .flags = IMXUART_HAVE_RTSCTS,
-+#else
-+ .flags = 0,
-+#endif
-+};
-+#endif
-+
-+
-+/* SPI ports declarations */
-+
-+#ifdef CONFIG_SPI_MXC_SELECT1
-+static int apf27_dev_spi0_cs[] = {
-+ SPI1_SS0, /* 0: MAX1027 */
-+};
-+
-+static struct spi_imx_master apf27dev_spi0_data = {
-+ .chipselect = apf27_dev_spi0_cs,
-+ .num_chipselect = ARRAY_SIZE(apf27_dev_spi0_cs),
-+};
-+#endif
-+
-+#ifdef CONFIG_SPI_MXC_SELECT2
-+static int apf27_dev_spi1_cs[] = {
-+ (GPIO_PORTD + 21), /* 0: SPI2_SS0 used as GPIO for TSC2101_CS */
-+ (GPIO_PORTD + 20), /* 1: MCP251X_CS */
-+ (GPIO_PORTB + 17), /* 2: SPIDEV_CS (CSI_D5) */
-+};
-+
-+static struct spi_imx_master apf27dev_spi1_data = {
-+ .chipselect = apf27_dev_spi1_cs,
-+ .num_chipselect = ARRAY_SIZE(apf27_dev_spi1_cs),
-+};
-+#endif
-+
-+#ifdef CONFIG_SPI_MXC_SELECT3
-+static int apf27_dev_spi2_cs[] = {
-+};
-+
-+static struct spi_imx_master apf27dev_spi2_data = {
-+ .chipselect = apf27_dev_spi2_cs,
-+ .num_chipselect = ARRAY_SIZE(apf27_dev_spi2_cs),
-+};
-+#endif
-+
-+
-+/* APF27Dev has an optionnal 7 channels 10 bits ADC (on SPI1) */
-+#define MAX1027_EOC_INT 15
-+#define MAX1027_CNVST 14
-+
-+#ifdef CONFIG_MAX1027
-+static int max1027_pins[] = {
-+ (GPIO_PORTE | GPIO_IN | GPIO_GPIO | MAX1027_EOC_INT),
-+ (GPIO_PORTE | GPIO_OUT | GPIO_GPIO | MAX1027_CNVST),
-+};
-+
-+static int max1027_init(struct spi_device *spi)
-+{
-+ return mxc_gpio_setup_multiple_pins(max1027_pins, ARRAY_SIZE(max1027_pins), "MAX1027");
-+}
-+
-+static int max1027_exit(struct spi_device *spi)
-+{
-+ return 0;
-+}
-+
-+static struct max1027_config apf27_max1027_config = {
-+ .conv = MAX1027_CONV_DEFAULT,
-+ .setup = MAX1027_SETUP_DEFAULT,
-+ .avg = MAX1027_AVG_DEFAULT,
-+ .cnvst_pin = (int)(MAX1027_CNVST|GPIO_PORTE),
-+ .init = max1027_init,
-+ .exit = max1027_exit
-+};
-+#endif /* CONFIG_MAX1027 */
-+
-+/* APF27Dev has a SPI Touchscreen controller */
-+
-+static struct tsc210x_config apf27_tsc2101_config = {
-+ .mclk = 12288000, /* MCLK value in Master mode */
-+ .use_internal = 1, /* -> use internal voltage reference */
-+ .monitor = TSC_BAT1 | TSC_AUX | TSC_TEMP,
-+};
-+
-+/* APF27Dev has an optional CAN Bus controller */
-+#ifdef CONFIG_CAN_MCP251X
-+
-+#define CAN_MCP251X_INT 19
-+
-+static int mcp251x_pins[] = {
-+ (GPIO_PORTD | CAN_MCP251X_INT | GPIO_IN | GPIO_GPIO), /* IRQ pin as GPIO */
-+};
-+
-+static int mcp251x_init_irq(struct spi_device *spi)
-+{
-+ printk("%s \n", __func__);
-+
-+ /* Still needed here ?? */
-+ mxc_gpio_setup_multiple_pins(mcp251x_pins, ARRAY_SIZE(mcp251x_pins), "MCP251x");
-+
-+ return 0;
-+}
-+
-+static struct mcp251x_platform_data apf27_mcp251x_config = {
-+ .oscillator_frequency = 16000000,
-+ .board_specific_setup = mcp251x_init_irq,
-+};
-+#endif /* CONFIG_CAN_MCP251X */
-+
-+
-+static struct spi_board_info apf27dev_spi_board_info[] __initdata = {
-+ {
-+ .modalias = "max1027",
-+ .max_speed_hz = 8000000,
-+ .bus_num = 0, /* SPI1 */
-+// .irq = IRQ_GPIOE(MAX1027_EOC_INT),
-+ .chip_select = 0, /* SS0 */
-+ .mode = 0,
-+#ifdef CONFIG_MAX1027
-+ .platform_data = &apf27_max1027_config,
-+#endif
-+ },
-+ {
-+ .modalias = "tsc210x",
-+ .max_speed_hz = 8000000,
-+ .bus_num = 1, /* SPI2 */
-+// .irq = IRQ_GPIOF(TSC2101_INT),
-+ .chip_select = 0,
-+ .mode = 0,
-+ .platform_data = &apf27_tsc2101_config,
-+ },
-+#ifdef CONFIG_CAN_MCP251X
-+ {
-+ .modalias = "mcp2515",
-+ .max_speed_hz = 8000000, /* 8MHz */
-+ .bus_num = 1, /* SPI2 */
-+ .mode = 0,
-+ .chip_select = 1,
-+// .irq = IRQ_GPIOD(CAN_MCP251X_INT),
-+ .platform_data = &apf27_mcp251x_config,
-+ },
-+#endif
-+#ifdef CONFIG_SPI_SPIDEV
-+/* SPI2 can be used as userspace general SPI bus (CS 2) */
-+ {
-+ .modalias = "spidev",
-+ .max_speed_hz = 8000000, /* 8MHz */
-+ .bus_num = 1, /* SPI2 */
-+ .mode = SPI_MODE_1,
-+ .chip_select = 2,
-+ },
-+#endif
-+};
-+
-+/* APF27Dev adds an USB PHY on i.MX27 USB_HOST 1 */
-+#if 0
-+static int apf27_usbh1_init(struct platform_device *pdev)
-+{
-+ int ret = 0;
-+ uint32_t temp;
-+ struct clk *usbclk;
-+ void __iomem *usb_base;
-+ void __iomem *usbreg_base;
-+
-+ usb_base = ioremap(OTG_BASE_ADDR, SZ_4K);
-+
-+ printk("-------- apf27_usbh1_init\n");
-+
-+ usbclk = clk_get(&pdev->dev, "usb");
-+ /* no clock -> no access to USB regs ! */
-+
-+ usbreg_base = usb_base + 0x600;
-+ temp = __raw_readl(usbreg_base);
-+ pr_debug("USB_CTRL before: 0x%08x\n", temp);
-+ temp &= ~( (3 << 13) | (1 << 8) | 1 );
-+ temp |= (1 << 4) | (1 << 11) ;
-+ __raw_writel(temp, usbreg_base);
-+ pr_debug("USB_CTRL after: 0x%08x\n", temp);
-+
-+ usbreg_base = usb_base + 0x384;
-+ temp = __raw_readl(usbreg_base);
-+ pr_debug("PORTSC1 before: 0x%08x\n", temp);
-+ temp &= ~(3 << 30);
-+ temp |= 3 << 30;
-+ __raw_writel(temp, usbreg_base);
-+ pr_debug("PORTSC1 after: 0x%08x\n", temp);
-+ mdelay(10);
-+
-+ usbreg_base = usb_base + 0x340;
-+ temp = __raw_readl(usbreg_base);
-+ temp |= 0x02; /* reset controller */
-+ __raw_writel(temp, usbreg_base);
-+ pr_debug("reset controller: 0x%08x\n", temp);
-+ mdelay(10);
-+
-+ iounmap(usb_base);
-+
-+ return ret;
-+}
-+#endif
-+
-+static int apf27dev_usbh1_init(struct platform_device *pdev)
-+{
-+ printk("--- %s\n", __func__);
-+
-+ return mx27_initialize_usb_hw(pdev->id, MXC_EHCI_POWER_PINS_ENABLED);
-+}
-+
-+struct mxc_usbh_platform_data usbh1_pdata = {
-+/* .init = apf27_usbh1_init, */
-+ .init = apf27dev_usbh1_init,
-+ .portsc = MXC_EHCI_MODE_SERIAL,
-+};
-+
-+
-+#if defined(CONFIG_SND_IMX_TSC2102) || defined(CONFIG_SND_IMX_TSC2102_MODULE)
-+static struct imx_alsa_codec_config tsc2101_alsa_pdata;
-+/*
-+static struct resource ssi_resources[] = {
-+ [0] = {
-+ .start = SSI1_BASE_ADDR,
-+ .end = SSI1_BASE_ADDR + 0x6F,
-+ .flags = IORESOURCE_MEM
-+ },
-+};
-+*/
-+static struct platform_device tsc2101_alsa_device = {
-+ .name = "tsc210x-alsa",
-+ .id = 0,
-+ .num_resources = ARRAY_SIZE(ssi_resources),
-+ .resource = ssi_resources,
-+ .dev = {
-+ .platform_data = &tsc2101_alsa_pdata,
-+ }
-+};
-+# define ALSA_SOUND &tsc2101_alsa_device,
-+#else
-+# define ALSA_SOUND
-+#endif /* CONFIG_SND_IMX_TSC2102 || CONFIG_SND_IMX_TSC2102_MODULE */
-+
-+static struct platform_device *platform_devices[] __initdata = {
-+#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)
-+ &apf27dev_led_dev,
-+#endif
-+#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
-+ &apf27dev_gpio_keys_device,
-+#endif
-+ ALSA_SOUND
-+};
-+
-+
-+/* SSI1 port is directly connected to TSC2101 and can't be used for
-+ anything else */
-+/*
-+static int gpio_ssi1_active(struct platform_device *pdev)
-+{
-+ int err;
-+
-+ err = mxc_gpio_setup_multiple_pins(mxc_ssi1_pins,
-+ ARRAY_SIZE(mxc_ssi1_pins), "mx2-sound");
-+ if (err < 0)
-+ pr_err("Failed to register SSI pins\n");
-+
-+ return err;
-+}
-+
-+static int gpio_ssi1_inactive(struct platform_device *pdev)
-+{
-+ mxc_gpio_release_multiple_pins(mxc_ssi1_pins, ARRAY_SIZE(mxc_ssi1_pins));
-+ return 0;
-+}
-+*/
-+
-+static struct imx_ssi_platform_data apf27_ssi0_pdata = {
-+ .flags = 0, /* TBDJB
-+ .init = gpio_ssi1_active,
-+ .exit = gpio_ssi1_inactive */
-+};
-+
-+
-+/* APF27Dev has a microSD connector */
-+#ifdef CONFIG_MMC_MXC
-+#define APF27DEV_SD_DETECT IMX_GPIO_NR(2, 15)
-+static int apf27_sdhc2_init(struct device *dev, irq_handler_t detect_irq, void *data)
-+{
-+// int ret = 0;
-+
-+ return request_irq(gpio_to_irq(APF27DEV_SD_DETECT), detect_irq,
-+ IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, "sdhc2-card-detect", data);
-+/* if (ret)
-+ printk(KERN_ERR
-+ "apf27dev: Failed to request irq for sd/mmc detection\n");
-+
-+ irq_set_irq_type(gpio_to_irq(APF27DEV_SD_DETECT), IRQ_TYPE_EDGE_BOTH);
-+
-+ return ret;*/
-+}
-+
-+static void apf27_sdhc2_exit(struct device *dev, void *data)
-+{
-+ free_irq(gpio_to_irq(APF27DEV_SD_DETECT), data);
-+}
-+
-+static struct imxmmc_platform_data apf27_sdhc2_pdata __initconst = {
-+ .init = apf27_sdhc2_init,
-+ .exit = apf27_sdhc2_exit,
-+};
-+
-+#endif /* CONFIG_MMC_MXC */
-+
-+
-+/* APF27Dev can have an optionnal Camera module extension using i.MX27 CSI */
-+#ifdef CONFIG_VIDEO_MX27
-+# ifdef CONFIG_SOC_CAMERA_OV96XX
-+#define OV9653_PWRDN (GPIO_PORTC | 30) /* SSI3_TX as POWERDOWN*/
-+#define OV9653_RESET (GPIO_PORTC | 31) /* SSI3_CLK as RESET */
-+
-+static int apf27dev_ov9653_ctl_pins[] = {
-+ (OV9653_PWRDN | GPIO_OUT | GPIO_GPIO),
-+ (OV9653_RESET | GPIO_OUT | GPIO_GPIO),
-+};
-+# endif
-+
-+static int apf27dev_csi_pins[] = {
-+ PB10_PF_CSI_D0,
-+ PB11_PF_CSI_D1,
-+ PB12_PF_CSI_D2,
-+ PB13_PF_CSI_D3,
-+ PB14_PF_CSI_D4,
-+ PB15_PF_CSI_MCLK,
-+ PB16_PF_CSI_PIXCLK,
-+ PB17_PF_CSI_D5,
-+ PB18_PF_CSI_D6,
-+ PB19_PF_CSI_D7,
-+ PB20_PF_CSI_VSYNC,
-+ PB21_PF_CSI_HSYNC
-+};
-+
-+static int apf27dev_camera_init(struct platform_device *pdev)
-+{
-+# ifdef CONFIG_SOC_CAMERA_OV96XX
-+ int err;
-+
-+ /* Setup PWRDN/RESET pins default value */
-+ gpio_set_value(OV9653_PWRDN, 0);
-+ gpio_set_value(OV9653_RESET, 0);
-+ err = mxc_gpio_setup_multiple_pins(apf27dev_ov9653_ctl_pins,
-+ ARRAY_SIZE(apf27dev_ov9653_ctl_pins), "OV9653");
-+ if (err)
-+ printk("Error %s", __func__);
-+# endif
-+
-+ return mxc_gpio_setup_multiple_pins(apf27dev_csi_pins,
-+ ARRAY_SIZE(apf27dev_csi_pins), "CSI");
-+}
-+
-+static int apf27dev_camera_exit(struct platform_device *pdev)
-+{
-+# ifdef CONFIG_SOC_CAMERA_OV96XX
-+ mxc_gpio_release_multiple_pins(apf27dev_ov9653_ctl_pins,
-+ ARRAY_SIZE(apf27dev_ov9653_ctl_pins));
-+# endif
-+
-+ mxc_gpio_release_multiple_pins(apf27dev_csi_pins, ARRAY_SIZE(apf27dev_csi_pins));
-+
-+ return 0;
-+}
-+
-+struct mx27_camera_platform_data apf27_camera = {
-+ .init = apf27dev_camera_init,
-+ .exit = apf27dev_camera_exit,
-+ .clk = 26600000,
-+ .flags = MX27_CAMERA_HSYNC_HIGH | MX27_CAMERA_GATED_CLOCK |
-+ MX27_CAMERA_SWAP16,
-+};
-+
-+# ifdef CONFIG_SOC_CAMERA_OV96XX
-+static int ov96xx_power(struct device *dev, int state)
-+{
-+ printk(KERN_DEBUG "*** %s %d\n", __func__, state);
-+
-+ if (state) /* UP */
-+ gpio_set_value(OV9653_PWRDN, 0);
-+ else /* DOWN */
-+ gpio_set_value(OV9653_PWRDN, 1);
-+
-+ return 0;
-+}
-+
-+static int ov96xx_reset(struct device *dev)
-+{
-+ printk(KERN_DEBUG "*** %s\n", __func__);
-+
-+ gpio_set_value(OV9653_RESET, 1);
-+ msleep(10);
-+ gpio_set_value(OV9653_RESET, 0);
-+ msleep(10);
-+
-+ return 0;
-+}
-+
-+static struct soc_camera_link ov96xx_iclink = {
-+ .bus_id = 0,
-+ .power = ov96xx_power,
-+ .reset = ov96xx_reset,
-+};
-+# endif
-+
-+#endif /* CONFIG_VIDEO_MX27 */
-+
-+
-+/* APF27Dev power management stuff */
-+
-+#define APF27DEV_USER_SWITCH (USER_BUTTON)
-+#define APF27DEV_USER_SWITCH_IRQ (IRQ_GPIOF(13))
-+#define APF27DEV_USER_LED (USER_LED)
-+#define APF27DEV_POWER_DOWN_NOT (GPIO_PORTF | 16)
-+
-+static int apf27dev_pwr_ctl_pins[] = {
-+ (APF27DEV_POWER_DOWN_NOT | GPIO_OUT | GPIO_GPIO),
-+#ifdef CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM
-+ (APF27DEV_USER_SWITCH | GPIO_IN | GPIO_GPIO),
-+#endif
-+#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
-+ (APF27DEV_USER_LED | GPIO_OUT | GPIO_GPIO),
-+#endif
-+};
-+
-+void apf27_baseboard_resume(void)
-+{
-+#ifdef CONFIG_MACH_APF27_DEV_EXT
-+ apf27dev_extension_resume();
-+#endif
-+ gpio_set_value(APF27DEV_POWER_DOWN_NOT, 1);
-+#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
-+ gpio_set_value(GPIO_PORTF | 14, 0);
-+#endif
-+}
-+
-+void apf27_baseboard_suspend(void)
-+{
-+#ifdef CONFIG_MACH_APF27_DEV_EXT
-+ apf27dev_extension_suspend();
-+#endif
-+ gpio_set_value(APF27DEV_POWER_DOWN_NOT, 0);
-+#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
-+ gpio_set_value(GPIO_PORTF | 14, 1);
-+#endif
-+}
-+
-+#ifdef CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM
-+static irqreturn_t apf27dev_user_switch_irq_handler(int irq, void *dev_id)
-+{
-+ return IRQ_HANDLED;
-+}
-+#endif
-+
-+static int apf27dev_pwr_ctrl_gpio_active(void)
-+{
-+ int err;
-+
-+ err = mxc_gpio_setup_multiple_pins(apf27dev_pwr_ctl_pins,
-+ ARRAY_SIZE(apf27dev_pwr_ctl_pins), "pwr-ctl");
-+ if (err < 0)
-+ pr_err("Failed to register power control pins !\n");
-+
-+ gpio_set_value(APF27DEV_POWER_DOWN_NOT, 1);
-+#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
-+ gpio_set_value(GPIO_PORTF | 14, 0);
-+#endif
-+#ifdef CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM
-+ err = request_irq(APF27DEV_USER_SWITCH_IRQ, apf27dev_user_switch_irq_handler,
-+ IRQF_TRIGGER_FALLING,
-+ "PM irq", NULL);
-+ if (err < 0)
-+ pr_err("Failed to register PM irq !\n");
-+#endif
-+
-+ return err;
-+}
-+
-+void __init apf27_baseboard_init(void)
-+{
-+ int ret;
-+
-+ /* SSI unit (TBDL) */
-+// mxc_audmux_v1_configure_port(.....);
-+
-+ printk("APF27Dev baseboard\n");
-+ ret = mxc_gpio_setup_multiple_pins(apf27dev_pins,
-+ ARRAY_SIZE(apf27dev_pins), "APF27DEV");
-+ if (ret)
-+ printk(KERN_ERR "apf27dev: Failed to setup pins (%d)\n", ret);
-+
-+// imx27_add_imx_ssi(0, &apf27_ssi0_pdata);
-+
-+ /* APF27Dev has an LCD connector */
-+#ifdef CONFIG_FB_IMX
-+ apf27_lcd_init();
-+#endif
-+
-+// apf27dev_pwr_ctrl_gpio_active();
-+
-+#ifdef CONFIG_SERIAL_IMX_UART2
-+ imx27_add_imx_uart1(&uart1_pdata);
-+#endif
-+#ifdef CONFIG_SERIAL_IMX_UART5
-+ imx27_add_imx_uart4(&uart4_pdata);
-+#endif
-+#ifdef CONFIG_SERIAL_IMX_UART6
-+ imx27_add_imx_uart5(&uart5_pdata);
-+#endif
-+
-+ imx27_add_mxc_ehci_hs(1, &usbh1_pdata);
-+
-+ i2c_register_board_info(0, apf27dev_i2c0_devices,
-+ ARRAY_SIZE(apf27dev_i2c0_devices));
-+ imx27_add_imx_i2c(0, &apf27dev_i2c0_data);
-+ /* I2C2 bus already registered by APF27 module */
-+ i2c_register_board_info(1, apf27dev_i2c1_devices,
-+ ARRAY_SIZE(apf27dev_i2c1_devices));
-+
-+#ifdef CONFIG_SPI_MXC_SELECT1
-+ /* Optionnal ADC */
-+// mxc_gpio_mode(GPIO_PORTD | 28 | GPIO_GPIO | GPIO_IN), /* 0: MAX1027 */
-+ imx27_add_spi_imx0(&apf27dev_spi0_data);
-+#endif
-+#ifdef CONFIG_SPI_MXC_SELECT2
-+ /* TSC2101 + optionnal CAN */
-+ /* Can also be used as USB2 or external SPI, with jumper J23 */
-+ /* Let hardware decide the state of CS at startup */
-+ mxc_gpio_mode(GPIO_PORTD | 21 | GPIO_GPIO | GPIO_IN);
-+ mxc_gpio_mode(GPIO_PORTD | 20 | GPIO_GPIO | GPIO_IN);
-+ mxc_gpio_mode(GPIO_PORTB | 17 | GPIO_GPIO | GPIO_IN);
-+ imx27_add_spi_imx1(&apf27dev_spi1_data);
-+#endif
-+#ifdef CONFIG_SPI_MXC_SELECT3
-+ /* Output on J8 connector (muxed with SD1) */
-+ imx27_add_spi_imx2(&apf27dev_spi2_data);
-+#endif
-+ apf27dev_spi_board_info[0].irq = gpio_to_irq(MAX1027_EOC_INT);
-+ apf27dev_spi_board_info[1].irq = gpio_to_irq(TSC2101_INT);
-+ spi_register_board_info(apf27dev_spi_board_info,
-+ ARRAY_SIZE(apf27dev_spi_board_info));
-+
-+ platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
-+#if 0
-+#ifdef CONFIG_SPI_TSC2102
-+ /* Due to an hardware "bug", force TSC2101 ChipSelect at startup
-+ (on some APF27Dev boards CS stays low, due to TXB0108 chip (U23))
-+ and too weak i.MX27 internal pullup resistors */
-+ tsc2101_init_gpio();
-+ tsc2101_release_gpio();
-+#endif
-+#endif
-+
-+// imx27_add_mxc_mmc(1, &apf27_sdhc2_pdata);
-+
-+#ifdef CONFIG_VIDEO_MX27
-+ mxc_register_device(&mx27_camera_device, &apf27_camera);
-+#endif
-+#ifdef CONFIG_MACH_APF27_DEV_EXT
-+ apf27dev_extension_init();
-+#endif
-+}
-+
-Index: linux-3.8-rc1/arch/arm/mach-imx/apf27-lcd.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8-rc1/arch/arm/mach-imx/apf27-lcd.c 2013-01-02 12:43:17.000000000 +0100
-@@ -0,0 +1,156 @@
-+/*
-+ * apf27-lcd.c
-+ *
-+ * Handle support of multiple LCDs on the APF27Dev
-+ *
-+ * Copyright (C) 2009-2013 Armadeus Systems
-+ * Authors: Julien Boibessot <jul...@ar...>
-+ * Nicolas Colombain <nic...@ar...>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ */
-+
-+#ifdef CONFIG_FB_IMX
-+
-+#include <linux/fb.h>
-+#include <linux/delay.h>
-+#include <linux/gpio.h>
-+#include <linux/platform_data/video-imxfb.h>
-+
-+#include "iomux-mx27.h"
-+#include "common.h"
-+#include "devices-imx27.h"
-+
-+static int apf27_fb_init(struct platform_device*);
-+
-+static void apf_lcd_custom_init(const char *name)
-+{
-+ if (!name)
-+ return;
-+
-+ if (!strcmp("Optrex-T51638D084", name)) {
-+ /* Activates LCD at startup: PS is used as LCD Display ON/OFF */
-+ gpio_set_value((GPIO_PORTA | 26), 1);
-+ mxc_gpio_mode(GPIO_PORTA | 26 | GPIO_OUT | GPIO_GPIO);
-+ } else if (!strcmp("Sharp-LQ057", name)) {
-+ /* Activates backlight at startup: CONTRAST is used as backlight's ON/OFF */
-+ gpio_set_value((GPIO_PORTA | 30), 0);
-+ mxc_gpio_mode(GPIO_PORTA | 30 | GPIO_OUT | GPIO_GPIO);
-+ } else if (!strcmp("Sharp-LQ043", name)) {
-+ /* Activates LCD at startup: OE_ACD is used as LCD Display ON/OFF */
-+ gpio_set_value((GPIO_PORTA | 31), 1);
-+ mxc_gpio_mode(GPIO_PORTA | 31 | GPIO_OUT | GPIO_GPIO);
-+ } else if (!strcmp("Custom", name)) {
-+ /* Please always let the custom LCD in this (last) position: */
-+ ;
-+ } else {
-+ /* "Chimei-LW700AT9003" / "Hitachi-TX12D17VM1BDP" */
-+ ;
-+ }
-+/* Please let these 2 lines here
-+*/
-+}
-+
-+static int mxc_lcd_pins[] = {
-+ PA5_PF_LSCLK,
-+ PA6_PF_LD0,
-+ PA7_PF_LD1,
-+ PA8_PF_LD2,
-+ PA9_PF_LD3,
-+ PA10_PF_LD4,
-+ PA11_PF_LD5,
-+ PA12_PF_LD6,
-+ PA13_PF_LD7,
-+ PA14_PF_LD8,
-+ PA15_PF_LD9,
-+ PA16_PF_LD10,
-+ PA17_PF_LD11,
-+ PA18_PF_LD12,
-+ PA19_PF_LD13,
-+ PA20_PF_LD14,
-+ PA21_PF_LD15,
-+ PA22_PF_LD16,
-+ PA23_PF_LD17,
-+ PA24_PF_REV,
-+ PA25_PF_CLS,
-+ PA26_PF_PS,
-+ PA27_PF_SPL_SPR,
-+ PA28_PF_HSYNC,
-+ PA29_PF_VSYNC,
-+ PA30_PF_CONTRAST,
-+ PA31_PF_OE_ACD
-+};
-+
-+#include "apf9328_lcd_config.h"
-+
-+static int apf27_fb_init(struct platform_device *pdev)
-+{
-+ int ret;
-+
-+ ret = mxc_gpio_setup_multiple_pins(mxc_lcd_pins,
-+ ARRAY_SIZE(mxc_lcd_pins), "LCD");
-+ if (ret)
-+ return ret;
-+#if 0
-+ apf_lcd_custom_init(lcd_name);
-+#endif
-+ return 0;
-+}
-+
-+#ifdef CONFIG_FB_MXC
-+void apf27_lcd_startup(void)
-+{
-+ int i;
-+
-+ /* force LCD data/control lines to 0 before powering the LCD
-+ otherwise start up conditions may not be respected */
-+ for (i = 5; i <= 31; i++) {
-+ if (i != 30) {
-+ gpio_set_value(GPIO_PORTA | i, 0);
-+ mxc_gpio_mode(GPIO_PORTA | i | GPIO_OUT| GPIO_GPIO);
-+ }
-+ }
-+ /* wait a few milli */
-+ mdelay(100);
-+}
-+#endif
-+
-+void apf27_lcd_init(void)
-+{
-+ char *opt, *name = NULL, *options = NULL;
-+
-+ if (fb_get_options("imxfb", &options))
-+ goto end;
-+
-+ if (!options || !*options)
-+ goto end;
-+
-+ while ((opt = strsep(&options, ",")) != NULL) {
-+ if (!*opt)
-+ continue;
-+ else
-+ name = opt;
-+ }
-+
-+#ifdef CONFIG_FB_MXC
-+ apf27_lcd_startup();
-+#endif
-+ apf_set_lcd_name(name);
-+ apf_fb_set_default_contrast();
-+ imx27_add_imx_fb(&apf_fb_data);
-+end:
-+ return;
-+}
-+
-+#endif
-Index: linux-3.8-rc1/arch/arm/mach-imx/apf27-dev-ext-apw.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8-rc1/arch/arm/mach-imx/apf27-dev-ext-apw.c 2013-01-02 12:12:28.000000000 +0100
-@@ -0,0 +1,175 @@
-+ /*
-+ * apf27-dev-ext-apw.c
-+ * Support for AFP27Dev's wireless extension board (APW).
-+ *
-+ * Copyright (C) 2009-2011 Armadeus Systems
-+ * Authors: Julien Boibessot <jul...@ar...>
-+ * Nicolas Colombain <nic...@ar...>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ */
-+
-+#include <linux/platform_device.h>
-+#include <linux/delay.h>
-+
-+#include <mach/common.h>
-+#include <mach/iomux-mx27.h>
-+#include <mach/gpio.h>
-+#include <mach/mmc.h>
-+
-+#include "devices-imx27.h"
-+
-+/* An optional GSM module can be added to wireless extension board */
-+#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GSM
-+
-+#define GSM_POK_IN (GPIO_PORTE | 11) /* UART3_RTS */
-+
-+static int apw_gsm_pins[] = {
-+ (GSM_POK_IN | GPIO_OUT | GPIO_GPIO) /* GSM_PWR_ON_not */
-+};
-+
-+static int apw_gsm_init(void)
-+{
-+ int res = mxc_gpio_setup_multiple_pins(apw_gsm_pins,
-+ ARRAY_SIZE(apw_gsm_pins), "GSM");
-+ gpio_set_value(GSM_POK_IN, 0); /* start GSM */
-+ mdelay(5000);
-+ gpio_set_value(GSM_POK_IN, 1); /* start GSM */
-+
-+ return res;
-+}
-+#endif
-+
-+
-+/* An optionnal GPS module can be mounted on wireless extension board */
-+#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS
-+
-+#define GPS_WAKEUP (GPIO_PORTB | 20) /* CSI_VSYNC_UART5_CTS */
-+#define GPS_TIMEPULSE (GPIO_PORTB | 21) /* CSI_HSYNC_UART5_RTS */
-+
-+static int apw_gps_pins[] = {
-+ (GPS_WAKEUP | GPIO_OUT | GPIO_GPIO),
-+ (GPS_TIMEPULSE | GPIO_IN | GPIO_GPIO),
-+};
-+
-+static int apw_gps_init(void)
-+{
-+ int res = mxc_gpio_setup_multiple_pins(apw_gps_pins,
-+ ARRAY_SIZE(apw_gps_pins), "GPS");
-+ gpio_set_value(GPS_WAKEUP, 1); /* start GPS */
-+
-+ return res;
-+}
-+#endif
-+
-+
-+/* An optional Bluetooth + WiFi module (Wi2Wi) can be mounted on wireless
-+ extension board */
-+#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI
-+
-+#define BT_RESETn (GPIO_PORTB | 14) /* shared with CSI_D4;
-+ driven by userspace */
-+#define WIFI_PWRDNn (GPIO_PORTE | 10) /* UART3_CTS */
-+
-+static int apw_bt_wifi_pins[] = {
-+ (WIFI_PWRDNn | GPIO_OUT | GPIO_GPIO),
-+};
-+
-+/* SDHC1 is used for WiFi */
-+static int mxc_sdhc1_pins[] = {
-+ PE18_PF_SD1_D0,
-+ PE19_PF_SD1_D1,
-+ PE20_PF_SD1_D2,
-+ PE21_PF_SD1_D3,
-+ PE22_PF_SD1_CMD,
-+ PE23_PF_SD1_CLK,
-+};
-+
-+static int apw_sdhc1_init(struct device *dev, irq_handler_t handler, void *data)
-+{
-+ return mxc_gpio_setup_multiple_pins(mxc_sdhc1_pins,
-+ ARRAY_SIZE(mxc_sdhc1_pins),
-+ "SDHC1");
-+}
-+
-+static void apw_sdhc1_exit(struct device *pdev, void *data)
-+{
-+ mxc_gpio_release_multiple_pins(mxc_sdhc1_pins, ARRAY_SIZE(mxc_sdhc1_pins));
-+}
-+
-+static struct imxmmc_platform_data apw_sdhc1_pdata = {
-+ .init = apw_sdhc1_init,
-+ .exit = apw_sdhc1_exit,
-+};
-+
-+/* UART6 is used for Bluetooth (init done in apf27-dev.c depending on
-+ Linux config) */
-+
-+static int apw_bt_wifi_init(void)
-+{
-+ int res;
-+
-+ gpio_set_value(WIFI_PWRDNn, 1); /* WiFi on */
-+ res = mxc_gpio_setup_multiple_pins(apw_bt_wifi_pins,
-+ ARRAY_SIZE(apw_bt_wifi_pins), "BT_WIFI");
-+ if (!res)
-+ imx27_add_mxc_mmc(0, &apw_sdhc1_pdata);
-+
-+ return res;
-+}
-+#endif /* CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI */
-+
-+
-+void apf27dev_extension_resume(void)
-+{
-+#ifdef CONFIG_PM
-+# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_WIFI
-+ gpio_set_value(WIFI_PWRDNn, 1);
-+# endif
-+# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS
-+ gpio_set_value(GPS_WAKEUP, 1);
-+# endif
-+#endif
-+}
-+
-+void apf27dev_extension_suspend(void)
-+{
-+#ifdef CONFIG_PM
-+# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_WIFI
-+ gpio_set_value(WIFI_PWRDNn, 0);
-+# endif
-+# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS
-+ gpio_set_value(GPS_WAKEUP, 0);
-+# endif
-+#endif
-+}
-+
-+
-+void __init apf27dev_extension_init(void)
-+{
-+ printk(" Registering APW ressources:");
-+
-+#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GSM
-+ apw_gsm_init();
-+#endif
-+#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS
-+ apw_gps_init();
-+#endif
-+#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI
-+ apw_bt_wifi_init();
-+#endif
-+
-+ printk("done\n");
-+}
-+
-Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf27.c
-===================================================================
---- linux-3.8-rc1.orig/arch/arm/mach-imx/mach-apf27.c 2013-01-02 12:12:28.000000000 +0100
-+++ linux-3.8-rc1/arch/arm/mach-imx/mach-apf27.c 2013-01-02 12:12:28.000000000 +0100
-@@ -43,6 +43,7 @@
- #include "iomux-mx27.h"
- #include "ulpi.h"
-
-+extern void apf27_baseboard_init(void);
-
- static const int apf27_pins[] __initconst = {
- /* UART1 */
-@@ -270,6 +271,10 @@
- i2c_register_board_info(1, apf27_i2c_devices_bus1,
- ARRAY_SIZE(apf27_i2c_devices_bus1));
- imx27_add_imx_i2c(1, &apf27_i2c_1_data);
-+
-+#ifdef CONFIG_MACH_APF27_HAS_BASEBOARD
-+ apf27_baseboard_init();
-+#endif
- }
-
- static void __init apf27_timer_init(void)
-Index: linux-3.8-rc1/arch/arm/mach-imx/Kconfig
-===================================================================
---- linux-3.8-rc1.orig/arch/arm/mach-imx/Kconfig 2013-01-02 12:12:28.000000000 +0100
-+++ linux-3.8-rc1/arch/arm/mach-imx/Kconfig 2013-01-02 12:12:28.000000000 +0100
-@@ -515,6 +515,103 @@
- Include support for APF27 platform. This includes specific
- configurations for the module and its peripherals.
-
-+config MACH_APF27_HAS_BASEBOARD
-+ bool
-+
-+choice
-+ prompt "Baseboard"
-+ depends on MACH_APF27
-+ default MACH_APF27_DEV
-+
-+config MACH_APF27_DEV
-+ prompt "Armadeus Systems APF27Dev development board"
-+ bool
-+ depends on MACH_APF27
-+ select SERIAL_IMX_UART3
-+ select MACH_APF27_HAS_BASEBOARD
-+ select IMX_HAVE_PLATFORM_IMX_FB
-+ select IMX_HAVE_PLATFORM_MXC_MMC
-+ select IMX_HAVE_PLATFORM_IMX_SSI
-+ select IMX_HAVE_PLATFORM_SPI_IMX
-+ select IMX_HAVE_PLATFORM_MXC_PWM
-+ help
-+ This selects the APF27Dev as baseboard. You have to manually
-+ activates the devices you want to use if you have the "Full"
-+ version.
-+
-+endchoice
-+
-+config MACH_APF27_DEV_EXT
-+ bool
-+
-+choice
-+ prompt "Extension board"
-+ depends on MACH_APF27_DEV
-+ default MACH_APF27_DEV_EXT_NONE
-+
-+config MACH_APF27_DEV_EXT_NONE
-+ prompt "No extension"
-+ bool
-+ help
-+ No extension board connected to APF27Dev baseboard.
-+
-+config MACH_APF27_DEV_EXT_WIRELESS
-+ prompt "Wireless (APW)"
-+ bool
-+ select MACH_APF27_DEV_EXT
-+ help
-+ Wireless extension board connected to APF27Dev baseboard.
-+
-+endchoice
-+
-+config MACH_APF27_DEV_EXT_WIRELESS_GSM
-+ bool "GSM/GPRS Modem"
-+ depends on MACH_APF27_DEV_EXT_WIRELESS
-+ select SERIAL_IMX_UART2
-+ select SERIAL_IMX_UART2_USE_RTSCTS
-+ default y
-+ help
-+ Activates support for the GSM modem on the APW extension board.
-+
-+config MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI
-+ bool "Bluetooth & WiFi module"
-+ depends on MACH_APF27_DEV_EXT_WIRELESS
-+ help
-+ Activates support for the Bluetooth+WiFi module on the APW extension
-+ board.
-+
-+config MACH_APF27_DEV_EXT_WIRELESS_WIFI
-+ bool "WiFi"
-+ depends on MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI && (!SPI_MXC_SELECT3)
-+ default y
-+ help
-+ Only activates WiFi part of the module.
-+
-+config MACH_APF27_DEV_EXT_WIRELESS_BT
-+ bool "Bluetooth"
-+ depends on MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI
-+ select SERIAL_IMX_UART6
-+ select SERIAL_IMX_UART6_USE_RTSCTS
-+ help
-+ Only activates Bluetooth part of the module
-+
-+config MACH_APF27_DEV_EXT_WIRELESS_CAMERA
-+ bool "CSI (Camera) pass-through"
-+ depends on (MACH_APF27_DEV_EXT_WIRELESS) && (!MACH_APF27_DEV_EXT_WIRELESS_GPS) && (!MACH_APF27_DEV_EXT_WIRELESS_BT)
-+
-+comment "Please check that J3 is unplugged"
-+ depends on MACH_APF27_DEV_EXT_WIRELESS_CAMERA
-+
-+config MACH_APF27_DEV_EXT_WIRELESS_GPS
-+ bool "GPS module"
-+ depends on MACH_APF27_DEV_EXT_WIRELESS
-+ select SERIAL_IMX_UART5
-+ help
-+ Activates support for the GPS module on the APW extension board.
-+
-+comment "Please check that J3 is plugged in"
-+ depends on MACH_APF27_DEV_EXT_WIRELESS_GPS
-+
- endif
-
- if ARCH_MULTI_V6
-Index: linux-3.8-rc1/arch/arm/mach-imx/Makefile
-===================================================================
---- linux-3.8-rc1.orig/arch/arm/mach-imx/Makefile 2013-01-02 12:12:28.000000000 +0100
-+++ linux-3.8-rc1/arch/arm/mach-imx/Makefile 2013-01-02 12:12:28.000000000 +0100
-@@ -67,6 +67,9 @@
- obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o
- obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
- obj-$(CONFIG_MACH_APF27) += mach-apf27.o
-+obj-$(CONFIG_MACH_APF27_DEV) += apf27-dev.o
-+obj-$(CONFIG_MACH_APF27_DEV) += apf27-lcd.o
-+obj-$(CONFIG_MACH_APF27_DEV_EXT_WIRELESS) += apf27-dev-ext-apw.o
-
- # i.MX31 based machines
- obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o
diff --git a/patches/linux/3.13/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch b/patches/linux/3.13/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
deleted file mode 100644
index 29df863..0000000
--- a/patches/linux/3.13/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-EHCI PER clock (aka usb_div) must be enabled to have EHCI driver working.
-
-Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
----
-
-Index: linux-3.8-rc5/drivers/usb/host/ehci-mxc.c
-===================================================================
---- linux-3.8-rc5.orig/drivers/usb/host/ehci-mxc.c
-+++ linux-3.8-rc5/drivers/usb/host/ehci-mxc.c
-@@ -42,7 +42,7 @@ static const char hcd_name[] = "ehci-mxc
- #define ULPI_VIEWPORT_OFFSET 0x170
-
- struct ehci_mxc_priv {
-- struct clk *usbclk, *ahbclk, *phyclk;
-+ struct clk *usbclk, *ahbclk, *perclk, *phyclk;
- };
-
- static struct hc_driver __read_mostly ehci_mxc_hc_driver;
-@@ -111,6 +111,13 @@ static int ehci_mxc_drv_probe(struct pla
- }
- clk_prepare_enable(priv->ahbclk);
-
-+ priv->perclk = devm_clk_get(&pdev->dev, "per");
-+ if (IS_ERR(priv->perclk)) {
-+ ret = PTR_ERR(priv->perclk);
-+ goto err_clk_per;
-+ }
-+ clk_prepare_enable(priv->perclk);
-+
- /* "dr" device has its own clock on i.MX51 */
- priv->phyclk = devm_clk_get(&pdev->dev, "phy");
- if (IS_ERR(priv->phyclk))
-@@ -191,6 +198,8 @@ err_init:
- if (priv->phyclk)
- clk_disable_unprepare(priv->phyclk);
-
-+ clk_disable_unprepare(priv->perclk);
-+err_clk_per:
- clk_disable_unprepare(priv->ahbclk);
- err_clk_ahb:
- clk_disable_unprepare(priv->usbclk);
-@@ -216,6 +225,7 @@ static int __exit ehci_mxc_drv_remove(st
-
- clk_disable_unprepare(priv->usbclk);
- clk_disable_unprepare(priv->ahbclk);
-+ clk_disable_unprepare(priv->perclk);
-
- if (priv->phyclk)
- clk_disable_unprepare(priv->phyclk);
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-01-23 13:45:16
|
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 67c99a9a1f37c11a95dd0ea178af3e253f761e12 (commit)
from fb71824e5dc68a1fa3fac271b23434da31620da5 (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 67c99a9a1f37c11a95dd0ea178af3e253f761e12
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jan 23 14:44:31 2014 +0100
[LINUX] apf27: 3.12+: makes VPU firmware loading OK
-----------------------------------------------------------------------
Summary of changes:
...-armadeus-fixes-vpu-spll-clock-dependency.patch | 18 ++++++++++++++++++
...-armadeus-fixes-vpu-spll-clock-dependency.patch | 18 ++++++++++++++++++
2 files changed, 36 insertions(+), 0 deletions(-)
create mode 100644 patches/linux/3.12/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
create mode 100644 patches/linux/3.13/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
diff --git a/patches/linux/3.12/0230-armadeus-fixes-vpu-spll-clock-dependency.patch b/patches/linux/3.12/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
new file mode 100644
index 0000000..5749479
--- /dev/null
+++ b/patches/linux/3.12/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
@@ -0,0 +1,18 @@
+Otherwise using VPU doesn't activate SPLL (if not already up with USB
+for example) and VPU firmware loading crashes at first coda_write().
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-3.12.8/arch/arm/mach-imx/clk-imx27.c
+===================================================================
+--- linux-3.12.8.orig/arch/arm/mach-imx/clk-imx27.c 2014-01-23 14:10:09.348774899 +0100
++++ linux-3.12.8/arch/arm/mach-imx/clk-imx27.c 2014-01-23 14:10:48.072966935 +0100
+@@ -49,7 +49,7 @@
+ #define CCM_SPCTL1_LF (1 << 15)
+ #define CCM_SPCTL1_BRMO (1 << 6)
+
+-static const char *vpu_sel_clks[] = { "spll", "mpll_main2", };
++static const char *vpu_sel_clks[] = { "spll_gate", "mpll_main2", };
+ static const char *cpu_sel_clks[] = { "mpll_main2", "mpll", };
+ static const char *mpll_sel_clks[] = { "fpm", "mpll_osc_sel", };
+ static const char *mpll_osc_sel_clks[] = { "ckih", "ckih_div1p5", };
diff --git a/patches/linux/3.13/0230-armadeus-fixes-vpu-spll-clock-dependency.patch b/patches/linux/3.13/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
new file mode 100644
index 0000000..43d37fa
--- /dev/null
+++ b/patches/linux/3.13/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
@@ -0,0 +1,18 @@
+Otherwise using VPU doesn't activate SPLL (if not already up with USB
+for example) and VPU firmware loading crashes at first coda_write().
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-3.13/arch/arm/mach-imx/clk-imx27.c
+===================================================================
+--- linux-3.13.orig/arch/arm/mach-imx/clk-imx27.c 2014-01-23 14:10:09.348774899 +0100
++++ linux-3.13/arch/arm/mach-imx/clk-imx27.c 2014-01-23 14:10:48.072966935 +0100
+@@ -49,7 +49,7 @@
+ #define CCM_SPCTL1_LF (1 << 15)
+ #define CCM_SPCTL1_BRMO (1 << 6)
+
+-static const char *vpu_sel_clks[] = { "spll", "mpll_main2", };
++static const char *vpu_sel_clks[] = { "spll_gate", "mpll_main2", };
+ static const char *cpu_sel_clks[] = { "mpll_main2", "mpll", };
+ static const char *mpll_sel_clks[] = { "fpm", "mpll_osc_sel", };
+ static const char *mpll_osc_sel_clks[] = { "ckih", "ckih_div1p5", };
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-22 22:47:21
|
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 fb71824e5dc68a1fa3fac271b23434da31620da5 (commit)
from e722cc699571ca95444b9e8ac36182cdcca84ebe (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 fb71824e5dc68a1fa3fac271b23434da31620da5
Author: Eric Jarrige <eri...@ar...>
Date: Wed Jan 22 23:47:04 2014 +0100
[LINUX] 3.13: apf27: add 2 USB ports to the apf27 device tree
-----------------------------------------------------------------------
Summary of changes:
...5-armadeus-add-apf27-apf27dev-dts-for-USB.patch | 96 ++++++++++++++++----
1 files changed, 78 insertions(+), 18 deletions(-)
diff --git a/patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch b/patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
index ee3c42e..836eaad 100644
--- a/patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
+++ b/patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
@@ -1,20 +1,51 @@
-Add APF27 APF27dev USB to DTS
+Add APF27 APF27dev USB to device tree
Signed-off-by: Eric Jarrige <eri...@ar...>
---
---- linux-3.13-rc8.ref/arch/arm/boot/dts/imx27-apf27dev.dts
+--- linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27dev.dts
+++ linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27dev.dts
-@@ -130,6 +130,23 @@
+@@ -16,6 +16,17 @@
+ model = "Armadeus Systems APF27Dev docking/development board";
+ compatible = "armadeus,imx27-apf27dev", "armadeus,imx27-apf27", "fsl,imx27";
+
++ regulators {
++ compatible = "simple-bus";
++
++ reg_usbh1_vbus: usbh1_vbus {
++ compatible = "regulator-fixed";
++ regulator-name = "usbh1_vbus";
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ };
++ };
++
+ display: display {
+ model = "Chimei-LW700AT9003";
+ native-mode = <&timing0>;
+@@ -56,6 +67,12 @@
+ };
+ };
+
++ usbphy1: usbphy@1 {
++ compatible = "usb-nop-xceiv";
++ clocks = <&clks 75>;
++ clock-names = "main_clk";
++ status = "okay";
++ };
+ };
+
+ &cspi1 {
+@@ -130,6 +147,23 @@
>;
};
};
+
-+ usbh2 {
-+ pinctrl_usbh2: usbh2 {
++ usbh1 {
++ pinctrl_usbh1: usbh1 {
+ fsl,pins = <
+ MX27_PAD_USBH1_SUSP__USBH1_SUSP 0
+ MX27_PAD_USB_PWR__USB_PWR 0
-+ MX27_PAD_USB_OC_B__USB_OC_B 1
++ MX27_PAD_USB_OC_B__USB_OC_B 0
+ MX27_PAD_USBH1_RCV__USBH1_RCV 0
+ MX27_PAD_USBH1_FS__USBH1_FS 0
+ MX27_PAD_USBH1_OE_B__USBH1_OE_B 0
@@ -28,39 +59,68 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
};
&sdhci2 {
-@@ -139,3 +156,15 @@
+@@ -139,3 +173,16 @@
pinctrl-0 = <&pinctrl_sdhc2_1>;
status = "okay";
};
+
-+&usbphy2 {
-+ status = "okay";
-+};
-+
-+&usbh2 {
++&usbh1 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbh2>;
++ pinctrl-0 = <&pinctrl_usbh1>;
++ fsl,usbphy = <&usbphy1>;
++ fsl,usbmisc = <&usbmisc 1>;
+ phy_type = "serial";
+ dr_mode = "host";
++ vbus-supply = <®_usbh1_vbus>;
++ sic = <0>;
++ disable-tll;
+ status = "okay";
+};
-
---- linux-3.13-rc8.ref/arch/arm/boot/dts/imx27-apf27.dts
+--- linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27.dts
+++ linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27.dts
-@@ -87,3 +87,36 @@
+@@ -32,6 +32,24 @@
+ clock-frequency = <0>;
+ };
+ };
++
++ regulators {
++ compatible = "simple-bus";
++
++ reg_usbotg_vbus: usbotg_vbus {
++ compatible = "regulator-fixed";
++ regulator-name = "usbotg_vbus";
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ };
++ };
++
++ usbphy0: usbphy@0 {
++ compatible = "usb-nop-xceiv";
++ clocks = <&clks 75>;
++ clock-names = "main_clk";
++ status = "okay";
++ };
+ };
+
+ &uart1 {
+@@ -87,3 +105,40 @@
reg = <0x800000 0xf800000>;
};
};
+
-+&usbphy0 {
++&usbmisc {
+ status = "okay";
+};
+
+&usbotg {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usbotg>;
++ fsl,usbphy = <&usbphy0>;
++ fsl,usbmisc = <&usbmisc 0>;
+ phy_type = "ulpi";
-+ dr_mode = "host";
++ dr_mode = "otg";
++ vbus-supply = <®_usbotg_vbus>;
++ disable-over-current;
+ status = "okay";
+};
+
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-01-22 22:45:35
|
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 e722cc699571ca95444b9e8ac36182cdcca84ebe (commit)
from 7c6b7e2fed4c8601ab78c0806c6028c66a8eac56 (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 e722cc699571ca95444b9e8ac36182cdcca84ebe
Author: Eric Jarrige <eri...@ar...>
Date: Wed Jan 22 23:45:17 2014 +0100
[LINUX] 3.13: imx27: update USB drivers to support the imx27
-----------------------------------------------------------------------
Summary of changes:
.../linux/3.13/0444-armadeus-imx27-add-usb.patch | 212 ++++++++++++++++
.../3.13/0444-armadeus-imx27-add-usb.patch.tofix | 254 --------------------
...-armadeus-add-apf27-apf27dev-dts-for-USB.patch} | 0
3 files changed, 212 insertions(+), 254 deletions(-)
create mode 100644 patches/linux/3.13/0444-armadeus-imx27-add-usb.patch
delete mode 100644 patches/linux/3.13/0444-armadeus-imx27-add-usb.patch.tofix
rename patches/linux/3.13/{0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix => 0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch} (100%)
diff --git a/patches/linux/3.13/0444-armadeus-imx27-add-usb.patch b/patches/linux/3.13/0444-armadeus-imx27-add-usb.patch
new file mode 100644
index 0000000..ec38f11
--- /dev/null
+++ b/patches/linux/3.13/0444-armadeus-imx27-add-usb.patch
@@ -0,0 +1,212 @@
+Add i.MX27 and i.MX31 to the usbmisc driver. (based on Alexexander Shiyan patches)
+
+TODO: add control to external USB VBUS power supply
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+--- linux-3.13-rc8/arch/arm/boot/dts/imx27.dtsi
++++ linux-3.13-rc8/arch/arm/boot/dts/imx27.dtsi
+@@ -31,6 +31,9 @@
+ spi0 = &cspi1;
+ spi1 = &cspi2;
+ spi2 = &cspi3;
++ usb0 = &usbotg;
++ usb1 = &usbh1;
++ usb2 = &usbh2;
+ };
+
+ aitc: aitc-interrupt-controller@e0000000 {
+@@ -411,6 +414,44 @@
+ iram = <&iram>;
+ };
+
++ usbotg: usb@10024000 {
++ compatible = "fsl,imx27-usb";
++ reg = <0x10024000 0x200>;
++ interrupts = <56>;
++ clocks = <&clks 15>, <&clks 75>, <&clks 62>;
++ clock-names = "per", "ipg", "ahb";
++ usbmisc = <&usbmisc 0>;
++ status = "disabled";
++ };
++
++ usbh1: usb@10024200 {
++ compatible = "fsl,imx27-usb";
++ reg = <0x10024200 0x200>;
++ interrupts = <54>;
++ clocks = <&clks 15>, <&clks 75>, <&clks 62>;
++ clock-names = "per", "ipg", "ahb";
++ usbmisc = <&usbmisc 1>;
++ status = "disabled";
++ };
++
++ usbh2: usb@10024400 {
++ compatible = "fsl,imx27-usb";
++ reg = <0x10024400 0x200>;
++ interrupts = <55>;
++ clocks = <&clks 15>, <&clks 75>, <&clks 62>;
++ clock-names = "per", "ipg", "ahb";
++ usbmisc = <&usbmisc 2>;
++ status = "disabled";
++ };
++
++ usbmisc: usbmisc@10024600 {
++ #index-cells = <1>;
++ compatible = "fsl,imx27-usbmisc";
++ reg = <0x10024600 0x4>;
++ clocks = <&clks 62>;
++ status = "disabled";
++ };
++
+ sahara2: sahara@10025000 {
+ compatible = "fsl,imx27-sahara";
+ reg = <0x10025000 0x1000>;
+--- linux-3.13-rc8/drivers/usb/chipidea/ci_hdrc_imx.c
++++ linux-3.13-rc8/drivers/usb/chipidea/ci_hdrc_imx.c
+@@ -37,6 +37,7 @@ static struct imx_usbmisc_data *usbmisc_
+ struct device_node *np = dev->of_node;
+ struct of_phandle_args args;
+ struct imx_usbmisc_data *data;
++ u32 sic;
+ int ret;
+
+ /*
+@@ -70,6 +71,14 @@ static struct imx_usbmisc_data *usbmisc_
+ if (!of_find_property(np, "ext-clk-en", NULL))
+ data->ext_clk_en = 1;
+
++ if (of_find_property(np, "disable-tll", NULL))
++ data->disable_tll = 1;
++
++ if (!of_property_read_u32(np, "sic", &sic)) {
++ data->enable_sic = 1;
++ data->sic = sic & 0x3;
++ }
++
+ return data;
+ }
+
+--- linux-3.13-rc8.ref2/drivers/usb/chipidea/ci_hdrc_imx.h
++++ linux-3.13-rc8/drivers/usb/chipidea/ci_hdrc_imx.h
+@@ -15,6 +15,9 @@ struct imx_usbmisc_data {
+ unsigned int disable_oc:1; /* over current detect disabled */
+ unsigned int evdo:1; /* set external vbus divider option */
+ unsigned int ext_clk_en:1; /* select the clock from external PHY*/
++ unsigned int disable_tll:1; /* disable transceiver-less link logic */
++ unsigned int enable_sic:1; /* enable serial interface configuration */
++ unsigned int sic:2; /* serial interface configuration */
+ };
+
+ int imx_usbmisc_init(struct imx_usbmisc_data *);
+--- linux-3.13-rc8/drivers/usb/chipidea/usbmisc_imx.c
++++ linux-3.13-rc8/drivers/usb/chipidea/usbmisc_imx.c
+@@ -21,6 +21,18 @@
+ #define MX25_USB_PHY_CTRL_OFFSET 0x08
+ #define MX25_BM_EXTERNAL_VBUS_DIVIDER BIT(23)
+
++#define MX27_H1_PM_BIT BIT(8)
++#define MX27_H1_SIC_OFFSET 13
++#define MX27_H1_SIC_MASK 0x00006000
++#define MX27_H1_TLL_BIT BIT(4)
++#define MX27_H2_PM_BIT BIT(16)
++#define MX27_H2_SIC_OFFSET 21
++#define MX27_H2_SIC_MASK 0x00600000
++#define MX27_H2_TLL_BIT BIT(5)
++#define MX27_OTG_PM_BIT BIT(24)
++#define MX27_OTG_SIC_OFFSET 29
++#define MX27_OTG_SIC_MASK 0x60000000
++
+ #define MX51_USB_OTG_PHY_CTRL_OFFSET 0x00
+ #define MX51_USB_OTG_PHY_CTRL_0_OFFSET 0x08
+ #define MX51_USB_OTG_PHY_CTRL_1_OFFSET 0x0c
+@@ -170,6 +182,66 @@ static int usbmisc_imx51_post(struct imx
+ return 0;
+ }
+
++static int usbmisc_imx27_init(struct imx_usbmisc_data *data)
++{
++ unsigned long flags;
++ u32 val=0;
++ u32 mask;
++ u32 reg;
++
++ switch (data->index) {
++ case 0:
++ mask = MX27_OTG_PM_BIT;
++ if (data->disable_oc)
++ val |= MX27_OTG_PM_BIT;
++
++ if (data->enable_sic) {
++ mask |= MX27_OTG_SIC_MASK;
++ val |= data->sic << MX27_OTG_SIC_OFFSET;
++ }
++
++ break;
++ case 1:
++ mask = MX27_H1_PM_BIT;
++ if (data->disable_oc)
++ val |= MX27_H1_PM_BIT;
++
++ if (data->enable_sic) {
++ mask |= MX27_H1_SIC_MASK;
++ val |= data->sic << MX27_H1_SIC_OFFSET;
++ }
++
++ if (data->disable_tll)
++ val |= MX27_H1_TLL_BIT;
++
++ break;
++ case 2:
++ mask = MX27_H2_PM_BIT;
++ if (data->disable_oc)
++ val |= MX27_H2_PM_BIT;
++
++ if (data->enable_sic) {
++ mask |= MX27_H2_SIC_MASK;
++ val |= data->sic << MX27_H2_SIC_OFFSET;
++ }
++
++ if (data->disable_tll)
++ val |= MX27_H2_TLL_BIT;
++
++ break;
++ default:
++ return -EINVAL;
++ };
++
++ spin_lock_irqsave(&usbmisc->lock, flags);
++ reg = readl(usbmisc->base);
++ reg = (reg & ~mask) | val;
++ writel(reg, usbmisc->base);
++ spin_unlock_irqrestore(&usbmisc->lock, flags);
++
++ return 0;
++}
++
+ static int usbmisc_imx53_init(struct imx_usbmisc_data *data)
+ {
+ void __iomem *reg = NULL;
+@@ -235,6 +307,10 @@ static const struct usbmisc_ops imx51_us
+ .post = usbmisc_imx51_post,
+ };
+
++static const struct usbmisc_ops imx27_usbmisc_ops = {
++ .init = usbmisc_imx27_init,
++};
++
+ static const struct usbmisc_ops imx53_usbmisc_ops = {
+ .init = usbmisc_imx53_init,
+ };
+@@ -273,7 +349,10 @@ static const struct of_device_id usbmisc
+ .data = &imx51_usbmisc_ops,
+ },
+ {
+- .compatible = "fsl,imx53-usbmisc",
++ .compatible = "fsl,imx27-usbmisc",
++ .data = &imx27_usbmisc_ops,
++ },
++ { .compatible = "fsl,imx53-usbmisc",
+ .data = &imx53_usbmisc_ops,
+ },
+ {
+--
diff --git a/patches/linux/3.13/0444-armadeus-imx27-add-usb.patch.tofix b/patches/linux/3.13/0444-armadeus-imx27-add-usb.patch.tofix
deleted file mode 100644
index 8178231..0000000
--- a/patches/linux/3.13/0444-armadeus-imx27-add-usb.patch.tofix
+++ /dev/null
@@ -1,254 +0,0 @@
-Add i.MX27 and i.MX31 to the usbmisc driver. (based on Alexexander Shiyan patches)
-
-Signed-off-by: Eric Jarrige <eri...@ar...>
----
---- linux-3.13-rc8.ref/arch/arm/boot/dts/imx27.dtsi
-+++ linux-3.13-rc8/arch/arm/boot/dts/imx27.dtsi
-@@ -31,6 +31,9 @@
- spi0 = &cspi1;
- spi1 = &cspi2;
- spi2 = &cspi3;
-+ usb0 = &usbotg;
-+ usb1 = &usbh1;
-+ usb2 = &usbh2;
- };
-
- aitc: aitc-interrupt-controller@e0000000 {
-@@ -68,6 +71,7 @@
- };
- };
-
-+
- soc {
- #address-cells = <1>;
- #size-cells = <1>;
-@@ -411,6 +415,67 @@
- iram = <&iram>;
- };
-
-+ usbphy0: usbphy@0 {
-+ compatible = "usb-nop-xceiv";
-+ clocks = <&clks 75>;
-+ clock-names = "main_clk";
-+ };
-+
-+ usbphy1: usbphy@1 {
-+ compatible = "usb-nop-xceiv";
-+ clocks = <&clks 75>;
-+ clock-names = "main_clk";
-+ };
-+
-+ usbphy2: usbphy@2 {
-+ compatible = "usb-nop-xceiv";
-+ clocks = <&clks 75>;
-+ clock-names = "main_clk";
-+ };
-+
-+
-+ usbotg: usb@10024000 {
-+ compatible = "fsl,imx27-usb";
-+ reg = <0x10024000 0x200>;
-+ interrupts = <56>;
-+ clocks = <&clks 75>, <&clks 62>;
-+ clock-names = "ipg", "ahb";
-+ fsl,usbmisc = <&usbmisc 0>;
-+ fsl,usbphy = <&usbphy0>;
-+ dr_mode = "host";
-+ phy_type = "ulpi";
-+ status = "disabled";
-+ };
-+
-+ usbh1: usb@10024200 {
-+ compatible = "fsl,imx27-usb";
-+ reg = <0x10024200 0x200>;
-+ interrupts = <54>;
-+ clocks = <&clks 75>, <&clks 62>;
-+ clock-names = "ipg", "ahb";
-+ fsl,usbmisc = <&usbmisc 1>;
-+ fsl,usbphy = <&usbphy1>;
-+ status = "disabled";
-+ };
-+
-+ usbh2: usb@10024400 {
-+ compatible = "fsl,imx27-usb";
-+ reg = <0x10024400 0x200>;
-+ interrupts = <55>;
-+ clocks = <&clks 75>, <&clks 62>;
-+ clock-names = "ipg", "ahb";
-+ fsl,usbmisc = <&usbmisc 2>;
-+ fsl,usbphy = <&usbphy2>;
-+ status = "disabled";
-+ };
-+
-+ usbmisc: usbmisc@10024600 {
-+ #index-cells = <1>;
-+ compatible = "fsl,imx27-usbmisc";
-+ reg = <0x10024600 0x4>;
-+ clocks = <&clks 62>;
-+ };
-+
- sahara2: sahara@10025000 {
- compatible = "fsl,imx27-sahara";
- reg = <0x10025000 0x1000>;
-
---- linux-3.13-rc8.ref/arch/arm/boot/dts/imx27-pinfunc.h
-+++ linux-3.13-rc8/arch/arm/boot/dts/imx27-pinfunc.h
-@@ -195,19 +195,19 @@
- #define MX27_PAD_I2C2_SDA__GPIO3_5 0x45 0x036
- #define MX27_PAD_I2C2_SCL__I2C2_SCL 0x46 0x004
- #define MX27_PAD_I2C2_SCL__GPIO3_6 0x46 0x036
--#define MX27_PAD_USBOTG_DATA5__USBOTG_DATA5 0x47 0x004
-+#define MX27_PAD_USBOTG_DATA5__USBOTG_DATA5 0x47 0x000
- #define MX27_PAD_USBOTG_DATA5__GPIO3_7 0x47 0x036
--#define MX27_PAD_USBOTG_DATA6__USBOTG_DATA6 0x48 0x004
-+#define MX27_PAD_USBOTG_DATA6__USBOTG_DATA6 0x48 0x000
- #define MX27_PAD_USBOTG_DATA6__GPIO3_8 0x48 0x036
--#define MX27_PAD_USBOTG_DATA0__USBOTG_DATA0 0x49 0x004
-+#define MX27_PAD_USBOTG_DATA0__USBOTG_DATA0 0x49 0x000
- #define MX27_PAD_USBOTG_DATA0__GPIO3_9 0x49 0x036
--#define MX27_PAD_USBOTG_DATA2__USBOTG_DATA2 0x4a 0x004
-+#define MX27_PAD_USBOTG_DATA2__USBOTG_DATA2 0x4a 0x000
- #define MX27_PAD_USBOTG_DATA2__GPIO3_10 0x4a 0x036
--#define MX27_PAD_USBOTG_DATA1__USBOTG_DATA1 0x4b 0x004
-+#define MX27_PAD_USBOTG_DATA1__USBOTG_DATA1 0x4b 0x000
- #define MX27_PAD_USBOTG_DATA1__GPIO3_11 0x4b 0x036
--#define MX27_PAD_USBOTG_DATA4__USBOTG_DATA4 0x4c 0x004
-+#define MX27_PAD_USBOTG_DATA4__USBOTG_DATA4 0x4c 0x000
- #define MX27_PAD_USBOTG_DATA4__GPIO3_12 0x4c 0x036
--#define MX27_PAD_USBOTG_DATA3__USBOTG_DATA3 0x4d 0x004
-+#define MX27_PAD_USBOTG_DATA3__USBOTG_DATA3 0x4d 0x000
- #define MX27_PAD_USBOTG_DATA3__GPIO3_13 0x4d 0x036
- #define MX27_PAD_TOUT__TOUT 0x4e 0x004
- #define MX27_PAD_TOUT__GPIO3_14 0x4e 0x036
-@@ -359,7 +359,7 @@
- #define MX27_PAD_USBOTG_NXT__USBOTG_NXT 0x80 0x000
- #define MX27_PAD_USBOTG_NXT__KP_COL6A 0x80 0x005
- #define MX27_PAD_USBOTG_NXT__GPIO5_0 0x80 0x036
--#define MX27_PAD_USBOTG_STP__USBOTG_STP 0x81 0x004
-+#define MX27_PAD_USBOTG_STP__USBOTG_STP 0x81 0x000
- #define MX27_PAD_USBOTG_STP__KP_ROW6A 0x81 0x005
- #define MX27_PAD_USBOTG_STP__GPIO5_1 0x81 0x036
- #define MX27_PAD_USBOTG_DIR__USBOTG_DIR 0x82 0x000
-@@ -418,7 +418,7 @@
- #define MX27_PAD_SD1_CLK__GPIO5_23 0x97 0x036
- #define MX27_PAD_USBOTG_CLK__USBOTG_CLK 0x98 0x000
- #define MX27_PAD_USBOTG_CLK__GPIO5_24 0x98 0x036
--#define MX27_PAD_USBOTG_DATA7__USBOTG_DATA7 0x99 0x004
-+#define MX27_PAD_USBOTG_DATA7__USBOTG_DATA7 0x99 0x000
- #define MX27_PAD_USBOTG_DATA7__GPIO5_25 0x99 0x036
- #define MX27_PAD_UNUSED9__UNUSED9 0x9a 0x004
- #define MX27_PAD_UNUSED9__GPIO5_26 0x9a 0x036
---- linux-3.13-rc8.ref/arch/arm/mach-imx/iomux-mx27.h
-+++ linux-3.13-rc8/arch/arm/mach-imx/iomux-mx27.h
-@@ -33,13 +33,13 @@
- #define PB25_PF_USBH1_RCV (GPIO_PORTB | GPIO_PF | 25)
- #define PC5_PF_I2C2_SDA (GPIO_PORTC | GPIO_PF | GPIO_IN | 5)
- #define PC6_PF_I2C2_SCL (GPIO_PORTC | GPIO_PF | GPIO_IN | 6)
--#define PC7_PF_USBOTG_DATA5 (GPIO_PORTC | GPIO_PF | GPIO_OUT | 7)
--#define PC8_PF_USBOTG_DATA6 (GPIO_PORTC | GPIO_PF | GPIO_OUT | 8)
--#define PC9_PF_USBOTG_DATA0 (GPIO_PORTC | GPIO_PF | GPIO_OUT | 9)
--#define PC10_PF_USBOTG_DATA2 (GPIO_PORTC | GPIO_PF | GPIO_OUT | 10)
--#define PC11_PF_USBOTG_DATA1 (GPIO_PORTC | GPIO_PF | GPIO_OUT | 11)
--#define PC12_PF_USBOTG_DATA4 (GPIO_PORTC | GPIO_PF | GPIO_OUT | 12)
--#define PC13_PF_USBOTG_DATA3 (GPIO_PORTC | GPIO_PF | GPIO_OUT | 13)
-+#define PC7_PF_USBOTG_DATA5 (GPIO_PORTC | GPIO_PF | 7)
-+#define PC8_PF_USBOTG_DATA6 (GPIO_PORTC | GPIO_PF | 8)
-+#define PC9_PF_USBOTG_DATA0 (GPIO_PORTC | GPIO_PF | 9)
-+#define PC10_PF_USBOTG_DATA2 (GPIO_PORTC | GPIO_PF | 10)
-+#define PC11_PF_USBOTG_DATA1 (GPIO_PORTC | GPIO_PF | 11)
-+#define PC12_PF_USBOTG_DATA4 (GPIO_PORTC | GPIO_PF | 12)
-+#define PC13_PF_USBOTG_DATA3 (GPIO_PORTC | GPIO_PF | 13)
- #define PC16_PF_SSI4_FS (GPIO_PORTC | GPIO_PF | GPIO_IN | 16)
- #define PC17_PF_SSI4_RXD (GPIO_PORTC | GPIO_PF | GPIO_IN | 17)
- #define PC18_PF_SSI4_TXD (GPIO_PORTC | GPIO_PF | GPIO_IN | 18)
-@@ -61,11 +61,11 @@
- #define PD14_PF_ATA_DATA12 (GPIO_PORTD | GPIO_PF | 14)
- #define PD15_PF_ATA_DATA13 (GPIO_PORTD | GPIO_PF | 15)
- #define PD16_PF_ATA_DATA14 (GPIO_PORTD | GPIO_PF | 16)
--#define PE0_PF_USBOTG_NXT (GPIO_PORTE | GPIO_PF | GPIO_OUT | 0)
--#define PE1_PF_USBOTG_STP (GPIO_PORTE | GPIO_PF | GPIO_OUT | 1)
--#define PE2_PF_USBOTG_DIR (GPIO_PORTE | GPIO_PF | GPIO_OUT | 2)
--#define PE24_PF_USBOTG_CLK (GPIO_PORTE | GPIO_PF | GPIO_OUT | 24)
--#define PE25_PF_USBOTG_DATA7 (GPIO_PORTE | GPIO_PF | GPIO_OUT | 25)
-+#define PE0_PF_USBOTG_NXT (GPIO_PORTE | GPIO_PF | 0)
-+#define PE1_PF_USBOTG_STP (GPIO_PORTE | GPIO_PF | 1)
-+#define PE2_PF_USBOTG_DIR (GPIO_PORTE | GPIO_PF | 2)
-+#define PE24_PF_USBOTG_CLK (GPIO_PORTE | GPIO_PF | 24)
-+#define PE25_PF_USBOTG_DATA7 (GPIO_PORTE | GPIO_PF | 25)
- #define PF1_PF_NFCLE (GPIO_PORTF | GPIO_PF | 1)
- #define PF3_PF_NFCE (GPIO_PORTF | GPIO_PF | 3)
- #define PF7_PF_PC_POE (GPIO_PORTF | GPIO_PF | 7)
-diff -purN linux-3.13-rc8.ref/drivers/usb/chipidea/usbmisc_imx.c linux-3.13-rc8/drivers/usb/chipidea/usbmisc_imx.c
---- linux-3.13-rc8.ref/drivers/usb/chipidea/usbmisc_imx.c 2014-01-17 16:34:15.000000000 +0100
-+++ linux-3.13-rc8/drivers/usb/chipidea/usbmisc_imx.c 2014-01-19 13:54:14.000000000 +0100
-@@ -20,6 +20,9 @@
-
- #define MX25_USB_PHY_CTRL_OFFSET 0x08
- #define MX25_BM_EXTERNAL_VBUS_DIVIDER BIT(23)
-+#define MX27_H1_PM_BIT BIT(8)
-+#define MX27_H2_PM_BIT BIT(16)
-+#define MX27_OTG_PM_BIT BIT(24)
-
- #define MX51_USB_OTG_PHY_CTRL_OFFSET 0x00
- #define MX51_USB_OTG_PHY_CTRL_0_OFFSET 0x08
-@@ -170,6 +173,36 @@ static int usbmisc_imx51_post(struct imx
- return 0;
- }
-
-+static int usbmisc_imx27_init(struct imx_usbmisc_data *data)
-+{
-+ unsigned long flags;
-+ u32 val;
-+
-+ switch (data->index) {
-+ case 0:
-+ val = MX27_OTG_PM_BIT;
-+ break;
-+ case 1:
-+ val = MX27_H1_PM_BIT;
-+ break;
-+ case 2:
-+ val = MX27_H2_PM_BIT;
-+ break;
-+ default:
-+ return -EINVAL;
-+ };
-+
-+ spin_lock_irqsave(&usbmisc->lock, flags);
-+ if (data->disable_oc)
-+ val = readl(usbmisc->base) | val;
-+ else
-+ val = readl(usbmisc->base) & ~val;
-+ writel(val, usbmisc->base);
-+ spin_unlock_irqrestore(&usbmisc->lock, flags);
-+
-+ return 0;
-+}
-+
- static int usbmisc_imx53_init(struct imx_usbmisc_data *data)
- {
- void __iomem *reg = NULL;
-@@ -235,6 +268,10 @@ static const struct usbmisc_ops imx51_us
- .post = usbmisc_imx51_post,
- };
-
-+static const struct usbmisc_ops imx27_usbmisc_ops = {
-+ .init = usbmisc_imx27_init,
-+};
-+
- static const struct usbmisc_ops imx53_usbmisc_ops = {
- .init = usbmisc_imx53_init,
- };
-@@ -273,7 +310,10 @@ static const struct of_device_id usbmisc
- .data = &imx51_usbmisc_ops,
- },
- {
-- .compatible = "fsl,imx53-usbmisc",
-+ .compatible = "fsl,imx27-usbmisc",
-+ .data = &imx27_usbmisc_ops,
-+ },
-+ { .compatible = "fsl,imx53-usbmisc",
- .data = &imx53_usbmisc_ops,
- },
- {
---
diff --git a/patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix b/patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
similarity index 100%
rename from patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix
rename to patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-01-22 17:49:51
|
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 7c6b7e2fed4c8601ab78c0806c6028c66a8eac56 (commit)
from 2dc6fac22b57d52319028543dd6a3d78dc189bd3 (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 7c6b7e2fed4c8601ab78c0806c6028c66a8eac56
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jan 22 18:49:34 2014 +0100
[BUILDROOT] Add gstreamer and libv4l (+tools) to test defconfigs
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27test_defconfig | 16 ++++++++++++++++
buildroot/configs/apf28test_defconfig | 3 +++
buildroot/configs/apf51test_defconfig | 16 ++++++++++++++++
3 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 96a6adc..451301e 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -68,6 +68,19 @@ BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
+BR2_PACKAGE_GSTREAMER=y
+BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y
+BR2_PACKAGE_GST_PLUGINS_GOOD=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_PNG=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIFILE=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIPART=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_V4L2=y
+BR2_PACKAGE_GST_PLUGINS_BAD=y
+BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN=y
+BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN2=y
+BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLORSPACE=y
+BR2_PACKAGE_GST_PLUGINS_UGLY=y
BR2_PACKAGE_MADPLAY=y
BR2_PACKAGE_MPLAYER=y
BR2_PACKAGE_GDB=y
@@ -102,6 +115,9 @@ BR2_PACKAGE_GPSD=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_INPUT_TOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_LIBV4L=y
+BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE=y
+BR2_PACKAGE_LIBV4L_V4L2_DBG=y
BR2_PACKAGE_LUA=y
BR2_PACKAGE_LUA_INTERPRETER_READLINE=y
BR2_PACKAGE_PYTHON=y
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index a486f0b..7454f92 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -98,6 +98,9 @@ BR2_PACKAGE_INPUT_TOOLS=y
# BR2_PACKAGE_INPUT_TOOLS_JSCAL is not set
# BR2_PACKAGE_INPUT_TOOLS_JSTEST is not set
BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_LIBV4L=y
+BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE=y
+BR2_PACKAGE_LIBV4L_V4L2_DBG=y
BR2_PACKAGE_LUA=y
BR2_PACKAGE_LUA_INTERPRETER_READLINE=y
BR2_PACKAGE_PYTHON=y
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index c845d01..a4741c1 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -70,6 +70,19 @@ BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
BR2_PACKAGE_FFMPEG=y
BR2_PACKAGE_FFMPEG_FFPLAY=y
+BR2_PACKAGE_GSTREAMER=y
+BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y
+BR2_PACKAGE_GST_PLUGINS_GOOD=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_PNG=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIFILE=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIPART=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_V4L2=y
+BR2_PACKAGE_GST_PLUGINS_BAD=y
+BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN=y
+BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN2=y
+BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLORSPACE=y
+BR2_PACKAGE_GST_PLUGINS_UGLY=y
BR2_PACKAGE_MADPLAY=y
BR2_PACKAGE_MPLAYER=y
BR2_PACKAGE_GDB=y
@@ -102,6 +115,9 @@ BR2_PACKAGE_GPSD=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_INPUT_TOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_LIBV4L=y
+BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE=y
+BR2_PACKAGE_LIBV4L_V4L2_DBG=y
BR2_PACKAGE_LUA=y
BR2_PACKAGE_LUA_INTERPRETER_READLINE=y
BR2_PACKAGE_PYTHON=y
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-01-22 17:43:37
|
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 2dc6fac22b57d52319028543dd6a3d78dc189bd3 (commit)
via 2c8f3fe85696dd408ef33ca5776415c6ab690d0a (commit)
from b2079cb56ca5694f164c7251493102cd09dd081a (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 2dc6fac22b57d52319028543dd6a3d78dc189bd3
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jan 22 18:42:48 2014 +0100
[BUILD] Updates buildroot/package/.gitignore for BR 2013.11+
commit 2c8f3fe85696dd408ef33ca5776415c6ab690d0a
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jan 22 18:37:48 2014 +0100
[LINUX] 2.6.29: apf27dev: add support for MT9M111 & OV7670 derived camera modules
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/.gitignore | 2 +
.../armadeus/apf27/apf27-linux-2.6.29.config | 4 +-
.../2.6.29/281-apf27-armadeus-add_apf27.c.patch | 58 ++++++++++++++------
3 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/buildroot/package/.gitignore b/buildroot/package/.gitignore
index ea0c3b5..c56aec0 100644
--- a/buildroot/package/.gitignore
+++ b/buildroot/package/.gitignore
@@ -7,6 +7,8 @@
/Makefile.package.in
/Makefile.in
/buildroot-libtool*.patch
+/Config.in.host
+/pkg-*.mk
# except:
!/armadeus/
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
index 983338f..7e6d04b 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Wed Sep 19 15:58:55 2012
+# Mon Jan 20 10:01:18 2014
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1114,7 +1114,7 @@ CONFIG_VIDEO_VIVI=m
# CONFIG_VIDEO_SAA5249 is not set
CONFIG_SOC_CAMERA=m
# CONFIG_SOC_CAMERA_MT9M001 is not set
-# CONFIG_SOC_CAMERA_MT9M111 is not set
+CONFIG_SOC_CAMERA_MT9M111=m
# CONFIG_SOC_CAMERA_MT9T031 is not set
# CONFIG_SOC_CAMERA_MT9V022 is not set
# CONFIG_SOC_CAMERA_TW9910 is not set
diff --git a/patches/linux/2.6.29/281-apf27-armadeus-add_apf27.c.patch b/patches/linux/2.6.29/281-apf27-armadeus-add_apf27.c.patch
index be2112a..87aa189 100644
--- a/patches/linux/2.6.29/281-apf27-armadeus-add_apf27.c.patch
+++ b/patches/linux/2.6.29/281-apf27-armadeus-add_apf27.c.patch
@@ -9,7 +9,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2012-01-26 10:40:27.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2014-01-22 16:39:52.328884634 +0100
@@ -0,0 +1,739 @@
+ /*
+ * apf27.c
@@ -753,8 +753,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2012-01-26 10:53:41.000000000 +0100
-@@ -0,0 +1,1152 @@
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2014-01-22 17:48:57.000000000 +0100
+@@ -0,0 +1,1178 @@
+ /*
+ * apf27-dev.c
+ * Support for AFP27 module's development baseboard
@@ -865,9 +865,6 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#ifdef CONFIG_VIDEO_MX27_MODULE
+#define CONFIG_VIDEO_MX27 1
+#endif
-+#ifdef CONFIG_SOC_CAMERA_OV96XX_MODULE
-+#define CONFIG_SOC_CAMERA_OV96XX 1
-+#endif
+#ifdef CONFIG_ARMADEUS_PWM_DRIVER_MODULE
+#define CONFIG_PWM
+#endif
@@ -950,9 +947,10 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+};
+
+/* I2C1 devices: RTC & Optionnal Camera */
-+# ifdef CONFIG_SOC_CAMERA_OV96XX
+static struct soc_camera_link ov96xx_iclink; /* declared later */
-+#endif
++static struct soc_camera_link mt9m111_iclink; /* declared later */
++static struct soc_camera_link ov7670_iclink; /* declared later */
++
+static struct i2c_board_info apf27dev_i2c_devices_bus0[] = {
+ [0] = {
+ /* APF27Dev has an RTC */
@@ -962,15 +960,21 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ .platform_data = NULL,
+ .irq = 0
+ },
-+# ifdef CONFIG_SOC_CAMERA_OV96XX
+ [1] = {
+ .type = "ov96xx",
-+ .flags = 0, /* FIXME */
+ .addr = 0x30,
+ .platform_data = &ov96xx_iclink,
-+ .irq = 0
+ },
-+# endif
++ [2] = {
++ .type = "mt9m111",
++ .addr = 0x5d,
++ .platform_data = &mt9m111_iclink,
++ },
++ [3] = {
++ .type = "ov7670",
++ .addr = 0x21,
++ .platform_data = &ov7670_iclink,
++ },
+};
+
+
@@ -1751,7 +1755,6 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ MX27_CAMERA_SWAP16,
+};
+
-+# ifdef CONFIG_SOC_CAMERA_OV96XX
+static int ov96xx_power(struct device *dev, int state)
+{
+ printk(KERN_DEBUG "*** %s %d (not implemented)\n", __func__, state);
@@ -1763,7 +1766,30 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ .bus_id = 0,
+ .power = ov96xx_power,
+};
-+# endif
++
++static int mt9m111_power(struct device *dev, int state)
++{
++ printk(KERN_DEBUG "*** %s %d (not implemented)\n", __func__, state);
++
++ return 0;
++}
++
++static struct soc_camera_link mt9m111_iclink = {
++ .bus_id = 0,
++ .power = mt9m111_power,
++};
++
++static int ov7670_power(struct device *dev, int state)
++{
++ printk(KERN_DEBUG "*** %s %d (not implemented)\n", __func__, state);
++
++ return 0;
++}
++
++static struct soc_camera_link ov7670_iclink = {
++ .bus_id = 0,
++ .power = ov7670_power,
++};
+
+#endif /* CONFIG_VIDEO_MX27 */
+
@@ -1910,7 +1936,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2012-01-26 10:40:27.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2014-01-22 16:39:52.332884647 +0100
@@ -0,0 +1,220 @@
+/*
+ * apf27-lcd.c
@@ -2135,7 +2161,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c 2012-01-26 10:40:27.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c 2014-01-22 16:39:52.332884647 +0100
@@ -0,0 +1,190 @@
+ /*
+ * apf27-dev-ext-apw.c
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-01-22 17:12:58
|
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 b2079cb56ca5694f164c7251493102cd09dd081a (commit)
from 40e03e09572b671a640bed0ec5ec88a3995bbe04 (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 b2079cb56ca5694f164c7251493102cd09dd081a
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Jan 22 18:08:30 2014 +0100
[LINUX] 3.13: apf6q: split device tree in two file: imx6-apf6.dtsi and
imx6-apf6dev.dts
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6q_defconfig | 2 +-
.../3.13/0450-armadeus-add-apf6q-devicetree.patch | 275 +++++++++++---------
2 files changed, 151 insertions(+), 126 deletions(-)
diff --git a/buildroot/configs/apf6q_defconfig b/buildroot/configs/apf6q_defconfig
index b2e85e3..f604be2 100644
--- a/buildroot/configs/apf6q_defconfig
+++ b/buildroot/configs/apf6q_defconfig
@@ -19,7 +19,7 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
BR2_LINUX_KERNEL_ZIMAGE=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6dev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_LINUX_FIRMWARE=y
diff --git a/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch b/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
index bf1fdb4..9485d08 100644
--- a/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
+++ b/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
@@ -1,8 +1,20 @@
-Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dts
+Index: linux-3.13/arch/arm/boot/dts/Makefile
+===================================================================
+--- linux-3.13.orig/arch/arm/boot/dts/Makefile
++++ linux-3.13/arch/arm/boot/dts/Makefile
+@@ -139,6 +139,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
+ imx6dl-sabreauto.dtb \
+ imx6dl-sabresd.dtb \
+ imx6dl-wandboard.dtb \
++ imx6q-apf6dev.dtb \
+ imx6q-arm2.dtb \
+ imx6q-phytec-pbab01.dtb \
+ imx6q-sabreauto.dtb \
+Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dtsi
===================================================================
--- /dev/null
-+++ linux-3.13/arch/arm/boot/dts/imx6q-apf6.dts
-@@ -0,0 +1,211 @@
++++ linux-3.13/arch/arm/boot/dts/imx6q-apf6.dtsi
+@@ -0,0 +1,66 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -14,36 +26,102 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dts
+ *
+ */
+
-+/dts-v1/;
+#include "imx6q.dtsi"
+
+/ {
-+ model = "Armadeus APF6 i.MX6 Quad Board";
-+ compatible = "armadeus,imx6q-apf6", "fsl,imx6q";
-+
-+ memory {
-+ reg = <0x10000000 0x80000000>;
-+ };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+
-+ reg_2p5v: 2p5v {
-+ compatible = "regulator-fixed";
-+ regulator-name = "2P5V";
-+ regulator-min-microvolt = <2500000>;
-+ regulator-max-microvolt = <2500000>;
-+ regulator-always-on;
-+ };
-+
-+ reg_3p3v: 3p3v {
-+ compatible = "regulator-fixed";
-+ regulator-name = "3P3V";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
-+ };
-+ };
++ model = "Armadeus APF6 i.MX6 Quad Board";
++ compatible = "armadeus,imx6q-apf6", "fsl,imx6q";
++
++ memory {
++ reg = <0x10000000 0x80000000>;
++ };
++};
++
++&iomuxc {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_hog>;
++
++ hog {
++ pinctrl_hog: hoggrp {
++ fsl,pins = <
++ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x80000000 /* WL_EN */
++ MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x80000000 /* BT_EN */
++ >;
++ };
++
++ pinctrl_uart2_3: uart2grp-3 {
++ fsl,pins = <
++ MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
++ MX6QDL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1
++ MX6QDL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1
++ MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
++ >;
++ };
++ };
++};
++
++/* Bluetooth */
++&uart2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart2_3>;
++ status = "okay";
++};
++
++/* Wi-Fi */
++&usdhc1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usdhc1_2>;
++ status = "okay";
++};
++
++/* eMMC */
++&usdhc3 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usdhc3_1>;
++ //non-removable;
++ status = "okay";
++};
+Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
+===================================================================
+--- /dev/null
++++ linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
+@@ -0,0 +1,165 @@
++/*
++ * Copyright 2014 Armadeus Systems
++ *
++ * Author: Armadeus Systems <su...@ar...>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ */
++/dts-v1/;
++#include "imx6q-apf6.dtsi"
++
++/ {
++ model = "Armadeus APF6Dev i.MX6 Quad Board";
++ compatible = "armadeus,imx6q-apf6dev", "armadeus,imx6q-apf6", "fsl,imx6q";
++
++ regulators {
++ compatible = "simple-bus";
++
++ reg_2p5v: 2p5v {
++ compatible = "regulator-fixed";
++ regulator-name = "2P5V";
++ regulator-min-microvolt = <2500000>;
++ regulator-max-microvolt = <2500000>;
++ regulator-always-on;
++ };
++
++ reg_3p3v: 3p3v {
++ compatible = "regulator-fixed";
++ regulator-name = "3P3V";
++ regulator-min-microvolt = <3300000>;
++ regulator-max-microvolt = <3300000>;
++ regulator-always-on;
++ };
++ };
+
+ leds {
+ compatible = "gpio-leds";
@@ -68,57 +146,38 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dts
+};
+
+&sata {
-+ status = "okay";
-+};
-+
-+/*
-+&audmux {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_audmux_2>;
-+ status = "okay";
++ status = "okay";
+};
-+*/
+
+&hdmi {
-+ ddc = <&i2c1>;
-+ status = "okay";
++ ddc = <&i2c1>;
++ status = "okay";
+};
+
+&i2c1 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1_1>;
-+ status = "okay";
++ clock-frequency = <100000>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c1_1>;
++ status = "okay";
+};
+
+&i2c2 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2_2>;
-+ status = "okay";
++ clock-frequency = <100000>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c2_2>;
++ status = "okay";
+};
+
+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ hog {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x80000000 /* WL_EN */
-+ MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x80000000 /* BT_EN */
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_hog>;
++
++ hog {
++ pinctrl_hog: hoggrp {
++ fsl,pins = <
+ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000
+ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000
+ MX6QDL_PAD_CSI0_DAT16__GPIO6_IO02 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_uart2_3: uart2grp-3 {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
+ >;
+ };
+
@@ -131,20 +190,20 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dts
+ >;
+ };
+
-+ pinctrl_uart4_2: uart4grp-2 {
-+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
-+ >;
-+ };
-+ };
++ pinctrl_uart4_2: uart4grp-2 {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
++ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
++ >;
++ };
++ };
+};
+
+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet_1>;
-+ phy-mode = "rgmii";
-+ status = "okay";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_enet_1>;
++ phy-mode = "rgmii";
++ status = "okay";
+};
+
+&pcie {
@@ -154,34 +213,27 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dts
+
+/* GPS */
+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1_1>;
-+ status = "okay";
-+};
-+
-+/* Bluetooth */
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2_3>;
-+ status = "okay";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart1_1>;
++ status = "okay";
+};
+
+/* GSM */
+&uart3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart3_3>;
-+ status = "okay";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart3_3>;
++ status = "okay";
+};
+
+/* console */
+&uart4 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart4_2>;
-+ status = "okay";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart4_2>;
++ status = "okay";
+};
+
+&usbh1 {
-+ status = "okay";
++ status = "okay";
+};
+
+&usbotg {
@@ -192,37 +244,10 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dts
+ status = "okay";
+};
+
-+/* Wi-Fi */
-+&usdhc1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc1_2>;
-+ status = "okay";
-+};
-+
+/* microSD */
+&usdhc2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc2_2>;
-+ cd-gpios = <&gpio1 2 0>;
-+ status = "okay";
-+};
-+
-+/* eMMC */
-+&usdhc3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc3_1>;
-+ //non-removable;
-+ status = "okay";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usdhc2_2>;
++ cd-gpios = <&gpio1 2 0>;
++ status = "okay";
+};
-Index: linux-3.13/arch/arm/boot/dts/Makefile
-===================================================================
---- linux-3.13.orig/arch/arm/boot/dts/Makefile
-+++ linux-3.13/arch/arm/boot/dts/Makefile
-@@ -139,6 +139,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
- imx6dl-sabreauto.dtb \
- imx6dl-sabresd.dtb \
- imx6dl-wandboard.dtb \
-+ imx6q-apf6.dtb \
- imx6q-arm2.dtb \
- imx6q-phytec-pbab01.dtb \
- imx6q-sabreauto.dtb \
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-01-20 16:24:10
|
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 40e03e09572b671a640bed0ec5ec88a3995bbe04 (commit)
via 1fd6239f432d3662e7b2a64e2902c3dc368b07ca (commit)
from 982f033e6d888ec2d31011cc3c29b21f91173f96 (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 40e03e09572b671a640bed0ec5ec88a3995bbe04
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Jan 20 17:23:55 2014 +0100
[LINUX] 3.13: apf6q: enable watchdog nowayout option in default config
commit 1fd6239f432d3662e7b2a64e2902c3dc368b07ca
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Jan 20 14:46:58 2014 +0100
[LINUX] 3.13: apf6q: add usb otg to device tree
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf6q/apf6q-linux-3.13.config | 1 +
.../3.13/0450-armadeus-add-apf6q-devicetree.patch | 20 ++++++++++++++------
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config
index c43a2e1..1e8d6ae 100644
--- a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config
+++ b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config
@@ -152,6 +152,7 @@ CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_MC9S08DZ60=y
# CONFIG_HWMON is not set
CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_NOWAYOUT=y
CONFIG_IMX2_WDT=y
CONFIG_MFD_DA9052_I2C=y
CONFIG_MFD_MC13XXX_SPI=y
diff --git a/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch b/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
index 82c17db..bf1fdb4 100644
--- a/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
+++ b/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
@@ -1,8 +1,8 @@
-Index: linux-3.13-rc8/arch/arm/boot/dts/imx6q-apf6.dts
+Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dts
===================================================================
--- /dev/null
-+++ linux-3.13-rc8/arch/arm/boot/dts/imx6q-apf6.dts
-@@ -0,0 +1,203 @@
++++ linux-3.13/arch/arm/boot/dts/imx6q-apf6.dts
+@@ -0,0 +1,211 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -184,6 +184,14 @@ Index: linux-3.13-rc8/arch/arm/boot/dts/imx6q-apf6.dts
+ status = "okay";
+};
+
++&usbotg {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usbotg_1>;
++ disable-over-current;
++ dr_mode = "otg";
++ status = "okay";
++};
++
+/* Wi-Fi */
+&usdhc1 {
+ pinctrl-names = "default";
@@ -206,10 +214,10 @@ Index: linux-3.13-rc8/arch/arm/boot/dts/imx6q-apf6.dts
+ //non-removable;
+ status = "okay";
+};
-Index: linux-3.13-rc8/arch/arm/boot/dts/Makefile
+Index: linux-3.13/arch/arm/boot/dts/Makefile
===================================================================
---- linux-3.13-rc8.orig/arch/arm/boot/dts/Makefile
-+++ linux-3.13-rc8/arch/arm/boot/dts/Makefile
+--- linux-3.13.orig/arch/arm/boot/dts/Makefile
++++ linux-3.13/arch/arm/boot/dts/Makefile
@@ -139,6 +139,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
imx6dl-sabreauto.dtb \
imx6dl-sabresd.dtb \
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-01-20 09:07:27
|
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 982f033e6d888ec2d31011cc3c29b21f91173f96 (commit)
from bb41f32a9a22680f96e13370ff26cd48e27390c6 (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 982f033e6d888ec2d31011cc3c29b21f91173f96
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Jan 20 10:08:29 2014 +0100
[BUILDROOT] apf6q: move to linux 3.13
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6q_defconfig | 2 +-
.../armadeus/apf6q/apf6q-linux-3.13-rc8.config | 1 -
2 files changed, 1 insertions(+), 2 deletions(-)
delete mode 120000 buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13-rc8.config
diff --git a/buildroot/configs/apf6q_defconfig b/buildroot/configs/apf6q_defconfig
index 1ff9001..b2e85e3 100644
--- a/buildroot/configs/apf6q_defconfig
+++ b/buildroot/configs/apf6q_defconfig
@@ -13,7 +13,7 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13-rc8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13-rc8.config b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13-rc8.config
deleted file mode 120000
index c3886da..0000000
--- a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13-rc8.config
+++ /dev/null
@@ -1 +0,0 @@
-apf6q-linux-3.13.config
\ No newline at end of file
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-01-20 08:26:38
|
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 bb41f32a9a22680f96e13370ff26cd48e27390c6 (commit)
from fa2d09eef9d23980620bf17941134607cb35f7c5 (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 bb41f32a9a22680f96e13370ff26cd48e27390c6
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Jan 20 09:08:36 2014 +0100
[BUILDROOT] apf6q: rename linux default config file and a symlink to it
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf6q/apf6q-linux-3.13-rc8.config | 289 +-------------------
...nux-3.13-rc8.config => apf6q-linux-3.13.config} | 0
2 files changed, 1 insertions(+), 288 deletions(-)
mode change 100644 => 120000 buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13-rc8.config
copy buildroot/target/device/armadeus/apf6q/{apf6q-linux-3.13-rc8.config => apf6q-linux-3.13.config} (100%)
diff --git a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13-rc8.config b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13-rc8.config
deleted file mode 100644
index c43a2e1..0000000
--- a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13-rc8.config
+++ /dev/null
@@ -1,288 +0,0 @@
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_KERNEL_LZO=y
-CONFIG_SYSVIPC=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_LOG_BUF_SHIFT=18
-CONFIG_CGROUPS=y
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_EXPERT=y
-CONFIG_PERF_EVENTS=y
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_ARCH_MULTI_V6=y
-CONFIG_ARCH_MXC=y
-CONFIG_MACH_MX31LILLY=y
-CONFIG_MACH_MX31LITE=y
-CONFIG_MACH_PCM037=y
-CONFIG_MACH_PCM037_EET=y
-CONFIG_MACH_MX31_3DS=y
-CONFIG_MACH_MX31MOBOARD=y
-CONFIG_MACH_QONG=y
-CONFIG_MACH_ARMADILLO5X0=y
-CONFIG_MACH_KZM_ARM11_01=y
-CONFIG_MACH_IMX31_DT=y
-CONFIG_MACH_PCM043=y
-CONFIG_MACH_MX35_3DS=y
-CONFIG_MACH_VPR200=y
-CONFIG_MACH_IMX51_DT=y
-CONFIG_MACH_EUKREA_CPUIMX51SD=y
-CONFIG_SOC_IMX53=y
-CONFIG_SOC_IMX6Q=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_SOC_VF610=y
-CONFIG_PCI=y
-CONFIG_PCI_IMX6=y
-CONFIG_SMP=y
-CONFIG_VMSPLIT_2G=y
-CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_AEABI=y
-CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
-CONFIG_VFP=y
-CONFIG_NEON=y
-CONFIG_BINFMT_MISC=m
-CONFIG_PM_RUNTIME=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_TEST_SUSPEND=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-CONFIG_IPV6=y
-CONFIG_NETFILTER=y
-CONFIG_CFG80211=y
-CONFIG_MAC80211=y
-CONFIG_RFKILL=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_STANDALONE is not set
-CONFIG_IMX_WEIM=y
-CONFIG_CONNECTOR=y
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_JEDECPROBE=y
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_STAA=y
-CONFIG_MTD_PHYSMAP_OF=y
-CONFIG_MTD_DATAFLASH=y
-CONFIG_MTD_M25P80=y
-CONFIG_MTD_SST25L=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_GPMI_NAND=y
-CONFIG_MTD_NAND_MXC=y
-CONFIG_MTD_UBI=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=65536
-CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_AT25=y
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
-# CONFIG_SCSI_LOWLEVEL is not set
-CONFIG_ATA=y
-CONFIG_SATA_AHCI_PLATFORM=y
-CONFIG_AHCI_IMX=y
-CONFIG_PATA_IMX=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_VENDOR_BROADCOM is not set
-CONFIG_CS89x0=y
-CONFIG_CS89x0_PLATFORM=y
-# CONFIG_NET_VENDOR_FARADAY is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_MICROCHIP is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-CONFIG_SMC91X=y
-CONFIG_SMC911X=y
-CONFIG_SMSC911X=y
-# CONFIG_NET_VENDOR_STMICRO is not set
-CONFIG_BRCMFMAC=m
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_EVBUG=m
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_IMX=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_EGALAX=y
-CONFIG_TOUCHSCREEN_MC13783=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_MMA8450=y
-CONFIG_SERIO_SERPORT=m
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_SERIAL_FSL_LPUART=y
-CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_MXC_RNGA=y
-# CONFIG_I2C_COMPAT is not set
-CONFIG_I2C_CHARDEV=y
-# CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ALGOPCA=m
-CONFIG_I2C_IMX=y
-CONFIG_SPI=y
-CONFIG_SPI_IMX=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_MC9S08DZ60=y
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_IMX2_WDT=y
-CONFIG_MFD_DA9052_I2C=y
-CONFIG_MFD_MC13XXX_SPI=y
-CONFIG_MFD_MC13XXX_I2C=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_ANATOP=y
-CONFIG_REGULATOR_DA9052=y
-CONFIG_REGULATOR_MC13783=y
-CONFIG_REGULATOR_MC13892=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_SOC_CAMERA=y
-CONFIG_VIDEO_MX3=y
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_CODA=y
-CONFIG_SOC_CAMERA_OV2640=y
-CONFIG_DRM=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_LCD_L4F00242T03=y
-CONFIG_LCD_PLATFORM=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_PWM=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_LOGO=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_SOC=y
-CONFIG_SND_IMX_SOC=y
-CONFIG_SND_SOC_PHYCORE_AC97=y
-CONFIG_SND_SOC_EUKREA_TLV320=y
-CONFIG_SND_SOC_IMX_WM8962=y
-CONFIG_SND_SOC_IMX_SGTL5000=y
-CONFIG_SND_SOC_IMX_SPDIF=y
-CONFIG_SND_SOC_IMX_MC13783=y
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_MXC=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_USB_MXS_PHY=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_ETH=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_MMC=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MMC_SDHCI_ESDHC_IMX=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_ONESHOT=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_GPIO=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_MC13XXX=y
-CONFIG_RTC_DRV_MXC=y
-CONFIG_RTC_DRV_SNVS=y
-CONFIG_DMADEVICES=y
-CONFIG_IMX_SDMA=y
-CONFIG_MXS_DMA=y
-CONFIG_STAGING=y
-CONFIG_DRM_IMX=y
-CONFIG_DRM_IMX_FB_HELPER=y
-CONFIG_DRM_IMX_PARALLEL_DISPLAY=y
-CONFIG_DRM_IMX_TVE=y
-CONFIG_DRM_IMX_LDB=y
-CONFIG_DRM_IMX_IPUV3_CORE=y
-CONFIG_DRM_IMX_IPUV3=y
-CONFIG_DRM_IMX_HDMI=y
-CONFIG_COMMON_CLK_DEBUG=y
-# CONFIG_IOMMU_SUPPORT is not set
-CONFIG_PWM=y
-CONFIG_PWM_IMX=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=y
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_DEFAULT="cp437"
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_UTF8=y
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_SCHED_DEBUG is not set
-CONFIG_PROVE_LOCKING=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_FTRACE is not set
-# CONFIG_ARM_UNWIND is not set
-CONFIG_SECURITYFS=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
-CONFIG_CRC_CCITT=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-
diff --git a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13-rc8.config b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13-rc8.config
new file mode 120000
index 0000000..c3886da
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13-rc8.config
@@ -0,0 +1 @@
+apf6q-linux-3.13.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13-rc8.config b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13-rc8.config
copy to buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config
hooks/post-receive
--
armadeus
|