From patchwork Tue Jun 9 20:04:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 11596527 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DD787912 for ; Tue, 9 Jun 2020 20:06:58 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B935A2072F for ; Tue, 9 Jun 2020 20:06:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ykr0a5Mh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B935A2072F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4BF506E33D; Tue, 9 Jun 2020 20:06:55 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x142.google.com (mail-lf1-x142.google.com [IPv6:2a00:1450:4864:20::142]) by gabe.freedesktop.org (Postfix) with ESMTPS id DBAF86E33D for ; Tue, 9 Jun 2020 20:06:54 +0000 (UTC) Received: by mail-lf1-x142.google.com with SMTP id j12so92955lfh.0 for ; Tue, 09 Jun 2020 13:06:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eg1+Og5Uei5NIChsUtGSk/n0WjIN9TSO/8QjqJynoKo=; b=ykr0a5MhCD6A9I1XX5r3v38XunSuPjX9D4tAqP46ALinMTiQDSU+5JyDRFqCzPbdg6 aW9xGyBxpsabwhHrLsldaWVGhfM7T+eby0twolnTLdF4dokJAdtnsUSeqLcO06gpuOQg Hmu1ZVfTLTwVWLggipPs5R6QPPIZhcLBSCVZHv2rhLgzyS1piM2AwpHE1ySb1sbltp+4 +r1BfF3+UgV8XNHAf37SLGGdFRVdK+jw3f5zjIJ/6UcnUtPG64/PbbutIivRwxZzq7Ju 9BGouzZwe8iSFfIQ3q4caGB46e2Qks8dcYTnwo97mGRuVlXNxTkTc7XVPLyrQL+WbwrV lHBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eg1+Og5Uei5NIChsUtGSk/n0WjIN9TSO/8QjqJynoKo=; b=b0qvhmUVO5BKwLSErshDkHq6Qyoo6JsYOv6Ua6GS6NKpXI2vcuap2m1fYZDBXaPYij AcoDcaHG+lp2qL+tSiTcmCx/OhjfYab/g2MBrGPb30OvkJfE7mUkh0q9p9HK+w7F2+/i BdU/H6t/2K9+vy2bXcj/p5ZjfUrLXLpg9j4NtAJBZqD4xzOQcapXCJhZpC/h0bpbmXXt adIeVdBVSQWSMVVFoVqm1cAkHiEwWHvPDO2ZKpASBb3AyoyTzrvnnjVzE6Jb5KR/SZlD 0G1MDN0Ct/HNrY2RHZgJimp4SrhiMaJ0pdInnkgecP4YCXamLH1CiDOPe6hS9+THX1qe UP1Q== X-Gm-Message-State: AOAM532etTVVS89GNAbX4wfh0Du49WuRnV+oQh5pDO2ogkaNls3Z36c9 04yueGAH5cfdsc4og73FOJmn1x0YWTo= X-Google-Smtp-Source: ABdhPJwOWWPmtqA1hPgLKcjlp9T413CcsSh90xifkPhy4RKHFr0XBF2HPh5YT8HOqmtXUlXD0zEZIA== X-Received: by 2002:a05:6512:691:: with SMTP id t17mr16807617lfe.85.1591733213128; Tue, 09 Jun 2020 13:06:53 -0700 (PDT) Received: from localhost.localdomain (c-92d7225c.014-348-6c756e10.bbcust.telenor.se. [92.34.215.146]) by smtp.gmail.com with ESMTPSA id 66sm6038579lfk.54.2020.06.09.13.06.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2020 13:06:52 -0700 (PDT) From: Linus Walleij To: dri-devel@lists.freedesktop.org, Maarten Lankhorst , Maxime Ripard , Sean Paul , Eric Anholt , Russell King Subject: [PATCH 1/4] drm: pl111: Credit where credit is due Date: Tue, 9 Jun 2020 22:04:43 +0200 Message-Id: <20200609200446.153209-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This moves over some of the credit for the development of this driver from the old fbdev driver that I used as reference when getting this in place. Cc: Russell King Signed-off-by: Linus Walleij --- drivers/gpu/drm/pl111/pl111_versatile.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/gpu/drm/pl111/pl111_versatile.c b/drivers/gpu/drm/pl111/pl111_versatile.c index 64f01a4e6767..1127082e9a60 100644 --- a/drivers/gpu/drm/pl111/pl111_versatile.c +++ b/drivers/gpu/drm/pl111/pl111_versatile.c @@ -1,5 +1,14 @@ // SPDX-License-Identifier: GPL-2.0-only +/* + * Versatile family (ARM reference designs) handling for the PL11x. + * This is based on code and know-how in the previous frame buffer + * driver in drivers/video/fbdev/amba-clcd.c: + * Copyright (C) 2001 ARM Limited, by David A Rusling + * Updated to 2.5 by Deep Blue Solutions Ltd. + * Major contributions and discoveries by Russell King. + */ + #include #include #include From patchwork Tue Jun 9 20:04:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 11596531 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0F95E138C for ; Tue, 9 Jun 2020 20:08:13 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DF8732072F for ; Tue, 9 Jun 2020 20:08:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="PYyTdvKP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DF8732072F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7A65B896FA; Tue, 9 Jun 2020 20:08:10 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 514AE896FA for ; Tue, 9 Jun 2020 20:08:08 +0000 (UTC) Received: by mail-lj1-x242.google.com with SMTP id a9so23145391ljn.6 for ; Tue, 09 Jun 2020 13:08:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Kjp4z7wYiCrrM667mqmlZTf80dbcp8zu9m+RxGjxf9I=; b=PYyTdvKP+oATBeKULsAEYr47eMnO4wpZg3//iAw/2XUzyN/l05dnJ9oZ51sBvcKQhe 4k0d+JIgV5fZFVno2MPERM2Y9ZQJ9/rNPy2JxwOjn3ep40Didh0yRIs1p6Mt79GJgtbq n1s+62+FRf+uAQoXhTDu0juwHa6RAwwmLV9opuP3jwFBUnPBXdaXKaNTTezuchqOEmN1 Yp3CRtDsaqU9HCdo0nDq1GdyU/lV7g+7J/wx7RdcfNF2SOJxWjsmIklqUK2cF73IswOH rmbVt12cnheAtON5KEvVzF3EPlFzpdEGDh2kpGEOJrvUpx+0ult3ZyzEV/RZljd8XEBg Mtow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Kjp4z7wYiCrrM667mqmlZTf80dbcp8zu9m+RxGjxf9I=; b=ekKiFHowqFh/76MNSymwIMicc7mrblxjAtZ/f3M7M4r2KDhdktCVp1jeHjx9kNtQj1 XCM7z3lKzqIzgAPuY6pe1u/VbsSQjyDHPxNWhZNplQ1fqVMC4jw/vcEeM9ATSifh2phU oswtBFyGlVI38fKmkBwIA4RuWcNHdYPhofvuj9MmRVscgDGz5+M7R0Ub99VwyZjklJQh qCvaGRUBmsm9gEjXXE8lBb/NcRuqQ+MoT42YG4lzqHINCZxBYudcVA0pM2SZxRhhmAkb t5eNSYCMpAwPND7IW3gbEEBBP3XiYrXSn/oCa+Nav682CzsHCdNVi6BiY5UHlpeu0Bic BE6g== X-Gm-Message-State: AOAM5326r26YFKQHOGAsd+fhhsW+dYurZDd5PqmSHhdNcmvVs6utfyCO b+vRoUrOgakG/75M9JRS5ufbY0QOeuM= X-Google-Smtp-Source: ABdhPJxfpl3e1nUamcL8sjNRH5nR46Oey9VO4GdWkuEBh8G6X10J+XF19SfUG4+iwAiAQ5BBIYNhSQ== X-Received: by 2002:a2e:b6c5:: with SMTP id m5mr7681ljo.94.1591733285330; Tue, 09 Jun 2020 13:08:05 -0700 (PDT) Received: from localhost.localdomain (c-92d7225c.014-348-6c756e10.bbcust.telenor.se. [92.34.215.146]) by smtp.gmail.com with ESMTPSA id 66sm6038579lfk.54.2020.06.09.13.08.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2020 13:08:04 -0700 (PDT) From: Linus Walleij To: dri-devel@lists.freedesktop.org, Maarten Lankhorst , Maxime Ripard , Sean Paul , Eric Anholt , Russell King Subject: [PATCH 2/4] video: fbdev: amba-clcd: Retire elder CLCD driver Date: Tue, 9 Jun 2020 22:04:44 +0200 Message-Id: <20200609200446.153209-2-linus.walleij@linaro.org> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200609200446.153209-1-linus.walleij@linaro.org> References: <20200609200446.153209-1-linus.walleij@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" All the functionality in this driver has been reimplemented in the new DRM driver in drivers/gpu/drm/pl111/* and all the boards using it have been migrated to use the DRM driver with all configuration coming from the device tree. I started the work to migrate the CLCD driver to DRM in april 2017 and it took a little more than 3 years to do this properly without leaving any platforms behind. Cc: Russell King Signed-off-by: Linus Walleij --- As the framebuffer subsystem is orphaned I expect this to go in through the drm-misc tree. --- MAINTAINERS | 5 - drivers/video/fbdev/Kconfig | 20 - drivers/video/fbdev/Makefile | 1 - drivers/video/fbdev/amba-clcd.c | 989 -------------------------------- include/linux/amba/clcd.h | 290 ---------- 5 files changed, 1305 deletions(-) delete mode 100644 drivers/video/fbdev/amba-clcd.c delete mode 100644 include/linux/amba/clcd.h diff --git a/MAINTAINERS b/MAINTAINERS index df86f6f06000..086894075397 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1432,11 +1432,6 @@ S: Odd Fixes F: drivers/amba/ F: include/linux/amba/bus.h -ARM PRIMECELL CLCD PL110 DRIVER -M: Russell King -S: Odd Fixes -F: drivers/video/fbdev/amba-clcd.* - ARM PRIMECELL KMI PL050 DRIVER M: Russell King S: Odd Fixes diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index fa88e8b9a83d..0a5fc63e05d2 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -272,26 +272,6 @@ config FB_PM2_FIFO_DISCONNECT help Support the Permedia2 FIFO disconnect feature. -config FB_ARMCLCD - tristate "ARM PrimeCell PL110 support" - depends on ARM || ARM64 || COMPILE_TEST - depends on FB && ARM_AMBA && HAS_IOMEM - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - select FB_MODE_HELPERS if OF - select VIDEOMODE_HELPERS if OF - select BACKLIGHT_CLASS_DEVICE if OF - help - This framebuffer device driver is for the ARM PrimeCell PL110 - Colour LCD controller. ARM PrimeCells provide the building - blocks for System on a Chip devices. - - If you want to compile this as a module (=code which can be - inserted into and removed from the running kernel), say M - here and read . The module - will be called amba-clcd. - config FB_ACORN bool "Acorn VIDC support" depends on (FB = y) && ARM && ARCH_ACORN diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile index aa6352798cf4..76a43ec8f24c 100644 --- a/drivers/video/fbdev/Makefile +++ b/drivers/video/fbdev/Makefile @@ -75,7 +75,6 @@ obj-$(CONFIG_FB_HIT) += hitfb.o obj-$(CONFIG_FB_ATMEL) += atmel_lcdfb.o obj-$(CONFIG_FB_PVR2) += pvr2fb.o obj-$(CONFIG_FB_VOODOO1) += sstfb.o -obj-$(CONFIG_FB_ARMCLCD) += amba-clcd.o obj-$(CONFIG_FB_GOLDFISH) += goldfishfb.o obj-$(CONFIG_FB_68328) += 68328fb.o obj-$(CONFIG_FB_GBE) += gbefb.o diff --git a/drivers/video/fbdev/amba-clcd.c b/drivers/video/fbdev/amba-clcd.c deleted file mode 100644 index c3d55fc6c4e0..000000000000 --- a/drivers/video/fbdev/amba-clcd.c +++ /dev/null @@ -1,989 +0,0 @@ -/* - * linux/drivers/video/amba-clcd.c - * - * Copyright (C) 2001 ARM Limited, by David A Rusling - * Updated to 2.5, Deep Blue Solutions Ltd. - * - * 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. - * - * ARM PrimeCell PL110 Color LCD Controller - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include