summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2020-02-11 11:05:15 +0000
committerPeter Robinson <pbrobinson@gmail.com>2020-02-11 11:05:15 +0000
commit90f94e196fa383fb2c105567231d414fb39e6d70 (patch)
tree7ca3fc6161eb819632fd819ae37c686d22755453
parenta2e8b8ba8eea1e6d314c7a7b3ee73deb2a229311 (diff)
downloadkernel-90f94e196fa383fb2c105567231d414fb39e6d70.tar.gz
kernel-90f94e196fa383fb2c105567231d414fb39e6d70.tar.xz
kernel-90f94e196fa383fb2c105567231d414fb39e6d70.zip
revert 4d40f2e8 (rockchips PCIE) because it's disabled for a reason and documented in bug 1704945
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_PCIE_ROCKCHIP_HOST1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_PHY_ROCKCHIP_PCIE1
-rw-r--r--kernel-aarch64-debug-fedora.config4
-rw-r--r--kernel-aarch64-fedora.config4
-rw-r--r--kernel.spec3
5 files changed, 4 insertions, 9 deletions
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_ROCKCHIP_HOST b/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_ROCKCHIP_HOST
deleted file mode 100644
index 416bd56df..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_ROCKCHIP_HOST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCIE_ROCKCHIP_HOST=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_ROCKCHIP_PCIE b/configs/fedora/generic/arm/aarch64/CONFIG_PHY_ROCKCHIP_PCIE
deleted file mode 100644
index 20fb6074b..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_ROCKCHIP_PCIE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PHY_ROCKCHIP_PCIE=m
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 8a897011f..195e408fc 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -4478,7 +4478,7 @@ CONFIG_PCIE_KIRIN=y
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
CONFIG_PCIE_QCOM=y
-CONFIG_PCIE_ROCKCHIP_HOST=m
+# CONFIG_PCIE_ROCKCHIP_HOST is not set
CONFIG_PCIE_TEGRA194=m
CONFIG_PCIE_XILINX_NWL=y
CONFIG_PCIE_XILINX=y
@@ -4575,7 +4575,7 @@ CONFIG_PHY_ROCKCHIP_EMMC=m
CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
CONFIG_PHY_ROCKCHIP_INNO_USB2=m
-CONFIG_PHY_ROCKCHIP_PCIE=m
+# CONFIG_PHY_ROCKCHIP_PCIE is not set
CONFIG_PHY_ROCKCHIP_TYPEC=m
CONFIG_PHY_ROCKCHIP_USB=m
# CONFIG_PHY_SAMSUNG_USB2 is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index bc6d67fb3..07ab4e405 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -4458,7 +4458,7 @@ CONFIG_PCIE_KIRIN=y
CONFIG_PCIEPORTBUS=y
CONFIG_PCIE_PTM=y
CONFIG_PCIE_QCOM=y
-CONFIG_PCIE_ROCKCHIP_HOST=m
+# CONFIG_PCIE_ROCKCHIP_HOST is not set
CONFIG_PCIE_TEGRA194=m
CONFIG_PCIE_XILINX_NWL=y
CONFIG_PCIE_XILINX=y
@@ -4555,7 +4555,7 @@ CONFIG_PHY_ROCKCHIP_EMMC=m
CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
CONFIG_PHY_ROCKCHIP_INNO_USB2=m
-CONFIG_PHY_ROCKCHIP_PCIE=m
+# CONFIG_PHY_ROCKCHIP_PCIE is not set
CONFIG_PHY_ROCKCHIP_TYPEC=m
CONFIG_PHY_ROCKCHIP_USB=m
# CONFIG_PHY_SAMSUNG_USB2 is not set
diff --git a/kernel.spec b/kernel.spec
index acfac4d88..3fd666cec 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2889,9 +2889,6 @@ fi
* Mon Feb 10 2020 Jeremy Cline <jcline@redhat.com>
- Remove sysrq support to lift lockdown (rhbz 1800859)
-* Fri Feb 07 2020 Jeremy Cline <jcline@redhat.com>
-- Enable PCI Express devices on RockChip SoCs (rhbz 1792564)
-
* Wed Feb 05 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.2-200
- Linux v5.5.2