Merge tag 'mtd/for-5.2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mtd/linux

Pull MTD updates from Richard Weinberger:
 "MTD core changes:
   - New AFS partition parser
   - Update MAINTAINERS entry
   - Use of fall-throughs markers

  NAND core changes:
   - Support having the bad block markers in either the first, second or
     last page of a block. The combination of all three location is now
     possible.
   - Constification of NAND_OP_PARSER(_PATTERN) elements.
   - Generic NAND DT bindings changed to yaml format (can be used to
     check the proposed bindings. First platform to be fully supported:
     sunxi.
   - Stopped using several legacy hooks.
   - Preparation to use the generic NAND layer with the addition of
     several helpers and the removal of the struct nand_chip from
     generic functions.
   - Kconfig cleanup to prepare the introduction of external ECC engines
     support.
   - Fallthrough comments.
   - Introduction of the SPI-mem dirmap API for SPI-NAND devices.

  Raw NAND controller drivers changes:
   - nandsim:
      - Switch to ->exec-op().
   - meson:
      - Misc cleanups and fixes.
      - New OOB layout.
   - Sunxi:
      - A23/A33 NAND DMA support.
   - Ingenic:
      - Full reorganization and cleanup.
      - Clear separation between NAND controller and ECC engine.
      - Support JZ4740 an JZ4725B.
   - Denali:
      - Clear controller/chip separation.
      - ->exec_op() migration.
      - Various cleanups.
   - fsl_elbc:
      - Enable software ECC support.
   - Atmel:
      - Sam9x60 support.
   - GPMI:
      - Introduce the GPMI_IS_MXS() macro.
   - Various trivial/spelling/coding style fixes.

  SPI NOR core changes:
   - Print all JEDEC ID bytes on error
   - Fix comment of spi_nor_find_best_erase_type()
   - Add region locking flags for s25fl512s

  SPI NOR controller drivers changes:
   - intel-spi:
      - Avoid crossing 4K address boundary on read/write
      - Add support for Intel Comet Lake SPI serial flash"

* tag 'mtd/for-5.2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mtd/linux: (120 commits)
  mtd: part: fix incorrect format specifier for an unsigned long long
  mtd: lpddr_cmds: Mark expected switch fall-through
  mtd: phram: Mark expected switch fall-throughs
  mtd: cfi_cmdset_0002: Mark expected switch fall-throughs
  mtd: cfi_util: mark expected switch fall-throughs
  MAINTAINERS: MTD Git repository is hosted on kernel.org
  MAINTAINERS: Update jffs2 entry
  mtd: afs: add v2 partition parsing
  mtd: afs: factor the IIS read into partition parser
  mtd: afs: factor footer parsing into the v1 part parsing
  mtd: factor out v1 partition parsing
  mtd: afs: simplify partition detection
  mtd: afs: simplify partition parsing
  mtd: partitions: Add OF support to AFS partitions
  mtd: partitions: Add AFS partitions DT bindings
  mtd: afs: Move AFS partition parser to parsers subdir
  mtd: maps: Make uclinux_ram_map static
  mtd: maps: Allow MTD_PHYSMAP with MTD_RAM
  MAINTAINERS: Add myself as MTD maintainer
  MAINTAINERS: Remove my name from the MTD and NAND entries
  ...

1 files changed, 30 insertions, 7 deletions

diff --git a/drivers/memory/atmel-ebi.c b/drivers/memory/atmel-ebi.c
index c3748b414c27..0322df9dc249 100644
--- a/drivers/memory/atmel-ebi.c
+++ b/drivers/memory/atmel-ebi.c
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/of_device.h>
 #include <linux/regmap.h>
+#include <soc/at91/atmel-sfr.h>
 
 struct atmel_ebi_dev_config {
         int cs;
@@ -36,6 +37,7 @@ struct atmel_ebi_dev {
 struct atmel_ebi_caps {
         unsigned int available_cs;
         unsigned int ebi_csa_offs;
+        const char *regmap_name;
         void (*get_config)(struct atmel_ebi_dev *ebid,
                            struct atmel_ebi_dev_config *conf);
         int (*xlate_config)(struct atmel_ebi_dev *ebid,
@@ -47,7 +49,7 @@ struct atmel_ebi_caps {
 
 struct atmel_ebi {
         struct clk *clk;
-        struct regmap *matrix;
+        struct regmap *regmap;
         struct  {
                 struct regmap *regmap;
                 struct clk *clk;
@@ -357,7 +359,7 @@ static int atmel_ebi_dev_setup(struct atmel_ebi *ebi, struct device_node *np,
                  * one "atmel,smc-" property is present.
                  */
                 if (ebi->caps->ebi_csa_offs && apply)
-                        regmap_update_bits(ebi->matrix,
+                        regmap_update_bits(ebi->regmap,
                                            ebi->caps->ebi_csa_offs,
                                            BIT(cs), 0);
 
@@ -372,6 +374,7 @@ static int atmel_ebi_dev_setup(struct atmel_ebi *ebi, struct device_node *np,
 static const struct atmel_ebi_caps at91sam9260_ebi_caps = {
         .available_cs = 0xff,
         .ebi_csa_offs = AT91SAM9260_MATRIX_EBICSA,
+        .regmap_name = "atmel,matrix",
         .get_config = at91sam9_ebi_get_config,
         .xlate_config = atmel_ebi_xslate_smc_config,
         .apply_config = at91sam9_ebi_apply_config,
@@ -380,6 +383,7 @@ static const struct atmel_ebi_caps at91sam9260_ebi_caps = {
 static const struct atmel_ebi_caps at91sam9261_ebi_caps = {
         .available_cs = 0xff,
         .ebi_csa_offs = AT91SAM9261_MATRIX_EBICSA,
+        .regmap_name = "atmel,matrix",
         .get_config = at91sam9_ebi_get_config,
         .xlate_config = atmel_ebi_xslate_smc_config,
         .apply_config = at91sam9_ebi_apply_config,
@@ -388,6 +392,7 @@ static const struct atmel_ebi_caps at91sam9261_ebi_caps = {
 static const struct atmel_ebi_caps at91sam9263_ebi0_caps = {
         .available_cs = 0x3f,
         .ebi_csa_offs = AT91SAM9263_MATRIX_EBI0CSA,
+        .regmap_name = "atmel,matrix",
         .get_config = at91sam9_ebi_get_config,
         .xlate_config = atmel_ebi_xslate_smc_config,
         .apply_config = at91sam9_ebi_apply_config,
@@ -396,6 +401,7 @@ static const struct atmel_ebi_caps at91sam9263_ebi0_caps = {
 static const struct atmel_ebi_caps at91sam9263_ebi1_caps = {
         .available_cs = 0x7,
         .ebi_csa_offs = AT91SAM9263_MATRIX_EBI1CSA,
+        .regmap_name = "atmel,matrix",
         .get_config = at91sam9_ebi_get_config,
         .xlate_config = atmel_ebi_xslate_smc_config,
         .apply_config = at91sam9_ebi_apply_config,
@@ -404,6 +410,7 @@ static const struct atmel_ebi_caps at91sam9263_ebi1_caps = {
 static const struct atmel_ebi_caps at91sam9rl_ebi_caps = {
         .available_cs = 0x3f,
         .ebi_csa_offs = AT91SAM9RL_MATRIX_EBICSA,
+        .regmap_name = "atmel,matrix",
         .get_config = at91sam9_ebi_get_config,
         .xlate_config = atmel_ebi_xslate_smc_config,
         .apply_config = at91sam9_ebi_apply_config,
@@ -412,6 +419,7 @@ static const struct atmel_ebi_caps at91sam9rl_ebi_caps = {
 static const struct atmel_ebi_caps at91sam9g45_ebi_caps = {
         .available_cs = 0x3f,
         .ebi_csa_offs = AT91SAM9G45_MATRIX_EBICSA,
+        .regmap_name = "atmel,matrix",
         .get_config = at91sam9_ebi_get_config,
         .xlate_config = atmel_ebi_xslate_smc_config,
         .apply_config = at91sam9_ebi_apply_config,
@@ -420,6 +428,7 @@ static const struct atmel_ebi_caps at91sam9g45_ebi_caps = {
 static const struct atmel_ebi_caps at91sam9x5_ebi_caps = {
         .available_cs = 0x3f,
         .ebi_csa_offs = AT91SAM9X5_MATRIX_EBICSA,
+        .regmap_name = "atmel,matrix",
         .get_config = at91sam9_ebi_get_config,
         .xlate_config = atmel_ebi_xslate_smc_config,
         .apply_config = at91sam9_ebi_apply_config,
@@ -432,6 +441,15 @@ static const struct atmel_ebi_caps sama5d3_ebi_caps = {
         .apply_config = sama5_ebi_apply_config,
 };
 
+static const struct atmel_ebi_caps sam9x60_ebi_caps = {
+        .available_cs = 0x3f,
+        .ebi_csa_offs = AT91_SFR_CCFG_EBICSA,
+        .regmap_name = "microchip,sfr",
+        .get_config = at91sam9_ebi_get_config,
+        .xlate_config = atmel_ebi_xslate_smc_config,
+        .apply_config = at91sam9_ebi_apply_config,
+};
+
 static const struct of_device_id atmel_ebi_id_table[] = {
         {
                 .compatible = "atmel,at91sam9260-ebi",
@@ -465,6 +483,10 @@ static const struct of_device_id atmel_ebi_id_table[] = {
                 .compatible = "atmel,sama5d3-ebi",
                 .data = &sama5d3_ebi_caps,
         },
+        {
+                .compatible = "microchip,sam9x60-ebi",
+                .data = &sam9x60_ebi_caps,
+        },
         { /* sentinel */ }
 };
 
@@ -543,13 +565,14 @@ static int atmel_ebi_probe(struct platform_device *pdev)
 
         /*
          * The sama5d3 does not provide an EBICSA register and thus does need
-         * to access the matrix registers.
+         * to access it.
          */
         if (ebi->caps->ebi_csa_offs) {
-                ebi->matrix =
-                        syscon_regmap_lookup_by_phandle(np, "atmel,matrix");
-                if (IS_ERR(ebi->matrix))
-                        return PTR_ERR(ebi->matrix);
+                ebi->regmap =
+                        syscon_regmap_lookup_by_phandle(np,
+                                                        ebi->caps->regmap_name);
+                if (IS_ERR(ebi->regmap))
+                        return PTR_ERR(ebi->regmap);
         }
 
         ret = of_property_read_u32(np, "#address-cells", &val);