Merge tag 'drm-misc-fixes-2023-02-23' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-block.git] / drivers / bcma / driver_chipcommon_nflash.c

diff --git a/drivers/bcma/driver_chipcommon_nflash.c b/drivers/bcma/driver_chipcommon_nflash.c
index d4f699aef8c440081d0f5847ab67766b6e128f48..a1a814750b4ac5ab0521a49deb5ad1acafb96132 100644 (file)
--- a/drivers/bcma/driver_chipcommon_nflash.c
+++ b/drivers/bcma/driver_chipcommon_nflash.c
@@ -7,18 +7,28 @@
 
 #include "bcma_private.h"
 
+#include <linux/bitops.h>
 #include <linux/platform_device.h>
+#include <linux/platform_data/brcmnand.h>
 #include <linux/bcma/bcma.h>
 
+/* Alternate NAND controller driver name in order to allow both bcm47xxnflash
+ * and bcma_brcmnand to be built into the same kernel image.
+ */
+static const char *bcma_nflash_alt_name = "bcma_brcmnand";
+
 struct platform_device bcma_nflash_dev = {
        .name           = "bcma_nflash",
        .num_resources  = 0,
 };
 
+static const char *probes[] = { "bcm47xxpart", NULL };
+
 /* Initialize NAND flash access */
 int bcma_nflash_init(struct bcma_drv_cc *cc)
 {
        struct bcma_bus *bus = cc->core->bus;
+       u32 reg;
 
        if (bus->chipinfo.id != BCMA_CHIP_ID_BCM4706 &&
            cc->core->id.rev != 38) {
@@ -33,8 +43,16 @@ int bcma_nflash_init(struct bcma_drv_cc *cc)
 
        cc->nflash.present = true;
        if (cc->core->id.rev == 38 &&
-           (cc->status & BCMA_CC_CHIPST_5357_NAND_BOOT))
+           (cc->status & BCMA_CC_CHIPST_5357_NAND_BOOT)) {
                cc->nflash.boot = true;
+               /* Determine the chip select that is being used */
+               reg = bcma_cc_read32(cc, BCMA_CC_NAND_CS_NAND_SELECT) & 0xff;
+               cc->nflash.brcmnand_info.chip_select = ffs(reg) - 1;
+               cc->nflash.brcmnand_info.part_probe_types = probes;
+               cc->nflash.brcmnand_info.ecc_stepsize = 512;
+               cc->nflash.brcmnand_info.ecc_strength = 1;
+               bcma_nflash_dev.name = bcma_nflash_alt_name;
+       }
 
        /* Prepare platform device, but don't register it yet. It's too early,
         * malloc (required by device_private_init) is not available yet. */