diff options
Diffstat (limited to 'drivers/pinctrl/pinctrl-tegra30.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-tegra30.c | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/drivers/pinctrl/pinctrl-tegra30.c b/drivers/pinctrl/pinctrl-tegra30.c index ffb04eebbf..f706ae6bfd 100644 --- a/drivers/pinctrl/pinctrl-tegra30.c +++ b/drivers/pinctrl/pinctrl-tegra30.c @@ -1,20 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2014 Lucas Stach <l.stach@pengutronix.de> * * Partly based on code * Copyright (C) 2011-2012, NVIDIA CORPORATION. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope 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, see <http://www.gnu.org/licenses/>. */ #include <common.h> @@ -32,7 +21,7 @@ struct pinctrl_tegra30 { u32 __iomem *mux; } regs; struct pinctrl_device pinctrl; - struct pinctrl_tegra30_drvdata *drvdata; + const struct pinctrl_tegra30_drvdata *drvdata; }; struct tegra_pingroup { @@ -388,7 +377,7 @@ static const struct tegra_drive_pingroup tegra30_drive_groups[] = { DRV_PG(vi1, 0x8c8, -1, -1, -1, 14, 5, 19, 5, 24, 4, 28, 4), }; -static const struct pinctrl_tegra30_drvdata tegra30_drvdata = { +__maybe_unused static const struct pinctrl_tegra30_drvdata tegra30_drvdata = { .pingrps = tegra30_pin_groups, .num_pingrps = ARRAY_SIZE(tegra30_pin_groups), .drvgrps = tegra30_drive_groups, @@ -632,7 +621,7 @@ static const struct tegra_drive_pingroup tegra124_drive_groups[] = { DRV_PG(ao4, 0x9c8, 2, 3, 4, 12, 7, 20, 7, 28, 2, 30, 2), }; -static const struct pinctrl_tegra30_drvdata tegra124_drvdata = { +__maybe_unused static const struct pinctrl_tegra30_drvdata tegra124_drvdata = { .pingrps = tegra124_pin_groups, .num_pingrps = ARRAY_SIZE(tegra124_pin_groups), .drvgrps = tegra124_drive_groups, @@ -868,7 +857,7 @@ static struct pinctrl_ops pinctrl_tegra30_ops = { .set_state = pinctrl_tegra30_set_state, }; -static int pinctrl_tegra30_probe(struct device_d *dev) +static int pinctrl_tegra30_probe(struct device *dev) { struct resource *iores; struct pinctrl_tegra30 *ctrl; @@ -893,7 +882,7 @@ static int pinctrl_tegra30_probe(struct device_d *dev) regs[i] = IOMEM(iores->start); } - dev_get_drvdata(dev, (const void **)&ctrl->drvdata); + ctrl->drvdata = device_get_match_data(dev); ctrl->pinctrl.dev = dev; ctrl->pinctrl.ops = &pinctrl_tegra30_ops; @@ -904,7 +893,7 @@ static int pinctrl_tegra30_probe(struct device_d *dev) return ret; } - of_pinctrl_select_state(dev->device_node, "boot"); + of_pinctrl_select_state(dev->of_node, "boot"); return 0; } @@ -924,15 +913,12 @@ static __maybe_unused struct of_device_id pinctrl_tegra30_dt_ids[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, pinctrl_tegra30_dt_ids); -static struct driver_d pinctrl_tegra30_driver = { +static struct driver pinctrl_tegra30_driver = { .name = "pinctrl-tegra30", .probe = pinctrl_tegra30_probe, .of_compatible = DRV_OF_COMPAT(pinctrl_tegra30_dt_ids), }; -static int pinctrl_tegra30_init(void) -{ - return platform_driver_register(&pinctrl_tegra30_driver); -} -core_initcall(pinctrl_tegra30_init); +core_platform_driver(pinctrl_tegra30_driver); |