[PATCH] UBUNTU: [Config] arm64: Enable PCI_MESON module

[Isaac True]

BugLink: https://bugs.launchpad.net/bugs/2007745

This driver is important for some Amlogic systems like the ODROID HC4, which
uses a PCIE-SATA bridge to provide a storage interface.

Signed-off-by: Isaac True <isaac.true at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 1 +
 debian.master/config/annotations                   | 2 +-
 debian.master/config/arm64/config.common.arm64     | 1 +
 debian.master/config/armhf/config.common.armhf     | 1 +
 debian.master/config/config.common.ubuntu          | 1 -
 debian.master/config/ppc64el/config.common.ppc64el | 1 +
 debian.master/config/s390x/config.common.s390x     | 1 +
 7 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64
b/debian.master/config/amd64/config.common.amd64
index 68f1ddf00776..3dda2e796076 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -472,6 +472,7 @@ CONFIG_PCCARD=m
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIPCWATCHDOG=m
 CONFIG_PCI_EPF_NTB=m
+# CONFIG_PCI_MESON is not set
 CONFIG_PCI_PASID=y
 CONFIG_PCI_PRI=y
 CONFIG_PCI_QUIRKS=y
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index a531e19a9288..e8edb2d08894 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -7191,7 +7191,7 @@ CONFIG_PCIE_KEEMBAY_HOST
policy<{'arm64': 'y'}>
 CONFIG_PCIE_KEEMBAY_EP                          policy<{'arm64': 'y'}>
 CONFIG_PCIE_KIRIN                               policy<{'arm64': 'y'}>
 CONFIG_PCIE_HISI_STB                            policy<{'arm64': 'y',
'armhf': 'y'}>
-CONFIG_PCI_MESON                                policy<{'amd64': 'n',
'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_PCI_MESON                                policy<{'amd64': 'n',
'arm64': 'm', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_PCIE_TEGRA194_HOST                       policy<{'arm64': 'm'}>
 CONFIG_PCIE_TEGRA194_EP                         policy<{'arm64': 'm'}>
 CONFIG_PCIE_VISCONTI_HOST                       policy<{'arm64': 'y'}>
diff --git a/debian.master/config/arm64/config.common.arm64
b/debian.master/config/arm64/config.common.arm64
index 0277523abb4b..4cc8c7dacaaa 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -492,6 +492,7 @@ CONFIG_PCIEPORTBUS=y
 CONFIG_PCIPCWATCHDOG=m
 CONFIG_PCI_EPF_NTB=m
 CONFIG_PCI_LAYERSCAPE=y
+CONFIG_PCI_MESON=m
 CONFIG_PCI_PASID=y
 CONFIG_PCI_PRI=y
 CONFIG_PCI_QUIRKS=y
diff --git a/debian.master/config/armhf/config.common.armhf
b/debian.master/config/armhf/config.common.armhf
index fa737f301635..3c647b3b659f 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -482,6 +482,7 @@ CONFIG_PCIEPORTBUS=y
 CONFIG_PCIPCWATCHDOG=m
 CONFIG_PCI_EPF_NTB=m
 # CONFIG_PCI_LAYERSCAPE is not set
+# CONFIG_PCI_MESON is not set
 CONFIG_PCI_PASID=y
 CONFIG_PCI_PRI=y
 CONFIG_PCI_QUIRKS=y
diff --git a/debian.master/config/config.common.ubuntu
b/debian.master/config/config.common.ubuntu
index f39359827c20..57eef9214385 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -7689,7 +7689,6 @@ CONFIG_PCI_KEYSTONE_HOST=y
 CONFIG_PCI_LABEL=y
 CONFIG_PCI_LAYERSCAPE_EP=y
 CONFIG_PCI_LOCKLESS_CONFIG=y
-# CONFIG_PCI_MESON is not set
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_ARCH_FALLBACKS=y
diff --git a/debian.master/config/ppc64el/config.common.ppc64el
b/debian.master/config/ppc64el/config.common.ppc64el
index 147d231e027a..265b584cb028 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -485,6 +485,7 @@ CONFIG_PC104=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_PCIPCWATCHDOG=m
 CONFIG_PCI_EPF_NTB=m
+# CONFIG_PCI_MESON is not set
 CONFIG_PCI_PASID=y
 CONFIG_PCI_PRI=y
 CONFIG_PCI_QUIRKS=y
diff --git a/debian.master/config/s390x/config.common.s390x
b/debian.master/config/s390x/config.common.s390x
index c31995b91e5c..296a4b60c49a 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -440,6 +440,7 @@ CONFIG_PANIC_TIMEOUT=0
 CONFIG_PCIEPORTBUS=y
 # CONFIG_PCIPCWATCHDOG is not set
 # CONFIG_PCI_EPF_NTB is not set
+# CONFIG_PCI_MESON is not set
 # CONFIG_PCI_PASID is not set
 # CONFIG_PCI_PRI is not set
 # CONFIG_PCI_QUIRKS is not set
--
2.37.2