drm: omapdrm: Remove filename from header and fix copyright tag
Subsystems (3)
PATCH 1/2 drm: omapdrm: Remove filename from header and fix copyright tag
Having the filename in the header serves little purpose and is often wrong after renames as it is here in several places, just drop it from all omapdrm files.
While we are here unify the copyright tags to the TI recommended style.
Signed-off-by Andrew F. Davis <[email protected]>
--- .../gpu/drm/omapdrm/displays/connector-analog-tv.c | 2 +- drivers/gpu/drm/omapdrm/displays/connector-dvi.c | 2 +- drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 2 +- drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 2 +- drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 2 +- drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 2 +- drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 2 +- drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 2 +- .../drm/omapdrm/displays/panel-lgphilips-lb035q02.c | 2 +- .../gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c | 2 +- .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 2 +- drivers/gpu/drm/omapdrm/dss/base.c | 15 +++++++++++++++ drivers/gpu/drm/omapdrm/dss/core.c | 2 -- drivers/gpu/drm/omapdrm/dss/dispc.c | 2 -- drivers/gpu/drm/omapdrm/dss/dispc.h | 5 +---- drivers/gpu/drm/omapdrm/dss/dispc_coefs.c | 4 +--- drivers/gpu/drm/omapdrm/dss/display.c | 2 -- drivers/gpu/drm/omapdrm/dss/dpi.c | 2 -- drivers/gpu/drm/omapdrm/dss/dsi.c | 2 -- drivers/gpu/drm/omapdrm/dss/dss-of.c | 2 +- drivers/gpu/drm/omapdrm/dss/dss.c | 2 -- drivers/gpu/drm/omapdrm/dss/dss.h | 2 -- drivers/gpu/drm/omapdrm/dss/hdmi4.c | 1 + drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 3 +-- drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 +- drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 3 +-- drivers/gpu/drm/omapdrm/dss/hdmi_phy.c | 2 +- drivers/gpu/drm/omapdrm/dss/hdmi_pll.c | 2 +- drivers/gpu/drm/omapdrm/dss/hdmi_wp.c | 2 +- drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c | 2 +- drivers/gpu/drm/omapdrm/dss/omapdss.h | 2 +- drivers/gpu/drm/omapdrm/dss/output.c | 2 +- drivers/gpu/drm/omapdrm/dss/pll.c | 2 +- drivers/gpu/drm/omapdrm/dss/sdi.c | 2 -- drivers/gpu/drm/omapdrm/dss/venc.c | 2 -- drivers/gpu/drm/omapdrm/dss/video-pll.c | 20 +++++++++++--------- drivers/gpu/drm/omapdrm/omap_connector.c | 4 +--- drivers/gpu/drm/omapdrm/omap_crtc.c | 4 +--- drivers/gpu/drm/omapdrm/omap_debugfs.c | 4 +--- drivers/gpu/drm/omapdrm/omap_dmm_priv.h | 2 +- drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 3 +-- drivers/gpu/drm/omapdrm/omap_dmm_tiler.h | 1 - drivers/gpu/drm/omapdrm/omap_drv.c | 4 +--- drivers/gpu/drm/omapdrm/omap_drv.h | 4 +--- drivers/gpu/drm/omapdrm/omap_encoder.c | 4 +--- drivers/gpu/drm/omapdrm/omap_fb.c | 4 +--- drivers/gpu/drm/omapdrm/omap_fbdev.c | 4 +--- drivers/gpu/drm/omapdrm/omap_gem.c | 4 +--- drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 4 +--- drivers/gpu/drm/omapdrm/omap_irq.c | 4 +--- drivers/gpu/drm/omapdrm/omap_plane.c | 4 +--- drivers/gpu/drm/omapdrm/tcm-sita.c | 4 +--- drivers/gpu/drm/omapdrm/tcm-sita.h | 4 +--- drivers/gpu/drm/omapdrm/tcm.h | 2 -- 54 files changed, 67 insertions(+), 106 deletions(-)
drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c +1 -1
@@ -1,7 +1,7 @@/* * Analog TV Connector driver * -* Copyright (C) 2013 Texas Instruments +* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ * Author: Tomi Valkeinen <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/displays/connector-dvi.c +1 -1
@@ -1,7 +1,7 @@/* * Generic DVI Connector driver * -* Copyright (C) 2013 Texas Instruments +* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ * Author: Tomi Valkeinen <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/displays/connector-hdmi.c +1 -1
@@ -1,7 +1,7 @@/* * HDMI Connector driver * -* Copyright (C) 2013 Texas Instruments +* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ * Author: Tomi Valkeinen <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/displays/encoder-opa362.c +1 -1
@@ -6,7 +6,7 @@* * based on encoder-tfp410 * -* Copyright (C) 2013 Texas Instruments +* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ * Author: Tomi Valkeinen <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c +1 -1
@@ -1,7 +1,7 @@/* * TFP410 DPI-to-DVI encoder driver * -* Copyright (C) 2013 Texas Instruments +* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ * Author: Tomi Valkeinen <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c +1 -1
@@ -1,7 +1,7 @@/* * TPD12S015 HDMI ESD protection & level shifter chip driver * -* Copyright (C) 2013 Texas Instruments +* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ * Author: Tomi Valkeinen <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/displays/panel-dpi.c +1 -1
@@ -1,7 +1,7 @@/* * Generic MIPI DPI Panel Driver * -* Copyright (C) 2013 Texas Instruments +* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ * Author: Tomi Valkeinen <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c +1 -1
@@ -1,7 +1,7 @@/* * Generic DSI Command Mode panel driver * -* Copyright (C) 2013 Texas Instruments +* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ * Author: Tomi Valkeinen <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c +1 -1
@@ -1,7 +1,7 @@/* * LG.Philips LB035Q02 LCD Panel driver * -* Copyright (C) 2013 Texas Instruments +* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ * Author: Tomi Valkeinen <[email protected]> * Based on a driver by: Steve Sakoman <[email protected]> *
drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c +1 -1
@@ -1,7 +1,7 @@/* * NEC NL8048HL11 Panel driver * -* Copyright (C) 2010 Texas Instruments Inc. +* Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/ * Author: Erik Gilling <[email protected]> * Converted to new DSS device model: Tomi Valkeinen <[email protected]> *
drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c +1 -1
@@ -1,7 +1,7 @@/* * LCD panel driver for Sharp LS037V7DW01 * -* Copyright (C) 2013 Texas Instruments +* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ * Author: Tomi Valkeinen <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/dss/base.c +15 -0
@@ -1,3 +1,18 @@ +/* +* OMAP Display Subsystem Base +* +* Copyright (C) 2015-2017 Texas Instruments Incorporated - http://www.ti.com/ +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* 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 <linux/kernel.h> #include <linux/module.h> #include <linux/of.h>
drivers/gpu/drm/omapdrm/dss/core.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/drivers/video/omap2/dss/core.c -* * Copyright (C) 2009 Nokia Corporation * Author: Tomi Valkeinen <[email protected]> *
drivers/gpu/drm/omapdrm/dss/dispc.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/drivers/video/omap2/dss/dispc.c -* * Copyright (C) 2009 Nokia Corporation * Author: Tomi Valkeinen <[email protected]> *
drivers/gpu/drm/omapdrm/dss/dispc.h +1 -4
@@ -1,10 +1,7 @@/* -* linux/drivers/video/omap2/dss/dispc.h -* -* Copyright (C) 2011 Texas Instruments +* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Archit Taneja <[email protected]> * -* * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published by * the Free Software Foundation.
drivers/gpu/drm/omapdrm/dss/dispc_coefs.c +1 -3
@@ -1,7 +1,5 @@/* -* linux/drivers/video/omap2/dss/dispc_coefs.c -* -* Copyright (C) 2011 Texas Instruments +* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Chandrabhanu Mahapatra <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/dss/display.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/drivers/video/omap2/dss/display.c -* * Copyright (C) 2009 Nokia Corporation * Author: Tomi Valkeinen <[email protected]> *
drivers/gpu/drm/omapdrm/dss/dpi.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/drivers/video/omap2/dss/dpi.c -* * Copyright (C) 2009 Nokia Corporation * Author: Tomi Valkeinen <[email protected]> *
drivers/gpu/drm/omapdrm/dss/dsi.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/drivers/video/omap2/dss/dsi.c -* * Copyright (C) 2009 Nokia Corporation * Author: Tomi Valkeinen <[email protected]> *
drivers/gpu/drm/omapdrm/dss/dss-of.c +1 -1
@@ -1,5 +1,5 @@/* -* Copyright (C) 2013 Texas Instruments +* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ * Author: Tomi Valkeinen <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/dss/dss.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/drivers/video/omap2/dss/dss.c -* * Copyright (C) 2009 Nokia Corporation * Author: Tomi Valkeinen <[email protected]> *
drivers/gpu/drm/omapdrm/dss/dss.h +0 -2
@@ -1,6 +1,4 @@/* -* linux/drivers/video/omap2/dss/dss.h -* * Copyright (C) 2009 Nokia Corporation * Author: Tomi Valkeinen <[email protected]> *
drivers/gpu/drm/omapdrm/dss/hdmi4.c +1 -0
@@ -1,5 +1,6 @@/* * HDMI interface DSS driver for TI's OMAP4 family of SoCs. +* * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com/ * Authors: Yong Zhi * Mythri pk <[email protected]>
drivers/gpu/drm/omapdrm/dss/hdmi4_core.c +1 -2
@@ -1,7 +1,6 @@/* -* ti_hdmi_4xxx_ip.c -* * HDMI TI81xx, TI38xx, TI OMAP4 etc IP driver Library +* * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com/ * Authors: Yong Zhi * Mythri pk <[email protected]>
drivers/gpu/drm/omapdrm/dss/hdmi5.c +1 -1
@@ -1,7 +1,7 @@/* * HDMI driver for OMAP5 * -* Copyright (C) 2014 Texas Instruments Incorporated +* Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ * * Authors: * Yong Zhi
drivers/gpu/drm/omapdrm/dss/hdmi5_core.c +1 -2
@@ -1,8 +1,7 @@/* * OMAP5 HDMI CORE IP driver library * -* Copyright (C) 2014 Texas Instruments Incorporated -* +* Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ * Authors: * Yong Zhi * Mythri pk
drivers/gpu/drm/omapdrm/dss/hdmi_phy.c +1 -1
@@ -1,7 +1,7 @@/* * HDMI PHY * -* Copyright (C) 2013 Texas Instruments Incorporated +* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published by
drivers/gpu/drm/omapdrm/dss/hdmi_pll.c +1 -1
@@ -1,7 +1,7 @@/* * HDMI PLL * -* Copyright (C) 2013 Texas Instruments Incorporated +* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published by
drivers/gpu/drm/omapdrm/dss/hdmi_wp.c +1 -1
@@ -1,7 +1,7 @@/* * HDMI wrapper * -* Copyright (C) 2013 Texas Instruments Incorporated +* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published by
drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c +1 -1
@@ -1,5 +1,5 @@/* -* Copyright (C) 2014 Texas Instruments +* Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ * Author: Tomi Valkeinen <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/dss/omapdss.h +1 -1
@@ -1,5 +1,5 @@/* -* Copyright (C) 2016 Texas Instruments +* Copyright (C) 2016 Texas Instruments Incorporated - http://www.ti.com/ * Author: Tomi Valkeinen <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/dss/output.c +1 -1
@@ -1,5 +1,5 @@/* -* Copyright (C) 2012 Texas Instruments Ltd +* Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ * Author: Archit Taneja <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/dss/pll.c +1 -1
@@ -1,5 +1,5 @@/* -* Copyright (C) 2014 Texas Instruments Incorporated +* Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published by
drivers/gpu/drm/omapdrm/dss/sdi.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/drivers/video/omap2/dss/sdi.c -* * Copyright (C) 2009 Nokia Corporation * Author: Tomi Valkeinen <[email protected]> *
drivers/gpu/drm/omapdrm/dss/venc.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/drivers/video/omap2/dss/venc.c -* * Copyright (C) 2009 Nokia Corporation * Author: Tomi Valkeinen <[email protected]> *
drivers/gpu/drm/omapdrm/dss/video-pll.c +11 -9
@@ -1,13 +1,15 @@/* -* Copyright (C) 2014 Texas Instruments Ltd -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License version 2 as published by -* the Free Software Foundation. -* -* You should have received a copy of the GNU General Public License along with -* this program. If not, see <http://www.gnu.org/licenses/>. -*/ +* Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License version 2 as published by +* the Free Software Foundation. +* +* 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 <linux/clk.h> #include <linux/delay.h>
drivers/gpu/drm/omapdrm/omap_connector.c +1 -3
@@ -1,7 +1,5 @@/* -* drivers/gpu/drm/omapdrm/omap_connector.c -* -* Copyright (C) 2011 Texas Instruments +* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Rob Clark <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/omap_crtc.c +1 -3
@@ -1,7 +1,5 @@/* -* drivers/gpu/drm/omapdrm/omap_crtc.c -* -* Copyright (C) 2011 Texas Instruments +* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Rob Clark <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/omap_debugfs.c +1 -3
@@ -1,7 +1,5 @@/* -* drivers/gpu/drm/omapdrm/omap_debugfs.c -* -* Copyright (C) 2011 Texas Instruments +* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Rob Clark <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/omap_dmm_priv.h +1 -1
@@ -1,5 +1,4 @@/* -* * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Rob Clark <[email protected]> * Andy Gross <[email protected]>
@@ -13,6 +12,7 @@* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ +#ifndef OMAP_DMM_PRIV_H #define OMAP_DMM_PRIV_H
drivers/gpu/drm/omapdrm/omap_dmm_tiler.c +1 -2
@@ -1,11 +1,10 @@/* * DMM IOMMU driver support functions for TI OMAP processors. * +* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Rob Clark <[email protected]> * Andy Gross <[email protected]> * -* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ -* * 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 version 2.
drivers/gpu/drm/omapdrm/omap_dmm_tiler.h +0 -1
@@ -1,5 +1,4 @@/* -* * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Rob Clark <[email protected]> * Andy Gross <[email protected]>
drivers/gpu/drm/omapdrm/omap_drv.c +1 -3
@@ -1,7 +1,5 @@/* -* drivers/gpu/drm/omapdrm/omap_drv.c -* -* Copyright (C) 2011 Texas Instruments +* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Rob Clark <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/omap_drv.h +1 -3
@@ -1,7 +1,5 @@/* -* drivers/gpu/drm/omapdrm/omap_drv.h -* -* Copyright (C) 2011 Texas Instruments +* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Rob Clark <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/omap_encoder.c +1 -3
@@ -1,7 +1,5 @@/* -* drivers/gpu/drm/omapdrm/omap_encoder.c -* -* Copyright (C) 2011 Texas Instruments +* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Rob Clark <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/omap_fb.c +1 -3
@@ -1,7 +1,5 @@/* -* drivers/gpu/drm/omapdrm/omap_fb.c -* -* Copyright (C) 2011 Texas Instruments +* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Rob Clark <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/omap_fbdev.c +1 -3
@@ -1,7 +1,5 @@/* -* drivers/gpu/drm/omapdrm/omap_fbdev.c -* -* Copyright (C) 2011 Texas Instruments +* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Rob Clark <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/omap_gem.c +1 -3
@@ -1,7 +1,5 @@/* -* drivers/gpu/drm/omapdrm/omap_gem.c -* -* Copyright (C) 2011 Texas Instruments +* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Rob Clark <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c +1 -3
@@ -1,7 +1,5 @@/* -* drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c -* -* Copyright (C) 2011 Texas Instruments +* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Rob Clark <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/omap_irq.c +1 -3
@@ -1,7 +1,5 @@/* -* drivers/gpu/drm/omapdrm/omap_irq.c -* -* Copyright (C) 2012 Texas Instruments +* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Rob Clark <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/omap_plane.c +1 -3
@@ -1,7 +1,5 @@/* -* drivers/gpu/drm/omapdrm/omap_plane.c -* -* Copyright (C) 2011 Texas Instruments +* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Rob Clark <[email protected]> * * This program is free software; you can redistribute it and/or modify it
drivers/gpu/drm/omapdrm/tcm-sita.c +1 -3
@@ -1,13 +1,11 @@/* -* tcm-sita.c -* * SImple Tiler Allocator (SiTA): 2D and 1D allocation(reservation) algorithm * * Authors: Ravi Ramachandra <[email protected]>, * Lajos Molnar <[email protected]> * Andy Gross <[email protected]> * -* Copyright (C) 2012 Texas Instruments, Inc. +* Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ * * This package is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
drivers/gpu/drm/omapdrm/tcm-sita.h +1 -3
@@ -1,11 +1,9 @@/* -* tcm_sita.h -* * SImple Tiler Allocator (SiTA) private structures. * +* Copyright (C) 2009-2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Ravi Ramachandra <[email protected]> * -* Copyright (C) 2009-2011 Texas Instruments, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without
drivers/gpu/drm/omapdrm/tcm.h +0 -2
@@ -1,6 +1,4 @@/* -* tcm.h -* * TILER container manager specification and support functions for TI * TILER driver. *
Signature · 6 lines
2.15.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/2 drm: omapdrm: Simplify platform registration
Currently, calls into each file are used to register the various platform drivers. Change this to a table of pointers to platform_driver structs to allow using platform_register_drivers.
Signed-off-by Andrew F. Davis <[email protected]>
--- drivers/gpu/drm/omapdrm/dss/core.c | 51 +++++++++++-------------------------- drivers/gpu/drm/omapdrm/dss/dispc.c | 12 +-------- drivers/gpu/drm/omapdrm/dss/dsi.c | 12 +-------- drivers/gpu/drm/omapdrm/dss/dss.c | 12 +-------- drivers/gpu/drm/omapdrm/dss/dss.h | 35 +++++++++++-------------- drivers/gpu/drm/omapdrm/dss/hdmi4.c | 12 +-------- drivers/gpu/drm/omapdrm/dss/hdmi5.c | 12 +-------- drivers/gpu/drm/omapdrm/dss/venc.c | 12 +-------- 8 files changed, 36 insertions(+), 122 deletions(-)
drivers/gpu/drm/omapdrm/dss/core.c +15 -36
@@ -28,52 +28,33 @@#include "dss.h" /* INIT */ -static int (*dss_output_drv_reg_funcs[])(void )__initdata = { - dss_init_platform_driver, - dispc_init_platform_driver, +static struct platform_driver *const omap_dss_drivers[] = { + &omap_dsshw_driver, + &omap_dispchw_driver, #ifdef CONFIG_OMAP2_DSS_DSI - dsi_init_platform_driver, + &omap_dsihw_driver, #endif #ifdef CONFIG_OMAP2_DSS_VENC - venc_init_platform_driver, + &omap_venchw_driver, #endif #ifdef CONFIG_OMAP4_DSS_HDMI - hdmi4_init_platform_driver, + &omapdss_hdmi4hw_driver, #endif #ifdef CONFIG_OMAP5_DSS_HDMI - hdmi5_init_platform_driver, + &omapdss_hdmi5hw_driver, #endif }; -static void (*dss_output_drv_unreg_funcs[])(void) = { -#ifdef CONFIG_OMAP5_DSS_HDMI - hdmi5_uninit_platform_driver, -#endif -#ifdef CONFIG_OMAP4_DSS_HDMI - hdmi4_uninit_platform_driver, -#endif -#ifdef CONFIG_OMAP2_DSS_VENC - venc_uninit_platform_driver, -#endif -#ifdef CONFIG_OMAP2_DSS_DSI - dsi_uninit_platform_driver, -#endif - dispc_uninit_platform_driver, - dss_uninit_platform_driver, -}; -static struct platform_device *omap_drm_device;static int __init omap_dss_init (void ) {int r; -int i; -for (i =0 ; i <ARRAY_SIZE (dss_output_drv_reg_funcs); ++i) { - r = dss_output_drv_reg_funcs[i](); -if (r) - goto err_reg; - } + r =platform_register_drivers (omap_dss_drivers, +ARRAY_SIZE (omap_dss_drivers)); +if (r) + goto err_reg; omap_drm_device =platform_device_register_simple ("omapdrm" ,0 ,NULL ,0 );if (IS_ERR (omap_drm_device)) {
@@ -84,10 +65,8 @@ static int __init omap_dss_init(void)return 0 ; err_reg: -for (i =ARRAY_SIZE (dss_output_drv_reg_funcs) - i; - i <ARRAY_SIZE (dss_output_drv_reg_funcs); - ++i) - dss_output_drv_unreg_funcs[i](); +platform_unregister_drivers (omap_dss_drivers, +ARRAY_SIZE (omap_dss_drivers));return r; }
@@ -98,8 +77,8 @@ static void __exit omap_dss_exit(void)platform_device_unregister (omap_drm_device); -for (i =0 ; i <ARRAY_SIZE (dss_output_drv_unreg_funcs); ++i) - dss_output_drv_unreg_funcs[i](); +platform_unregister_drivers (omap_dss_drivers, +ARRAY_SIZE (omap_dss_drivers)); }module_init (omap_dss_init);
drivers/gpu/drm/omapdrm/dss/dispc.c +1 -11
@@ -4683,7 +4683,7 @@ static const struct dev_pm_ops dispc_pm_ops = { .runtime_resume = dispc_runtime_resume, }; -static struct platform_driver omap_dispchw_driver = { +struct platform_driver omap_dispchw_driver = { .probe = dispc_probe, .remove = dispc_remove, .driver = {
@@ -4693,13 +4693,3 @@ static struct platform_driver omap_dispchw_driver = { .suppress_bind_attrs = true, }, }; - -int __init dispc_init_platform_driver (void ) -{ -return platform_driver_register (&omap_dispchw_driver); -} - -void dispc_uninit_platform_driver (void ) -{ -platform_driver_unregister (&omap_dispchw_driver); -}
drivers/gpu/drm/omapdrm/dss/dsi.c +1 -11
@@ -5658,7 +5658,7 @@ static const struct dev_pm_ops dsi_pm_ops = { .runtime_resume = dsi_runtime_resume, }; -static struct platform_driver omap_dsihw_driver = { +struct platform_driver omap_dsihw_driver = { .probe = dsi_probe, .remove = dsi_remove, .driver = {
@@ -5668,13 +5668,3 @@ static struct platform_driver omap_dsihw_driver = { .suppress_bind_attrs = true, }, }; - -int __init dsi_init_platform_driver (void ) -{ -return platform_driver_register (&omap_dsihw_driver); -} - -void dsi_uninit_platform_driver (void ) -{ -platform_driver_unregister (&omap_dsihw_driver); -}
drivers/gpu/drm/omapdrm/dss/dss.c +1 -11
@@ -1525,7 +1525,7 @@ static const struct dev_pm_ops dss_pm_ops = { .runtime_resume = dss_runtime_resume, }; -static struct platform_driver omap_dsshw_driver = { +struct platform_driver omap_dsshw_driver = { .probe = dss_probe, .remove = dss_remove, .shutdown = dss_shutdown,
@@ -1536,13 +1536,3 @@ static struct platform_driver omap_dsshw_driver = { .suppress_bind_attrs = true, }, }; - -int __init dss_init_platform_driver (void ) -{ -return platform_driver_register (&omap_dsshw_driver); -} - -void dss_uninit_platform_driver (void ) -{ -platform_driver_unregister (&omap_dsshw_driver); -}
drivers/gpu/drm/omapdrm/dss/dss.h +15 -20
@@ -262,9 +262,6 @@ static inline int dss_debugfs_create_file(const char *name, }#endif /* CONFIG_OMAP2_DSS_DEBUGFS */ -int dss_init_platform_driver (void )__init ; -void dss_uninit_platform_driver (void ); -int dss_runtime_get (void );void dss_runtime_put (void );
@@ -327,9 +324,6 @@ static inline void sdi_uninit_port(struct device_node *port)struct dentry ;struct file_operations ; -int dsi_init_platform_driver (void )__init ; -void dsi_uninit_platform_driver (void ); -void dsi_dump_clocks (struct seq_file *s);void dsi_irq_handler (void );
@@ -353,8 +347,6 @@ static inline void dpi_uninit_port(struct device_node *port)#endif /* DISPC */ -int dispc_init_platform_driver (void )__init ; -void dispc_uninit_platform_driver (void );void dispc_dump_clocks (struct seq_file *s);int dispc_runtime_get (void );
@@ -398,18 +390,6 @@ void dispc_wb_set_channel_in(enum dss_writeback_channel channel);int dispc_wb_setup (const struct omap_dss_writeback_info *wi,bool mem_to_mem,const struct videomode *vm); -/* VENC */ -int venc_init_platform_driver (void )__init ; -void venc_uninit_platform_driver (void ); - -/* HDMI */ -int hdmi4_init_platform_driver (void )__init ; -void hdmi4_uninit_platform_driver (void ); - -int hdmi5_init_platform_driver (void )__init ; -void hdmi5_uninit_platform_driver (void ); - -#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS static inline void dss_collect_irq_stats (u32 irqstatus,unsigned *irq_arr) {
@@ -453,4 +433,19 @@ int dss_pll_write_config_type_b(struct dss_pll *pll, const struct dss_pll_clock_info *cinfo);int dss_pll_wait_reset_done (struct dss_pll *pll); +extern struct platform_driver omap_dsshw_driver; +extern struct platform_driver omap_dispchw_driver; +#ifdef CONFIG_OMAP2_DSS_DSI +extern struct platform_driver omap_dsihw_driver; +#endif +#ifdef CONFIG_OMAP2_DSS_VENC +extern struct platform_driver omap_venchw_driver; +#endif +#ifdef CONFIG_OMAP4_DSS_HDMI +extern struct platform_driver omapdss_hdmi4hw_driver; +#endif +#ifdef CONFIG_OMAP5_DSS_HDMI +extern struct platform_driver omapdss_hdmi5hw_driver; +#endif +#endif
drivers/gpu/drm/omapdrm/dss/hdmi4.c +1 -11
@@ -845,7 +845,7 @@ static const struct of_device_id hdmi_of_match[] = { {}, }; -static struct platform_driver omapdss_hdmihw_driver = { +struct platform_driver omapdss_hdmi4hw_driver = { .probe = hdmi4_probe, .remove = hdmi4_remove, .driver = {
@@ -855,13 +855,3 @@ static struct platform_driver omapdss_hdmihw_driver = { .suppress_bind_attrs = true, }, }; - -int __init hdmi4_init_platform_driver (void ) -{ -return platform_driver_register (&omapdss_hdmihw_driver); -} - -void hdmi4_uninit_platform_driver (void ) -{ -platform_driver_unregister (&omapdss_hdmihw_driver); -}
drivers/gpu/drm/omapdrm/dss/hdmi5.c +1 -11
@@ -841,7 +841,7 @@ static const struct of_device_id hdmi_of_match[] = { {}, }; -static struct platform_driver omapdss_hdmihw_driver = { +struct platform_driver omapdss_hdmi5hw_driver = { .probe = hdmi5_probe, .remove = hdmi5_remove, .driver = {
@@ -851,13 +851,3 @@ static struct platform_driver omapdss_hdmihw_driver = { .suppress_bind_attrs = true, }, }; - -int __init hdmi5_init_platform_driver (void ) -{ -return platform_driver_register (&omapdss_hdmihw_driver); -} - -void hdmi5_uninit_platform_driver (void ) -{ -platform_driver_unregister (&omapdss_hdmihw_driver); -}
drivers/gpu/drm/omapdrm/dss/venc.c +1 -11
@@ -984,7 +984,7 @@ static const struct of_device_id venc_of_match[] = { {}, }; -static struct platform_driver omap_venchw_driver = { +struct platform_driver omap_venchw_driver = { .probe = venc_probe, .remove = venc_remove, .driver = {
@@ -994,13 +994,3 @@ static struct platform_driver omap_venchw_driver = { .suppress_bind_attrs = true, }, }; - -int __init venc_init_platform_driver (void ) -{ -return platform_driver_register (&omap_venchw_driver); -} - -void venc_uninit_platform_driver (void ) -{ -platform_driver_unregister (&omap_venchw_driver); -}
Signature · 6 lines
2.15.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 2/2] drm: omapdrm: Simplify platform registration
Quoted 5 lines · Andrew F. Davis
Currently, calls into each file are used to register the various platform drivers. Change this to a table of pointers to
platform_driverstructs to allow usingplatform_register_drivers.Signed-off-by Andrew F. Davis <[email protected]>
Quoted 10 lines
--- drivers/gpu/drm/omapdrm/dss/core.c | 51 +++++++++++-------------------------- drivers/gpu/drm/omapdrm/dss/dispc.c | 12 +-------- drivers/gpu/drm/omapdrm/dss/dsi.c | 12 +-------- drivers/gpu/drm/omapdrm/dss/dss.c | 12 +-------- drivers/gpu/drm/omapdrm/dss/dss.h | 35 +++++++++++-------------- drivers/gpu/drm/omapdrm/dss/hdmi4.c | 12 +-------- drivers/gpu/drm/omapdrm/dss/hdmi5.c | 12 +-------- drivers/gpu/drm/omapdrm/dss/venc.c | 12 +-------- 8 files changed, 36 insertions(+), 122 deletions(-)
Thanks! There was an unused variable warning, I fixed that, and applied this and the patch 1 of the series.
Tomi
Signature · 5 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel