armadeus-commitlog Mailing List for armadeus (Page 42)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
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-09-11 06:47: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 b7b0095250b3833ce687f7a5a1472f02afda8101 (commit)
via 1d1d2ec00f26d995c3df8818806c856e2719bf1b (commit)
via 5f24d75c16477b38e5e5cf818a3752851a3ae9ba (commit)
via 7be6e1996d950a045f42f2c2e4b6a7a0841fe4ce (commit)
via 026c4af7a83ede91732130ce20a5f58b1f4ba2b3 (commit)
via 0360507cfb1d0fc3c4afca56d14ca4b9cac67d4a (commit)
via 17858345abc2329213c1c8b587ad802711c483ef (commit)
via c5df96d2074e331f16f20ba4db6118d7a2489f9e (commit)
from 8e94572950465a5f2356e06c613d0d73ed879475 (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 b7b0095250b3833ce687f7a5a1472f02afda8101
Author: Philippe Reynes <tr...@gm...>
Date: Mon Sep 8 20:49:40 2014 +0200
[LINUX] 3.17: move to 3.17-rc4
commit 1d1d2ec00f26d995c3df8818806c856e2719bf1b
Author: Philippe Reynes <tr...@gm...>
Date: Wed Sep 10 21:40:14 2014 +0200
[LINUX] 3.12: move to 3.12.28
commit 5f24d75c16477b38e5e5cf818a3752851a3ae9ba
Author: Philippe Reynes <tr...@gm...>
Date: Sat Sep 6 14:14:37 2014 +0200
[LINUX] 3.16: move to 3.16.2
commit 7be6e1996d950a045f42f2c2e4b6a7a0841fe4ce
Author: Philippe Reynes <tr...@gm...>
Date: Sat Sep 6 14:14:36 2014 +0200
[LINUX] 3.14: move to 3.14.18
commit 026c4af7a83ede91732130ce20a5f58b1f4ba2b3
Author: Philippe Reynes <tr...@gm...>
Date: Sat Sep 6 14:14:35 2014 +0200
[LINUX] 3.10: move to 3.10.54
commit 0360507cfb1d0fc3c4afca56d14ca4b9cac67d4a
Author: Philippe Reynes <tr...@gm...>
Date: Thu Sep 4 21:39:18 2014 +0200
[LINUX] 3.12: move to 3.12.27
commit 17858345abc2329213c1c8b587ad802711c483ef
Author: Philippe Reynes <tr...@gm...>
Date: Mon Sep 1 19:31:44 2014 +0200
[LINUX] 3.17: move to 3.17-rc3
commit c5df96d2074e331f16f20ba4db6118d7a2489f9e
Author: Philippe Reynes <tr...@gm...>
Date: Mon Sep 1 19:31:43 2014 +0200
[LINUX] apf27: fix linux config file on xenomai mainline configuration
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27xenomaimainline_defconfig | 2 +-
...x-3.10.53.config => apf27-linux-3.10.54.config} | 0
...x-3.12.26.config => apf27-linux-3.12.28.config} | 0
...x-3.14.17.config => apf27-linux-3.14.18.config} | 0
...nux-3.16.1.config => apf27-linux-3.16.2.config} | 0
...3.17-rc2.config => apf27-linux-3.17-rc4.config} | 0
...x-3.10.53.config => apf28-linux-3.10.54.config} | 0
...x-3.12.26.config => apf28-linux-3.12.28.config} | 0
...x-3.14.17.config => apf28-linux-3.14.18.config} | 0
...nux-3.16.1.config => apf28-linux-3.16.2.config} | 0
...3.17-rc2.config => apf28-linux-3.17-rc4.config} | 0
...x-3.10.53.config => apf51-linux-3.10.54.config} | 0
...x-3.12.26.config => apf51-linux-3.12.28.config} | 0
...x-3.14.17.config => apf51-linux-3.14.18.config} | 0
...nux-3.16.1.config => apf51-linux-3.16.2.config} | 0
...3.17-rc2.config => apf51-linux-3.17-rc4.config} | 0
patches/linux/{3.10.53 => 3.10.54} | 0
patches/linux/{3.12.26 => 3.12.28} | 0
patches/linux/{3.14.17 => 3.14.18} | 0
patches/linux/{3.16.1 => 3.16.2} | 0
patches/linux/{3.17-rc2 => 3.17-rc4} | 0
...remove-PWD-in-ccflags-y.patch.applied-3.17-rc3} | 0
22 files changed, 1 insertions(+), 1 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.53.config => apf27-linux-3.10.54.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.12.26.config => apf27-linux-3.12.28.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.14.17.config => apf27-linux-3.14.18.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.16.1.config => apf27-linux-3.16.2.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.17-rc2.config => apf27-linux-3.17-rc4.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.53.config => apf28-linux-3.10.54.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.12.26.config => apf28-linux-3.12.28.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.17.config => apf28-linux-3.14.18.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.16.1.config => apf28-linux-3.16.2.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.17-rc2.config => apf28-linux-3.17-rc4.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.53.config => apf51-linux-3.10.54.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.12.26.config => apf51-linux-3.12.28.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.14.17.config => apf51-linux-3.14.18.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.16.1.config => apf51-linux-3.16.2.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.17-rc2.config => apf51-linux-3.17-rc4.config} (100%)
rename patches/linux/{3.10.53 => 3.10.54} (100%)
rename patches/linux/{3.12.26 => 3.12.28} (100%)
rename patches/linux/{3.14.17 => 3.14.18} (100%)
rename patches/linux/{3.16.1 => 3.16.2} (100%)
rename patches/linux/{3.17-rc2 => 3.17-rc4} (100%)
rename patches/linux/3.17/{0506-usb-gadget-remove-PWD-in-ccflags-y.patch => 0506-usb-gadget-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3} (100%)
diff --git a/buildroot/configs/apf27xenomaimainline_defconfig b/buildroot/configs/apf27xenomaimainline_defconfig
index cacf619..ac440f4 100644
--- a/buildroot/configs/apf27xenomaimainline_defconfig
+++ b/buildroot/configs/apf27xenomaimainline_defconfig
@@ -36,7 +36,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.32"
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"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION)-xenomai.config"
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xA0008000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27dev"
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.53.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.54.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.53.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.54.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.26.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.28.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.12.26.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.12.28.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.17.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.18.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.14.17.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.14.18.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.16.1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.16.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.16.1.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.16.2.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.17-rc2.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.17-rc4.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.17-rc2.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.17-rc4.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.53.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.54.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.53.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.54.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.26.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.28.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.12.26.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.12.28.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.17.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.18.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.17.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.14.18.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.16.1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.16.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.16.1.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.16.2.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.17-rc2.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.17-rc4.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.17-rc2.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.17-rc4.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.53.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.54.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.53.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.54.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.26.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.28.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.12.26.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.12.28.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.17.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.18.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.14.17.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.14.18.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.1.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.16.1.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.16.2.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.17-rc2.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.17-rc4.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.17-rc2.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.17-rc4.config
diff --git a/patches/linux/3.10.53 b/patches/linux/3.10.54
similarity index 100%
rename from patches/linux/3.10.53
rename to patches/linux/3.10.54
diff --git a/patches/linux/3.12.26 b/patches/linux/3.12.28
similarity index 100%
rename from patches/linux/3.12.26
rename to patches/linux/3.12.28
diff --git a/patches/linux/3.14.17 b/patches/linux/3.14.18
similarity index 100%
rename from patches/linux/3.14.17
rename to patches/linux/3.14.18
diff --git a/patches/linux/3.16.1 b/patches/linux/3.16.2
similarity index 100%
rename from patches/linux/3.16.1
rename to patches/linux/3.16.2
diff --git a/patches/linux/3.17-rc2 b/patches/linux/3.17-rc4
similarity index 100%
rename from patches/linux/3.17-rc2
rename to patches/linux/3.17-rc4
diff --git a/patches/linux/3.17/0506-usb-gadget-remove-PWD-in-ccflags-y.patch b/patches/linux/3.17/0506-usb-gadget-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3
similarity index 100%
rename from patches/linux/3.17/0506-usb-gadget-remove-PWD-in-ccflags-y.patch
rename to patches/linux/3.17/0506-usb-gadget-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-08-31 19:26:29
|
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 8e94572950465a5f2356e06c613d0d73ed879475 (commit)
via 6433668e2f9f48993fddf076e890bf129ffbf9f1 (commit)
via 6a94c41523c8c02f928af622095667a3aaffe5a8 (commit)
from d29f40441e61639eb76d46c250015beb182fc751 (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 8e94572950465a5f2356e06c613d0d73ed879475
Author: Philippe Reynes <tr...@gm...>
Date: Sat Aug 30 12:41:23 2014 +0200
[LINUX] 3.17: move to 3.17-rc2
commit 6433668e2f9f48993fddf076e890bf129ffbf9f1
Author: Philippe Reynes <tr...@gm...>
Date: Mon Aug 18 23:58:11 2014 +0200
[LINUX] 3.17: add initial support of 3.17-rc1
commit 6a94c41523c8c02f928af622095667a3aaffe5a8
Author: Philippe Reynes <tr...@gm...>
Date: Mon Aug 18 23:58:10 2014 +0200
xilinx-fpga-loader: fix compilation for 3.17
Without this fix, the compilation of xilinx-fpga-loader fails
with the following error :
CC drivers/armadeus/fpga/dev_tools/loader/xilinx-fpga-loader.o drivers/armadeus/fpga/dev_tools/loader/xilinx-fpga-loader.c: In function âget_timerâ: drivers/armadeus/fpga/dev_tools/loader/xilinx-fpga-loader.c:48:2:erreur: implicit declaration of function âdo_gettimeofdayâ [-Werror=implicit-function-declaration] cc1: some warnings being treated as errors
make[7]: *** [drivers/armadeus/fpga/dev_tools/loader/xilinx-fpga-loader.o] Erreur 1
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-3.17-rc2.config | 1 +
...7-linux-3.16.config => apf27-linux-3.17.config} | 0
.../armadeus/apf28/apf28-linux-3.17-rc2.config | 1 +
...8-linux-3.14.config => apf28-linux-3.17.config} | 0
.../armadeus/apf51/apf51-linux-3.17-rc2.config | 1 +
...1-linux-3.16.config => apf51-linux-3.17.config} | 0
patches/linux/3.17-rc2 | 1 +
...15-armadeus-logo-add_armadeus-project_tux.patch | 0
.../{3.10 => 3.17}/0021-armadeus-apf9328.patch | 0
...s-apf9328-add_board_to_linux_build_system.patch | 0
.../0029-armadeus-add_csi_and_spi_registers.patch | 0
...29b-armadeus-add_csi_registers.patch.dontapply} | 0
...rmadeus-devices-imx1-add_udc_registration.patch | 0
...35-armadeus-re_add_pwm_and_correct_driver.tofix | 0
...50-armadeus-add_custom_drivers_to_kconfig.patch | 0
.../{3.15 => 3.17}/0073-armadeus-tsc2102.patch | 0
...02_integrate_driver_to_linux_build_system.patch | 0
...chscreen-add_driver_to_linux_build_system.patch | 0
.../0074-armadeus-tsc2102-touchscreen.patch | 0
.../0075-armadeus-spi2-reg-defines.patch | 0
.../0076-Add-tsc210x-device-tree-support.patch | 0
...eus-clock_correct_mxc_decode_pll_for_imx1.tofix | 0
...madeus-clock-imx1_avoid_crash_with_module.tofix | 0
...-tsc210x-device-tree-support-for-apf27dev.patch | 0
...deus-dts-apf27dev-fixes-user-led-polarity.patch | 0
...1-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch | 0
...dts-apf27dev-add_gpio_key_wakeup_behavior.patch | 0
...s-dts-imx27-apf27dev-set-pwmr-accordingly.patch | 0
...-armadeus-fixes-vpu-spll-clock-dependency.patch | 0
...-net-phy-fix_smsc_reset.patch.applied-3.17-rc2} | 0
.../0322-armadeus-add_mach_fpga_h.patch | 0
...-imx51_dts-add_usbphy_for_host1_and_host2.patch | 0
...51-chipidea-usbmisc_imx-add_imx51_support.patch | 0
...adeus-chipidea-add_node_to_select_clk_phy.patch | 0
...us-apf51-add_apf51_v1-and_v2_device_trees.patch | 0
...eus-apf51-add_mc13982_touchscreen_support.patch | 0
.../0420-armadeus-Add-apf28dev-dts.patch | 0
...ot_link_otg_phy_clock_directly_to_osc_ref.patch | 0
..._star_completion_for_source_in_menuconfig.patch | 0
...low_to_use_the_wakeupalarm_functionnality.patch | 0
.../0444-armadeus-imx27-add-usb.patch | 0
...44-armadeus-usb-enable_usb_div_by_default.patch | 16 ++--
...5-armadeus-add-apf27-apf27dev-dts-for-USB.patch | 0
.../0446-armadeus_add_pm_power_off_function.patch | 0
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 0
...c-core-Update-ext_csd-if-touched-by-ioctl.patch | 0
...6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch | 0
...-remove-pwr_in_suspend-from-platform-data.patch | 0
...-instead-of-enumerations-for-pdata-clocks.patch | 0
...al-device-tree-support-to-the-sdio-module.patch | 0
...-8-wlcore-sdio-add-wilink-clock-providers.patch | 0
...8-wlcore-sdio-get-clocks-from-device-tree.patch | 0
...heck-if-we-got-correct-clock-data-from-DT.patch | 0
...cumentation-dt-bindings-TI-WiLink-modules.patch | 0
...platfrom-get_max_timeout_count-hook.patch.tofix | 0
...-incorrect-max_discard_to-for-uSDHC.patch.tofix | 0
...sdhci-add-platform-set_timeout-hook.patch.tofix | 0
...correct-max-timeout-value-for-uSDHC.patch.tofix | 0
...SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix | 0
...04-armadeus-add_sx8674_touchscreen_driver.patch | 0
.../0505-armadeus-add_mcp7940x_rtc_driver.patch | 0
.../0506-usb-gadget-remove-PWD-in-ccflags-y.patch | 96 ++++++++++++++++++++
.../fpga/dev_tools/loader/xilinx-fpga-loader.c | 5 +
63 files changed, 114 insertions(+), 7 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.17-rc2.config
copy buildroot/target/device/armadeus/apf27/{apf27-linux-3.16.config => apf27-linux-3.17.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.17-rc2.config
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.config => apf28-linux-3.17.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.17-rc2.config
copy buildroot/target/device/armadeus/apf51/{apf51-linux-3.16.config => apf51-linux-3.17.config} (100%)
create mode 120000 patches/linux/3.17-rc2
copy patches/linux/{3.12 => 3.17}/0015-armadeus-logo-add_armadeus-project_tux.patch (100%)
copy patches/linux/{3.10 => 3.17}/0021-armadeus-apf9328.patch (100%)
copy patches/linux/{3.10 => 3.17}/0024-armadeus-apf9328-add_board_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 3.17}/0029-armadeus-add_csi_and_spi_registers.patch (100%)
copy patches/linux/{3.10/0029b-armadeus-add_csi_registers.patch => 3.17/0029b-armadeus-add_csi_registers.patch.dontapply} (100%)
copy patches/linux/{3.10 => 3.17}/0030-armadeus-devices-imx1-add_udc_registration.patch (100%)
copy patches/linux/{3.10 => 3.17}/0035-armadeus-re_add_pwm_and_correct_driver.tofix (100%)
copy patches/linux/{3.10 => 3.17}/0050-armadeus-add_custom_drivers_to_kconfig.patch (100%)
copy patches/linux/{3.15 => 3.17}/0073-armadeus-tsc2102.patch (100%)
copy patches/linux/{3.10 => 3.17}/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 3.17}/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 3.17}/0074-armadeus-tsc2102-touchscreen.patch (100%)
copy patches/linux/{3.10 => 3.17}/0075-armadeus-spi2-reg-defines.patch (100%)
copy patches/linux/{3.15 => 3.17}/0076-Add-tsc210x-device-tree-support.patch (100%)
copy patches/linux/{3.10 => 3.17}/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix (100%)
copy patches/linux/{3.10 => 3.17}/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix (100%)
copy patches/linux/{3.15 => 3.17}/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch (100%)
copy patches/linux/{3.15 => 3.17}/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch (100%)
copy patches/linux/{3.15 => 3.17}/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch (100%)
copy patches/linux/{3.13 => 3.17}/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch (100%)
copy patches/linux/{3.15 => 3.17}/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch (100%)
copy patches/linux/{3.13 => 3.17}/0230-armadeus-fixes-vpu-spll-clock-dependency.patch (100%)
copy patches/linux/{3.16/0232-armadeus-net-phy-fix_smsc_reset.patch => 3.17/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.17-rc2} (100%)
copy patches/linux/{3.10 => 3.17}/0322-armadeus-add_mach_fpga_h.patch (100%)
copy patches/linux/{3.14 => 3.17}/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch (100%)
copy patches/linux/{3.12 => 3.17}/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch (100%)
copy patches/linux/{3.12 => 3.17}/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch (100%)
copy patches/linux/{3.16 => 3.17}/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch (100%)
copy patches/linux/{3.16 => 3.17}/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch (100%)
copy patches/linux/{3.16 => 3.17}/0420-armadeus-Add-apf28dev-dts.patch (100%)
copy patches/linux/{3.14 => 3.17}/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch (100%)
copy patches/linux/{3.12 => 3.17}/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch (100%)
copy patches/linux/{3.10 => 3.17}/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch (100%)
copy patches/linux/{3.16 => 3.17}/0444-armadeus-imx27-add-usb.patch (100%)
copy patches/linux/{3.16 => 3.17}/0444-armadeus-usb-enable_usb_div_by_default.patch (52%)
copy patches/linux/{3.16 => 3.17}/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch (100%)
copy patches/linux/{3.14 => 3.17}/0446-armadeus_add_pm_power_off_function.patch (100%)
copy patches/linux/{3.16 => 3.17}/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch (100%)
copy patches/linux/{3.12 => 3.17}/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch (100%)
copy patches/linux/{3.13 => 3.17}/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch (100%)
copy patches/linux/{3.16 => 3.17}/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch (100%)
copy patches/linux/{3.15 => 3.17}/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch (100%)
copy patches/linux/{3.16 => 3.17}/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch (100%)
copy patches/linux/{3.13 => 3.17}/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch (100%)
copy patches/linux/{3.15 => 3.17}/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch (100%)
copy patches/linux/{3.15 => 3.17}/0496-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch (100%)
copy patches/linux/{3.15 => 3.17}/0497-v3-Documentation-dt-bindings-TI-WiLink-modules.patch (100%)
copy patches/linux/{3.16 => 3.17}/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix (100%)
copy patches/linux/{3.16 => 3.17}/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix (100%)
copy patches/linux/{3.16 => 3.17}/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix (100%)
copy patches/linux/{3.16 => 3.17}/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix (100%)
copy patches/linux/{3.16 => 3.17}/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix (100%)
copy patches/linux/{3.15 => 3.17}/0504-armadeus-add_sx8674_touchscreen_driver.patch (100%)
copy patches/linux/{3.15 => 3.17}/0505-armadeus-add_mcp7940x_rtc_driver.patch (100%)
create mode 100644 patches/linux/3.17/0506-usb-gadget-remove-PWD-in-ccflags-y.patch
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.17-rc2.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.17-rc2.config
new file mode 120000
index 0000000..f353627
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.17-rc2.config
@@ -0,0 +1 @@
+apf27-linux-3.17.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.16.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.17.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-3.16.config
copy to buildroot/target/device/armadeus/apf27/apf27-linux-3.17.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.17-rc2.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.17-rc2.config
new file mode 120000
index 0000000..866bd25
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.17-rc2.config
@@ -0,0 +1 @@
+apf28-linux-3.17.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.17.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-3.17.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.17-rc2.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.17-rc2.config
new file mode 120000
index 0000000..f370504
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.17-rc2.config
@@ -0,0 +1 @@
+apf51-linux-3.17.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf51/apf51-linux-3.16.config
copy to buildroot/target/device/armadeus/apf51/apf51-linux-3.17.config
diff --git a/patches/linux/3.17-rc2 b/patches/linux/3.17-rc2
new file mode 120000
index 0000000..459f037
--- /dev/null
+++ b/patches/linux/3.17-rc2
@@ -0,0 +1 @@
+3.17
\ No newline at end of file
diff --git a/patches/linux/3.12/0015-armadeus-logo-add_armadeus-project_tux.patch b/patches/linux/3.17/0015-armadeus-logo-add_armadeus-project_tux.patch
similarity index 100%
copy from patches/linux/3.12/0015-armadeus-logo-add_armadeus-project_tux.patch
copy to patches/linux/3.17/0015-armadeus-logo-add_armadeus-project_tux.patch
diff --git a/patches/linux/3.10/0021-armadeus-apf9328.patch b/patches/linux/3.17/0021-armadeus-apf9328.patch
similarity index 100%
copy from patches/linux/3.10/0021-armadeus-apf9328.patch
copy to patches/linux/3.17/0021-armadeus-apf9328.patch
diff --git a/patches/linux/3.10/0024-armadeus-apf9328-add_board_to_linux_build_system.patch b/patches/linux/3.17/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
similarity index 100%
copy from patches/linux/3.10/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
copy to patches/linux/3.17/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
diff --git a/patches/linux/3.10/0029-armadeus-add_csi_and_spi_registers.patch b/patches/linux/3.17/0029-armadeus-add_csi_and_spi_registers.patch
similarity index 100%
copy from patches/linux/3.10/0029-armadeus-add_csi_and_spi_registers.patch
copy to patches/linux/3.17/0029-armadeus-add_csi_and_spi_registers.patch
diff --git a/patches/linux/3.10/0029b-armadeus-add_csi_registers.patch b/patches/linux/3.17/0029b-armadeus-add_csi_registers.patch.dontapply
similarity index 100%
copy from patches/linux/3.10/0029b-armadeus-add_csi_registers.patch
copy to patches/linux/3.17/0029b-armadeus-add_csi_registers.patch.dontapply
diff --git a/patches/linux/3.10/0030-armadeus-devices-imx1-add_udc_registration.patch b/patches/linux/3.17/0030-armadeus-devices-imx1-add_udc_registration.patch
similarity index 100%
copy from patches/linux/3.10/0030-armadeus-devices-imx1-add_udc_registration.patch
copy to patches/linux/3.17/0030-armadeus-devices-imx1-add_udc_registration.patch
diff --git a/patches/linux/3.10/0035-armadeus-re_add_pwm_and_correct_driver.tofix b/patches/linux/3.17/0035-armadeus-re_add_pwm_and_correct_driver.tofix
similarity index 100%
copy from patches/linux/3.10/0035-armadeus-re_add_pwm_and_correct_driver.tofix
copy to patches/linux/3.17/0035-armadeus-re_add_pwm_and_correct_driver.tofix
diff --git a/patches/linux/3.10/0050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/3.17/0050-armadeus-add_custom_drivers_to_kconfig.patch
similarity index 100%
copy from patches/linux/3.10/0050-armadeus-add_custom_drivers_to_kconfig.patch
copy to patches/linux/3.17/0050-armadeus-add_custom_drivers_to_kconfig.patch
diff --git a/patches/linux/3.15/0073-armadeus-tsc2102.patch b/patches/linux/3.17/0073-armadeus-tsc2102.patch
similarity index 100%
copy from patches/linux/3.15/0073-armadeus-tsc2102.patch
copy to patches/linux/3.17/0073-armadeus-tsc2102.patch
diff --git a/patches/linux/3.10/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch b/patches/linux/3.17/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
similarity index 100%
copy from patches/linux/3.10/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
copy to patches/linux/3.17/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
diff --git a/patches/linux/3.10/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch b/patches/linux/3.17/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
similarity index 100%
copy from patches/linux/3.10/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
copy to patches/linux/3.17/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
diff --git a/patches/linux/3.10/0074-armadeus-tsc2102-touchscreen.patch b/patches/linux/3.17/0074-armadeus-tsc2102-touchscreen.patch
similarity index 100%
copy from patches/linux/3.10/0074-armadeus-tsc2102-touchscreen.patch
copy to patches/linux/3.17/0074-armadeus-tsc2102-touchscreen.patch
diff --git a/patches/linux/3.10/0075-armadeus-spi2-reg-defines.patch b/patches/linux/3.17/0075-armadeus-spi2-reg-defines.patch
similarity index 100%
copy from patches/linux/3.10/0075-armadeus-spi2-reg-defines.patch
copy to patches/linux/3.17/0075-armadeus-spi2-reg-defines.patch
diff --git a/patches/linux/3.15/0076-Add-tsc210x-device-tree-support.patch b/patches/linux/3.17/0076-Add-tsc210x-device-tree-support.patch
similarity index 100%
copy from patches/linux/3.15/0076-Add-tsc210x-device-tree-support.patch
copy to patches/linux/3.17/0076-Add-tsc210x-device-tree-support.patch
diff --git a/patches/linux/3.10/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix b/patches/linux/3.17/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
similarity index 100%
copy from patches/linux/3.10/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
copy to patches/linux/3.17/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
diff --git a/patches/linux/3.10/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix b/patches/linux/3.17/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
similarity index 100%
copy from patches/linux/3.10/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
copy to patches/linux/3.17/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
diff --git a/patches/linux/3.15/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch b/patches/linux/3.17/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
similarity index 100%
copy from patches/linux/3.15/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
copy to patches/linux/3.17/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
diff --git a/patches/linux/3.15/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch b/patches/linux/3.17/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
similarity index 100%
copy from patches/linux/3.15/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
copy to patches/linux/3.17/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
diff --git a/patches/linux/3.15/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch b/patches/linux/3.17/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
similarity index 100%
copy from patches/linux/3.15/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
copy to patches/linux/3.17/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
diff --git a/patches/linux/3.13/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch b/patches/linux/3.17/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
similarity index 100%
copy from patches/linux/3.13/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
copy to patches/linux/3.17/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
diff --git a/patches/linux/3.15/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch b/patches/linux/3.17/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
similarity index 100%
copy from patches/linux/3.15/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
copy to patches/linux/3.17/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
diff --git a/patches/linux/3.13/0230-armadeus-fixes-vpu-spll-clock-dependency.patch b/patches/linux/3.17/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
similarity index 100%
copy from patches/linux/3.13/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
copy to patches/linux/3.17/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
diff --git a/patches/linux/3.16/0232-armadeus-net-phy-fix_smsc_reset.patch b/patches/linux/3.17/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.17-rc2
similarity index 100%
copy from patches/linux/3.16/0232-armadeus-net-phy-fix_smsc_reset.patch
copy to patches/linux/3.17/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.17-rc2
diff --git a/patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.17/0322-armadeus-add_mach_fpga_h.patch
similarity index 100%
copy from patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch
copy to patches/linux/3.17/0322-armadeus-add_mach_fpga_h.patch
diff --git a/patches/linux/3.14/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch b/patches/linux/3.17/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
similarity index 100%
copy from patches/linux/3.14/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
copy to patches/linux/3.17/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
diff --git a/patches/linux/3.12/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch b/patches/linux/3.17/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
similarity index 100%
copy from patches/linux/3.12/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
copy to patches/linux/3.17/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
diff --git a/patches/linux/3.12/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch b/patches/linux/3.17/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
similarity index 100%
copy from patches/linux/3.12/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
copy to patches/linux/3.17/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
diff --git a/patches/linux/3.16/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch b/patches/linux/3.17/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
similarity index 100%
copy from patches/linux/3.16/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
copy to patches/linux/3.17/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
diff --git a/patches/linux/3.16/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch b/patches/linux/3.17/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch
similarity index 100%
copy from patches/linux/3.16/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch
copy to patches/linux/3.17/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch
diff --git a/patches/linux/3.16/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.17/0420-armadeus-Add-apf28dev-dts.patch
similarity index 100%
copy from patches/linux/3.16/0420-armadeus-Add-apf28dev-dts.patch
copy to patches/linux/3.17/0420-armadeus-Add-apf28dev-dts.patch
diff --git a/patches/linux/3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch b/patches/linux/3.17/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
similarity index 100%
copy from patches/linux/3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
copy to patches/linux/3.17/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
diff --git a/patches/linux/3.12/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/patches/linux/3.17/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
similarity index 100%
copy from patches/linux/3.12/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
copy to patches/linux/3.17/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
diff --git a/patches/linux/3.10/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch b/patches/linux/3.17/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
similarity index 100%
copy from patches/linux/3.10/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
copy to patches/linux/3.17/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
diff --git a/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch b/patches/linux/3.17/0444-armadeus-imx27-add-usb.patch
similarity index 100%
copy from patches/linux/3.16/0444-armadeus-imx27-add-usb.patch
copy to patches/linux/3.17/0444-armadeus-imx27-add-usb.patch
diff --git a/patches/linux/3.16/0444-armadeus-usb-enable_usb_div_by_default.patch b/patches/linux/3.17/0444-armadeus-usb-enable_usb_div_by_default.patch
similarity index 52%
copy from patches/linux/3.16/0444-armadeus-usb-enable_usb_div_by_default.patch
copy to patches/linux/3.17/0444-armadeus-usb-enable_usb_div_by_default.patch
index 19e14e6..cfceb18 100644
--- a/patches/linux/3.16/0444-armadeus-usb-enable_usb_div_by_default.patch
+++ b/patches/linux/3.17/0444-armadeus-usb-enable_usb_div_by_default.patch
@@ -7,13 +7,15 @@ This patch is an temporary solution to enable usb_div.
Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
---
---- linux-3.16/arch/arm/mach-imx/clk-imx27.c
-+++ linux-3.16/arch/arm/mach-imx/clk-imx27.c
-@@ -279,6 +279,7 @@ int __init mx27_clocks_init(unsigned lon
- mxc_timer_init(MX27_IO_ADDRESS(MX27_GPT1_BASE_ADDR), MX27_INT_GPT1);
+Index: b/arch/arm/mach-imx/clk-imx27.c
+===================================================================
+--- a/arch/arm/mach-imx/clk-imx27.c
++++ b/arch/arm/mach-imx/clk-imx27.c
+@@ -157,6 +157,7 @@ static void __init _mx27_clocks_init(uns
+ clk_register_clkdev(clk[IMX27_CLK_CPU_DIV], NULL, "cpu0");
- clk_prepare_enable(clk[emi_ahb_gate]);
-+ clk_prepare_enable(clk[usb_div]);
+ clk_prepare_enable(clk[IMX27_CLK_EMI_AHB_GATE]);
++ clk_prepare_enable(clk[IMX27_CLK_USB_DIV]);
imx_print_silicon_rev("i.MX27", mx27_revision());
-
+ }
diff --git a/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch b/patches/linux/3.17/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
similarity index 100%
copy from patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
copy to patches/linux/3.17/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
diff --git a/patches/linux/3.14/0446-armadeus_add_pm_power_off_function.patch b/patches/linux/3.17/0446-armadeus_add_pm_power_off_function.patch
similarity index 100%
copy from patches/linux/3.14/0446-armadeus_add_pm_power_off_function.patch
copy to patches/linux/3.17/0446-armadeus_add_pm_power_off_function.patch
diff --git a/patches/linux/3.16/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.17/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
similarity index 100%
copy from patches/linux/3.16/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
copy to patches/linux/3.17/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
diff --git a/patches/linux/3.12/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch b/patches/linux/3.17/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
similarity index 100%
copy from patches/linux/3.12/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
copy to patches/linux/3.17/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
diff --git a/patches/linux/3.13/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch b/patches/linux/3.17/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
similarity index 100%
copy from patches/linux/3.13/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
copy to patches/linux/3.17/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
diff --git a/patches/linux/3.16/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch b/patches/linux/3.17/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
similarity index 100%
copy from patches/linux/3.16/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
copy to patches/linux/3.17/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
diff --git a/patches/linux/3.15/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch b/patches/linux/3.17/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
similarity index 100%
copy from patches/linux/3.15/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
copy to patches/linux/3.17/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
diff --git a/patches/linux/3.16/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch b/patches/linux/3.17/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
similarity index 100%
copy from patches/linux/3.16/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
copy to patches/linux/3.17/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
diff --git a/patches/linux/3.13/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch b/patches/linux/3.17/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch
similarity index 100%
copy from patches/linux/3.13/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch
copy to patches/linux/3.17/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch
diff --git a/patches/linux/3.15/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch b/patches/linux/3.17/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
similarity index 100%
copy from patches/linux/3.15/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
copy to patches/linux/3.17/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
diff --git a/patches/linux/3.15/0496-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch b/patches/linux/3.17/0496-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
similarity index 100%
copy from patches/linux/3.15/0496-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
copy to patches/linux/3.17/0496-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
diff --git a/patches/linux/3.15/0497-v3-Documentation-dt-bindings-TI-WiLink-modules.patch b/patches/linux/3.17/0497-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
similarity index 100%
copy from patches/linux/3.15/0497-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
copy to patches/linux/3.17/0497-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
diff --git a/patches/linux/3.16/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix b/patches/linux/3.17/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix
similarity index 100%
copy from patches/linux/3.16/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix
copy to patches/linux/3.17/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix
diff --git a/patches/linux/3.16/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix b/patches/linux/3.17/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix
similarity index 100%
copy from patches/linux/3.16/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix
copy to patches/linux/3.17/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix
diff --git a/patches/linux/3.16/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix b/patches/linux/3.17/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix
similarity index 100%
copy from patches/linux/3.16/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix
copy to patches/linux/3.17/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix
diff --git a/patches/linux/3.16/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix b/patches/linux/3.17/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix
similarity index 100%
copy from patches/linux/3.16/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix
copy to patches/linux/3.17/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix
diff --git a/patches/linux/3.16/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix b/patches/linux/3.17/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix
similarity index 100%
copy from patches/linux/3.16/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix
copy to patches/linux/3.17/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix
diff --git a/patches/linux/3.15/0504-armadeus-add_sx8674_touchscreen_driver.patch b/patches/linux/3.17/0504-armadeus-add_sx8674_touchscreen_driver.patch
similarity index 100%
copy from patches/linux/3.15/0504-armadeus-add_sx8674_touchscreen_driver.patch
copy to patches/linux/3.17/0504-armadeus-add_sx8674_touchscreen_driver.patch
diff --git a/patches/linux/3.15/0505-armadeus-add_mcp7940x_rtc_driver.patch b/patches/linux/3.17/0505-armadeus-add_mcp7940x_rtc_driver.patch
similarity index 100%
copy from patches/linux/3.15/0505-armadeus-add_mcp7940x_rtc_driver.patch
copy to patches/linux/3.17/0505-armadeus-add_mcp7940x_rtc_driver.patch
diff --git a/patches/linux/3.17/0506-usb-gadget-remove-PWD-in-ccflags-y.patch b/patches/linux/3.17/0506-usb-gadget-remove-PWD-in-ccflags-y.patch
new file mode 100644
index 0000000..23a02fa
--- /dev/null
+++ b/patches/linux/3.17/0506-usb-gadget-remove-PWD-in-ccflags-y.patch
@@ -0,0 +1,96 @@
+From 33cf4516f3e77a07bff59abdf8e74588573a2fd8 Mon Sep 17 00:00:00 2001
+From: Philippe Reynes <tr...@gm...>
+Date: Sun, 17 Aug 2014 23:04:39 +0200
+Subject: [PATCH] usb: gadget: remove $(PWD) in ccflags-y
+
+The variable $(PWD) is useless, and it may break the compilation.
+For example, it breaks the kernel compilation when it's done with
+buildroot :
+
+ /home/trem/Codes/armadeus/armadeus/buildroot/output/host/usr/bin/ccache
+/home/trem/Codes/armadeus/armadeus/buildroot/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc
+-Wp,-MD,drivers/usb/gadget/legacy/.hid.o.d -nostdinc -isystem
+/home/trem/Codes/armadeus/armadeus/buildroot/output/host/usr/lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.7.3/include
+-I./arch/arm/include -Iarch/arm/include/generated -Iinclude
+-I./arch/arm/include/uapi -Iarch/arm/include/generated/uapi
+-I./include/uapi -Iinclude/generated/uapi -include
+./include/linux/kconfig.h -D__KERNEL__ -mlittle-endian -Wall -Wundef
+-Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common
+-Werror-implicit-function-declaration -Wno-format-security
+-fno-dwarf2-cfi-asm -mabi=aapcs-linux -mno-thumb-interwork -mfpu=vfp
+-funwind-tables -marm -D__LINUX_ARM_ARCH__=5 -march=armv5te
+-mtune=arm9tdmi -msoft-float -Uarm -fno-delete-null-pointer-checks -O2
+--param=allow-store-data-races=0 -Wframe-larger-than=1024
+-fno-stack-protector -Wno-unused-but-set-variable -fomit-frame-pointer
+-fno-var-tracking-assignments -g -Wdeclaration-after-statement
+-Wno-pointer-sign -fno-strict-overflow -fconserve-stack
+-Werror=implicit-int -Werror=strict-prototypes -DCC_HAVE_ASM_GOTO
+-I/home/trem/Codes/armadeus/armadeus/buildroot/drivers/usb/gadget/
+-I/home/trem/Codes/armadeus/armadeus/buildroot/drivers/usb/gadget/udc/
+-I/home/trem/Codes/armadeus/armadeus/buildroot/drivers/usb/gadget/function/
+-DMODULE -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(hid)"
+-D"KBUILD_MODNAME=KBUILD_STR(g_hid)" -c -o
+drivers/usb/gadget/legacy/hid.o drivers/usb/gadget/legacy/hid.c
+drivers/usb/gadget/epautoconf.c:23:26: erreur fatale: gadget_chips.h :
+Aucun fichier ou dossier de ce type
+
+This compilation line include :
+..../buildroot/driver/usb/gadget
+but the real path is :
+..../buildroot/output/build/linux-3.17-rc1/driver/usb/gadget
+
+Signed-off-by: Philippe Reynes <tr...@gm...>
+---
+ drivers/usb/gadget/Makefile | 2 +-
+ drivers/usb/gadget/function/Makefile | 4 ++--
+ drivers/usb/gadget/legacy/Makefile | 6 +++---
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
+index a186afe..9add915 100644
+--- a/drivers/usb/gadget/Makefile
++++ b/drivers/usb/gadget/Makefile
+@@ -3,7 +3,7 @@
+ #
+ subdir-ccflags-$(CONFIG_USB_GADGET_DEBUG) := -DDEBUG
+ subdir-ccflags-$(CONFIG_USB_GADGET_VERBOSE) += -DVERBOSE_DEBUG
+-ccflags-y += -I$(PWD)/drivers/usb/gadget/udc
++ccflags-y += -Idrivers/usb/gadget/udc
+
+ obj-$(CONFIG_USB_LIBCOMPOSITE) += libcomposite.o
+ libcomposite-y := usbstring.o config.o epautoconf.o
+diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile
+index 6d91f21..83ae106 100644
+--- a/drivers/usb/gadget/function/Makefile
++++ b/drivers/usb/gadget/function/Makefile
+@@ -2,8 +2,8 @@
+ # USB peripheral controller drivers
+ #
+
+-ccflags-y := -I$(PWD)/drivers/usb/gadget/
+-ccflags-y += -I$(PWD)/drivers/usb/gadget/udc/
++ccflags-y := -Idrivers/usb/gadget/
++ccflags-y += -Idrivers/usb/gadget/udc/
+
+ # USB Functions
+ usb_f_acm-y := f_acm.o
+diff --git a/drivers/usb/gadget/legacy/Makefile b/drivers/usb/gadget/legacy/Makefile
+index a11aad5..edba2d1 100644
+--- a/drivers/usb/gadget/legacy/Makefile
++++ b/drivers/usb/gadget/legacy/Makefile
+@@ -2,9 +2,9 @@
+ # USB gadget drivers
+ #
+
+-ccflags-y := -I$(PWD)/drivers/usb/gadget/
+-ccflags-y += -I$(PWD)/drivers/usb/gadget/udc/
+-ccflags-y += -I$(PWD)/drivers/usb/gadget/function/
++ccflags-y := -Idrivers/usb/gadget/
++ccflags-y += -Idrivers/usb/gadget/udc/
++ccflags-y += -Idrivers/usb/gadget/function/
+
+ g_zero-y := zero.o
+ g_audio-y := audio.o
+--
+1.7.4.4
+
diff --git a/target/linux/modules/fpga/dev_tools/loader/xilinx-fpga-loader.c b/target/linux/modules/fpga/dev_tools/loader/xilinx-fpga-loader.c
index 84c2afd..f5b9866 100644
--- a/target/linux/modules/fpga/dev_tools/loader/xilinx-fpga-loader.c
+++ b/target/linux/modules/fpga/dev_tools/loader/xilinx-fpga-loader.c
@@ -28,7 +28,12 @@
*/
#include <asm/io.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
#include <linux/time.h>
+#else
+#include <linux/timer.h>
+#endif
#include <linux/delay.h>
#include <linux/errno.h>
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-08-16 19:02:32
|
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 d29f40441e61639eb76d46c250015beb182fc751 (commit)
via 7f24bfdc48ad1d09670450a565174c9795419373 (commit)
via abe7920c89698ea62a2c75b24c490a536dd6b811 (commit)
via 3cb3080ecbf269c1cf9ccb729611b57c00116c38 (commit)
from 471d89dad9fbd4ebea58290ae7f24a4cb052728d (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 d29f40441e61639eb76d46c250015beb182fc751
Author: Philippe Reynes <tr...@ya...>
Date: Fri Aug 15 21:43:21 2014 +0200
[LINUX] 3.16: move to 3.16.1
commit 7f24bfdc48ad1d09670450a565174c9795419373
Author: Philippe Reynes <tr...@ya...>
Date: Fri Aug 15 21:43:20 2014 +0200
[LINUX] 3.15: move to 3.15.10
commit abe7920c89698ea62a2c75b24c490a536dd6b811
Author: Philippe Reynes <tr...@ya...>
Date: Fri Aug 15 21:43:19 2014 +0200
[LINUX] 3.14: move to 3.14.17
commit 3cb3080ecbf269c1cf9ccb729611b57c00116c38
Author: Philippe Reynes <tr...@ya...>
Date: Fri Aug 15 21:43:18 2014 +0200
[LINUX] 3.10: move to 3.10.53
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...x-3.10.52.config => apf27-linux-3.10.53.config} | 0
...x-3.14.16.config => apf27-linux-3.14.17.config} | 0
...ux-3.15.9.config => apf27-linux-3.15.10.config} | 0
.../armadeus/apf27/apf27-linux-3.16.1.config | 1 +
...x-3.10.52.config => apf28-linux-3.10.53.config} | 0
...x-3.14.16.config => apf28-linux-3.14.17.config} | 0
...ux-3.15.9.config => apf28-linux-3.15.10.config} | 0
.../armadeus/apf28/apf28-linux-3.16.1.config | 1 +
...x-3.10.52.config => apf51-linux-3.10.53.config} | 0
...x-3.14.16.config => apf51-linux-3.14.17.config} | 0
...ux-3.15.9.config => apf51-linux-3.15.10.config} | 0
.../armadeus/apf51/apf51-linux-3.16.1.config | 1 +
patches/linux/{3.10.52 => 3.10.53} | 0
patches/linux/{3.14.16 => 3.14.17} | 0
patches/linux/{3.15.9 => 3.15.10} | 0
patches/linux/3.16.1 | 1 +
19 files changed, 10 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.52.config => apf27-linux-3.10.53.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.14.16.config => apf27-linux-3.14.17.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.15.9.config => apf27-linux-3.15.10.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.16.1.config
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.52.config => apf28-linux-3.10.53.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.16.config => apf28-linux-3.14.17.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.15.9.config => apf28-linux-3.15.10.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.16.1.config
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.52.config => apf51-linux-3.10.53.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.14.16.config => apf51-linux-3.14.17.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.15.9.config => apf51-linux-3.15.10.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.16.1.config
rename patches/linux/{3.10.52 => 3.10.53} (100%)
rename patches/linux/{3.14.16 => 3.14.17} (100%)
rename patches/linux/{3.15.9 => 3.15.10} (100%)
create mode 120000 patches/linux/3.16.1
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index df5dd1c..ebb8f93 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.15.9"
+BR2_DEFAULT_KERNEL_VERSION="3.16.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.15.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.16.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 90adda5..34efdf4 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.15.9"
+BR2_DEFAULT_KERNEL_VERSION="3.16.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.15.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.16.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 187df11..be34fcf 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.15.9"
+BR2_DEFAULT_KERNEL_VERSION="3.16.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.15.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.16.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.52.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.53.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.52.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.53.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.16.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.17.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.14.16.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.14.17.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.9.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.10.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.15.9.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.15.10.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.16.1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.16.1.config
new file mode 120000
index 0000000..946ea8d
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.16.1.config
@@ -0,0 +1 @@
+apf27-linux-3.16.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.52.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.53.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.52.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.53.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.16.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.17.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.16.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.14.17.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.15.9.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.15.10.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.15.9.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.15.10.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.16.1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.16.1.config
new file mode 120000
index 0000000..8af93d4
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.16.1.config
@@ -0,0 +1 @@
+apf28-linux-3.16.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.52.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.53.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.52.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.53.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.16.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.17.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.14.16.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.14.17.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.15.9.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.15.10.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.15.9.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.15.10.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.1.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.1.config
new file mode 120000
index 0000000..9c57540
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.1.config
@@ -0,0 +1 @@
+apf51-linux-3.16.config
\ No newline at end of file
diff --git a/patches/linux/3.10.52 b/patches/linux/3.10.53
similarity index 100%
rename from patches/linux/3.10.52
rename to patches/linux/3.10.53
diff --git a/patches/linux/3.14.16 b/patches/linux/3.14.17
similarity index 100%
rename from patches/linux/3.14.16
rename to patches/linux/3.14.17
diff --git a/patches/linux/3.15.9 b/patches/linux/3.15.10
similarity index 100%
rename from patches/linux/3.15.9
rename to patches/linux/3.15.10
diff --git a/patches/linux/3.16.1 b/patches/linux/3.16.1
new file mode 120000
index 0000000..1bc446c
--- /dev/null
+++ b/patches/linux/3.16.1
@@ -0,0 +1 @@
+3.16
\ No newline at end of file
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-08-16 18:54: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 471d89dad9fbd4ebea58290ae7f24a4cb052728d (commit)
via f51fa78b493f2bb29f77b937ea1a86b21cec4108 (commit)
via 61e0b0e8c9536fef375718af8aaf6e7fcc267bb1 (commit)
from 7b20dae85283cb2c1f546b4a066a4d9d5831f3cd (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 471d89dad9fbd4ebea58290ae7f24a4cb052728d
Author: Philippe Reynes <tr...@ya...>
Date: Fri Aug 8 22:50:02 2014 +0200
[LINUX] 3.15: move to 3.15.9
commit f51fa78b493f2bb29f77b937ea1a86b21cec4108
Author: Philippe Reynes <tr...@ya...>
Date: Fri Aug 8 22:50:01 2014 +0200
[LINUX] 3.14: move to 3.14.16
commit 61e0b0e8c9536fef375718af8aaf6e7fcc267bb1
Author: Philippe Reynes <tr...@ya...>
Date: Fri Aug 8 22:50:00 2014 +0200
[LINUX] 3.10: move to 3.10.52
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...x-3.10.51.config => apf27-linux-3.10.52.config} | 0
...x-3.14.15.config => apf27-linux-3.14.16.config} | 0
...nux-3.15.8.config => apf27-linux-3.15.9.config} | 0
...x-3.10.51.config => apf28-linux-3.10.52.config} | 0
...x-3.14.15.config => apf28-linux-3.14.16.config} | 0
...nux-3.15.8.config => apf28-linux-3.15.9.config} | 0
...x-3.10.51.config => apf51-linux-3.10.52.config} | 0
...x-3.14.15.config => apf51-linux-3.14.16.config} | 0
...nux-3.15.8.config => apf51-linux-3.15.9.config} | 0
patches/linux/{3.10.51 => 3.10.52} | 0
patches/linux/{3.14.15 => 3.14.16} | 0
patches/linux/{3.15.8 => 3.15.9} | 0
15 files changed, 6 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.51.config => apf27-linux-3.10.52.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.14.15.config => apf27-linux-3.14.16.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.15.8.config => apf27-linux-3.15.9.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.51.config => apf28-linux-3.10.52.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.15.config => apf28-linux-3.14.16.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.15.8.config => apf28-linux-3.15.9.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.51.config => apf51-linux-3.10.52.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.14.15.config => apf51-linux-3.14.16.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.15.8.config => apf51-linux-3.15.9.config} (100%)
rename patches/linux/{3.10.51 => 3.10.52} (100%)
rename patches/linux/{3.14.15 => 3.14.16} (100%)
rename patches/linux/{3.15.8 => 3.15.9} (100%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 1e89268..df5dd1c 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.15.8"
+BR2_DEFAULT_KERNEL_VERSION="3.15.9"
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.15.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.9"
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 0b3d836..90adda5 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.15.8"
+BR2_DEFAULT_KERNEL_VERSION="3.15.9"
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.15.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.9"
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 9190a59..187df11 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.15.8"
+BR2_DEFAULT_KERNEL_VERSION="3.15.9"
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.15.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.9"
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.51.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.52.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.51.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.52.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.15.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.16.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.14.15.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.14.16.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.8.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.9.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.15.8.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.15.9.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.51.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.52.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.51.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.52.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.15.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.16.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.15.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.14.16.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.15.8.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.15.9.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.15.8.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.15.9.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.51.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.52.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.51.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.52.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.15.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.16.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.14.15.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.14.16.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.15.8.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.15.9.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.15.8.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.15.9.config
diff --git a/patches/linux/3.10.51 b/patches/linux/3.10.52
similarity index 100%
rename from patches/linux/3.10.51
rename to patches/linux/3.10.52
diff --git a/patches/linux/3.14.15 b/patches/linux/3.14.16
similarity index 100%
rename from patches/linux/3.14.15
rename to patches/linux/3.14.16
diff --git a/patches/linux/3.15.8 b/patches/linux/3.15.9
similarity index 100%
rename from patches/linux/3.15.8
rename to patches/linux/3.15.9
hooks/post-receive
--
armadeus
|
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2014-08-16 13:17:24
|
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 7b20dae85283cb2c1f546b4a066a4d9d5831f3cd (commit)
via 10f338e3349858d9eeb472a38143c9130d7dcb96 (commit)
via 1df015aa2a618aec7205a3691c4491166ed7c59c (commit)
from 149604c9024176b5ba3272ce82115f2419ee451a (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 7b20dae85283cb2c1f546b4a066a4d9d5831f3cd
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Sat Aug 16 15:16:35 2014 +0200
[LINUX][3.16] imx27: add a trick to enable usb_div and avoid usb crash
commit 10f338e3349858d9eeb472a38143c9130d7dcb96
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Sat Aug 16 15:15:59 2014 +0200
[LINUX][3.16] simplify 0444 and 0445
commit 1df015aa2a618aec7205a3691c4491166ed7c59c
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Sat Aug 16 15:15:26 2014 +0200
[LINUX][3.16] suppress patch 0444-armadeus-fix_phy_init.patch.patch (wrong solution)
-----------------------------------------------------------------------
Summary of changes:
.../linux/3.16/0444-armadeus-fix_phy_init.patch | 25 -----------
.../linux/3.16/0444-armadeus-imx27-add-usb.patch | 46 +++++--------------
...44-armadeus-usb-enable_usb_div_by_default.patch | 19 ++++++++
...5-armadeus-add-apf27-apf27dev-dts-for-USB.patch | 18 ++++---
4 files changed, 41 insertions(+), 67 deletions(-)
delete mode 100644 patches/linux/3.16/0444-armadeus-fix_phy_init.patch
create mode 100644 patches/linux/3.16/0444-armadeus-usb-enable_usb_div_by_default.patch
diff --git a/patches/linux/3.16/0444-armadeus-fix_phy_init.patch b/patches/linux/3.16/0444-armadeus-fix_phy_init.patch
deleted file mode 100644
index 78c663c..0000000
--- a/patches/linux/3.16/0444-armadeus-fix_phy_init.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-hw_phymode_configure must be called after usb_phy_init
-
-Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
----
---- linux-3.16/drivers/usb/chipidea/core.c
-+++ linux-3.16/drivers/usb/chipidea/core.c
-@@ -306,17 +306,12 @@ static int ci_usb_phy_init(struct ci_hdr
- case USBPHY_INTERFACE_MODE_UTMI:
- case USBPHY_INTERFACE_MODE_UTMIW:
- case USBPHY_INTERFACE_MODE_HSIC:
-- ret = usb_phy_init(ci->transceiver);
-- if (ret)
-- return ret;
-- hw_phymode_configure(ci);
-- break;
- case USBPHY_INTERFACE_MODE_ULPI:
- case USBPHY_INTERFACE_MODE_SERIAL:
-- hw_phymode_configure(ci);
- ret = usb_phy_init(ci->transceiver);
- if (ret)
- return ret;
-+ hw_phymode_configure(ci);
- break;
- default:
- ret = usb_phy_init(ci->transceiver);
diff --git a/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch b/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch
index 734af5e..bb016b8 100644
--- a/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch
+++ b/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch
@@ -4,7 +4,9 @@ TODO: add control to external USB VBUS power supply
Signed-off-by: Eric Jarrige <eri...@ar...>
---
---- linux-3.16/arch/arm/boot/dts/imx27.dtsi
+Index: linux-3.16/arch/arm/boot/dts/imx27.dtsi
+===================================================================
+--- linux-3.16.orig/arch/arm/boot/dts/imx27.dtsi
+++ linux-3.16/arch/arm/boot/dts/imx27.dtsi
@@ -35,6 +35,9 @@
spi0 = &cspi1;
@@ -16,37 +18,9 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
};
aitc: aitc-interrupt-controller@e0000000 {
-@@ -446,7 +449,8 @@
- compatible = "fsl,imx27-usb";
- reg = <0x10024000 0x200>;
- interrupts = <56>;
-- clocks = <&clks 75>;
-+ clocks = <&clks 15>, <&clks 75>, <&clks 62>;
-+ clock-names = "per", "ipg", "ahb";
- fsl,usbmisc = <&usbmisc 0>;
- status = "disabled";
- };
-@@ -455,7 +459,8 @@
- compatible = "fsl,imx27-usb";
- reg = <0x10024200 0x200>;
- interrupts = <54>;
-- clocks = <&clks 75>;
-+ clocks = <&clks 15>, <&clks 75>, <&clks 62>;
-+ clock-names = "per", "ipg", "ahb";
- fsl,usbmisc = <&usbmisc 1>;
- status = "disabled";
- };
-@@ -464,7 +469,8 @@
- compatible = "fsl,imx27-usb";
- reg = <0x10024400 0x200>;
- interrupts = <55>;
-- clocks = <&clks 75>;
-+ clocks = <&clks 15>, <&clks 75>, <&clks 62>;
-+ clock-names = "per", "ipg", "ahb";
- fsl,usbmisc = <&usbmisc 2>;
- status = "disabled";
- };
---- linux-3.16/drivers/usb/chipidea/ci_hdrc_imx.c
+Index: linux-3.16/drivers/usb/chipidea/ci_hdrc_imx.c
+===================================================================
+--- linux-3.16.orig/drivers/usb/chipidea/ci_hdrc_imx.c
+++ linux-3.16/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -57,6 +57,7 @@ static struct imx_usbmisc_data *usbmisc_
struct device_node *np = dev->of_node;
@@ -71,7 +45,9 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
return data;
}
---- linux-3.16/drivers/usb/chipidea/ci_hdrc_imx.h
+Index: linux-3.16/drivers/usb/chipidea/ci_hdrc_imx.h
+===================================================================
+--- linux-3.16.orig/drivers/usb/chipidea/ci_hdrc_imx.h
+++ linux-3.16/drivers/usb/chipidea/ci_hdrc_imx.h
@@ -18,6 +18,9 @@ struct imx_usbmisc_data {
unsigned int disable_oc:1; /* over current detect disabled */
@@ -83,7 +59,9 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
};
int imx_usbmisc_init(struct imx_usbmisc_data *);
---- linux-3.16/drivers/usb/chipidea/usbmisc_imx.c
+Index: linux-3.16/drivers/usb/chipidea/usbmisc_imx.c
+===================================================================
+--- linux-3.16.orig/drivers/usb/chipidea/usbmisc_imx.c
+++ linux-3.16/drivers/usb/chipidea/usbmisc_imx.c
@@ -42,8 +42,18 @@
#define MX25_H1_OCPOL_BIT BIT(2)
diff --git a/patches/linux/3.16/0444-armadeus-usb-enable_usb_div_by_default.patch b/patches/linux/3.16/0444-armadeus-usb-enable_usb_div_by_default.patch
new file mode 100644
index 0000000..19e14e6
--- /dev/null
+++ b/patches/linux/3.16/0444-armadeus-usb-enable_usb_div_by_default.patch
@@ -0,0 +1,19 @@
+i.MX27's usb needs three clocks (usb_ipg_gate, usb_ahb_gate and usb_misc)
+but the current chipidea driver implementation, and devicetree, provides
+only ipg and ahb. Consequently, if the bootloader don't enable the last
+one, the kernel will crash.
+
+This patch is an temporary solution to enable usb_div.
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+--- linux-3.16/arch/arm/mach-imx/clk-imx27.c
++++ linux-3.16/arch/arm/mach-imx/clk-imx27.c
+@@ -279,6 +279,7 @@ int __init mx27_clocks_init(unsigned lon
+ mxc_timer_init(MX27_IO_ADDRESS(MX27_GPT1_BASE_ADDR), MX27_INT_GPT1);
+
+ clk_prepare_enable(clk[emi_ahb_gate]);
++ clk_prepare_enable(clk[usb_div]);
+
+ imx_print_silicon_rev("i.MX27", mx27_revision());
+
diff --git a/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch b/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
index adb3aaa..6c23dcd 100644
--- a/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
+++ b/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
@@ -2,7 +2,9 @@ Add APF27 APF27dev USB to device tree
Signed-off-by: Eric Jarrige <eri...@ar...>
---
---- linux-3.16/arch/arm/boot/dts/imx27-apf27.dts
+Index: linux-3.16/arch/arm/boot/dts/imx27-apf27.dts
+===================================================================
+--- linux-3.16.orig/arch/arm/boot/dts/imx27-apf27.dts
+++ linux-3.16/arch/arm/boot/dts/imx27-apf27.dts
@@ -33,6 +33,26 @@
clock-frequency = <0>;
@@ -24,7 +26,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
+
+ usbphy0: usbphy@0 {
+ compatible = "usb-nop-xceiv";
-+ clocks = <&clks 75>;
++ clocks = <&clks 0>;
+ clock-names = "main_clk";
+ status = "okay";
+ };
@@ -55,7 +57,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
};
};
-@@ -75,6 +112,21 @@
+@@ -75,6 +112,20 @@
status = "okay";
};
@@ -67,7 +69,6 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usbotg>;
+ fsl,usbphy = <&usbphy0>;
-+ fsl,usbmisc = <&usbmisc 0>;
+ phy_type = "ulpi";
+ dr_mode = "otg";
+ vbus-supply = <®_usbotg_vbus>;
@@ -77,7 +78,9 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
&fec {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_fec1>;
---- linux-3.16/arch/arm/boot/dts/imx27-apf27dev.dts
+Index: linux-3.16/arch/arm/boot/dts/imx27-apf27dev.dts
+===================================================================
+--- linux-3.16.orig/arch/arm/boot/dts/imx27-apf27dev.dts
+++ linux-3.16/arch/arm/boot/dts/imx27-apf27dev.dts
@@ -60,6 +60,25 @@
linux,default-trigger = "heartbeat";
@@ -97,7 +100,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
+
+ usbphy1: usbphy@1 {
+ compatible = "usb-nop-xceiv";
-+ clocks = <&clks 75>;
++ clocks = <&clks 0>;
+ clock-names = "main_clk";
+ status = "okay";
+ };
@@ -128,7 +131,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
};
};
-@@ -238,3 +273,17 @@
+@@ -238,3 +273,16 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm>;
};
@@ -137,7 +140,6 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usbh1>;
+ fsl,usbphy = <&usbphy1>;
-+ fsl,usbmisc = <&usbmisc 1>;
+ phy_type = "serial";
+ dr_mode = "host";
+ vbus-supply = <®_usbh1_vbus>;
hooks/post-receive
--
armadeus
|
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2014-08-14 14:37:32
|
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 149604c9024176b5ba3272ce82115f2419ee451a (commit)
from 5d9f505d4218302284ed719270d942f57220e4d0 (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 149604c9024176b5ba3272ce82115f2419ee451a
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Thu Aug 14 16:36:58 2014 +0200
[LINUX][3.16] net: phy: fix LAN8700 phy reset
-----------------------------------------------------------------------
Summary of changes:
.../0232-armadeus-net-phy-fix_smsc_reset.patch | 83 ++++++++++++++++++++
1 files changed, 83 insertions(+), 0 deletions(-)
create mode 100644 patches/linux/3.16/0232-armadeus-net-phy-fix_smsc_reset.patch
diff --git a/patches/linux/3.16/0232-armadeus-net-phy-fix_smsc_reset.patch b/patches/linux/3.16/0232-armadeus-net-phy-fix_smsc_reset.patch
new file mode 100644
index 0000000..c946277
--- /dev/null
+++ b/patches/linux/3.16/0232-armadeus-net-phy-fix_smsc_reset.patch
@@ -0,0 +1,83 @@
+LAN87xx needs to be wake up before reset. By default, smsc driver does not
+provides soft_reset function and it's the default reset function is used. Due
+to that, the phy initialization fails.
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+--- linux-3.16/drivers/net/phy/smsc.c
++++ linux-3.16/drivers/net/phy/smsc.c
+@@ -43,6 +43,22 @@ static int smsc_phy_ack_interrupt(struct
+
+ static int smsc_phy_config_init(struct phy_device *phydev)
+ {
++ int rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);
++
++ if (rc < 0)
++ return rc;
++
++ /* Enable energy detect mode for this SMSC Transceivers */
++ rc = phy_write(phydev, MII_LAN83C185_CTRL_STATUS,
++ rc | MII_LAN83C185_EDPWRDOWN);
++ if (rc < 0)
++ return rc;
++
++ return smsc_phy_ack_interrupt(phydev);
++}
++
++static int smsc_phy_reset(struct phy_device *phydev)
++{
+ int rc = phy_read(phydev, MII_LAN83C185_SPECIAL_MODES);
+ if (rc < 0)
+ return rc;
+@@ -66,18 +82,7 @@ static int smsc_phy_config_init(struct p
+ rc = phy_read(phydev, MII_BMCR);
+ } while (rc & BMCR_RESET);
+ }
+-
+- rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);
+- if (rc < 0)
+- return rc;
+-
+- /* Enable energy detect mode for this SMSC Transceivers */
+- rc = phy_write(phydev, MII_LAN83C185_CTRL_STATUS,
+- rc | MII_LAN83C185_EDPWRDOWN);
+- if (rc < 0)
+- return rc;
+-
+- return smsc_phy_ack_interrupt (phydev);
++ return 0;
+ }
+
+ static int lan911x_config_init(struct phy_device *phydev)
+@@ -142,6 +147,7 @@ static struct phy_driver smsc_phy_driver
+ .config_aneg = genphy_config_aneg,
+ .read_status = genphy_read_status,
+ .config_init = smsc_phy_config_init,
++ .soft_reset = smsc_phy_reset,
+
+ /* IRQ related */
+ .ack_interrupt = smsc_phy_ack_interrupt,
+@@ -164,6 +170,7 @@ static struct phy_driver smsc_phy_driver
+ .config_aneg = genphy_config_aneg,
+ .read_status = genphy_read_status,
+ .config_init = smsc_phy_config_init,
++ .soft_reset = smsc_phy_reset,
+
+ /* IRQ related */
+ .ack_interrupt = smsc_phy_ack_interrupt,
+@@ -186,6 +193,7 @@ static struct phy_driver smsc_phy_driver
+ .config_aneg = genphy_config_aneg,
+ .read_status = genphy_read_status,
+ .config_init = smsc_phy_config_init,
++ .soft_reset = smsc_phy_reset,
+
+ /* IRQ related */
+ .ack_interrupt = smsc_phy_ack_interrupt,
+@@ -230,6 +238,7 @@ static struct phy_driver smsc_phy_driver
+ .config_aneg = genphy_config_aneg,
+ .read_status = lan87xx_read_status,
+ .config_init = smsc_phy_config_init,
++ .soft_reset = smsc_phy_reset,
+
+ /* IRQ related */
+ .ack_interrupt = smsc_phy_ack_interrupt,
hooks/post-receive
--
armadeus
|
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2014-08-13 15:04:24
|
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 5d9f505d4218302284ed719270d942f57220e4d0 (commit)
via 3f8a6aadf94146f8098991de2876a02b046592fc (commit)
via d89239ce96b5ca4457d74fdbbf88884bba53ead9 (commit)
from e107b3d8a7e782eeeffc123608d60af6d8abe0cd (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 5d9f505d4218302284ed719270d942f57220e4d0
Merge: 3f8a6aa e107b3d
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Wed Aug 13 17:03:53 2014 +0200
Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code
commit 3f8a6aadf94146f8098991de2876a02b046592fc
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Wed Aug 13 17:03:24 2014 +0200
[LINUX][3.16] usb: switch phy configuration and initialisation
commit d89239ce96b5ca4457d74fdbbf88884bba53ead9
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Wed Aug 13 17:01:45 2014 +0200
[LINUX][3.16] fix patches 0444, 0445
-----------------------------------------------------------------------
Summary of changes:
.../linux/3.16/0444-armadeus-fix_phy_init.patch | 25 +++
.../linux/3.16/0444-armadeus-imx27-add-usb.patch | 165 +++++++++++++++
.../3.16/0444-armadeus-imx27-add-usb.patch.tofix | 212 --------------------
...-armadeus-add-apf27-apf27dev-dts-for-USB.patch} | 175 ++++++++--------
4 files changed, 278 insertions(+), 299 deletions(-)
create mode 100644 patches/linux/3.16/0444-armadeus-fix_phy_init.patch
create mode 100644 patches/linux/3.16/0444-armadeus-imx27-add-usb.patch
delete mode 100644 patches/linux/3.16/0444-armadeus-imx27-add-usb.patch.tofix
rename patches/linux/3.16/{0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix => 0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch} (62%)
diff --git a/patches/linux/3.16/0444-armadeus-fix_phy_init.patch b/patches/linux/3.16/0444-armadeus-fix_phy_init.patch
new file mode 100644
index 0000000..78c663c
--- /dev/null
+++ b/patches/linux/3.16/0444-armadeus-fix_phy_init.patch
@@ -0,0 +1,25 @@
+hw_phymode_configure must be called after usb_phy_init
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+--- linux-3.16/drivers/usb/chipidea/core.c
++++ linux-3.16/drivers/usb/chipidea/core.c
+@@ -306,17 +306,12 @@ static int ci_usb_phy_init(struct ci_hdr
+ case USBPHY_INTERFACE_MODE_UTMI:
+ case USBPHY_INTERFACE_MODE_UTMIW:
+ case USBPHY_INTERFACE_MODE_HSIC:
+- ret = usb_phy_init(ci->transceiver);
+- if (ret)
+- return ret;
+- hw_phymode_configure(ci);
+- break;
+ case USBPHY_INTERFACE_MODE_ULPI:
+ case USBPHY_INTERFACE_MODE_SERIAL:
+- hw_phymode_configure(ci);
+ ret = usb_phy_init(ci->transceiver);
+ if (ret)
+ return ret;
++ hw_phymode_configure(ci);
+ break;
+ default:
+ ret = usb_phy_init(ci->transceiver);
diff --git a/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch b/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch
new file mode 100644
index 0000000..734af5e
--- /dev/null
+++ b/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch
@@ -0,0 +1,165 @@
+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.16/arch/arm/boot/dts/imx27.dtsi
++++ linux-3.16/arch/arm/boot/dts/imx27.dtsi
+@@ -35,6 +35,9 @@
+ spi0 = &cspi1;
+ spi1 = &cspi2;
+ spi2 = &cspi3;
++ usb0 = &usbotg;
++ usb1 = &usbh1;
++ usb2 = &usbh2;
+ };
+
+ aitc: aitc-interrupt-controller@e0000000 {
+@@ -446,7 +449,8 @@
+ compatible = "fsl,imx27-usb";
+ reg = <0x10024000 0x200>;
+ interrupts = <56>;
+- clocks = <&clks 75>;
++ clocks = <&clks 15>, <&clks 75>, <&clks 62>;
++ clock-names = "per", "ipg", "ahb";
+ fsl,usbmisc = <&usbmisc 0>;
+ status = "disabled";
+ };
+@@ -455,7 +459,8 @@
+ compatible = "fsl,imx27-usb";
+ reg = <0x10024200 0x200>;
+ interrupts = <54>;
+- clocks = <&clks 75>;
++ clocks = <&clks 15>, <&clks 75>, <&clks 62>;
++ clock-names = "per", "ipg", "ahb";
+ fsl,usbmisc = <&usbmisc 1>;
+ status = "disabled";
+ };
+@@ -464,7 +469,8 @@
+ compatible = "fsl,imx27-usb";
+ reg = <0x10024400 0x200>;
+ interrupts = <55>;
+- clocks = <&clks 75>;
++ clocks = <&clks 15>, <&clks 75>, <&clks 62>;
++ clock-names = "per", "ipg", "ahb";
+ fsl,usbmisc = <&usbmisc 2>;
+ status = "disabled";
+ };
+--- linux-3.16/drivers/usb/chipidea/ci_hdrc_imx.c
++++ linux-3.16/drivers/usb/chipidea/ci_hdrc_imx.c
+@@ -57,6 +57,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;
+
+ /*
+@@ -90,6 +91,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.16/drivers/usb/chipidea/ci_hdrc_imx.h
++++ linux-3.16/drivers/usb/chipidea/ci_hdrc_imx.h
+@@ -18,6 +18,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.16/drivers/usb/chipidea/usbmisc_imx.c
++++ linux-3.16/drivers/usb/chipidea/usbmisc_imx.c
+@@ -42,8 +42,18 @@
+ #define MX25_H1_OCPOL_BIT BIT(2)
+
+ #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 USBCTRL_UIE_BIT BIT(26)
++#define USBCTRL_WIE_BIT BIT(27)
++#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
+@@ -148,28 +158,50 @@ static int usbmisc_imx25_post(struct imx
+ static int usbmisc_imx27_init(struct imx_usbmisc_data *data)
+ {
+ unsigned long flags;
+- u32 val;
++ u32 val = 0;
++ u32 mask;
++ u32 reg;
+
+ switch (data->index) {
+ case 0:
+ val = MX27_OTG_PM_BIT;
+ break;
+ case 1:
+- val = MX27_H1_PM_BIT;
++ 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:
+- val = MX27_H2_PM_BIT;
++ 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);
+- if (data->disable_oc)
+- val = readl(usbmisc->base) | val;
+- else
+- val = readl(usbmisc->base) & ~val;
+- writel(val, usbmisc->base);
++ reg = readl(usbmisc->base);
++ reg = (reg & ~mask) | val;
++ writel(reg, usbmisc->base);
+ spin_unlock_irqrestore(&usbmisc->lock, flags);
+
+ return 0;
diff --git a/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch.tofix b/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch.tofix
deleted file mode 100644
index ec38f11..0000000
--- a/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch.tofix
+++ /dev/null
@@ -1,212 +0,0 @@
-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.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix b/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
similarity index 62%
rename from patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix
rename to patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
index 836eaad..adb3aaa 100644
--- a/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix
+++ b/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
@@ -2,31 +2,27 @@ Add APF27 APF27dev USB to device tree
Signed-off-by: Eric Jarrige <eri...@ar...>
---
---- linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27dev.dts
-+++ linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27dev.dts
-@@ -16,6 +16,17 @@
- model = "Armadeus Systems APF27Dev docking/development board";
- compatible = "armadeus,imx27-apf27dev", "armadeus,imx27-apf27", "fsl,imx27";
-
+--- linux-3.16/arch/arm/boot/dts/imx27-apf27.dts
++++ linux-3.16/arch/arm/boot/dts/imx27-apf27.dts
+@@ -33,6 +33,26 @@
+ clock-frequency = <0>;
+ };
+ };
++
+ regulators {
+ compatible = "simple-bus";
++ #address-cells = <1>;
++ #size-cells = <0>;
+
-+ reg_usbh1_vbus: usbh1_vbus {
++ reg_usbotg_vbus: usbotg_vbus {
+ compatible = "regulator-fixed";
-+ regulator-name = "usbh1_vbus";
++ regulator-name = "usbotg_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ };
+ };
+
- display: display {
- model = "Chimei-LW700AT9003";
- native-mode = <&timing0>;
-@@ -56,6 +67,12 @@
- };
- };
-
-+ usbphy1: usbphy@1 {
++ usbphy0: usbphy@0 {
+ compatible = "usb-nop-xceiv";
+ clocks = <&clks 75>;
+ clock-names = "main_clk";
@@ -34,114 +30,119 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
+ };
};
- &cspi1 {
-@@ -130,6 +147,23 @@
+ &iomuxc {
+@@ -66,6 +86,23 @@
+ MX27_PAD_UART1_RXD__UART1_RXD 0x0
>;
};
- };
+
-+ usbh1 {
-+ pinctrl_usbh1: usbh1 {
++ pinctrl_usbotg: usbotg {
+ fsl,pins = <
-+ MX27_PAD_USBH1_SUSP__USBH1_SUSP 0
-+ MX27_PAD_USB_PWR__USB_PWR 0
-+ 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
-+ MX27_PAD_USBH1_TXDM__USBH1_TXDM 0
-+ MX27_PAD_USBH1_TXDP__USBH1_TXDP 0
-+ MX27_PAD_USBH1_RXDM__USBH1_RXDM 0
-+ MX27_PAD_USBH1_RXDP__USBH1_RXDP 0
++ MX27_PAD_USBOTG_NXT__USBOTG_NXT 0x0
++ MX27_PAD_USBOTG_STP__USBOTG_STP 0x0
++ MX27_PAD_USBOTG_DIR__USBOTG_DIR 0x0
++ MX27_PAD_USBOTG_CLK__USBOTG_CLK 0x0
++ MX27_PAD_USBOTG_DATA0__USBOTG_DATA0 0x0
++ MX27_PAD_USBOTG_DATA1__USBOTG_DATA1 0x0
++ MX27_PAD_USBOTG_DATA2__USBOTG_DATA2 0x0
++ MX27_PAD_USBOTG_DATA3__USBOTG_DATA3 0x0
++ MX27_PAD_USBOTG_DATA4__USBOTG_DATA4 0x0
++ MX27_PAD_USBOTG_DATA5__USBOTG_DATA5 0x0
++ MX27_PAD_USBOTG_DATA6__USBOTG_DATA6 0x0
++ MX27_PAD_USBOTG_DATA7__USBOTG_DATA7 0x0
+ >;
+ };
-+ };
+ };
};
- &sdhci2 {
-@@ -139,3 +173,16 @@
- pinctrl-0 = <&pinctrl_sdhc2_1>;
+@@ -75,6 +112,21 @@
status = "okay";
};
+
++&usbmisc {
++ status = "okay";
++};
+
-+&usbh1 {
++&usbotg {
+ pinctrl-names = "default";
-+ 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;
++ pinctrl-0 = <&pinctrl_usbotg>;
++ fsl,usbphy = <&usbphy0>;
++ fsl,usbmisc = <&usbmisc 0>;
++ phy_type = "ulpi";
++ dr_mode = "otg";
++ vbus-supply = <®_usbotg_vbus>;
++ disable-over-current;
+ status = "okay";
+};
---- linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27.dts
-+++ linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27.dts
-@@ -32,6 +32,24 @@
- clock-frequency = <0>;
+ &fec {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_fec1>;
+--- linux-3.16/arch/arm/boot/dts/imx27-apf27dev.dts
++++ linux-3.16/arch/arm/boot/dts/imx27-apf27dev.dts
+@@ -60,6 +60,25 @@
+ linux,default-trigger = "heartbeat";
};
};
+
+ regulators {
+ compatible = "simple-bus";
+
-+ reg_usbotg_vbus: usbotg_vbus {
++ reg_usbh1_vbus: usbh1_vbus {
+ compatible = "regulator-fixed";
-+ regulator-name = "usbotg_vbus";
++ regulator-name = "usbh1_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ };
+ };
+
-+ usbphy0: usbphy@0 {
++ usbphy1: usbphy@1 {
+ compatible = "usb-nop-xceiv";
+ clocks = <&clks 75>;
+ clock-names = "main_clk";
+ status = "okay";
+ };
++
};
- &uart1 {
-@@ -87,3 +105,40 @@
- reg = <0x800000 0xf800000>;
+ &cspi1 {
+@@ -223,6 +242,22 @@
+ pinctrl_sdhc2_cd: sdhc2cdgrp {
+ fsl,pins = <MX27_PAD_TOUT__GPIO3_14 0x0>;
+ };
++
++ 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 0
++ MX27_PAD_USBH1_RCV__USBH1_RCV 0
++ MX27_PAD_USBH1_FS__USBH1_FS 0
++ MX27_PAD_USBH1_OE_B__USBH1_OE_B 0
++ MX27_PAD_USBH1_TXDM__USBH1_TXDM 0
++ MX27_PAD_USBH1_TXDP__USBH1_TXDP 0
++ MX27_PAD_USBH1_RXDM__USBH1_RXDM 0
++ MX27_PAD_USBH1_RXDP__USBH1_RXDP 0
++ >;
++ };
++
};
};
+
+@@ -238,3 +273,17 @@
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm>;
+ };
+
-+&usbmisc {
-+ status = "okay";
-+};
-+
-+&usbotg {
++&usbh1 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg>;
-+ fsl,usbphy = <&usbphy0>;
-+ fsl,usbmisc = <&usbmisc 0>;
-+ phy_type = "ulpi";
-+ dr_mode = "otg";
-+ vbus-supply = <®_usbotg_vbus>;
-+ disable-over-current;
++ 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";
+};
+
-+&iomuxc {
-+ usbotg {
-+ pinctrl_usbotg: usbotg {
-+ fsl,pins = <
-+ MX27_PAD_USBOTG_NXT__USBOTG_NXT 0
-+ MX27_PAD_USBOTG_STP__USBOTG_STP 0
-+ MX27_PAD_USBOTG_DIR__USBOTG_DIR 0
-+ MX27_PAD_USBOTG_CLK__USBOTG_CLK 0
-+ MX27_PAD_USBOTG_DATA7__USBOTG_DATA7 0
-+ MX27_PAD_USBOTG_DATA5__USBOTG_DATA5 0
-+ MX27_PAD_USBOTG_DATA6__USBOTG_DATA6 0
-+ MX27_PAD_USBOTG_DATA0__USBOTG_DATA0 0
-+ MX27_PAD_USBOTG_DATA2__USBOTG_DATA2 0
-+ MX27_PAD_USBOTG_DATA1__USBOTG_DATA1 0
-+ MX27_PAD_USBOTG_DATA4__USBOTG_DATA4 0
-+ MX27_PAD_USBOTG_DATA3__USBOTG_DATA3 0
-+ >;
-+ };
-+ };
-+};
---
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-08-12 18:15: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 e107b3d8a7e782eeeffc123608d60af6d8abe0cd (commit)
from 1e59df0260079d3bfb8daef42452c7cdf01ddb9f (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 e107b3d8a7e782eeeffc123608d60af6d8abe0cd
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Aug 12 20:15:06 2014 +0200
[LINUX] 3.16: apf51: dts: rename imx51-apf51dev-v1.dts to imx51-apf51dev.dts
-----------------------------------------------------------------------
Summary of changes:
...us-apf51-add_apf51_v1-and_v2_device_trees.patch | 62 ++++++-------------
1 files changed, 20 insertions(+), 42 deletions(-)
diff --git a/patches/linux/3.16/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch b/patches/linux/3.16/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
index ec76f97..f122428 100644
--- a/patches/linux/3.16/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
+++ b/patches/linux/3.16/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
@@ -286,30 +286,6 @@ Index: linux-3.16/arch/arm/boot/dts/imx51-apf51-v2.dtsi
+ };
+ };
+};
-Index: linux-3.16/arch/arm/boot/dts/imx51-apf51dev-v1.dts
-===================================================================
---- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx51-apf51dev-v1.dts
-@@ -0,0 +1,19 @@
-+/*
-+ * Copyright 2014 Armadeus Systems - <su...@ar...>
-+ *
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/dts-v1/;
-+#include "imx51-apf51-v1.dtsi"
-+#include "imx51-apf51dev.dtsi"
-+
-+/ {
-+ model = "Armadeus Systems APF51Dev docking/development board with APF51 V1 SOM";
-+ compatible = "armadeus,imx51-apf51dev", "armadeus,imx51-apf51", "fsl,imx51";
-+};
Index: linux-3.16/arch/arm/boot/dts/imx51-apf51dev-v2.dts
===================================================================
--- /dev/null
@@ -586,8 +562,7 @@ Index: linux-3.16/arch/arm/boot/dts/Makefile
imx35-pdk.dtb \
imx50-evk.dtb \
- imx51-apf51.dtb \
-- imx51-apf51dev.dtb \
-+ imx51-apf51dev-v1.dtb \
+ imx51-apf51dev.dtb \
+ imx51-apf51dev-v2.dtb \
imx51-babbage.dtb \
imx51-digi-connectcore-jsk.dtb \
@@ -689,25 +664,28 @@ Index: linux-3.16/arch/arm/boot/dts/imx51-apf51.dts
Index: linux-3.16/arch/arm/boot/dts/imx51-apf51dev.dts
===================================================================
--- linux-3.16.orig/arch/arm/boot/dts/imx51-apf51dev.dts
-+++ /dev/null
-@@ -1,211 +0,0 @@
--/*
++++ linux-3.16/arch/arm/boot/dts/imx51-apf51dev.dts
+@@ -1,5 +1,5 @@
+ /*
- * Copyright 2013 Armadeus Systems - <su...@ar...>
-- *
-- * The code contained herein is licensed under the GNU General Public
-- * License. You may obtain a copy of the GNU General Public License
-- * Version 2 or later at the following locations:
-- *
-- * http://www.opensource.org/licenses/gpl-license.html
-- * http://www.gnu.org/copyleft/gpl.html
-- */
--
++ * Copyright 2014 Armadeus Systems - <su...@ar...>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+@@ -9,203 +9,11 @@
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
-/* APF51Dev is a docking board for the APF51 SOM */
-#include "imx51-apf51.dts"
--
--/ {
++/dts-v1/;
++#include "imx51-apf51-v1.dtsi"
++#include "imx51-apf51dev.dtsi"
+
+ / {
- model = "Armadeus Systems APF51Dev docking/development board";
-- compatible = "armadeus,imx51-apf51dev", "armadeus,imx51-apf51", "fsl,imx51";
++ model = "Armadeus Systems APF51Dev docking/development board with APF51 V1 SOM";
+ compatible = "armadeus,imx51-apf51dev", "armadeus,imx51-apf51", "fsl,imx51";
-
- display@di1 {
- compatible = "fsl,imx-parallel-display";
@@ -901,4 +879,4 @@ Index: linux-3.16/arch/arm/boot/dts/imx51-apf51dev.dts
-
-&ipu_di0_disp0 {
- remote-endpoint = <&display_in>;
--};
+ };
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-08-12 07:59:13
|
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 1e59df0260079d3bfb8daef42452c7cdf01ddb9f (commit)
via 51cc108c3cde41cddaa22f5b1bc5bac0852da79d (commit)
from b1f085cfc744c2dd98805e84095f0fe8c8e93050 (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 1e59df0260079d3bfb8daef42452c7cdf01ddb9f
Author: Sébastien Szymanski <ss...@us...>
Date: Tue Aug 12 09:52:09 2014 +0200
[LINUX] 3.16: apf6: dts: set proper ethernet phy reset duration (10ms)
commit 51cc108c3cde41cddaa22f5b1bc5bac0852da79d
Author: Sébastien Szymanski <ss...@us...>
Date: Tue Aug 12 09:46:37 2014 +0200
[LINUX] 3.10.mx6_legacy: apf6: dts: remove phy-reset-gpios
The ethernet does not work with this property set so remove
it.
-----------------------------------------------------------------------
Summary of changes:
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 3 +--
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index 7341c3a..e6d8bd4 100644
--- a/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -98,7 +98,7 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dt
===================================================================
--- /dev/null
+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,182 @@
+@@ -0,0 +1,181 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -220,7 +220,6 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dt
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_enet_4>;
+ phy-mode = "rgmii";
-+ phy-reset-gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+};
+
diff --git a/patches/linux/3.16/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.16/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index 2ea3678..c744651 100644
--- a/patches/linux/3.16/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.16/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -76,7 +76,7 @@ Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_enet>;
+ phy-mode = "rgmii";
-+ phy-reset-duration = <2>;
++ phy-reset-duration = <10>;
+ phy-reset-gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+};
@@ -111,7 +111,7 @@ Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ fsl,pins = <
+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
++ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b030
+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b030
+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b030
+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b030
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-08-11 15:36: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 b1f085cfc744c2dd98805e84095f0fe8c8e93050 (commit)
from 3cbfe63b03b05103b9460a6093fbac54962bb41d (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 b1f085cfc744c2dd98805e84095f0fe8c8e93050
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Aug 11 17:39:28 2014 +0200
[LINUX] APF6 (3.10-legacy): fix ethernet pin muxing
-----------------------------------------------------------------------
Summary of changes:
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 64 +++++++++++++-------
1 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index 7f755f6..7341c3a 100644
--- a/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,7 +1,7 @@
Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dts 2014-08-08 11:51:35.269075208 +0200
+--- /dev/null
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dts
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -35,8 +35,8 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dts
+*/
Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6.dtsi 2014-08-08 11:51:35.269075208 +0200
+--- /dev/null
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6.dtsi
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -96,8 +96,8 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+};
Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi 2014-08-08 11:51:35.273075229 +0200
+--- /dev/null
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -218,7 +218,7 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dt
+
+&fec {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet_3>;
++ pinctrl-0 = <&pinctrl_enet_4>;
+ phy-mode = "rgmii";
+ phy-reset-gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
+ status = "okay";
@@ -283,8 +283,8 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dt
+
Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dts 2014-08-08 11:51:35.273075229 +0200
+--- /dev/null
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -312,8 +312,8 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dts
+};
Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6.dtsi
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6.dtsi 2014-08-08 11:51:35.273075229 +0200
+--- /dev/null
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6.dtsi
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -351,8 +351,8 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6.dtsi
+};
Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dtsi
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dtsi 2014-08-08 11:51:35.273075229 +0200
+--- /dev/null
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dtsi
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -399,8 +399,8 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dts
+};
Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6.dtsi
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6.dtsi 2014-08-08 11:51:35.273075229 +0200
+--- /dev/null
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6.dtsi
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -438,8 +438,8 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6.dtsi
+};
Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dtsi
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dtsi 2014-08-08 11:51:35.273075229 +0200
+--- /dev/null
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dtsi
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -486,17 +486,39 @@ Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dtsi
+};
Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl.dtsi
===================================================================
---- linux-wandboard_imx_3.10.17_1.0.0_ga.orig/arch/arm/boot/dts/imx6qdl.dtsi 2014-07-11 21:53:12.000000000 +0200
-+++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl.dtsi 2014-08-08 12:42:33.948242320 +0200
-@@ -1166,6 +1166,7 @@
+--- linux-wandboard_imx_3.10.17_1.0.0_ga.orig/arch/arm/boot/dts/imx6qdl.dtsi
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl.dtsi
+@@ -1166,6 +1166,29 @@
MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x1b0b0
+ MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x80000000
++ >;
++ };
++
++ pinctrl_enet_4: enetgrp-4 {
++ fsl,pins = <
++ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
++ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
++ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b030
++ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b030
++ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b030
++ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b030
++ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b030
++ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b030
++ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
++ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b030
++ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b030
++ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b030
++ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1f030
++ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1f030
++ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b030
++ MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x80000000
++ MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x80000000
>;
};
};
-@@ -1354,6 +1355,12 @@
+@@ -1354,6 +1377,12 @@
MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
>;
};
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-08-11 13:03: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 3cbfe63b03b05103b9460a6093fbac54962bb41d (commit)
via e226fb4de4d327192377995e8bf4b4b7af6432d2 (commit)
via b60db36f3dd1e60b3ad7f17edfc26f4dc8aeee21 (commit)
from 9a2417f75df0427a3701e6760c2b413b423f19d5 (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 3cbfe63b03b05103b9460a6093fbac54962bb41d
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Aug 11 15:03:19 2014 +0200
[SCRIPTS] quiltify.sh: add a no build option
You can disable compiling linux or u-boot by adding no-build to the
command line:
<armadeus_bsp_dir>/scripts/quiltify.sh no-build
commit e226fb4de4d327192377995e8bf4b4b7af6432d2
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Aug 11 15:01:19 2014 +0200
[LINUX] 3.16: apf6: dts: fix ethernet pin muxing.
commit b60db36f3dd1e60b3ad7f17edfc26f4dc8aeee21
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Aug 11 14:59:43 2014 +0200
[U-BOOT] 2014.07: apf6: fix ethernet.
-----------------------------------------------------------------------
Summary of changes:
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 43 ++++++++++----------
patches/u-boot/2014.07/503-add-apf6.patch | 22 ++++++++--
scripts/quiltify.sh | 8 ++-
3 files changed, 45 insertions(+), 28 deletions(-)
diff --git a/patches/linux/3.16/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.16/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index e6f4a52..2ea3678 100644
--- a/patches/linux/3.16/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.16/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,7 +1,7 @@
-Index: linux-3.15-rc8/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-3.16/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.15-rc8/arch/arm/boot/dts/imx6q-apf6dev.dts
++++ linux-3.16/arch/arm/boot/dts/imx6q-apf6dev.dts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -31,11 +31,11 @@ Index: linux-3.15-rc8/arch/arm/boot/dts/imx6q-apf6dev.dts
+&sata {
+ status = "okay";
+};
-Index: linux-3.15-rc8/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
--- /dev/null
-+++ linux-3.15-rc8/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-@@ -0,0 +1,131 @@
++++ linux-3.16/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+@@ -0,0 +1,132 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -76,6 +76,7 @@ Index: linux-3.15-rc8/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_enet>;
+ phy-mode = "rgmii";
++ phy-reset-duration = <2>;
+ phy-reset-gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+};
@@ -111,20 +112,20 @@ Index: linux-3.15-rc8/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
++ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b030
++ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b030
++ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b030
++ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b030
++ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b030
+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
-+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
-+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
-+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-+ MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x1b0b0
++ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b030
++ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b030
++ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b030
++ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1f030
++ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1f030
++ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b030
+ MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x80000000
++ MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x80000000
+ >;
+ };
+
@@ -167,10 +168,10 @@ Index: linux-3.15-rc8/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ };
+ };
+};
-Index: linux-3.15-rc8/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
-+++ linux-3.15-rc8/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
++++ linux-3.16/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
@@ -0,0 +1,451 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -623,10 +624,10 @@ Index: linux-3.15-rc8/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ };
+ };
+};
-Index: linux-3.15-rc8/arch/arm/boot/dts/imx6dl-apf6dev.dts
+Index: linux-3.16/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.15-rc8/arch/arm/boot/dts/imx6dl-apf6dev.dts
++++ linux-3.16/arch/arm/boot/dts/imx6dl-apf6dev.dts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Armadeus Systems
diff --git a/patches/u-boot/2014.07/503-add-apf6.patch b/patches/u-boot/2014.07/503-add-apf6.patch
index b2349bf..8824404 100644
--- a/patches/u-boot/2014.07/503-add-apf6.patch
+++ b/patches/u-boot/2014.07/503-add-apf6.patch
@@ -27,7 +27,7 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
===================================================================
--- /dev/null
+++ uboot-2014.07/board/armadeus/apf6/apf6.c
-@@ -0,0 +1,307 @@
+@@ -0,0 +1,321 @@
+/*
+ * Copyright (C) 2013 Armadeus systems.
+ *
@@ -74,6 +74,9 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+#define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | \
+ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
+
++#define ENET_PAD_CTRL2 (PAD_CTL_PUS_22K_UP | \
++ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
++
+#define USDHC2_CD_GPIO IMX_GPIO_NR(1, 2)
+#define ETH_PHY_RESET IMX_GPIO_NR(1, 24)
+
@@ -118,11 +121,13 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+ IOMUX_PADS(PAD_RGMII_RXC__RGMII_RXC | MUX_PAD_CTRL(ENET_PAD_CTRL)),
+ IOMUX_PADS(PAD_RGMII_RD0__RGMII_RD0 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
+ IOMUX_PADS(PAD_RGMII_RD1__RGMII_RD1 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
-+ IOMUX_PADS(PAD_RGMII_RD2__RGMII_RD2 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
-+ IOMUX_PADS(PAD_RGMII_RD3__RGMII_RD3 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_RD2__RGMII_RD2 | MUX_PAD_CTRL(ENET_PAD_CTRL2)),
++ IOMUX_PADS(PAD_RGMII_RD3__RGMII_RD3 | MUX_PAD_CTRL(ENET_PAD_CTRL2)),
+ IOMUX_PADS(PAD_RGMII_RX_CTL__RGMII_RX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL)),
+ /* AR8035 PHY Reset */
+ IOMUX_PADS(PAD_ENET_RX_ER__GPIO1_IO24 | MUX_PAD_CTRL(NO_PAD_CTRL)),
++ /* AR8035 INT */
++ IOMUX_PADS(PAD_ENET_TX_EN__GPIO1_IO28 | MUX_PAD_CTRL(NO_PAD_CTRL)),
+};
+
+static void setup_iomux_uart(void)
@@ -136,7 +141,7 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+
+ /* Reset AR8035 PHY */
+ gpio_direction_output(ETH_PHY_RESET, 0);
-+ udelay(500);
++ udelay(10000);
+ gpio_set_value(ETH_PHY_RESET, 1);
+}
+
@@ -197,6 +202,15 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+{
+ unsigned short val;
+
++ /*
++ * Ar803x phy SmartEEE feature cause link status generates glitch,
++ * which cause ethernet link down/up issue, so disable SmartEEE
++ *
++ */
++ phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x7);
++ phy_write(phydev, MDIO_DEVAD_NONE, 0xe, 0x805d);
++ phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x4003);
++
+ /* To enable AR8035 ouput a 125MHz clk from CLK_25M */
+ phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x7);
+ phy_write(phydev, MDIO_DEVAD_NONE, 0xe, 0x8016);
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 5a5ee33..d949656 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -200,9 +200,11 @@ if [ "$QUILT_POST_PATCH_HOOK" != "" ]; then
fi
# Build it
-echo -e "\n--- Your "$QUILT_TARGET_NAME" is \"quiltified\" ! I will now compile it...\n"
-sleep 2
-make
+if [ "$1" != "no-build" ]; then
+ echo -e "\n--- Your "$QUILT_TARGET_NAME" is \"quiltified\" ! I will now compile it...\n"
+ sleep 2
+ make
+fi
echo -e "\n--- Your can now go to $QUILT_TARGET_DIR\nHappy hacking ! ;-)\n"
echo -e "__ Don't forget to do a \"$0 export\" after your modifications __\n"
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-08-11 08:04:13
|
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 9a2417f75df0427a3701e6760c2b413b423f19d5 (commit)
via da28e2f04effd7ed5a3408f6084d4ece01db04ae (commit)
via f6f1d40586716173a655c1eb96e820c8acf2d37c (commit)
via 525b178e78b99891d84c2f79e3a8052c2c376ae3 (commit)
via 683953633df1f28b7e0e9a153ff73fa5c7d252a0 (commit)
via ff20ee2027bcad13af091d6d2d24152e8564d6a5 (commit)
via e67810ee0d04fa8a6228a2d3f0d00340bc72b710 (commit)
from 98ff779657e244d570fd8cf77ad3c03e0a3cdd70 (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 9a2417f75df0427a3701e6760c2b413b423f19d5
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Aug 11 00:09:22 2014 +0200
[LINUX] apf51-v2: 3.16: dts: add gpo2 and gpo3
commit da28e2f04effd7ed5a3408f6084d4ece01db04ae
Author: Sébastien Szymanski <seb...@ar...>
Date: Sun Aug 10 19:52:09 2014 +0200
[LINUX] move to kernel 3.16
commit f6f1d40586716173a655c1eb96e820c8acf2d37c
Author: Sébastien Szymanski <seb...@ar...>
Date: Sun Aug 10 19:41:21 2014 +0200
[LINUX] 3.16: apf51: enable MC13892 PMIC drivers
commit 525b178e78b99891d84c2f79e3a8052c2c376ae3
Author: Sébastien Szymanski <seb...@ar...>
Date: Sun Aug 10 19:39:16 2014 +0200
[LINUX] 3.16: apf51: add MC13892 touchscreen support.
The code for MC13892 support and calibration comes from Oskar Schirmer
from here: https://lkml.org/lkml/2012/2/14/98
commit 683953633df1f28b7e0e9a153ff73fa5c7d252a0
Author: Sébastien Szymanski <seb...@ar...>
Date: Sun Aug 10 04:25:00 2014 +0200
[LINUX] 3.16: apf51: dts: rework dts files for apf51 v2 module.
The APF51 V2 module has a MC13892 PMIC.
Patches 400, 401 and 414 have been merged into new patch 0415.
The apf51 device trees files are now:
- imx51-apf51.dtsi
- imx51-apf51-v1.dtsi (includes imx51-apf51.dtsi)
- imx51-apf51-v2.dtsi (includes imx51-apf51.dtsi)
- imx51-apf51dev.dtsi
- imx51-apf51dev-v1.dts (includes imx51-apf51-v1.dtsi)
- imx51-apf51dev-v2.dts (includes imx51-apf51-v2.dtsi)
commit ff20ee2027bcad13af091d6d2d24152e8564d6a5
Author: Sébastien Szymanski <seb...@ar...>
Date: Sat Aug 9 23:17:02 2014 +0200
[LINUX] 3.1{5,6}: apf51: remove patch 0412
This patch adds a uart1 pinctrl node in apf51.dts file. However, since linux
3.15 pinctrl nodes are board specific, see [1]. So the uart1 node
is badly placed. Moreover this node is not used in apf51 dts files.
[1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/arch/arm/boot/dts/imx51.dtsi?id=5a2a7d57ee66a1347ba39a4b474dfad08e3a68a3
commit e67810ee0d04fa8a6228a2d3f0d00340bc72b710
Author: Sébastien Szymanski <seb...@ar...>
Date: Sat Aug 9 22:26:21 2014 +0200
[LINUX] 3.16: apf51: enable IPUv3 driver
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
.../armadeus/apf27/apf27-linux-3.16-rc7.config | 1 -
.../armadeus/apf28/apf28-linux-3.16-rc7.config | 1 -
.../armadeus/apf51/apf51-linux-3.16-rc7.config | 1 -
.../device/armadeus/apf51/apf51-linux-3.16.config | 9 +-
.../armadeus/apf6/apf6-linux-3.16-rc7.config | 1 -
...us-imx51-dts-add-pin-definition-for-uart1.patch | 29 -
patches/linux/3.16-rc7 | 1 -
.../3.16/0400-Add-apf51-basic-dt-support.patch | 105 ---
.../0401-armadeus-add_apf51dev_baseboard.patch | 91 --
...us-imx51-dts-add-pin-definition-for-uart1.patch | 29 -
...dts-apf51dev-add_gpio_key_wakeup_behavior.patch | 16 -
...us-apf51-add_apf51_v1-and_v2_device_trees.patch | 904 ++++++++++++++++++++
...eus-apf51-add_mc13982_touchscreen_support.patch | 540 ++++++++++++
14 files changed, 1453 insertions(+), 277 deletions(-)
delete mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.16-rc7.config
delete mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.16-rc7.config
delete mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.16-rc7.config
delete mode 120000 buildroot/target/device/armadeus/apf6/apf6-linux-3.16-rc7.config
delete mode 100644 patches/linux/3.15/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
delete mode 120000 patches/linux/3.16-rc7
delete mode 100644 patches/linux/3.16/0400-Add-apf51-basic-dt-support.patch
delete mode 100644 patches/linux/3.16/0401-armadeus-add_apf51dev_baseboard.patch
delete mode 100644 patches/linux/3.16/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
delete mode 100644 patches/linux/3.16/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
create mode 100644 patches/linux/3.16/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
create mode 100644 patches/linux/3.16/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index b0d013d..0fb2947 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -22,7 +22,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.16-rc7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.16"
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.16-rc7.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.16-rc7.config
deleted file mode 120000
index 946ea8d..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.16-rc7.config
+++ /dev/null
@@ -1 +0,0 @@
-apf27-linux-3.16.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.16-rc7.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.16-rc7.config
deleted file mode 120000
index 8af93d4..0000000
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.16-rc7.config
+++ /dev/null
@@ -1 +0,0 @@
-apf28-linux-3.16.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.16-rc7.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.16-rc7.config
deleted file mode 120000
index 9c57540..0000000
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.16-rc7.config
+++ /dev/null
@@ -1 +0,0 @@
-apf51-linux-3.16.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.config
index fd2729f..bdf1419 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.config
@@ -111,7 +111,9 @@ CONFIG_KEYBOARD_GPIO=m
CONFIG_KEYBOARD_IMX=m
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_WM831X=y
+CONFIG_TOUCHSCREEN_MC13XXX=m
CONFIG_INPUT_MISC=y
+CONFIG_INPUT_MC13783_PWRBUTTON=m
CONFIG_INPUT_UINPUT=m
CONFIG_INPUT_WM831X_ON=y
# CONFIG_LEGACY_PTYS is not set
@@ -132,14 +134,18 @@ CONFIG_WM831X_BACKUP=m
CONFIG_WM831X_POWER=m
CONFIG_HWMON=m
CONFIG_SENSORS_AS1531=m
+CONFIG_SENSORS_MC13783_ADC=m
CONFIG_SENSORS_WM831X=m
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_NOWAYOUT=y
CONFIG_WM831X_WATCHDOG=m
CONFIG_IMX2_WDT=y
+CONFIG_MFD_MC13XXX_I2C=y
CONFIG_MFD_WM831X_I2C=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_MC13892=m
+CONFIG_IMX_IPUV3_CORE=y
CONFIG_DRM=y
CONFIG_MFD_IMX_IPU_V3=y
CONFIG_MEDIA_SUPPORT=m
@@ -229,17 +235,18 @@ CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=y
CONFIG_LEDS_WM831X_STATUS=m
+CONFIG_LEDS_MC13783=m
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_MXC=y
CONFIG_RTC_DRV_WM831X=y
+CONFIG_RTC_DRV_MC13XXX=m
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
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.16-rc7.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.16-rc7.config
deleted file mode 120000
index 4f41d2e..0000000
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-3.16-rc7.config
+++ /dev/null
@@ -1 +0,0 @@
-apf6-linux-3.16.config
\ No newline at end of file
diff --git a/patches/linux/3.15/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch b/patches/linux/3.15/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
deleted file mode 100644
index 38521dd..0000000
--- a/patches/linux/3.15/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8298da1db865a3789c8a786c95b5def6003e53d1 Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Mon, 11 Nov 2013 10:09:41 +0100
-Subject: [PATCH] To use UART1 without CTS/RTS.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
----
- arch/arm/boot/dts/imx51.dtsi | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
-index 524ac61..c863f6c 100644
---- a/arch/arm/boot/dts/imx51.dtsi
-+++ b/arch/arm/boot/dts/imx51.dtsi
-@@ -760,6 +760,12 @@
- MX51_PAD_UART1_CTS__UART1_CTS 0x1c5
- >;
- };
-+ pinctrl_uart1_2: uart1grp-2 {
-+ fsl,pins = <
-+ MX51_PAD_UART1_RXD__UART1_RXD 0x1c5
-+ MX51_PAD_UART1_TXD__UART1_TXD 0x1c5
-+ >;
-+ };
- };
-
- uart2 {
---
-1.7.4.4
diff --git a/patches/linux/3.16-rc7 b/patches/linux/3.16-rc7
deleted file mode 120000
index 1bc446c..0000000
--- a/patches/linux/3.16-rc7
+++ /dev/null
@@ -1 +0,0 @@
-3.16
\ No newline at end of file
diff --git a/patches/linux/3.16/0400-Add-apf51-basic-dt-support.patch b/patches/linux/3.16/0400-Add-apf51-basic-dt-support.patch
deleted file mode 100644
index d466dac..0000000
--- a/patches/linux/3.16/0400-Add-apf51-basic-dt-support.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Add apf51 basic support
-
-Signed-off-by: Laurent Cans <lau...@gm...>
-Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
----
-Index: linux-3.13-rc2/arch/arm/boot/dts/imx51-apf51.dts
-===================================================================
---- linux-3.13-rc2.orig/arch/arm/boot/dts/imx51-apf51.dts
-+++ linux-3.13-rc2/arch/arm/boot/dts/imx51-apf51.dts
-@@ -30,6 +30,19 @@
- clock-frequency = <33554432>;
- };
- };
-+
-+ regulators {
-+ compatible = "simple-bus";
-+
-+ reg_usbotg_vbus: usbotg_vbus {
-+ compatible = "regulator-fixed";
-+ regulator-name = "usbotg_vbus";
-+ regulator-min-microvolt = <5000000>;
-+ regulator-max-microvolt = <5000000>;
-+ gpio = <&gpio1 8 0>;
-+ enable-active-high;
-+ };
-+ };
- };
-
- &fec {
-@@ -72,6 +72,43 @@
- MX51_PAD_UART3_TXD__UART3_TXD 0x1c5
- >;
- };
-+ usbh1 {
-+ pinctrl_usbh1_1: usbh1grp-1 {
-+ fsl,pins = <
-+ MX51_PAD_USBH1_DATA0__USBH1_DATA0 0x1e5
-+ MX51_PAD_USBH1_DATA1__USBH1_DATA1 0x1e5
-+ MX51_PAD_USBH1_DATA2__USBH1_DATA2 0x1e5
-+ MX51_PAD_USBH1_DATA3__USBH1_DATA3 0x1e5
-+ MX51_PAD_USBH1_DATA4__USBH1_DATA4 0x1e5
-+ MX51_PAD_USBH1_DATA5__USBH1_DATA5 0x1e5
-+ MX51_PAD_USBH1_DATA6__USBH1_DATA6 0x1e5
-+ MX51_PAD_USBH1_DATA7__USBH1_DATA7 0x1e5
-+ MX51_PAD_USBH1_CLK__USBH1_CLK 0x1e5
-+ MX51_PAD_USBH1_DIR__USBH1_DIR 0x1e5
-+ MX51_PAD_USBH1_NXT__USBH1_NXT 0x1e5
-+ MX51_PAD_USBH1_STP__USBH1_STP 0x1e5
-+ >;
-+ };
-+ };
-+
-+ usbh2 {
-+ pinctrl_usbh2_1: usbh2grp-1 {
-+ fsl,pins = <
-+ MX51_PAD_EIM_D16__USBH2_DATA0 0x1e5
-+ MX51_PAD_EIM_D17__USBH2_DATA1 0x1e5
-+ MX51_PAD_EIM_D18__USBH2_DATA2 0x1e5
-+ MX51_PAD_EIM_D19__USBH2_DATA3 0x1e5
-+ MX51_PAD_EIM_D20__USBH2_DATA4 0x1e5
-+ MX51_PAD_EIM_D21__USBH2_DATA5 0x1e5
-+ MX51_PAD_EIM_D22__USBH2_DATA6 0x1e5
-+ MX51_PAD_EIM_D23__USBH2_DATA7 0x1e5
-+ MX51_PAD_EIM_A24__USBH2_CLK 0x1e5
-+ MX51_PAD_EIM_A25__USBH2_DIR 0x1e5
-+ MX51_PAD_EIM_A27__USBH2_NXT 0x1e5
-+ MX51_PAD_EIM_A26__USBH2_STP 0x1e5
-+ >;
-+ };
-+ };
- };
- };
-
-@@ -87,3 +100,31 @@
- pinctrl-0 = <&pinctrl_uart3>;
- status = "okay";
- };
-+
-+&usbphy1 {
-+ reset-gpios = <&gpio3 1 1>;
-+};
-+
-+&usbh1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbh1_1>;
-+ phy_type = "ulpi";
-+ dr_mode = "host";
-+ ext-clk-en;
-+ status = "okay";
-+};
-+
-+&usbh2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbh2_1>;
-+ phy_type = "ulpi";
-+ dr_mode = "host";
-+ ext-clk-en;
-+ status = "okay";
-+};
-+
-+&usbotg {
-+ phy_type = "utmi_wide";
-+ vbus-supply = <®_usbotg_vbus>;
-+ status = "okay";
-+};
diff --git a/patches/linux/3.16/0401-armadeus-add_apf51dev_baseboard.patch b/patches/linux/3.16/0401-armadeus-add_apf51dev_baseboard.patch
deleted file mode 100644
index f456c61..0000000
--- a/patches/linux/3.16/0401-armadeus-add_apf51dev_baseboard.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-The APF51Dev is a docking board for an APF51 SOM
-
-Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
-Signed-off-by: Laurent Cans <lau...@gm...>
----
-Index: linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
-===================================================================
---- linux-3.14-rc4.orig/arch/arm/boot/dts/imx51-apf51dev.dts
-+++ linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
-@@ -66,6 +66,12 @@
- gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "heartbeat";
- };
-+
-+ backlight {
-+ label = "Backlight";
-+ gpios = <&gpio3 4 0>;
-+ default-state = "on";
-+ };
- };
- };
-
-@@ -85,6 +91,14 @@
- cs-gpios = <&gpio3 28 GPIO_ACTIVE_LOW>,
- <&gpio3 27 GPIO_ACTIVE_LOW>;
- status = "okay";
-+
-+ spidev: spidev@1 {
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ compatible = "spidev";
-+ spi-max-frequency = <25000000>;
-+ reg = <1>;
-+ };
- };
-
- &esdhc1 {
-@@ -99,7 +113,6 @@
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_esdhc2>;
- bus-width = <4>;
-- non-removable;
- status = "okay";
- };
-
-@@ -102,6 +115,13 @@
- status = "okay";
- };
-
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2_1>;
-+ fsl,uart-has-rtscts;
-+ status = "okay";
-+};
-+
- &iomuxc {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_hog>;
-@@ -116,6 +136,7 @@
- imx51-apf51dev {
- pinctrl_hog: hoggrp {
- fsl,pins = <
-+ MX51_PAD_GPIO1_8__GPIO1_8 0x0C5
- MX51_PAD_EIM_EB2__GPIO2_22 0x0C5
- MX51_PAD_EIM_EB3__GPIO2_23 0x0C5
- MX51_PAD_EIM_CS4__GPIO2_29 0x100
-@@ -125,6 +146,8 @@
- MX51_PAD_CSPI1_SS1__GPIO4_25 0x0C5
- MX51_PAD_GPIO1_2__GPIO1_2 0x0C5
- MX51_PAD_GPIO1_3__GPIO1_3 0x0C5
-+ MX51_PAD_DI1_D1_CS__GPIO3_4 0x0C5
-+ MX51_PAD_EIM_CS3__GPIO2_28 0x0C5
- >;
- };
-
-@@ -203,6 +203,14 @@
- MX51_PAD_DI1_PIN3__DI1_PIN3 0x5
- >;
- };
-+ uart2 {
-+ pinctrl_uart2_1: uart2grp-1 {
-+ fsl,pins = <
-+ MX51_PAD_UART2_RXD__UART2_RXD 0x1c5
-+ MX51_PAD_UART2_TXD__UART2_TXD 0x1c5
-+ >;
-+ };
-+ };
- };
- };
-
diff --git a/patches/linux/3.16/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch b/patches/linux/3.16/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
deleted file mode 100644
index 38521dd..0000000
--- a/patches/linux/3.16/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8298da1db865a3789c8a786c95b5def6003e53d1 Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Mon, 11 Nov 2013 10:09:41 +0100
-Subject: [PATCH] To use UART1 without CTS/RTS.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
----
- arch/arm/boot/dts/imx51.dtsi | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
-index 524ac61..c863f6c 100644
---- a/arch/arm/boot/dts/imx51.dtsi
-+++ b/arch/arm/boot/dts/imx51.dtsi
-@@ -760,6 +760,12 @@
- MX51_PAD_UART1_CTS__UART1_CTS 0x1c5
- >;
- };
-+ pinctrl_uart1_2: uart1grp-2 {
-+ fsl,pins = <
-+ MX51_PAD_UART1_RXD__UART1_RXD 0x1c5
-+ MX51_PAD_UART1_TXD__UART1_TXD 0x1c5
-+ >;
-+ };
- };
-
- uart2 {
---
-1.7.4.4
diff --git a/patches/linux/3.16/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch b/patches/linux/3.16/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
deleted file mode 100644
index 48c2c01..0000000
--- a/patches/linux/3.16/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-add wakeup capabilities to the apf51dev user button
-
-Signed-off-by: Eric Jarrige <eri...@ar...>
-
-Index: linux-3.15-rc1/arch/arm/boot/dts/imx51-apf51dev.dts
-===================================================================
---- linux-3.15-rc1.orig/arch/arm/boot/dts/imx51-apf51dev.dts
-+++ linux-3.15-rc1/arch/arm/boot/dts/imx51-apf51dev.dts
-@@ -55,6 +55,7 @@
- label = "user";
- gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
- linux,code = <256>; /* BTN_0 */
-+ gpio-key,wakeup;
- };
- };
-
diff --git a/patches/linux/3.16/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch b/patches/linux/3.16/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
new file mode 100644
index 0000000..ec76f97
--- /dev/null
+++ b/patches/linux/3.16/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
@@ -0,0 +1,904 @@
+Index: linux-3.16/arch/arm/boot/dts/imx51-apf51.dtsi
+===================================================================
+--- /dev/null
++++ linux-3.16/arch/arm/boot/dts/imx51-apf51.dtsi
+@@ -0,0 +1,182 @@
++/*
++ * Copyright 2014 Armadeus Systems - <su...@ar...>
++ * Copyright 2012 Laurent Cans <lau...@gm...>
++ *
++ * Based on mx51-babbage.dts
++ * Copyright 2011 Freescale Semiconductor, Inc.
++ * Copyright 2011 Linaro Ltd.
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++#include "imx51.dtsi"
++
++/ {
++ memory {
++ reg = <0x90000000 0x20000000>;
++ };
++
++ clocks {
++ osc {
++ clock-frequency = <33554432>;
++ };
++ };
++
++ regulators {
++ compatible = "simple-bus";
++
++ reg_usbotg_vbus: usbotg_vbus {
++ compatible = "regulator-fixed";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usbotgreg>;
++ regulator-name = "usbotg_vbus";
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ gpio = <&gpio1 8 GPIO_ACTIVE_HIGH>;
++ enable-active-high;
++ };
++ };
++};
++
++&fec {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_fec>;
++ phy-mode = "mii";
++ phy-reset-gpios = <&gpio3 0 GPIO_ACTIVE_HIGH>;
++ phy-reset-duration = <1>;
++ status = "okay";
++};
++
++&i2c2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c2>;
++ clock-frequency = <400000>;
++ status = "okay";
++};
++
++&nfc {
++ nand-bus-width = <8>;
++ nand-ecc-mode = "hw";
++ nand-on-flash-bbt;
++ status = "okay";
++};
++
++&uart3 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart3>;
++ status = "okay";
++};
++
++&usbphy1 {
++ reset-gpios = <&gpio3 1 GPIO_ACTIVE_LOW>;
++};
++
++&usbh1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usbh1>;
++ phy_type = "ulpi";
++ dr_mode = "host";
++ ext-clk-en;
++ status = "okay";
++};
++
++&usbh2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usbh2>;
++ phy_type = "ulpi";
++ dr_mode = "host";
++ ext-clk-en;
++ status = "okay";
++};
++
++&usbotg {
++ phy_type = "utmi_wide";
++ vbus-supply = <®_usbotg_vbus>;
++ status = "okay";
++};
++
++&iomuxc {
++ imx51-apf51 {
++ pinctrl_fec: fecgrp {
++ fsl,pins = <
++ MX51_PAD_DI_GP3__FEC_TX_ER 0x80000000
++ MX51_PAD_DI2_PIN4__FEC_CRS 0x80000000
++ MX51_PAD_DI2_PIN2__FEC_MDC 0x80000000
++ MX51_PAD_DI2_PIN3__FEC_MDIO 0x80000000
++ MX51_PAD_DI2_DISP_CLK__FEC_RDATA1 0x80000000
++ MX51_PAD_DI_GP4__FEC_RDATA2 0x80000000
++ MX51_PAD_DISP2_DAT0__FEC_RDATA3 0x80000000
++ MX51_PAD_DISP2_DAT1__FEC_RX_ER 0x80000000
++ MX51_PAD_DISP2_DAT6__FEC_TDATA1 0x80000000
++ MX51_PAD_DISP2_DAT7__FEC_TDATA2 0x80000000
++ MX51_PAD_DISP2_DAT8__FEC_TDATA3 0x80000000
++ MX51_PAD_DISP2_DAT9__FEC_TX_EN 0x80000000
++ MX51_PAD_DISP2_DAT10__FEC_COL 0x80000000
++ MX51_PAD_DISP2_DAT11__FEC_RX_CLK 0x80000000
++ MX51_PAD_DISP2_DAT12__FEC_RX_DV 0x80000000
++ MX51_PAD_DISP2_DAT13__FEC_TX_CLK 0x80000000
++ MX51_PAD_DISP2_DAT14__FEC_RDATA0 0x80000000
++ MX51_PAD_DISP2_DAT15__FEC_TDATA0 0x80000000
++ >;
++ };
++
++ pinctrl_i2c2: i2c2grp {
++ fsl,pins = <
++ MX51_PAD_EIM_D27__I2C2_SCL 0x400001ed
++ MX51_PAD_EIM_D24__I2C2_SDA 0x400001ed
++ >;
++ };
++
++ pinctrl_uart3: uart3grp {
++ fsl,pins = <
++ MX51_PAD_UART3_RXD__UART3_RXD 0x1c5
++ MX51_PAD_UART3_TXD__UART3_TXD 0x1c5
++ >;
++ };
++
++ pinctrl_usbh1: usbh1grp {
++ fsl,pins = <
++ MX51_PAD_USBH1_DATA0__USBH1_DATA0 0x1e5
++ MX51_PAD_USBH1_DATA1__USBH1_DATA1 0x1e5
++ MX51_PAD_USBH1_DATA2__USBH1_DATA2 0x1e5
++ MX51_PAD_USBH1_DATA3__USBH1_DATA3 0x1e5
++ MX51_PAD_USBH1_DATA4__USBH1_DATA4 0x1e5
++ MX51_PAD_USBH1_DATA5__USBH1_DATA5 0x1e5
++ MX51_PAD_USBH1_DATA6__USBH1_DATA6 0x1e5
++ MX51_PAD_USBH1_DATA7__USBH1_DATA7 0x1e5
++ MX51_PAD_USBH1_CLK__USBH1_CLK 0x1e5
++ MX51_PAD_USBH1_DIR__USBH1_DIR 0x1e5
++ MX51_PAD_USBH1_NXT__USBH1_NXT 0x1e5
++ MX51_PAD_USBH1_STP__USBH1_STP 0x1e5
++ >;
++ };
++
++ pinctrl_usbh2: usbh2grp {
++ fsl,pins = <
++ MX51_PAD_EIM_D16__USBH2_DATA0 0x1e5
++ MX51_PAD_EIM_D17__USBH2_DATA1 0x1e5
++ MX51_PAD_EIM_D18__USBH2_DATA2 0x1e5
++ MX51_PAD_EIM_D19__USBH2_DATA3 0x1e5
++ MX51_PAD_EIM_D20__USBH2_DATA4 0x1e5
++ MX51_PAD_EIM_D21__USBH2_DATA5 0x1e5
++ MX51_PAD_EIM_D22__USBH2_DATA6 0x1e5
++ MX51_PAD_EIM_D23__USBH2_DATA7 0x1e5
++ MX51_PAD_EIM_A24__USBH2_CLK 0x1e5
++ MX51_PAD_EIM_A25__USBH2_DIR 0x1e5
++ MX51_PAD_EIM_A27__USBH2_NXT 0x1e5
++ MX51_PAD_EIM_A26__USBH2_STP 0x1e5
++ >;
++ };
++
++ pinctrl_usbotgreg: usbotgreggrp {
++ fsl,pins = <
++ MX51_PAD_GPIO1_8__GPIO1_8 0x0c5
++ >;
++ };
++ };
++};
+Index: linux-3.16/arch/arm/boot/dts/imx51-apf51-v1.dtsi
+===================================================================
+--- /dev/null
++++ linux-3.16/arch/arm/boot/dts/imx51-apf51-v1.dtsi
+@@ -0,0 +1,22 @@
++/*
++ * Copyright 2014 Armadeus Systems - <su...@ar...>
++ * Copyright 2012 Laurent Cans <lau...@gm...>
++ *
++ * Based on mx51-babbage.dts
++ * Copyright 2011 Freescale Semiconductor, Inc.
++ * Copyright 2011 Linaro Ltd.
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++#include "imx51-apf51.dtsi"
++
++/ {
++ model = "Armadeus Systems APF51 V1 module";
++ compatible = "armadeus,imx51-apf51", "fsl,imx51";
++};
+Index: linux-3.16/arch/arm/boot/dts/imx51-apf51-v2.dtsi
+===================================================================
+--- /dev/null
++++ linux-3.16/arch/arm/boot/dts/imx51-apf51-v2.dtsi
+@@ -0,0 +1,69 @@
++/*
++ * Copyright 2014 Armadeus Systems - <su...@ar...>
++ * Copyright 2012 Laurent Cans <lau...@gm...>
++ *
++ * Based on mx51-babbage.dts
++ * Copyright 2011 Freescale Semiconductor, Inc.
++ * Copyright 2011 Linaro Ltd.
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++#include "imx51-apf51.dtsi"
++
++/ {
++ model = "Armadeus Systems APF51 V2 module";
++ compatible = "armadeus,imx51-apf51", "fsl,imx51";
++};
++
++&i2c2 {
++ pmic: mc13892@09 {
++ compatible = "fsl,mc13892";
++ reg = <0x09>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pmic>;
++ interrupt-parent = <&gpio1>;
++ interrupts = <7 IRQ_TYPE_LEVEL_HIGH>;
++ fsl,mc13xxx-uses-rtc;
++ fsl,mc13xxx-uses-touch;
++ /* adc makes the board reset so let's disable it for now */
++ //fsl,mc13xxx-uses-adc;
++
++ touchscreen {
++ ato = <128>;
++ atox;
++ };
++
++ leds {
++ #address-cells = <1>;
++ #size-cells = <0>;
++ led-control = <0x000 0x000 0x3ff8 0x000>;
++
++ pmic_led2 {
++ reg = <3>;
++ label = "PMIC_LED2";
++ linux,default-trigger = "heartbeat";
++ };
++ };
++
++ regulators {
++ gpo2_reg: gpo2 { };
++ gpo3_reg: gpo3 { };
++ };
++ };
++};
++
++&iomuxc {
++ imx51-apf51-v2 {
++ pinctrl_pmic: pmicgrp {
++ fsl,pins = <
++ MX51_PAD_GPIO1_7__GPIO1_7 0x0c5 /* PMIC_IRQ */
++ >;
++ };
++ };
++};
+Index: linux-3.16/arch/arm/boot/dts/imx51-apf51dev-v1.dts
+===================================================================
+--- /dev/null
++++ linux-3.16/arch/arm/boot/dts/imx51-apf51dev-v1.dts
+@@ -0,0 +1,19 @@
++/*
++ * Copyright 2014 Armadeus Systems - <su...@ar...>
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++/dts-v1/;
++#include "imx51-apf51-v1.dtsi"
++#include "imx51-apf51dev.dtsi"
++
++/ {
++ model = "Armadeus Systems APF51Dev docking/development board with APF51 V1 SOM";
++ compatible = "armadeus,imx51-apf51dev", "armadeus,imx51-apf51", "fsl,imx51";
++};
+Index: linux-3.16/arch/arm/boot/dts/imx51-apf51dev-v2.dts
+===================================================================
+--- /dev/null
++++ linux-3.16/arch/arm/boot/dts/imx51-apf51dev-v2.dts
+@@ -0,0 +1,19 @@
++/*
++ * Copyright 2014 Armadeus Systems - <su...@ar...>
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++/dts-v1/;
++#include "imx51-apf51-v2.dtsi"
++#include "imx51-apf51dev.dtsi"
++
++/ {
++ model = "Armadeus Systems APF51Dev docking/development board with APF51 V2 SOM";
++ compatible = "armadeus,imx51-apf51dev", "armadeus,imx51-apf51", "fsl,imx51";
++};
+Index: linux-3.16/arch/arm/boot/dts/imx51-apf51dev.dtsi
+===================================================================
+--- /dev/null
++++ linux-3.16/arch/arm/boot/dts/imx51-apf51dev.dtsi
+@@ -0,0 +1,238 @@
++/*
++ * Copyright 2014 Armadeus Systems - <su...@ar...>
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++/ {
++ display@di1 {
++ compatible = "fsl,imx-parallel-display";
++ interface-pix-fmt = "bgr666";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_ipu_disp1>;
++
++ display-timings {
++ native-mode = <&timing0>;
++ timing0: lw700 {
++ clock-frequency = <33000033>;
++ hactive = <800>;
++ vactive = <480>;
++ hback-porch = <96>;
++ hfront-porch = <96>;
++ vback-porch = <20>;
++ vfront-porch = <21>;
++ hsync-len = <64>;
++ vsync-len = <4>;
++ hsync-active = <1>;
++ vsync-active = <1>;
++ de-active = <1>;
++ pixelclk-active = <0>;
++ };
++ };
++
++ port {
++ display_in: endpoint {
++ remote-endpoint = <&ipu_di0_disp0>;
++ };
++ };
++ };
++
++ gpio-keys {
++ compatible = "gpio-keys";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_gpio_keys>;
++
++ user-key {
++ label = "user";
++ gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
++ linux,code = <256>; /* BTN_0 */
++ gpio-key,wakeup;
++ };
++ };
++
++ leds {
++ compatible = "gpio-leds";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_gpio_leds>;
++
++ user {
++ label = "Heartbeat";
++ gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
++ linux,default-trigger = "heartbeat";
++ };
++
++ backlight {
++ label = "Backlight";
++ gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
++ default-state = "on";
++ };
++ };
++};
++
++&ecspi1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_ecspi1>;
++ fsl,spi-num-chipselects = <2>;
++ cs-gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>,
++ <&gpio4 25 GPIO_ACTIVE_HIGH>;
++ status = "okay";
++};
++
++&ecspi2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_ecspi2>;
++ fsl,spi-num-chipselects = <2>;
++ cs-gpios = <&gpio3 28 GPIO_ACTIVE_LOW>,
++ <&gpio3 27 GPIO_ACTIVE_LOW>;
++ status = "okay";
++
++ spidev: spidev@1 {
++ #address-cells = <1>;
++ #size-cells = <1>;
++ compatible = "spidev";
++ spi-max-frequency = <25000000>;
++ reg = <1>;
++ };
++};
++
++&esdhc1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_esdhc1>;
++ cd-gpios = <&gpio2 29 GPIO_ACTIVE_HIGH>;
++ bus-width = <4>;
++ status = "okay";
++};
++
++&esdhc2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_esdhc2 &pinctrl_wifi>;
++ bus-width = <4>;
++ status = "okay";
++};
++
++&uart2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart2 &pinctrl_bluetooth>;
++ fsl,uart-has-rtscts;
++ status = "okay";
++};
++
++&ipu_di0_disp0 {
++ remote-endpoint = <&display_in>;
++};
++
++&iomuxc {
++ imx51-apf51dev {
++ pinctrl_bluetooth: bluetoothgrp {
++ fsl,pins = <
++ MX51_PAD_EIM_CS3__GPIO2_28 0x0c5
++ >;
++ };
++
++ pinctrl_ecspi1: ecspi1grp {
++ fsl,pins = <
++ MX51_PAD_CSPI1_SS0__GPIO4_24 0x0c5
++ MX51_PAD_CSPI1_SS1__GPIO4_25 0x0c5
++ MX51_PAD_CSPI1_MISO__ECSPI1_MISO 0x185
++ MX51_PAD_CSPI1_MOSI__ECSPI1_MOSI 0x185
++ MX51_PAD_CSPI1_SCLK__ECSPI1_SCLK 0x185
++ >;
++ };
++
++ pinctrl_ecspi2: ecspi2grp {
++ fsl,pins = <
++ MX51_PAD_NANDF_D13__GPIO3_27 0x0c5
++ MX51_PAD_NANDF_D12__GPIO3_28 0x0c5
++ MX51_PAD_NANDF_RB3__ECSPI2_MISO 0x185
++ MX51_PAD_NANDF_D15__ECSPI2_MOSI 0x185
++ MX51_PAD_NANDF_RB2__ECSPI2_SCLK 0x185
++ >;
++ };
++
++ pinctrl_esdhc1: esdhc1grp {
++ fsl,pins = <
++ MX51_PAD_EIM_CS4__GPIO2_29 0x100
++ MX51_PAD_SD1_CMD__SD1_CMD 0x400020d5
++ MX51_PAD_SD1_CLK__SD1_CLK 0x20d5
++ MX51_PAD_SD1_DATA0__SD1_DATA0 0x20d5
++ MX51_PAD_SD1_DATA1__SD1_DATA1 0x20d5
++ MX51_PAD_SD1_DATA2__SD1_DATA2 0x20d5
++ MX51_PAD_SD1_DATA3__SD1_DATA3 0x20d5
++ >;
++ };
++
++ pinctrl_esdhc2: esdhc2grp {
++ fsl,pins = <
++ MX51_PAD_SD2_CMD__SD2_CMD 0x400020d5
++ MX51_PAD_SD2_CLK__SD2_CLK 0x20d5
++ MX51_PAD_SD2_DATA0__SD2_DATA0 0x20d5
++ MX51_PAD_SD2_DATA1__SD2_DATA1 0x20d5
++ MX51_PAD_SD2_DATA2__SD2_DATA2 0x20d5
++ MX51_PAD_SD2_DATA3__SD2_DATA3 0x20d5
++ >;
++ };
++
++ pinctrl_gpio_keys: gpiokeysgrp {
++ fsl,pins = <
++ MX51_PAD_GPIO1_3__GPIO1_3 0x0c5
++ >;
++ };
++
++ pinctrl_gpio_leds: gpioledsgrp {
++ fsl,pins = <
++ MX51_PAD_GPIO1_2__GPIO1_2 0x0c5
++ MX51_PAD_DI1_D1_CS__GPIO3_4 0x0c5
++ >;
++ };
++
++ pinctrl_ipu_disp1: ipudisp1grp {
++ fsl,pins = <
++ MX51_PAD_DISP1_DAT0__DISP1_DAT0 0x5
++ MX51_PAD_DISP1_DAT1__DISP1_DAT1 0x5
++ MX51_PAD_DISP1_DAT2__DISP1_DAT2 0x5
++ MX51_PAD_DISP1_DAT3__DISP1_DAT3 0x5
++ MX51_PAD_DISP1_DAT4__DISP1_DAT4 0x5
++ MX51_PAD_DISP1_DAT5__DISP1_DAT5 0x5
++ MX51_PAD_DISP1_DAT6__DISP1_DAT6 0x5
++ MX51_PAD_DISP1_DAT7__DISP1_DAT7 0x5
++ MX51_PAD_DISP1_DAT8__DISP1_DAT8 0x5
++ MX51_PAD_DISP1_DAT9__DISP1_DAT9 0x5
++ MX51_PAD_DISP1_DAT10__DISP1_DAT10 0x5
++ MX51_PAD_DISP1_DAT11__DISP1_DAT11 0x5
++ MX51_PAD_DISP1_DAT12__DISP1_DAT12 0x5
++ MX51_PAD_DISP1_DAT13__DISP1_DAT13 0x5
++ MX51_PAD_DISP1_DAT14__DISP1_DAT14 0x5
++ MX51_PAD_DISP1_DAT15__DISP1_DAT15 0x5
++ MX51_PAD_DISP1_DAT16__DISP1_DAT16 0x5
++ MX51_PAD_DISP1_DAT17__DISP1_DAT17 0x5
++ MX51_PAD_DISP1_DAT18__DISP1_DAT18 0x5
++ MX51_PAD_DISP1_DAT19__DISP1_DAT19 0x5
++ MX51_PAD_DISP1_DAT20__DISP1_DAT20 0x5
++ MX51_PAD_DISP1_DAT21__DISP1_DAT21 0x5
++ MX51_PAD_DISP1_DAT22__DISP1_DAT22 0x5
++ MX51_PAD_DISP1_DAT23__DISP1_DAT23 0x5
++ MX51_PAD_DI1_PIN2__DI1_PIN2 0x5
++ MX51_PAD_DI1_PIN3__DI1_PIN3 0x5
++ >;
++ };
++
++ pinctrl_uart2: uart2grp {
++ fsl,pins = <
++ MX51_PAD_UART2_RXD__UART2_RXD 0x1c5
++ MX51_PAD_UART2_TXD__UART2_TXD 0x1c5
++ >;
++ };
++
++ pinctrl_wifi: wifigrp {
++ fsl,pins = <
++ MX51_PAD_EIM_EB2__GPIO2_22 0x0c5
++ MX51_PAD_EIM_EB3__GPIO2_23 0x0c5
++ >;
++ };
++ };
++};
+Index: linux-3.16/arch/arm/boot/dts/Makefile
+===================================================================
+--- linux-3.16.orig/arch/arm/boot/dts/Makefile
++++ linux-3.16/arch/arm/boot/dts/Makefile
+@@ -168,8 +168,8 @@ dtb-$(CONFIG_ARCH_MXC) += \
+ imx35-eukrea-mbimxsd35-baseboard.dtb \
+ imx35-pdk.dtb \
+ imx50-evk.dtb \
+- imx51-apf51.dtb \
+- imx51-apf51dev.dtb \
++ imx51-apf51dev-v1.dtb \
++ imx51-apf51dev-v2.dtb \
+ imx51-babbage.dtb \
+ imx51-digi-connectcore-jsk.dtb \
+ imx51-eukrea-mbimxsd51-baseboard.dtb \
+Index: linux-3.16/arch/arm/boot/dts/imx51-apf51.dts
+===================================================================
+--- linux-3.16.orig/arch/arm/boot/dts/imx51-apf51.dts
++++ /dev/null
+@@ -1,89 +0,0 @@
+-/*
+- * Copyright 2012 Armadeus Systems - <su...@ar...>
+- * Copyright 2012 Laurent Cans <lau...@gm...>
+- *
+- * Based on mx51-babbage.dts
+- * Copyright 2011 Freescale Semiconductor, Inc.
+- * Copyright 2011 Linaro Ltd.
+- *
+- * The code contained herein is licensed under the GNU General Public
+- * License. You may obtain a copy of the GNU General Public License
+- * Version 2 or later at the following locations:
+- *
+- * http://www.opensource.org/licenses/gpl-license.html
+- * http://www.gnu.org/copyleft/gpl.html
+- */
+-
+-/dts-v1/;
+-#include "imx51.dtsi"
+-
+-/ {
+- model = "Armadeus Systems APF51 module";
+- compatible = "armadeus,imx51-apf51", "fsl,imx51";
+-
+- memory {
+- reg = <0x90000000 0x20000000>;
+- };
+-
+- clocks {
+- osc {
+- clock-frequency = <33554432>;
+- };
+- };
+-};
+-
+-&fec {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_fec>;
+- phy-mode = "mii";
+- phy-reset-gpios = <&gpio3 0 GPIO_ACTIVE_HIGH>;
+- phy-reset-duration = <1>;
+- status = "okay";
+-};
+-
+-&iomuxc {
+- imx51-apf51 {
+- pinctrl_fec: fecgrp {
+- fsl,pins = <
+- MX51_PAD_DI_GP3__FEC_TX_ER 0x80000000
+- MX51_PAD_DI2_PIN4__FEC_CRS 0x80000000
+- MX51_PAD_DI2_PIN2__FEC_MDC 0x80000000
+- MX51_PAD_DI2_PIN3__FEC_MDIO 0x80000000
+- MX51_PAD_DI2_DISP_CLK__FEC_RDATA1 0x80000000
+- MX51_PAD_DI_GP4__FEC_RDATA2 0x80000000
+- MX51_PAD_DISP2_DAT0__FEC_RDATA3 0x80000000
+- MX51_PAD_DISP2_DAT1__FEC_RX_ER 0x80000000
+- MX51_PAD_DISP2_DAT6__FEC_TDATA1 0x80000000
+- MX51_PAD_DISP2_DAT7__FEC_TDATA2 0x80000000
+- MX51_PAD_DISP2_DAT8__FEC_TDATA3 0x80000000
+- MX51_PAD_DISP2_DAT9__FEC_TX_EN 0x80000000
+- MX51_PAD_DISP2_DAT10__FEC_COL 0x80000000
+- MX51_PAD_DISP2_DAT11__FEC_RX_CLK 0x80000000
+- MX51_PAD_DISP2_DAT12__FEC_RX_DV 0x80000000
+- MX51_PAD_DISP2_DAT13__FEC_TX_CLK 0x80000000
+- MX51_PAD_DISP2_DAT14__FEC_RDATA0 0x80000000
+- MX51_PAD_DISP2_DAT15__FEC_TDATA0 0x80000000
+- >;
+- };
+-
+- pinctrl_uart3: uart3grp {
+- fsl,pins = <
+- MX51_PAD_UART3_RXD__UART3_RXD 0x1c5
+- MX51_PAD_UART3_TXD__UART3_TXD 0x1c5
+- >;
+- };
+- };
+-};
+-
+-&nfc {
+- nand-bus-width = <8>;
+- nand-ecc-mode = "hw";
+- nand-on-flash-bbt;
+- status = "okay";
+-};
+-
+-&uart3 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_uart3>;
+- status = "okay";
+-};
+Index: linux-3.16/arch/arm/boot/dts/imx51-apf51dev.dts
+===================================================================
+--- linux-3.16.orig/arch/arm/boot/dts/imx51-apf51dev.dts
++++ /dev/null
+@@ -1,211 +0,0 @@
+-/*
+- * Copyright 2013 Armadeus Systems - <su...@ar...>
+- *
+- * The code contained herein is licensed under the GNU General Public
+- * License. You may obtain a copy of the GNU General Public License
+- * Version 2 or later at the following locations:
+- *
+- * http://www.opensource.org/licenses/gpl-license.html
+- * http://www.gnu.org/copyleft/gpl.html
+- */
+-
+-/* APF51Dev is a docking board for the APF51 SOM */
+-#include "imx51-apf51.dts"
+-
+-/ {
+- model = "Armadeus Systems APF51Dev docking/development board";
+- compatible = "armadeus,imx51-apf51dev", "armadeus,imx51-apf51", "fsl,imx51";
+-
+- display@di1 {
+- compatible = "fsl,imx-parallel-display";
+- interface-pix-fmt = "bgr666";
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_ipu_disp1>;
+-
+- display-timings {
+- lw700 {
+- native-mode;
+- clock-frequency = <33000033>;
+- hactive = <800>;
+- vactive = <480>;
+- hback-porch = <96>;
+- hfront-porch = <96>;
+- vback-porch = <20>;
+- vfront-porch = <21>;
+- hsync-len = <64>;
+- vsync-len = <4>;
+- hsync-active = <1>;
+- vsync-active = <1>;
+- de-active = <1>;
+- pixelclk-active = <0>;
+- };
+- };
+-
+- port {
+- display_in: endpoint {
+- remote-endpoint = <&ipu_di0_disp0>;
+- };
+- };
+- };
+-
+- gpio-keys {
+- compatible = "gpio-keys";
+-
+- user-key {
+- label = "user";
+- gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
+- linux,code = <256>; /* BTN_0 */
+- };
+- };
+-
+- leds {
+- compatible = "gpio-leds";
+-
+- user {
+- label = "Heartbeat";
+- gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
+- linux,default-trigger = "heartbeat";
+- };
+- };
+-};
+-
+-&ecspi1 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_ecspi1>;
+- fsl,spi-num-chipselects = <2>;
+- cs-gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>,
+- <&gpio4 25 GPIO_ACTIVE_HIGH>;
+- status = "okay";
+-};
+-
+-&ecspi2 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_ecspi2>;
+- fsl,spi-num-chipselects = <2>;
+- cs-gpios = <&gpio3 28 GPIO_ACTIVE_LOW>,
+- <&gpio3 27 GPIO_ACTIVE_LOW>;
+- status = "okay";
+-};
+-
+-&esdhc1 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_esdhc1>;
+- cd-gpios = <&gpio2 29 GPIO_ACTIVE_HIGH>;
+- bus-width = <4>;
+- status = "okay";
+-};
+-
+-&esdhc2 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_esdhc2>;
+- bus-width = <4>;
+- non-removable;
+- status = "okay";
+-};
+-
+-&i2c2 {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_i2c2>;
+- status = "okay";
+-};
+-
+-&iomuxc {
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_hog>;
+-
+- imx51-apf51dev {
+- pinctrl_hog: hoggrp {
+- fsl,pins = <
+- MX51_PAD_EIM_EB2__GPIO2_22 0x0C5
+- MX51_PAD_EIM_EB3__GPIO2_23 0x0C5
+- MX51_PAD_EIM_CS4__GPIO2_29 0x100
+- MX51_PAD_NANDF_D13__GPIO3_27 0x0C5
+- MX51_PAD_NANDF_D12__GPIO3_28 0x0C5
+- MX51_PAD_CSPI1_SS0__GPIO4_24 0x0C5
+- MX51_PAD_CSPI1_SS1__GPIO4_25 0x0C5
+- MX51_PAD_GPIO1_2__GPIO1_2 0x0C5
+- MX51_PAD_GPIO1_3__GPIO1_3 0x0C5
+- >;
+- };
+-
+- pinctrl_ecspi1: ecspi1grp {
+- fsl,pins = <
+- MX51_PAD_CSPI1_MISO__ECSPI1_MISO 0x185
+- MX51_PAD_CSPI1_MOSI__ECSPI1_MOSI 0x185
+- MX51_PAD_CSPI1_SCLK__ECSPI1_SCLK 0x185
+- >;
+- };
+-
+- pinctrl_ecspi2: ecspi2grp {
+- fsl,pins = <
+- MX51_PAD_NANDF_RB3__ECSPI2_MISO 0x185
+- MX51_PAD_NANDF_D15__ECSPI2_MOSI 0x185
+- MX51_PAD_NANDF_RB2__ECSPI2_SCLK 0x185
+- >;
+- };
+-
+- pinctrl_esdhc1: esdhc1grp {
+- fsl,pins = <
+- MX51_PAD_SD1_CMD__SD1_CMD 0x400020d5
+- MX51_PAD_SD1_CLK__SD1_CLK 0x20d5
+- MX51_PAD_SD1_DATA0__SD1_DATA0 0x20d5
+- MX51_PAD_SD1_DATA1__SD1_DATA1 0x20d5
+- MX51_PAD_SD1_DATA2__SD1_DATA2 0x20d5
+- MX51_PAD_SD1_DATA3__SD1_DATA3 0x20d5
+- >;
+- };
+-
+- pinctrl_esdhc2: esdhc2grp {
+- fsl,pins = <
+- MX51_PAD_SD2_CMD__SD2_CMD 0x400020d5
+- MX51_PAD_SD2_CLK__SD2_CLK 0x20d5
+- MX51_PAD_SD2_DATA0__SD2_DATA0 0x20d5
+- MX51_PAD_SD2_DATA1__SD2_DATA1 0x20d5
+- MX51_PAD_SD2_DATA2__SD2_DATA2 0x20d5
+- MX51_PAD_SD2_DATA3__SD2_DATA3 0x20d5
+- >;
+- };
+-
+- pinctrl_i2c2: i2c2grp {
+- fsl,pins = <
+- MX51_PAD_EIM_D27__I2C2_SCL 0x400001ed
+- MX51_PAD_EIM_D24__I2C2_SDA 0x400001ed
+- >;
+- };
+-
+- pinctrl_ipu_disp1: ipudisp1grp {
+- fsl,pins = <
+- MX51_PAD_DISP1_DAT0__DISP1_DAT0 0x5
+- MX51_PAD_DISP1_DAT1__DISP1_DAT1 0x5
+- MX51_PAD_DISP1_DAT2__DISP1_DAT2 0x5
+- MX51_PAD_DISP1_DAT3__DISP1_DAT3 0x5
+- MX51_PAD_DISP1_DAT4__DISP1_DAT4 0x5
+- MX51_PAD_DISP1_DAT5__DISP1_DAT5 0x5
+- MX51_PAD_DISP1_DAT6__DISP1_DAT6 0x5
+- MX51_PAD_DISP1_DAT7__DISP1_DAT7 0x5
+- MX51_PAD_DISP1_DAT8__DISP1_DAT8 0x5
+- MX51_PAD_DISP1_DAT9__DISP1_DAT9 0x5
+- MX51_PAD_DISP1_DAT10__DISP1_DAT10 0x5
+- MX51_PAD_DISP1_DAT11__DISP1_DAT11 0x5
+- MX51_PAD_DISP1_DAT12__DISP1_DAT12 0x5
+- MX51_PAD_DISP1_DAT13__DISP1_DAT13 0x5
+- MX51_PAD_DISP1_DAT14__DISP1_DAT14 0x5
+- MX51_PAD_DISP1_DAT15__DISP1_DAT15 0x5
+- MX51_PAD_DISP1_DAT16__DISP1_DAT16 0x5
+- MX51_PAD_DISP1_DAT17__DISP1_DAT17 0x5
+- MX51_PAD_DISP1_DAT18__DISP1_DAT18 0x5
+- MX51_PAD_DISP1_DAT19__DISP1_DAT19 0x5
+- MX51_PAD_DISP1_DAT20__DISP1_DAT20 0x5
+- MX51_PAD_DISP1_DAT21__DISP1_DAT21 0x5
+- MX51_PAD_DISP1_DAT22__DISP1_DAT22 0x5
+- MX51_PAD_DISP1_DAT23__DISP1_DAT23 0x5
+- MX51_PAD_DI1_PIN2__DI1_PIN2 0x5
+- MX51_PAD_DI1_PIN3__DI1_PIN3 0x5
+- >;
+- };
+- };
+-};
+-
+-&ipu_di0_disp0 {
+- remote-endpoint = <&display_in>;
+-};
diff --git a/patches/linux/3.16/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch b/patches/linux/3.16/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch
new file mode 100644
index 0000000..184ae1c
--- /dev/null
+++ b/patches/linux/3.16/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch
@@ -0,0 +1,540 @@
+Index: linux-3.16/drivers/input/touchscreen/mc13xxx_ts.c
+===================================================================
+--- /dev/null
++++ linux-3.16/drivers/input/touchscreen/mc13xxx_ts.c
+@@ -0,0 +1,468 @@
++/*
++ * Driver for the Freescale Semiconductor MC13783 / MC13892 touchscreen.
++ *
++ * The code for MC13892 support and calibration comes from Oskar Schirmer
++ * from here: https://lkml.org/lkml/2012/2/14/98
++ *
++ * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2009 Sascha Hauer, Pengutronix
++ *
++ * Initial development of this code was funded by
++ * Phytec Messtechnik GmbH, http://www.phytec.de/
++ *
++ * 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.
++ */
++#include <linux/platform_device.h>
++#include <linux/mfd/mc13xxx.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/input.h>
++#include <linux/of.h>
++#include <linux/sched.h>
++#include <linux/slab.h>
++#include <linux/init.h>
++
++#define DRIVER_NAME "mc13xxx-ts"
++
++#define MC13XXX_ID_MC13783 1
++#define MC13XXX_ID_MC13892 2
++
++#define DEFAULT_SAMPLE_TOLERANCE 300
++
++static unsigned int sample_tolerance = DEFAULT_SAMPLE_TOLERANCE;
++module_param(sample_tolerance, uint, S_IRUGO | S_IWUSR);
++MODULE_PARM_DESC(sample_tolerance,
++ "If the minimal and maximal value read out for one axis (out "
++ "of three) differ by this value (default: "
++ __stringify(DEFAULT_SAMPLE_TOLERANCE) ") or more, the reading "
++ "is supposed to be wrong and is discarded. Set to 0 to "
++ "disable this check.");
++
++#define DEFAULT_PRESSURE_LIMIT 2048
++
++static unsigned int pressure_limit = DEFAULT_PRESSURE_LIMIT;
++module_param(pressure_limit, uint, S_IRUGO | S_IWUSR);
++MODULE_PARM_DESC(pressure_limit,
++ "Pressure values below this value (default: "
++ __stringify(DEFAULT_PRESSURE_LIMIT) ") are taken "
++ "as release event.");
++
++struct mc13xxx_ts_priv {
++ struct input_dev *idev;
++ struct mc13xxx *mc13xxx;
++ struct delayed_work work;
++ struct workqueue_struct *workq;
++ unsigned int sample[4];
++ struct mc13xxx_ts_platform_data *touch;
++ int calibration[7];
++};
++
++static irqreturn_t mc13xxx_ts_handler(int irq, void *data)
++{
++ struct mc13xxx_ts_priv *priv = data;
++
++ mc13xxx_irq_ack(priv->mc13xxx, irq);
++
++ /*
++ * Kick off reading coordinates. Note that if work happens already
++ * be queued for future execution (it rearms itself) it will not
++ * be rescheduled for immediate execution here. However the rearm
++ * delay is HZ / 50 which is acceptable.
++ */
++ queue_delayed_work(priv->workq, &priv->work, 0);
++
++ return IRQ_HANDLED;
++}
++
++#define sort3(a0, a1, a2) ({ \
++ if (a0 > a1) \
++ swap(a0, a1); \
++ if (a1 > a2) \
++ swap(a1, a2); \
++ if (a0 > a1) \
++ swap(a0, a1); \
++ })
++
++static void mc13xxx_report_abs_calibrated(struct mc13xxx_ts_priv *priv,
++ struct input_dev *idev, int x, int y)
++{
++ int *calib = priv->calibration;
++ int xc, yc;
++ if (calib[6]) {
++ xc = (calib[0] * x + calib[1] * y + calib[2]) / calib[6];
++ if (xc < 0)
++ xc = 0;
++ yc = (calib[3] * x + calib[4] * y + calib[5]) / calib[6];
++ if (yc < 0)
++ yc = 0;
++ } else {
++ xc = x;
++ yc = y;
++ }
++ input_report_abs(idev, ABS_X, xc);
++ input_report_abs(idev, ABS_Y, yc);
++}
++
++static void mc13783_ts_report_sample(struct mc13xxx_ts_priv *priv)
++{
++ struct input_dev *idev = priv->idev;
++ int x0, x1, x2, y0, y1, y2;
++ int cr0, cr1;
++
++ /*
++ * the values are 10-bit wide only, but the two least significant
++ * bits are for future 12 bit use and reading yields 0
++ */
++ x0 = priv->sample[0] & 0xfff;
++ x1 = priv->sample[1] & 0xfff;
++ x2 = priv->sample[2] & 0xfff;
++ y0 = priv->sample[3] & 0xfff;
++ y1 = (priv->sample[0] >> 12) & 0xfff;
++ y2 = (priv->sample[1] >> 12) & 0xfff;
++ cr0 = (priv->sample[2] >> 12) & 0xfff;
++ cr1 = (priv->sample[3] >> 12) & 0xfff;
++
++ dev_dbg(&idev->dev,
++ "x: (% 4d,% 4d,% 4d) y: (% 4d, % 4d,% 4d) cr: (% 4d, % 4d)\n",
++ x0, x1, x2, y0, y1, y2, cr0, cr1);
++
++ sort3(x0, x1, x2);
++ sort3(y0, y1, y2);
++
++ cr0 = (cr0 + cr1) / 2;
++
++ if (!cr0 || !sample_tolerance ||
++ (x2 - x0 < sample_tolerance &&
++ y2 - y0 < sample_tolerance)) {
++ /* report the median coordinate and average pressure */
++ if (cr0) {
++ mc13xxx_report_abs_calibrated(priv, idev, x1, y1);
++ dev_dbg(&idev->dev, "report (%d, %d, %d)\n",
++ x1, y1, 0x1000 - cr0);
++ queue_delayed_work(priv->workq, &priv->work, HZ / 50);
++ } else
++ dev_dbg(&idev->dev, "report release\n");
++
++ input_report_abs(idev, ABS_PRESSURE,
++ cr0 ? 0x1000 - cr0 : cr0);
++ input_report_key(idev, BTN_TOUCH, cr0);
++ input_sync(idev);
++ } else
++ dev_dbg(&idev->dev, "discard event\n");
++}
++
++static void mc13892_ts_report_sample(struct mc13xxx_ts_priv *priv)
++{
++ struct input_dev *idev = priv->idev;
++ int x0, x1, y0, y1;
++ int cr0, cr1;
++
++ /*
++ * the values are 10-bit wide only, but the two least significant
++ * bits are for future 12 bit use and reading yields 0
++ */
++ x0 = priv->sample[0] & 0xfff;
++ x1 = priv->sample[1] & 0xfff;
++ y0 = priv->sample[3] & 0xfff;
++ y1 = (priv->sample[0] >> 12) & 0xfff;
++ cr0 = (priv->sample[2] >> 12) & 0xfff;
++ cr1 = (priv->sample[3] >> 12) & 0xfff;
++
++ dev_dbg(&idev->dev,
++ "x: (% 4d,% 4d) y: (% 4d,% 4d) cr: (% 4d, % 4d)\n",
++ x0, x1, y0, y1, cr0, cr1);
++
++ if (x0 > x1)
++ swap(x0, x1);
++ if (y0 > y1)
++ swap(y0, y1);
++
++ cr0 = 0x1000 - ((cr0 + cr1) / 2);
++ if (cr0 < pressure_limit)
++ cr0 = 0;
++
++ if (!cr0 || !sample_tolerance ||
++ (x1 - x0 < sample_tolerance &&
++ y1 - y0 < sample_tolerance)) {
++ /* report the average coordinate and pressure */
++ if (cr0) {
++ x0 = (x0 + x1) / 2;
++ y0 = (y0 + y1) / 2;
++ mc13xxx_report_abs_calibrated(priv, idev, x0, y0);
++ dev_dbg(&idev->dev, "report (%d, %d, %d)\n",
++ x0, y0, cr0);
++ queue_delayed_work(priv->workq, &priv->work, HZ / 50);
++ } else
++ dev_dbg(&idev->dev, "report release\n");
++
++ input_report_abs(idev, ABS_PRESSURE, cr0);
++ input_report_key(idev, BTN_TOUCH, cr0);
++ input_sync(idev);
++ } else
++ dev_dbg(&idev->dev, "discard event\n");
++}
++
++static void mc13783_ts_work(struct work_struct *work)
++{
++ struct mc13xxx_ts_priv *priv =
++ container_of(work, struct mc13xxx_ts_priv, work.work);
++ unsigned int mode = MC13XXX_ADC_MODE_TS;
++ unsigned int channel = 12;
++
++ if (mc13xxx_adc_do_conversion(priv->mc13xxx,
++ mode, channel,
++ priv->touch->ato, priv->touch->atox,
++ priv->sample) == 0)
++ mc13783_ts_report_sample(priv);
++}
++
++static void mc13892_ts_work(struct work_struct *work)
++{
++ struct mc13xxx_ts_priv *priv =
++ container_of(work, struct mc13xxx_ts_priv, work.work);
++ unsigned int mode = MC13XXX_ADC_MODE_TS;
++ unsigned int channel = 12;
++
++ if (mc13xxx_adc_do_conversion(priv->mc13xxx,
++ mode, channel,
++ priv->touch->ato, priv->touch->atox,
++ priv->sample) == 0)
++ mc13892_ts_report_sample(priv);
++}
++
++static int mc13xxx_ts_open(struct input_dev *dev)
++{
++ struct mc13xxx_ts_priv *priv = input_get_drvdata(dev);
++ int ret;
++
++ mc13xxx_lock(priv->mc13xxx);
++
++ mc13xxx_irq_ack(priv->mc13xxx, MC13XXX_IRQ_TS);
++
++ ret = mc13xxx_irq_request(priv->mc13xxx, MC13XXX_IRQ_TS,
++ mc13xxx_ts_handler, DRIVER_NAME, priv);
++ if (ret)
++ goto out;
++
++ ret = mc13xxx_reg_rmw(priv->mc13xxx, MC13XXX_ADC0,
++ MC13XXX_ADC0_TSMOD_MASK, MC13XXX_ADC0_TSMOD0);
++ if (ret)
++ mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_TS, priv);
++out:
++ mc13xxx_unlock(priv->mc13xxx);
++ return ret;
++}
++
++static void mc13xxx_ts_close(struct input_dev *dev)
++{
++ struct mc13xxx_ts_priv *priv = input_get_drvdata(dev);
++
++ mc13xxx_lock(priv->mc13xxx);
++ mc13xxx_reg_rmw(priv->mc13xxx, MC13XXX_ADC0,
++ MC13XXX_ADC0_TSMOD_MASK, 0);
++ mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_TS, priv);
++ mc13xxx_unlock(priv->mc13xxx);
++
++ cancel_delayed_work_sync(&priv->work);
++}
++
++static ssize_t mc13xxx_calibration_show(struct device *d,
++ struct device_attribute *attr, char *buf)
++{
++ struct mc13xxx_ts_priv *priv = dev_get_drvdata(d);
++ int i, p, r;
++
++ p = 0;
++ for (i = 0; i < 7; i++) {
++ r = sprintf(&buf[p], i == 6 ? "%d\n" : "%d ",
++ priv->calibration[i]);
++ if (r < 0)
++ return r;
++ p += r;
++ }
++ return p;
++}
++
++static ssize_t mc13xxx_calibration_store(struct device *d,
++ struct device_attribute *attr, const char *buf, size_t count)
++{
++ struct mc13xxx_ts_priv *priv = dev_get_drvdata(d);
++ int i, p, r;
++ int c[7];
++
++ p = 0;
++ for (i = 0; i < 7; i++) {
++ if (sscanf(&buf[p], "%d%n", &c[i], &r) != 1)
++ return -EINVAL;
++ p += r;
++ }
++ memcpy(priv->calibration, c, sizeof(priv->calibration));
++ return count;
++}
++
++static DEVICE_ATTR(calibration, S_IWUSR | S_IRUGO,
++ mc13xxx_calibration_show, mc13xxx_calibration_store);
++
++static int mc13xxx_init_sysfs(struct device *d)
++{
++ return device_create_file(d, &dev_attr_calibration);
++}
++
++static void mc13xxx_free_sysfs(struct device *d)
++{
++ device_remove_file(d, &dev_attr_calibration);
++}
++
++static struct mc13xxx_ts_platform_data __init *mc13xxx_ts_probe_dt(
++ struct platform_device *pdev)
++{
++ struct mc13xxx_ts_platform_data *pdata;
++ struct device_node *parent;
++ struct device *dev = &pdev->dev;
++ int ret = -ENODATA;
++
++ pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
++ if (!pdata)
++ return ERR_PTR(-ENOMEM);
++
++ of_node_get(dev->parent->of_node);
++
++ parent = of_find_node_by_name(dev->parent->of_node, "touchscreen");
++ if (!parent)
++ goto out_node_put;
++
++ ret = of_property_read_u8(parent, "ato", &pdata->ato);
++ if (ret)
++ goto out_node_put;
++
++ if (of_property_read_bool(parent, "atox"))
++ pdata->atox = 1;
++ else
++ pdata->atox = 0;
++
++out_node_put:
++ of_node_put(parent);
++
++ return ret ? ERR_PTR(ret) : pdata;
++}
++static int __init mc13xxx_ts_probe(struct platform_device *pdev)
++{
++ struct mc13xxx_ts_priv *priv;
++ struct input_dev *idev;
++ int ret = -ENOMEM;
++
++ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
++ idev = input_allocate_device();
++ if (!priv || !idev)
++ goto err_free_mem;
++
++ switch (platform_get_device_id(pdev)->driver_data) {
++ case MC13XXX_ID_MC13783:
++ INIT_DELAYED_WORK(&priv->work, mc13783_ts_work);
++ break;
++ case MC13XXX_ID_MC13892:
++ INIT_DELAYED_WORK(&priv->work, mc13892_ts_work);
++ break;
++ default:
++ goto err_free_mem;
++ }
++
++ priv->mc13xxx = dev_get_drvdata(pdev->dev.parent);
++ priv->idev = idev;
++ platform_set_drvdata(pdev, priv);
++ priv->touch = mc13xxx_ts_probe_dt(pdev);
++ if (IS_ERR(priv->touch)) {
++ priv->touch = dev_get_platdata(&pdev->dev);
++ if (!priv->touch) {
++ dev_err(&pdev->dev, "missing platform data\n");
++ ret = -ENODEV;
++ goto err_free_mem;
++ }
++ }
++
++ /*
++ * We need separate workqueue because mc13xxx_adc_do_conversion
++ * uses keventd and thus would deadlock.
++ */
++ priv->workq = create_singlethread_workqueue("mc13xxx_ts");
++ if (!priv->workq)
++ goto err_free_mem;
++
++ idev->name = DRIVER_NAME;
++ idev->dev.parent = &pdev->dev;
++
++ idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
++ idev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
++ input_set_abs_params(idev, ABS_X, 0, 0xfff, 0, 0);
++ input_set_abs_params(idev, ABS_Y, 0, 0xfff, 0, 0);
++ input_set_abs_params(idev, ABS_PRESSURE, 0, 0xfff, 0, 0);
++
++ idev->open = mc13xxx_ts_open;
++ idev->close = mc13xxx_ts_close;
++
++ input_set_drvdata(idev, priv);
++
++ ret = mc13xxx_init_sysfs(&pdev->dev);
++ if (ret) {
++ dev_err(&pdev->dev, "failed to init sysfs.\n");
++ goto err_destroy_wq;
++ }
++
++ ret = input_register_device(priv->idev);
++ if (ret) {
++ dev_err(&pdev->dev,
++ "register input device failed with %d\n", ret);
++ goto err_free_sysfs;
++ }
++
++ return 0;
++
++err_free_sysfs:
++ mc13xxx_free_sysfs(&pdev->dev);
++err_destroy_wq:
++ destroy_workqueue(priv->workq);
++err_free_mem:
++ input_free_device(idev);
++ kfree(priv);
++ return ret;
++}
++
++static int mc13xxx_ts_remove(struct platform_device *pdev)
++{
++ struct mc13xxx_ts_priv *priv = platform_get_drvdata(pdev);
++
++ destroy_workqueue(priv->workq);
++ input_unregister_device(priv->idev);
++ kfree(priv);
++
++ return 0;
++}
++
++const struct platform_device_id mc13xxx_ts_idtable[] = {
++ {
++ .name = "mc13783-ts",
++ .driver_data = MC13XXX_ID_MC13783,
++ }, {
++ .name = "mc13892-ts",
++ .driver_data = MC13XXX_ID_MC13892,
++ },
++ { }
++};
++
++static struct platform_driver mc13xxx_ts_driver = {
++ .id_table = mc13xxx_ts_idtable,
++ .remove = mc13xxx_ts_remove,
++ .driver = {
++ .owner = THIS_MODULE,
++ .name = DRIVER_NAME,
++ },
++};
++
++module_platform_driver_probe(mc13xxx_ts_driver, mc13xxx_ts_probe);
++
++MODULE_DESCRIPTION("MC13xxx input touchscreen driver");
++MODULE_AUTHOR("Sascha Hauer <s....@pe...>");
++MODULE_LICENSE("GPL v2");
++MODULE_ALIAS("platform:" DRIVER_NAME);
+Index: linux-3.16/drivers/input/touchscreen/Makefile
+===================================================================
+--- linux-3.16.orig/drivers/input/touchscreen/Makefile
++++ linux-3.16/drivers/input/touchscreen/Makefile
+@@ -38,7 +38,7 @@ obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inex
+ obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) += intel-mid-touch.o
+ obj-$(CONFIG_TOUCHSCREEN_LPC32XX) += lpc32xx_ts.o
+ obj-$(CONFIG_TOUCHSCREEN_MAX11801) += max11801_ts.o
+-obj-$(CONFIG_TOUCHSCREEN_MC13783) += mc13783_ts.o
++obj-$(CONFIG_TOUCHSCREEN_MC13XXX) += mc13xxx_ts.o
+ obj-$(CONFIG_TOUCHSCREEN_MCS5000) += mcs5000_ts.o
+ obj-$(CONFIG_TOUCHSCREEN_MIGOR) += migor_ts.o
+ obj-$(CONFIG_TOUCHSCREEN_MMS114) += mms114.o
+Index: linux-3.16/drivers/input/touchscreen/Kconfig
+===================================================================
+--- linux-3.16.orig/drivers/input/touchscreen/Kconfig
++++ linux-3.16/drivers/input/touchscreen/Kconfig
+@@ -713,17 +713,18 @@ config TOUCHSCREEN_USB_COMPOSITE
+ To compile this driver as a module, choose M here: the
+ module will be called usbtouchscreen.
+
+-config TOUCHSCREEN_MC13783
+- tristate "Freescale MC13783 touchscreen input driver"
++config TOUCHSCREEN_MC13XXX
++ tristate "Freescale MC13XXX touchscreen input driver"
+ depends on MFD_MC13XXX
++ select SYSFS
+ help
+- Say Y here if you have an Freescale MC13783 PMIC on your
++ Say Y here if you have an Freescale MC13XXX PMIC on your
+ board and want to use its touchscreen
+
+ If unsure, say N.
+
+ To compile this driver as a module, choose M here: the
+- module will be called mc13783_ts.
++ module will be called mc13xxx_ts.
+
+ config TOUCHSCREEN_USB_EGALAX
+ default y
+Index: linux-3.16/Documentation/devicetree/bindings/mfd/mc13xxx.txt
+===================================================================
+--- linux-3.16.orig/Documentation/devicetree/bindings/mfd/mc13xxx.txt
++++ linux-3.16/Documentation/devicetree/bindings/mfd/mc13xxx.txt
+@@ -24,6 +24,10 @@ Sub-nodes:
+ Documentation/devicetree/bindings/leds/common.txt.
+ - regulators : Contain the regulator nodes. The regulators are bound using
+ their names as listed below with their registers and bits for enabling.
++- touchscreen : Contain the touchscreen node.
++ - ato : Delay between Touchscreen polarization and ADC Conversion.
++ It goes from 1 to 256 times the 32 kHz equivalent time base.
++ - atox : If present, use the ATO delay for each conversion.
+
+ MC13783 LED IDs:
+ 0 : Main display
+@@ -139,6 +143,11 @@ ecspi@70010000 { /* ECSPI1 */
+ };
+ };
+
++ touchscreen {
++ ato = <128>;
++ atox;
++ };
++
+ regulators {
+ sw1_reg: mc13892__sw1 {
+ regulator-min-microvolt = <600000>;
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-08-08 11:07:07
|
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 98ff779657e244d570fd8cf77ad3c03e0a3cdd70 (commit)
from bb584aa76e09ab8b0f2ecf4109790017e21e00be (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 98ff779657e244d570fd8cf77ad3c03e0a3cdd70
Author: Julien Boibessot <jul...@ar...>
Date: Fri Aug 8 13:06:32 2014 +0200
[LINUX] APF6 (3.10-legacy): Add support for HDMI, USB, SD & ETH to device tree files
-----------------------------------------------------------------------
Summary of changes:
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 123 +++++++++++++++-----
1 files changed, 96 insertions(+), 27 deletions(-)
diff --git a/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index a08603e..7f755f6 100644
--- a/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,7 +1,7 @@
-Index: linux-3.10.18/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/arch/arm/boot/dts/imx6q-apf6dev.dts 2014-02-17 11:22:26.647139601 +0100
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dts 2014-08-08 11:51:35.269075208 +0200
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -33,10 +33,10 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6q-apf6dev.dts
+ status = "okay";
+};
+*/
-Index: linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6.dtsi 2014-02-17 11:42:29.341103441 +0100
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6.dtsi 2014-08-08 11:51:35.269075208 +0200
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -94,11 +94,11 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ //non-removable;
+ status = "okay";
+};
-Index: linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi 2014-02-17 11:45:51.374105275 +0100
-@@ -0,0 +1,138 @@
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi 2014-08-08 11:51:35.273075229 +0200
+@@ -0,0 +1,182 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -111,6 +111,10 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ */
+
+/ {
++ aliases {
++ mxcfb0 = &mxcfb1;
++ };
++
+ regulators {
+ compatible = "simple-bus";
+
@@ -129,6 +133,14 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
++
++ reg_usb_otg_vbus: usb_otg_vbus {
++ compatible = "regulator-fixed";
++ regulator-name = "usb_otg_vbus";
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ regulator-always-on;
++ };
+ };
+
+ leds {
@@ -151,14 +163,43 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ linux,code = <100>;
+ };
+ };
++
++ mxcfb1: fb@0 {
++ compatible = "fsl,mxc_sdc_fb";
++ disp_dev = "hdmi";
++ interface_pix_fmt = "RGB24";
++ mode_str ="1920x1080M@60";
++ default_bpp = <24>;
++ int_clk = <0>;
++ late_init = <0>;
++ status = "okay";
++ };
+};
+
-+/*
-+&hdmi {
-+ ddc = <&i2c1>;
++&hdmi_core {
++ ipu_id = <0>;
++ disp_id = <0>;
+ status = "okay";
+};
-+*/
++
++&hdmi_video {
++ fsl,phy_reg_vlev = <0x0294>;
++ fsl,phy_reg_cksymtx = <0x800d>;
++ status = "okay";
++};
++
++&i2c3 {
++ clock-frequency = <100000>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c3_1>;
++ status = "okay";
++
++ hdmi: edid@50 {
++ compatible = "fsl,imx6-hdmi-i2c";
++ reg = <0x50>;
++ };
++};
++
+/*
+&i2c1 {
+ clock-frequency = <100000>;
@@ -174,12 +215,15 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ status = "okay";
+};
+*/
++
+&fec {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet_1>;
++ pinctrl-0 = <&pinctrl_enet_3>;
+ phy-mode = "rgmii";
++ phy-reset-gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+};
++
+/*
+&pcie {
+ reset-gpio = <&gpio6 2 0>;
@@ -218,29 +262,29 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ status = "okay";
+};
+
-+/*
+&usbotg {
++ vbus-supply = <®_usb_otg_vbus>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usbotg_1>;
+ disable-over-current;
-+ dr_mode = "otg";
++ dr_mode = "peripheral";
+ status = "okay";
+};
-+*/
+
+/* microSD */
-+/*
+&usdhc2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usdhc2_2>;
++ bus-width = <4>;
++ vmmc-supply = <®_3p3v>;
+ cd-gpios = <&gpio1 2 0>;
+ status = "okay";
+};
-+*/
-Index: linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6dev.dts
++
+Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6dev.dts 2014-02-17 10:58:09.335913198 +0100
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dts 2014-08-08 11:51:35.273075229 +0200
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -266,10 +310,10 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6dev.dts
+ reg = <0x10000000 0x40000000>;
+ };
+};
-Index: linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6.dtsi
+Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6.dtsi
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6.dtsi 2014-02-17 10:57:17.391655619 +0100
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6.dtsi 2014-08-08 11:51:35.273075229 +0200
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -305,10 +349,10 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6.dtsi
+ };
+ };
+};
-Index: linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6dev.dtsi
+Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dtsi
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6dev.dtsi 2014-02-17 11:00:14.108531917 +0100
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dtsi 2014-08-08 11:51:35.273075229 +0200
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -353,10 +397,10 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6dev.dtsi
+ };
+ };
+};
-Index: linux-3.10.18/arch/arm/boot/dts/imx6q-apf6.dtsi
+Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6.dtsi
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/arch/arm/boot/dts/imx6q-apf6.dtsi 2014-02-17 11:25:55.484175170 +0100
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6.dtsi 2014-08-08 11:51:35.273075229 +0200
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -392,10 +436,10 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6q-apf6.dtsi
+ };
+ };
+};
-Index: linux-3.10.18/arch/arm/boot/dts/imx6q-apf6dev.dtsi
+Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dtsi
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/arch/arm/boot/dts/imx6q-apf6dev.dtsi 2014-02-17 11:33:41.270484892 +0100
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dtsi 2014-08-08 11:51:35.273075229 +0200
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -440,3 +484,28 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6q-apf6dev.dtsi
+ };
+ };
+};
+Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl.dtsi
+===================================================================
+--- linux-wandboard_imx_3.10.17_1.0.0_ga.orig/arch/arm/boot/dts/imx6qdl.dtsi 2014-07-11 21:53:12.000000000 +0200
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl.dtsi 2014-08-08 12:42:33.948242320 +0200
+@@ -1166,6 +1166,7 @@
+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
+ MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x1b0b0
++ MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x80000000
+ >;
+ };
+ };
+@@ -1354,6 +1355,12 @@
+ MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
+ >;
+ };
++ pinctrl_i2c3_5: i2c3grp-5 {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_5__I2C3_SCL 0x4001b8b1
++ MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
++ >;
++ };
+ };
+
+ ipu1 {
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-08-08 09:33:47
|
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 bb584aa76e09ab8b0f2ecf4109790017e21e00be (commit)
via a3ade9ce925641c709b1a09c9c9ecb7e8f671cdb (commit)
from f3e411c91b0874c95775d2c3daa1b758e0b63a19 (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 bb584aa76e09ab8b0f2ecf4109790017e21e00be
Author: Julien Boibessot <jul...@ar...>
Date: Fri Aug 8 11:28:35 2014 +0200
[LINUX] 3.10-legacy: Add APF6 Ethernet PHY driver to default configuration
commit a3ade9ce925641c709b1a09c9c9ecb7e8f671cdb
Author: Julien Boibessot <jul...@ar...>
Date: Fri Aug 8 11:26:24 2014 +0200
[BUILDROOT] APF6 (legacy): Add Vivante GPU SDK to default config
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6legacy_defconfig | 1 +
.../armadeus/apf6/apf6legacy-linux-3.10.config | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/buildroot/configs/apf6legacy_defconfig b/buildroot/configs/apf6legacy_defconfig
index 2961bc3..f4eec56 100644
--- a/buildroot/configs/apf6legacy_defconfig
+++ b/buildroot/configs/apf6legacy_defconfig
@@ -52,6 +52,7 @@ BR2_PACKAGE_EVTEST=y
BR2_PACKAGE_IMX_LIB=y
BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q=y
BR2_PACKAGE_GPU_VIV_BIN_MX6Q=y
+BR2_PACKAGE_VIVANTE_GPU_SDK=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_TI_UTILS=y
diff --git a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
index 121578b..b27c252 100644
--- a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
+++ b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
@@ -126,6 +126,7 @@ CONFIG_SMC91X=y
CONFIG_SMC911X=y
CONFIG_SMSC911X=y
# CONFIG_NET_VENDOR_STMICRO is not set
+CONFIG_AT803X_PHY=y
# CONFIG_WLAN is not set
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_EVDEV=y
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-08-07 10:31:29
|
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 f3e411c91b0874c95775d2c3daa1b758e0b63a19 (commit)
from 058bedcc83b9eba0a32ccb41e42578caab0caadc (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 f3e411c91b0874c95775d2c3daa1b758e0b63a19
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Aug 7 11:45:06 2014 +0200
[LINUX] 3.16: enable IPUv3 driver
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf6/apf6-linux-3.16.config | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.16.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.16.config
index 414af30..8b44abe 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-3.16.config
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-3.16.config
@@ -161,6 +161,7 @@ CONFIG_VIDEO_CODA=y
# CONFIG_DVB_TUNER_DIB0070 is not set
# CONFIG_DVB_TUNER_DIB0090 is not set
# CONFIG_VGA_ARB is not set
+CONFIG_IMX_IPUV3_CORE=y
CONFIG_DRM=y
CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_MX3 is not set
@@ -224,7 +225,6 @@ CONFIG_DRM_IMX=y
CONFIG_DRM_IMX_FB_HELPER=y
CONFIG_DRM_IMX_PARALLEL_DISPLAY=y
CONFIG_DRM_IMX_LDB=y
-CONFIG_DRM_IMX_IPUV3_CORE=y
CONFIG_DRM_IMX_IPUV3=y
CONFIG_DRM_IMX_HDMI=y
# CONFIG_IOMMU_SUPPORT is not set
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-08-04 19:34:43
|
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 058bedcc83b9eba0a32ccb41e42578caab0caadc (commit)
via 52a8d5ce291712deea25c6e0d75fc7733e08429b (commit)
via d7141b29b575f008fb609fb0cfa1001f38ec6609 (commit)
via 47cd0dfed7055dccb8273983a5d1a6bb6bb5005c (commit)
from cf8fe1137d381675f05da2ab640945d43671cb80 (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 058bedcc83b9eba0a32ccb41e42578caab0caadc
Author: Philippe Reynes <tr...@ya...>
Date: Sat Aug 2 17:20:17 2014 +0200
[LINUX] 3.12: move to 3.12.26
commit 52a8d5ce291712deea25c6e0d75fc7733e08429b
Author: Philippe Reynes <tr...@ya...>
Date: Fri Aug 1 21:43:39 2014 +0200
[LINUX] 3.15: move to 3.15.8
commit d7141b29b575f008fb609fb0cfa1001f38ec6609
Author: Philippe Reynes <tr...@ya...>
Date: Fri Aug 1 21:43:38 2014 +0200
[LINUX] 3.14: move to 3.14.15
commit 47cd0dfed7055dccb8273983a5d1a6bb6bb5005c
Author: Philippe Reynes <tr...@ya...>
Date: Fri Aug 1 21:43:37 2014 +0200
[LINUX] 3.10: move to 3.10.51
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...x-3.10.50.config => apf27-linux-3.10.51.config} | 0
...x-3.12.25.config => apf27-linux-3.12.26.config} | 0
...x-3.14.14.config => apf27-linux-3.14.15.config} | 0
...nux-3.15.7.config => apf27-linux-3.15.8.config} | 0
...x-3.10.50.config => apf28-linux-3.10.51.config} | 0
...x-3.12.25.config => apf28-linux-3.12.26.config} | 0
...x-3.14.14.config => apf28-linux-3.14.15.config} | 0
...nux-3.15.7.config => apf28-linux-3.15.8.config} | 0
...x-3.10.50.config => apf51-linux-3.10.51.config} | 0
...x-3.12.25.config => apf51-linux-3.12.26.config} | 0
...x-3.14.14.config => apf51-linux-3.14.15.config} | 0
...nux-3.15.7.config => apf51-linux-3.15.8.config} | 0
patches/linux/{3.10.50 => 3.10.51} | 0
patches/linux/{3.12.25 => 3.12.26} | 0
patches/linux/{3.14.14 => 3.14.15} | 0
patches/linux/{3.15.7 => 3.15.8} | 0
19 files changed, 6 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.50.config => apf27-linux-3.10.51.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.12.25.config => apf27-linux-3.12.26.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.14.14.config => apf27-linux-3.14.15.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.15.7.config => apf27-linux-3.15.8.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.50.config => apf28-linux-3.10.51.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.12.25.config => apf28-linux-3.12.26.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.14.config => apf28-linux-3.14.15.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.15.7.config => apf28-linux-3.15.8.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.50.config => apf51-linux-3.10.51.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.12.25.config => apf51-linux-3.12.26.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.14.14.config => apf51-linux-3.14.15.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.15.7.config => apf51-linux-3.15.8.config} (100%)
rename patches/linux/{3.10.50 => 3.10.51} (100%)
rename patches/linux/{3.12.25 => 3.12.26} (100%)
rename patches/linux/{3.14.14 => 3.14.15} (100%)
rename patches/linux/{3.15.7 => 3.15.8} (100%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 06dc983..1e89268 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.15.7"
+BR2_DEFAULT_KERNEL_VERSION="3.15.8"
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.15.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.8"
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 7b16b3f..0b3d836 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.15.7"
+BR2_DEFAULT_KERNEL_VERSION="3.15.8"
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.15.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.8"
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 3f70028..9190a59 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.15.7"
+BR2_DEFAULT_KERNEL_VERSION="3.15.8"
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.15.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.8"
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.50.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.51.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.50.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.51.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.25.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.26.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.12.25.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.12.26.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.14.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.15.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.14.14.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.14.15.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.7.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.8.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.15.7.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.15.8.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.50.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.51.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.50.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.51.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.25.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.26.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.12.25.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.12.26.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.14.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.15.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.14.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.14.15.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.15.7.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.15.8.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.15.7.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.15.8.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.50.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.51.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.50.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.51.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.25.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.26.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.12.25.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.12.26.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.14.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.15.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.14.14.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.14.15.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.15.7.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.15.8.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.15.7.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.15.8.config
diff --git a/patches/linux/3.10.50 b/patches/linux/3.10.51
similarity index 100%
rename from patches/linux/3.10.50
rename to patches/linux/3.10.51
diff --git a/patches/linux/3.12.25 b/patches/linux/3.12.26
similarity index 100%
rename from patches/linux/3.12.25
rename to patches/linux/3.12.26
diff --git a/patches/linux/3.14.14 b/patches/linux/3.14.15
similarity index 100%
rename from patches/linux/3.14.14
rename to patches/linux/3.14.15
diff --git a/patches/linux/3.15.7 b/patches/linux/3.15.8
similarity index 100%
rename from patches/linux/3.15.7
rename to patches/linux/3.15.8
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-08-04 11:59:56
|
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 cf8fe1137d381675f05da2ab640945d43671cb80 (commit)
from 2025aaa99bb3022bd60f5b239580f23c25c2f7fe (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 cf8fe1137d381675f05da2ab640945d43671cb80
Author: Julien Boibessot <jul...@ar...>
Date: Mon Aug 4 13:59:14 2014 +0200
[BUILDROOT] APF6: add gpu-vivante-sdk package (examples only tested with framebuffer backend)
-----------------------------------------------------------------------
Summary of changes:
.../015-armadeus-gpu-vivante-sdk-new-package.patch | 133 ++++++++++++++++++++
patches/buildroot/2013.11/cleanup_buildroot.sh | 1 +
2 files changed, 134 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2013.11/015-armadeus-gpu-vivante-sdk-new-package.patch
diff --git a/patches/buildroot/2013.11/015-armadeus-gpu-vivante-sdk-new-package.patch b/patches/buildroot/2013.11/015-armadeus-gpu-vivante-sdk-new-package.patch
new file mode 100644
index 0000000..1209b52
--- /dev/null
+++ b/patches/buildroot/2013.11/015-armadeus-gpu-vivante-sdk-new-package.patch
@@ -0,0 +1,133 @@
+X11 stuff hasn't been tested yet, only fb is validated.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/freescale-imx/vivante-gpu-sdk/vivante-gpu-sdk.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/freescale-imx/vivante-gpu-sdk/vivante-gpu-sdk.mk 2014-08-03 19:49:06.142801660 +0200
+@@ -0,0 +1,99 @@
++################################################################################
++#
++# vivante-gpu-sdk
++#
++################################################################################
++
++VIVANTE_GPU_SDK_VERSION = 1.00
++VIVANTE_GPU_SDK_SITE = $(FREESCALE_IMX_MIRROR_SITE)
++VIVANTE_GPU_SDK_SOURCE = vivante-gpu-sdk-$(VIVANTE_GPU_SDK_VERSION).bin
++VIVANTE_GPU_SDK_LICENSE = Freescale Semiconductor Software License Agreement
++VIVANTE_GPU_SDK_LICENSE += mix of OpenSource licenses
++VIVANTE_GPU_SDK_LICENSE_FILE = COPYING
++
++# The archive is a shell-self-extractor of a bzipped tar. It happens
++# to extract in the correct directory (vivante-gpu-sdk-x.y)
++# The --force makes sure it doesn't fail if the source dir already exists.
++# The --auto-accept skips the license check - not needed for us
++# because we have legal-info.
++define VIVANTE_GPU_SDK_EXTRACT_CMDS
++ (cd $(BUILD_DIR); \
++ sh $(DL_DIR)/$(VIVANTE_GPU_SDK_SOURCE) --force --auto-accept)
++endef
++
++ifeq ($(BR2_PACKAGE_XORG7),y)
++VIVANTE_GPU_SDK_MAKEFILE = Makefile.x11
++else
++VIVANTE_GPU_SDK_MAKEFILE = Makefile.fbdev
++endif
++
++# Examples 18 and 19 are listed in main Makefile but not present in sources
++define VIVANTE_GPU_SDK_BUILD_GLES_V1_1
++ (cd $(@D)/Samples/GLES1.1/; \
++ $(SED) 's/18_VertexBufferObjects//' $(VIVANTE_GPU_SDK_MAKEFILE); \
++ $(SED) 's/19_Beizer//' $(VIVANTE_GPU_SDK_MAKEFILE); \
++ $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" \
++ CFLAGS="$(TARGET_CFLAGS)" \
++ ROOTFS="$(STAGING_DIR)" \
++ -f $(VIVANTE_GPU_SDK_MAKEFILE))
++endef
++
++define VIVANTE_GPU_SDK_BUILD_GLES_V2_0
++ (cd $(@D)/Samples/GLES2.0/; \
++ $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" \
++ CFLAGS="$(TARGET_CFLAGS)" \
++ ROOTFS="$(STAGING_DIR)" \
++ -f $(VIVANTE_GPU_SDK_MAKEFILE))
++endef
++
++# OpenVG examples seem only buildable against framebuffer API
++define VIVANTE_GPU_SDK_BUILD_OPENVG
++ (cd $(@D)/Samples/OpenVG/; \
++ $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" \
++ CFLAGS="$(TARGET_CFLAGS)" \
++ ROOTFS="$(STAGING_DIR)" \
++ -f Makefile.fbdev)
++endef
++
++define VIVANTE_GPU_SDK_BUILD_CMDS
++ $(VIVANTE_GPU_SDK_BUILD_GLES_V1_1)
++ $(VIVANTE_GPU_SDK_BUILD_GLES_V2_0)
++ $(VIVANTE_GPU_SDK_BUILD_OPENVG)
++endef
++
++ifeq ($(BR2_PACKAGE_VIVANTE_GPU_SDK_EXAMPLES),y)
++define VIVANTE_GPU_SDK_INSTALL_EXAMPLES
++ mkdir -p $(TARGET_DIR)/usr/share/examples/
++ cp -r $(@D)/opt/* $(TARGET_DIR)/usr/share/examples/
++endef
++endif
++
++define VIVANTE_GPU_SDK_INSTALL_TARGET_GLES_V1_1
++ (cd $(@D)/Samples/GLES1.1/; \
++ $(MAKE) install \
++ DESTDIR="$(TARGET_DIR)/opt/gpu-sdk-1.1" \
++ -f $(VIVANTE_GPU_SDK_MAKEFILE))
++endef
++
++define VIVANTE_GPU_SDK_INSTALL_TARGET_GLES_V2_0
++ $(VIVANTE_GPU_SDK_INSTALL_EXAMPLES)
++ (cd $(@D)/Samples/GLES2.0/; \
++ $(MAKE) install \
++ DESTDIR="$(TARGET_DIR)/opt/gpu-sdk-2.0" \
++ -f $(VIVANTE_GPU_SDK_MAKEFILE))
++endef
++
++define VIVANTE_GPU_SDK_INSTALL_TARGET_OPENVG
++ (cd $(@D)/Samples/OpenVG/; \
++ $(MAKE) install \
++ DESTDIR="$(TARGET_DIR)/opt/gpu-sdk-openvg" \
++ -f Makefile.fbdev)
++endef
++
++define VIVANTE_GPU_SDK_INSTALL_TARGET_CMDS
++ $(VIVANTE_GPU_SDK_INSTALL_TARGET_GLES_V1_1)
++ $(VIVANTE_GPU_SDK_INSTALL_TARGET_GLES_V2_0)
++ $(VIVANTE_GPU_SDK_INSTALL_TARGET_OPENVG)
++endef
++
++$(eval $(generic-package))
+Index: buildroot/package/freescale-imx/vivante-gpu-sdk/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/freescale-imx/vivante-gpu-sdk/Config.in 2014-08-04 13:30:59.289112813 +0200
+@@ -0,0 +1,9 @@
++config BR2_PACKAGE_VIVANTE_GPU_SDK
++ bool "vivante-gpu-sdk"
++ depends on BR2_PACKAGE_GPU_VIV_BIN_MX6Q
++ help
++ Freescale examples on how to use GLES, OpenCL, and
++ OpenVG libraries for i.MX6 processors.
++
++ These examples are provided by Freescale as-is and doesn't have
++ an upstream.
+Index: buildroot/package/freescale-imx/Config.in
+===================================================================
+--- buildroot.orig/package/freescale-imx/Config.in 2013-11-30 14:16:03.000000000 +0100
++++ buildroot/package/freescale-imx/Config.in 2014-08-04 13:32:41.489619608 +0200
+@@ -4,5 +4,6 @@
+ source "package/freescale-imx/imx-lib/Config.in"
+ source "package/freescale-imx/firmware-imx/Config.in"
+ source "package/freescale-imx/gpu-viv-bin-mx6q/Config.in"
++source "package/freescale-imx/vivante-gpu-sdk/Config.in"
+
+ endmenu
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index cafd94c..e7787ea 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -91,3 +91,4 @@ rm -rf buildroot/package/tk/
rm -rf buildroot/package/libhid/
rm -rf buildroot/package/shiboken/
rm -rf buildroot/package/python-wx/
+rm -rf buildroot/package/freescale-imx/vivante-gpu-sdk/
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-08-01 18:42:42
|
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 2025aaa99bb3022bd60f5b239580f23c25c2f7fe (commit)
from 3f0d330b022ab07f2e102e66008ac4a4a314987c (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 2025aaa99bb3022bd60f5b239580f23c25c2f7fe
Author: Julien Boibessot <jul...@ar...>
Date: Fri Aug 1 20:39:19 2014 +0200
[BUILDROOT] 2013.11: Add package to (try to) build python-wx
-----------------------------------------------------------------------
Summary of changes:
.../014-armadeus-python-wx-add-package.patch | 115 ++++++++++++++++++++
patches/buildroot/2013.11/cleanup_buildroot.sh | 1 +
2 files changed, 116 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2013.11/014-armadeus-python-wx-add-package.patch
diff --git a/patches/buildroot/2013.11/014-armadeus-python-wx-add-package.patch b/patches/buildroot/2013.11/014-armadeus-python-wx-add-package.patch
new file mode 100644
index 0000000..b074df8
--- /dev/null
+++ b/patches/buildroot/2013.11/014-armadeus-python-wx-add-package.patch
@@ -0,0 +1,115 @@
+Author: Edouard Tisserant
+Slightly modified by JB
+
+Index: buildroot/package/python-wx/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/python-wx/Config.in 2014-07-31 12:17:09.911327367 +0200
+@@ -0,0 +1,14 @@
++config BR2_PACKAGE_PYTHON_WX
++ bool "wxPython"
++ depends on BR2_PACKAGE_PYTHON
++ depends on BR2_PACKAGE_LIBGTK2
++
++ help
++ The wxPython module is a blending of the wxWidgets C++ class library
++ with the Python programming language.
++ By default GTK backend is used (requires X.org).
++
++ http://wxpython.org/
++
++comment "wxPython needs python, GTK"
++ depends on !BR2_PACKAGE_PYTHON || !BR2_PACKAGE_LIBGTK2
+Index: buildroot/package/python-wx/python-wx.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/python-wx/python-wx.mk 2014-08-01 20:33:43.245320800 +0200
+@@ -0,0 +1,59 @@
++################################################################################
++#
++# python-wx
++#
++################################################################################
++
++# 2.8 is the most used version (BR will prefer latest one)
++PYTHON_WX_VERSION = 2.8.12.1
++PYTHON_WX_SOURCE = wxPython-src-$(PYTHON_WX_VERSION).tar.bz2
++PYTHON_WX_SITE = http://downloads.sourceforge.net/project/wxpython/wxPython/$(PYTHON_WX_VERSION)
++PYTHON_WX_LICENSE = LGPL
++PYTHON_WX_LICENSE_FILES = docs/licence.txt
++PYTHON_WX_INSTALL_STAGING = YES
++PYTHON_WX_DEPENDENCIES = python libgtk2
++# Why ? ->
++PYTHON_WX_CONF_OPT = --enable-monolithic
++
++# Autotools are used to build wxGTK embedded in wxPython sources, and then we use
++# HOOKS to install Python wrappers.
++# However wxWidget/GTK has a lot of configure options not proposed here...
++
++define PYTHON_WX_PYSETUP
++ (cd $(@D)/wxPython; \
++ CC="$(TARGET_CC)" \
++ CFLAGS="$(TARGET_CFLAGS)" \
++ LDSHARED="$(TARGET_CROSS)gcc -shared" \
++ CROSS_COMPILING=yes \
++ _python_sysroot=$(STAGING_DIR) \
++ _python_srcdir=$(BUILD_DIR)/python$(PYTHON_VERSION) \
++ _python_prefix=/usr \
++ _python_exec_prefix=/usr \
++ $(HOST_DIR)/usr/bin/python setup.py build \
++ WX_CONFIG="$(STAGING_DIR)/usr/bin/wx-config \
++ --prefix=$(STAGING_DIR)/usr" \
++ BUILD_GLCANVAS=0 \
++ BUILD_STC=0 \
++ BUILD_GIZMOS=0 \
++ )
++endef
++PYTHON_WX_POST_INSTALL_STAGING_HOOKS += PYTHON_WX_PYSETUP
++
++# Useful ? ->
++define PYTHON_WX_PYTHON_WRAPPER_STAGING_INSTALL
++ (cd $(@D)/wxPython; \
++ $(HOST_DIR)/usr/bin/python setup.py install \
++ --prefix=$(STAGING_DIR)/usr)
++endef
++
++PYTHON_WX_POST_INSTALL_STAGING_HOOKS += PYTHON_WX_PYTHON_WRAPPER_STAGING_INSTALL
++
++define PYTHON_WX_PYTHON_WRAPPER_TARGET_INSTALL
++ (cd $(@D)/wxPython; \
++ $(HOST_DIR)/usr/bin/python setup.py install \
++ --prefix=$(TARGET_DIR)/usr)
++endef
++
++PYTHON_WX_POST_INSTALL_TARGET_HOOKS += PYTHON_WX_PYTHON_WRAPPER_TARGET_INSTALL
++
++$(eval $(autotools-package))
+Index: buildroot/package/python-wx/python-wx-001-fix_wxconfig.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/python-wx/python-wx-001-fix_wxconfig.patch 2014-07-31 12:26:52.102214295 +0200
+@@ -0,0 +1,12 @@
++diff -purN python-wxgtk-2.8.12.1.orig/Makefile.in python-wxgtk-2.8.12.1/Makefile.in
++--- python-wxgtk-2.8.12.1.orig/Makefile.in 2011-03-28 21:48:29.000000000 +0200
+++++ python-wxgtk-2.8.12.1/Makefile.in 2014-07-25 22:45:27.710057682 +0200
++@@ -12455,7 +12455,7 @@ install-wxconfig:
++ $(INSTALL_DIR) $(DESTDIR)$(bindir)
++ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
++ $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
++- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+++ (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(CP_P) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++
++ locale_install:
++ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2014-07-31 11:16:22.805242344 +0200
++++ buildroot/package/Config.in 2014-07-31 12:28:38.678742781 +0200
+@@ -230,6 +230,7 @@
+ source "package/qwt/Config.in"
+ endif
+
++source "package/python-wx/Config.in"
+ source "package/qt5/Config.in"
+ source "package/x11r7/Config.in"
+ source "package/weston/Config.in"
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index b30ebe6..cafd94c 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -90,3 +90,4 @@ rm -rf buildroot/package/sam7-pgm-ng/
rm -rf buildroot/package/tk/
rm -rf buildroot/package/libhid/
rm -rf buildroot/package/shiboken/
+rm -rf buildroot/package/python-wx/
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-07-31 09:03:24
|
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 3f0d330b022ab07f2e102e66008ac4a4a314987c (commit)
via 2ae1cc8d60fbdd9d03876c4e71bbf3af08b5eaad (commit)
via abd894da9d2acce46f54320ac865625efe22f81c (commit)
via 7b76695745f06012d24b68540447e3985ab29e1b (commit)
from 785ae69a541b32bfeafd3eb977a1334920cd0170 (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 3f0d330b022ab07f2e102e66008ac4a4a314987c
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 31 11:01:40 2014 +0200
[BUILDROOT] Add some more packages/drivers to apf6legacy config
commit 2ae1cc8d60fbdd9d03876c4e71bbf3af08b5eaad
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jul 30 16:50:44 2014 +0200
[BUILDROOT] APF6: add a config to build legacy (Freescale) kernel
commit abd894da9d2acce46f54320ac865625efe22f81c
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jul 30 16:38:43 2014 +0200
[BUILD] use BR2_LINUX_KERNEL_PATCH (when defined) in Armadeus envt variables
commit 7b76695745f06012d24b68540447e3985ab29e1b
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jul 30 16:36:56 2014 +0200
[TOOLS] quiltify: use --rebase when pulling from git
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 4 +
.../{apf6_defconfig => apf6legacy_defconfig} | 24 ++-
...ux-3.14.config => apf6legacy-linux-3.10.config} | 188 ++++++++++++-------
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 56 +++---
scripts/quiltify.sh | 2 +-
5 files changed, 169 insertions(+), 105 deletions(-)
copy buildroot/configs/{apf6_defconfig => apf6legacy_defconfig} (76%)
copy buildroot/target/device/armadeus/apf6/{apf6-linux-3.14.config => apf6legacy-linux-3.10.config} (65%)
copy patches/linux/{3.10 => 3.10.mx6_legacy}/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch (87%)
diff --git a/Makefile.in b/Makefile.in
index bc67917..2dc76fc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -82,7 +82,11 @@ ARMADEUS_ROOTFS_DIR:=$(BUILDROOT_OUTPUT_DIR)/target
ARMADEUS_ROOTFS_TAR:=$(ARMADEUS_BINARIES)/$(ARMADEUS_BOARD_NAME)-rootfs.tar
ARMADEUS_LINUX_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/linux-$(ARMADEUS_LINUX_VERSION)
+ifneq ($(BR2_LINUX_KERNEL_PATCH),)
+ARMADEUS_LINUX_PATCH_DIR:=$(BUILDROOT_DIR)/$(BR2_LINUX_KERNEL_PATCH)
+else
ARMADEUS_LINUX_PATCH_DIR:=$(ARMADEUS_PATCH_DIR)/linux/$(ARMADEUS_LINUX_VERSION)
+endif
ARMADEUS_U_BOOT_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/uboot-$(ARMADEUS_U_BOOT_VERSION)
ARMADEUS_UCLIBC_DIR:=$(BUILDROOT_TOOLCHAIN_BUILD_DIR)/uClibc-$(ARMADEUS_UCLIBC_VERSION)
ARMADEUS_BOARD_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6legacy_defconfig
similarity index 76%
copy from buildroot/configs/apf6_defconfig
copy to buildroot/configs/apf6legacy_defconfig
index b0d013d..2961bc3 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6legacy_defconfig
@@ -1,3 +1,4 @@
+# To build APF6 BSP with Freescale's kernel/libs
BR2_arm=y
BR2_cortex_a9=y
BR2_ARM_EABIHF=y
@@ -7,7 +8,6 @@ BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_TOOLCHAIN_EXTERNAL=y
-BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201311=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_TARGET_GENERIC_HOSTNAME="apf6"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
@@ -21,20 +21,25 @@ BR2_CPU_NAME="imx6"
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.16-rc7"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/wandboard-org/linux.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="wandboard_imx_3.10.17_1.0.0_ga"
+BR2_LINUX_KERNEL_PATCH="../patches/linux/3.10.mx6_legacy"
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_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/apf6legacy-linux-3.10.config"
BR2_LINUX_KERNEL_ZIMAGE=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6dev imx6dl-apf6dev"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6dev imx6dl-apf6dev imx6q-wandboard imx6dl-wandboard"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
+BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
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_GDB=y
+BR2_PACKAGE_LTRACE=y
+BR2_PACKAGE_RAMSMP=y
+BR2_PACKAGE_STRACE=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FBV=y
@@ -44,11 +49,15 @@ BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y
BR2_PACKAGE_EVTEST=y
+BR2_PACKAGE_IMX_LIB=y
+BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q=y
+BR2_PACKAGE_GPU_VIV_BIN_MX6Q=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_TI_UTILS=y
BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_BLUEZ_UTILS=y
+BR2_PACKAGE_CAN_UTILS=y
BR2_PACKAGE_DROPBEAR=y
BR2_PACKAGE_IW=y
BR2_PACKAGE_WIRELESS_TOOLS=y
@@ -57,6 +66,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_UTIL_LINUX_FSCK=y
+BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_UBOOT=y
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.config b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
similarity index 65%
copy from buildroot/target/device/armadeus/apf6/apf6-linux-3.14.config
copy to buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
index 5c39d1f..121578b 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.config
+++ b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
@@ -7,7 +7,7 @@ CONFIG_LOG_BUF_SHIFT=18
CONFIG_CGROUPS=y
CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
-CONFIG_EXPERT=y
+CONFIG_EMBEDDED=y
CONFIG_PERF_EVENTS=y
# CONFIG_SLUB_DEBUG is not set
# CONFIG_COMPAT_BRK is not set
@@ -16,22 +16,26 @@ 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_MXC_DEBUG_BOARD=y
-# CONFIG_MACH_MX31ADS is not set
-# CONFIG_MACH_BUG is not set
-CONFIG_MACH_IMX51_DT=y
-CONFIG_SOC_IMX53=y
CONFIG_SOC_IMX6Q=y
CONFIG_SOC_IMX6SL=y
-CONFIG_PCI=y
-CONFIG_PCI_IMX6=y
+CONFIG_WAND_RFKILL=y
CONFIG_SMP=y
CONFIG_VMSPLIT_2G=y
-CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_PREEMPT=y
CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE="noinitrd console=ttymxc3,115200"
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
+CONFIG_ARM_IMX6_CPUFREQ=y
+CONFIG_CPU_IDLE=y
CONFIG_VFP=y
CONFIG_NEON=y
CONFIG_BINFMT_MISC=m
@@ -50,29 +54,46 @@ CONFIG_IP_PNP_DHCP=y
# CONFIG_INET_LRO is not set
CONFIG_IPV6=y
CONFIG_NETFILTER=y
-CONFIG_CAN=m
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_SLCAN=m
-CONFIG_CAN_FLEXCAN=m
-CONFIG_BT=m
+CONFIG_VLAN_8021Q=y
+CONFIG_CAN=y
+CONFIG_CAN_FLEXCAN=y
+CONFIG_BT=y
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=m
-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_INPUT=y
+CONFIG_RFKILL_GPIO=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set
+CONFIG_CMA=y
+CONFIG_CMA_SIZE_MBYTES=256
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_PROC_DEVICETREE=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
@@ -105,11 +126,7 @@ CONFIG_SMC91X=y
CONFIG_SMC911X=y
CONFIG_SMSC911X=y
# CONFIG_NET_VENDOR_STMICRO is not set
-CONFIG_AT803X_PHY=y
-# CONFIG_RTL_CARDS is not set
-CONFIG_WL_TI=y
-CONFIG_WL12XX=m
-CONFIG_WLCORE_SDIO=m
+# CONFIG_WLAN is not set
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_EVBUG=m
@@ -118,20 +135,23 @@ CONFIG_KEYBOARD_IMX=y
CONFIG_MOUSE_PS2=m
CONFIG_MOUSE_PS2_ELANTECH=y
CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_SX8674=m
+CONFIG_TOUCHSCREEN_MC13783=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_MMA8450=y
CONFIG_SERIO_SERPORT=m
+CONFIG_VT_HW_CONSOLE_BINDING=y
# 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 is not set
+CONFIG_FSL_OTP=y
+CONFIG_I2C=y
# CONFIG_I2C_COMPAT is not set
CONFIG_I2C_CHARDEV=y
# CONFIG_I2C_HELPER_AUTO is not set
+CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_ALGOPCF=m
CONFIG_I2C_ALGOPCA=m
CONFIG_I2C_IMX=y
@@ -140,46 +160,57 @@ CONFIG_SPI_IMX=y
CONFIG_GPIO_SYSFS=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
CONFIG_MFD_MC13XXX_I2C=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_ANATOP=y
CONFIG_REGULATOR_DA9052=y
+CONFIG_REGULATOR_ANATOP=y
CONFIG_REGULATOR_MC13783=y
CONFIG_REGULATOR_MC13892=y
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_VIDEO_V4L2_INT_DEVICE=y
+CONFIG_MEDIA_USB_SUPPORT=y
+CONFIG_USB_VIDEO_CLASS=m
CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_MXC_OUTPUT=y
+CONFIG_VIDEO_MXC_CAPTURE=m
+CONFIG_VIDEO_MXC_CSI_CAMERA=m
+CONFIG_MXC_CAMERA_OV5640=m
+CONFIG_MXC_CAMERA_OV5642=m
+CONFIG_MXC_CAMERA_OV5640_MIPI=m
+CONFIG_MXC_TVIN_ADV7180=m
+CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m
+CONFIG_VIDEO_MXC_IPU_OUTPUT=y
+CONFIG_VIDEO_MXC_PXP_V4L2=y
CONFIG_SOC_CAMERA=y
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_CODA=y
-# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
-# CONFIG_DVB_AU8522_V4L is not set
-# CONFIG_DVB_TUNER_DIB0070 is not set
-# CONFIG_DVB_TUNER_DIB0090 is not set
-# CONFIG_VGA_ARB is not set
-CONFIG_DRM=y
-CONFIG_FB_MODE_HELPERS=y
+CONFIG_VIDEO_MX3=y
+CONFIG_SOC_CAMERA_OV2640=y
+CONFIG_FB=y
# CONFIG_FB_MX3 is not set
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_GENERIC is not set
CONFIG_BACKLIGHT_PWM=y
-CONFIG_BACKLIGHT_GPIO=y
+CONFIG_FB_MXC_SYNC_PANEL=y
+CONFIG_FB_MXC_HDMI=y
CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
CONFIG_LOGO=y
CONFIG_SOUND=y
CONFIG_SND=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_PCM_OSS=y
# CONFIG_SND_DRIVERS is not set
-# CONFIG_SND_PCI is not set
# CONFIG_SND_ARM is not set
# CONFIG_SND_SPI is not set
# CONFIG_SND_USB is not set
@@ -187,48 +218,46 @@ CONFIG_SND_SOC=y
CONFIG_SND_IMX_SOC=y
CONFIG_SND_SOC_IMX_SGTL5000=y
CONFIG_SND_SOC_IMX_SPDIF=y
-CONFIG_HID_MULTITOUCH=y
+CONFIG_SND_SOC_IMX_MC13783=y
CONFIG_USB=y
+CONFIG_USB_OTG=y
+# CONFIG_USB_OTG_WHITELIST is not set
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_USB_PHY=y
CONFIG_NOP_USB_XCEIV=y
CONFIG_USB_MXS_PHY=y
CONFIG_USB_GADGET=y
+CONFIG_USB_ZERO=m
CONFIG_USB_ETH=m
CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_G_SERIAL=m
CONFIG_MMC=y
CONFIG_MMC_UNSAFE_RESUME=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MMC_SDHCI_ESDHC_IMX=y
+CONFIG_MXC_IPU=y
+CONFIG_MXC_GPU_VIV=y
+CONFIG_MXC_ASRC=y
+CONFIG_MXC_HDMI_CEC=y
+CONFIG_MXC_MIPI_CSI2=y
+CONFIG_MXC_MLB150=m
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_MCP7940X=m
+CONFIG_RTC_DRV_MC13XXX=y
+CONFIG_RTC_DRV_MXC=y
CONFIG_RTC_DRV_SNVS=y
CONFIG_DMADEVICES=y
+CONFIG_MXC_PXP_V2=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_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
@@ -254,7 +283,7 @@ CONFIG_UDF_FS=m
CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=y
CONFIG_TMPFS=y
-# CONFIG_MISC_FILESYSTEMS is not set
+CONFIG_UBIFS_FS=y
CONFIG_NFS_FS=y
CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
@@ -265,21 +294,42 @@ CONFIG_NLS_ASCII=y
CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_ISO8859_15=m
CONFIG_NLS_UTF8=y
+CONFIG_PRINTK_TIME=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_DEFLATE=y
-CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_USER=y
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_CCM=y
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_LRW=y
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_RMD128=y
+CONFIG_CRYPTO_RMD160=y
+CONFIG_CRYPTO_RMD256=y
+CONFIG_CRYPTO_RMD320=y
+CONFIG_CRYPTO_SHA1_ARM=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_TGR192=y
+CONFIG_CRYPTO_WP512=y
+CONFIG_CRYPTO_AES_ARM=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_CAMELLIA=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_TWOFISH=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y
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/patches/linux/3.10/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
similarity index 87%
copy from patches/linux/3.10/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
copy to patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index 3b3b057..a08603e 100644
--- a/patches/linux/3.10/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -291,16 +291,16 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6.dtsi
+ hog {
+ pinctrl_hog: hoggrp {
+ fsl,pins = <
-+ MX6DL_PAD_SD4_DAT2__GPIO2_IO10 0x80000000 /* WL_IRQ */
++ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x80000000 /* WL_IRQ */
+ >;
+ };
+
+ pinctrl_uart2_3: uart2grp-3 {
+ fsl,pins = <
-+ MX6DL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
-+ MX6DL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1
-+ MX6DL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1
-+ MX6DL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
++ 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
+ >;
+ };
+ };
@@ -330,25 +330,25 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6dev.dtsi
+ hog {
+ pinctrl_hog: hoggrp {
+ fsl,pins = <
-+ MX6DL_PAD_GPIO_9__GPIO1_IO09 0x80000000
-+ MX6DL_PAD_GPIO_17__GPIO7_IO12 0x80000000
-+ MX6DL_PAD_CSI0_DAT16__GPIO6_IO02 0x80000000
++ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000
++ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000
++ MX6QDL_PAD_CSI0_DAT16__GPIO6_IO02 0x80000000
+ >;
+ };
+
+ pinctrl_uart3_3: uart3grp-3 {
+ fsl,pins = <
-+ MX6DL_PAD_EIM_D23__UART3_CTS_B 0x1b0b1
-+ MX6DL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
-+ MX6DL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
-+ MX6DL_PAD_EIM_D31__UART3_RTS_B 0x1b0b1
++ MX6QDL_PAD_EIM_D23__UART3_CTS_B 0x1b0b1
++ MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
++ MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
++ MX6QDL_PAD_EIM_D31__UART3_RTS_B 0x1b0b1
+ >;
+ };
+
+ pinctrl_uart4_2: uart4grp-2 {
+ fsl,pins = <
-+ MX6DL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
-+ MX6DL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
++ MX6QDL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
++ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
+ >;
+ };
+ };
@@ -378,16 +378,16 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6q-apf6.dtsi
+ hog {
+ pinctrl_hog: hoggrp {
+ fsl,pins = <
-+ MX6Q_PAD_SD4_DAT2__GPIO2_IO10 0x80000000 /* WL_IRQ */
++ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x80000000 /* WL_IRQ */
+ >;
+ };
+
+ pinctrl_uart2_3: uart2grp-3 {
+ fsl,pins = <
-+ MX6Q_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
-+ MX6Q_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1
-+ MX6Q_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1
-+ MX6Q_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
++ 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
+ >;
+ };
+ };
@@ -417,25 +417,25 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6q-apf6dev.dtsi
+ hog {
+ pinctrl_hog: hoggrp {
+ fsl,pins = <
-+ MX6Q_PAD_GPIO_9__GPIO1_IO09 0x80000000
-+ MX6Q_PAD_GPIO_17__GPIO7_IO12 0x80000000
-+ MX6Q_PAD_CSI0_DAT16__GPIO6_IO02 0x80000000
++ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000
++ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000
++ MX6QDL_PAD_CSI0_DAT16__GPIO6_IO02 0x80000000
+ >;
+ };
+
+ pinctrl_uart3_3: uart3grp-3 {
+ fsl,pins = <
-+ MX6Q_PAD_EIM_D23__UART3_CTS_B 0x1b0b1
-+ MX6Q_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
-+ MX6Q_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
-+ MX6Q_PAD_EIM_D31__UART3_RTS_B 0x1b0b1
++ MX6QDL_PAD_EIM_D23__UART3_CTS_B 0x1b0b1
++ MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
++ MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
++ MX6QDL_PAD_EIM_D31__UART3_RTS_B 0x1b0b1
+ >;
+ };
+
+ pinctrl_uart4_2: uart4grp-2 {
+ fsl,pins = <
-+ MX6Q_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
-+ MX6Q_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
++ MX6QDL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
++ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
+ >;
+ };
+ };
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 9d4c6bc..5a5ee33 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -118,7 +118,7 @@ echo -e "\nThis script is going to rebuild a quiltified "$QUILT_TARGET_NAME" in
# Update repository
ask_user "Update (pull) your local GIT repository (y/N) ?"
if [ "$answer" == "y" ] || [ "$answer" == "yes" ]; then
- git pull
+ git pull --rebase
fi
# Move or delete current XXX dir
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-07-31 07:07:44
|
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 785ae69a541b32bfeafd3eb977a1334920cd0170 (commit)
from b8a5bc1af163998e46dcb2669993b53461b0ea4d (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 785ae69a541b32bfeafd3eb977a1334920cd0170
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Jul 31 09:10:26 2014 +0200
[BUILDROOT] apf6: move to kernel 3.16-rc7
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index c37563b..b0d013d 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -22,7 +22,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.16-rc5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.16-rc7"
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"
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-07-30 12:57: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 b8a5bc1af163998e46dcb2669993b53461b0ea4d (commit)
from 96e936067fc9493894be91e5fa3f21b1b775b98b (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 b8a5bc1af163998e46dcb2669993b53461b0ea4d
Author: Eric Jarrige <eri...@ar...>
Date: Wed Jul 30 14:56:59 2014 +0200
[LINUX] 3.16: Fix again patch syntax
-----------------------------------------------------------------------
Summary of changes:
.../0401-armadeus-add_apf51dev_baseboard.patch | 1 +
..._star_completion_for_source_in_menuconfig.patch | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/patches/linux/3.16/0401-armadeus-add_apf51dev_baseboard.patch b/patches/linux/3.16/0401-armadeus-add_apf51dev_baseboard.patch
index 7c6ba01..f456c61 100644
--- a/patches/linux/3.16/0401-armadeus-add_apf51dev_baseboard.patch
+++ b/patches/linux/3.16/0401-armadeus-add_apf51dev_baseboard.patch
@@ -88,3 +88,4 @@ Index: linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
+ };
};
};
+
diff --git a/patches/linux/3.16/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/patches/linux/3.16/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
index b5160af..ce666db 100644
--- a/patches/linux/3.16/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
+++ b/patches/linux/3.16/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
@@ -79,3 +79,4 @@ Index: linux-3.12-rc1/scripts/kconfig/zconf.tab.c_shipped
+ }
}
break;
+
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-07-30 11:27:24
|
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 96e936067fc9493894be91e5fa3f21b1b775b98b (commit)
from da10efb9dc9ed0ae7b78315dac272c7ab41fd7ad (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 96e936067fc9493894be91e5fa3f21b1b775b98b
Author: Eric Jarrige <eri...@ar...>
Date: Wed Jul 30 13:27:03 2014 +0200
[LINUX] 3.16: Fix patch syntax
-----------------------------------------------------------------------
Summary of changes:
...15-armadeus-logo-add_armadeus-project_tux.patch | 18 ++--
patches/linux/3.16/0021-armadeus-apf9328.patch | 50 +++++-----
...s-apf9328-add_board_to_linux_build_system.patch | 18 ++--
.../0029-armadeus-add_csi_and_spi_registers.patch | 2 +-
.../3.16/0029b-armadeus-add_csi_registers.patch | 2 +-
...rmadeus-devices-imx1-add_udc_registration.patch | 2 +-
...35-armadeus-re_add_pwm_and_correct_driver.tofix | 42 ++++----
...50-armadeus-add_custom_drivers_to_kconfig.patch | 4 +-
...02_integrate_driver_to_linux_build_system.patch | 6 +-
...chscreen-add_driver_to_linux_build_system.patch | 10 +-
.../0076-Add-tsc210x-device-tree-support.patch | 42 ++++----
...eus-clock_correct_mxc_decode_pll_for_imx1.tofix | 20 ++--
...madeus-clock-imx1_avoid_crash_with_module.tofix | 12 +-
...-tsc210x-device-tree-support-for-apf27dev.patch | 8 +-
...deus-dts-apf27dev-fixes-user-led-polarity.patch | 12 +-
...1-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch | 8 +-
...dts-apf27dev-add_gpio_key_wakeup_behavior.patch | 12 +-
...-armadeus-fixes-vpu-spll-clock-dependency.patch | 2 +-
.../3.16/0400-Add-apf51-basic-dt-support.patch | 22 ++--
.../0401-armadeus-add_apf51dev_baseboard.patch | 70 +++++++-------
...-imx51_dts-add_usbphy_for_host1_and_host2.patch | 35 ++++---
...51-chipidea-usbmisc_imx-add_imx51_support.patch | 26 +++---
...adeus-chipidea-add_node_to_select_clk_phy.patch | 18 ++--
...us-imx51-dts-add-pin-definition-for-uart1.patch | 12 +-
...dts-apf51dev-add_gpio_key_wakeup_behavior.patch | 30 +-----
...ot_link_otg_phy_clock_directly_to_osc_ref.patch | 12 +-
..._star_completion_for_source_in_menuconfig.patch | 20 ++--
...low_to_use_the_wakeupalarm_functionnality.patch | 12 +-
.../3.16/0444-armadeus-imx27-add-usb.patch.tofix | 80 ++++++++--------
...deus-add-apf27-apf27dev-dts-for-USB.patch.tofix | 44 ++++----
.../0446-armadeus_add_pm_power_off_function.patch | 8 +-
...c-core-Update-ext_csd-if-touched-by-ioctl.patch | 58 ++++++------
...6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch | 106 ++++++++++----------
...-remove-pwr_in_suspend-from-platform-data.patch | 48 +++++-----
...-instead-of-enumerations-for-pdata-clocks.patch | 48 +++++-----
...al-device-tree-support-to-the-sdio-module.patch | 50 +++++-----
...-8-wlcore-sdio-add-wilink-clock-providers.patch | 26 +++---
...8-wlcore-sdio-get-clocks-from-device-tree.patch | 61 ++++++------
...heck-if-we-got-correct-clock-data-from-DT.patch | 104 ++++++++++----------
...04-armadeus-add_sx8674_touchscreen_driver.patch | 10 +-
.../0505-armadeus-add_mcp7940x_rtc_driver.patch | 8 +-
41 files changed, 581 insertions(+), 597 deletions(-)
diff --git a/patches/linux/3.16/0015-armadeus-logo-add_armadeus-project_tux.patch b/patches/linux/3.16/0015-armadeus-logo-add_armadeus-project_tux.patch
index 744c0e0..053b7b8 100644
--- a/patches/linux/3.16/0015-armadeus-logo-add_armadeus-project_tux.patch
+++ b/patches/linux/3.16/0015-armadeus-logo-add_armadeus-project_tux.patch
@@ -3,9 +3,9 @@ Index: linux-2.6.36/drivers/video/logo/Kconfig
--- linux-2.6.36.orig/drivers/video/logo/Kconfig 2010-10-20 22:30:22.000000000 +0200
+++ linux-2.6.36/drivers/video/logo/Kconfig 2010-10-21 14:29:22.000000000 +0200
@@ -82,4 +82,11 @@
- depends on M32R
- default y
-
+ depends on M32R
+ default y
+
+config LOGO_ARMADEUS_CLUT224
+ bool "224-color Armadeus Linux logo"
+ depends on ARM
@@ -19,15 +19,15 @@ Index: linux-2.6.36/drivers/video/logo/logo.c
--- linux-2.6.36.orig/drivers/video/logo/logo.c 2010-10-20 22:30:22.000000000 +0200
+++ linux-2.6.36/drivers/video/logo/logo.c 2010-10-21 14:29:22.000000000 +0200
@@ -100,6 +100,10 @@
- /* M32R Linux logo */
- logo = &logo_m32r_clut224;
+ /* M32R Linux logo */
+ logo = &logo_m32r_clut224;
#endif
+#ifdef CONFIG_LOGO_ARMADEUS_CLUT224
+ /* Armadeus Linux logo */
+ logo = &logo_armadeus_clut224;
+#endif
- }
- return logo;
+ }
+ return logo;
}
Index: linux-2.6.36/include/linux/linux_logo.h
===================================================================
@@ -50,9 +50,9 @@ Index: linux-2.6.36/drivers/video/logo/Makefile
obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o
obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o
+obj-$(CONFIG_LOGO_ARMADEUS_CLUT224) += logo_armadeus_clut224.o
-
+
obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o
-
+
Index: linux-2.6.36/drivers/video/logo/logo_armadeus_clut224.ppm
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/linux/3.16/0021-armadeus-apf9328.patch b/patches/linux/3.16/0021-armadeus-apf9328.patch
index 7abfd66..103cb6e 100644
--- a/patches/linux/3.16/0021-armadeus-apf9328.patch
+++ b/patches/linux/3.16/0021-armadeus-apf9328.patch
@@ -369,7 +369,7 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf9328.c
+#include <asm/system.h>
+#include <asm/pgtable.h>
+#include <asm/page.h>
-
+
+#include <asm/mach/map.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -415,17 +415,17 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf9328.c
+#ifdef CONFIG_ARMADEUS_MAX1027
+#include <linux/spi/max1027.h>
+#endif
-
+
static const int apf9328_pins[] __initconst = {
- /* UART1 */
+ /* UART1 */
@@ -41,10 +87,225 @@
- PB29_PF_UART2_RTS,
- PB30_PF_UART2_TXD,
- PB31_PF_UART2_RXD,
+ PB29_PF_UART2_RTS,
+ PB30_PF_UART2_TXD,
+ PB31_PF_UART2_RXD,
+#ifdef CONFIG_I2C_IMX
- /* I2C */
- PA15_PF_I2C_SDA,
- PA16_PF_I2C_SCL,
+ /* I2C */
+ PA15_PF_I2C_SDA,
+ PA16_PF_I2C_SCL,
+#endif
+#ifdef CONFIG_MXC_PWM
+ PA2_PF_PWM0,
@@ -641,19 +641,19 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf9328.c
+ .id = 0,
};
+#endif /* CONFIG_IMX_BACKLIGHT */
-
+
/*
* The APF9328 can have up to 32MB NOR Flash
@@ -105,11 +366,19 @@
- .flags = IMXUART_HAVE_RTSCTS,
+ .flags = IMXUART_HAVE_RTSCTS,
};
-
+
+#ifdef CONFIG_I2C_IMX
static const struct imxi2c_platform_data apf9328_i2c_data __initconst = {
- .bitrate = 100000,
+ .bitrate = 100000,
};
+#endif /* CONFIG_I2C_IMX */
-
+
static struct platform_device *devices[] __initdata = {
+#ifdef CONFIG_IMX_BACKLIGHT
+ &imxbl_device,
@@ -661,13 +661,13 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf9328.c
+#if defined(CONFIG_SND_IMX_PCM) || defined(CONFIG_SND_IMX_PCM_MODULE)
+ &apf9328_ssi_device,
+#endif
- &apf9328_flash_device,
- &dm9000x_device,
+ &apf9328_flash_device,
+ &dm9000x_device,
};
@@ -125,11 +394,31 @@
- imx1_add_imx_uart0(NULL);
- imx1_add_imx_uart1(&uart1_pdata);
-
+ imx1_add_imx_uart0(NULL);
+ imx1_add_imx_uart1(&uart1_pdata);
+
+#ifdef CONFIG_SPI_IMX
+#if defined(CONFIG_ARMADEUS_MAX1027) || defined(CONFIG_SPIDEV)
+ mxc_gpio_mode(GPIO_PORTC | IMX_SPI1_SS_PIN | GPIO_OUT | GPIO_GPIO);
@@ -680,7 +680,7 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf9328.c
+#endif
+#endif
+#ifdef CONFIG_I2C_IMX
- imx1_add_imx_i2c(&apf9328_i2c_data);
+ imx1_add_imx_i2c(&apf9328_i2c_data);
+#endif
+#ifdef CONFIG_USB_IMX
+ imx1_add_udc(&apf9328_udc_0_data);
@@ -688,13 +688,13 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf9328.c
+/*#ifdef CONFIG_MXC_PWM
+ imx1_add_mxc_pwm();
+#endif*/
-
- dm9000_resources[2].start = gpio_to_irq(IMX_GPIO_NR(2, 14));
- dm9000_resources[2].end = gpio_to_irq(IMX_GPIO_NR(2, 14));
- platform_add_devices(devices, ARRAY_SIZE(devices));
+
+ dm9000_resources[2].start = gpio_to_irq(IMX_GPIO_NR(2, 14));
+ dm9000_resources[2].end = gpio_to_irq(IMX_GPIO_NR(2, 14));
+ platform_add_devices(devices, ARRAY_SIZE(devices));
+ apf9328_baseboard_init();
}
-
+
static void __init apf9328_timer_init(void)
Index: linux-3.8-rc1/arch/arm/mach-imx/apf9328-dev.c
===================================================================
diff --git a/patches/linux/3.16/0024-armadeus-apf9328-add_board_to_linux_build_system.patch b/patches/linux/3.16/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
index 8ff0c75..7dfaa54 100644
--- a/patches/linux/3.16/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
+++ b/patches/linux/3.16/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
@@ -3,18 +3,18 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/Kconfig
--- linux-3.8-rc1.orig/arch/arm/mach-imx/Kconfig 2012-12-22 02:19:00.000000000 +0100
+++ linux-3.8-rc1/arch/arm/mach-imx/Kconfig 2013-01-01 21:22:49.000000000 +0100
@@ -202,10 +202,43 @@
- bool "APF9328"
- select IMX_HAVE_PLATFORM_IMX_I2C
- select IMX_HAVE_PLATFORM_IMX_UART
+ bool "APF9328"
+ select IMX_HAVE_PLATFORM_IMX_I2C
+ select IMX_HAVE_PLATFORM_IMX_UART
+ select IMX_HAVE_PLATFORM_SPI_IMX
+ select IMX_HAVE_PLATFORM_IMX_FB
+ select IMX_HAVE_PLATFORM_MXC_PWM
+ select IMX_HAVE_PLATFORM_IMX_UDC
+ select SERIAL_IMX_UART1
- select SOC_IMX1
- help
- Say Yes here if you are using the Armadeus APF9328 development board
-
+ select SOC_IMX1
+ help
+ Say Yes here if you are using the Armadeus APF9328 development board
+
+choice
+ prompt "Flash available on board"
+ depends on MACH_APF9328
@@ -44,7 +44,7 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/Kconfig
+endchoice
+
endif
-
+
if ARCH_MULTI_V5
Index: linux-3.8-rc1/arch/arm/mach-imx/Makefile
===================================================================
@@ -55,6 +55,6 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/Makefile
obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o
obj-$(CONFIG_MACH_APF9328) += mach-apf9328.o
+obj-$(CONFIG_MACH_APF9328_DEV) += apf9328-dev.o
-
+
# i.MX21 based machines
obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o
diff --git a/patches/linux/3.16/0029-armadeus-add_csi_and_spi_registers.patch b/patches/linux/3.16/0029-armadeus-add_csi_and_spi_registers.patch
index 08447f3..5884050 100644
--- a/patches/linux/3.16/0029-armadeus-add_csi_and_spi_registers.patch
+++ b/patches/linux/3.16/0029-armadeus-add_csi_and_spi_registers.patch
@@ -10,5 +10,5 @@ Index: linux-3.8-rc1/drivers/spi/spi-imx.c
+#define MXC_PERIOD 0x14
+#define MXC_DMA 0x18
#define MXC_RESET 0x1c
-
+
/* generic defines to abstract from the different register layouts */
diff --git a/patches/linux/3.16/0029b-armadeus-add_csi_registers.patch b/patches/linux/3.16/0029b-armadeus-add_csi_registers.patch
index dace792..856b0b3 100644
--- a/patches/linux/3.16/0029b-armadeus-add_csi_registers.patch
+++ b/patches/linux/3.16/0029b-armadeus-add_csi_registers.patch
@@ -10,7 +10,7 @@ Index: linux-3.8-rc1/drivers/media/platform/soc_camera/mx1_camera.c
#define CSISR 0x08 /* CSI Status Register */
+#define CSISTATR 0x0C
#define CSIRXR 0x10 /* CSI RxFIFO Register */
-
+
+#define CSICR1_RXOR_INTEN (1 << 24)
+#define CSICR1_RXFF_INTEN (1 << 18)
#define CSICR1_RXFF_LEVEL(x) (((x) & 0x3) << 19)
diff --git a/patches/linux/3.16/0030-armadeus-devices-imx1-add_udc_registration.patch b/patches/linux/3.16/0030-armadeus-devices-imx1-add_udc_registration.patch
index bf94207..6a4a7c2 100644
--- a/patches/linux/3.16/0030-armadeus-devices-imx1-add_udc_registration.patch
+++ b/patches/linux/3.16/0030-armadeus-devices-imx1-add_udc_registration.patch
@@ -8,7 +8,7 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/devices-imx1.h
--- linux-3.8-rc1.orig/arch/arm/mach-imx/devices-imx1.h 2012-12-22 02:19:00.000000000 +0100
+++ linux-3.8-rc1/arch/arm/mach-imx/devices-imx1.h 2013-01-01 21:19:56.000000000 +0100
@@ -28,3 +28,7 @@
-
+
#define imx1_add_spi_imx0(pdata) imx1_add_cspi(0, pdata)
#define imx1_add_spi_imx1(pdata) imx1_add_cspi(1, pdata)
+
diff --git a/patches/linux/3.16/0035-armadeus-re_add_pwm_and_correct_driver.tofix b/patches/linux/3.16/0035-armadeus-re_add_pwm_and_correct_driver.tofix
index 7746b71..16468ce 100644
--- a/patches/linux/3.16/0035-armadeus-re_add_pwm_and_correct_driver.tofix
+++ b/patches/linux/3.16/0035-armadeus-re_add_pwm_and_correct_driver.tofix
@@ -3,9 +3,9 @@ Index: linux-3.3.5/arch/arm/mach-imx/clock-imx1.c
--- linux-3.3.5.orig/arch/arm/mach-imx/clock-imx1.c
+++ linux-3.3.5/arch/arm/mach-imx/clock-imx1.c
@@ -535,6 +535,12 @@ static struct clk uart_clk = {
- .set_rate = _clk_parent_set_rate,
+ .set_rate = _clk_parent_set_rate,
};
-
+
+static struct clk pwm_clk = {
+ .parent = &perclk[0],
+ .round_rate = _clk_parent_round_rate,
@@ -13,24 +13,24 @@ Index: linux-3.3.5/arch/arm/mach-imx/clock-imx1.c
+};
+
static struct clk i2c_clk = {
- .parent = &hclk,
- .round_rate = _clk_parent_round_rate,
+ .parent = &hclk,
+ .round_rate = _clk_parent_round_rate,
@@ -590,6 +596,7 @@ static struct clk_lookup lookups[] __ini
- _REGISTER_CLOCK("imx1-uart.0", NULL, uart_clk)
- _REGISTER_CLOCK("imx1-uart.1", NULL, uart_clk)
- _REGISTER_CLOCK("imx1-uart.2", NULL, uart_clk)
+ _REGISTER_CLOCK("imx1-uart.0", NULL, uart_clk)
+ _REGISTER_CLOCK("imx1-uart.1", NULL, uart_clk)
+ _REGISTER_CLOCK("imx1-uart.2", NULL, uart_clk)
+ _REGISTER_CLOCK(NULL, "pwm", pwm_clk)
- _REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk)
- _REGISTER_CLOCK("imx1-cspi.0", NULL, spi_clk)
- _REGISTER_CLOCK("imx1-cspi.1", NULL, spi_clk)
+ _REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk)
+ _REGISTER_CLOCK("imx1-cspi.0", NULL, spi_clk)
+ _REGISTER_CLOCK("imx1-cspi.1", NULL, spi_clk)
Index: linux-3.3.5/arch/arm/plat-mxc/devices/platform-mxc_pwm.c
===================================================================
--- linux-3.3.5.orig/arch/arm/plat-mxc/devices/platform-mxc_pwm.c
+++ linux-3.3.5/arch/arm/plat-mxc/devices/platform-mxc_pwm.c
@@ -19,6 +19,11 @@
#define imx_mxc_pwm_data_entry(soc, _id, _hwid, _size) \
- [_id] = imx_mxc_pwm_data_entry_single(soc, _id, _hwid, _size)
-
+ [_id] = imx_mxc_pwm_data_entry_single(soc, _id, _hwid, _size)
+
+#ifdef CONFIG_SOC_IMX1
+const struct imx_mxc_pwm_data imx1_mxc_pwm_data __initconst =
+ imx_mxc_pwm_data_entry_single(MX1, 0, , SZ_4K);
@@ -38,15 +38,15 @@ Index: linux-3.3.5/arch/arm/plat-mxc/devices/platform-mxc_pwm.c
+
#ifdef CONFIG_SOC_IMX21
const struct imx_mxc_pwm_data imx21_mxc_pwm_data __initconst =
- imx_mxc_pwm_data_entry_single(MX21, 0, , SZ_4K);
+ imx_mxc_pwm_data_entry_single(MX21, 0, , SZ_4K);
Index: linux-3.3.5/arch/arm/plat-mxc/pwm.c
===================================================================
--- linux-3.3.5.orig/arch/arm/plat-mxc/pwm.c
+++ linux-3.3.5/arch/arm/plat-mxc/pwm.c
@@ -116,9 +116,35 @@ int pwm_config(struct pwm_device *pwm, i
- * both the prescaler (/1 .. /128) and then by CLKSEL
- * (/2 .. /16).
- */
+ * both the prescaler (/1 .. /128) and then by CLKSEL
+ * (/2 .. /16).
+ */
- u32 max = readl(pwm->mmio_base + MX1_PWMP);
- u32 p = max * duty_ns / period_ns;
- writel(max - p, pwm->mmio_base + MX1_PWMS);
@@ -79,9 +79,9 @@ Index: linux-3.3.5/arch/arm/plat-mxc/pwm.c
+ cr |= (((prescale-1)&0xef)<<8)|1<<4;
+ writel(cr, pwm->mmio_base+MX1_PWMC);
+
- } else {
- BUG();
- }
+ } else {
+ BUG();
+ }
Index: linux-3.3.5/arch/arm/plat-mxc/include/mach/mx1.h
===================================================================
--- linux-3.3.5.orig/arch/arm/plat-mxc/include/mach/mx1.h
@@ -102,11 +102,11 @@ Index: linux-3.3.5/arch/arm/mach-imx/devices-imx1.h
@@ -30,6 +30,10 @@ extern const struct imx_spi_imx_data imx
#define imx1_add_spi_imx0(pdata) imx1_add_cspi(0, pdata)
#define imx1_add_spi_imx1(pdata) imx1_add_cspi(1, pdata)
-
+
+extern struct imx_mxc_pwm_data imx1_mxc_pwm_data[];
+#define imx1_add_mxc_pwm() \
+ imx_add_mxc_pwm(&imx1_mxc_pwm_data[0])
+
extern const struct imx_imx_udc_data imx1_imx_udc_data;
#define imx1_add_udc(pdata) \
- imx_add_imx_udc(&imx1_imx_udc_data, pdata)
+ imx_add_imx_udc(&imx1_imx_udc_data, pdata)
diff --git a/patches/linux/3.16/0050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/3.16/0050-armadeus-add_custom_drivers_to_kconfig.patch
index 03d3a87..9a18198 100644
--- a/patches/linux/3.16/0050-armadeus-add_custom_drivers_to_kconfig.patch
+++ b/patches/linux/3.16/0050-armadeus-add_custom_drivers_to_kconfig.patch
@@ -5,9 +5,9 @@ Index: linux-3.8-rc1/drivers/Kconfig
--- linux-3.8-rc1.orig/drivers/Kconfig 2012-12-22 02:19:00.000000000 +0100
+++ linux-3.8-rc1/drivers/Kconfig 2013-01-02 20:28:02.000000000 +0100
@@ -158,4 +158,6 @@
-
+
source "drivers/ipack/Kconfig"
-
+
+source "drivers/armadeus/Kconfig"
+
endmenu
diff --git a/patches/linux/3.16/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch b/patches/linux/3.16/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
index 0a13beb..3e76095 100644
--- a/patches/linux/3.16/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
+++ b/patches/linux/3.16/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
@@ -3,9 +3,9 @@ Index: linux-3.8-rc1/drivers/spi/Kconfig
--- linux-3.8-rc1.orig/drivers/spi/Kconfig 2012-12-22 02:19:00.000000000 +0100
+++ linux-3.8-rc1/drivers/spi/Kconfig 2013-01-01 21:19:56.000000000 +0100
@@ -494,6 +494,14 @@
- sysfs interface, with each line presented as a kind of GPIO
- exposing both switch control and diagnostic feedback.
-
+ sysfs interface, with each line presented as a kind of GPIO
+ exposing both switch control and diagnostic feedback.
+
+config SPI_TSC2102
+ depends on SPI_MASTER
+ depends on HWMON = n || HWMON
diff --git a/patches/linux/3.16/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch b/patches/linux/3.16/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
index 5618f12..2640882 100644
--- a/patches/linux/3.16/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
+++ b/patches/linux/3.16/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
@@ -3,9 +3,9 @@ Index: linux-3.8-rc1/drivers/input/touchscreen/Kconfig
--- linux-3.8-rc1.orig/drivers/input/touchscreen/Kconfig 2012-12-22 02:19:00.000000000 +0100
+++ linux-3.8-rc1/drivers/input/touchscreen/Kconfig 2013-01-01 21:19:56.000000000 +0100
@@ -541,6 +541,20 @@
- To compile this driver as a module, choose M here: the
- module will be called atmel_tsadcc.
-
+ To compile this driver as a module, choose M here: the
+ module will be called atmel_tsadcc.
+
+config TOUCHSCREEN_TSC2102
+ tristate "TSC 2102 based touchscreens"
+ depends on SPI_MASTER
@@ -21,8 +21,8 @@ Index: linux-3.8-rc1/drivers/input/touchscreen/Kconfig
+ module will be called tsc2102_ts.
+
config TOUCHSCREEN_UCB1400
- tristate "Philips UCB1400 touchscreen"
- depends on AC97_BUS
+ tristate "Philips UCB1400 touchscreen"
+ depends on AC97_BUS
Index: linux-3.8-rc1/drivers/input/touchscreen/Makefile
===================================================================
--- linux-3.8-rc1.orig/drivers/input/touchscreen/Makefile 2012-12-22 02:19:00.000000000 +0100
diff --git a/patches/linux/3.16/0076-Add-tsc210x-device-tree-support.patch b/patches/linux/3.16/0076-Add-tsc210x-device-tree-support.patch
index 72c80e6..32ea2d4 100644
--- a/patches/linux/3.16/0076-Add-tsc210x-device-tree-support.patch
+++ b/patches/linux/3.16/0076-Add-tsc210x-device-tree-support.patch
@@ -13,7 +13,7 @@ index 47e67a3..d19cba2 100644
@@ -41,6 +41,10 @@
#include <asm/irq.h>
#include <asm/io.h>
-
+
+#ifdef CONFIG_OF
+#include <linux/of_device.h>
+#endif
@@ -24,7 +24,7 @@ index 47e67a3..d19cba2 100644
@@ -83,6 +87,16 @@
#define SM_TEMP1 1
#define SM_SUSPENDED 2
-
+
+#ifdef CONFIG_OF
+static struct of_device_id tsc210x_spi_of_match[] = {
+ {
@@ -36,24 +36,24 @@ index 47e67a3..d19cba2 100644
+#endif
+
struct tsc210x_spi_req {
- struct spi_device *dev;
- uint16_t command;
+ struct spi_device *dev;
+ uint16_t command;
@@ -380,7 +394,6 @@ static irqreturn_t tsc2102_handler(int irq, void *dev_id)
-
- schedule_work(&dev->work);
- }
+
+ schedule_work(&dev->work);
+ }
-
- return IRQ_HANDLED;
+ return IRQ_HANDLED;
}
-
+
@@ -1075,7 +1088,54 @@ static int tsc210x_probe(struct spi_device *spi)
- struct spi_transfer *spi_buffer;
- int err = -EINVAL;
- u16 rev_id = 0;
+ struct spi_transfer *spi_buffer;
+ int err = -EINVAL;
+ u16 rev_id = 0;
+#ifdef CONFIG_OF
+ const struct of_device_id *match;
+ int status;
-
+
+ pdata = kzalloc(sizeof(struct tsc210x_config), GFP_KERNEL);
+ if (!pdata) {
+ dev_err(&spi->dev, "No memory for tsc210x_config\n");
@@ -98,19 +98,19 @@ index 47e67a3..d19cba2 100644
+ return -ENODEV;
+ }
+#endif
- if (!pdata) {
- printk(KERN_ERR "TSC210x: Platform data not supplied\n");
- return -ENOENT;
+ if (!pdata) {
+ printk(KERN_ERR "TSC210x: Platform data not supplied\n");
+ return -ENOENT;
@@ -1263,7 +1323,9 @@ static int tsc210x_remove(struct spi_device *spi)
- apm_get_power_status = 0;
+ apm_get_power_status = 0;
#endif
- free_irq(spi->irq, &tsc);
+ free_irq(spi->irq, &tsc);
-
+#ifdef CONFIG_OF
+ kfree(dev->pdata);
+#endif
- mutex_unlock(&dev->lock_sync);
-
- return 0;
+ mutex_unlock(&dev->lock_sync);
+
+ return 0;
--
1.8.4.2
diff --git a/patches/linux/3.16/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix b/patches/linux/3.16/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
index 54ce9f8..ee5940b 100644
--- a/patches/linux/3.16/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
+++ b/patches/linux/3.16/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
@@ -10,15 +10,15 @@ Index: linux-2.6.36/arch/arm/plat-mxc/clock.c
@@ -212,6 +212,7 @@
unsigned long mxc_decode_pll(unsigned int reg_val, u32 freq)
{
- long long ll;
+ long long ll;
+ unsigned long quot;
- int mfn_abs;
- unsigned int mfi, mfn, mfd, pd;
-
+ int mfn_abs;
+ unsigned int mfi, mfn, mfd, pd;
+
@@ -222,6 +223,15 @@
-
- mfi = mfi <= 5 ? 5 : mfi;
-
+
+ mfi = mfi <= 5 ? 5 : mfi;
+
+ if (cpu_is_mx1()) {
+ ll = 2 * (unsigned long long)freq *
+ ((mfi << 16) + (mfn << 16) / (mfd + 1));
@@ -28,6 +28,6 @@ Index: linux-2.6.36/arch/arm/plat-mxc/clock.c
+ return (unsigned long)ll;
+ }
+
- mfn_abs = mfn;
-
- /* On all i.MXs except i.MX1 and i.MX21 mfn is a 10bit
+ mfn_abs = mfn;
+
+ /* On all i.MXs except i.MX1 and i.MX21 mfn is a 10bit
diff --git a/patches/linux/3.16/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix b/patches/linux/3.16/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
index 90cc05a..d6a1205 100644
--- a/patches/linux/3.16/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
+++ b/patches/linux/3.16/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
@@ -2,11 +2,11 @@ This patch suppress kernel oops when a driver, compiled as module, get a clock.
--- a/arch/arm/mach-imx/clock-imx1.c 2011-01-09 16:11:35.000000000 +0100
+++ b/arch/arm/mach-imx/clock-imx1.c 2011-01-09 16:11:47.000000000 +0100
@@ -582,7 +582,7 @@
- .con_id = n, \
- .clk = &c, \
- },
+ .con_id = n, \
+ .clk = &c, \
+ },
-static struct clk_lookup lookups[] __initdata = {
+static struct clk_lookup lookups[] = {
- _REGISTER_CLOCK(NULL, "dma", dma_clk)
- _REGISTER_CLOCK("mx1-camera.0", NULL, csi_clk)
- _REGISTER_CLOCK(NULL, "mma", mma_clk)
+ _REGISTER_CLOCK(NULL, "dma", dma_clk)
+ _REGISTER_CLOCK("mx1-camera.0", NULL, csi_clk)
+ _REGISTER_CLOCK(NULL, "mma", mma_clk)
diff --git a/patches/linux/3.16/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch b/patches/linux/3.16/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
index 548c8ea..9e03c13 100644
--- a/patches/linux/3.16/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
+++ b/patches/linux/3.16/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
@@ -11,9 +11,9 @@ index 39a8cb4..cfa797f 100644
--- a/arch/arm/boot/dts/imx27-apf27dev.dts
+++ b/arch/arm/boot/dts/imx27-apf27dev.dts
@@ -72,6 +72,18 @@
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_cspi2_1>;
- status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_cspi2_1>;
+ status = "okay";
+ tsc210x@0 {
+ compatible = "tsc210x";
+ reg = <0>;
@@ -27,7 +27,7 @@ index 39a8cb4..cfa797f 100644
+ tsc210x-irq = <257>; /* GPIO port 6 pin 17 (6-1)*32 + 17 + 64 + 16 */
+ };
};
-
+
&i2c1 {
--
1.8.4.2
diff --git a/patches/linux/3.16/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch b/patches/linux/3.16/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
index 2d341bf..e7f0fc9 100644
--- a/patches/linux/3.16/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
+++ b/patches/linux/3.16/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
@@ -7,11 +7,11 @@ Index: linux-3.15-rc1/arch/arm/boot/dts/imx27-apf27dev.dts
--- linux-3.15-rc1.orig/arch/arm/boot/dts/imx27-apf27dev.dts
+++ linux-3.15-rc1/arch/arm/boot/dts/imx27-apf27dev.dts
@@ -55,7 +55,7 @@
-
- user {
- label = "Heartbeat";
+
+ user {
+ label = "Heartbeat";
- gpios = <&gpio6 14 GPIO_ACTIVE_HIGH>;
+ gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
- linux,default-trigger = "heartbeat";
- };
- };
+ linux,default-trigger = "heartbeat";
+ };
+ };
diff --git a/patches/linux/3.16/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch b/patches/linux/3.16/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
index cb51ef9..8d5b1e4 100644
--- a/patches/linux/3.16/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
+++ b/patches/linux/3.16/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
@@ -7,9 +7,9 @@ Index: linux-3.15-rc1/arch/arm/boot/dts/imx27-apf27.dts
--- linux-3.15-rc1.orig/arch/arm/boot/dts/imx27-apf27.dts
+++ linux-3.15-rc1/arch/arm/boot/dts/imx27-apf27.dts
@@ -80,6 +80,18 @@
- status = "okay";
+ status = "okay";
};
-
+
+&i2c2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c2_1>;
@@ -23,5 +23,5 @@ Index: linux-3.15-rc1/arch/arm/boot/dts/imx27-apf27.dts
+};
+
&nfc {
- status = "okay";
- nand-bus-width = <16>;
+ status = "okay";
+ nand-bus-width = <16>;
diff --git a/patches/linux/3.16/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch b/patches/linux/3.16/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
index d83819d..b030473 100644
--- a/patches/linux/3.16/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
+++ b/patches/linux/3.16/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
@@ -7,11 +7,11 @@ 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 */
+ label = "user";
+ gpios = <&gpio6 13 0>;
+ linux,code = <276>; /* BTN_EXTRA */
+ gpio-key,wakeup;
- };
- };
-
+ };
+ };
+
--
diff --git a/patches/linux/3.16/0230-armadeus-fixes-vpu-spll-clock-dependency.patch b/patches/linux/3.16/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
index 3ce46cd..43d37fa 100644
--- a/patches/linux/3.16/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
+++ b/patches/linux/3.16/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
@@ -10,7 +10,7 @@ Index: linux-3.13/arch/arm/mach-imx/clk-imx27.c
@@ -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", };
diff --git a/patches/linux/3.16/0400-Add-apf51-basic-dt-support.patch b/patches/linux/3.16/0400-Add-apf51-basic-dt-support.patch
index 9136025..d466dac 100644
--- a/patches/linux/3.16/0400-Add-apf51-basic-dt-support.patch
+++ b/patches/linux/3.16/0400-Add-apf51-basic-dt-support.patch
@@ -8,9 +8,9 @@ Index: linux-3.13-rc2/arch/arm/boot/dts/imx51-apf51.dts
--- linux-3.13-rc2.orig/arch/arm/boot/dts/imx51-apf51.dts
+++ linux-3.13-rc2/arch/arm/boot/dts/imx51-apf51.dts
@@ -30,6 +30,19 @@
- clock-frequency = <33554432>;
- };
- };
+ clock-frequency = <33554432>;
+ };
+ };
+
+ regulators {
+ compatible = "simple-bus";
@@ -25,12 +25,12 @@ Index: linux-3.13-rc2/arch/arm/boot/dts/imx51-apf51.dts
+ };
+ };
};
-
+
&fec {
@@ -72,6 +72,43 @@
- MX51_PAD_UART3_TXD__UART3_TXD 0x1c5
- >;
- };
+ MX51_PAD_UART3_TXD__UART3_TXD 0x1c5
+ >;
+ };
+ usbh1 {
+ pinctrl_usbh1_1: usbh1grp-1 {
+ fsl,pins = <
@@ -68,12 +68,12 @@ Index: linux-3.13-rc2/arch/arm/boot/dts/imx51-apf51.dts
+ >;
+ };
+ };
- };
+ };
};
-
+
@@ -87,3 +100,31 @@
- pinctrl-0 = <&pinctrl_uart3>;
- status = "okay";
+ pinctrl-0 = <&pinctrl_uart3>;
+ status = "okay";
};
+
+&usbphy1 {
diff --git a/patches/linux/3.16/0401-armadeus-add_apf51dev_baseboard.patch b/patches/linux/3.16/0401-armadeus-add_apf51dev_baseboard.patch
index 1f8bcb7..7c6ba01 100644
--- a/patches/linux/3.16/0401-armadeus-add_apf51dev_baseboard.patch
+++ b/patches/linux/3.16/0401-armadeus-add_apf51dev_baseboard.patch
@@ -8,22 +8,22 @@ Index: linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
--- linux-3.14-rc4.orig/arch/arm/boot/dts/imx51-apf51dev.dts
+++ linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
@@ -66,6 +66,12 @@
- gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "heartbeat";
- };
+ gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "heartbeat";
+ };
+
+ backlight {
+ label = "Backlight";
+ gpios = <&gpio3 4 0>;
+ default-state = "on";
+ };
- };
+ };
};
-
+
@@ -85,6 +91,14 @@
- cs-gpios = <&gpio3 28 GPIO_ACTIVE_LOW>,
- <&gpio3 27 GPIO_ACTIVE_LOW>;
- status = "okay";
+ cs-gpios = <&gpio3 28 GPIO_ACTIVE_LOW>,
+ <&gpio3 27 GPIO_ACTIVE_LOW>;
+ status = "okay";
+
+ spidev: spidev@1 {
+ #address-cells = <1>;
@@ -33,20 +33,20 @@ Index: linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
+ reg = <1>;
+ };
};
-
+
&esdhc1 {
@@ -99,7 +113,6 @@
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_esdhc2>;
- bus-width = <4>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_esdhc2>;
+ bus-width = <4>;
- non-removable;
- status = "okay";
+ status = "okay";
};
-
-@@ -109,6 +122,13 @@
- status = "okay";
+
+@@ -102,6 +115,13 @@
+ status = "okay";
};
-
+
+&uart2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart2_1>;
@@ -55,29 +55,29 @@ Index: linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
+};
+
&iomuxc {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_hog>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_hog>;
@@ -116,6 +136,7 @@
- imx51-apf51dev {
- pinctrl_hog: hoggrp {
- fsl,pins = <
+ imx51-apf51dev {
+ pinctrl_hog: hoggrp {
+ fsl,pins = <
+ MX51_PAD_GPIO1_8__GPIO1_8 0x0C5
- MX51_PAD_EIM_EB2__GPIO2_22 0x0C5
- MX51_PAD_EIM_EB3__GPIO2_23 0x0C5
- MX51_PAD_EIM_CS4__GPIO2_29 0x100
+ MX51_PAD_EIM_EB2__GPIO2_22 0x0C5
+ MX51_PAD_EIM_EB3__GPIO2_23 0x0C5
+ MX51_PAD_EIM_CS4__GPIO2_29 0x100
@@ -125,6 +146,8 @@
- MX51_PAD_CSPI1_SS1__GPIO4_25 0x0C5
- MX51_PAD_GPIO1_2__GPIO1_2 0x0C5
- MX51_PAD_GPIO1_3__GPIO1_3 0x0C5
+ MX51_PAD_CSPI1_SS1__GPIO4_25 0x0C5
+ MX51_PAD_GPIO1_2__GPIO1_2 0x0C5
+ MX51_PAD_GPIO1_3__GPIO1_3 0x0C5
+ MX51_PAD_DI1_D1_CS__GPIO3_4 0x0C5
+ MX51_PAD_EIM_CS3__GPIO2_28 0x0C5
- >;
- };
-
+ >;
+ };
+
@@ -203,6 +203,14 @@
- MX51_PAD_DI1_PIN3__DI1_PIN3 0x5
- >;
- };
+ MX51_PAD_DI1_PIN3__DI1_PIN3 0x5
+ >;
+ };
+ uart2 {
+ pinctrl_uart2_1: uart2grp-1 {
+ fsl,pins = <
@@ -86,5 +86,5 @@ Index: linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
+ >;
+ };
+ };
- };
+ };
};
diff --git a/patches/linux/3.16/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch b/patches/linux/3.16/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
index 0753b0e..40e8ce1 100644
--- a/patches/linux/3.16/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
+++ b/patches/linux/3.16/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
@@ -7,9 +7,9 @@ Index: linux-3.14-rc4/arch/arm/boot/dts/imx51.dtsi
--- linux-3.14-rc4.orig/arch/arm/boot/dts/imx51.dtsi
+++ linux-3.14-rc4/arch/arm/boot/dts/imx51.dtsi
@@ -195,6 +195,13 @@
- status = "okay";
- };
-
+ status = "okay";
+ };
+
+ usbphy1: usbphy@1 {
+ compatible = "usb-nop-xceiv";
+ clocks = <&clks 0>;
@@ -17,21 +17,22 @@ Index: linux-3.14-rc4/arch/arm/boot/dts/imx51.dtsi
+ status = "okay";
+ };
+
- usbotg: usb@73f80000 {
- compatible = "fsl,imx51-usb", "fsl,imx27-usb";
- reg = <0x73f80000 0x0200>;
+ usbotg: usb@73f80000 {
+ compatible = "fsl,imx51-usb", "fsl,imx27-usb";
+ reg = <0x73f80000 0x0200>;
@@ -211,6 +218,7 @@
- interrupts = <14>;
- clocks = <&clks 108>;
- fsl,usbmisc = <&usbmisc 1>;
+ interrupts = <14>;
+ clocks = <&clks 108>;
+ fsl,usbmisc = <&usbmisc 1>;
+ fsl,usbphy = <&usbphy1>;
- status = "disabled";
- };
-
+ status = "disabled";
+ };
+
@@ -220,6 +228,7 @@
- interrupts = <16>;
- clocks = <&clks 108>;
- fsl,usbmisc = <&usbmisc 2>;
+ interrupts = <16>;
+ clocks = <&clks 108>;
+ fsl,usbmisc = <&usbmisc 2>;
+ fsl,usbphy = <&usbphy1>;
- status = "disabled";
- };
+ status = "disabled";
+ };
+
diff --git a/patches/linux/3.16/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch b/patches/linux/3.16/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
index 1bca689..76a8fd5 100644
--- a/patches/linux/3.16/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
+++ b/patches/linux/3.16/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
@@ -5,7 +5,7 @@ Index: linux-3.12-rc1/drivers/usb/chipidea/usbmisc_imx.c
@@ -21,6 +21,23 @@
#define MX25_USB_PHY_CTRL_OFFSET 0x08
#define MX25_BM_EXTERNAL_VBUS_DIVIDER BIT(23)
-
+
+#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
@@ -27,9 +27,9 @@ Index: linux-3.12-rc1/drivers/usb/chipidea/usbmisc_imx.c
#define MX53_USB_UH2_CTRL_OFFSET 0x14
#define MX53_USB_UH3_CTRL_OFFSET 0x18
@@ -68,6 +85,91 @@ static int usbmisc_imx25_post(struct imx
- return 0;
+ return 0;
}
-
+
+static int usbmisc_imx51_init(struct imx_usbmisc_data *data)
+{
+ void __iomem *reg = NULL;
@@ -117,27 +117,27 @@ Index: linux-3.12-rc1/drivers/usb/chipidea/usbmisc_imx.c
+
static int usbmisc_imx53_init(struct imx_usbmisc_data *data)
{
- void __iomem *reg = NULL;
+ void __iomem *reg = NULL;
@@ -128,6 +230,11 @@ static const struct usbmisc_ops imx25_us
- .post = usbmisc_imx25_post,
+ .post = usbmisc_imx25_post,
};
-
+
+static const struct usbmisc_ops imx51_usbmisc_ops = {
+ .init = usbmisc_imx51_init,
+ .post = usbmisc_imx51_post,
+};
+
static const struct usbmisc_ops imx53_usbmisc_ops = {
- .init = usbmisc_imx53_init,
+ .init = usbmisc_imx53_init,
};
@@ -162,6 +269,10 @@ static const struct of_device_id usbmisc
- .data = &imx25_usbmisc_ops,
- },
- {
+ .data = &imx25_usbmisc_ops,
+ },
+ {
+ .compatible = "fsl,imx51-usbmisc",
+ .data = &imx51_usbmisc_ops,
+ },
+ {
- .compatible = "fsl,imx53-usbmisc",
- .data = &imx53_usbmisc_ops,
- },
+ .compatible = "fsl,imx53-usbmisc",
+ .data = &imx53_usbmisc_ops,
+ },
diff --git a/patches/linux/3.16/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch b/patches/linux/3.16/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
index a2b709a..1b5a3a0 100644
--- a/patches/linux/3.16/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
+++ b/patches/linux/3.16/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
@@ -6,24 +6,24 @@ Index: linux-3.12-rc1/drivers/usb/chipidea/ci_hdrc_imx.c
--- linux-3.12-rc1.orig/drivers/usb/chipidea/ci_hdrc_imx.c
+++ linux-3.12-rc1/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -67,6 +67,9 @@ static struct imx_usbmisc_data *usbmisc_
- if (of_find_property(np, "external-vbus-divider", NULL))
- data->evdo = 1;
-
+ if (of_find_property(np, "external-vbus-divider", NULL))
+ data->evdo = 1;
+
+ if (!of_find_property(np, "ext-clk-en", NULL))
+ data->ext_clk_en = 1;
+
- return data;
+ return data;
}
-
+
Index: linux-3.12-rc1/drivers/usb/chipidea/ci_hdrc_imx.h
===================================================================
--- linux-3.12-rc1.orig/drivers/usb/chipidea/ci_hdrc_imx.h
+++ linux-3.12-rc1/drivers/usb/chipidea/ci_hdrc_imx.h
@@ -14,6 +14,7 @@ struct imx_usbmisc_data {
-
- unsigned int disable_oc:1; /* over current detect disabled */
- unsigned int evdo:1; /* set external vbus divider option */
+
+ 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*/
};
-
+
int imx_usbmisc_init(struct imx_usbmisc_data *);
diff --git a/patches/linux/3.16/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch b/patches/linux/3.16/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
index 077ecfd..38521dd 100644
--- a/patches/linux/3.16/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
+++ b/patches/linux/3.16/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
@@ -13,17 +13,17 @@ index 524ac61..c863f6c 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -760,6 +760,12 @@
- MX51_PAD_UART1_CTS__UART1_CTS 0x1c5
- >;
- };
+ MX51_PAD_UART1_CTS__UART1_CTS 0x1c5
+ >;
+ };
+ pinctrl_uart1_2: uart1grp-2 {
+ fsl,pins = <
+ MX51_PAD_UART1_RXD__UART1_RXD 0x1c5
+ MX51_PAD_UART1_TXD__UART1_TXD 0x1c5
+ >;
+ };
- };
-
- uart2 {
+ };
+
+ uart2 {
--
1.7.4.4
diff --git a/patches/linux/3.16/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch b/patches/linux/3.16/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
index 98fe714..48c2c01 100644
--- a/patches/linux/3.16/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
+++ b/patches/linux/3.16/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
@@ -6,29 +6,11 @@ Index: linux-3.15-rc1/arch/arm/boot/dts/imx51-apf51dev.dts
===================================================================
--- linux-3.15-rc1.orig/arch/arm/boot/dts/imx51-apf51dev.dts
+++ linux-3.15-rc1/arch/arm/boot/dts/imx51-apf51dev.dts
-@@ -36,15 +36,15 @@
- vsync-len = <4>;
- hsync-active = <1>;
- vsync-active = <1>;
-- de-active = <1>;
-+ de-active = <1>;
- pixelclk-active = <0>;
- };
- };
-
- port {
- display_in: endpoint {
-- remote-endpoint = <&ipu_di0_disp0>;
-- };
-+ remote-endpoint = <&ipu_di0_disp0>;
-+ };
- };
- };
-
@@ -55,6 +55,7 @@
- label = "user";
- gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
- linux,code = <256>; /* BTN_0 */
+ label = "user";
+ gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
+ linux,code = <256>; /* BTN_0 */
+ gpio-key,wakeup;
- };
- };
+ };
+ };
+
diff --git a/patches/linux/3.16/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch b/patches/linux/3.16/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
index 4201d7f..43422c2 100644
--- a/patches/linux/3.16/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
+++ b/patches/linux/3.16/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
@@ -7,11 +7,11 @@ Index: linux-3.14-rc3/arch/arm/mach-imx/clk-imx51-imx53.c
--- linux-3.14-rc3.orig/arch/arm/mach-imx/clk-imx51-imx53.c
+++ linux-3.14-rc3/arch/arm/mach-imx/clk-imx51-imx53.c
@@ -304,7 +304,7 @@ static void __init mx5_clocks_common_ini
- clk_set_parent(clk[IMX5_CLK_ESDHC_B_SEL], clk[IMX5_CLK_PLL2_SW]);
-
- /* move usb phy clk to 24MHz */
+ clk_set_parent(clk[IMX5_CLK_ESDHC_B_SEL], clk[IMX5_CLK_PLL2_SW]);
+
+ /* move usb phy clk to 24MHz */
- clk_set_parent(clk[IMX5_CLK_USB_PHY_SEL], clk[IMX5_CLK_OSC]);
+ /*clk_set_parent(clk[IMX5_CLK_USB_PHY_SEL], clk[IMX5_CLK_OSC]);*/
-
- clk_prepare_enable(clk[IMX5_CLK_GPC_DVFS]);
- clk_prepare_enable(clk[IMX5_CLK_AHB_MAX]); /* esdhc3 */
+
+ clk_prepare_enable(clk[IMX5_CLK_GPC_DVFS]);
+ clk_prepare_enable(clk[IMX5_CLK_AHB_MAX]); /* esdhc3 */
diff --git a/patches/linux/3.16/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/patches/linux/3.16/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
index 600752a..b5160af 100644
--- a/patches/linux/3.16/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
+++ b/patches/linux/3.16/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
@@ -8,21 +8,21 @@ Index: linux-3.12-rc1/scripts/kconfig/zconf.tab.c_shipped
#include <stdbool.h>
+#include <dirent.h>
+#include <sys/stat.h>
-
+
#include "lkc.h"
-
+
@@ -92,6 +94,7 @@
-
+
#define PRINTD 0x0001
#define DEBUG_PARSE 0x0002
+#define BUFF_SIZE 300
-
+
int cdebug = PRINTD;
-
+
@@ -108,6 +111,27 @@ static struct menu *current_menu, *curre
-
-
-
+
+
+
+
+static int isDir(const char *, const char *);
+
@@ -49,7 +49,7 @@ Index: linux-3.12-rc1/scripts/kconfig/zconf.tab.c_shipped
# define YYDEBUG 1
@@ -1922,8 +1946,31 @@ yyreduce:
case 83:
-
+
{
+ char *name;
+ char *ptr;
@@ -58,7 +58,7 @@ Index: linux-3.12-rc1/scripts/kconfig/zconf.tab.c_shipped
+ struct dirent *lecture;
+ DIR *rep;
+
- printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
+ printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
- zconf_nextfile((yyvsp[(2) - (3)].string));
+ name = (yyvsp[(2) -(3)].string);
+ ptr = strchr(name, '*');
diff --git a/patches/linux/3.16/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch b/patches/linux/3.16/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
index c5d2671..1c4ab18 100644
--- a/patches/linux/3.16/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
+++ b/patches/linux/3.16/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
@@ -13,10 +13,10 @@ Index: linux-3.10-rc2/drivers/rtc/rtc-stmp3xxx.c
--- linux-3.10-rc2.orig/drivers/rtc/rtc-stmp3xxx.c
+++ linux-3.10-rc2/drivers/rtc/rtc-stmp3xxx.c
@@ -272,6 +272,7 @@ static int stmp3xxx_rtc_probe(struct pla
- STMP3XXX_RTC_CTRL_ALARM_IRQ_EN,
- rtc_data->io + STMP3XXX_RTC_CTRL_CLR);
-
+ STMP3XXX_RTC_CTRL_ALARM_IRQ_EN,
+ rtc_data->io + STMP3XXX_RTC_CTRL_CLR);
+
+ device_set_wakeup_capable(&pdev->dev, 1);
- rtc_data->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
- &stmp3xxx_rtc_ops, THIS_MODULE);
- if (IS_ERR(rtc_data->rtc)) {
+ rtc_data->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
+ &stmp3xxx_rtc_ops, THIS_MODULE);
+ if (IS_ERR(rtc_data->rtc)) {
diff --git a/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch.tofix b/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch.tofix
index 11de36c..ec38f11 100644
--- a/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch.tofix
+++ b/patches/linux/3.16/0444-armadeus-imx27-add-usb.patch.tofix
@@ -7,19 +7,19 @@ 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;
+ spi0 = &cspi1;
+ spi1 = &cspi2;
+ spi2 = &cspi3;
+ usb0 = &usbotg;
+ usb1 = &usbh1;
+ usb2 = &usbh2;
- };
-
- aitc: aitc-interrupt-controller@e0000000 {
+ };
+
+ aitc: aitc-interrupt-controller@e0000000 {
@@ -411,6 +414,44 @@
- iram = <&iram>;
- };
-
+ iram = <&iram>;
+ };
+
+ usbotg: usb@10024000 {
+ compatible = "fsl,imx27-usb";
+ reg = <0x10024000 0x200>;
@@ -58,23 +58,23 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
+ status = "disabled";
+ };
+
- sahara2: sahara@10025000 {
- compatible = "fsl,imx27-sahara";
- reg = <0x10025000 0x1000>;
+ 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;
+ struct device_node *np = dev->of_node;
+ struct of_phandle_args args;
+ struct imx_usbmisc_data *data;
+ u32 sic;
- int ret;
-
- /*
+ 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, "ext-clk-en", NULL))
+ data->ext_clk_en = 1;
+
+ if (of_find_property(np, "disable-tll", NULL))
+ data->disable_tll = 1;
+
@@ -83,27 +83,27 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
+ data->sic = sic & 0x3;
+ }
+
- return data;
+ 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_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
@@ -120,9 +120,9 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
#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;
+ return 0;
}
-
+
+static int usbmisc_imx27_init(struct imx_usbmisc_data *data)
+{
+ unsigned long flags;
@@ -185,28 +185,28 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
+
static int usbmisc_imx53_init(struct imx_usbmisc_data *data)
{
- void __iomem *reg = NULL;
+ void __iomem *reg = NULL;
@@ -235,6 +307,10 @@ static const struct usbmisc_ops imx51_us
- .post = usbmisc_imx51_post,
+ .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,
+ .init = usbmisc_imx53_init,
};
@@ -273,7 +349,10 @@ static const struct of_device_id usbmisc
- .data = &imx51_usbmisc_ops,
- },
- {
+ .data = &imx51_usbmisc_ops,
+ },
+ {
- .compatible = "fsl,imx53-usbmisc",
+ .compatible = "fsl,imx27-usbmisc",
+ .data = &imx27_usbmisc_ops,
+ },
+ { .compatible = "fsl,imx53-usbmisc",
- .data = &imx53_usbmisc_ops,
- },
- {
+ .data = &imx53_usbmisc_ops,
+ },
+ {
--
diff --git a/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix b/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix
index 0a50809..836eaad 100644
--- a/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix
+++ b/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix
@@ -5,9 +5,9 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
--- linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27dev.dts
+++ linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27dev.dts
@@ -16,6 +16,17 @@
- model = "Armadeus Systems APF27Dev docking/development board";
- compatible = "armadeus,imx27-apf27dev", "armadeus,imx27-apf27", "fsl,imx27";
-
+ model = "Armadeus Systems APF27Dev docking/development board";
+ compatible = "armadeus,imx27-apf27dev", "armadeus,imx27-apf27", "fsl,imx27";
+
+ regulators {
+ compatible = "simple-bus";
+
@@ -19,13 +19,13 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
+ };
+ };
+
- display: display {
- model = "Chimei-LW700AT9003";
- native-mode = <&timing0>;
+ display: display {
+ model = "Chimei-LW700AT9003";
+ native-mode = <&timing0>;
@@ -56,6 +67,12 @@
- };
- };
-
+ };
+ };
+
+ usbphy1: usbphy@1 {
+ compatible = "usb-nop-xceiv";
+ clocks = <&clks 75>;
@@ -33,12 +33,12 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
+ status = "okay";
+ };
};
-
+
&cspi1 {
@@ -130,6 +147,23 @@
- >;
- };
- };
+ >;
+ };
+ };
+
+ usbh1 {
+ pinctrl_usbh1: usbh1 {
@@ -57,11 +57,11 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
+ };
+ };
};
-
+
&sdhci2 {
@@ -139,3 +173,16 @@
- pinctrl-0 = <&pinctrl_sdhc2_1>;
- status = "okay";
+ pinctrl-0 = <&pinctrl_sdhc2_1>;
+ status = "okay";
};
+
+&usbh1 {
@@ -79,9 +79,9 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
--- linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27.dts
+++ linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27.dts
@@ -32,6 +32,24 @@
- clock-frequency = <0>;
- };
- };
+ clock-frequency = <0>;
+ };
+ };
+
+ regulators {
+ compatible = "simple-bus";
@@ -101,11 +101,11 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
+ status = "okay";
+ };
};
-
+
&uart1 {
@@ -87,3 +105,40 @@
- reg = <0x800000 0xf800000>;
- };
+ reg = <0x800000 0xf800000>;
+ };
};
+
+&usbmisc {
diff --git a/patches/linux/3.16/0446-armadeus_add_pm_power_off_function.patch b/patches/linux/3.16/0446-armadeus_add_pm_power_off_function.patch
index 42d0968..ce4a7df 100644
--- a/patches/linux/3.16/0446-armadeus_add_pm_power_off_function.patch
+++ b/patches/linux/3.16/0446-armadeus_add_pm_power_off_function.patch
@@ -3,9 +3,9 @@ Index: linux-3.14-rc7/arch/arm/mach-mxs/mach-mxs.c
--- linux-3.14-rc7.orig/arch/arm/mach-mxs/mach-mxs.c
+++ linux-3.14-rc7/arch/arm/mach-mxs/mach-mxs.c
@@ -242,9 +242,34 @@ static void __init imx28_evk_init(void)
- mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0);
+ mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0);
}
-
+
+#define BM_POWER_RESET_UNLOCK 0xFFFF0000
+#define BV_POWER_RESET_UNLOCK__KEY 0x3E77
+#define BM_POWER_RESET_PWD 0x00000001
@@ -32,8 +32,8 @@ Index: linux-3.14-rc7/arch/arm/mach-mxs/mach-mxs.c
+
static void __init imx28_apf28_init(void)
{
- update_fec_mac_prop(OUI_ARMADEUS);
+ update_fec_mac_prop(OUI_ARMADEUS);
+ pm_power_off = apf28_power_off;
}
-
+
static int apx4devkit_phy_fixup(struct phy_device *phy)
diff --git a/patches/linux/3.16/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch b/patches/linux/3.16/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
index dedb258..6ceeb97 100644
--- a/patches/linux/3.16/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
+++ b/patches/linux/3.16/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
@@ -62,16 +62,16 @@ index 1a3163f..0a4bd62 100644
@@ -132,6 +132,8 @@ enum {
module_param(perdev_minors, int, 0444);
MODULE_PARM_DESC(perdev_minors, "Minors numbers to allocate per device");
-
+
+int mmc_update_ext_csd(struct mmc_card *card);
+
static inline int mmc_blk_part_switch(struct mmc_card *card,
- struct mmc_blk_data *md);
+ struct mmc_blk_data *md);
static int get_card_status(struct mmc_card *card, u32 *status, int retries);
@@ -600,6 +602,18 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
- __func__, status, err);
- }
-
+ __func__, status, err);
+ }
+
+ if ((cmd.opcode == MMC_SWITCH) && ((cmd.arg >> 24) & 0x3)) {
+ /*
+ * In case the IOCTL has modified the EXT_CSD,
@@ -85,8 +85,8 @@ index 1a3163f..0a4bd62 100644
+ }
+
cmd_rel_host:
- mmc_put_card(card);
-
+ mmc_put_card(card);
+
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 6d02012..5db9d8c 100644
--- a/drivers/mmc/core/mmc.c
@@ -98,41 +98,41 @@ index 6d02012..5db9d8c 100644
-static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
+static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd, int update)
{
- int err = 0, idx;
- unsigned int part_size;
+ int err = 0, idx;
+ unsigned int part_size;
@@ -348,7 +348,8 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
- * There are two boot regions of equal size, defined in
- * multiples of 128K.
- */
+ * There are two boot regions of equal size, defined in
+ * multiples of 128K.
+ */
- if (ext_csd[EXT_CSD_BOOT_MULT] && mmc_boot_partition_access(card->host)) {
+ if (ext_csd[EXT_CSD_BOOT_MULT] && mmc_boot_partition_access(card->host) &&
+ !update) {
- for (idx = 0; idx < MMC_NUM_BOOT_PARTITION; idx++) {
- part_size = ext_csd[EXT_CSD_BOOT_MULT] << 17;
- mmc_part_add(card, part_size,
+ for (idx = 0; idx < MMC_NUM_BOOT_PARTITION; idx++) {
+ part_size = ext_csd[EXT_CSD_BOOT_MULT] << 17;
+ mmc_part_add(card, part_size,
@@ -519,7 +520,8 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
- * RPMB regions are defined in multiples of 128K.
- */
- card->ext_csd.raw_rpmb_size_mult = ext_csd[EXT_CSD_RPMB_MULT];
+ * RPMB regions are defined in multiples of 128K.
+ */
+ card->ext_csd.raw_rpmb_size_mult = ext_csd[EXT_CSD_RPMB_MULT];
- if (ext_csd[EXT_CSD_RPMB_MULT] && mmc_host_cmd23(card->host)) {
+ if (ext_csd[EXT_CSD_RPMB_MULT] && mmc_host_cmd23(card->host) &&
+ !update) {
- mmc_part_add(card, ext_csd[EXT_CSD_RPMB_MULT] << 17,
- EXT_CSD_PART_CONFIG_ACC_RPMB,
- "rpmb", 0, false,
+ mmc_part_add(card, ext_csd[EXT_CSD_RPMB_MULT] << 17,
+ EXT_CSD_PART_CONFIG_ACC_RPMB,
+ "rpmb", 0, false,
@@ -983,7 +985,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
- err = mmc_get_ext_csd(card, &ext_csd);
- if (err)
- goto free_card;
+ err = mmc_get_ext_csd(card, &ext_csd);
+ if (err)
+ goto free_card;
- err = mmc_read_ext_csd(card, ext_csd);
+ err = mmc_read_ext_csd(card, ext_csd, 0);
- if (err)
- goto free_card;
-
+ if (err)
+ goto free_card;
+
@@ -1634,6 +1636,22 @@ static void mmc_attach_bus_ops(struct mmc_host *host)
- mmc_attach_bus(host, bus_ops);
+ mmc_attach_bus(host, bus_ops);
}
-
+
+int mmc_update_ext_csd(struct mmc_card *card)
+{
+ u8 *new_ext_csd;
diff --git a/patches/linux/3.16/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch b/patches/linux/3.16/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
index e471dcb..c4ddb08 100644
--- a/patches/linux/3.16/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
+++ b/patches/linux/3.16/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
@@ -3,14 +3,14 @@ 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(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);
+ 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
@@ -20,42 +20,42 @@ Index: linux-3.13/drivers/net/wireless/ti/wlcore/main.c
#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.
- */
+ * 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");
+ 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->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;
+ 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;
+ 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;
-
+ 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);
+ wlcore_adjust_conf(wl);
+
+ wl->irq = platform_get_irq(pdev, 0);
- wl->platform_quirks = pdata->platform_quirks;
- wl->if_ops = pdev_data->if_ops;
-
+ wl->if_ops = pdev_data->if_ops;
+
- if (wl->platform_quirks & WL12XX_PLATFORM_QUIRK_EDGE_IRQ) {
- irqflags = IRQF_TRIGGER_RISING;
- hardirq_fn = wlcore_hardirq;
@@ -66,51 +66,51 @@ Index: linux-3.13/drivers/net/wireless/ti/wlcore/main.c
+
+ wl->irq_flags = irq_get_trigger_type(wl->irq);
+ wl->irq_flags |= IRQF_ONESHOT;
-
- ret = request_threaded_irq(wl->irq, hardirq_fn, wlcore_irq,
+
+ 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;
+ 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;
+
+ int irq_flags;
+
- spinlock_t wl_lock;
-
- enum wlcore_state state;
+ spinlock_t wl_lock;
+
+ enum wlcore_state state;
@@ -393,9 +395,6 @@ struct wl1271 {
- /* Quirks of specific hardware revisions */
- unsigned int quirks;
-
+ /* 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;
-
+ /* 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;
+ bool use_eeprom;
+ int board_ref_clock;
+ int board_tcxo_clock;
- unsigned long platform_quirks;
- bool pwr_in_suspend;
+ bool pwr_in_suspend;
};
-
+
-/* Platform does not support level trigger interrupts */
-#define WL12XX_PLATFORM_QUIRK_EDGE...
[truncated message content] |
|
From: jorasse <jo...@us...> - 2014-07-30 11:13: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 da10efb9dc9ed0ae7b78315dac272c7ab41fd7ad (commit)
from 64f909377bcd7d89a03d3faf1d8650bc5b017ab8 (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 da10efb9dc9ed0ae7b78315dac272c7ab41fd7ad
Author: Eric Jarrige <eri...@ar...>
Date: Wed Jul 30 13:12:33 2014 +0200
[LINUX] 3.16: move to 3.16-rc7
-----------------------------------------------------------------------
Summary of changes:
...3.16-rc5.config => apf27-linux-3.16-rc7.config} | 0
...3.16-rc5.config => apf28-linux-3.16-rc7.config} | 0
...3.16-rc5.config => apf51-linux-3.16-rc7.config} | 0
...-3.16-rc5.config => apf6-linux-3.16-rc7.config} | 0
patches/linux/{3.16-rc5 => 3.16-rc7} | 0
...-lvds_sel-input-from-upstream-clock-gates.patch | 59 --------------------
6 files changed, 0 insertions(+), 59 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.16-rc5.config => apf27-linux-3.16-rc7.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.16-rc5.config => apf28-linux-3.16-rc7.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.16-rc5.config => apf51-linux-3.16-rc7.config} (100%)
rename buildroot/target/device/armadeus/apf6/{apf6-linux-3.16-rc5.config => apf6-linux-3.16-rc7.config} (100%)
rename patches/linux/{3.16-rc5 => 3.16-rc7} (100%)
delete mode 100644 patches/linux/3.16/0506-arm-clk-imx6q-parent-lvds_sel-input-from-upstream-clock-gates.patch
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.16-rc5.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.16-rc7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.16-rc5.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.16-rc7.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.16-rc5.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.16-rc7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.16-rc5.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.16-rc7.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.16-rc5.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.16-rc7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.16-rc5.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.16-rc7.config
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.16-rc5.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.16-rc7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf6/apf6-linux-3.16-rc5.config
rename to buildroot/target/device/armadeus/apf6/apf6-linux-3.16-rc7.config
diff --git a/patches/linux/3.16-rc5 b/patches/linux/3.16-rc7
similarity index 100%
rename from patches/linux/3.16-rc5
rename to patches/linux/3.16-rc7
diff --git a/patches/linux/3.16/0506-arm-clk-imx6q-parent-lvds_sel-input-from-upstream-clock-gates.patch b/patches/linux/3.16/0506-arm-clk-imx6q-parent-lvds_sel-input-from-upstream-clock-gates.patch
deleted file mode 100644
index 0f8c43c..0000000
--- a/patches/linux/3.16/0506-arm-clk-imx6q-parent-lvds_sel-input-from-upstream-clock-gates.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From patchwork Thu Jul 17 10:20:14 2014
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: arm: clk-imx6q: parent lvds_sel input from upstream clock gates
-From: Lucas Stach <l....@pe...>
-X-Patchwork-Id: 371047
-Message-Id: <140...@pe...>
-To: Shawn Guo <sha...@fr...>, Arnd Bergmann <ar...@ar...>,
- Olof Johansson <ol...@li...>
-Cc: ke...@pe..., lin...@li...
-Date: Thu, 17 Jul 2014 12:20:14 +0200
-
-The i.MX6 reference manual doesn't make a clear distinction
-between the fixed clock divider and the enable gate for the
-pcie and sata reference clocks. This lead to the lvds mux
-inputs in the imx6q clk driver to be parented from the
-ref clock (which is the divider) instead of the actual gate,
-which in turn prevents the upstream clock to actually be
-enabled when lvds clk out is active.
-
-This fixes a hard machine hang regression in kernel 3.16 for
-boards where only pcie is active but no sata, as with this
-kernel version the imx6-pcie driver is no longer enabling
-the upstream clock directly but only lvds clk out.
-
-Reported-by: Arne Ruhnau <arn...@ta...>
-Signed-off-by: Lucas Stach <l....@pe...>
-Tested-by: Arne Ruhnau <arn...@ta...>
-
----
-Shawn, this is an urgent fix for 3.16. Can you please
-Ack it so arm-soc people can take this directly?
----
- arch/arm/mach-imx/clk-imx6q.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
-index 8e795dea02ec..8556c787e59c 100644
---- a/arch/arm/mach-imx/clk-imx6q.c
-+++ b/arch/arm/mach-imx/clk-imx6q.c
-@@ -70,7 +70,7 @@ static const char *cko_sels[] = { "cko1", "cko2", };
- static const char *lvds_sels[] = {
- "dummy", "dummy", "dummy", "dummy", "dummy", "dummy",
- "pll4_audio", "pll5_video", "pll8_mlb", "enet_ref",
-- "pcie_ref", "sata_ref",
-+ "pcie_ref_125m", "sata_ref_100m",
- };
-
- enum mx6q_clks {
-@@ -491,7 +491,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
-
- /* All existing boards with PCIe use LVDS1 */
- if (IS_ENABLED(CONFIG_PCI_IMX6))
-- clk_set_parent(clk[lvds1_sel], clk[sata_ref]);
-+ clk_set_parent(clk[lvds1_sel], clk[sata_ref_100m]);
-
- /* Set initial power mode */
- imx6q_set_lpm(WAIT_CLOCKED);
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-07-30 08:13:52
|
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 64f909377bcd7d89a03d3faf1d8650bc5b017ab8 (commit)
from cb5b38a762e49cb7169fecf89a76b8d4940a3e43 (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 64f909377bcd7d89a03d3faf1d8650bc5b017ab8
Author: Eric Jarrige <eri...@ar...>
Date: Wed Jul 30 10:13:31 2014 +0200
[LINUX] 3.15: Fix patch syntax
-----------------------------------------------------------------------
Summary of changes:
...15-armadeus-logo-add_armadeus-project_tux.patch | 18 ++--
patches/linux/3.15/0021-armadeus-apf9328.patch | 50 +++++-----
...s-apf9328-add_board_to_linux_build_system.patch | 18 ++--
.../3.15/0025-armadeus-imx-correct_dma_shift.patch | 12 +-
.../0029-armadeus-add_csi_and_spi_registers.patch | 2 +-
.../3.15/0029b-armadeus-add_csi_registers.patch | 2 +-
...rmadeus-devices-imx1-add_udc_registration.patch | 2 +-
...35-armadeus-re_add_pwm_and_correct_driver.tofix | 42 ++++----
...50-armadeus-add_custom_drivers_to_kconfig.patch | 4 +-
...02_integrate_driver_to_linux_build_system.patch | 6 +-
...chscreen-add_driver_to_linux_build_system.patch | 10 +-
.../0076-Add-tsc210x-device-tree-support.patch | 42 ++++----
...eus-clock_correct_mxc_decode_pll_for_imx1.tofix | 20 ++--
...madeus-clock-imx1_avoid_crash_with_module.tofix | 12 +-
...-tsc210x-device-tree-support-for-apf27dev.patch | 8 +-
...deus-dts-apf27dev-fixes-user-led-polarity.patch | 12 +-
...1-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch | 8 +-
...dts-apf27dev-add_gpio_key_wakeup_behavior.patch | 12 +-
...-armadeus-fixes-vpu-spll-clock-dependency.patch | 2 +-
.../3.15/0400-Add-apf51-basic-dt-support.patch | 22 ++--
.../0401-armadeus-add_apf51dev_baseboard.patch | 72 +++++++-------
...-imx51_dts-add_usbphy_for_host1_and_host2.patch | 35 ++++---
...51-chipidea-usbmisc_imx-add_imx51_support.patch | 26 +++---
...adeus-chipidea-add_node_to_select_clk_phy.patch | 18 ++--
...us-imx51-dts-add-pin-definition-for-uart1.patch | 12 +-
...imx-drm-fix_clk_polarity_for_apf51_screen.patch | 12 +-
...dts-apf51dev-add_gpio_key_wakeup_behavior.patch | 30 +-----
.../3.15/0420-armadeus-Add-apf28dev-dts.patch | 14 ++--
...ot_link_otg_phy_clock_directly_to_osc_ref.patch | 12 +-
..._star_completion_for_source_in_menuconfig.patch | 21 ++--
...low_to_use_the_wakeupalarm_functionnality.patch | 12 +-
.../3.15/0444-armadeus-imx27-add-usb.patch.tofix | 80 ++++++++--------
...deus-add-apf27-apf27dev-dts-for-USB.patch.tofix | 44 ++++----
.../0446-armadeus_add_pm_power_off_function.patch | 8 +-
...around-fec-tx-queue-timeouts-when-SATA-SD.patch | 2 +-
...c-core-Update-ext_csd-if-touched-by-ioctl.patch | 58 ++++++------
...6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch | 106 ++++++++++----------
...-remove-pwr_in_suspend-from-platform-data.patch | 48 +++++-----
...-instead-of-enumerations-for-pdata-clocks.patch | 48 +++++-----
...al-device-tree-support-to-the-sdio-module.patch | 38 ++++----
...-8-wlcore-sdio-add-wilink-clock-providers.patch | 26 +++---
...8-wlcore-sdio-get-clocks-from-device-tree.patch | 61 ++++++------
...heck-if-we-got-correct-clock-data-from-DT.patch | 104 ++++++++++----------
...i-add-platfrom-get_max_timeout_count-hook.patch | 24 ++--
...mx-fix-incorrect-max_discard_to-for-uSDHC.patch | 16 ++--
...5-mmc-sdhci-add-platform-set_timeout-hook.patch | 36 ++++----
...t-the-correct-max-timeout-value-for-uSDHC.patch | 16 ++--
...y-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch | 38 ++++----
...04-armadeus-add_sx8674_touchscreen_driver.patch | 10 +-
.../0505-armadeus-add_mcp7940x_rtc_driver.patch | 8 +-
50 files changed, 662 insertions(+), 677 deletions(-)
diff --git a/patches/linux/3.15/0015-armadeus-logo-add_armadeus-project_tux.patch b/patches/linux/3.15/0015-armadeus-logo-add_armadeus-project_tux.patch
index 744c0e0..053b7b8 100644
--- a/patches/linux/3.15/0015-armadeus-logo-add_armadeus-project_tux.patch
+++ b/patches/linux/3.15/0015-armadeus-logo-add_armadeus-project_tux.patch
@@ -3,9 +3,9 @@ Index: linux-2.6.36/drivers/video/logo/Kconfig
--- linux-2.6.36.orig/drivers/video/logo/Kconfig 2010-10-20 22:30:22.000000000 +0200
+++ linux-2.6.36/drivers/video/logo/Kconfig 2010-10-21 14:29:22.000000000 +0200
@@ -82,4 +82,11 @@
- depends on M32R
- default y
-
+ depends on M32R
+ default y
+
+config LOGO_ARMADEUS_CLUT224
+ bool "224-color Armadeus Linux logo"
+ depends on ARM
@@ -19,15 +19,15 @@ Index: linux-2.6.36/drivers/video/logo/logo.c
--- linux-2.6.36.orig/drivers/video/logo/logo.c 2010-10-20 22:30:22.000000000 +0200
+++ linux-2.6.36/drivers/video/logo/logo.c 2010-10-21 14:29:22.000000000 +0200
@@ -100,6 +100,10 @@
- /* M32R Linux logo */
- logo = &logo_m32r_clut224;
+ /* M32R Linux logo */
+ logo = &logo_m32r_clut224;
#endif
+#ifdef CONFIG_LOGO_ARMADEUS_CLUT224
+ /* Armadeus Linux logo */
+ logo = &logo_armadeus_clut224;
+#endif
- }
- return logo;
+ }
+ return logo;
}
Index: linux-2.6.36/include/linux/linux_logo.h
===================================================================
@@ -50,9 +50,9 @@ Index: linux-2.6.36/drivers/video/logo/Makefile
obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o
obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o
+obj-$(CONFIG_LOGO_ARMADEUS_CLUT224) += logo_armadeus_clut224.o
-
+
obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o
-
+
Index: linux-2.6.36/drivers/video/logo/logo_armadeus_clut224.ppm
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/linux/3.15/0021-armadeus-apf9328.patch b/patches/linux/3.15/0021-armadeus-apf9328.patch
index 7abfd66..103cb6e 100644
--- a/patches/linux/3.15/0021-armadeus-apf9328.patch
+++ b/patches/linux/3.15/0021-armadeus-apf9328.patch
@@ -369,7 +369,7 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf9328.c
+#include <asm/system.h>
+#include <asm/pgtable.h>
+#include <asm/page.h>
-
+
+#include <asm/mach/map.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -415,17 +415,17 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf9328.c
+#ifdef CONFIG_ARMADEUS_MAX1027
+#include <linux/spi/max1027.h>
+#endif
-
+
static const int apf9328_pins[] __initconst = {
- /* UART1 */
+ /* UART1 */
@@ -41,10 +87,225 @@
- PB29_PF_UART2_RTS,
- PB30_PF_UART2_TXD,
- PB31_PF_UART2_RXD,
+ PB29_PF_UART2_RTS,
+ PB30_PF_UART2_TXD,
+ PB31_PF_UART2_RXD,
+#ifdef CONFIG_I2C_IMX
- /* I2C */
- PA15_PF_I2C_SDA,
- PA16_PF_I2C_SCL,
+ /* I2C */
+ PA15_PF_I2C_SDA,
+ PA16_PF_I2C_SCL,
+#endif
+#ifdef CONFIG_MXC_PWM
+ PA2_PF_PWM0,
@@ -641,19 +641,19 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf9328.c
+ .id = 0,
};
+#endif /* CONFIG_IMX_BACKLIGHT */
-
+
/*
* The APF9328 can have up to 32MB NOR Flash
@@ -105,11 +366,19 @@
- .flags = IMXUART_HAVE_RTSCTS,
+ .flags = IMXUART_HAVE_RTSCTS,
};
-
+
+#ifdef CONFIG_I2C_IMX
static const struct imxi2c_platform_data apf9328_i2c_data __initconst = {
- .bitrate = 100000,
+ .bitrate = 100000,
};
+#endif /* CONFIG_I2C_IMX */
-
+
static struct platform_device *devices[] __initdata = {
+#ifdef CONFIG_IMX_BACKLIGHT
+ &imxbl_device,
@@ -661,13 +661,13 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf9328.c
+#if defined(CONFIG_SND_IMX_PCM) || defined(CONFIG_SND_IMX_PCM_MODULE)
+ &apf9328_ssi_device,
+#endif
- &apf9328_flash_device,
- &dm9000x_device,
+ &apf9328_flash_device,
+ &dm9000x_device,
};
@@ -125,11 +394,31 @@
- imx1_add_imx_uart0(NULL);
- imx1_add_imx_uart1(&uart1_pdata);
-
+ imx1_add_imx_uart0(NULL);
+ imx1_add_imx_uart1(&uart1_pdata);
+
+#ifdef CONFIG_SPI_IMX
+#if defined(CONFIG_ARMADEUS_MAX1027) || defined(CONFIG_SPIDEV)
+ mxc_gpio_mode(GPIO_PORTC | IMX_SPI1_SS_PIN | GPIO_OUT | GPIO_GPIO);
@@ -680,7 +680,7 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf9328.c
+#endif
+#endif
+#ifdef CONFIG_I2C_IMX
- imx1_add_imx_i2c(&apf9328_i2c_data);
+ imx1_add_imx_i2c(&apf9328_i2c_data);
+#endif
+#ifdef CONFIG_USB_IMX
+ imx1_add_udc(&apf9328_udc_0_data);
@@ -688,13 +688,13 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/mach-apf9328.c
+/*#ifdef CONFIG_MXC_PWM
+ imx1_add_mxc_pwm();
+#endif*/
-
- dm9000_resources[2].start = gpio_to_irq(IMX_GPIO_NR(2, 14));
- dm9000_resources[2].end = gpio_to_irq(IMX_GPIO_NR(2, 14));
- platform_add_devices(devices, ARRAY_SIZE(devices));
+
+ dm9000_resources[2].start = gpio_to_irq(IMX_GPIO_NR(2, 14));
+ dm9000_resources[2].end = gpio_to_irq(IMX_GPIO_NR(2, 14));
+ platform_add_devices(devices, ARRAY_SIZE(devices));
+ apf9328_baseboard_init();
}
-
+
static void __init apf9328_timer_init(void)
Index: linux-3.8-rc1/arch/arm/mach-imx/apf9328-dev.c
===================================================================
diff --git a/patches/linux/3.15/0024-armadeus-apf9328-add_board_to_linux_build_system.patch b/patches/linux/3.15/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
index 8ff0c75..7dfaa54 100644
--- a/patches/linux/3.15/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
+++ b/patches/linux/3.15/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
@@ -3,18 +3,18 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/Kconfig
--- linux-3.8-rc1.orig/arch/arm/mach-imx/Kconfig 2012-12-22 02:19:00.000000000 +0100
+++ linux-3.8-rc1/arch/arm/mach-imx/Kconfig 2013-01-01 21:22:49.000000000 +0100
@@ -202,10 +202,43 @@
- bool "APF9328"
- select IMX_HAVE_PLATFORM_IMX_I2C
- select IMX_HAVE_PLATFORM_IMX_UART
+ bool "APF9328"
+ select IMX_HAVE_PLATFORM_IMX_I2C
+ select IMX_HAVE_PLATFORM_IMX_UART
+ select IMX_HAVE_PLATFORM_SPI_IMX
+ select IMX_HAVE_PLATFORM_IMX_FB
+ select IMX_HAVE_PLATFORM_MXC_PWM
+ select IMX_HAVE_PLATFORM_IMX_UDC
+ select SERIAL_IMX_UART1
- select SOC_IMX1
- help
- Say Yes here if you are using the Armadeus APF9328 development board
-
+ select SOC_IMX1
+ help
+ Say Yes here if you are using the Armadeus APF9328 development board
+
+choice
+ prompt "Flash available on board"
+ depends on MACH_APF9328
@@ -44,7 +44,7 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/Kconfig
+endchoice
+
endif
-
+
if ARCH_MULTI_V5
Index: linux-3.8-rc1/arch/arm/mach-imx/Makefile
===================================================================
@@ -55,6 +55,6 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/Makefile
obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o
obj-$(CONFIG_MACH_APF9328) += mach-apf9328.o
+obj-$(CONFIG_MACH_APF9328_DEV) += apf9328-dev.o
-
+
# i.MX21 based machines
obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o
diff --git a/patches/linux/3.15/0025-armadeus-imx-correct_dma_shift.patch b/patches/linux/3.15/0025-armadeus-imx-correct_dma_shift.patch
index a88f110..687c248 100644
--- a/patches/linux/3.15/0025-armadeus-imx-correct_dma_shift.patch
+++ b/patches/linux/3.15/0025-armadeus-imx-correct_dma_shift.patch
@@ -8,11 +8,11 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/clk-imx1.c
--- linux-3.8-rc1.orig/arch/arm/mach-imx/clk-imx1.c 2012-12-22 02:19:00.000000000 +0100
+++ linux-3.8-rc1/arch/arm/mach-imx/clk-imx1.c 2013-01-01 21:19:56.000000000 +0100
@@ -72,7 +72,7 @@
- clk[per3] = imx_clk_divider("per3", "spll", CCM_PCDR, 16, 7);
- clk[clko] = imx_clk_mux("clko", CCM_CSCR, 29, 3, clko_sel_clks,
- ARRAY_SIZE(clko_sel_clks));
+ clk[per3] = imx_clk_divider("per3", "spll", CCM_PCDR, 16, 7);
+ clk[clko] = imx_clk_mux("clko", CCM_CSCR, 29, 3, clko_sel_clks,
+ ARRAY_SIZE(clko_sel_clks));
- clk[dma_gate] = imx_clk_gate("dma_gate", "hclk", SCM_GCCR, 4);
+ clk[dma_gate] = imx_clk_gate("dma_gate", "hclk", SCM_GCCR, 3);
- clk[csi_gate] = imx_clk_gate("csi_gate", "hclk", SCM_GCCR, 2);
- clk[mma_gate] = imx_clk_gate("mma_gate", "hclk", SCM_GCCR, 1);
- clk[usbd_gate] = imx_clk_gate("usbd_gate", "clk48m", SCM_GCCR, 0);
+ clk[csi_gate] = imx_clk_gate("csi_gate", "hclk", SCM_GCCR, 2);
+ clk[mma_gate] = imx_clk_gate("mma_gate", "hclk", SCM_GCCR, 1);
+ clk[usbd_gate] = imx_clk_gate("usbd_gate", "clk48m", SCM_GCCR, 0);
diff --git a/patches/linux/3.15/0029-armadeus-add_csi_and_spi_registers.patch b/patches/linux/3.15/0029-armadeus-add_csi_and_spi_registers.patch
index 08447f3..5884050 100644
--- a/patches/linux/3.15/0029-armadeus-add_csi_and_spi_registers.patch
+++ b/patches/linux/3.15/0029-armadeus-add_csi_and_spi_registers.patch
@@ -10,5 +10,5 @@ Index: linux-3.8-rc1/drivers/spi/spi-imx.c
+#define MXC_PERIOD 0x14
+#define MXC_DMA 0x18
#define MXC_RESET 0x1c
-
+
/* generic defines to abstract from the different register layouts */
diff --git a/patches/linux/3.15/0029b-armadeus-add_csi_registers.patch b/patches/linux/3.15/0029b-armadeus-add_csi_registers.patch
index dace792..856b0b3 100644
--- a/patches/linux/3.15/0029b-armadeus-add_csi_registers.patch
+++ b/patches/linux/3.15/0029b-armadeus-add_csi_registers.patch
@@ -10,7 +10,7 @@ Index: linux-3.8-rc1/drivers/media/platform/soc_camera/mx1_camera.c
#define CSISR 0x08 /* CSI Status Register */
+#define CSISTATR 0x0C
#define CSIRXR 0x10 /* CSI RxFIFO Register */
-
+
+#define CSICR1_RXOR_INTEN (1 << 24)
+#define CSICR1_RXFF_INTEN (1 << 18)
#define CSICR1_RXFF_LEVEL(x) (((x) & 0x3) << 19)
diff --git a/patches/linux/3.15/0030-armadeus-devices-imx1-add_udc_registration.patch b/patches/linux/3.15/0030-armadeus-devices-imx1-add_udc_registration.patch
index bf94207..6a4a7c2 100644
--- a/patches/linux/3.15/0030-armadeus-devices-imx1-add_udc_registration.patch
+++ b/patches/linux/3.15/0030-armadeus-devices-imx1-add_udc_registration.patch
@@ -8,7 +8,7 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/devices-imx1.h
--- linux-3.8-rc1.orig/arch/arm/mach-imx/devices-imx1.h 2012-12-22 02:19:00.000000000 +0100
+++ linux-3.8-rc1/arch/arm/mach-imx/devices-imx1.h 2013-01-01 21:19:56.000000000 +0100
@@ -28,3 +28,7 @@
-
+
#define imx1_add_spi_imx0(pdata) imx1_add_cspi(0, pdata)
#define imx1_add_spi_imx1(pdata) imx1_add_cspi(1, pdata)
+
diff --git a/patches/linux/3.15/0035-armadeus-re_add_pwm_and_correct_driver.tofix b/patches/linux/3.15/0035-armadeus-re_add_pwm_and_correct_driver.tofix
index 7746b71..16468ce 100644
--- a/patches/linux/3.15/0035-armadeus-re_add_pwm_and_correct_driver.tofix
+++ b/patches/linux/3.15/0035-armadeus-re_add_pwm_and_correct_driver.tofix
@@ -3,9 +3,9 @@ Index: linux-3.3.5/arch/arm/mach-imx/clock-imx1.c
--- linux-3.3.5.orig/arch/arm/mach-imx/clock-imx1.c
+++ linux-3.3.5/arch/arm/mach-imx/clock-imx1.c
@@ -535,6 +535,12 @@ static struct clk uart_clk = {
- .set_rate = _clk_parent_set_rate,
+ .set_rate = _clk_parent_set_rate,
};
-
+
+static struct clk pwm_clk = {
+ .parent = &perclk[0],
+ .round_rate = _clk_parent_round_rate,
@@ -13,24 +13,24 @@ Index: linux-3.3.5/arch/arm/mach-imx/clock-imx1.c
+};
+
static struct clk i2c_clk = {
- .parent = &hclk,
- .round_rate = _clk_parent_round_rate,
+ .parent = &hclk,
+ .round_rate = _clk_parent_round_rate,
@@ -590,6 +596,7 @@ static struct clk_lookup lookups[] __ini
- _REGISTER_CLOCK("imx1-uart.0", NULL, uart_clk)
- _REGISTER_CLOCK("imx1-uart.1", NULL, uart_clk)
- _REGISTER_CLOCK("imx1-uart.2", NULL, uart_clk)
+ _REGISTER_CLOCK("imx1-uart.0", NULL, uart_clk)
+ _REGISTER_CLOCK("imx1-uart.1", NULL, uart_clk)
+ _REGISTER_CLOCK("imx1-uart.2", NULL, uart_clk)
+ _REGISTER_CLOCK(NULL, "pwm", pwm_clk)
- _REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk)
- _REGISTER_CLOCK("imx1-cspi.0", NULL, spi_clk)
- _REGISTER_CLOCK("imx1-cspi.1", NULL, spi_clk)
+ _REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk)
+ _REGISTER_CLOCK("imx1-cspi.0", NULL, spi_clk)
+ _REGISTER_CLOCK("imx1-cspi.1", NULL, spi_clk)
Index: linux-3.3.5/arch/arm/plat-mxc/devices/platform-mxc_pwm.c
===================================================================
--- linux-3.3.5.orig/arch/arm/plat-mxc/devices/platform-mxc_pwm.c
+++ linux-3.3.5/arch/arm/plat-mxc/devices/platform-mxc_pwm.c
@@ -19,6 +19,11 @@
#define imx_mxc_pwm_data_entry(soc, _id, _hwid, _size) \
- [_id] = imx_mxc_pwm_data_entry_single(soc, _id, _hwid, _size)
-
+ [_id] = imx_mxc_pwm_data_entry_single(soc, _id, _hwid, _size)
+
+#ifdef CONFIG_SOC_IMX1
+const struct imx_mxc_pwm_data imx1_mxc_pwm_data __initconst =
+ imx_mxc_pwm_data_entry_single(MX1, 0, , SZ_4K);
@@ -38,15 +38,15 @@ Index: linux-3.3.5/arch/arm/plat-mxc/devices/platform-mxc_pwm.c
+
#ifdef CONFIG_SOC_IMX21
const struct imx_mxc_pwm_data imx21_mxc_pwm_data __initconst =
- imx_mxc_pwm_data_entry_single(MX21, 0, , SZ_4K);
+ imx_mxc_pwm_data_entry_single(MX21, 0, , SZ_4K);
Index: linux-3.3.5/arch/arm/plat-mxc/pwm.c
===================================================================
--- linux-3.3.5.orig/arch/arm/plat-mxc/pwm.c
+++ linux-3.3.5/arch/arm/plat-mxc/pwm.c
@@ -116,9 +116,35 @@ int pwm_config(struct pwm_device *pwm, i
- * both the prescaler (/1 .. /128) and then by CLKSEL
- * (/2 .. /16).
- */
+ * both the prescaler (/1 .. /128) and then by CLKSEL
+ * (/2 .. /16).
+ */
- u32 max = readl(pwm->mmio_base + MX1_PWMP);
- u32 p = max * duty_ns / period_ns;
- writel(max - p, pwm->mmio_base + MX1_PWMS);
@@ -79,9 +79,9 @@ Index: linux-3.3.5/arch/arm/plat-mxc/pwm.c
+ cr |= (((prescale-1)&0xef)<<8)|1<<4;
+ writel(cr, pwm->mmio_base+MX1_PWMC);
+
- } else {
- BUG();
- }
+ } else {
+ BUG();
+ }
Index: linux-3.3.5/arch/arm/plat-mxc/include/mach/mx1.h
===================================================================
--- linux-3.3.5.orig/arch/arm/plat-mxc/include/mach/mx1.h
@@ -102,11 +102,11 @@ Index: linux-3.3.5/arch/arm/mach-imx/devices-imx1.h
@@ -30,6 +30,10 @@ extern const struct imx_spi_imx_data imx
#define imx1_add_spi_imx0(pdata) imx1_add_cspi(0, pdata)
#define imx1_add_spi_imx1(pdata) imx1_add_cspi(1, pdata)
-
+
+extern struct imx_mxc_pwm_data imx1_mxc_pwm_data[];
+#define imx1_add_mxc_pwm() \
+ imx_add_mxc_pwm(&imx1_mxc_pwm_data[0])
+
extern const struct imx_imx_udc_data imx1_imx_udc_data;
#define imx1_add_udc(pdata) \
- imx_add_imx_udc(&imx1_imx_udc_data, pdata)
+ imx_add_imx_udc(&imx1_imx_udc_data, pdata)
diff --git a/patches/linux/3.15/0050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/3.15/0050-armadeus-add_custom_drivers_to_kconfig.patch
index 03d3a87..9a18198 100644
--- a/patches/linux/3.15/0050-armadeus-add_custom_drivers_to_kconfig.patch
+++ b/patches/linux/3.15/0050-armadeus-add_custom_drivers_to_kconfig.patch
@@ -5,9 +5,9 @@ Index: linux-3.8-rc1/drivers/Kconfig
--- linux-3.8-rc1.orig/drivers/Kconfig 2012-12-22 02:19:00.000000000 +0100
+++ linux-3.8-rc1/drivers/Kconfig 2013-01-02 20:28:02.000000000 +0100
@@ -158,4 +158,6 @@
-
+
source "drivers/ipack/Kconfig"
-
+
+source "drivers/armadeus/Kconfig"
+
endmenu
diff --git a/patches/linux/3.15/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch b/patches/linux/3.15/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
index 0a13beb..3e76095 100644
--- a/patches/linux/3.15/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
+++ b/patches/linux/3.15/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
@@ -3,9 +3,9 @@ Index: linux-3.8-rc1/drivers/spi/Kconfig
--- linux-3.8-rc1.orig/drivers/spi/Kconfig 2012-12-22 02:19:00.000000000 +0100
+++ linux-3.8-rc1/drivers/spi/Kconfig 2013-01-01 21:19:56.000000000 +0100
@@ -494,6 +494,14 @@
- sysfs interface, with each line presented as a kind of GPIO
- exposing both switch control and diagnostic feedback.
-
+ sysfs interface, with each line presented as a kind of GPIO
+ exposing both switch control and diagnostic feedback.
+
+config SPI_TSC2102
+ depends on SPI_MASTER
+ depends on HWMON = n || HWMON
diff --git a/patches/linux/3.15/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch b/patches/linux/3.15/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
index 5618f12..2640882 100644
--- a/patches/linux/3.15/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
+++ b/patches/linux/3.15/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
@@ -3,9 +3,9 @@ Index: linux-3.8-rc1/drivers/input/touchscreen/Kconfig
--- linux-3.8-rc1.orig/drivers/input/touchscreen/Kconfig 2012-12-22 02:19:00.000000000 +0100
+++ linux-3.8-rc1/drivers/input/touchscreen/Kconfig 2013-01-01 21:19:56.000000000 +0100
@@ -541,6 +541,20 @@
- To compile this driver as a module, choose M here: the
- module will be called atmel_tsadcc.
-
+ To compile this driver as a module, choose M here: the
+ module will be called atmel_tsadcc.
+
+config TOUCHSCREEN_TSC2102
+ tristate "TSC 2102 based touchscreens"
+ depends on SPI_MASTER
@@ -21,8 +21,8 @@ Index: linux-3.8-rc1/drivers/input/touchscreen/Kconfig
+ module will be called tsc2102_ts.
+
config TOUCHSCREEN_UCB1400
- tristate "Philips UCB1400 touchscreen"
- depends on AC97_BUS
+ tristate "Philips UCB1400 touchscreen"
+ depends on AC97_BUS
Index: linux-3.8-rc1/drivers/input/touchscreen/Makefile
===================================================================
--- linux-3.8-rc1.orig/drivers/input/touchscreen/Makefile 2012-12-22 02:19:00.000000000 +0100
diff --git a/patches/linux/3.15/0076-Add-tsc210x-device-tree-support.patch b/patches/linux/3.15/0076-Add-tsc210x-device-tree-support.patch
index 72c80e6..32ea2d4 100644
--- a/patches/linux/3.15/0076-Add-tsc210x-device-tree-support.patch
+++ b/patches/linux/3.15/0076-Add-tsc210x-device-tree-support.patch
@@ -13,7 +13,7 @@ index 47e67a3..d19cba2 100644
@@ -41,6 +41,10 @@
#include <asm/irq.h>
#include <asm/io.h>
-
+
+#ifdef CONFIG_OF
+#include <linux/of_device.h>
+#endif
@@ -24,7 +24,7 @@ index 47e67a3..d19cba2 100644
@@ -83,6 +87,16 @@
#define SM_TEMP1 1
#define SM_SUSPENDED 2
-
+
+#ifdef CONFIG_OF
+static struct of_device_id tsc210x_spi_of_match[] = {
+ {
@@ -36,24 +36,24 @@ index 47e67a3..d19cba2 100644
+#endif
+
struct tsc210x_spi_req {
- struct spi_device *dev;
- uint16_t command;
+ struct spi_device *dev;
+ uint16_t command;
@@ -380,7 +394,6 @@ static irqreturn_t tsc2102_handler(int irq, void *dev_id)
-
- schedule_work(&dev->work);
- }
+
+ schedule_work(&dev->work);
+ }
-
- return IRQ_HANDLED;
+ return IRQ_HANDLED;
}
-
+
@@ -1075,7 +1088,54 @@ static int tsc210x_probe(struct spi_device *spi)
- struct spi_transfer *spi_buffer;
- int err = -EINVAL;
- u16 rev_id = 0;
+ struct spi_transfer *spi_buffer;
+ int err = -EINVAL;
+ u16 rev_id = 0;
+#ifdef CONFIG_OF
+ const struct of_device_id *match;
+ int status;
-
+
+ pdata = kzalloc(sizeof(struct tsc210x_config), GFP_KERNEL);
+ if (!pdata) {
+ dev_err(&spi->dev, "No memory for tsc210x_config\n");
@@ -98,19 +98,19 @@ index 47e67a3..d19cba2 100644
+ return -ENODEV;
+ }
+#endif
- if (!pdata) {
- printk(KERN_ERR "TSC210x: Platform data not supplied\n");
- return -ENOENT;
+ if (!pdata) {
+ printk(KERN_ERR "TSC210x: Platform data not supplied\n");
+ return -ENOENT;
@@ -1263,7 +1323,9 @@ static int tsc210x_remove(struct spi_device *spi)
- apm_get_power_status = 0;
+ apm_get_power_status = 0;
#endif
- free_irq(spi->irq, &tsc);
+ free_irq(spi->irq, &tsc);
-
+#ifdef CONFIG_OF
+ kfree(dev->pdata);
+#endif
- mutex_unlock(&dev->lock_sync);
-
- return 0;
+ mutex_unlock(&dev->lock_sync);
+
+ return 0;
--
1.8.4.2
diff --git a/patches/linux/3.15/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix b/patches/linux/3.15/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
index 54ce9f8..ee5940b 100644
--- a/patches/linux/3.15/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
+++ b/patches/linux/3.15/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
@@ -10,15 +10,15 @@ Index: linux-2.6.36/arch/arm/plat-mxc/clock.c
@@ -212,6 +212,7 @@
unsigned long mxc_decode_pll(unsigned int reg_val, u32 freq)
{
- long long ll;
+ long long ll;
+ unsigned long quot;
- int mfn_abs;
- unsigned int mfi, mfn, mfd, pd;
-
+ int mfn_abs;
+ unsigned int mfi, mfn, mfd, pd;
+
@@ -222,6 +223,15 @@
-
- mfi = mfi <= 5 ? 5 : mfi;
-
+
+ mfi = mfi <= 5 ? 5 : mfi;
+
+ if (cpu_is_mx1()) {
+ ll = 2 * (unsigned long long)freq *
+ ((mfi << 16) + (mfn << 16) / (mfd + 1));
@@ -28,6 +28,6 @@ Index: linux-2.6.36/arch/arm/plat-mxc/clock.c
+ return (unsigned long)ll;
+ }
+
- mfn_abs = mfn;
-
- /* On all i.MXs except i.MX1 and i.MX21 mfn is a 10bit
+ mfn_abs = mfn;
+
+ /* On all i.MXs except i.MX1 and i.MX21 mfn is a 10bit
diff --git a/patches/linux/3.15/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix b/patches/linux/3.15/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
index 90cc05a..d6a1205 100644
--- a/patches/linux/3.15/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
+++ b/patches/linux/3.15/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
@@ -2,11 +2,11 @@ This patch suppress kernel oops when a driver, compiled as module, get a clock.
--- a/arch/arm/mach-imx/clock-imx1.c 2011-01-09 16:11:35.000000000 +0100
+++ b/arch/arm/mach-imx/clock-imx1.c 2011-01-09 16:11:47.000000000 +0100
@@ -582,7 +582,7 @@
- .con_id = n, \
- .clk = &c, \
- },
+ .con_id = n, \
+ .clk = &c, \
+ },
-static struct clk_lookup lookups[] __initdata = {
+static struct clk_lookup lookups[] = {
- _REGISTER_CLOCK(NULL, "dma", dma_clk)
- _REGISTER_CLOCK("mx1-camera.0", NULL, csi_clk)
- _REGISTER_CLOCK(NULL, "mma", mma_clk)
+ _REGISTER_CLOCK(NULL, "dma", dma_clk)
+ _REGISTER_CLOCK("mx1-camera.0", NULL, csi_clk)
+ _REGISTER_CLOCK(NULL, "mma", mma_clk)
diff --git a/patches/linux/3.15/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch b/patches/linux/3.15/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
index 548c8ea..9e03c13 100644
--- a/patches/linux/3.15/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
+++ b/patches/linux/3.15/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
@@ -11,9 +11,9 @@ index 39a8cb4..cfa797f 100644
--- a/arch/arm/boot/dts/imx27-apf27dev.dts
+++ b/arch/arm/boot/dts/imx27-apf27dev.dts
@@ -72,6 +72,18 @@
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_cspi2_1>;
- status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_cspi2_1>;
+ status = "okay";
+ tsc210x@0 {
+ compatible = "tsc210x";
+ reg = <0>;
@@ -27,7 +27,7 @@ index 39a8cb4..cfa797f 100644
+ tsc210x-irq = <257>; /* GPIO port 6 pin 17 (6-1)*32 + 17 + 64 + 16 */
+ };
};
-
+
&i2c1 {
--
1.8.4.2
diff --git a/patches/linux/3.15/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch b/patches/linux/3.15/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
index 2d341bf..e7f0fc9 100644
--- a/patches/linux/3.15/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
+++ b/patches/linux/3.15/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
@@ -7,11 +7,11 @@ Index: linux-3.15-rc1/arch/arm/boot/dts/imx27-apf27dev.dts
--- linux-3.15-rc1.orig/arch/arm/boot/dts/imx27-apf27dev.dts
+++ linux-3.15-rc1/arch/arm/boot/dts/imx27-apf27dev.dts
@@ -55,7 +55,7 @@
-
- user {
- label = "Heartbeat";
+
+ user {
+ label = "Heartbeat";
- gpios = <&gpio6 14 GPIO_ACTIVE_HIGH>;
+ gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
- linux,default-trigger = "heartbeat";
- };
- };
+ linux,default-trigger = "heartbeat";
+ };
+ };
diff --git a/patches/linux/3.15/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch b/patches/linux/3.15/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
index cb51ef9..8d5b1e4 100644
--- a/patches/linux/3.15/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
+++ b/patches/linux/3.15/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
@@ -7,9 +7,9 @@ Index: linux-3.15-rc1/arch/arm/boot/dts/imx27-apf27.dts
--- linux-3.15-rc1.orig/arch/arm/boot/dts/imx27-apf27.dts
+++ linux-3.15-rc1/arch/arm/boot/dts/imx27-apf27.dts
@@ -80,6 +80,18 @@
- status = "okay";
+ status = "okay";
};
-
+
+&i2c2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c2_1>;
@@ -23,5 +23,5 @@ Index: linux-3.15-rc1/arch/arm/boot/dts/imx27-apf27.dts
+};
+
&nfc {
- status = "okay";
- nand-bus-width = <16>;
+ status = "okay";
+ nand-bus-width = <16>;
diff --git a/patches/linux/3.15/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch b/patches/linux/3.15/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
index d83819d..b030473 100644
--- a/patches/linux/3.15/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
+++ b/patches/linux/3.15/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
@@ -7,11 +7,11 @@ 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 */
+ label = "user";
+ gpios = <&gpio6 13 0>;
+ linux,code = <276>; /* BTN_EXTRA */
+ gpio-key,wakeup;
- };
- };
-
+ };
+ };
+
--
diff --git a/patches/linux/3.15/0230-armadeus-fixes-vpu-spll-clock-dependency.patch b/patches/linux/3.15/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
index 3ce46cd..43d37fa 100644
--- a/patches/linux/3.15/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
+++ b/patches/linux/3.15/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
@@ -10,7 +10,7 @@ Index: linux-3.13/arch/arm/mach-imx/clk-imx27.c
@@ -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", };
diff --git a/patches/linux/3.15/0400-Add-apf51-basic-dt-support.patch b/patches/linux/3.15/0400-Add-apf51-basic-dt-support.patch
index 9136025..d466dac 100644
--- a/patches/linux/3.15/0400-Add-apf51-basic-dt-support.patch
+++ b/patches/linux/3.15/0400-Add-apf51-basic-dt-support.patch
@@ -8,9 +8,9 @@ Index: linux-3.13-rc2/arch/arm/boot/dts/imx51-apf51.dts
--- linux-3.13-rc2.orig/arch/arm/boot/dts/imx51-apf51.dts
+++ linux-3.13-rc2/arch/arm/boot/dts/imx51-apf51.dts
@@ -30,6 +30,19 @@
- clock-frequency = <33554432>;
- };
- };
+ clock-frequency = <33554432>;
+ };
+ };
+
+ regulators {
+ compatible = "simple-bus";
@@ -25,12 +25,12 @@ Index: linux-3.13-rc2/arch/arm/boot/dts/imx51-apf51.dts
+ };
+ };
};
-
+
&fec {
@@ -72,6 +72,43 @@
- MX51_PAD_UART3_TXD__UART3_TXD 0x1c5
- >;
- };
+ MX51_PAD_UART3_TXD__UART3_TXD 0x1c5
+ >;
+ };
+ usbh1 {
+ pinctrl_usbh1_1: usbh1grp-1 {
+ fsl,pins = <
@@ -68,12 +68,12 @@ Index: linux-3.13-rc2/arch/arm/boot/dts/imx51-apf51.dts
+ >;
+ };
+ };
- };
+ };
};
-
+
@@ -87,3 +100,31 @@
- pinctrl-0 = <&pinctrl_uart3>;
- status = "okay";
+ pinctrl-0 = <&pinctrl_uart3>;
+ status = "okay";
};
+
+&usbphy1 {
diff --git a/patches/linux/3.15/0401-armadeus-add_apf51dev_baseboard.patch b/patches/linux/3.15/0401-armadeus-add_apf51dev_baseboard.patch
index c490052..f456c61 100644
--- a/patches/linux/3.15/0401-armadeus-add_apf51dev_baseboard.patch
+++ b/patches/linux/3.15/0401-armadeus-add_apf51dev_baseboard.patch
@@ -8,22 +8,22 @@ Index: linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
--- linux-3.14-rc4.orig/arch/arm/boot/dts/imx51-apf51dev.dts
+++ linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
@@ -66,6 +66,12 @@
- gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "heartbeat";
- };
+ gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "heartbeat";
+ };
+
+ backlight {
+ label = "Backlight";
+ gpios = <&gpio3 4 0>;
+ default-state = "on";
+ };
- };
+ };
};
-
+
@@ -85,6 +91,14 @@
- cs-gpios = <&gpio3 28 GPIO_ACTIVE_LOW>,
- <&gpio3 27 GPIO_ACTIVE_LOW>;
- status = "okay";
+ cs-gpios = <&gpio3 28 GPIO_ACTIVE_LOW>,
+ <&gpio3 27 GPIO_ACTIVE_LOW>;
+ status = "okay";
+
+ spidev: spidev@1 {
+ #address-cells = <1>;
@@ -33,20 +33,20 @@ Index: linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
+ reg = <1>;
+ };
};
-
+
&esdhc1 {
@@ -99,7 +113,6 @@
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_esdhc2>;
- bus-width = <4>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_esdhc2>;
+ bus-width = <4>;
- non-removable;
- status = "okay";
+ status = "okay";
};
-
-@@ -109,6 +122,13 @@
- status = "okay";
+
+@@ -102,6 +115,13 @@
+ status = "okay";
};
-
+
+&uart2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart2_1>;
@@ -55,29 +55,29 @@ Index: linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
+};
+
&iomuxc {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_hog>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_hog>;
@@ -116,6 +136,7 @@
- imx51-apf51dev {
- pinctrl_hog: hoggrp {
- fsl,pins = <
+ imx51-apf51dev {
+ pinctrl_hog: hoggrp {
+ fsl,pins = <
+ MX51_PAD_GPIO1_8__GPIO1_8 0x0C5
- MX51_PAD_EIM_EB2__GPIO2_22 0x0C5
- MX51_PAD_EIM_EB3__GPIO2_23 0x0C5
- MX51_PAD_EIM_CS4__GPIO2_29 0x100
+ MX51_PAD_EIM_EB2__GPIO2_22 0x0C5
+ MX51_PAD_EIM_EB3__GPIO2_23 0x0C5
+ MX51_PAD_EIM_CS4__GPIO2_29 0x100
@@ -125,6 +146,8 @@
- MX51_PAD_CSPI1_SS1__GPIO4_25 0x0C5
- MX51_PAD_GPIO1_2__GPIO1_2 0x0C5
- MX51_PAD_GPIO1_3__GPIO1_3 0x0C5
+ MX51_PAD_CSPI1_SS1__GPIO4_25 0x0C5
+ MX51_PAD_GPIO1_2__GPIO1_2 0x0C5
+ MX51_PAD_GPIO1_3__GPIO1_3 0x0C5
+ MX51_PAD_DI1_D1_CS__GPIO3_4 0x0C5
+ MX51_PAD_EIM_CS3__GPIO2_28 0x0C5
- >;
- };
-
+ >;
+ };
+
@@ -203,6 +203,14 @@
- MX51_PAD_DI1_PIN3__DI1_PIN3 0x5
- >;
- };
+ MX51_PAD_DI1_PIN3__DI1_PIN3 0x5
+ >;
+ };
+ uart2 {
+ pinctrl_uart2_1: uart2grp-1 {
+ fsl,pins = <
@@ -86,6 +86,6 @@ Index: linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
+ >;
+ };
+ };
- };
+ };
};
-
+
diff --git a/patches/linux/3.15/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch b/patches/linux/3.15/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
index 0753b0e..40e8ce1 100644
--- a/patches/linux/3.15/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
+++ b/patches/linux/3.15/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
@@ -7,9 +7,9 @@ Index: linux-3.14-rc4/arch/arm/boot/dts/imx51.dtsi
--- linux-3.14-rc4.orig/arch/arm/boot/dts/imx51.dtsi
+++ linux-3.14-rc4/arch/arm/boot/dts/imx51.dtsi
@@ -195,6 +195,13 @@
- status = "okay";
- };
-
+ status = "okay";
+ };
+
+ usbphy1: usbphy@1 {
+ compatible = "usb-nop-xceiv";
+ clocks = <&clks 0>;
@@ -17,21 +17,22 @@ Index: linux-3.14-rc4/arch/arm/boot/dts/imx51.dtsi
+ status = "okay";
+ };
+
- usbotg: usb@73f80000 {
- compatible = "fsl,imx51-usb", "fsl,imx27-usb";
- reg = <0x73f80000 0x0200>;
+ usbotg: usb@73f80000 {
+ compatible = "fsl,imx51-usb", "fsl,imx27-usb";
+ reg = <0x73f80000 0x0200>;
@@ -211,6 +218,7 @@
- interrupts = <14>;
- clocks = <&clks 108>;
- fsl,usbmisc = <&usbmisc 1>;
+ interrupts = <14>;
+ clocks = <&clks 108>;
+ fsl,usbmisc = <&usbmisc 1>;
+ fsl,usbphy = <&usbphy1>;
- status = "disabled";
- };
-
+ status = "disabled";
+ };
+
@@ -220,6 +228,7 @@
- interrupts = <16>;
- clocks = <&clks 108>;
- fsl,usbmisc = <&usbmisc 2>;
+ interrupts = <16>;
+ clocks = <&clks 108>;
+ fsl,usbmisc = <&usbmisc 2>;
+ fsl,usbphy = <&usbphy1>;
- status = "disabled";
- };
+ status = "disabled";
+ };
+
diff --git a/patches/linux/3.15/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch b/patches/linux/3.15/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
index 1bca689..76a8fd5 100644
--- a/patches/linux/3.15/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
+++ b/patches/linux/3.15/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
@@ -5,7 +5,7 @@ Index: linux-3.12-rc1/drivers/usb/chipidea/usbmisc_imx.c
@@ -21,6 +21,23 @@
#define MX25_USB_PHY_CTRL_OFFSET 0x08
#define MX25_BM_EXTERNAL_VBUS_DIVIDER BIT(23)
-
+
+#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
@@ -27,9 +27,9 @@ Index: linux-3.12-rc1/drivers/usb/chipidea/usbmisc_imx.c
#define MX53_USB_UH2_CTRL_OFFSET 0x14
#define MX53_USB_UH3_CTRL_OFFSET 0x18
@@ -68,6 +85,91 @@ static int usbmisc_imx25_post(struct imx
- return 0;
+ return 0;
}
-
+
+static int usbmisc_imx51_init(struct imx_usbmisc_data *data)
+{
+ void __iomem *reg = NULL;
@@ -117,27 +117,27 @@ Index: linux-3.12-rc1/drivers/usb/chipidea/usbmisc_imx.c
+
static int usbmisc_imx53_init(struct imx_usbmisc_data *data)
{
- void __iomem *reg = NULL;
+ void __iomem *reg = NULL;
@@ -128,6 +230,11 @@ static const struct usbmisc_ops imx25_us
- .post = usbmisc_imx25_post,
+ .post = usbmisc_imx25_post,
};
-
+
+static const struct usbmisc_ops imx51_usbmisc_ops = {
+ .init = usbmisc_imx51_init,
+ .post = usbmisc_imx51_post,
+};
+
static const struct usbmisc_ops imx53_usbmisc_ops = {
- .init = usbmisc_imx53_init,
+ .init = usbmisc_imx53_init,
};
@@ -162,6 +269,10 @@ static const struct of_device_id usbmisc
- .data = &imx25_usbmisc_ops,
- },
- {
+ .data = &imx25_usbmisc_ops,
+ },
+ {
+ .compatible = "fsl,imx51-usbmisc",
+ .data = &imx51_usbmisc_ops,
+ },
+ {
- .compatible = "fsl,imx53-usbmisc",
- .data = &imx53_usbmisc_ops,
- },
+ .compatible = "fsl,imx53-usbmisc",
+ .data = &imx53_usbmisc_ops,
+ },
diff --git a/patches/linux/3.15/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch b/patches/linux/3.15/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
index a2b709a..1b5a3a0 100644
--- a/patches/linux/3.15/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
+++ b/patches/linux/3.15/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
@@ -6,24 +6,24 @@ Index: linux-3.12-rc1/drivers/usb/chipidea/ci_hdrc_imx.c
--- linux-3.12-rc1.orig/drivers/usb/chipidea/ci_hdrc_imx.c
+++ linux-3.12-rc1/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -67,6 +67,9 @@ static struct imx_usbmisc_data *usbmisc_
- if (of_find_property(np, "external-vbus-divider", NULL))
- data->evdo = 1;
-
+ if (of_find_property(np, "external-vbus-divider", NULL))
+ data->evdo = 1;
+
+ if (!of_find_property(np, "ext-clk-en", NULL))
+ data->ext_clk_en = 1;
+
- return data;
+ return data;
}
-
+
Index: linux-3.12-rc1/drivers/usb/chipidea/ci_hdrc_imx.h
===================================================================
--- linux-3.12-rc1.orig/drivers/usb/chipidea/ci_hdrc_imx.h
+++ linux-3.12-rc1/drivers/usb/chipidea/ci_hdrc_imx.h
@@ -14,6 +14,7 @@ struct imx_usbmisc_data {
-
- unsigned int disable_oc:1; /* over current detect disabled */
- unsigned int evdo:1; /* set external vbus divider option */
+
+ 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*/
};
-
+
int imx_usbmisc_init(struct imx_usbmisc_data *);
diff --git a/patches/linux/3.15/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch b/patches/linux/3.15/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
index 077ecfd..38521dd 100644
--- a/patches/linux/3.15/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
+++ b/patches/linux/3.15/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
@@ -13,17 +13,17 @@ index 524ac61..c863f6c 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -760,6 +760,12 @@
- MX51_PAD_UART1_CTS__UART1_CTS 0x1c5
- >;
- };
+ MX51_PAD_UART1_CTS__UART1_CTS 0x1c5
+ >;
+ };
+ pinctrl_uart1_2: uart1grp-2 {
+ fsl,pins = <
+ MX51_PAD_UART1_RXD__UART1_RXD 0x1c5
+ MX51_PAD_UART1_TXD__UART1_TXD 0x1c5
+ >;
+ };
- };
-
- uart2 {
+ };
+
+ uart2 {
--
1.7.4.4
diff --git a/patches/linux/3.15/0413-armadeus-imx-drm-fix_clk_polarity_for_apf51_screen.patch b/patches/linux/3.15/0413-armadeus-imx-drm-fix_clk_polarity_for_apf51_screen.patch
index ae4f19e..825de4a 100644
--- a/patches/linux/3.15/0413-armadeus-imx-drm-fix_clk_polarity_for_apf51_screen.patch
+++ b/patches/linux/3.15/0413-armadeus-imx-drm-fix_clk_polarity_for_apf51_screen.patch
@@ -5,11 +5,11 @@ Index: linux-3.13-rc5/drivers/staging/imx-drm/ipuv3-crtc.c
--- linux-3.13-rc5.orig/drivers/staging/imx-drm/ipuv3-crtc.c
+++ linux-3.13-rc5/drivers/staging/imx-drm/ipuv3-crtc.c
@@ -157,7 +157,7 @@ static int ipu_crtc_mode_set(struct drm_
- sig_cfg.Vsync_pol = 1;
-
- sig_cfg.enable_pol = 1;
+ sig_cfg.Vsync_pol = 1;
+
+ sig_cfg.enable_pol = 1;
- sig_cfg.clk_pol = 1;
+ sig_cfg.clk_pol = 0;
- sig_cfg.width = mode->hdisplay;
- sig_cfg.height = mode->vdisplay;
- sig_cfg.pixel_fmt = out_pixel_fmt;
+ sig_cfg.width = mode->hdisplay;
+ sig_cfg.height = mode->vdisplay;
+ sig_cfg.pixel_fmt = out_pixel_fmt;
diff --git a/patches/linux/3.15/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch b/patches/linux/3.15/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
index 98fe714..48c2c01 100644
--- a/patches/linux/3.15/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
+++ b/patches/linux/3.15/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
@@ -6,29 +6,11 @@ Index: linux-3.15-rc1/arch/arm/boot/dts/imx51-apf51dev.dts
===================================================================
--- linux-3.15-rc1.orig/arch/arm/boot/dts/imx51-apf51dev.dts
+++ linux-3.15-rc1/arch/arm/boot/dts/imx51-apf51dev.dts
-@@ -36,15 +36,15 @@
- vsync-len = <4>;
- hsync-active = <1>;
- vsync-active = <1>;
-- de-active = <1>;
-+ de-active = <1>;
- pixelclk-active = <0>;
- };
- };
-
- port {
- display_in: endpoint {
-- remote-endpoint = <&ipu_di0_disp0>;
-- };
-+ remote-endpoint = <&ipu_di0_disp0>;
-+ };
- };
- };
-
@@ -55,6 +55,7 @@
- label = "user";
- gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
- linux,code = <256>; /* BTN_0 */
+ label = "user";
+ gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
+ linux,code = <256>; /* BTN_0 */
+ gpio-key,wakeup;
- };
- };
+ };
+ };
+
diff --git a/patches/linux/3.15/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.15/0420-armadeus-Add-apf28dev-dts.patch
index 8639882..16f48ad 100644
--- a/patches/linux/3.15/0420-armadeus-Add-apf28dev-dts.patch
+++ b/patches/linux/3.15/0420-armadeus-Add-apf28dev-dts.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Fix spidev
Signed-off-by: Julien Boibessot <jul...@ar...>
---
-Index: linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
+Index: linux-3.15-rc1/arch/arm/boot/dts/imx28-apf28dev.dts
===================================================================
---- linux-3.15.5.orig/arch/arm/boot/dts/imx28-apf28dev.dts
-+++ linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
-@@ -77,6 +77,15 @@
- fsl,voltage = <MXS_VOLTAGE_HIGH>;
- fsl,pull-up = <MXS_PULL_DISABLE>;
+--- linux-3.15-rc1.orig/arch/arm/boot/dts/imx28-apf28dev.dts
++++ linux-3.15-rc1/arch/arm/boot/dts/imx28-apf28dev.dts
+@@ -109,6 +109,15 @@
+ };
+ };
};
+
+ apf28dev_usb0_id_pins: apf28dev-usb0-id-pins@0 {
@@ -23,8 +23,8 @@ Index: linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
+ fsl,pull-up = <MXS_PULL_ENABLE>;
+ };
};
+ };
- lcdif@80030000 {
@@ -143,7 +152,8 @@
ahb@80080000 {
usb0: usb@80080000 {
diff --git a/patches/linux/3.15/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch b/patches/linux/3.15/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
index 4201d7f..43422c2 100644
--- a/patches/linux/3.15/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
+++ b/patches/linux/3.15/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
@@ -7,11 +7,11 @@ Index: linux-3.14-rc3/arch/arm/mach-imx/clk-imx51-imx53.c
--- linux-3.14-rc3.orig/arch/arm/mach-imx/clk-imx51-imx53.c
+++ linux-3.14-rc3/arch/arm/mach-imx/clk-imx51-imx53.c
@@ -304,7 +304,7 @@ static void __init mx5_clocks_common_ini
- clk_set_parent(clk[IMX5_CLK_ESDHC_B_SEL], clk[IMX5_CLK_PLL2_SW]);
-
- /* move usb phy clk to 24MHz */
+ clk_set_parent(clk[IMX5_CLK_ESDHC_B_SEL], clk[IMX5_CLK_PLL2_SW]);
+
+ /* move usb phy clk to 24MHz */
- clk_set_parent(clk[IMX5_CLK_USB_PHY_SEL], clk[IMX5_CLK_OSC]);
+ /*clk_set_parent(clk[IMX5_CLK_USB_PHY_SEL], clk[IMX5_CLK_OSC]);*/
-
- clk_prepare_enable(clk[IMX5_CLK_GPC_DVFS]);
- clk_prepare_enable(clk[IMX5_CLK_AHB_MAX]); /* esdhc3 */
+
+ clk_prepare_enable(clk[IMX5_CLK_GPC_DVFS]);
+ clk_prepare_enable(clk[IMX5_CLK_AHB_MAX]); /* esdhc3 */
diff --git a/patches/linux/3.15/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/patches/linux/3.15/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
index 600752a..59e54f3 100644
--- a/patches/linux/3.15/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
+++ b/patches/linux/3.15/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
@@ -8,21 +8,21 @@ Index: linux-3.12-rc1/scripts/kconfig/zconf.tab.c_shipped
#include <stdbool.h>
+#include <dirent.h>
+#include <sys/stat.h>
-
+
#include "lkc.h"
-
+
@@ -92,6 +94,7 @@
-
+
#define PRINTD 0x0001
#define DEBUG_PARSE 0x0002
+#define BUFF_SIZE 300
-
+
int cdebug = PRINTD;
-
+
@@ -108,6 +111,27 @@ static struct menu *current_menu, *curre
-
-
-
+
+
+
+
+static int isDir(const char *, const char *);
+
@@ -49,7 +49,7 @@ Index: linux-3.12-rc1/scripts/kconfig/zconf.tab.c_shipped
# define YYDEBUG 1
@@ -1922,8 +1946,31 @@ yyreduce:
case 83:
-
+
{
+ char *name;
+ char *ptr;
@@ -58,7 +58,7 @@ Index: linux-3.12-rc1/scripts/kconfig/zconf.tab.c_shipped
+ struct dirent *lecture;
+ DIR *rep;
+
- printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
+ printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
- zconf_nextfile((yyvsp[(2) - (3)].string));
+ name = (yyvsp[(2) -(3)].string);
+ ptr = strchr(name, '*');
@@ -79,3 +79,4 @@ Index: linux-3.12-rc1/scripts/kconfig/zconf.tab.c_shipped
+ }
}
break;
+
diff --git a/patches/linux/3.15/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch b/patches/linux/3.15/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
index c5d2671..1c4ab18 100644
--- a/patches/linux/3.15/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
+++ b/patches/linux/3.15/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
@@ -13,10 +13,10 @@ Index: linux-3.10-rc2/drivers/rtc/rtc-stmp3xxx.c
--- linux-3.10-rc2.orig/drivers/rtc/rtc-stmp3xxx.c
+++ linux-3.10-rc2/drivers/rtc/rtc-stmp3xxx.c
@@ -272,6 +272,7 @@ static int stmp3xxx_rtc_probe(struct pla
- STMP3XXX_RTC_CTRL_ALARM_IRQ_EN,
- rtc_data->io + STMP3XXX_RTC_CTRL_CLR);
-
+ STMP3XXX_RTC_CTRL_ALARM_IRQ_EN,
+ rtc_data->io + STMP3XXX_RTC_CTRL_CLR);
+
+ device_set_wakeup_capable(&pdev->dev, 1);
- rtc_data->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
- &stmp3xxx_rtc_ops, THIS_MODULE);
- if (IS_ERR(rtc_data->rtc)) {
+ rtc_data->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
+ &stmp3xxx_rtc_ops, THIS_MODULE);
+ if (IS_ERR(rtc_data->rtc)) {
diff --git a/patches/linux/3.15/0444-armadeus-imx27-add-usb.patch.tofix b/patches/linux/3.15/0444-armadeus-imx27-add-usb.patch.tofix
index 11de36c..ec38f11 100644
--- a/patches/linux/3.15/0444-armadeus-imx27-add-usb.patch.tofix
+++ b/patches/linux/3.15/0444-armadeus-imx27-add-usb.patch.tofix
@@ -7,19 +7,19 @@ 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;
+ spi0 = &cspi1;
+ spi1 = &cspi2;
+ spi2 = &cspi3;
+ usb0 = &usbotg;
+ usb1 = &usbh1;
+ usb2 = &usbh2;
- };
-
- aitc: aitc-interrupt-controller@e0000000 {
+ };
+
+ aitc: aitc-interrupt-controller@e0000000 {
@@ -411,6 +414,44 @@
- iram = <&iram>;
- };
-
+ iram = <&iram>;
+ };
+
+ usbotg: usb@10024000 {
+ compatible = "fsl,imx27-usb";
+ reg = <0x10024000 0x200>;
@@ -58,23 +58,23 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
+ status = "disabled";
+ };
+
- sahara2: sahara@10025000 {
- compatible = "fsl,imx27-sahara";
- reg = <0x10025000 0x1000>;
+ 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;
+ struct device_node *np = dev->of_node;
+ struct of_phandle_args args;
+ struct imx_usbmisc_data *data;
+ u32 sic;
- int ret;
-
- /*
+ 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, "ext-clk-en", NULL))
+ data->ext_clk_en = 1;
+
+ if (of_find_property(np, "disable-tll", NULL))
+ data->disable_tll = 1;
+
@@ -83,27 +83,27 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
+ data->sic = sic & 0x3;
+ }
+
- return data;
+ 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_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
@@ -120,9 +120,9 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
#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;
+ return 0;
}
-
+
+static int usbmisc_imx27_init(struct imx_usbmisc_data *data)
+{
+ unsigned long flags;
@@ -185,28 +185,28 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
+
static int usbmisc_imx53_init(struct imx_usbmisc_data *data)
{
- void __iomem *reg = NULL;
+ void __iomem *reg = NULL;
@@ -235,6 +307,10 @@ static const struct usbmisc_ops imx51_us
- .post = usbmisc_imx51_post,
+ .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,
+ .init = usbmisc_imx53_init,
};
@@ -273,7 +349,10 @@ static const struct of_device_id usbmisc
- .data = &imx51_usbmisc_ops,
- },
- {
+ .data = &imx51_usbmisc_ops,
+ },
+ {
- .compatible = "fsl,imx53-usbmisc",
+ .compatible = "fsl,imx27-usbmisc",
+ .data = &imx27_usbmisc_ops,
+ },
+ { .compatible = "fsl,imx53-usbmisc",
- .data = &imx53_usbmisc_ops,
- },
- {
+ .data = &imx53_usbmisc_ops,
+ },
+ {
--
diff --git a/patches/linux/3.15/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix b/patches/linux/3.15/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix
index 0a50809..836eaad 100644
--- a/patches/linux/3.15/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix
+++ b/patches/linux/3.15/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix
@@ -5,9 +5,9 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
--- linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27dev.dts
+++ linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27dev.dts
@@ -16,6 +16,17 @@
- model = "Armadeus Systems APF27Dev docking/development board";
- compatible = "armadeus,imx27-apf27dev", "armadeus,imx27-apf27", "fsl,imx27";
-
+ model = "Armadeus Systems APF27Dev docking/development board";
+ compatible = "armadeus,imx27-apf27dev", "armadeus,imx27-apf27", "fsl,imx27";
+
+ regulators {
+ compatible = "simple-bus";
+
@@ -19,13 +19,13 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
+ };
+ };
+
- display: display {
- model = "Chimei-LW700AT9003";
- native-mode = <&timing0>;
+ display: display {
+ model = "Chimei-LW700AT9003";
+ native-mode = <&timing0>;
@@ -56,6 +67,12 @@
- };
- };
-
+ };
+ };
+
+ usbphy1: usbphy@1 {
+ compatible = "usb-nop-xceiv";
+ clocks = <&clks 75>;
@@ -33,12 +33,12 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
+ status = "okay";
+ };
};
-
+
&cspi1 {
@@ -130,6 +147,23 @@
- >;
- };
- };
+ >;
+ };
+ };
+
+ usbh1 {
+ pinctrl_usbh1: usbh1 {
@@ -57,11 +57,11 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
+ };
+ };
};
-
+
&sdhci2 {
@@ -139,3 +173,16 @@
- pinctrl-0 = <&pinctrl_sdhc2_1>;
- status = "okay";
+ pinctrl-0 = <&pinctrl_sdhc2_1>;
+ status = "okay";
};
+
+&usbh1 {
@@ -79,9 +79,9 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
--- linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27.dts
+++ linux-3.13-rc8/arch/arm/boot/dts/imx27-apf27.dts
@@ -32,6 +32,24 @@
- clock-frequency = <0>;
- };
- };
+ clock-frequency = <0>;
+ };
+ };
+
+ regulators {
+ compatible = "simple-bus";
@@ -101,11 +101,11 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
+ status = "okay";
+ };
};
-
+
&uart1 {
@@ -87,3 +105,40 @@
- reg = <0x800000 0xf800000>;
- };
+ reg = <0x800000 0xf800000>;
+ };
};
+
+&usbmisc {
diff --git a/patches/linux/3.15/0446-armadeus_add_pm_power_off_function.patch b/patches/linux/3.15/0446-armadeus_add_pm_power_off_function.patch
index 42d0968..ce4a7df 100644
--- a/patches/linux/3.15/0446-armadeus_add_pm_power_off_function.patch
+++ b/patches/linux/3.15/0446-armadeus_add_pm_power_off_function.patch
@@ -3,9 +3,9 @@ Index: linux-3.14-rc7/arch/arm/mach-mxs/mach-mxs.c
--- linux-3.14-rc7.orig/arch/arm/mach-mxs/mach-mxs.c
+++ linux-3.14-rc7/arch/arm/mach-mxs/mach-mxs.c
@@ -242,9 +242,34 @@ static void __init imx28_evk_init(void)
- mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0);
+ mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0);
}
-
+
+#define BM_POWER_RESET_UNLOCK 0xFFFF0000
+#define BV_POWER_RESET_UNLOCK__KEY 0x3E77
+#define BM_POWER_RESET_PWD 0x00000001
@@ -32,8 +32,8 @@ Index: linux-3.14-rc7/arch/arm/mach-mxs/mach-mxs.c
+
static void __init imx28_apf28_init(void)
{
- update_fec_mac_prop(OUI_ARMADEUS);
+ update_fec_mac_prop(OUI_ARMADEUS);
+ pm_power_off = apf28_power_off;
}
-
+
static int apx4devkit_phy_fixup(struct phy_device *phy)
diff --git a/patches/linux/3.15/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch b/patches/linux/3.15/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
index 354d6ba..34d5655 100644
--- a/patches/linux/3.15/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
+++ b/patches/linux/3.15/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
@@ -44,7 +44,7 @@ index 0120217..ee9a1da 100644
-#define TX_RING_SIZE 16 /* Must be power of two */
+#define TX_RING_SIZE 64 /* Must be power of two */
#define TX_RING_MOD_MASK 15 /* for this to work */
-
+
#define BD_ENET_RX_INT 0x00800000
--
1.8.4.rc3
diff --git a/patches/linux/3.15/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch b/patches/linux/3.15/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
index dedb258..6ceeb97 100644
--- a/patches/linux/3.15/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
+++ b/patches/linux/3.15/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
@@ -62,16 +62,16 @@ index 1a3163f..0a4bd62 100644
@@ -132,6 +132,8 @@ enum {
module_param(perdev_minors, int, 0444);
MODULE_PARM_DESC(perdev_minors, "Minors numbers to allocate per device");
-
+
+int mmc_update_ext_csd(struct mmc_card *card);
+
static inline int mmc_blk_part_switch(struct mmc_card *card,
- struct mmc_blk_data *md);
+ struct mmc_blk_data *md);
static int get_card_status(struct mmc_card *card, u32 *status, int retries);
@@ -600,6 +602,18 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
- __func__, status, err);
- }
-
+ __func__, status, err);
+ }
+
+ if ((cmd.opcode == MMC_SWITCH) && ((cmd.arg >> 24) & 0x3)) {
+ /*
+ * In case the IOCTL has modified the EXT_CSD,
@@ -85,8 +85,8 @@ index 1a3163f..0a4bd62 100644
+ }
+
cmd_rel_host:
- mmc_put_card(card);
-
+ mmc_put_card(card);
+
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 6d02012..5db9d8c 100644
--- a/drivers/mmc/core/mmc.c
@@ -98,41 +98,41 @@ index 6d02012..5db9d8c 100644
-static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
+static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd, int update)
{
- int err = 0, idx;
- unsigned int part_size;
+ int err = 0, idx;
+ unsigned int part_size;
@@ -348,7 +348,8 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
- * There are two boot regions of equal size, defined in
- * multiples of 128K.
- */
+ * There are two boot regions of equal size, defined in
+ * multiples of 128K.
+ */
- if (ext_csd[EXT_CSD_BOOT_MULT] && mmc_boot_partition_access(card->host)) {
+ if (ext_csd[EXT_CSD_BOOT_MULT] && mmc_boot_partition_access(card->host) &&
+ !update) {
- for (idx = 0; idx < MMC_NUM_BOOT_PARTITION; idx++) {
- part_size = ext_csd[EXT_CSD_BOOT_MULT] << 17;
- mmc_part_add(card, part_size,
+ for (idx = 0; idx < MMC_NUM_BOOT_PARTITION; idx++) {
+ part_size = ext_csd[EXT_CSD_BOOT_MULT] << 17;
+ mmc_part_add(card, part_size,
@@ -519,7 +520,8 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
- * RPMB regions are defined in multiples of 128K.
- */
- card->ext_csd.raw_rpmb_size_mult = ext_csd[EXT_CSD_RPMB_MULT];
+ * RPMB regions are defined in multiples of 128K.
+ */
+ card->ext_csd.raw_rpmb_size_mult = ext_csd[EXT_CSD_RPMB_MULT];
- if (ext_csd[EXT_CSD_RPMB_MULT] && mmc_host_cmd23(card->host)) {
+ if (ext_csd[EXT_CSD_RPMB_MULT] && mmc_host_cmd23(card->host) &&
+ !update) {
- mmc_part_add(card, ext_csd[EXT_CSD_RPMB_MULT] << 17,
- EXT_CSD_PART_CONFIG_ACC_RPMB,
- "rpmb", 0, false,
+ mmc_part_add(card, ext_csd[EXT_CSD_RPMB_MULT] << 17,
+ EXT_CSD_PART_CONFIG_ACC_RPMB,
+ "rpmb", 0, false,
@@ -983,7 +985,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
- err = mmc_get_ext_csd(card, &ext_csd);
- if (err)
- goto free_card;
+ err = mmc_get_ext_csd(card, &ext_csd);
+ if (err)
+ goto free_card;
- err = mmc_read_ext_csd(card, ext_csd);
+ err = mmc_read_ext_csd(card, ext_csd, 0);
- if (err)
- goto free_card;
-
+ if (err)
+ goto free_card;
+
@@ -1634,6 +1636,22 @@ static void mmc_attach_bus_ops(struct mmc_host *host)
- mmc_attach_bus(host, bus_ops);
+ mmc_attach_bus(host, bus_ops);
}
-
+
+int mmc_update_ext_csd(struct mmc_card *card)
+{
+ u8 *new_ext_csd;
diff --git a/patches/linux/3.15/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch b/patches/linux/3.15/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
index e471dcb..c4ddb08 100644
--- a/patches/linux/3.15/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
+++ b/patches/linux/3.15/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
@@ -3,14 +3,14 @@ Index: linux-3.13/drivers/net/wireless/ti/wlcore/debugfs.c
--- linux-3.13.orig/drivers/net/wireless/ti/wlcore/debugfs.c
+++...
[truncated message content] |
|
From: jorasse <jo...@us...> - 2014-07-30 05:55:50
|
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 cb5b38a762e49cb7169fecf89a76b8d4940a3e43 (commit)
via 185d7a9fa67058b22836a514d99c48e924ae2e64 (commit)
via c4d34521189a33b1c4ae97f2e148f2ccc8017a28 (commit)
via 77872a969886319d7df0b017c1cb03fcba45b01a (commit)
from 0308252ab0e971a59a07f377f8212829434953e3 (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 cb5b38a762e49cb7169fecf89a76b8d4940a3e43
Author: Philippe Reynes <tr...@ya...>
Date: Tue Jul 29 21:52:23 2014 +0200
[LINUX] 3.15: move to 3.15.7
commit 185d7a9fa67058b22836a514d99c48e924ae2e64
Author: Philippe Reynes <tr...@ya...>
Date: Tue Jul 29 21:52:22 2014 +0200
[LINUX] 3.14: move to 3.14.14
commit c4d34521189a33b1c4ae97f2e148f2ccc8017a28
Author: Philippe Reynes <tr...@ya...>
Date: Tue Jul 29 21:52:21 2014 +0200
[LINUX] 3.10: move to 3.10.50
commit 77872a969886319d7df0b017c1cb03fcba45b01a
Author: Philippe Reynes <tr...@ya...>
Date: Tue Jul 29 21:52:20 2014 +0200
[LINUX] 3.16: move to 3.16-rc5
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...x-3.10.49.config => apf27-linux-3.10.50.config} | 0
...x-3.14.13.config => apf27-linux-3.14.14.config} | 0
...nux-3.15.6.config => apf27-linux-3.15.7.config} | 0
...3.16-rc2.config => apf27-linux-3.16-rc5.config} | 0
...x-3.10.49.config => apf28-linux-3.10.50.config} | 0
...x-3.14.13.config => apf28-linux-3.14.14.config} | 0
...nux-3.15.6.config => apf28-linux-3.15.7.config} | 0
...3.16-rc2.config => apf28-linux-3.16-rc5.config} | 0
...x-3.10.49.config => apf51-linux-3.10.50.config} | 0
...x-3.14.13.config => apf51-linux-3.14.14.config} | 0
...nux-3.15.6.config => apf51-linux-3.15.7.config} | 0
...3.16-rc2.config => apf51-linux-3.16-rc5.config} | 0
patches/linux/{3.10.49 => 3.10.50} | 0
patches/linux/{3.14.13 => 3.14.14} | 0
patches/linux/{3.15.6 => 3.15.7} | 0
18 files changed, 6 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.49.config => apf27-linux-3.10.50.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.14.13.config => apf27-linux-3.14.14.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.15.6.config => apf27-linux-3.15.7.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.16-rc2.config => apf27-linux-3.16-rc5.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.49.config => apf28-linux-3.10.50.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.13.config => apf28-linux-3.14.14.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.15.6.config => apf28-linux-3.15.7.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.16-rc2.config => apf28-linux-3.16-rc5.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.49.config => apf51-linux-3.10.50.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.14.13.config => apf51-linux-3.14.14.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.15.6.config => apf51-linux-3.15.7.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.16-rc2.config => apf51-linux-3.16-rc5.config} (100%)
rename patches/linux/{3.10.49 => 3.10.50} (100%)
rename patches/linux/{3.14.13 => 3.14.14} (100%)
rename patches/linux/{3.15.6 => 3.15.7} (100%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index a622f10..06dc983 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.15.6"
+BR2_DEFAULT_KERNEL_VERSION="3.15.7"
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.15.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.7"
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 b57549a..7b16b3f 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.15.6"
+BR2_DEFAULT_KERNEL_VERSION="3.15.7"
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.15.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.7"
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 88c23a7..3f70028 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.15.6"
+BR2_DEFAULT_KERNEL_VERSION="3.15.7"
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.15.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.7"
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.49.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.50.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.49.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.50.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.13.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.14.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.14.13.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.14.14.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.6.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.15.6.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.15.7.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.16-rc2.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.16-rc5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.16-rc2.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.16-rc5.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.49.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.50.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.49.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.50.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.13.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.14.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.13.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.14.14.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.15.6.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.15.7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.15.6.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.15.7.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.16-rc2.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.16-rc5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.16-rc2.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.16-rc5.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.49.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.50.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.49.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.50.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.13.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.14.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.14.13.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.14.14.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.15.6.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.15.7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.15.6.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.15.7.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.16-rc2.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.16-rc5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.16-rc2.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.16-rc5.config
diff --git a/patches/linux/3.10.49 b/patches/linux/3.10.50
similarity index 100%
rename from patches/linux/3.10.49
rename to patches/linux/3.10.50
diff --git a/patches/linux/3.14.13 b/patches/linux/3.14.14
similarity index 100%
rename from patches/linux/3.14.13
rename to patches/linux/3.14.14
diff --git a/patches/linux/3.15.6 b/patches/linux/3.15.7
similarity index 100%
rename from patches/linux/3.15.6
rename to patches/linux/3.15.7
hooks/post-receive
--
armadeus
|