]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
mtd: physmap: physmap-bt1-rom: Remove not-going-to-be-supported code for Baikal SoC
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 25 Feb 2026 16:23:34 +0000 (17:23 +0100)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Wed, 11 Mar 2026 15:18:53 +0000 (16:18 +0100)
As noticed in the discussion [1] the Baikal SoC and platforms
are not going to be finalized, hence remove stale code.

Link: https://lore.kernel.org/lkml/22b92ddf-6321-41b5-8073-f9c7064d3432@infradead.org/
Reviewed-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
drivers/mtd/maps/Kconfig
drivers/mtd/maps/Makefile
drivers/mtd/maps/physmap-bt1-rom.c [deleted file]
drivers/mtd/maps/physmap-bt1-rom.h [deleted file]
drivers/mtd/maps/physmap-core.c

index 8a8b19874e2392f076ead223ce3f443434dd85d7..99d5ff9a1fbe6a5c36a06174eb15152bc87e4d32 100644 (file)
@@ -75,17 +75,6 @@ config MTD_PHYSMAP_OF
          physically into the CPU's memory. The mapping description here is
          taken from OF device tree.
 
-config MTD_PHYSMAP_BT1_ROM
-       bool "Baikal-T1 Boot ROMs OF-based physical memory map handling"
-       depends on MTD_PHYSMAP_OF
-       depends on MIPS_BAIKAL_T1 || COMPILE_TEST
-       select MTD_COMPLEX_MAPPINGS
-       select MULTIPLEXER
-       select MUX_MMIO
-       help
-         This provides some extra DT physmap parsing for the Baikal-T1
-         platforms, some detection and setting up ROMs-specific accessors.
-
 config MTD_PHYSMAP_VERSATILE
        bool "ARM Versatile OF-based physical memory map handling"
        depends on MTD_PHYSMAP_OF
index 019f1e92cc4147056ca099fc892e8243bf11c177..51af1d2ebd52118ba6e61533b018c07a0375bef8 100644 (file)
@@ -19,7 +19,6 @@ obj-$(CONFIG_MTD_TSUNAMI)     += tsunami_flash.o
 obj-$(CONFIG_MTD_PXA2XX)       += pxa2xx-flash.o
 obj-$(CONFIG_MTD_PHYSMAP)      += physmap.o
 physmap-y                      := physmap-core.o
-physmap-$(CONFIG_MTD_PHYSMAP_BT1_ROM) += physmap-bt1-rom.o
 physmap-$(CONFIG_MTD_PHYSMAP_VERSATILE) += physmap-versatile.o
 physmap-$(CONFIG_MTD_PHYSMAP_GEMINI) += physmap-gemini.o
 physmap-$(CONFIG_MTD_PHYSMAP_IXP4XX) += physmap-ixp4xx.o
