[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-709-g3705a10

[Fabien M <fa...@us...>]

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  3705a10f15fbc879cc74a0f43e908b0ac9bd4dac (commit)
      from  21e0cce99af4f617e34fb847e475cd4f9e67a686 (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 3705a10f15fbc879cc74a0f43e908b0ac9bd4dac
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Apr 22 17:21:42 2015 +0200

    [LINUX][APF6] do not change PCIe clock frequency under Linux (must be done in UBoot)

-----------------------------------------------------------------------

Summary of changes:
 .../0700-armadeus-pcie_clk_defined_in_uboot.patch  |   15 +++++++++++++++
 .../0700-armadeus-pcie_clk_defined_in_uboot.patch  |   15 +++++++++++++++
 2 files changed, 30 insertions(+), 0 deletions(-)
 create mode 100644 patches/linux/3.19/0700-armadeus-pcie_clk_defined_in_uboot.patch
 create mode 100644 patches/linux/4.0/0700-armadeus-pcie_clk_defined_in_uboot.patch

diff --git a/patches/linux/3.19/0700-armadeus-pcie_clk_defined_in_uboot.patch b/patches/linux/3.19/0700-armadeus-pcie_clk_defined_in_uboot.patch
new file mode 100644
index 0000000..2a51bbe
--- /dev/null
+++ b/patches/linux/3.19/0700-armadeus-pcie_clk_defined_in_uboot.patch
@@ -0,0 +1,15 @@
+Index: linux-4.0-rc1/arch/arm/mach-imx/clk-imx6q.c
+===================================================================
+--- linux-4.0-rc1.orig/arch/arm/mach-imx/clk-imx6q.c	2015-04-22 16:21:27.538399032 +0200
++++ linux-4.0-rc1/arch/arm/mach-imx/clk-imx6q.c	2015-04-22 16:23:15.822395833 +0200
+@@ -522,7 +522,9 @@
+ 	clk_set_parent(clk[IMX6QDL_CLK_SPDIF_SEL], clk[IMX6QDL_CLK_PLL3_PFD3_454M]);
+ 
+ 	/* All existing boards with PCIe use LVDS1 */
+-	if (IS_ENABLED(CONFIG_PCI_IMX6))
++	if (	IS_ENABLED(CONFIG_PCI_IMX6)
++		&& !of_machine_is_compatible("armadeus,imx6dl-apf6")
++		&& !of_machine_is_compatible("armadeus,imx6q-apf6"))
+ 		clk_set_parent(clk[IMX6QDL_CLK_LVDS1_SEL], clk[IMX6QDL_CLK_SATA_REF_100M]);
+ 
+ 	/* Set initial power mode */
diff --git a/patches/linux/4.0/0700-armadeus-pcie_clk_defined_in_uboot.patch b/patches/linux/4.0/0700-armadeus-pcie_clk_defined_in_uboot.patch
new file mode 100644
index 0000000..2a51bbe
--- /dev/null
+++ b/patches/linux/4.0/0700-armadeus-pcie_clk_defined_in_uboot.patch
@@ -0,0 +1,15 @@
+Index: linux-4.0-rc1/arch/arm/mach-imx/clk-imx6q.c
+===================================================================
+--- linux-4.0-rc1.orig/arch/arm/mach-imx/clk-imx6q.c	2015-04-22 16:21:27.538399032 +0200
++++ linux-4.0-rc1/arch/arm/mach-imx/clk-imx6q.c	2015-04-22 16:23:15.822395833 +0200
+@@ -522,7 +522,9 @@
+ 	clk_set_parent(clk[IMX6QDL_CLK_SPDIF_SEL], clk[IMX6QDL_CLK_PLL3_PFD3_454M]);
+ 
+ 	/* All existing boards with PCIe use LVDS1 */
+-	if (IS_ENABLED(CONFIG_PCI_IMX6))
++	if (	IS_ENABLED(CONFIG_PCI_IMX6)
++		&& !of_machine_is_compatible("armadeus,imx6dl-apf6")
++		&& !of_machine_is_compatible("armadeus,imx6q-apf6"))
+ 		clk_set_parent(clk[IMX6QDL_CLK_LVDS1_SEL], clk[IMX6QDL_CLK_SATA_REF_100M]);
+ 
+ 	/* Set initial power mode */


hooks/post-receive
-- 
armadeus