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: 2854194 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AD973C0AB5 for ; Thu, 5 Sep 2013 17:42:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8CBBF203EA for ; Thu, 5 Sep 2013 17:42:03 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AE97320411 for ; Thu, 5 Sep 2013 17:41:58 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VHdXu-0005F3-5C; Thu, 05 Sep 2013 17:40:43 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VHdXO-00007k-F9; Thu, 05 Sep 2013 17:40:10 +0000 Received: from mail-ee0-f45.google.com ([74.125.83.45]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VHdXL-000056-KI for linux-arm-kernel@lists.infradead.org; Thu, 05 Sep 2013 17:40:08 +0000 Received: by mail-ee0-f45.google.com with SMTP id c50so1077293eek.4 for ; Thu, 05 Sep 2013 10:39:45 -0700 (PDT) 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=K4Ag5qT8hi/7JCv0TPz7mJaPtejjePIYHJgpi5IZ/44=; b=Yyh8vzYZhk864Bzs/nhAaHhAaaPRIX0FO+cZe4n7JnVs8YJiWmOw4PgXXWEf1ycq0i 1+QLOZISKpFKsVO8qhewBzlMjUhAK4M4KoauRTCcvlj9QXAn7aO8luBtaxjK9YEKSuq7 Xa2K0OwbTc3nXNHAN8dmmt5hq5fRP3N9UXIMA2jp+jBVCue4+omQ1cEUrhZaWam518k7 avZvlCvH9CZFJENE+57y1MxVGEXOE9yBYDC4L3wU5/xtGKmaAzi44D+ml5Kv5V1LRj8b S7NxpUx6UxjizsBsGBwSGiDg1sEQwAA7Sgv6Tt1haSEcJx0QgtSMKHEX2LX599BVXI9C nLaQ== X-Gm-Message-State: ALoCoQks+P8w9ItUyKj1Q+hdOAxP8j07ayGDeOsQs7pIazZaHgONWDIqbcQpagAfxcwIo+vWzQHg 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130905_134007_786926_6D6926DB X-CRM114-Status: GOOD ( 14.70 ) X-Spam-Score: -2.6 (--) Cc: Jens Axboe , Russell King , arm@kernel.org, Linus Walleij , Dmitry Torokhov , Tomi Valkeinen , Jean-Christophe Plagniol-Villard , "David S. Miller" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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");