[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-353-gda10efb
Brought to you by:
sszy
|
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
|