diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex_bittware.dts b/arch/arm64/boot/dts/intel/socfpga_agilex_bittware.dts
index 6757577c5c42..c221d31f2eb1 100644
--- a/arch/arm64/boot/dts/intel/socfpga_agilex_bittware.dts
+++ b/arch/arm64/boot/dts/intel/socfpga_agilex_bittware.dts
@@ -181,11 +181,11 @@
 	};
 };
 
-/*&pcie_0_pcie_aglx {
+&pcie_0_pcie_aglx {
 	status = "okay";
-	compatible = "altr,pcie-root-port-3.0-f-tile";*/
+	compatible = "altr,pcie-root-port-3.0-f-tile";
 	/* interrupts = <0 0 0>; */
 /*	interrupts = <32 IRQ_TYPE_LEVEL_HIGH>;
 	interupt_parent = <&intc>; */
-/*};*/
+};
 
diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex_pcie_root_port.dtsi b/arch/arm64/boot/dts/intel/socfpga_agilex_pcie_root_port.dtsi
index 5ffcef255b5c..d8ed797d08bb 100644
--- a/arch/arm64/boot/dts/intel/socfpga_agilex_pcie_root_port.dtsi
+++ b/arch/arm64/boot/dts/intel/socfpga_agilex_pcie_root_port.dtsi
@@ -27,7 +27,6 @@
 			interrupt-controller;
 			#interrupt-cells = <0x1>;
 			device_type = "pci";
-			max-link-speed = <2>; /* MM addded */
 			bus-range = <0x0000000 0x000000ff>;
 			ranges = <0x82000000 0x00000000 0x00100000 0x00000000 0x10000000 0x00000000 0x0ff00000>;
 			msi-parent = <&pcie_0_msi_irq>;
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index b7c8611c3875..efbae2191b96 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -1600,7 +1600,7 @@ CONFIG_IO_STRICT_DEVMEM=n
 CONFIG_HUGETLB_PAGE=y
 ##MM includes
 CONFIG_BLK_DEV_NVME=y
-CONFIG_NVME_MULTIPATH=y
-CONFIG_NVME_VERBOSE_ERRORS=y
+#CONFIG_NVME_MULTIPATH=y
+#CONFIG_NVME_VERBOSE_ERRORS=y
 #CONFIG_NVME_HWMON=y
 #CONFIG_NVME_FC=y
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index d5331eee139d..89ff5934458d 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2320,8 +2320,7 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl)
 	if (ret)
 		return ret;
 	return nvme_wait_ready(ctrl, NVME_CSTS_RDY, NVME_CSTS_RDY,
-			       (timeout + 1) * 2, "initialisation");
-/*MM : PATCH                          (timeout + 1) / 2, "initialisation"); */
+				(timeout + 1) / 2, "initialisation");
 }
 EXPORT_SYMBOL_GPL(nvme_enable_ctrl);
 
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 17fbf4e95cfb..f8e92404a659 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2270,7 +2270,6 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
 	dev->nr_poll_queues = poll_queues;
 
 	nr_io_queues = dev->nr_allocated_queues - 1;
-	nr_io_queues = 4;
 	result = nvme_set_queue_count(&dev->ctrl, &nr_io_queues);
 	if (result < 0)
 		return result;