diff --git a/drivers/mtd/maps/physmap-bt1-rom.c b/drivers/mtd/maps/physmap-bt1-rom.c
deleted file mode 100644 (file)
index 60dccc4..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (C) 2020 BAIKAL ELECTRONICS, JSC
- *
- * Authors:
- *   Serge Semin <Sergey.Semin@baikalelectronics.ru>
- *
- * Baikal-T1 Physically Mapped Internal ROM driver
- */
-#include <linux/bits.h>
-#include <linux/device.h>
-#include <linux/kernel.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/xip.h>
-#include <linux/mux/consumer.h>
-#include <linux/of.h>
-#include <linux/platform_device.h>
-#include <linux/string.h>
-#include <linux/types.h>
-
-#include "physmap-bt1-rom.h"
-
-/*
- * Baikal-T1 SoC ROMs are only accessible by the dword-aligned instructions.
- * We have to take this into account when implementing the data read-methods.
- * Note there is no need in bothering with endianness, since both Baikal-T1
- * CPU and MMIO are LE.
- */
-static map_word __xipram bt1_rom_map_read(struct map_info *map,
-                                         unsigned long ofs)
-{
-       void __iomem *src = map->virt + ofs;
-       unsigned int shift;
-       map_word ret;
-       u32 data;
-
-       /* Read data within offset dword. */
-       shift = (uintptr_t)src & 0x3;
-       data = readl_relaxed(src - shift);
-       if (!shift) {
-               ret.x[0] = data;
-               return ret;
-       }
-       ret.x[0] = data >> (shift * BITS_PER_BYTE);
-
-       /* Read data from the next dword. */
-       shift = 4 - shift;
-       if (ofs + shift >= map->size)
-               return ret;
-
-       data = readl_relaxed(src + shift);
-       ret.x[0] |= data << (shift * BITS_PER_BYTE);
-
-       return ret;
-}
-
-static void __xipram bt1_rom_map_copy_from(struct map_info *map,
-                                          void *to, unsigned long from,
-                                          ssize_t len)
-{
-       void __iomem *src = map->virt + from;
-       unsigned int shift, chunk;
-       u32 data;
-
-       if (len <= 0 || from >= map->size)
-               return;
-
-       /* Make sure we don't go over the map limit. */
-       len = min_t(ssize_t, map->size - from, len);
-
-       /*
-        * Since requested data size can be pretty big we have to implement
-        * the copy procedure as optimal as possible. That's why it's split
-        * up into the next three stages: unaligned head, aligned body,
-        * unaligned tail.
-        */
-       shift = (uintptr_t)src & 0x3;
-       if (shift) {
-               chunk = min_t(ssize_t, 4 - shift, len);
-               data = readl_relaxed(src - shift);
-               memcpy(to, (char *)&data + shift, chunk);
-               src += chunk;
-               to += chunk;
-               len -= chunk;
-       }
-
-       while (len >= 4) {
-               data = readl_relaxed(src);
-               memcpy(to, &data, 4);
-               src += 4;
-               to += 4;
-               len -= 4;
-       }
-
-       if (len) {
-               data = readl_relaxed(src);
-               memcpy(to, &data, len);
-       }
-}
-
-int of_flash_probe_bt1_rom(struct platform_device *pdev,
-                          struct device_node *np,
-                          struct map_info *map)
-{
-       struct device *dev = &pdev->dev;
-
-       /* It's supposed to be read-only MTD. */
-       if (!of_device_is_compatible(np, "mtd-rom")) {
-               dev_info(dev, "No mtd-rom compatible string\n");
-               return 0;
-       }
-
-       /* Multiplatform guard. */
-       if (!of_device_is_compatible(np, "baikal,bt1-int-rom"))
-               return 0;
-
-       /* Sanity check the device parameters retrieved from DTB. */
-       if (map->bankwidth != 4)
-               dev_warn(dev, "Bank width is supposed to be 32 bits wide\n");
-
-       map->read = bt1_rom_map_read;
-       map->copy_from = bt1_rom_map_copy_from;
-
-       return 0;
-}
diff --git a/drivers/mtd/maps/physmap-bt1-rom.h b/drivers/mtd/maps/physmap-bt1-rom.h
deleted file mode 100644 (file)
index 6782899..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-#include <linux/mtd/map.h>
-#include <linux/of.h>
-
-#ifdef CONFIG_MTD_PHYSMAP_BT1_ROM
-int of_flash_probe_bt1_rom(struct platform_device *pdev,
-                          struct device_node *np,
-                          struct map_info *map);
-#else
-static inline
-int of_flash_probe_bt1_rom(struct platform_device *pdev,
-                          struct device_node *np,
-                          struct map_info *map)
-{
-       return 0;
-}
-#endif
index 0dcc25b7ff988829ff2495a396a8ef19e7487128..2e31c30d266c763a3b7b977103627fd759ad2000 100644 (file)
@@ -42,7 +42,6 @@
 #include <linux/pm_runtime.h>
 #include <linux/gpio/consumer.h>
 
-#include "physmap-bt1-rom.h"
 #include "physmap-gemini.h"
 #include "physmap-ixp4xx.h"
 #include "physmap-versatile.h"