diff --git a/drivers/gpu/drm/hisilicon/Kconfig b/drivers/gpu/drm/hisilicon/Kconfig index b03095bbf01f..29b1ceb80d9d 100644 --- a/drivers/gpu/drm/hisilicon/Kconfig +++ b/drivers/gpu/drm/hisilicon/Kconfig @@ -4,4 +4,4 @@ source "drivers/gpu/drm/hisilicon/kirin/Kconfig" -source "drivers/gpu/drm/hisilicon/kirin960/Kconfig" +source "drivers/gpu/drm/hisilicon/kirin9xx/Kconfig" diff --git a/drivers/gpu/drm/hisilicon/Makefile b/drivers/gpu/drm/hisilicon/Makefile index 5c0fee460c6d..a801716cad3e 100644 --- a/drivers/gpu/drm/hisilicon/Makefile +++ b/drivers/gpu/drm/hisilicon/Makefile @@ -3,4 +3,4 @@ # Please keep this list sorted alphabetically obj-$(CONFIG_DRM_HISI_KIRIN) += kirin/ -obj-$(CONFIG_DRM_KIRIN_960) += kirin960/ +obj-$(CONFIG_DRM_KIRIN_960) += kirin9xx/ diff --git a/drivers/gpu/drm/hisilicon/kirin960/panel/panel-hikey960-nte300nts.c b/drivers/gpu/drm/hisilicon/kirin960/panel/panel-hikey960-nte300nts.c deleted file mode 100644 index 51a99b305d07..000000000000 --- a/drivers/gpu/drm/hisilicon/kirin960/panel/panel-hikey960-nte300nts.c +++ /dev/null @@ -1,402 +0,0 @@ -/* - * HiKey LCD panel driver - * TODO: Add backlight adjustment support. - * - * 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. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . - */ - -#include -#include -#include -#include