From patchwork Thu Sep 5 17:39:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 19787 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BE4F824869 for ; Thu, 5 Sep 2013 17:39:47 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id i72sf2559278yha.5 for ; Thu, 05 Sep 2013 10:39:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=K4Ag5qT8hi/7JCv0TPz7mJaPtejjePIYHJgpi5IZ/44=; b=JJwOWf3ChNaHfDphPZ993h2cPiGr1apYaEjNId0pY7cl0DcFW/s2geNVNWuzGu6DvH +ptqvm5fBSULqO/pAirkbhh0ov4/+G6qExzynwzdrlbTv7KjoXUi8sRFWlwhEcExCDzC NiHAfKJYDN9kjZTNCMrjC9tIqjXCbc0B/CyywXrTsjGlh5uLPRPoeIP+dY2CT5tw3zAu eLxN72nguE+ZV3Mp1sNsIm8tYP16GUTdK5zvZt9n6J8D4t5xj9cYlcuWOVmFFTKedvbu Egz2SO5epupQFfQQRT2KLqcZfM7MoninJoe/RKLu6w40O+XMKt+VBdGU9ePbshV6hpnH IlgQ== X-Received: by 10.236.7.130 with SMTP id 2mr3477919yhp.4.1378402787582; Thu, 05 Sep 2013 10:39:47 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.4.70 with SMTP id i6ls549121qei.26.gmail; Thu, 05 Sep 2013 10:39:47 -0700 (PDT) X-Received: by 10.52.230.233 with SMTP id tb9mr4602137vdc.17.1378402787495; Thu, 05 Sep 2013 10:39:47 -0700 (PDT) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id i15si7530577vep.16.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 05 Sep 2013 10:39:47 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.170; Received: by mail-ve0-f170.google.com with SMTP id c14so804169vea.29 for ; Thu, 05 Sep 2013 10:39:47 -0700 (PDT) X-Gm-Message-State: ALoCoQngw0vo0TQjo5dWmDsr2KOySlSKZIDUvvnJeImwiT2wE0CM6Dhlr3BsHbODBVc/cBrL+9m1 X-Received: by 10.52.117.211 with SMTP id kg19mr1158692vdb.35.1378402787316; Thu, 05 Sep 2013 10:39:47 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp293253vcz; Thu, 5 Sep 2013 10:39:46 -0700 (PDT) X-Received: by 10.15.107.10 with SMTP id ca10mr1052eeb.76.1378402786370; Thu, 05 Sep 2013 10:39:46 -0700 (PDT) Received: from mail-ee0-f43.google.com (mail-ee0-f43.google.com [74.125.83.43]) by mx.google.com with ESMTPS id h5si24750074eeg.20.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 05 Sep 2013 10:39:46 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.43 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.83.43; Received: by mail-ee0-f43.google.com with SMTP id e52so1062717eek.2 for ; Thu, 05 Sep 2013 10:39:45 -0700 (PDT) X-Received: by 10.15.45.8 with SMTP id a8mr15156189eew.1.1378402785831; Thu, 05 Sep 2013 10:39:45 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id k7sm50484770eeg.13.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 05 Sep 2013 10:39:45 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Alexander Schulz Cc: Jens Axboe , "David S. Miller" , Dmitry Torokhov , Russell King , Jean-Christophe Plagniol-Villard , Tomi Valkeinen , arm@kernel.org, Linus Walleij Subject: [PATCH 6/6] RFC: video: drop code for ARCH_SHARK in cyber2000fb Date: Thu, 5 Sep 2013 19:39:42 +0200 Message-Id: <1378402782-16543-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The Cyber2000 frame buffer driver contains a block of code solely for the Shark machine. As the machine is deleted, delete this code as well. Also remove the pointless #ifdef CONFIG_PCI as the Kconfig clearly states PCI as a dependency anyway. Cc: Russell King Cc: Jean-Christophe Plagniol-Villard Cc: Tomi Valkeinen Signed-off-by: Linus Walleij --- NOTE: Do not apply this patch other than after removing the RFC tag. I am collecting ACKs from subsystem maintainers to take this through ARM SoC if we continue with the deletion. --- drivers/video/cyber2000fb.c | 70 --------------------------------------------- 1 file changed, 70 deletions(-) diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c index 5788678..1c446bc 100644 --- a/drivers/video/cyber2000fb.c +++ b/drivers/video/cyber2000fb.c @@ -1641,67 +1641,6 @@ static void cyberpro_common_resume(struct cfb_info *cfb) cyber2000fb_set_par(&cfb->fb); } -#ifdef CONFIG_ARCH_SHARK - -#include - -static int cyberpro_vl_probe(void) -{ - struct cfb_info *cfb; - int err = -ENOMEM; - - if (!request_mem_region(FB_START, FB_SIZE, "CyberPro2010")) - return err; - - cfb = cyberpro_alloc_fb_info(ID_CYBERPRO_2010, "CyberPro2010"); - if (!cfb) - goto failed_release; - - cfb->irq = -1; - cfb->region = ioremap(FB_START, FB_SIZE); - if (!cfb->region) - goto failed_ioremap; - - cfb->regs = cfb->region + MMIO_OFFSET; - cfb->fb.device = NULL; - cfb->fb.fix.mmio_start = FB_START + MMIO_OFFSET; - cfb->fb.fix.smem_start = FB_START; - - /* - * Bring up the hardware. This is expected to enable access - * to the linear memory region, and allow access to the memory - * mapped registers. Also, mem_ctl1 and mem_ctl2 must be - * initialised. - */ - cyber2000fb_writeb(0x18, 0x46e8, cfb); - cyber2000fb_writeb(0x01, 0x102, cfb); - cyber2000fb_writeb(0x08, 0x46e8, cfb); - cyber2000fb_writeb(EXT_BIU_MISC, 0x3ce, cfb); - cyber2000fb_writeb(EXT_BIU_MISC_LIN_ENABLE, 0x3cf, cfb); - - cfb->mclk_mult = 0xdb; - cfb->mclk_div = 0x54; - - err = cyberpro_common_probe(cfb); - if (err) - goto failed; - - if (int_cfb_info == NULL) - int_cfb_info = cfb; - - return 0; - -failed: - iounmap(cfb->region); -failed_ioremap: - cyberpro_free_fb_info(cfb); -failed_release: - release_mem_region(FB_START, FB_SIZE); - - return err; -} -#endif /* CONFIG_ARCH_SHARK */ - /* * PCI specific support. */ @@ -1948,28 +1887,19 @@ static int __init cyber2000fb_init(void) cyber2000fb_setup(option); #endif -#ifdef CONFIG_ARCH_SHARK - err = cyberpro_vl_probe(); - if (!err) - ret = 0; -#endif -#ifdef CONFIG_PCI err = pci_register_driver(&cyberpro_driver); if (!err) ret = 0; -#endif return ret ? err : 0; } module_init(cyber2000fb_init); -#ifndef CONFIG_ARCH_SHARK static void __exit cyberpro_exit(void) { pci_unregister_driver(&cyberpro_driver); } module_exit(cyberpro_exit); -#endif MODULE_AUTHOR("Russell King"); MODULE_DESCRIPTION("CyberPro 2000, 2010 and 5000 framebuffer driver");