[PATCH 5/5] mtd: nand: pxa3xx: enable NAND controller if the SoC needs it
Stefan Roese
sr at denx.de
Thu Oct 29 10:02:00 CET 2020
Hi Baruch,
On 29.10.20 07:52, Baruch Siach wrote:
> From: Shmuel Hazan <shmuel.h at siklu.com>
>
> Based on Linux kernel commit fc256f5789cb ("mtd: nand: pxa3xx: enable
> NAND controller if the SoC needs it"). This commit adds support for the
> Armada 8040 nand controller.
>
> The kernel commit says this:
>
> Marvell recent SoCs like A7k/A8k do not boot with NAND flash
> controller activated by default. Enabling the controller is a matter
> of writing in a system controller register that may also be used for
> other NAND related choices.
>
> Reviewed-by: Stefan Roese <sr at denx.de>
> Signed-off-by: Shmuel Hazan <shmuel.h at siklu.com>
> Signed-off-by: Baruch Siach <baruch at tkos.co.il>
> ---
> drivers/mtd/nand/raw/Kconfig | 1 +
> drivers/mtd/nand/raw/pxa3xx_nand.c | 52 ++++++++++++++++++++++++------
> 2 files changed, 43 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig
> index 160b599b3464..08df12a3daf9 100644
> --- a/drivers/mtd/nand/raw/Kconfig
> +++ b/drivers/mtd/nand/raw/Kconfig
> @@ -196,6 +196,7 @@ config NAND_PXA3XX
> bool "Support for NAND on PXA3xx and Armada 370/XP/38x"
> select SYS_NAND_SELF_INIT
> select DM_MTD
> + select SYSCON
It seems REGMAP dependency is missing here. I get some errors while
building for some MVEBU boards, like x530:
WARNING: unmet direct dependencies detected for SYSCON
Depends on [n]: REGMAP [=n]
Selected by [y]:
- NAND_PXA3XX [=y] && MTD_RAW_NAND [=y]
WARNING: unmet direct dependencies detected for SYSCON
Depends on [n]: REGMAP [=n]
Selected by [y]:
- NAND_PXA3XX [=y] && MTD_RAW_NAND [=y]
WARNING: unmet direct dependencies detected for SYSCON
Depends on [n]: REGMAP [=n]
Selected by [y]:
- NAND_PXA3XX [=y] && MTD_RAW_NAND [=y]
/opt/kernel.org/gcc-10.1.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ld.bfd:
drivers/built-in.o: in function `syscon_pre_probe':
/home/stefan/git/u-boot/u-boot-marvell/drivers/core/syscon-uclass.c:64:
undefined reference to `regmap_init_mem'
/opt/kernel.org/gcc-10.1.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ld.bfd:
drivers/built-in.o: in function `alloc_nand_resource':
/home/stefan/git/u-boot/u-boot-marvell/drivers/mtd/nand/raw/pxa3xx_nand.c:1840:
undefined reference to `regmap_read'
/opt/kernel.org/gcc-10.1.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ld.bfd:
/home/stefan/git/u-boot/u-boot-marvell/drivers/mtd/nand/raw/pxa3xx_nand.c:1842:
undefined reference to `regmap_write'
I'll add "select REGMAP" to this patch and re-run the world build again
shortly.
Thanks,
Stefan
> imply CMD_NAND
> help
> This enables the driver for the NAND flash device found on
> diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c
> index 8481c6e3bf91..361a9e32935b 100644
> --- a/drivers/mtd/nand/raw/pxa3xx_nand.c
> +++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
> @@ -22,6 +22,8 @@
> #include <linux/mtd/mtd.h>
> #include <linux/mtd/rawnand.h>
> #include <linux/types.h>
> +#include <syscon.h>
> +#include <regmap.h>
> #include <dm/uclass.h>
> #include <dm/read.h>
>
> @@ -119,6 +121,10 @@ DECLARE_GLOBAL_DATA_PTR;
> #define EXT_CMD_TYPE_LAST_RW 1 /* Last naked read/write */
> #define EXT_CMD_TYPE_MONO 0 /* Monolithic read/write */
>
> +/* System control register and bit to enable NAND on some SoCs */
> +#define GENCONF_SOC_DEVICE_MUX 0x208
> +#define GENCONF_SOC_DEVICE_MUX_NFC_EN BIT(0)
> +
> /*
> * This should be large enough to read 'ONFI' and 'JEDEC'.
> * Let's use 7 bytes, which is the maximum ID count supported
> @@ -159,6 +165,7 @@ enum {
> enum pxa3xx_nand_variant {
> PXA3XX_NAND_VARIANT_PXA,
> PXA3XX_NAND_VARIANT_ARMADA370,
> + PXA3XX_NAND_VARIANT_ARMADA_8K,
> };
>
> struct pxa3xx_nand_host {
> @@ -424,13 +431,16 @@ static const struct udevice_id pxa3xx_nand_dt_ids[] = {
> .compatible = "marvell,mvebu-pxa3xx-nand",
> .data = PXA3XX_NAND_VARIANT_ARMADA370,
> },
> + {
> + .compatible = "marvell,armada-8k-nand-controller",
> + .data = PXA3XX_NAND_VARIANT_ARMADA_8K,
> + },
> {}
> };
>
> -static enum pxa3xx_nand_variant pxa3xx_nand_get_variant(void)
> +static enum pxa3xx_nand_variant pxa3xx_nand_get_variant(struct udevice *dev)
> {
> - /* We only support the Armada 370/XP/38x for now */
> - return PXA3XX_NAND_VARIANT_ARMADA370;
> + return dev_get_driver_data(dev);
> }
>
> static void pxa3xx_nand_set_timing(struct pxa3xx_nand_host *host,
> @@ -707,7 +717,8 @@ static irqreturn_t pxa3xx_nand_irq(struct pxa3xx_nand_info *info)
> info->retcode = ERR_UNCORERR;
> if (status & NDSR_CORERR) {
> info->retcode = ERR_CORERR;
> - if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370 &&
> + if ((info->variant == PXA3XX_NAND_VARIANT_ARMADA370 ||
> + info->variant == PXA3XX_NAND_VARIANT_ARMADA_8K) &&
> info->ecc_bch)
> info->ecc_err_cnt = NDSR_ERR_CNT(status);
> else
> @@ -762,7 +773,8 @@ static irqreturn_t pxa3xx_nand_irq(struct pxa3xx_nand_info *info)
> nand_writel(info, NDCB0, info->ndcb2);
>
> /* NDCB3 register is available in NFCv2 (Armada 370/XP SoC) */
> - if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370)
> + if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370 ||
> + info->variant == PXA3XX_NAND_VARIANT_ARMADA_8K)
> nand_writel(info, NDCB0, info->ndcb3);
> }
>
> @@ -1676,7 +1688,8 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd)
> }
>
> /* Device detection must be done with ECC disabled */
> - if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370)
> + if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370 ||
> + info->variant == PXA3XX_NAND_VARIANT_ARMADA_8K)
> nand_writel(info, NDECCCTRL, 0x0);
>
> if (nand_scan_ident(mtd, 1, NULL))
> @@ -1726,7 +1739,8 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd)
> * (aka split) command handling,
> */
> if (mtd->writesize > info->chunk_size) {
> - if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370) {
> + if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370 ||
> + info->variant == PXA3XX_NAND_VARIANT_ARMADA_8K) {
> chip->cmdfunc = nand_cmdfunc_extended;
> } else {
> dev_err(mtd->dev,
> @@ -1762,7 +1776,7 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd)
> return nand_scan_tail(mtd);
> }
>
> -static int alloc_nand_resource(struct pxa3xx_nand_info *info)
> +static int alloc_nand_resource(struct udevice *dev, struct pxa3xx_nand_info *info)
> {
> struct pxa3xx_nand_platform_data *pdata;
> struct pxa3xx_nand_host *host;
> @@ -1774,7 +1788,7 @@ static int alloc_nand_resource(struct pxa3xx_nand_info *info)
> if (pdata->num_cs <= 0)
> return -ENODEV;
>
> - info->variant = pxa3xx_nand_get_variant();
> + info->variant = pxa3xx_nand_get_variant(dev);
> for (cs = 0; cs < pdata->num_cs; cs++) {
> chip = (struct nand_chip *)
> ((u8 *)&info[1] + sizeof(*host) * cs);
> @@ -1810,6 +1824,24 @@ static int alloc_nand_resource(struct pxa3xx_nand_info *info)
> /* initialize all interrupts to be disabled */
> disable_int(info, NDSR_MASK);
>
> + /*
> + * Some SoCs like A7k/A8k need to enable manually the NAND
> + * controller to avoid being bootloader dependent. This is done
> + * through the use of a single bit in the System Functions registers.
> + */
> + if (pxa3xx_nand_get_variant(dev) == PXA3XX_NAND_VARIANT_ARMADA_8K) {
> + struct regmap *sysctrl_base = syscon_regmap_lookup_by_phandle(
> + dev, "marvell,system-controller");
> + u32 reg;
> +
> + if (IS_ERR(sysctrl_base))
> + return PTR_ERR(sysctrl_base);
> +
> + regmap_read(sysctrl_base, GENCONF_SOC_DEVICE_MUX, ®);
> + reg |= GENCONF_SOC_DEVICE_MUX_NFC_EN;
> + regmap_write(sysctrl_base, GENCONF_SOC_DEVICE_MUX, reg);
> + }
> +
> return 0;
> }
>
> @@ -1864,7 +1896,7 @@ static int pxa3xx_nand_probe(struct udevice *dev)
>
> pdata = info->pdata;
>
> - ret = alloc_nand_resource(info);
> + ret = alloc_nand_resource(dev, info);
> if (ret) {
> dev_err(dev, "alloc nand resource failed\n");
> return ret;
>
Viele Grüße,
Stefan
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
More information about the U-Boot
mailing list