diff options
Diffstat (limited to 'drivers/video/stm.c')
| -rw-r--r-- | drivers/video/stm.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/drivers/video/stm.c b/drivers/video/stm.c index 28ddc649f8..917405ea80 100644 --- a/drivers/video/stm.c +++ b/drivers/video/stm.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010 Juergen Beisert, Pengutronix <jbe@pengutronix.de> * @@ -6,16 +7,6 @@ * * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved. * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved. - * - * 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. */ #include <common.h> #include <init.h> @@ -29,7 +20,7 @@ #include <stmp-device.h> #include <linux/clk.h> #include <linux/err.h> -#include <mach/fb.h> +#include <mach/mxs/fb.h> #define HW_LCDIF_CTRL 0x00 # define CTRL_SFTRST (1 << 31) @@ -148,7 +139,7 @@ struct imxfb_info { void __iomem *base; unsigned memory_size; struct fb_info info; - struct device_d *hw_dev; + struct device *hw_dev; struct clk *clk; void *fixed_screen; unsigned fixed_screen_size; @@ -503,7 +494,7 @@ static struct imxfb_info fbi = { }, }; -static int stmfb_probe(struct device_d *hw_dev) +static int stmfb_probe(struct device *hw_dev) { struct resource *iores; struct imx_fb_platformdata *pdata = hw_dev->platform_data; @@ -541,10 +532,10 @@ static int stmfb_probe(struct device_d *hw_dev) struct display_timings *modes; struct device_node *display; - if (!IS_ENABLED(CONFIG_OFDEVICE) || !hw_dev->device_node) + if (!IS_ENABLED(CONFIG_OFDEVICE) || !hw_dev->of_node) return -EINVAL; - display = of_parse_phandle(hw_dev->device_node, "display", 0); + display = of_parse_phandle(hw_dev->of_node, "display", 0); if (!display) { dev_err(hw_dev, "no display phandle\n"); return -EINVAL; @@ -590,8 +581,9 @@ static __maybe_unused struct of_device_id stmfb_compatible[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, stmfb_compatible); -static struct driver_d stmfb_driver = { +static struct driver stmfb_driver = { .name = "stmfb", .probe = stmfb_probe, .of_compatible = DRV_OF_COMPAT(stmfb_compatible), |