[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-416-g9300ddab0

[Sébastien S. <ss...@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  9300ddab00a73baedf940f9f00d0d87390e6a167 (commit)
       via  5abbfa4f8deeb82edfb21a59f50ee2b0ee10bb01 (commit)
      from  ff038cd065f60ab03710fdadef7942a1445b32a9 (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 9300ddab00a73baedf940f9f00d0d87390e6a167
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue May 29 09:54:29 2018 +0200

    [LINUX] 4.1: port patch 0700 from 3.14

commit 5abbfa4f8deeb82edfb21a59f50ee2b0ee10bb01
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue May 29 09:53:05 2018 +0200

    [LINUX] 4.1: apf6: enable PCIe

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

Summary of changes:
 .../armadeus/apf6/apf6legacy-linux-4.1.config      |  3 +++
 .../0700-armadeus-pcie_clk_defined_in_uboot.patch  | 22 ++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)
 copy patches/linux/{3.19 => 4.1.mx6_legacy}/0700-armadeus-pcie_clk_defined_in_uboot.patch (55%)

diff --git a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-4.1.config b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-4.1.config
index 32035ebec..0c4544f61 100644
--- a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-4.1.config
+++ b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-4.1.config
@@ -23,6 +23,9 @@ CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
 CONFIG_SOC_IMX6ULL=y
 # CONFIG_SWP_EMULATE is not set
+CONFIG_PCI=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_IMX6=y
 CONFIG_SMP=y
 CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_VMSPLIT_2G=y
diff --git a/patches/linux/3.19/0700-armadeus-pcie_clk_defined_in_uboot.patch b/patches/linux/4.1.mx6_legacy/0700-armadeus-pcie_clk_defined_in_uboot.patch
similarity index 55%
copy from patches/linux/3.19/0700-armadeus-pcie_clk_defined_in_uboot.patch
copy to patches/linux/4.1.mx6_legacy/0700-armadeus-pcie_clk_defined_in_uboot.patch
index 05907405c..d6f0477be 100644
--- a/patches/linux/3.19/0700-armadeus-pcie_clk_defined_in_uboot.patch
+++ b/patches/linux/4.1.mx6_legacy/0700-armadeus-pcie_clk_defined_in_uboot.patch
@@ -6,23 +6,21 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
 Signed-off-by: Sébastien Szymanski <seb...@ar...>
 ---
 
-Index: linux-3.19.3/arch/arm/mach-imx/clk-imx6q.c
+Index: linux-imx_4.1.15_2.0.0_ga/arch/arm/mach-imx/clk-imx6q.c
 ===================================================================
---- linux-3.19.3.orig/arch/arm/mach-imx/clk-imx6q.c
-+++ linux-3.19.3/arch/arm/mach-imx/clk-imx6q.c
-@@ -522,8 +522,13 @@ static void __init imx6q_clocks_init(str
- 	clk_set_parent(clk[IMX6QDL_CLK_SPDIF_SEL], clk[IMX6QDL_CLK_PLL3_PFD3_454M]);
+--- linux-imx_4.1.15_2.0.0_ga.orig/arch/arm/mach-imx/clk-imx6q.c
++++ linux-imx_4.1.15_2.0.0_ga/arch/arm/mach-imx/clk-imx6q.c
+@@ -870,7 +870,12 @@ static void __init imx6q_clocks_init(str
  
  	/* All existing boards with PCIe use LVDS1 */
--	if (IS_ENABLED(CONFIG_PCI_IMX6))
--		clk_set_parent(clk[IMX6QDL_CLK_LVDS1_SEL], clk[IMX6QDL_CLK_SATA_REF_100M]);
-+	if (IS_ENABLED(CONFIG_PCI_IMX6)) {
+ 	if (IS_ENABLED(CONFIG_PCI_IMX6)) {
+-		imx_clk_set_parent(clk[IMX6QDL_CLK_LVDS1_SEL], clk[IMX6QDL_CLK_SATA_REF_100M]);
 +		if (of_machine_is_compatible("armadeus,imx6dl-apf6") ||
 +		    of_machine_is_compatible("armadeus,imx6q-apf6"))
 +			clk_prepare_enable(clk[IMX6QDL_CLK_SATA_REF_100M]);
 +		else
 +			clk_set_parent(clk[IMX6QDL_CLK_LVDS1_SEL], clk[IMX6QDL_CLK_SATA_REF_100M]);
-+	}
- 
- 	/* Set initial power mode */
-	imx6q_set_lpm(WAIT_CLOCKED);
++
+ 		np = of_find_compatible_node(NULL, NULL, "snps,dw-pcie");
+ 		 /* external oscillator is used or not. */
+ 		if (of_property_read_u32(np, "ext_osc", &val) < 0)


hooks/post-receive
-- 
armadeus