linux-kernel - [GIT PULL 2/2] memory: omap: drivers for v5.17

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20211224111124.6097-2-krzysztof.kozlowski@canonical.com>
Date:   Fri, 24 Dec 2021 12:11:24 +0100
From:   Krzysztof Kozlowski <krzysztof.kozlowski@...onical.com>
To:     Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        arm@...nel.org, soc@...nel.org
Cc:     Krzysztof Kozlowski <krzysztof.kozlowski@...onical.com>,
        linux-kernel@...r.kernel.org,
        Krzysztof Kozlowski <krzk@...nel.org>,
        Miquel Raynal <miquel.raynal@...tlin.com>
Subject: [GIT PULL 2/2] memory: omap: drivers for v5.17

Hi Arnd and Olof,

Separate topic branch for omap-gpmc driver. This includes changes to
mtd-nand-omap2 driver (acked by Miquel) *which will conflict NAND tree*:

1. The "of_device_id omap_nand_ids" is moved to header
   ../platform_data/mtd-nand-omap2.h.
2. New compatible is added to above "of_device_id omap_nand_ids".

One way to avoid pushing this conflict to Linus, would be if Miquel would
actually pull this request instead of soc tree.

Proper resolution looks like:
----------------------------------------------------------------
diff --git a/include/linux/platform_data/mtd-nand-omap2.h b/include/linux/platform_data/mtd-nand-omap2.h
index 92f011805ad4..8c2f1f185353 100644
--- a/include/linux/platform_data/mtd-nand-omap2.h
+++ b/include/linux/platform_data/mtd-nand-omap2.h
@@ -65,6 +65,7 @@ struct gpmc_nand_regs {
 
 static const struct of_device_id omap_nand_ids[] = {
 	{ .compatible = "ti,omap2-nand", },
+	{ .compatible = "ti,am64-nand", },
 	{},
 };
----------------------------------------------------------------

Best regards,
Krzysztof


The following changes since commit fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf:

  Linux 5.16-rc1 (2021-11-14 13:56:52 -0800)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git tags/memory-controller-drv-omap-5.17

for you to fetch changes up to dbcb124acebd8148e9e858a231f1798956dd3ca6:

  mtd: rawnand: omap2: Select GPMC device driver for ARCH_K3 (2021-12-22 16:51:43 +0100)

----------------------------------------------------------------
Memory controller drivers for v5.14 - OMAP GPMC

1. Add support for AM64 SoC.
2. Minor improvement: use platform_get_irq().

----------------------------------------------------------------
Lad Prabhakar (1):
      memory: omap-gpmc: Use platform_get_irq() to get the interrupt

Roger Quadros (4):
      dt-bindings: memory-controllers: ti,gpmc: Add compatible for AM64
      memory: omap-gpmc: Add support for GPMC on AM64 SoC
      memory: omap-gpmc: Use a compatible match table when checking for NAND controller
      mtd: rawnand: omap2: Select GPMC device driver for ARCH_K3

 .../bindings/memory-controllers/ti,gpmc.yaml       | 23 +++++++++-
 drivers/memory/omap-gpmc.c                         | 50 ++++++++++++++--------
 drivers/mtd/nand/raw/Kconfig                       |  1 +
 drivers/mtd/nand/raw/omap2.c                       |  5 +--
 include/linux/platform_data/mtd-nand-omap2.h       |  9 +++-
 5 files changed, 65 insertions(+), 23 deletions(-)