![Linus Torvalds](/assets/img/avatar_default.png)
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 ...
195 lines
4.9 KiB
C
195 lines
4.9 KiB
C
/*
|
|
* Copyright (c) 2011, NVIDIA Corporation.
|
|
*
|
|
* 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.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
#include <linux/gpio.h>
|
|
#include <linux/init.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/rfkill.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/acpi.h>
|
|
#include <linux/gpio/consumer.h>
|
|
|
|
#include <linux/rfkill-gpio.h>
|
|
|
|
struct rfkill_gpio_data {
|
|
const char *name;
|
|
enum rfkill_type type;
|
|
struct gpio_desc *reset_gpio;
|
|
struct gpio_desc *shutdown_gpio;
|
|
|
|
struct rfkill *rfkill_dev;
|
|
struct clk *clk;
|
|
|
|
bool clk_enabled;
|
|
};
|
|
|
|
static int rfkill_gpio_set_power(void *data, bool blocked)
|
|
{
|
|
struct rfkill_gpio_data *rfkill = data;
|
|
|
|
if (!blocked && !IS_ERR(rfkill->clk) && !rfkill->clk_enabled)
|
|
clk_enable(rfkill->clk);
|
|
|
|
gpiod_set_value_cansleep(rfkill->shutdown_gpio, !blocked);
|
|
gpiod_set_value_cansleep(rfkill->reset_gpio, !blocked);
|
|
|
|
if (blocked && !IS_ERR(rfkill->clk) && rfkill->clk_enabled)
|
|
clk_disable(rfkill->clk);
|
|
|
|
rfkill->clk_enabled = !blocked;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct rfkill_ops rfkill_gpio_ops = {
|
|
.set_block = rfkill_gpio_set_power,
|
|
};
|
|
|
|
static const struct acpi_gpio_params reset_gpios = { 0, 0, false };
|
|
static const struct acpi_gpio_params shutdown_gpios = { 1, 0, false };
|
|
|
|
static const struct acpi_gpio_mapping acpi_rfkill_default_gpios[] = {
|
|
{ "reset-gpios", &reset_gpios, 1 },
|
|
{ "shutdown-gpios", &shutdown_gpios, 1 },
|
|
{ },
|
|
};
|
|
|
|
static int rfkill_gpio_acpi_probe(struct device *dev,
|
|
struct rfkill_gpio_data *rfkill)
|
|
{
|
|
const struct acpi_device_id *id;
|
|
|
|
id = acpi_match_device(dev->driver->acpi_match_table, dev);
|
|
if (!id)
|
|
return -ENODEV;
|
|
|
|
rfkill->name = dev_name(dev);
|
|
rfkill->type = (unsigned)id->driver_data;
|
|
|
|
return acpi_dev_add_driver_gpios(ACPI_COMPANION(dev),
|
|
acpi_rfkill_default_gpios);
|
|
}
|
|
|
|
static int rfkill_gpio_probe(struct platform_device *pdev)
|
|
{
|
|
struct rfkill_gpio_platform_data *pdata = pdev->dev.platform_data;
|
|
struct rfkill_gpio_data *rfkill;
|
|
struct gpio_desc *gpio;
|
|
int ret;
|
|
|
|
rfkill = devm_kzalloc(&pdev->dev, sizeof(*rfkill), GFP_KERNEL);
|
|
if (!rfkill)
|
|
return -ENOMEM;
|
|
|
|
if (ACPI_HANDLE(&pdev->dev)) {
|
|
ret = rfkill_gpio_acpi_probe(&pdev->dev, rfkill);
|
|
if (ret)
|
|
return ret;
|
|
} else if (pdata) {
|
|
rfkill->name = pdata->name;
|
|
rfkill->type = pdata->type;
|
|
} else {
|
|
return -ENODEV;
|
|
}
|
|
|
|
rfkill->clk = devm_clk_get(&pdev->dev, NULL);
|
|
|
|
gpio = devm_gpiod_get(&pdev->dev, "reset");
|
|
if (!IS_ERR(gpio)) {
|
|
ret = gpiod_direction_output(gpio, 0);
|
|
if (ret)
|
|
return ret;
|
|
rfkill->reset_gpio = gpio;
|
|
}
|
|
|
|
gpio = devm_gpiod_get(&pdev->dev, "shutdown");
|
|
if (!IS_ERR(gpio)) {
|
|
ret = gpiod_direction_output(gpio, 0);
|
|
if (ret)
|
|
return ret;
|
|
rfkill->shutdown_gpio = gpio;
|
|
}
|
|
|
|
/* Make sure at-least one of the GPIO is defined and that
|
|
* a name is specified for this instance
|
|
*/
|
|
if ((!rfkill->reset_gpio && !rfkill->shutdown_gpio) || !rfkill->name) {
|
|
dev_err(&pdev->dev, "invalid platform data\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
rfkill->rfkill_dev = rfkill_alloc(rfkill->name, &pdev->dev,
|
|
rfkill->type, &rfkill_gpio_ops,
|
|
rfkill);
|
|
if (!rfkill->rfkill_dev)
|
|
return -ENOMEM;
|
|
|
|
ret = rfkill_register(rfkill->rfkill_dev);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
platform_set_drvdata(pdev, rfkill);
|
|
|
|
dev_info(&pdev->dev, "%s device registered.\n", rfkill->name);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int rfkill_gpio_remove(struct platform_device *pdev)
|
|
{
|
|
struct rfkill_gpio_data *rfkill = platform_get_drvdata(pdev);
|
|
|
|
rfkill_unregister(rfkill->rfkill_dev);
|
|
rfkill_destroy(rfkill->rfkill_dev);
|
|
|
|
acpi_dev_remove_driver_gpios(ACPI_COMPANION(&pdev->dev));
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_ACPI
|
|
static const struct acpi_device_id rfkill_acpi_match[] = {
|
|
{ "BCM2E1A", RFKILL_TYPE_BLUETOOTH },
|
|
{ "BCM2E39", RFKILL_TYPE_BLUETOOTH },
|
|
{ "BCM2E3D", RFKILL_TYPE_BLUETOOTH },
|
|
{ "BCM2E64", RFKILL_TYPE_BLUETOOTH },
|
|
{ "BCM4752", RFKILL_TYPE_GPS },
|
|
{ "LNV4752", RFKILL_TYPE_GPS },
|
|
{ },
|
|
};
|
|
MODULE_DEVICE_TABLE(acpi, rfkill_acpi_match);
|
|
#endif
|
|
|
|
static struct platform_driver rfkill_gpio_driver = {
|
|
.probe = rfkill_gpio_probe,
|
|
.remove = rfkill_gpio_remove,
|
|
.driver = {
|
|
.name = "rfkill_gpio",
|
|
.acpi_match_table = ACPI_PTR(rfkill_acpi_match),
|
|
},
|
|
};
|
|
|
|
module_platform_driver(rfkill_gpio_driver);
|
|
|
|
MODULE_DESCRIPTION("gpio rfkill");
|
|
MODULE_AUTHOR("NVIDIA");
|
|
MODULE_LICENSE("GPL");
|