mirror of
https://github.com/torvalds/linux.git
synced 2024-12-21 10:31:54 +00:00
e6b5be2be4
Here's the set of driver core patches for 3.19-rc1. They are dominated by the removal of the .owner field in platform drivers. They touch a lot of files, but they are "simple" changes, just removing a line in a structure. Other than that, a few minor driver core and debugfs changes. There are some ath9k patches coming in through this tree that have been acked by the wireless maintainers as they relied on the debugfs changes. Everything has been in linux-next for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEABECAAYFAlSOD20ACgkQMUfUDdst+ylLPACg2QrW1oHhdTMT9WI8jihlHVRM 53kAoLeteByQ3iVwWurwwseRPiWa8+MI =OVRS -----END PGP SIGNATURE----- Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core Pull driver core update from Greg KH: "Here's the set of driver core patches for 3.19-rc1. They are dominated by the removal of the .owner field in platform drivers. They touch a lot of files, but they are "simple" changes, just removing a line in a structure. Other than that, a few minor driver core and debugfs changes. There are some ath9k patches coming in through this tree that have been acked by the wireless maintainers as they relied on the debugfs changes. Everything has been in linux-next for a while" * tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (324 commits) Revert "ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries" fs: debugfs: add forward declaration for struct device type firmware class: Deletion of an unnecessary check before the function call "vunmap" firmware loader: fix hung task warning dump devcoredump: provide a one-way disable function device: Add dev_<level>_once variants ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries ath: use seq_file api for ath9k debugfs files debugfs: add helper function to create device related seq_file drivers/base: cacheinfo: remove noisy error boot message Revert "core: platform: add warning if driver has no owner" drivers: base: support cpu cache information interface to userspace via sysfs drivers: base: add cpu_device_create to support per-cpu devices topology: replace custom attribute macros with standard DEVICE_ATTR* cpumask: factor out show_cpumap into separate helper function driver core: Fix unbalanced device reference in drivers_probe driver core: fix race with userland in device_add() sysfs/kernfs: make read requests on pre-alloc files use the buffer. sysfs/kernfs: allow attributes to request write buffer be pre-allocated. fs: sysfs: return EGBIG on write if offset is larger than file size ...
161 lines
4.0 KiB
C
161 lines
4.0 KiB
C
/*
|
|
* Copyright 2014 Steffen Trumtrar <s.trumtrar@pengutronix.de>
|
|
*
|
|
* based on
|
|
* Allwinner SoCs Reset Controller driver
|
|
*
|
|
* Copyright 2013 Maxime Ripard
|
|
*
|
|
* Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*/
|
|
|
|
#include <linux/err.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 <linux/types.h>
|
|
|
|
#define NR_BANKS 4
|
|
#define OFFSET_MODRST 0x10
|
|
|
|
struct socfpga_reset_data {
|
|
spinlock_t lock;
|
|
void __iomem *membase;
|
|
struct reset_controller_dev rcdev;
|
|
};
|
|
|
|
static int socfpga_reset_assert(struct reset_controller_dev *rcdev,
|
|
unsigned long id)
|
|
{
|
|
struct socfpga_reset_data *data = container_of(rcdev,
|
|
struct socfpga_reset_data,
|
|
rcdev);
|
|
int bank = id / BITS_PER_LONG;
|
|
int offset = id % BITS_PER_LONG;
|
|
unsigned long flags;
|
|
u32 reg;
|
|
|
|
spin_lock_irqsave(&data->lock, flags);
|
|
|
|
reg = readl(data->membase + OFFSET_MODRST + (bank * NR_BANKS));
|
|
writel(reg | BIT(offset), data->membase + OFFSET_MODRST +
|
|
(bank * NR_BANKS));
|
|
spin_unlock_irqrestore(&data->lock, flags);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int socfpga_reset_deassert(struct reset_controller_dev *rcdev,
|
|
unsigned long id)
|
|
{
|
|
struct socfpga_reset_data *data = container_of(rcdev,
|
|
struct socfpga_reset_data,
|
|
rcdev);
|
|
|
|
int bank = id / BITS_PER_LONG;
|
|
int offset = id % BITS_PER_LONG;
|
|
unsigned long flags;
|
|
u32 reg;
|
|
|
|
spin_lock_irqsave(&data->lock, flags);
|
|
|
|
reg = readl(data->membase + OFFSET_MODRST + (bank * NR_BANKS));
|
|
writel(reg & ~BIT(offset), data->membase + OFFSET_MODRST +
|
|
(bank * NR_BANKS));
|
|
|
|
spin_unlock_irqrestore(&data->lock, flags);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int socfpga_reset_status(struct reset_controller_dev *rcdev,
|
|
unsigned long id)
|
|
{
|
|
struct socfpga_reset_data *data = container_of(rcdev,
|
|
struct socfpga_reset_data, rcdev);
|
|
int bank = id / BITS_PER_LONG;
|
|
int offset = id % BITS_PER_LONG;
|
|
u32 reg;
|
|
|
|
reg = readl(data->membase + OFFSET_MODRST + (bank * NR_BANKS));
|
|
|
|
return !(reg & BIT(offset));
|
|
}
|
|
|
|
static struct reset_control_ops socfpga_reset_ops = {
|
|
.assert = socfpga_reset_assert,
|
|
.deassert = socfpga_reset_deassert,
|
|
.status = socfpga_reset_status,
|
|
};
|
|
|
|
static int socfpga_reset_probe(struct platform_device *pdev)
|
|
{
|
|
struct socfpga_reset_data *data;
|
|
struct resource *res;
|
|
|
|
/*
|
|
* The binding was mainlined without the required property.
|
|
* Do not continue, when we encounter an old DT.
|
|
*/
|
|
if (!of_find_property(pdev->dev.of_node, "#reset-cells", NULL)) {
|
|
dev_err(&pdev->dev, "%s missing #reset-cells property\n",
|
|
pdev->dev.of_node->full_name);
|
|
return -EINVAL;
|
|
}
|
|
|
|
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
|
|
if (!data)
|
|
return -ENOMEM;
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
data->membase = devm_ioremap_resource(&pdev->dev, res);
|
|
if (IS_ERR(data->membase))
|
|
return PTR_ERR(data->membase);
|
|
|
|
spin_lock_init(&data->lock);
|
|
|
|
data->rcdev.owner = THIS_MODULE;
|
|
data->rcdev.nr_resets = NR_BANKS * BITS_PER_LONG;
|
|
data->rcdev.ops = &socfpga_reset_ops;
|
|
data->rcdev.of_node = pdev->dev.of_node;
|
|
reset_controller_register(&data->rcdev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int socfpga_reset_remove(struct platform_device *pdev)
|
|
{
|
|
struct socfpga_reset_data *data = platform_get_drvdata(pdev);
|
|
|
|
reset_controller_unregister(&data->rcdev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id socfpga_reset_dt_ids[] = {
|
|
{ .compatible = "altr,rst-mgr", },
|
|
{ /* sentinel */ },
|
|
};
|
|
|
|
static struct platform_driver socfpga_reset_driver = {
|
|
.probe = socfpga_reset_probe,
|
|
.remove = socfpga_reset_remove,
|
|
.driver = {
|
|
.name = "socfpga-reset",
|
|
.of_match_table = socfpga_reset_dt_ids,
|
|
},
|
|
};
|
|
module_platform_driver(socfpga_reset_driver);
|
|
|
|
MODULE_AUTHOR("Steffen Trumtrar <s.trumtrar@pengutronix.de");
|
|
MODULE_DESCRIPTION("Socfpga Reset Controller Driver");
|
|
MODULE_LICENSE("GPL");
|