mirror of
https://github.com/torvalds/linux.git
synced 2024-11-29 07:31:29 +00:00
c2a96b7f18
Here is the big set of driver core changes for 6.11-rc1. Lots of stuff in here, with not a huge diffstat, but apis are evolving which required lots of files to be touched. Highlights of the changes in here are: - platform remove callback api final fixups (Uwe took many releases to get here, finally!) - Rust bindings for basic firmware apis and initial driver-core interactions. It's not all that useful for a "write a whole driver in rust" type of thing, but the firmware bindings do help out the phy rust drivers, and the driver core bindings give a solid base on which others can start their work. There is still a long way to go here before we have a multitude of rust drivers being added, but it's a great first step. - driver core const api changes. This reached across all bus types, and there are some fix-ups for some not-common bus types that linux-next and 0-day testing shook out. This work is being done to help make the rust bindings more safe, as well as the C code, moving toward the end-goal of allowing us to put driver structures into read-only memory. We aren't there yet, but are getting closer. - minor devres cleanups and fixes found by code inspection - arch_topology minor changes - other minor driver core cleanups All of these have been in linux-next for a very long time with no reported problems. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- iG0EABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCZqH+aQ8cZ3JlZ0Brcm9h aC5jb20ACgkQMUfUDdst+ymoOQCfVBdLcBjEDAGh3L8qHRGMPy4rV2EAoL/r+zKm cJEYtJpGtWX6aAtugm9E =ZyJV -----END PGP SIGNATURE----- Merge tag 'driver-core-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core Pull driver core updates from Greg KH: "Here is the big set of driver core changes for 6.11-rc1. Lots of stuff in here, with not a huge diffstat, but apis are evolving which required lots of files to be touched. Highlights of the changes in here are: - platform remove callback api final fixups (Uwe took many releases to get here, finally!) - Rust bindings for basic firmware apis and initial driver-core interactions. It's not all that useful for a "write a whole driver in rust" type of thing, but the firmware bindings do help out the phy rust drivers, and the driver core bindings give a solid base on which others can start their work. There is still a long way to go here before we have a multitude of rust drivers being added, but it's a great first step. - driver core const api changes. This reached across all bus types, and there are some fix-ups for some not-common bus types that linux-next and 0-day testing shook out. This work is being done to help make the rust bindings more safe, as well as the C code, moving toward the end-goal of allowing us to put driver structures into read-only memory. We aren't there yet, but are getting closer. - minor devres cleanups and fixes found by code inspection - arch_topology minor changes - other minor driver core cleanups All of these have been in linux-next for a very long time with no reported problems" * tag 'driver-core-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (55 commits) ARM: sa1100: make match function take a const pointer sysfs/cpu: Make crash_hotplug attribute world-readable dio: Have dio_bus_match() callback take a const * zorro: make match function take a const pointer driver core: module: make module_[add|remove]_driver take a const * driver core: make driver_find_device() take a const * driver core: make driver_[create|remove]_file take a const * firmware_loader: fix soundness issue in `request_internal` firmware_loader: annotate doctests as `no_run` devres: Correct code style for functions that return a pointer type devres: Initialize an uninitialized struct member devres: Fix memory leakage caused by driver API devm_free_percpu() devres: Fix devm_krealloc() wasting memory driver core: platform: Switch to use kmemdup_array() driver core: have match() callback in struct bus_type take a const * MAINTAINERS: add Rust device abstractions to DRIVER CORE device: rust: improve safety comments MAINTAINERS: add Danilo as FIRMWARE LOADER maintainer MAINTAINERS: add Rust FW abstractions to FIRMWARE LOADER firmware: rust: improve safety comments ...
194 lines
4.7 KiB
C
194 lines
4.7 KiB
C
// SPDX-License-Identifier: (GPL-2.0 OR MIT)
|
|
// Copyright (c) 2018 BayLibre, SAS.
|
|
// Author: Jerome Brunet <jbrunet@baylibre.com>
|
|
|
|
#include <linux/clk.h>
|
|
#include <linux/io.h>
|
|
#include <linux/module.h>
|
|
#include <linux/of.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/reset-controller.h>
|
|
#include <linux/spinlock.h>
|
|
|
|
#include <dt-bindings/reset/amlogic,meson-axg-audio-arb.h>
|
|
|
|
struct meson_audio_arb_data {
|
|
struct reset_controller_dev rstc;
|
|
void __iomem *regs;
|
|
struct clk *clk;
|
|
const unsigned int *reset_bits;
|
|
spinlock_t lock;
|
|
};
|
|
|
|
struct meson_audio_arb_match_data {
|
|
const unsigned int *reset_bits;
|
|
unsigned int reset_num;
|
|
};
|
|
|
|
#define ARB_GENERAL_BIT 31
|
|
|
|
static const unsigned int axg_audio_arb_reset_bits[] = {
|
|
[AXG_ARB_TODDR_A] = 0,
|
|
[AXG_ARB_TODDR_B] = 1,
|
|
[AXG_ARB_TODDR_C] = 2,
|
|
[AXG_ARB_FRDDR_A] = 4,
|
|
[AXG_ARB_FRDDR_B] = 5,
|
|
[AXG_ARB_FRDDR_C] = 6,
|
|
};
|
|
|
|
static const struct meson_audio_arb_match_data axg_audio_arb_match = {
|
|
.reset_bits = axg_audio_arb_reset_bits,
|
|
.reset_num = ARRAY_SIZE(axg_audio_arb_reset_bits),
|
|
};
|
|
|
|
static const unsigned int sm1_audio_arb_reset_bits[] = {
|
|
[AXG_ARB_TODDR_A] = 0,
|
|
[AXG_ARB_TODDR_B] = 1,
|
|
[AXG_ARB_TODDR_C] = 2,
|
|
[AXG_ARB_FRDDR_A] = 4,
|
|
[AXG_ARB_FRDDR_B] = 5,
|
|
[AXG_ARB_FRDDR_C] = 6,
|
|
[AXG_ARB_TODDR_D] = 3,
|
|
[AXG_ARB_FRDDR_D] = 7,
|
|
};
|
|
|
|
static const struct meson_audio_arb_match_data sm1_audio_arb_match = {
|
|
.reset_bits = sm1_audio_arb_reset_bits,
|
|
.reset_num = ARRAY_SIZE(sm1_audio_arb_reset_bits),
|
|
};
|
|
|
|
static int meson_audio_arb_update(struct reset_controller_dev *rcdev,
|
|
unsigned long id, bool assert)
|
|
{
|
|
u32 val;
|
|
struct meson_audio_arb_data *arb =
|
|
container_of(rcdev, struct meson_audio_arb_data, rstc);
|
|
|
|
spin_lock(&arb->lock);
|
|
val = readl(arb->regs);
|
|
|
|
if (assert)
|
|
val &= ~BIT(arb->reset_bits[id]);
|
|
else
|
|
val |= BIT(arb->reset_bits[id]);
|
|
|
|
writel(val, arb->regs);
|
|
spin_unlock(&arb->lock);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int meson_audio_arb_status(struct reset_controller_dev *rcdev,
|
|
unsigned long id)
|
|
{
|
|
u32 val;
|
|
struct meson_audio_arb_data *arb =
|
|
container_of(rcdev, struct meson_audio_arb_data, rstc);
|
|
|
|
val = readl(arb->regs);
|
|
|
|
return !(val & BIT(arb->reset_bits[id]));
|
|
}
|
|
|
|
static int meson_audio_arb_assert(struct reset_controller_dev *rcdev,
|
|
unsigned long id)
|
|
{
|
|
return meson_audio_arb_update(rcdev, id, true);
|
|
}
|
|
|
|
static int meson_audio_arb_deassert(struct reset_controller_dev *rcdev,
|
|
unsigned long id)
|
|
{
|
|
return meson_audio_arb_update(rcdev, id, false);
|
|
}
|
|
|
|
static const struct reset_control_ops meson_audio_arb_rstc_ops = {
|
|
.assert = meson_audio_arb_assert,
|
|
.deassert = meson_audio_arb_deassert,
|
|
.status = meson_audio_arb_status,
|
|
};
|
|
|
|
static const struct of_device_id meson_audio_arb_of_match[] = {
|
|
{
|
|
.compatible = "amlogic,meson-axg-audio-arb",
|
|
.data = &axg_audio_arb_match,
|
|
}, {
|
|
.compatible = "amlogic,meson-sm1-audio-arb",
|
|
.data = &sm1_audio_arb_match,
|
|
},
|
|
{}
|
|
};
|
|
MODULE_DEVICE_TABLE(of, meson_audio_arb_of_match);
|
|
|
|
static void meson_audio_arb_remove(struct platform_device *pdev)
|
|
{
|
|
struct meson_audio_arb_data *arb = platform_get_drvdata(pdev);
|
|
|
|
/* Disable all access */
|
|
spin_lock(&arb->lock);
|
|
writel(0, arb->regs);
|
|
spin_unlock(&arb->lock);
|
|
}
|
|
|
|
static int meson_audio_arb_probe(struct platform_device *pdev)
|
|
{
|
|
struct device *dev = &pdev->dev;
|
|
const struct meson_audio_arb_match_data *data;
|
|
struct meson_audio_arb_data *arb;
|
|
int ret;
|
|
|
|
data = of_device_get_match_data(dev);
|
|
if (!data)
|
|
return -EINVAL;
|
|
|
|
arb = devm_kzalloc(dev, sizeof(*arb), GFP_KERNEL);
|
|
if (!arb)
|
|
return -ENOMEM;
|
|
platform_set_drvdata(pdev, arb);
|
|
|
|
arb->clk = devm_clk_get_enabled(dev, NULL);
|
|
if (IS_ERR(arb->clk))
|
|
return dev_err_probe(dev, PTR_ERR(arb->clk), "failed to get clock\n");
|
|
|
|
arb->regs = devm_platform_ioremap_resource(pdev, 0);
|
|
if (IS_ERR(arb->regs))
|
|
return PTR_ERR(arb->regs);
|
|
|
|
spin_lock_init(&arb->lock);
|
|
arb->reset_bits = data->reset_bits;
|
|
arb->rstc.nr_resets = data->reset_num;
|
|
arb->rstc.ops = &meson_audio_arb_rstc_ops;
|
|
arb->rstc.of_node = dev->of_node;
|
|
arb->rstc.owner = THIS_MODULE;
|
|
|
|
/*
|
|
* Enable general :
|
|
* In the initial state, all memory interfaces are disabled
|
|
* and the general bit is on
|
|
*/
|
|
writel(BIT(ARB_GENERAL_BIT), arb->regs);
|
|
|
|
/* Register reset controller */
|
|
ret = devm_reset_controller_register(dev, &arb->rstc);
|
|
if (ret) {
|
|
dev_err(dev, "failed to register arb reset controller\n");
|
|
meson_audio_arb_remove(pdev);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static struct platform_driver meson_audio_arb_pdrv = {
|
|
.probe = meson_audio_arb_probe,
|
|
.remove_new = meson_audio_arb_remove,
|
|
.driver = {
|
|
.name = "meson-audio-arb-reset",
|
|
.of_match_table = meson_audio_arb_of_match,
|
|
},
|
|
};
|
|
module_platform_driver(meson_audio_arb_pdrv);
|
|
|
|
MODULE_DESCRIPTION("Amlogic A113 Audio Memory Arbiter");
|
|
MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");
|
|
MODULE_LICENSE("GPL v2");
|