From patchwork Fri Sep 13 10:54:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 20024 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f200.google.com (mail-qc0-f200.google.com [209.85.216.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1BA4E25E09 for ; Fri, 13 Sep 2013 10:54:25 +0000 (UTC) Received: by mail-qc0-f200.google.com with SMTP id x20sf1036703qcv.7 for ; Fri, 13 Sep 2013 03:54:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version: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=F9gQ7m0rXl3+OzxZjmS48qsV23JHV4Ak21gjmeuhbns=; b=HCMk1xRYoZfPDAPHWQf2y/NHQsfMp1k7a1YjB932C4AU+A2c7/DpzryXBlJhKn1rYh VoVqI3aldDLFxfzRAoOf5Nmrl4ITWOL3HFPoVgXYRMy9G97ml64OHwQbUC9WzeVqyIl4 tDiPRkCs3wUxUcrjLIaF2WOfqxW4TOKIEPssiP2h3RHxA0SWIzor1KWp+qxYXiHfaVMq Zn9zNv1vwOjVAbXn5a5OeDFemy1b57yn7hJwdadSaY8DjXryYSQh2t4ud6KyuWgZwMSP 9UjtR7rY5b5Tv5BzIQ/AtDrp3BsA0bhkyG5d8nBWbAWR06/z/T7Vws/xFZMB97AX+AzF bn7w== X-Gm-Message-State: ALoCoQmHygh77/KIHsPyKr1/SXB+btyn7NdaWVryPZnEqG3RSRdej39qR5+SRmenvlC2T4F6q3X0 X-Received: by 10.236.90.67 with SMTP id d43mr4770050yhf.36.1379069664607; Fri, 13 Sep 2013 03:54:24 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.28.10 with SMTP id x10ls1177725qeg.20.gmail; Fri, 13 Sep 2013 03:54:24 -0700 (PDT) X-Received: by 10.220.249.67 with SMTP id mj3mr6369139vcb.23.1379069664389; Fri, 13 Sep 2013 03:54:24 -0700 (PDT) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id x9si2932849vec.118.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Sep 2013 03:54:24 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.178 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.178; Received: by mail-ve0-f178.google.com with SMTP id jw12so812275veb.37 for ; Fri, 13 Sep 2013 03:54:24 -0700 (PDT) X-Received: by 10.220.13.20 with SMTP id z20mr11456108vcz.0.1379069664283; Fri, 13 Sep 2013 03:54:24 -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 u4csp73825vcz; Fri, 13 Sep 2013 03:54:23 -0700 (PDT) X-Received: by 10.112.9.195 with SMTP id c3mr1074811lbb.33.1379069662601; Fri, 13 Sep 2013 03:54:22 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com [209.85.217.170]) by mx.google.com with ESMTPS id y3si5534282lbq.158.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Sep 2013 03:54:22 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.217.170 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.217.170; Received: by mail-lb0-f170.google.com with SMTP id w7so1920702lbi.15 for ; Fri, 13 Sep 2013 03:54:22 -0700 (PDT) X-Received: by 10.112.159.166 with SMTP id xd6mr11507063lbb.22.1379069661990; Fri, 13 Sep 2013 03:54:21 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id vs11sm4030136lac.3.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 13 Sep 2013 03:54:21 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Alexander Schulz , Jean-Christophe Plagniol-Villard , Tomi Valkeinen Cc: Jens Axboe , "David S. Miller" , Dmitry Torokhov , Russell King , arm@kernel.org, Linus Walleij Subject: [PATCH 6/6] video: drop code for ARCH_SHARK in cyber2000fb Date: Fri, 13 Sep 2013 12:54:16 +0200 Message-Id: <1379069656-4273-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.178 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 --- Hi Jean-Christophe/Tomi, I am seeking an ACK to take this through the ARM SoC tree as part of the deletion of the Shark machine. Please do not apply it to your tree. --- 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");