diff options
Diffstat (limited to 'drivers/video/fbdev/mmp')
| -rw-r--r-- | drivers/video/fbdev/mmp/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/video/fbdev/mmp/Makefile | 1 | ||||
| -rw-r--r-- | drivers/video/fbdev/mmp/core.c | 15 | ||||
| -rw-r--r-- | drivers/video/fbdev/mmp/fb/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/video/fbdev/mmp/fb/Makefile | 1 | ||||
| -rw-r--r-- | drivers/video/fbdev/mmp/fb/mmpfb.c | 15 | ||||
| -rw-r--r-- | drivers/video/fbdev/mmp/fb/mmpfb.h | 15 | ||||
| -rw-r--r-- | drivers/video/fbdev/mmp/hw/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/video/fbdev/mmp/hw/Makefile | 1 | ||||
| -rw-r--r-- | drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 15 | ||||
| -rw-r--r-- | drivers/video/fbdev/mmp/hw/mmp_ctrl.h | 16 | ||||
| -rw-r--r-- | drivers/video/fbdev/mmp/hw/mmp_spi.c | 15 | ||||
| -rw-r--r-- | drivers/video/fbdev/mmp/panel/Makefile | 1 | ||||
| -rw-r--r-- | drivers/video/fbdev/mmp/panel/tpo_tj032md01bw.c | 15 |
14 files changed, 14 insertions, 99 deletions
diff --git a/drivers/video/fbdev/mmp/Kconfig b/drivers/video/fbdev/mmp/Kconfig index 1b5e80c8a984..9041ffd2cfcf 100644 --- a/drivers/video/fbdev/mmp/Kconfig +++ b/drivers/video/fbdev/mmp/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | menuconfig MMP_DISP | 2 | menuconfig MMP_DISP |
| 2 | tristate "Marvell MMP Display Subsystem support" | 3 | tristate "Marvell MMP Display Subsystem support" |
| 3 | depends on CPU_PXA910 || CPU_MMP2 | 4 | depends on CPU_PXA910 || CPU_MMP2 |
diff --git a/drivers/video/fbdev/mmp/Makefile b/drivers/video/fbdev/mmp/Makefile index 924dd0930cc7..84204c04e9d0 100644 --- a/drivers/video/fbdev/mmp/Makefile +++ b/drivers/video/fbdev/mmp/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | obj-$(CONFIG_MMP_DISP) += mmp_disp.o hw/ panel/ fb/ | 2 | obj-$(CONFIG_MMP_DISP) += mmp_disp.o hw/ panel/ fb/ |
| 2 | 3 | ||
| 3 | mmp_disp-y += core.o | 4 | mmp_disp-y += core.o |
diff --git a/drivers/video/fbdev/mmp/core.c b/drivers/video/fbdev/mmp/core.c index 3a6bb6561ba0..0ffc1b7b7052 100644 --- a/drivers/video/fbdev/mmp/core.c +++ b/drivers/video/fbdev/mmp/core.c | |||
| @@ -1,23 +1,10 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 1 | /* | 2 | /* |
| 2 | * linux/drivers/video/mmp/common.c | 3 | * linux/drivers/video/mmp/common.c |
| 3 | * This driver is a common framework for Marvell Display Controller | 4 | * This driver is a common framework for Marvell Display Controller |
| 4 | * | 5 | * |
| 5 | * Copyright (C) 2012 Marvell Technology Group Ltd. | 6 | * Copyright (C) 2012 Marvell Technology Group Ltd. |
| 6 | * Authors: Zhou Zhu <zzhu3@marvell.com> | 7 | * Authors: Zhou Zhu <zzhu3@marvell.com> |
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify it | ||
| 9 | * under the terms of the GNU General Public License as published by the | ||
| 10 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 11 | * option) any later version. | ||
| 12 | * | ||
| 13 | * This program is distributed in the hope that it will be useful, but WITHOUT | ||
| 14 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| 15 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
| 16 | * more details. | ||
| 17 | * | ||
| 18 | * You should have received a copy of the GNU General Public License along with | ||
| 19 | * this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 20 | * | ||
| 21 | */ | 8 | */ |
| 22 | 9 | ||
| 23 | #include <linux/slab.h> | 10 | #include <linux/slab.h> |
diff --git a/drivers/video/fbdev/mmp/fb/Kconfig b/drivers/video/fbdev/mmp/fb/Kconfig index 985e1a7cd254..39944eb23ef8 100644 --- a/drivers/video/fbdev/mmp/fb/Kconfig +++ b/drivers/video/fbdev/mmp/fb/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | if MMP_DISP | 2 | if MMP_DISP |
| 2 | 3 | ||
| 3 | config MMP_FB | 4 | config MMP_FB |
diff --git a/drivers/video/fbdev/mmp/fb/Makefile b/drivers/video/fbdev/mmp/fb/Makefile index 709fd1f76abe..b1b1386c429f 100644 --- a/drivers/video/fbdev/mmp/fb/Makefile +++ b/drivers/video/fbdev/mmp/fb/Makefile | |||
| @@ -1 +1,2 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | obj-$(CONFIG_MMP_FB) += mmpfb.o | 2 | obj-$(CONFIG_MMP_FB) += mmpfb.o |
diff --git a/drivers/video/fbdev/mmp/fb/mmpfb.c b/drivers/video/fbdev/mmp/fb/mmpfb.c index ee212be67dc6..e5b56f2199df 100644 --- a/drivers/video/fbdev/mmp/fb/mmpfb.c +++ b/drivers/video/fbdev/mmp/fb/mmpfb.c | |||
| @@ -1,23 +1,10 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 1 | /* | 2 | /* |
| 2 | * linux/drivers/video/mmp/fb/mmpfb.c | 3 | * linux/drivers/video/mmp/fb/mmpfb.c |
| 3 | * Framebuffer driver for Marvell Display controller. | 4 | * Framebuffer driver for Marvell Display controller. |
| 4 | * | 5 | * |
| 5 | * Copyright (C) 2012 Marvell Technology Group Ltd. | 6 | * Copyright (C) 2012 Marvell Technology Group Ltd. |
| 6 | * Authors: Zhou Zhu <zzhu3@marvell.com> | 7 | * Authors: Zhou Zhu <zzhu3@marvell.com> |
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify it | ||
| 9 | * under the terms of the GNU General Public License as published by the | ||
| 10 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 11 | * option) any later version. | ||
| 12 | * | ||
| 13 | * This program is distributed in the hope that it will be useful, but WITHOUT | ||
| 14 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| 15 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
| 16 | * more details. | ||
| 17 | * | ||
| 18 | * You should have received a copy of the GNU General Public License along with | ||
| 19 | * this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 20 | * | ||
| 21 | */ | 8 | */ |
| 22 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 23 | #include <linux/dma-mapping.h> | 10 | #include <linux/dma-mapping.h> |
diff --git a/drivers/video/fbdev/mmp/fb/mmpfb.h b/drivers/video/fbdev/mmp/fb/mmpfb.h index 88c23c10a9ec..a6111d11254c 100644 --- a/drivers/video/fbdev/mmp/fb/mmpfb.h +++ b/drivers/video/fbdev/mmp/fb/mmpfb.h | |||
| @@ -1,23 +1,10 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0-or-later */ | ||
| 1 | /* | 2 | /* |
| 2 | * linux/drivers/video/mmp/fb/mmpfb.h | 3 | * linux/drivers/video/mmp/fb/mmpfb.h |
| 3 | * Framebuffer driver for Marvell Display controller. | 4 | * Framebuffer driver for Marvell Display controller. |
| 4 | * | 5 | * |
| 5 | * Copyright (C) 2012 Marvell Technology Group Ltd. | 6 | * Copyright (C) 2012 Marvell Technology Group Ltd. |
| 6 | * Authors: Zhou Zhu <zzhu3@marvell.com> | 7 | * Authors: Zhou Zhu <zzhu3@marvell.com> |
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify it | ||
| 9 | * under the terms of the GNU General Public License as published by the | ||
| 10 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 11 | * option) any later version. | ||
| 12 | * | ||
| 13 | * This program is distributed in the hope that it will be useful, but WITHOUT | ||
| 14 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| 15 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
| 16 | * more details. | ||
| 17 | * | ||
| 18 | * You should have received a copy of the GNU General Public License along with | ||
| 19 | * this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 20 | * | ||
| 21 | */ | 8 | */ |
| 22 | 9 | ||
| 23 | #ifndef _MMP_FB_H_ | 10 | #ifndef _MMP_FB_H_ |
diff --git a/drivers/video/fbdev/mmp/hw/Kconfig b/drivers/video/fbdev/mmp/hw/Kconfig index fcb711143fb2..4d018cf661ec 100644 --- a/drivers/video/fbdev/mmp/hw/Kconfig +++ b/drivers/video/fbdev/mmp/hw/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | if MMP_DISP | 2 | if MMP_DISP |
| 2 | 3 | ||
| 3 | config MMP_DISP_CONTROLLER | 4 | config MMP_DISP_CONTROLLER |
diff --git a/drivers/video/fbdev/mmp/hw/Makefile b/drivers/video/fbdev/mmp/hw/Makefile index 0000a714fedf..5a7c6be70b77 100644 --- a/drivers/video/fbdev/mmp/hw/Makefile +++ b/drivers/video/fbdev/mmp/hw/Makefile | |||
| @@ -1,2 +1,3 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | obj-$(CONFIG_MMP_DISP_CONTROLLER) += mmp_ctrl.o | 2 | obj-$(CONFIG_MMP_DISP_CONTROLLER) += mmp_ctrl.o |
| 2 | obj-$(CONFIG_MMP_DISP_SPI) += mmp_spi.o | 3 | obj-$(CONFIG_MMP_DISP_SPI) += mmp_spi.o |
diff --git a/drivers/video/fbdev/mmp/hw/mmp_ctrl.c b/drivers/video/fbdev/mmp/hw/mmp_ctrl.c index fcdbb2df137f..87d943f15a12 100644 --- a/drivers/video/fbdev/mmp/hw/mmp_ctrl.c +++ b/drivers/video/fbdev/mmp/hw/mmp_ctrl.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 1 | /* | 2 | /* |
| 2 | * linux/drivers/video/mmp/hw/mmp_ctrl.c | 3 | * linux/drivers/video/mmp/hw/mmp_ctrl.c |
| 3 | * Marvell MMP series Display Controller support | 4 | * Marvell MMP series Display Controller support |
| @@ -6,20 +7,6 @@ | |||
| 6 | * Authors: Guoqing Li <ligq@marvell.com> | 7 | * Authors: Guoqing Li <ligq@marvell.com> |
| 7 | * Lisa Du <cldu@marvell.com> | 8 | * Lisa Du <cldu@marvell.com> |
| 8 | * Zhou Zhu <zzhu3@marvell.com> | 9 | * Zhou Zhu <zzhu3@marvell.com> |
| 9 | * | ||
| 10 | * This program is free software; you can redistribute it and/or modify it | ||
| 11 | * under the terms of the GNU General Public License as published by the | ||
| 12 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 13 | * option) any later version. | ||
| 14 | * | ||
| 15 | * This program is distributed in the hope that it will be useful, but WITHOUT | ||
| 16 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| 17 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
| 18 | * more details. | ||
| 19 | * | ||
| 20 | * You should have received a copy of the GNU General Public License along with | ||
| 21 | * this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | * | ||
| 23 | */ | 10 | */ |
| 24 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 25 | #include <linux/moduleparam.h> | 12 | #include <linux/moduleparam.h> |
diff --git a/drivers/video/fbdev/mmp/hw/mmp_ctrl.h b/drivers/video/fbdev/mmp/hw/mmp_ctrl.h index 56fdeab34355..e9ec45c118fb 100644 --- a/drivers/video/fbdev/mmp/hw/mmp_ctrl.h +++ b/drivers/video/fbdev/mmp/hw/mmp_ctrl.h | |||
| @@ -1,25 +1,11 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0-or-later */ | ||
| 1 | /* | 2 | /* |
| 2 | * drivers/video/mmp/hw/mmp_ctrl.h | 3 | * drivers/video/mmp/hw/mmp_ctrl.h |
| 3 | * | 4 | * |
| 4 | * | ||
| 5 | * Copyright (C) 2012 Marvell Technology Group Ltd. | 5 | * Copyright (C) 2012 Marvell Technology Group Ltd. |
| 6 | * Authors: Guoqing Li <ligq@marvell.com> | 6 | * Authors: Guoqing Li <ligq@marvell.com> |
| 7 | * Lisa Du <cldu@marvell.com> | 7 | * Lisa Du <cldu@marvell.com> |
| 8 | * Zhou Zhu <zzhu3@marvell.com> | 8 | * Zhou Zhu <zzhu3@marvell.com> |
| 9 | * | ||
| 10 | * This program is free software; you can redistribute it and/or modify it | ||
| 11 | * under the terms of the GNU General Public License as published by the | ||
| 12 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 13 | * option) any later version. | ||
| 14 | * | ||
| 15 | * This program is distributed in the hope that it will be useful, but WITHOUT | ||
| 16 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| 17 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
| 18 | * more details. | ||
| 19 | * | ||
| 20 | * You should have received a copy of the GNU General Public License along with | ||
| 21 | * this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | * | ||
| 23 | */ | 9 | */ |
| 24 | 10 | ||
| 25 | #ifndef _MMP_CTRL_H_ | 11 | #ifndef _MMP_CTRL_H_ |
diff --git a/drivers/video/fbdev/mmp/hw/mmp_spi.c b/drivers/video/fbdev/mmp/hw/mmp_spi.c index e62ca7bf0d5e..bbb75de5e441 100644 --- a/drivers/video/fbdev/mmp/hw/mmp_spi.c +++ b/drivers/video/fbdev/mmp/hw/mmp_spi.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 1 | /* | 2 | /* |
| 2 | * linux/drivers/video/mmp/hw/mmp_spi.c | 3 | * linux/drivers/video/mmp/hw/mmp_spi.c |
| 3 | * using the spi in LCD controler for commands send | 4 | * using the spi in LCD controler for commands send |
| @@ -6,20 +7,6 @@ | |||
| 6 | * Authors: Guoqing Li <ligq@marvell.com> | 7 | * Authors: Guoqing Li <ligq@marvell.com> |
| 7 | * Lisa Du <cldu@marvell.com> | 8 | * Lisa Du <cldu@marvell.com> |
| 8 | * Zhou Zhu <zzhu3@marvell.com> | 9 | * Zhou Zhu <zzhu3@marvell.com> |
| 9 | * | ||
| 10 | * This program is free software; you can redistribute it and/or modify it | ||
| 11 | * under the terms of the GNU General Public License as published by the | ||
| 12 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 13 | * option) any later version. | ||
| 14 | * | ||
| 15 | * This program is distributed in the hope that it will be useful, but WITHOUT | ||
| 16 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| 17 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
| 18 | * more details. | ||
| 19 | * | ||
| 20 | * You should have received a copy of the GNU General Public License along with | ||
| 21 | * this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | * | ||
| 23 | */ | 10 | */ |
| 24 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
| 25 | #include <linux/delay.h> | 12 | #include <linux/delay.h> |
diff --git a/drivers/video/fbdev/mmp/panel/Makefile b/drivers/video/fbdev/mmp/panel/Makefile index 2f91611c7e5e..6a21aeec14c6 100644 --- a/drivers/video/fbdev/mmp/panel/Makefile +++ b/drivers/video/fbdev/mmp/panel/Makefile | |||
| @@ -1 +1,2 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | obj-$(CONFIG_MMP_PANEL_TPOHVGA) += tpo_tj032md01bw.o | 2 | obj-$(CONFIG_MMP_PANEL_TPOHVGA) += tpo_tj032md01bw.o |
diff --git a/drivers/video/fbdev/mmp/panel/tpo_tj032md01bw.c b/drivers/video/fbdev/mmp/panel/tpo_tj032md01bw.c index f7e85d1c9f9c..34fae588e202 100644 --- a/drivers/video/fbdev/mmp/panel/tpo_tj032md01bw.c +++ b/drivers/video/fbdev/mmp/panel/tpo_tj032md01bw.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 1 | /* | 2 | /* |
| 2 | * linux/drivers/video/mmp/panel/tpo_tj032md01bw.c | 3 | * linux/drivers/video/mmp/panel/tpo_tj032md01bw.c |
| 3 | * active panel using spi interface to do init | 4 | * active panel using spi interface to do init |
| @@ -6,20 +7,6 @@ | |||
| 6 | * Authors: Guoqing Li <ligq@marvell.com> | 7 | * Authors: Guoqing Li <ligq@marvell.com> |
| 7 | * Lisa Du <cldu@marvell.com> | 8 | * Lisa Du <cldu@marvell.com> |
| 8 | * Zhou Zhu <zzhu3@marvell.com> | 9 | * Zhou Zhu <zzhu3@marvell.com> |
| 9 | * | ||
| 10 | * This program is free software; you can redistribute it and/or modify it | ||
| 11 | * under the terms of the GNU General Public License as published by the | ||
| 12 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 13 | * option) any later version. | ||
| 14 | * | ||
| 15 | * This program is distributed in the hope that it will be useful, but WITHOUT | ||
| 16 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| 17 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
| 18 | * more details. | ||
| 19 | * | ||
| 20 | * You should have received a copy of the GNU General Public License along with | ||
| 21 | * this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 22 | * | ||
| 23 | */ | 10 | */ |
| 24 | 11 | ||
| 25 | #include <linux/module.h> | 12 | #include <linux/module.h> |
