[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-331-gec1dc1f9d

[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  ec1dc1f9d8167aa8c4e11b24c11d574e6d5ce3dd (commit)
      from  bcb88e7e3f439875edc39607bd1e66e438b08fc3 (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 ec1dc1f9d8167aa8c4e11b24c11d574e6d5ce3dd
Author: Sébastien Szymanski <seb...@ar...>
Date:   Mon May 23 17:38:57 2022 +0200

    [LINUX] 5.4: add patches for APF6

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

Summary of changes:
 patches/linux/5.4/0702-armadeus-pcie-fix-build.patch      | 15 +++++++++++++++
 ...core-Allow-setting-slot-index-via-device-tree-al.patch |  0
 .../0812-mmc-core-Don-t-allocate-IDA-for-OF-aliases.patch |  0
 3 files changed, 15 insertions(+)
 create mode 100644 patches/linux/5.4/0702-armadeus-pcie-fix-build.patch
 copy patches/linux/{4.19 => 5.4}/0811-mmc-core-Allow-setting-slot-index-via-device-tree-al.patch (100%)
 copy patches/linux/{4.19 => 5.4}/0812-mmc-core-Don-t-allocate-IDA-for-OF-aliases.patch (100%)

diff --git a/patches/linux/5.4/0702-armadeus-pcie-fix-build.patch b/patches/linux/5.4/0702-armadeus-pcie-fix-build.patch
new file mode 100644
index 000000000..2c1d9a8a7
--- /dev/null
+++ b/patches/linux/5.4/0702-armadeus-pcie-fix-build.patch
@@ -0,0 +1,15 @@
+Index: linux-5.4.180/drivers/pci/controller/dwc/pci-imx6.c
+===================================================================
+--- linux-5.4.180.orig/drivers/pci/controller/dwc/pci-imx6.c
++++ linux-5.4.180/drivers/pci/controller/dwc/pci-imx6.c
+@@ -105,7 +105,9 @@ struct imx6_pcie {
+ 
+ /* PCIe Port Logic registers (memory-mapped) */
+ #define PL_OFFSET 0x700
+-
++#define PCIE_PL_PFLR (PL_OFFSET + 0x08)
++#define PCIE_PL_PFLR_LINK_STATE_MASK		(0x3f << 16)
++#define PCIE_PL_PFLR_FORCE_LINK			(1 << 15)
+ #define PCIE_PHY_CTRL (PL_OFFSET + 0x114)
+ #define PCIE_PHY_CTRL_DATA(x)		FIELD_PREP(GENMASK(15, 0), (x))
+ #define PCIE_PHY_CTRL_CAP_ADR		BIT(16)
diff --git a/patches/linux/4.19/0811-mmc-core-Allow-setting-slot-index-via-device-tree-al.patch b/patches/linux/5.4/0811-mmc-core-Allow-setting-slot-index-via-device-tree-al.patch
similarity index 100%
copy from patches/linux/4.19/0811-mmc-core-Allow-setting-slot-index-via-device-tree-al.patch
copy to patches/linux/5.4/0811-mmc-core-Allow-setting-slot-index-via-device-tree-al.patch
diff --git a/patches/linux/4.19/0812-mmc-core-Don-t-allocate-IDA-for-OF-aliases.patch b/patches/linux/5.4/0812-mmc-core-Don-t-allocate-IDA-for-OF-aliases.patch
similarity index 100%
copy from patches/linux/4.19/0812-mmc-core-Don-t-allocate-IDA-for-OF-aliases.patch
copy to patches/linux/5.4/0812-mmc-core-Don-t-allocate-IDA-for-OF-aliases.patch


hooks/post-receive
-- 
armadeus