diff options
Diffstat (limited to 'drivers/video/imx-ipu-v3')
| -rw-r--r-- | drivers/video/imx-ipu-v3/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/Makefile | 1 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/imx-hdmi.c | 23 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/imx-hdmi.h | 6 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/imx-ipu-v3.h | 8 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/imx-ldb.c | 29 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/imx-pd.c | 19 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/ipu-common.c | 34 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/ipu-dc.c | 15 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/ipu-di.c | 13 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/ipu-dmfc.c | 17 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/ipu-dp.c | 15 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/ipu-prv.h | 26 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/ipufb.c | 29 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/ipuv3-plane.c | 12 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/ipuv3-plane.h | 1 |
16 files changed, 76 insertions, 173 deletions
diff --git a/drivers/video/imx-ipu-v3/Kconfig b/drivers/video/imx-ipu-v3/Kconfig index 55aeac9415..4429e815cd 100644 --- a/drivers/video/imx-ipu-v3/Kconfig +++ b/drivers/video/imx-ipu-v3/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only config DRIVER_VIDEO_IMX_IPUV3 bool "i.MX IPUv3 driver" depends on ARCH_IMX diff --git a/drivers/video/imx-ipu-v3/Makefile b/drivers/video/imx-ipu-v3/Makefile index 1f6812021e..709a9203a3 100644 --- a/drivers/video/imx-ipu-v3/Makefile +++ b/drivers/video/imx-ipu-v3/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_DRIVER_VIDEO_IMX_IPUV3) += ipu-common.o ipu-dmfc.o ipu-di.o obj-$(CONFIG_DRIVER_VIDEO_IMX_IPUV3) += ipu-dp.o ipuv3-plane.o ipufb.o obj-$(CONFIG_DRIVER_VIDEO_IMX_IPUV3) += ipu-dc.o diff --git a/drivers/video/imx-ipu-v3/imx-hdmi.c b/drivers/video/imx-ipu-v3/imx-hdmi.c index 589ef5e32d..2d5fd98666 100644 --- a/drivers/video/imx-ipu-v3/imx-hdmi.c +++ b/drivers/video/imx-ipu-v3/imx-hdmi.c @@ -1,14 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. - * - * 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. - * * Designware High-Definition Multimedia Interface (HDMI) driver * * Copyright (C) 2010, Guennadi Liakhovetski <g.liakhovetski@gmx.de> + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. */ #include <common.h> #include <fb.h> @@ -20,12 +15,11 @@ #include <linux/clk.h> #include <linux/err.h> #include <linux/math64.h> -#include <linux/clk.h> #include <i2c/i2c.h> #include <video/media-bus-format.h> #include <video/vpl.h> -#include <mach/imx6-regs.h> -#include <mach/imx53-regs.h> +#include <mach/imx/imx6-regs.h> +#include <mach/imx/imx53-regs.h> #include "imx-ipu-v3.h" #include "ipuv3-plane.h" @@ -119,7 +113,7 @@ struct hdmi_data_info { struct dw_hdmi { enum dw_hdmi_devtype dev_type; - struct device_d *dev; + struct device *dev; struct clk *isfr_clk; struct clk *iahb_clk; @@ -1203,6 +1197,7 @@ static struct of_device_id dw_hdmi_dt_ids[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, dw_hdmi_dt_ids); static int dw_hdmi_get_modes(struct dw_hdmi *hdmi, struct display_timings *timings) { @@ -1254,10 +1249,10 @@ static int dw_hdmi_ioctl(struct vpl *vpl, unsigned int port, return 0; } -static int dw_hdmi_probe(struct device_d *dev) +static int dw_hdmi_probe(struct device *dev) { struct resource *iores; - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; struct dw_hdmi *hdmi; int ret; @@ -1353,7 +1348,7 @@ err_isfr: return ret; } -static struct driver_d dw_hdmi_driver = { +static struct driver dw_hdmi_driver = { .probe = dw_hdmi_probe, .of_compatible = dw_hdmi_dt_ids, .name = "imx-hdmi", diff --git a/drivers/video/imx-ipu-v3/imx-hdmi.h b/drivers/video/imx-ipu-v3/imx-hdmi.h index b3e144227f..dcffe75529 100644 --- a/drivers/video/imx-ipu-v3/imx-hdmi.h +++ b/drivers/video/imx-ipu-v3/imx-hdmi.h @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Freescale Semiconductor, Inc. - * - * 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. */ #ifndef __IMX_HDMI_H__ diff --git a/drivers/video/imx-ipu-v3/imx-ipu-v3.h b/drivers/video/imx-ipu-v3/imx-ipu-v3.h index cdfff6992f..8b78b716d3 100644 --- a/drivers/video/imx-ipu-v3/imx-ipu-v3.h +++ b/drivers/video/imx-ipu-v3/imx-ipu-v3.h @@ -1,12 +1,6 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* * Copyright 2005-2009 Freescale Semiconductor, Inc. - * - * The code contained herein is licensed under the GNU Lesser General - * Public License. You may obtain a copy of the GNU Lesser General - * Public License Version 2.1 or later at the following locations: - * - * http://www.opensource.org/licenses/lgpl-license.html - * http://www.gnu.org/copyleft/lgpl.html */ #ifndef __DRM_IPU_H__ diff --git a/drivers/video/imx-ipu-v3/imx-ldb.c b/drivers/video/imx-ipu-v3/imx-ldb.c index 1316237161..3ed6d44f5b 100644 --- a/drivers/video/imx-ipu-v3/imx-ldb.c +++ b/drivers/video/imx-ipu-v3/imx-ldb.c @@ -1,21 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * i.MX drm driver - parallel display implementation * * Copyright (C) 2012 Sascha Hauer, Pengutronix - * - * 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 <common.h> @@ -32,9 +19,8 @@ #include <linux/clk.h> #include <linux/err.h> #include <linux/math64.h> -#include <linux/clk.h> -#include <mach/imx6-regs.h> -#include <mach/imx53-regs.h> +#include <mach/imx/imx6-regs.h> +#include <mach/imx/imx53-regs.h> #include "imx-ipu-v3.h" #include "ipuv3-plane.h" @@ -75,7 +61,7 @@ struct imx_ldb_data { }; struct imx_ldb { - struct device_d *dev; + struct device *dev; u32 bus_format; int mode_valid; struct imx_ldb_channel channel[2]; @@ -316,9 +302,9 @@ static int imx_ldb_ioctl(struct vpl *vpl, unsigned int port, return 0; } -static int imx_ldb_probe(struct device_d *dev) +static int imx_ldb_probe(struct device *dev) { - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; struct device_node *child; struct imx_ldb *imx_ldb; int ret, i; @@ -417,8 +403,9 @@ static struct of_device_id imx_ldb_dt_ids[] = { { .compatible = "fsl,imx53-ldb", &imx_ldb_data_imx53}, { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, imx_ldb_dt_ids); -static struct driver_d imx_ldb_driver = { +static struct driver imx_ldb_driver = { .probe = imx_ldb_probe, .of_compatible = imx_ldb_dt_ids, .name = "imx-ldb", diff --git a/drivers/video/imx-ipu-v3/imx-pd.c b/drivers/video/imx-ipu-v3/imx-pd.c index fa6314c044..d8b5f90a6c 100644 --- a/drivers/video/imx-ipu-v3/imx-pd.c +++ b/drivers/video/imx-ipu-v3/imx-pd.c @@ -1,16 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * i.MX drm driver - parallel display implementation * * Copyright (C) 2016 Philippe Leduc - * - * 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> @@ -30,7 +22,7 @@ #define IMX_PD_OUTPUT_PORT 1 struct imx_pd { - struct device_d *dev; + struct device *dev; struct display_timings *timings; u32 bus_format; struct vpl vpl; @@ -69,9 +61,9 @@ static int imx_pd_ioctl(struct vpl *vpl, unsigned int port, return 0; } -static int imx_pd_probe(struct device_d *dev) +static int imx_pd_probe(struct device *dev) { - struct device_node *node = dev->device_node; + struct device_node *node = dev->of_node; struct imx_pd *imx_pd; struct device_node *port; const char *fmt; @@ -116,8 +108,9 @@ static struct of_device_id imx_pd_dt_ids[] = { { .compatible = "fsl,imx-parallel-display", }, { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, imx_pd_dt_ids); -static struct driver_d imx_pd_driver = { +static struct driver imx_pd_driver = { .probe = imx_pd_probe, .of_compatible = imx_pd_dt_ids, .name = "imx-parallel-display", diff --git a/drivers/video/imx-ipu-v3/ipu-common.c b/drivers/video/imx-ipu-v3/ipu-common.c index b31edcdd55..4909119d87 100644 --- a/drivers/video/imx-ipu-v3/ipu-common.c +++ b/drivers/video/imx-ipu-v3/ipu-common.c @@ -1,16 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2010 Sascha Hauer <s.hauer@pengutronix.de> * Copyright (C) 2005-2009 Freescale Semiconductor, Inc. - * - * 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> @@ -20,10 +11,10 @@ #include <driver.h> #include <init.h> #include <linux/mutex.h> -#include <mach/generic.h> -#include <mach/imx6-regs.h> -#include <mach/imx53-regs.h> -#include <mach/imx51-regs.h> +#include <mach/imx/generic.h> +#include <mach/imx/imx6-regs.h> +#include <mach/imx/imx53-regs.h> +#include <mach/imx/imx51-regs.h> #include "imx-ipu-v3.h" #include "ipu-prv.h" @@ -618,9 +609,10 @@ static struct of_device_id imx_ipu_dt_ids[] = { { .compatible = "fsl,imx6q-ipu", .data = &ipu_type_imx6q, }, { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, imx_ipu_dt_ids); static int ipu_submodules_init(struct ipu_soc *ipu, - struct device_d *dev, void __iomem *ipu_base, + struct device *dev, void __iomem *ipu_base, struct clk *ipu_clk) { char *unit; @@ -714,16 +706,16 @@ static struct ipu_platform_reg client_reg[] = { static int ipu_client_id; -static int ipu_add_subdevice_pdata(struct device_d *ipu_dev, - struct ipu_platform_reg *reg) +static int ipu_add_subdevice_pdata(struct device *ipu_dev, + struct ipu_platform_reg *reg) { - struct device_d *dev; + struct device *dev; int ret; dev = device_alloc(reg->name, ipu_client_id++); dev->parent = ipu_dev; device_add_data(dev, ®->pdata, sizeof(reg->pdata)); - ((struct ipu_client_platformdata *)dev->platform_data)->device_node = ipu_dev->device_node; + ((struct ipu_client_platformdata *)dev->platform_data)->device_node = ipu_dev->of_node; ret = platform_device_register(dev); @@ -749,7 +741,7 @@ err_register: return ret; } -static int ipu_probe(struct device_d *dev) +static int ipu_probe(struct device *dev) { struct resource *iores; struct ipu_soc *ipu; @@ -853,7 +845,7 @@ out_failed_reset: return ret; } -static struct driver_d imx_ipu_driver = { +static struct driver imx_ipu_driver = { .name = "imx-ipuv3", .of_compatible = imx_ipu_dt_ids, .probe = ipu_probe, diff --git a/drivers/video/imx-ipu-v3/ipu-dc.c b/drivers/video/imx-ipu-v3/ipu-dc.c index 7b343e8149..a0292fc4a1 100644 --- a/drivers/video/imx-ipu-v3/ipu-dc.c +++ b/drivers/video/imx-ipu-v3/ipu-dc.c @@ -1,16 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2010 Sascha Hauer <s.hauer@pengutronix.de> * Copyright (C) 2005-2009 Freescale Semiconductor, Inc. - * - * 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> @@ -105,7 +96,7 @@ struct ipu_dc_priv { void __iomem *dc_reg; void __iomem *dc_tmpl_reg; struct ipu_soc *ipu; - struct device_d *dev; + struct device *dev; struct ipu_dc channels[IPU_DC_NUM_CHANNELS]; }; @@ -321,7 +312,7 @@ void ipu_dc_put(struct ipu_dc *dc) } EXPORT_SYMBOL_GPL(ipu_dc_put); -int ipu_dc_init(struct ipu_soc *ipu, struct device_d *dev, +int ipu_dc_init(struct ipu_soc *ipu, struct device *dev, void __iomem *base, void __iomem *template_base) { struct ipu_dc_priv *priv; diff --git a/drivers/video/imx-ipu-v3/ipu-di.c b/drivers/video/imx-ipu-v3/ipu-di.c index 85dde1882e..6156911bfc 100644 --- a/drivers/video/imx-ipu-v3/ipu-di.c +++ b/drivers/video/imx-ipu-v3/ipu-di.c @@ -1,16 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2010 Sascha Hauer <s.hauer@pengutronix.de> * Copyright (C) 2005-2009 Freescale Semiconductor, Inc. - * - * 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 <linux/err.h> @@ -709,7 +700,7 @@ void ipu_di_put(struct ipu_di *di) } EXPORT_SYMBOL_GPL(ipu_di_put); -int ipu_di_init(struct ipu_soc *ipu, struct device_d *dev, int id, +int ipu_di_init(struct ipu_soc *ipu, struct device *dev, int id, void __iomem *base, u32 module, struct clk *clk_ipu) { diff --git a/drivers/video/imx-ipu-v3/ipu-dmfc.c b/drivers/video/imx-ipu-v3/ipu-dmfc.c index 29c4bb4780..4be6a15eef 100644 --- a/drivers/video/imx-ipu-v3/ipu-dmfc.c +++ b/drivers/video/imx-ipu-v3/ipu-dmfc.c @@ -1,16 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2010 Sascha Hauer <s.hauer@pengutronix.de> * Copyright (C) 2005-2009 Freescale Semiconductor, Inc. - * - * 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> @@ -109,7 +100,7 @@ struct dmfc_channel { struct ipu_dmfc_priv { struct ipu_soc *ipu; - struct device_d *dev; + struct device *dev; struct dmfc_channel channels[DMFC_NUM_CHANNELS]; unsigned long bandwidth_per_slot; void __iomem *base; @@ -349,8 +340,8 @@ void ipu_dmfc_put(struct dmfc_channel *dmfc) } EXPORT_SYMBOL_GPL(ipu_dmfc_put); -int ipu_dmfc_init(struct ipu_soc *ipu, struct device_d *dev, void __iomem *base, - struct clk *ipu_clk) +int ipu_dmfc_init(struct ipu_soc *ipu, struct device *dev, void __iomem *base, + struct clk *ipu_clk) { struct ipu_dmfc_priv *priv; int i; diff --git a/drivers/video/imx-ipu-v3/ipu-dp.c b/drivers/video/imx-ipu-v3/ipu-dp.c index 8829954db0..68b45c11c7 100644 --- a/drivers/video/imx-ipu-v3/ipu-dp.c +++ b/drivers/video/imx-ipu-v3/ipu-dp.c @@ -1,16 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2010 Sascha Hauer <s.hauer@pengutronix.de> * Copyright (C) 2005-2009 Freescale Semiconductor, Inc. - * - * 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 <linux/err.h> @@ -65,7 +56,7 @@ struct ipu_flow { struct ipu_dp_priv { struct ipu_soc *ipu; - struct device_d *dev; + struct device *dev; void __iomem *base; struct ipu_flow flow[IPUV3_NUM_FLOWS]; int use_count; @@ -286,7 +277,7 @@ void ipu_dp_put(struct ipu_dp *dp) } EXPORT_SYMBOL_GPL(ipu_dp_put); -int ipu_dp_init(struct ipu_soc *ipu, struct device_d *dev, void __iomem *base) +int ipu_dp_init(struct ipu_soc *ipu, struct device *dev, void __iomem *base) { struct ipu_dp_priv *priv; int i; diff --git a/drivers/video/imx-ipu-v3/ipu-prv.h b/drivers/video/imx-ipu-v3/ipu-prv.h index 4d1c0692de..4465711ee4 100644 --- a/drivers/video/imx-ipu-v3/ipu-prv.h +++ b/drivers/video/imx-ipu-v3/ipu-prv.h @@ -1,16 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2010 Sascha Hauer <s.hauer@pengutronix.de> * Copyright (C) 2005-2009 Freescale Semiconductor, Inc. - * - * 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. */ #ifndef __IPU_PRV_H__ #define __IPU_PRV_H__ @@ -149,7 +140,7 @@ struct ipu_di; struct ipu_devtype; struct ipu_soc { - struct device_d *dev; + struct device *dev; const struct ipu_devtype *devtype; enum ipuv3_type ipu_type; spinlock_t lock; @@ -181,22 +172,23 @@ void ipu_srm_dp_sync_update(struct ipu_soc *ipu); int ipu_module_enable(struct ipu_soc *ipu, u32 mask); int ipu_module_disable(struct ipu_soc *ipu, u32 mask); -int ipu_di_init(struct ipu_soc *ipu, struct device_d *dev, int id, +int ipu_di_init(struct ipu_soc *ipu, struct device *dev, int id, void __iomem *base, u32 module, struct clk *ipu_clk); void ipu_di_exit(struct ipu_soc *ipu, int id); -int ipu_dmfc_init(struct ipu_soc *ipu, struct device_d *dev, void __iomem *base, - struct clk *ipu_clk); +int ipu_dmfc_init(struct ipu_soc *ipu, struct device *dev, void __iomem *base, + struct clk *ipu_clk); void ipu_dmfc_exit(struct ipu_soc *ipu); -int ipu_dp_init(struct ipu_soc *ipu, struct device_d *dev, void __iomem *base); +int ipu_dp_init(struct ipu_soc *ipu, struct device *dev, void __iomem *base); void ipu_dp_exit(struct ipu_soc *ipu); -int ipu_dc_init(struct ipu_soc *ipu, struct device_d *dev, void __iomem *base, +int ipu_dc_init(struct ipu_soc *ipu, struct device *dev, void __iomem *base, void __iomem *template_base); void ipu_dc_exit(struct ipu_soc *ipu); -int ipu_cpmem_init(struct ipu_soc *ipu, struct device_d *dev, void __iomem *base); +int ipu_cpmem_init(struct ipu_soc *ipu, struct device *dev, + void __iomem *base); void ipu_cpmem_exit(struct ipu_soc *ipu); #endif /* __IPU_PRV_H__ */ diff --git a/drivers/video/imx-ipu-v3/ipufb.c b/drivers/video/imx-ipu-v3/ipufb.c index 68e87ff3fb..e4ac988053 100644 --- a/drivers/video/imx-ipu-v3/ipufb.c +++ b/drivers/video/imx-ipu-v3/ipufb.c @@ -1,13 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Freescale i.MX Frame Buffer device driver * * Copyright (C) 2004 Sascha Hauer, Pengutronix * Based on acornfb.c Copyright (C) Russell King. - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of this archive for - * more details. - * */ #define pr_fmt(fmt) "IPU: " fmt @@ -49,7 +45,7 @@ struct ipufb_info { struct fb_videomode *mode; struct fb_info info; - struct device_d *dev; + struct device *dev; /* plane[0] is the full plane, plane[1] is the partial plane */ struct ipu_plane *plane[2]; @@ -111,10 +107,8 @@ static int ipu_crtc_mode_set(struct ipufb_info *fbi, struct ipu_di_mode di_mode = {}; u32 bus_format = 0; - dev_info(fbi->dev, "%s: mode->xres: %d\n", __func__, - mode->xres); - dev_info(fbi->dev, "%s: mode->yres: %d\n", __func__, - mode->yres); + dev_info(fbi->dev, "%s: mode->xres: %d mode->yres: %d\n", __func__, + mode->xres, mode->yres); vpl_ioctl(&fbi->vpl, 2 + fbi->dino, IMX_IPU_VPL_DI_MODE, &di_mode); vpl_ioctl(&fbi->vpl, 2 + fbi->dino, VPL_GET_BUS_FORMAT, &bus_format); @@ -275,7 +269,7 @@ err_out: return ret; } -static int ipufb_probe(struct device_d *dev) +static int ipufb_probe(struct device *dev) { struct ipufb_info *fbi; struct fb_info *info; @@ -288,7 +282,7 @@ static int ipufb_probe(struct device_d *dev) fbi = xzalloc(sizeof(*fbi)); info = &fbi->info; - ipuid = of_alias_get_id(dev->parent->device_node, "ipu"); + ipuid = of_alias_get_id(dev->parent->of_node, "ipu"); fbi->name = basprintf("ipu%d-di%d", ipuid + 1, pdata->di); fbi->id = ipuid * 2 + pdata->di; fbi->dino = pdata->di; @@ -311,11 +305,12 @@ static int ipufb_probe(struct device_d *dev) if (ret) return ret; - node = of_graph_get_port_by_id(dev->parent->device_node, 2 + pdata->di); + node = of_graph_get_port_by_id(dev->parent->of_node, 2 + pdata->di); if (node && of_graph_port_is_available(node)) { - dev_dbg(fbi->dev, "register vpl for %s\n", dev->parent->device_node->full_name); + dev_dbg(fbi->dev, "register vpl for %pOF\n", + dev->parent->of_node); - fbi->vpl.node = dev->parent->device_node; + fbi->vpl.node = dev->parent->of_node; ret = vpl_register(&fbi->vpl); if (ret) return ret; @@ -347,11 +342,11 @@ static int ipufb_probe(struct device_d *dev) return ret; } -static void ipufb_remove(struct device_d *dev) +static void ipufb_remove(struct device *dev) { } -static struct driver_d ipufb_driver = { +static struct driver ipufb_driver = { .name = "imx-ipuv3-crtc", .probe = ipufb_probe, .remove = ipufb_remove, diff --git a/drivers/video/imx-ipu-v3/ipuv3-plane.c b/drivers/video/imx-ipu-v3/ipuv3-plane.c index 9dffcfc670..aed7a46963 100644 --- a/drivers/video/imx-ipu-v3/ipuv3-plane.c +++ b/drivers/video/imx-ipu-v3/ipuv3-plane.c @@ -1,16 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * i.MX IPUv3 DP Overlay Planes * * Copyright (C) 2013 Philipp Zabel, Pengutronix - * - * 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 <linux/err.h> @@ -63,7 +55,7 @@ int ipu_plane_mode_set(struct ipu_plane *ipu_plane, uint32_t src_w, uint32_t src_h) { struct ipu_ch_param __iomem *cpmem; - struct device_d *dev = &info->dev; + struct device *dev = &info->dev; int ret; /* no scaling */ diff --git a/drivers/video/imx-ipu-v3/ipuv3-plane.h b/drivers/video/imx-ipu-v3/ipuv3-plane.h index 3d52f807fe..cade98e3e9 100644 --- a/drivers/video/imx-ipu-v3/ipuv3-plane.h +++ b/drivers/video/imx-ipu-v3/ipuv3-plane.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ #ifndef __IPUV3_PLANE_H__ #define __IPUV3_PLANE_H__ |