From patchwork Wed Mar 8 17:46:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylvain Lemieux X-Patchwork-Id: 9611735 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8599D602B4 for ; Wed, 8 Mar 2017 17:48:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7232E28618 for ; Wed, 8 Mar 2017 17:48:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6713328624; Wed, 8 Mar 2017 17:48:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Flag: YES X-Spam-Level: ** X-Spam-Status: Yes, score=2.5 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, NUMERIC_HTTP_ADDR, RCVD_IN_SORBS_WEB, URI_HEX autolearn=no version=3.3.1 X-Spam-Report: * 2.0 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server * [74.51.240.241 listed in dnsbl.sorbs.net] * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider * (slemieux.tyco[at]gmail.com) * 0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is * CUSTOM_MED * 1.1 URI_HEX URI: URI hostname has long hexadecimal sequence * 1.2 NUMERIC_HTTP_ADDR URI: Uses a numeric IP address in URL * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily * valid * -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 12E4928618 for ; Wed, 8 Mar 2017 17:48:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Qo+gzdjWY3PpjqZ1rocTF6L3Fvb1U+DyTjQ4/ipcn7o=; b=IWLsT0SxgrqLYkgP4iLp7WNmu3 Nn3k352l2tXlBXXAhHbjvG28sTMhNcbDr9anAx6WT/bqxBbQmvyp4tYs3Oq2ZhEIpHoYs+eusph4Y 9QCsofIelxDdWOSDjFPCSDqrCU/Ag5EFJmnEpZeErHW8adVCuHC1vCRCekNhXMO+y8y74ID/Rwuzu K3qMrEazDeBB0yISEe/YOT6YwOBcbfR5csN+m1C/aTbr5WVekVSW5b1Uvs8Xo7lOCdXPGf2UF2+If Nt0fxcx+j2bYMeRs1Jidb26LuTtaWJ4amQOS5JERweSAJ9Ed3DfZFiPagqPFDaoibuF7NfEG+GnGB uItMAUEA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1clfh3-0003R7-UL; Wed, 08 Mar 2017 17:48:09 +0000 Received: from mail-oi0-x241.google.com ([2607:f8b0:4003:c06::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1clfg6-0002pJ-5Y for linux-arm-kernel@lists.infradead.org; Wed, 08 Mar 2017 17:47:12 +0000 Received: by mail-oi0-x241.google.com with SMTP id q19so2835738oic.2 for ; Wed, 08 Mar 2017 09:46:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NN+rwiea/D/mFUMLsPJ6DAWBFOW13jftYsPI8foAZUI=; b=olMEiMZZeXMZ559mNSoE07mZw+HpW66rFZPnx3yn02jepTDJdXUv5Zdav0Yz6JVwi0 fvrh9M4wydi2Fk6hKOPDfJw5F37tYmacJQ018zkiwpBD0t303gKCkB4cBghjQsNlWaJs hH4El9RmxzNbw+TNRlFAlAxbd8fkLyPUuwZTfAdEK/dibbK0b85DeWh4Ih9YiP8vFmK6 EyidQ5DPXgS5tow+6NuSf5yNPOXuRGBwAhSRWJnNP3ZUg3LlpxGLfy2cdXRjq+UqjgF7 fXlVgKB5jWC8CqGkzEYis92asb0u9Rsmge+jJHmyvtUdmS+Dpme5YR5x3P1C3fvxG1kW gsTg== 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; bh=NN+rwiea/D/mFUMLsPJ6DAWBFOW13jftYsPI8foAZUI=; b=PtasqXDeoLOtmTYWDs14uxGHPgQYQYLzB+t3lDz3ObVj6JMkTXPRtC+o9+SXbhoftX IuTkMotrao+WkgcXt87ODdo5ctuf58lYblB1rLe0NN85pQbe11Aw2bWtVhVo31NlmYUU R6xRSZRZ4iaBrDBi/yPmovpNpIduJapFmsL53KONkXLjxxhv7KEtBdiBgOYLwYMJgtr1 lcCSFm1HfIqVdiXHY9l9qVXFfQz5auS5HQhjPQANPbS6r03TZNBX1o/Gt07KAakWcFu1 +4H0tGuWr14zborD9KF2TLe6Q0C4uuvE26DM+auexf6BhDOO8sLIHhyofRGvCN9GlPVs XBjw== X-Gm-Message-State: AMke39nm32hE1Iz9JmvIK/WtDaunEBr0B67ssuB3HPuF6xSKucjU9JLLp9qAt9GbCr3SMw== X-Received: by 10.107.172.134 with SMTP id v128mr8441773ioe.49.1488995209145; Wed, 08 Mar 2017 09:46:49 -0800 (PST) Received: from CABRO3AP00510.localdomain ([74.51.240.241]) by smtp.gmail.com with ESMTPSA id h143sm1806123ith.1.2017.03.08.09.46.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Mar 2017 09:46:48 -0800 (PST) From: Sylvain Lemieux To: vz@mleia.com, robh+dt@kernel.org Subject: [PATCH 2/2] [kernel] ARM: lpc32xx: drop CLCD configuration Date: Wed, 8 Mar 2017 12:46:38 -0500 Message-Id: <20170308174638.25578-3-slemieux.tyco@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170308174638.25578-1-slemieux.tyco@gmail.com> References: <20170308174638.25578-1-slemieux.tyco@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170308_094710_265078_D5A056B6 X-CRM114-Status: GOOD ( 11.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Liam Beguin Drop the CLCD configurations and custom functions since it's now done using the devicetree. Signed-off-by: Liam Beguin Signed-off-by: Sylvain Lemieux --- arch/arm/mach-lpc32xx/phy3250.c | 70 ----------------------------------------- 1 file changed, 70 deletions(-) diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c index 6c52bd32610e..97bffd9324f3 100644 --- a/arch/arm/mach-lpc32xx/phy3250.c +++ b/arch/arm/mach-lpc32xx/phy3250.c @@ -24,8 +24,6 @@ #include #include #include -#include -#include #include #include #include @@ -45,73 +43,6 @@ #include #include "common.h" -/* - * AMBA LCD controller - */ -static struct clcd_panel conn_lcd_panel = { - .mode = { - .name = "QVGA portrait", - .refresh = 60, - .xres = 240, - .yres = 320, - .pixclock = 191828, - .left_margin = 22, - .right_margin = 11, - .upper_margin = 2, - .lower_margin = 1, - .hsync_len = 5, - .vsync_len = 2, - .sync = 0, - .vmode = FB_VMODE_NONINTERLACED, - }, - .width = -1, - .height = -1, - .tim2 = (TIM2_IVS | TIM2_IHS), - .cntl = (CNTL_BGR | CNTL_LCDTFT | CNTL_LCDVCOMP(1) | - CNTL_LCDBPP16_565), - .bpp = 16, -}; -#define PANEL_SIZE (3 * SZ_64K) - -static int lpc32xx_clcd_setup(struct clcd_fb *fb) -{ - dma_addr_t dma; - - fb->fb.screen_base = dma_alloc_wc(&fb->dev->dev, PANEL_SIZE, &dma, - GFP_KERNEL); - if (!fb->fb.screen_base) { - printk(KERN_ERR "CLCD: unable to map framebuffer\n"); - return -ENOMEM; - } - - fb->fb.fix.smem_start = dma; - fb->fb.fix.smem_len = PANEL_SIZE; - fb->panel = &conn_lcd_panel; - - return 0; -} - -static int lpc32xx_clcd_mmap(struct clcd_fb *fb, struct vm_area_struct *vma) -{ - return dma_mmap_wc(&fb->dev->dev, vma, fb->fb.screen_base, - fb->fb.fix.smem_start, fb->fb.fix.smem_len); -} - -static void lpc32xx_clcd_remove(struct clcd_fb *fb) -{ - dma_free_wc(&fb->dev->dev, fb->fb.fix.smem_len, fb->fb.screen_base, - fb->fb.fix.smem_start); -} - -static struct clcd_board lpc32xx_clcd_data = { - .name = "Phytec LCD", - .check = clcdfb_check, - .decode = clcdfb_decode, - .setup = lpc32xx_clcd_setup, - .mmap = lpc32xx_clcd_mmap, - .remove = lpc32xx_clcd_remove, -}; - static struct pl08x_channel_data pl08x_slave_channels[] = { { .bus_id = "nand-slc", @@ -161,7 +92,6 @@ static struct lpc32xx_mlc_platform_data lpc32xx_mlc_data = { static const struct of_dev_auxdata lpc32xx_auxdata_lookup[] __initconst = { OF_DEV_AUXDATA("arm,pl022", 0x20084000, "dev:ssp0", NULL), OF_DEV_AUXDATA("arm,pl022", 0x2008C000, "dev:ssp1", NULL), - OF_DEV_AUXDATA("arm,pl110", 0x31040000, "dev:clcd", &lpc32xx_clcd_data), OF_DEV_AUXDATA("arm,pl080", 0x31000000, "pl08xdmac", &pl08x_pd), OF_DEV_AUXDATA("arm,pl18x", 0x20098000, "20098000.sd", &lpc32xx_mmci_data),