]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
staging: Remove board staging code
authorGeert Uytterhoeven <geert+renesas@glider.be>
Mon, 22 Jan 2024 14:24:33 +0000 (15:24 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 24 Jan 2024 18:20:27 +0000 (10:20 -0800)
There are no more users of the board staging code.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/eec1bfb2878237888a8c3bc866d18dc53900739f.1705932585.git.geert+renesas@glider.be
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/board/Kconfig [deleted file]
drivers/staging/board/Makefile [deleted file]
drivers/staging/board/TODO [deleted file]
drivers/staging/board/board.c [deleted file]
drivers/staging/board/board.h [deleted file]

index b8f777036bb22fe5150cc1fce13e684832dfcec6..5175b1c4f16198633b9e252797a0b052fe9af0cc 100644 (file)
@@ -50,8 +50,6 @@ source "drivers/staging/nvec/Kconfig"
 
 source "drivers/staging/media/Kconfig"
 
-source "drivers/staging/board/Kconfig"
-
 source "drivers/staging/gdm724x/Kconfig"
 
 source "drivers/staging/fbtft/Kconfig"
index 5bf357782d8377c5c9607a6584ee8eb7b8c97b3d..67399c0ad8719cb57f4d3a3e44d64d90227c2317 100644 (file)
@@ -15,7 +15,6 @@ obj-$(CONFIG_VME_BUS)         += vme_user/
 obj-$(CONFIG_IIO)              += iio/
 obj-$(CONFIG_FB_SM750)         += sm750fb/
 obj-$(CONFIG_MFD_NVEC)         += nvec/
-obj-$(CONFIG_STAGING_BOARD)    += board/
 obj-$(CONFIG_LTE_GDM724X)      += gdm724x/
 obj-$(CONFIG_FB_TFT)           += fbtft/
 obj-$(CONFIG_MOST)             += most/
diff --git a/drivers/staging/board/Kconfig b/drivers/staging/board/Kconfig
deleted file mode 100644 (file)
index b492167..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-config STAGING_BOARD
-       bool "Staging Board Support"
-       depends on OF_ADDRESS && OF_IRQ && HAVE_CLK
-       help
-         Staging board base is to support continuous upstream
-         in-tree development and integration of platform devices.
-
-         Helps developers integrate devices as platform devices for
-         device drivers that only provide platform device bindings.
-         This in turn allows for incremental development of both
-         hardware feature support and DT binding work in parallel.
diff --git a/drivers/staging/board/Makefile b/drivers/staging/board/Makefile
deleted file mode 100644 (file)
index b6a00c9..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-obj-y  := board.o
diff --git a/drivers/staging/board/TODO b/drivers/staging/board/TODO
deleted file mode 100644 (file)
index 8db70e1..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-* replace platform device code with DT nodes once the driver supports DT
-* remove staging board code when no more platform devices are needed
diff --git a/drivers/staging/board/board.c b/drivers/staging/board/board.c
deleted file mode 100644 (file)
index f980af0..0000000
+++ /dev/null
@@ -1,204 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (C) 2014 Magnus Damm
- * Copyright (C) 2015 Glider bvba
- */
-
-#define pr_fmt(fmt)    "board_staging: "  fmt
-
-#include <linux/clkdev.h>
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <linux/device.h>
-#include <linux/kernel.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/of_irq.h>
-#include <linux/platform_device.h>
-#include <linux/pm_domain.h>
-
-#include "board.h"
-
-static struct device_node *irqc_node __initdata;
-static unsigned int irqc_base __initdata;
-
-static bool find_by_address(u64 base_address)
-{
-       struct device_node *dn = of_find_all_nodes(NULL);
-       struct resource res;
-
-       while (dn) {
-               if (!of_address_to_resource(dn, 0, &res)) {
-                       if (res.start == base_address) {
-                               of_node_put(dn);
-                               return true;
-                       }
-               }
-               dn = of_find_all_nodes(dn);
-       }
-
-       return false;
-}
-
-bool __init board_staging_dt_node_available(const struct resource *resource,
-                                           unsigned int num_resources)
-{
-       unsigned int i;
-
-       for (i = 0; i < num_resources; i++) {
-               const struct resource *r = resource + i;
-
-               if (resource_type(r) == IORESOURCE_MEM)
-                       if (find_by_address(r->start))
-                               return true; /* DT node available */
-       }
-
-       return false; /* Nothing found */
-}
-
-int __init board_staging_gic_setup_xlate(const char *gic_match,
-                                        unsigned int base)
-{
-       WARN_ON(irqc_node);
-
-       irqc_node = of_find_compatible_node(NULL, NULL, gic_match);
-
-       WARN_ON(!irqc_node);
-       if (!irqc_node)
-               return -ENOENT;
-
-       irqc_base = base;
-       return 0;
-}
-
-static void __init gic_fixup_resource(struct resource *res)
-{
-       struct of_phandle_args irq_data;
-       unsigned int hwirq = res->start;
-       unsigned int virq;
-
-       if (resource_type(res) != IORESOURCE_IRQ || !irqc_node)
-               return;
-
-       irq_data.np = irqc_node;
-       irq_data.args_count = 3;
-       irq_data.args[0] = 0;
-       irq_data.args[1] = hwirq - irqc_base;
-       switch (res->flags &
-               (IORESOURCE_IRQ_LOWEDGE | IORESOURCE_IRQ_HIGHEDGE |
-                IORESOURCE_IRQ_LOWLEVEL | IORESOURCE_IRQ_HIGHLEVEL)) {
-       case IORESOURCE_IRQ_LOWEDGE:
-               irq_data.args[2] = IRQ_TYPE_EDGE_FALLING;
-               break;
-       case IORESOURCE_IRQ_HIGHEDGE:
-               irq_data.args[2] = IRQ_TYPE_EDGE_RISING;
-               break;
-       case IORESOURCE_IRQ_LOWLEVEL:
-               irq_data.args[2] = IRQ_TYPE_LEVEL_LOW;
-               break;
-       case IORESOURCE_IRQ_HIGHLEVEL:
-       default:
-               irq_data.args[2] = IRQ_TYPE_LEVEL_HIGH;
-               break;
-       }
-
-       virq = irq_create_of_mapping(&irq_data);
-       if (WARN_ON(!virq))
-               return;
-
-       pr_debug("hwirq %u -> virq %u\n", hwirq, virq);
-       res->start = virq;
-}
-
-void __init board_staging_gic_fixup_resources(struct resource *res,
-                                             unsigned int nres)
-{
-       unsigned int i;
-
-       for (i = 0; i < nres; i++)
-               gic_fixup_resource(&res[i]);
-}
-
-int __init board_staging_register_clock(const struct board_staging_clk *bsc)
-{
-       int error;
-
-       pr_debug("Aliasing clock %s for con_id %s dev_id %s\n", bsc->clk,
-                bsc->con_id, bsc->dev_id);
-       error = clk_add_alias(bsc->con_id, bsc->dev_id, bsc->clk, NULL);
-       if (error)
-               pr_err("Failed to alias clock %s (%d)\n", bsc->clk, error);
-
-       return error;
-}
-
-#ifdef CONFIG_PM_GENERIC_DOMAINS_OF
-static int board_staging_add_dev_domain(struct platform_device *pdev,
-                                       const char *domain)
-{
-       struct device *dev = &pdev->dev;
-       struct of_phandle_args pd_args;
-       struct device_node *np;
-
-       np = of_find_node_by_path(domain);
-       if (!np) {
-               pr_err("Cannot find domain node %s\n", domain);
-               return -ENOENT;
-       }
-
-       pd_args.np = np;
-       pd_args.args_count = 0;
-
-       /* Initialization similar to device_pm_init_common() */
-       spin_lock_init(&dev->power.lock);
-       dev->power.early_init = true;
-
-       return of_genpd_add_device(&pd_args, dev);
-}
-#else
-static inline int board_staging_add_dev_domain(struct platform_device *pdev,
-                                              const char *domain)
-{
-       return 0;
-}
-#endif
-
-int __init board_staging_register_device(const struct board_staging_dev *dev)
-{
-       struct platform_device *pdev = dev->pdev;
-       unsigned int i;
-       int error;
-
-       pr_debug("Trying to register device %s\n", pdev->name);
-       if (board_staging_dt_node_available(pdev->resource,
-                                           pdev->num_resources)) {
-               pr_warn("Skipping %s, already in DT\n", pdev->name);
-               return -EEXIST;
-       }
-
-       board_staging_gic_fixup_resources(pdev->resource, pdev->num_resources);
-
-       for (i = 0; i < dev->nclocks; i++)
-               board_staging_register_clock(&dev->clocks[i]);
-
-       if (dev->domain)
-               board_staging_add_dev_domain(pdev, dev->domain);
-
-       error = platform_device_register(pdev);
-       if (error) {
-               pr_err("Failed to register device %s (%d)\n", pdev->name,
-                      error);
-               return error;
-       }
-
-       return error;
-}
-
-void __init board_staging_register_devices(const struct board_staging_dev *devs,
-                                          unsigned int ndevs)
-{
-       unsigned int i;
-
-       for (i = 0; i < ndevs; i++)
-               board_staging_register_device(&devs[i]);
-}
diff --git a/drivers/staging/board/board.h b/drivers/staging/board/board.h
deleted file mode 100644 (file)
index 5609daf..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __BOARD_H__
-#define __BOARD_H__
-
-#include <linux/init.h>
-#include <linux/of.h>
-
-struct board_staging_clk {
-       const char *clk;
-       const char *con_id;
-       const char *dev_id;
-};
-
-struct board_staging_dev {
-       /* Platform Device */
-       struct platform_device *pdev;
-       /* Clocks (optional) */
-       const struct board_staging_clk *clocks;
-       unsigned int nclocks;
-       /* Generic PM Domain (optional) */
-       const char *domain;
-};
-
-struct resource;
-
-bool board_staging_dt_node_available(const struct resource *resource,
-                                    unsigned int num_resources);
-int board_staging_gic_setup_xlate(const char *gic_match, unsigned int base);
-void board_staging_gic_fixup_resources(struct resource *res, unsigned int nres);
-int board_staging_register_clock(const struct board_staging_clk *bsc);
-int board_staging_register_device(const struct board_staging_dev *dev);
-void board_staging_register_devices(const struct board_staging_dev *devs,
-                                   unsigned int ndevs);
-
-#define board_staging(str, fn)                 \
-static int __init runtime_board_check(void)    \
-{                                              \
-       if (of_machine_is_compatible(str))      \
-               fn();                           \
-                                               \
-       return 0;                               \
-}                                              \
-                                               \
-device_initcall(runtime_board_check)
-
-#endif /* __BOARD_H__ */