From patchwork Fri Apr 15 11:42:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 65897 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1128292qge; Fri, 15 Apr 2016 04:42:33 -0700 (PDT) X-Received: by 10.98.71.91 with SMTP id u88mr28713856pfa.161.1460720553260; Fri, 15 Apr 2016 04:42:33 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y2si2822670pal.92.2016.04.15.04.42.32; Fri, 15 Apr 2016 04:42:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751712AbcDOLmb (ORCPT + 29 others); Fri, 15 Apr 2016 07:42:31 -0400 Received: from mail-lf0-f47.google.com ([209.85.215.47]:36621 "EHLO mail-lf0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750976AbcDOLm3 (ORCPT ); Fri, 15 Apr 2016 07:42:29 -0400 Received: by mail-lf0-f47.google.com with SMTP id g184so142057385lfb.3 for ; Fri, 15 Apr 2016 04:42:28 -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; bh=mae68va3HTh4QMDJjY/Yi/Yi6loVeyQzaR6/+VS7qU4=; b=IcvKoZXlnjukSVexlrHiAEO/EijxppC+OOitxJGSeftCDeFVg1TRuJiPLnt8P9ujTw DAHaTETUYopuaYJHbPyQcIPUb1h2mxeYfyTZ36I21fN9nQbRhUqW8Ehal+pKx0NaqZmn FnIM0zmZlOjNgs7edGTXSSQ5F6OF2PUuSvET4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mae68va3HTh4QMDJjY/Yi/Yi6loVeyQzaR6/+VS7qU4=; b=UUfRSwpqlKvkq2S+FDgNfzmhPaPIinMx2V15Ue+fSFQq0A26JNzcsOOIv5qrNUmsmo aArCuVMDNZWfskOmROIdpB6i20yEvnv52SEcN1OI9nH0Mf5F1DveQ/qWgWE6AqMhPtPC 5Gk9rqyjY9dY7bIQ3phK07v8FZKHYjNJHG14oBBYgThJPDBXQqhcTrKxGpIqHIrnvMg8 ToeQqebPp7FQTTPxB/HNMe/LZYN3lLIy5yNB3D/LHg/Qkt4/FDYd4UyyuTYYsQGQHruz /zo3vDwfl2wj6q6WQ8yYLCttrvzMsQcVIunrTElG/kRfFXkjns41EA5Lh3x8q+dBDmCP SwTg== X-Gm-Message-State: AOPr4FXCgN+736K4DTknN9vkj3M4nv2nQVPFbR1ZbIgC6EQ1PwjVekM8QHNlZPnAv0uvbCoV X-Received: by 10.25.205.146 with SMTP id d140mr9348103lfg.109.1460720547602; Fri, 15 Apr 2016 04:42:27 -0700 (PDT) Received: from localhost.localdomain ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id wl7sm2819016lbb.45.2016.04.15.04.42.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Apr 2016 04:42:25 -0700 (PDT) From: Linus Walleij To: Miguel Ojeda Sandonis Cc: linux-kernel@vger.kernel.org, Linus Walleij , Arnd Bergmann , Robin van der Gracht , Sudip Mukherjee , Paulo Marques , Miguel Ojeda Sandonis Subject: [PATCH 1/2] auxdisplay: move the ARM LCD driver into auxdisplay Date: Fri, 15 Apr 2016 13:42:20 +0200 Message-Id: <1460720541-26806-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This driver most definately belongs in this subsystem. It is a simple hardware block wrapping the Hitachi HD44780 LCD into a system peripheral, and if there is ever going to be shared code amongst LCD drivers, it will happen in this subsystem, so move it. Cc: Arnd Bergmann Cc: Robin van der Gracht Cc: Sudip Mukherjee Cc: Paulo Marques Cc: Miguel Ojeda Sandonis Signed-off-by: Linus Walleij --- Miguel: if you ACK this I guess I can get it merged through the ARM SoC tree. Arnd: another misc exodus I'm trying to engineer. --- drivers/auxdisplay/Kconfig | 10 ++++++++++ drivers/auxdisplay/Makefile | 1 + drivers/{misc => auxdisplay}/arm-charlcd.c | 0 drivers/misc/Kconfig | 10 ---------- drivers/misc/Makefile | 1 - 5 files changed, 11 insertions(+), 11 deletions(-) rename drivers/{misc => auxdisplay}/arm-charlcd.c (100%) -- 2.4.3 diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig index c07e725ea93d..caa68daf3fd4 100644 --- a/drivers/auxdisplay/Kconfig +++ b/drivers/auxdisplay/Kconfig @@ -15,6 +15,16 @@ menuconfig AUXDISPLAY if AUXDISPLAY +config ARM_CHARLCD + bool "ARM Ltd. Character LCD Driver" + depends on PLAT_VERSATILE + help + This is a driver for the character LCD found on the ARM Ltd. + Versatile and RealView Platform Baseboards. It doesn't do + very much more than display the text "ARM Linux" on the first + line and the Linux version on the second line, but that's + still useful. + config KS0108 tristate "KS0108 LCD Controller" depends on PARPORT_PC diff --git a/drivers/auxdisplay/Makefile b/drivers/auxdisplay/Makefile index 8a8936a468b9..b34a99fa0d82 100644 --- a/drivers/auxdisplay/Makefile +++ b/drivers/auxdisplay/Makefile @@ -2,5 +2,6 @@ # Makefile for the kernel auxiliary displays device drivers. # +obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o obj-$(CONFIG_KS0108) += ks0108.o obj-$(CONFIG_CFAG12864B) += cfag12864b.o cfag12864bfb.o diff --git a/drivers/misc/arm-charlcd.c b/drivers/auxdisplay/arm-charlcd.c similarity index 100% rename from drivers/misc/arm-charlcd.c rename to drivers/auxdisplay/arm-charlcd.c diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index a216b4667742..5398a1bc031c 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -429,16 +429,6 @@ config VMWARE_BALLOON To compile this driver as a module, choose M here: the module will be called vmw_balloon. -config ARM_CHARLCD - bool "ARM Ltd. Character LCD Driver" - depends on PLAT_VERSATILE - help - This is a driver for the character LCD found on the ARM Ltd. - Versatile and RealView Platform Baseboards. It doesn't do - very much more than display the text "ARM Linux" on the first - line and the Linux version on the second line, but that's - still useful. - config BMP085 tristate depends on SYSFS diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index b2fb6dbffcef..86c4b6583f3c 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -41,7 +41,6 @@ obj-y += eeprom/ obj-y += cb710/ obj-$(CONFIG_SPEAR13XX_PCIE_GADGET) += spear13xx_pcie_gadget.o obj-$(CONFIG_VMWARE_BALLOON) += vmw_balloon.o -obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o obj-$(CONFIG_PCH_PHUB) += pch_phub.o obj-y += ti-st/ obj-y += lis3lv02d/