[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-538-g536024a
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-538-g536024a
|
From: Julien B a. A. <ar...@us...> - 2014-12-29 17:49:22
|
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 536024a45c3f8653f273b16af2e5c67603017d18 (commit)
via d21e8563f541d660b6e5bc318c3d5b2543b99441 (commit)
via 5c6517e3de603e52592de396f408889967a4354f (commit)
via fad8fae2f33ea4521fbff755966d8025a45632cd (commit)
via 70882a6289cbeabb58baf7f9c5f2bf63c7a6c07b (commit)
via 867be4e8fa810c9e7aff33bc773627096921198b (commit)
from eec9ddb124b46f9bd6e795ab1c353b5c6737f003 (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 536024a45c3f8653f273b16af2e5c67603017d18
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 29 18:47:55 2014 +0100
[BUILDROOT] apf6: moves Linux 3.14 support to 3.14.27
commit d21e8563f541d660b6e5bc318c3d5b2543b99441
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 29 18:43:59 2014 +0100
[BUILDROOT] apf28: moves Linux 3.4 support to 3.4.105
commit 5c6517e3de603e52592de396f408889967a4354f
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 29 18:40:15 2014 +0100
[BUILDROOT] all boards: remove some no more needed Linux config symlinks
commit fad8fae2f33ea4521fbff755966d8025a45632cd
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 29 18:30:02 2014 +0100
[LINUX] 3.18: renames patches 0035, 0076, 0101, 0219, 0230, 0420, 0444 & 0446 (for better understanding)
commit 70882a6289cbeabb58baf7f9c5f2bf63c7a6c07b
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 29 15:33:50 2014 +0100
[LINUX] 3.18: add comments for 0446-armadeus_add_pm_power_off_function.patch
commit 867be4e8fa810c9e7aff33bc773627096921198b
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 29 15:16:55 2014 +0100
[LINUX] 3.18: update comments of 0420-armadeus-Add-apf28dev-dts.patch
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6failsafe_defconfig | 2 +-
.../armadeus/apf27/apf27-linux-3.9-rc4.config | 1 -
...ux-3.4.48.config => apf28-linux-3.4.105.config} | 0
.../device/armadeus/apf28/apf28-linux-3.4.6.config | 1 -
.../armadeus/apf51/apf51-linux-3.14-rc4.config | 1 -
...nux-3.14.8.config => apf6-linux-3.14.27.config} | 0
.../apf6/apf6failsafe-linux-3.14-rc4.config | 1 -
...add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix} | 0
...dd-device-tree-support-to-tsc210x-driver.patch} | 0
...g-as-module-a-driver-registering-a-clock.tofix} | 1 +
...madeus-clock-imx1_avoid_crash_with_module.tofix | 12 ------
...10x-device-tree-declaration-for-apf27dev.patch} | 0
...lk-imx27-fixes-vpu-spll-clock-dependency.patch} | 0
...ch => 0420-armadeus-Improve-apf28dev-dts.patch} | 6 +---
...-armadeus-usb-chipidea-add-imx27-support.patch} | 0
...6-armadeus-mxs-add-pm_power_off-function.patch} | 10 +++++
.../0446-armadeus_add_pm_power_off_function.patch | 39 --------------------
patches/linux/{3.4.48 => 3.4.105} | 0
18 files changed, 13 insertions(+), 61 deletions(-)
delete mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.9-rc4.config
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.4.48.config => apf28-linux-3.4.105.config} (100%)
delete mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.4.6.config
delete mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.14-rc4.config
rename buildroot/target/device/armadeus/apf6/{apf6-linux-3.14.8.config => apf6-linux-3.14.27.config} (100%)
delete mode 120000 buildroot/target/device/armadeus/apf6/apf6failsafe-linux-3.14-rc4.config
rename patches/linux/3.18/{0035-armadeus-re_add_pwm_and_correct_driver.tofix => 0035-armadeus-re-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix} (100%)
rename patches/linux/3.18/{0076-Add-tsc210x-device-tree-support.patch => 0076-roch-Add-device-tree-support-to-tsc210x-driver.patch} (100%)
copy patches/linux/{3.10/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix => 3.18/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix} (99%)
delete mode 100644 patches/linux/3.18/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
rename patches/linux/3.18/{0219-Add-tsc210x-device-tree-support-for-apf27dev.patch => 0219-roch-dts-Add-tsc210x-device-tree-declaration-for-apf27dev.patch} (100%)
rename patches/linux/3.18/{0230-armadeus-fixes-vpu-spll-clock-dependency.patch => 0230-armadeus-clk-imx27-fixes-vpu-spll-clock-dependency.patch} (100%)
rename patches/linux/3.18/{0420-armadeus-Add-apf28dev-dts.patch => 0420-armadeus-Improve-apf28dev-dts.patch} (80%)
rename patches/linux/3.18/{0444-armadeus-imx27-add-usb.patch => 0444-armadeus-usb-chipidea-add-imx27-support.patch} (100%)
copy patches/linux/{3.15/0446-armadeus_add_pm_power_off_function.patch => 3.18/0446-armadeus-mxs-add-pm_power_off-function.patch} (76%)
delete mode 100644 patches/linux/3.18/0446-armadeus_add_pm_power_off_function.patch
copy patches/linux/{3.4.48 => 3.4.105} (100%)
diff --git a/buildroot/configs/apf6failsafe_defconfig b/buildroot/configs/apf6failsafe_defconfig
index 8b0aa35..ceddcca 100644
--- a/buildroot/configs/apf6failsafe_defconfig
+++ b/buildroot/configs/apf6failsafe_defconfig
@@ -11,7 +11,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.14-rc4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.27"
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)failsafe-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.9-rc4.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.9-rc4.config
deleted file mode 120000
index 9e93e0d..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.9-rc4.config
+++ /dev/null
@@ -1 +0,0 @@
-apf27-linux-3.9.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.48.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.105.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.4.48.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.4.105.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.6.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.6.config
deleted file mode 120000
index ba0c3a3..0000000
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.6.config
+++ /dev/null
@@ -1 +0,0 @@
-apf28-linux-3.4.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14-rc4.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14-rc4.config
deleted file mode 120000
index a6a73f6..0000000
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14-rc4.config
+++ /dev/null
@@ -1 +0,0 @@
-apf51-linux-3.14.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.8.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.27.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf6/apf6-linux-3.14.8.config
rename to buildroot/target/device/armadeus/apf6/apf6-linux-3.14.27.config
diff --git a/buildroot/target/device/armadeus/apf6/apf6failsafe-linux-3.14-rc4.config b/buildroot/target/device/armadeus/apf6/apf6failsafe-linux-3.14-rc4.config
deleted file mode 120000
index b23fbcc..0000000
--- a/buildroot/target/device/armadeus/apf6/apf6failsafe-linux-3.14-rc4.config
+++ /dev/null
@@ -1 +0,0 @@
-apf6failsafe-linux-3.14.config
\ No newline at end of file
diff --git a/patches/linux/3.18/0035-armadeus-re_add_pwm_and_correct_driver.tofix b/patches/linux/3.18/0035-armadeus-re-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix
similarity index 100%
rename from patches/linux/3.18/0035-armadeus-re_add_pwm_and_correct_driver.tofix
rename to patches/linux/3.18/0035-armadeus-re-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix
diff --git a/patches/linux/3.18/0076-Add-tsc210x-device-tree-support.patch b/patches/linux/3.18/0076-roch-Add-device-tree-support-to-tsc210x-driver.patch
similarity index 100%
rename from patches/linux/3.18/0076-Add-tsc210x-device-tree-support.patch
rename to patches/linux/3.18/0076-roch-Add-device-tree-support-to-tsc210x-driver.patch
diff --git a/patches/linux/3.10/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix b/patches/linux/3.18/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix
similarity index 99%
copy from patches/linux/3.10/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
copy to patches/linux/3.18/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix
index d6a1205..4edc265 100644
--- a/patches/linux/3.10/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
+++ b/patches/linux/3.18/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix
@@ -1,4 +1,5 @@
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 @@
diff --git a/patches/linux/3.18/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix b/patches/linux/3.18/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
deleted file mode 100644
index d6a1205..0000000
--- a/patches/linux/3.18/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
+++ /dev/null
@@ -1,12 +0,0 @@
-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, \
- },
--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)
diff --git a/patches/linux/3.18/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch b/patches/linux/3.18/0219-roch-dts-Add-tsc210x-device-tree-declaration-for-apf27dev.patch
similarity index 100%
rename from patches/linux/3.18/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
rename to patches/linux/3.18/0219-roch-dts-Add-tsc210x-device-tree-declaration-for-apf27dev.patch
diff --git a/patches/linux/3.18/0230-armadeus-fixes-vpu-spll-clock-dependency.patch b/patches/linux/3.18/0230-armadeus-clk-imx27-fixes-vpu-spll-clock-dependency.patch
similarity index 100%
rename from patches/linux/3.18/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
rename to patches/linux/3.18/0230-armadeus-clk-imx27-fixes-vpu-spll-clock-dependency.patch
diff --git a/patches/linux/3.18/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch
similarity index 80%
rename from patches/linux/3.18/0420-armadeus-Add-apf28dev-dts.patch
rename to patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch
index 8639882..a331255 100644
--- a/patches/linux/3.18/0420-armadeus-Add-apf28dev-dts.patch
+++ b/patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch
@@ -1,9 +1,5 @@
-From 8262b3cd32259533556e6dd8d1cd0a4c77c6acfe Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Mon, 15 Jul 2013 15:26:14 +0200
-Subject: [PATCH] Fix spidev
+Remaining Armadeus tweaks for APF28Dev device tree.
-Signed-off-by: Julien Boibessot <jul...@ar...>
---
Index: linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
===================================================================
diff --git a/patches/linux/3.18/0444-armadeus-imx27-add-usb.patch b/patches/linux/3.18/0444-armadeus-usb-chipidea-add-imx27-support.patch
similarity index 100%
rename from patches/linux/3.18/0444-armadeus-imx27-add-usb.patch
rename to patches/linux/3.18/0444-armadeus-usb-chipidea-add-imx27-support.patch
diff --git a/patches/linux/3.15/0446-armadeus_add_pm_power_off_function.patch b/patches/linux/3.18/0446-armadeus-mxs-add-pm_power_off-function.patch
similarity index 76%
copy from patches/linux/3.15/0446-armadeus_add_pm_power_off_function.patch
copy to patches/linux/3.18/0446-armadeus-mxs-add-pm_power_off-function.patch
index ce4a7df..98eace1 100644
--- a/patches/linux/3.15/0446-armadeus_add_pm_power_off_function.patch
+++ b/patches/linux/3.18/0446-armadeus-mxs-add-pm_power_off-function.patch
@@ -1,3 +1,13 @@
+apf28: add pm_power_off function
+
+When shutting down the board with the poweroff command, an halt is
+actually performed because there is no pm_power_off function defined.
+The SoC is then stuck in an infinite loop.
+
+This patch adds a pm_power_off function to shut down the SoC.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+
Index: linux-3.14-rc7/arch/arm/mach-mxs/mach-mxs.c
===================================================================
--- linux-3.14-rc7.orig/arch/arm/mach-mxs/mach-mxs.c
diff --git a/patches/linux/3.18/0446-armadeus_add_pm_power_off_function.patch b/patches/linux/3.18/0446-armadeus_add_pm_power_off_function.patch
deleted file mode 100644
index ce4a7df..0000000
--- a/patches/linux/3.18/0446-armadeus_add_pm_power_off_function.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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);
- }
-
-+#define BM_POWER_RESET_UNLOCK 0xFFFF0000
-+#define BV_POWER_RESET_UNLOCK__KEY 0x3E77
-+#define BM_POWER_RESET_PWD 0x00000001
-+#define HW_POWER_RESET 0x00000100
-+#define BF_POWER_RESET_UNLOCK(v) \
-+ (((v) << 16) & BM_POWER_RESET_UNLOCK)
-+
-+static void apf28_power_off(void)
-+{
-+ struct device_node *np;
-+ void __iomem *power_base;
-+
-+ np = of_find_node_by_name(NULL, "power");
-+ if (!np)
-+ return;
-+
-+ power_base = of_iomap(np, 0);
-+ if (!power_base)
-+ return;
-+
-+ __mxs_setl(BF_POWER_RESET_UNLOCK(BV_POWER_RESET_UNLOCK__KEY) |
-+ BM_POWER_RESET_PWD, power_base + HW_POWER_RESET);
-+}
-+
- static void __init imx28_apf28_init(void)
- {
- 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.4.48 b/patches/linux/3.4.105
similarity index 100%
copy from patches/linux/3.4.48
copy to patches/linux/3.4.105
hooks/post-receive
--
armadeus
|