OSDN Git Service

mtd: lantiq-flash: drop check of boot select
authorHauke Mehrtens <hauke@hauke-m.de>
Sat, 19 Aug 2017 22:18:09 +0000 (00:18 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 4 Sep 2017 11:53:15 +0000 (13:53 +0200)
Do not check which flash type the SoC was booted from before
using this driver. Assume that the device tree is correct and use this
driver when it was added to device tree. This also removes a build
dependency to the SoC code.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Acked-by: Brian Norris <computersforpeace@gmail.com>
Cc: martin.blumenstingl@googlemail.com
Cc: john@phrozen.org
Cc: robh@kernel.org
Cc: andy.shevchenko@gmail.com
Cc: p.zabel@pengutronix.de
Cc: kishon@ti.com
Cc: mark.rutland@arm.com
Cc: linux-mips@linux-mips.org
Cc: linux-mtd@lists.infradead.org
Cc: linux-watchdog@vger.kernel.org
Cc: devicetree@vger.kernel.org
Cc: linux-spi@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/17117/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
drivers/mtd/maps/lantiq-flash.c

index 3e33ab6..77b1d80 100644 (file)
@@ -114,12 +114,6 @@ ltq_mtd_probe(struct platform_device *pdev)
        struct cfi_private *cfi;
        int err;
 
-       if (of_machine_is_compatible("lantiq,falcon") &&
-                       (ltq_boot_select() != BS_FLASH)) {
-               dev_err(&pdev->dev, "invalid bootstrap options\n");
-               return -ENODEV;
-       }
-
        ltq_mtd = devm_kzalloc(&pdev->dev, sizeof(struct ltq_mtd), GFP_KERNEL);
        if (!ltq_mtd)
                return -ENOMEM;