Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/panel: drop drmP.h usage

Drop use of the deprecated drmP.h header file.

While touching the list of include files:
- Divide include files in blocks of linux/* video/* drm/* etc.
Be consistent in the order of the blocks
- Sort individual blocks of include files

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Stefan Mavrodiev <stefan@olimex.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190526180532.1641-3-sam@ravnborg.org

+126 -74
+4 -2
drivers/gpu/drm/panel/panel-arm-versatile.c
··· 25 25 * Epson QCIF display. 26 26 * 27 27 */ 28 - #include <drm/drmP.h> 29 - #include <drm/drm_panel.h> 30 28 31 29 #include <linux/bitops.h> 32 30 #include <linux/init.h> 33 31 #include <linux/kernel.h> 34 32 #include <linux/mfd/syscon.h> 33 + #include <linux/mod_devicetable.h> 35 34 #include <linux/module.h> 36 35 #include <linux/platform_device.h> 37 36 #include <linux/regmap.h> 38 37 39 38 #include <video/of_videomode.h> 40 39 #include <video/videomode.h> 40 + 41 + #include <drm/drm_modes.h> 42 + #include <drm/drm_panel.h> 41 43 42 44 /* 43 45 * This configuration register in the Versatile and RealView
+5 -4
drivers/gpu/drm/panel/panel-ilitek-ili9322.c
··· 22 22 * published by the Free Software Foundation. 23 23 */ 24 24 25 - #include <drm/drmP.h> 26 - #include <drm/drm_panel.h> 27 - 28 - #include <linux/of_device.h> 29 25 #include <linux/bitops.h> 30 26 #include <linux/gpio/consumer.h> 31 27 #include <linux/module.h> 28 + #include <linux/of_device.h> 32 29 #include <linux/regmap.h> 33 30 #include <linux/regulator/consumer.h> 34 31 #include <linux/spi/spi.h> ··· 33 36 #include <video/mipi_display.h> 34 37 #include <video/of_videomode.h> 35 38 #include <video/videomode.h> 39 + 40 + #include <drm/drm_modes.h> 41 + #include <drm/drm_panel.h> 42 + #include <drm/drm_print.h> 36 43 37 44 #define ILI9322_CHIP_ID 0x00 38 45 #define ILI9322_CHIP_ID_MAGIC 0x96
+8 -5
drivers/gpu/drm/panel/panel-innolux-p079zca.c
··· 8 8 */ 9 9 10 10 #include <linux/backlight.h> 11 + #include <linux/delay.h> 11 12 #include <linux/gpio/consumer.h> 12 13 #include <linux/module.h> 13 14 #include <linux/of.h> 14 15 #include <linux/of_device.h> 15 16 #include <linux/regulator/consumer.h> 16 17 17 - #include <drm/drmP.h> 18 - #include <drm/drm_crtc.h> 19 - #include <drm/drm_mipi_dsi.h> 20 - #include <drm/drm_panel.h> 21 - 22 18 #include <video/mipi_display.h> 19 + 20 + #include <drm/drm_crtc.h> 21 + #include <drm/drm_device.h> 22 + #include <drm/drm_mipi_dsi.h> 23 + #include <drm/drm_modes.h> 24 + #include <drm/drm_panel.h> 25 + #include <drm/drm_print.h> 23 26 24 27 struct panel_init_cmd { 25 28 size_t len;
+5 -3
drivers/gpu/drm/panel/panel-jdi-lt070me05000.c
··· 21 21 * You should have received a copy of the GNU General Public License along with 22 22 * this program. If not, see <http://www.gnu.org/licenses/>. 23 23 */ 24 + 24 25 #include <linux/backlight.h> 26 + #include <linux/delay.h> 25 27 #include <linux/gpio/consumer.h> 26 28 #include <linux/module.h> 27 29 #include <linux/of.h> 28 30 #include <linux/regulator/consumer.h> 29 31 30 - #include <drm/drmP.h> 32 + #include <video/mipi_display.h> 33 + 31 34 #include <drm/drm_crtc.h> 32 35 #include <drm/drm_mipi_dsi.h> 36 + #include <drm/drm_modes.h> 33 37 #include <drm/drm_panel.h> 34 - 35 - #include <video/mipi_display.h> 36 38 37 39 static const char * const regulator_names[] = { 38 40 "vddp",
+8 -5
drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c
··· 4 4 */ 5 5 6 6 #include <linux/backlight.h> 7 + #include <linux/delay.h> 7 8 #include <linux/gpio/consumer.h> 8 9 #include <linux/module.h> 9 10 #include <linux/of.h> 10 11 #include <linux/regulator/consumer.h> 11 12 12 - #include <drm/drmP.h> 13 - #include <drm/drm_crtc.h> 14 - #include <drm/drm_mipi_dsi.h> 15 - #include <drm/drm_panel.h> 16 - 17 13 #include <video/mipi_display.h> 14 + 15 + #include <drm/drm_crtc.h> 16 + #include <drm/drm_device.h> 17 + #include <drm/drm_mipi_dsi.h> 18 + #include <drm/drm_modes.h> 19 + #include <drm/drm_panel.h> 20 + #include <drm/drm_print.h> 18 21 19 22 struct kingdisplay_panel { 20 23 struct drm_panel base;
+6 -3
drivers/gpu/drm/panel/panel-lg-lg4573.c
··· 15 15 * published by the Free Software Foundation. 16 16 */ 17 17 18 - #include <drm/drmP.h> 19 - #include <drm/drm_panel.h> 20 - 18 + #include <linux/delay.h> 21 19 #include <linux/gpio/consumer.h> 20 + #include <linux/module.h> 22 21 #include <linux/regulator/consumer.h> 23 22 #include <linux/spi/spi.h> 24 23 25 24 #include <video/mipi_display.h> 26 25 #include <video/of_videomode.h> 27 26 #include <video/videomode.h> 27 + 28 + #include <drm/drm_device.h> 29 + #include <drm/drm_modes.h> 30 + #include <drm/drm_panel.h> 28 31 29 32 struct lg4573 { 30 33 struct drm_panel panel;
+3 -4
drivers/gpu/drm/panel/panel-lvds.c
··· 16 16 #include <linux/regulator/consumer.h> 17 17 #include <linux/slab.h> 18 18 19 - #include <drm/drmP.h> 20 - #include <drm/drm_crtc.h> 21 - #include <drm/drm_panel.h> 22 - 23 19 #include <video/display_timing.h> 24 20 #include <video/of_display_timing.h> 25 21 #include <video/videomode.h> 22 + 23 + #include <drm/drm_crtc.h> 24 + #include <drm/drm_panel.h> 26 25 27 26 struct panel_lvds { 28 27 struct drm_panel panel;
+4 -4
drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
··· 15 15 #include <linux/of.h> 16 16 #include <linux/regulator/consumer.h> 17 17 18 - #include <drm/drm_modes.h> 19 - #include <drm/drm_panel.h> 20 - #include <drm/drmP.h> 21 - 22 18 #include <video/videomode.h> 23 19 #include <video/display_timing.h> 20 + 21 + #include <drm/drm_device.h> 22 + #include <drm/drm_modes.h> 23 + #include <drm/drm_panel.h> 24 24 25 25 #define LCD_OLINUXINO_HEADER_MAGIC 0x4F4CB727 26 26 #define LCD_OLINUXINO_DATA_LEN 256
+8 -3
drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
··· 6 6 * Yannick Fertre <yannick.fertre@st.com> 7 7 */ 8 8 9 - #include <drm/drmP.h> 10 - #include <drm/drm_mipi_dsi.h> 11 - #include <drm/drm_panel.h> 12 9 #include <linux/backlight.h> 10 + #include <linux/delay.h> 13 11 #include <linux/gpio/consumer.h> 12 + #include <linux/module.h> 14 13 #include <linux/regulator/consumer.h> 14 + 15 15 #include <video/mipi_display.h> 16 + 17 + #include <drm/drm_mipi_dsi.h> 18 + #include <drm/drm_modes.h> 19 + #include <drm/drm_panel.h> 20 + #include <drm/drm_print.h> 16 21 17 22 #define OTM8009A_BACKLIGHT_DEFAULT 240 18 23 #define OTM8009A_BACKLIGHT_MAX 255
+4 -3
drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c
··· 19 19 */ 20 20 21 21 #include <linux/backlight.h> 22 + #include <linux/delay.h> 22 23 #include <linux/module.h> 23 24 #include <linux/of.h> 24 25 #include <linux/regulator/consumer.h> 25 26 26 - #include <drm/drmP.h> 27 + #include <video/mipi_display.h> 28 + 27 29 #include <drm/drm_crtc.h> 30 + #include <drm/drm_device.h> 28 31 #include <drm/drm_mipi_dsi.h> 29 32 #include <drm/drm_panel.h> 30 - 31 - #include <video/mipi_display.h> 32 33 33 34 /* 34 35 * When power is turned off to this panel a minimum off time of 500ms has to be
+2 -2
drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
··· 53 53 #include <linux/of_graph.h> 54 54 #include <linux/pm.h> 55 55 56 - #include <drm/drm_panel.h> 57 - #include <drm/drmP.h> 58 56 #include <drm/drm_crtc.h> 57 + #include <drm/drm_device.h> 59 58 #include <drm/drm_mipi_dsi.h> 59 + #include <drm/drm_panel.h> 60 60 61 61 #define RPI_DSI_DRIVER_NAME "rpi-ts-dsi" 62 62
+4 -1
drivers/gpu/drm/panel/panel-raydium-rm68200.c
··· 7 7 */ 8 8 9 9 #include <linux/backlight.h> 10 + #include <linux/delay.h> 10 11 #include <linux/gpio/consumer.h> 12 + #include <linux/module.h> 11 13 #include <linux/regulator/consumer.h> 12 14 13 15 #include <video/mipi_display.h> 14 16 15 - #include <drm/drmP.h> 16 17 #include <drm/drm_mipi_dsi.h> 18 + #include <drm/drm_modes.h> 17 19 #include <drm/drm_panel.h> 20 + #include <drm/drm_print.h> 18 21 19 22 /*** Manufacturer Command Set ***/ 20 23 #define MCS_CMD_MODE_SW 0xFE /* CMD Mode Switch */
+7 -3
drivers/gpu/drm/panel/panel-samsung-ld9040.c
··· 11 11 * published by the Free Software Foundation. 12 12 */ 13 13 14 - #include <drm/drmP.h> 15 - #include <drm/drm_panel.h> 16 - 14 + #include <linux/delay.h> 17 15 #include <linux/gpio/consumer.h> 16 + #include <linux/module.h> 17 + #include <linux/of.h> 18 18 #include <linux/regulator/consumer.h> 19 19 #include <linux/spi/spi.h> 20 20 21 21 #include <video/mipi_display.h> 22 22 #include <video/of_videomode.h> 23 23 #include <video/videomode.h> 24 + 25 + #include <drm/drm_modes.h> 26 + #include <drm/drm_panel.h> 27 + #include <drm/drm_print.h> 24 28 25 29 /* Manufacturer Command Set */ 26 30 #define MCS_MANPWR 0xb0
+7 -3
drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c
··· 11 11 * published by the Free Software Foundation. 12 12 */ 13 13 14 - #include <drm/drmP.h> 15 - #include <drm/drm_mipi_dsi.h> 16 - #include <drm/drm_panel.h> 17 14 #include <linux/backlight.h> 15 + #include <linux/delay.h> 18 16 #include <linux/gpio/consumer.h> 17 + #include <linux/module.h> 19 18 #include <linux/of_device.h> 20 19 #include <linux/regulator/consumer.h> 20 + 21 + #include <drm/drm_mipi_dsi.h> 22 + #include <drm/drm_modes.h> 23 + #include <drm/drm_panel.h> 24 + #include <drm/drm_print.h> 21 25 22 26 #define S6E3HA2_MIN_BRIGHTNESS 0 23 27 #define S6E3HA2_MAX_BRIGHTNESS 100
+8 -3
drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c
··· 11 11 * published by the Free Software Foundation. 12 12 */ 13 13 14 - #include <drm/drmP.h> 15 - #include <drm/drm_mipi_dsi.h> 16 - #include <drm/drm_panel.h> 17 14 #include <linux/backlight.h> 15 + #include <linux/delay.h> 18 16 #include <linux/gpio/consumer.h> 17 + #include <linux/module.h> 19 18 #include <linux/regulator/consumer.h> 19 + 20 20 #include <video/mipi_display.h> 21 + 22 + #include <drm/drm_mipi_dsi.h> 23 + #include <drm/drm_modes.h> 24 + #include <drm/drm_panel.h> 25 + #include <drm/drm_print.h> 21 26 22 27 #define MCS_LEVEL2_KEY 0xf0 23 28 #define MCS_MTP_KEY 0xf1
+8 -4
drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c
··· 15 15 * published by the Free Software Foundation. 16 16 */ 17 17 18 - #include <drm/drmP.h> 19 - #include <drm/drm_mipi_dsi.h> 20 - #include <drm/drm_panel.h> 21 - 18 + #include <linux/delay.h> 22 19 #include <linux/gpio/consumer.h> 20 + #include <linux/module.h> 21 + #include <linux/of.h> 23 22 #include <linux/regulator/consumer.h> 24 23 25 24 #include <video/mipi_display.h> 26 25 #include <video/of_videomode.h> 27 26 #include <video/videomode.h> 27 + 28 + #include <drm/drm_mipi_dsi.h> 29 + #include <drm/drm_modes.h> 30 + #include <drm/drm_panel.h> 31 + #include <drm/drm_print.h> 28 32 29 33 #define LDI_MTP_LENGTH 24 30 34 #define GAMMA_LEVEL_NUM 25
+6 -4
drivers/gpu/drm/panel/panel-seiko-43wvf1g.c
··· 7 7 */ 8 8 9 9 #include <linux/backlight.h> 10 + #include <linux/delay.h> 10 11 #include <linux/module.h> 11 12 #include <linux/of.h> 13 + #include <linux/platform_device.h> 12 14 #include <linux/regulator/consumer.h> 13 - 14 - #include <drm/drmP.h> 15 - #include <drm/drm_crtc.h> 16 - #include <drm/drm_panel.h> 17 15 18 16 #include <video/display_timing.h> 19 17 #include <video/videomode.h> 18 + 19 + #include <drm/drm_crtc.h> 20 + #include <drm/drm_device.h> 21 + #include <drm/drm_panel.h> 20 22 21 23 struct seiko_panel_desc { 22 24 const struct drm_display_mode *modes;
+4 -3
drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c
··· 7 7 */ 8 8 9 9 #include <linux/backlight.h> 10 + #include <linux/delay.h> 10 11 #include <linux/gpio/consumer.h> 11 12 #include <linux/module.h> 12 13 #include <linux/of.h> 13 14 #include <linux/regulator/consumer.h> 14 15 15 - #include <drm/drmP.h> 16 + #include <video/mipi_display.h> 17 + 16 18 #include <drm/drm_crtc.h> 19 + #include <drm/drm_device.h> 17 20 #include <drm/drm_mipi_dsi.h> 18 21 #include <drm/drm_panel.h> 19 - 20 - #include <video/mipi_display.h> 21 22 22 23 struct sharp_panel { 23 24 struct drm_panel base;
+4 -3
drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c
··· 19 19 */ 20 20 21 21 #include <linux/backlight.h> 22 + #include <linux/delay.h> 22 23 #include <linux/gpio/consumer.h> 23 24 #include <linux/module.h> 24 25 #include <linux/of.h> 25 26 #include <linux/regulator/consumer.h> 26 27 27 - #include <drm/drmP.h> 28 + #include <video/mipi_display.h> 29 + 28 30 #include <drm/drm_crtc.h> 31 + #include <drm/drm_device.h> 29 32 #include <drm/drm_mipi_dsi.h> 30 33 #include <drm/drm_panel.h> 31 - 32 - #include <video/mipi_display.h> 33 34 34 35 struct sharp_nt_panel { 35 36 struct drm_panel base;
+6 -5
drivers/gpu/drm/panel/panel-simple.c
··· 22 22 */ 23 23 24 24 #include <linux/backlight.h> 25 + #include <linux/delay.h> 25 26 #include <linux/gpio/consumer.h> 26 27 #include <linux/module.h> 27 28 #include <linux/of_platform.h> 28 29 #include <linux/platform_device.h> 29 30 #include <linux/regulator/consumer.h> 30 31 31 - #include <drm/drmP.h> 32 - #include <drm/drm_crtc.h> 33 - #include <drm/drm_mipi_dsi.h> 34 - #include <drm/drm_panel.h> 35 - 36 32 #include <video/display_timing.h> 37 33 #include <video/videomode.h> 34 + 35 + #include <drm/drm_crtc.h> 36 + #include <drm/drm_device.h> 37 + #include <drm/drm_mipi_dsi.h> 38 + #include <drm/drm_panel.h> 38 39 39 40 struct panel_desc { 40 41 const struct drm_display_mode *modes;
+7 -3
drivers/gpu/drm/panel/panel-sitronix-st7789v.c
··· 6 6 * 2 as published by the Free Software Foundation. 7 7 */ 8 8 9 + #include <linux/backlight.h> 10 + #include <linux/delay.h> 9 11 #include <linux/gpio/consumer.h> 12 + #include <linux/module.h> 10 13 #include <linux/regulator/consumer.h> 11 14 #include <linux/spi/spi.h> 12 15 13 - #include <drm/drmP.h> 14 - #include <drm/drm_panel.h> 15 - 16 16 #include <video/mipi_display.h> 17 + 18 + #include <drm/drm_device.h> 19 + #include <drm/drm_modes.h> 20 + #include <drm/drm_panel.h> 17 21 18 22 #define ST7789V_COLMOD_RGB_FMT_18BITS (6 << 4) 19 23 #define ST7789V_COLMOD_CTRL_FMT_18BITS (6 << 0)
+8 -4
drivers/gpu/drm/panel/panel-truly-nt35597.c
··· 3 3 * Copyright (c) 2018, The Linux Foundation. All rights reserved. 4 4 */ 5 5 6 - #include <drm/drmP.h> 7 - #include <drm/drm_panel.h> 8 - #include <drm/drm_mipi_dsi.h> 9 - 6 + #include <linux/backlight.h> 7 + #include <linux/delay.h> 10 8 #include <linux/gpio/consumer.h> 9 + #include <linux/module.h> 11 10 #include <linux/of_device.h> 12 11 #include <linux/of_graph.h> 13 12 #include <linux/pinctrl/consumer.h> 14 13 #include <linux/regulator/consumer.h> 15 14 16 15 #include <video/mipi_display.h> 16 + 17 + #include <drm/drm_mipi_dsi.h> 18 + #include <drm/drm_modes.h> 19 + #include <drm/drm_panel.h> 20 + #include <drm/drm_print.h> 17 21 18 22 static const char * const regulator_names[] = { 19 23 "vdda",