diff options
Diffstat (limited to 'drivers/clk/imx/clk-imx6sx.c')
| -rw-r--r-- | drivers/clk/imx/clk-imx6sx.c | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/drivers/clk/imx/clk-imx6sx.c b/drivers/clk/imx/clk-imx6sx.c index d758957d4d..bebe1ed685 100644 --- a/drivers/clk/imx/clk-imx6sx.c +++ b/drivers/clk/imx/clk-imx6sx.c @@ -1,27 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Freescale Semiconductor, Inc. - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html */ #include <dt-bindings/clock/imx6sx-clock.h> #include <common.h> #include <init.h> #include <driver.h> -#include <linux/clk.h> #include <io.h> #include <of.h> #include <linux/clkdev.h> #include <linux/err.h> #include <linux/clk.h> -#include <mach/imx6-regs.h> -#include <mach/revision.h> -#include <mach/imx6.h> +#include <mach/imx/imx6-regs.h> +#include <mach/imx/revision.h> +#include <mach/imx/imx6.h> #include "clk.h" #include "common.h" @@ -116,11 +109,11 @@ static struct clk_div_table video_div_table[] = { { } }; -static int imx6sx_ccm_probe(struct device_d *dev) +static int imx6sx_ccm_probe(struct device *dev) { struct resource *iores; void __iomem *base, *anatop_base, *ccm_base; - struct device_node *ccm_node = dev->device_node; + struct device_node *ccm_node = dev->of_node; clks[IMX6SX_CLK_DUMMY] = clk_fixed("dummy", 0); @@ -469,15 +462,12 @@ static __maybe_unused struct of_device_id imx6sx_ccm_dt_ids[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, imx6sx_ccm_dt_ids); -static struct driver_d imx6sx_ccm_driver = { +static struct driver imx6sx_ccm_driver = { .probe = imx6sx_ccm_probe, .name = "imx6-ccm", .of_compatible = DRV_OF_COMPAT(imx6sx_ccm_dt_ids), }; -static int imx6sx_ccm_init(void) -{ - return platform_driver_register(&imx6sx_ccm_driver); -} -core_initcall(imx6sx_ccm_init); +core_platform_driver(imx6sx_ccm_driver); |