Patches against Linux 5.4 for SPI-NAND Gigadevice on Rpi

diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
index 2b69957e0..1db686e21 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -116,3 +116,5 @@
        pinctrl-0 = <&uart0_gpio14>;
        status = "okay";
 };
+
+#include "rpi_spi-nand.dtsi"
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
index 2d191fcbc..0cbe7fec2 100644
--- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -320,10 +320,6 @@
                                brcm,function = <BCM2835_FSEL_ALT0>;
                        };

-                       spi0_gpio7: spi0_gpio7 {
-                               brcm,pins = <7 8 9 10 11>;
-                               brcm,function = <BCM2835_FSEL_ALT0>;
-                       };
                        spi0_gpio35: spi0_gpio35 {
                                brcm,pins = <35 36 37 38 39>;
                                brcm,function = <BCM2835_FSEL_ALT0>;
diff --git a/drivers/mtd/nand/spi/gigadevice.c b/drivers/mtd/nand/spi/gigadevice.c
index e99d425aa..90127d3cb 100644
--- a/drivers/mtd/nand/spi/gigadevice.c
+++ b/drivers/mtd/nand/spi/gigadevice.c
@@ -255,7 +255,7 @@ static int gigadevice_spinand_detect(struct spinand_device *spinand)

        if (id[0] == SPINAND_MFR_GIGADEVICE)
                did = (id[1] << 8) + id[2];
-       else if (id[0] == 0 && id[1] == SPINAND_MFR_GIGADEVICE)
+       else if (id[1] == SPINAND_MFR_GIGADEVICE)
                did = id[2];
        else
                return 0;