diff --git a/drivers/mtd/ltq-spinand/ltq_spinand.c b/drivers/mtd/ltq-spinand/ltq_spinand.c
index f511f785d7e5173bbedc1ad3085b34f42d95462c..6d00119edfeab64a54010fcb17b01ac631a8dfe6 100644
--- a/drivers/mtd/ltq-spinand/ltq_spinand.c
+++ b/drivers/mtd/ltq-spinand/ltq_spinand.c
@@ -1586,7 +1586,7 @@ static int spinand_remove(struct spi_device *spi)
 }
 
 static const struct of_device_id ltq_spinand_dt[] = {
-	{ .compatible = "lantiq,ltq_spinand", },
+	{ .compatible = "lantiq,spinand", },
 	{}
 };
 
diff --git a/drivers/spi/spi-cadence-qspi.c b/drivers/spi/spi-cadence-qspi.c
index 2ca0657c7fb68fa43ee5cf5e53112df6a0b02a6f..f29ce09c587fa9a2ef485a574c92c58f19756123 100644
--- a/drivers/spi/spi-cadence-qspi.c
+++ b/drivers/spi/spi-cadence-qspi.c
@@ -267,12 +267,16 @@ static int cadence_qspi_of_get_pdata(struct platform_device *pdev)
 			return -ENXIO;
 		}
 		f_pdata = &(pdata->f_pdata[cs]);
-		if (of_property_read_u32(nc, "flash-type", &prop)) {
-			dev_err(&pdev->dev, "couldn't determine flash-type\n");
-			return -ENXIO;
-		}
-		pr_debug("[%s]cs=%d flash-type=%d\n", __func__, cs, prop);
-		f_pdata->flash_type = prop;
+
+		/* use compatible string to determine flash type */
+		if (of_device_is_compatible(nc, "lantiq,spinand"))
+			f_pdata->flash_type = QSPI_FLASH_TYPE_NAND;
+		else
+			f_pdata->flash_type = QSPI_FLASH_TYPE_NOR;
+
+		pr_debug("[%s]cs=%d flash-type=%d\n", __func__, cs,
+			 f_pdata->flash_type);
+
 		if (of_property_read_u32(nc, "spi-rx-bus-width", &prop)) {
 			dev_err(&pdev->dev, "couldn't determine quad\n");
 			return -ENXIO;