From patchwork Fri Aug 23 12:23:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 19460 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-gh0-f197.google.com (mail-gh0-f197.google.com [209.85.160.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 09A50248E6 for ; Fri, 23 Aug 2013 12:24:43 +0000 (UTC) Received: by mail-gh0-f197.google.com with SMTP id r20sf422753ghr.0 for ; Fri, 23 Aug 2013 05:24:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=bSQkopcXlOQHnEKj2zu2IsPxEh9Np4Btm1t7yjf3bDw=; b=FjAYyjrCQsh95OOeMxzaQhUdfjWBCstNsM9dN5urltKJTTd0MeIPfJ/EGHqPB35lML msPgOaZhOGjTFxQLAtwuRuOidcUMGMAxsQnlPlxOi4vGwo/+G1ce2Nt/xWg5ggYqyIxl Tlw9u2CWHY5v1uhvqwDKVtpu29gLtMHgrYYYJ0M6mYRcVH99BpBeRSzOFc69gi/Ve8DM wUDSeMDfhOu+2sUIgcFX0FpoKtwtwQPtahj5LKQ01bpvf0y2FJ2LfXz0YUC/ex9EJgXZ k6t8ScMugnf0Xpdi+jMA9pd4URleqbKy36CEVcoxUSmPz3Puq/pUD0YBmULdl8Qq3M4l hM6A== X-Received: by 10.224.13.136 with SMTP id c8mr16796296qaa.0.1377260682839; Fri, 23 Aug 2013 05:24:42 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.49.42 with SMTP id r10ls1550692qen.86.gmail; Fri, 23 Aug 2013 05:24:42 -0700 (PDT) X-Received: by 10.52.103.101 with SMTP id fv5mr80629vdb.31.1377260682763; Fri, 23 Aug 2013 05:24:42 -0700 (PDT) Received: from mail-vb0-f49.google.com (mail-vb0-f49.google.com [209.85.212.49]) by mx.google.com with ESMTPS id f20si5460572vcs.142.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:42 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.49 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.49; Received: by mail-vb0-f49.google.com with SMTP id w16so358601vbb.36 for ; Fri, 23 Aug 2013 05:24:42 -0700 (PDT) X-Gm-Message-State: ALoCoQk8ndeleHQTW+G9OuF8bgB4oV9hA4orIuNDF98nJYTR2+8zh5I/T6z30v0sUnSGGBWNp0ny X-Received: by 10.52.115.102 with SMTP id jn6mr14190431vdb.18.1377260682664; Fri, 23 Aug 2013 05:24:42 -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 u4csp90135vcz; Fri, 23 Aug 2013 05:24:41 -0700 (PDT) X-Received: by 10.15.73.134 with SMTP id h6mr512877eey.76.1377260681316; Fri, 23 Aug 2013 05:24:41 -0700 (PDT) Received: from mail-ee0-f46.google.com (mail-ee0-f46.google.com [74.125.83.46]) by mx.google.com with ESMTPS id 47si16793364eea.61.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:41 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.46 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.83.46; Received: by mail-ee0-f46.google.com with SMTP id c13so263864eek.33 for ; Fri, 23 Aug 2013 05:24:40 -0700 (PDT) X-Received: by 10.14.205.135 with SMTP id j7mr62279eeo.93.1377260680756; Fri, 23 Aug 2013 05:24:40 -0700 (PDT) Received: from localhost.localdomain (cpc15-aztw25-2-0-cust493.aztw.cable.virginmedia.com. [92.233.57.238]) by mx.google.com with ESMTPSA id f49sm24417729eec.7.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:39 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@linaro.org, Lee Jones Subject: [PATCH 26/40] ARM: ux500: Rip out SSP/SPI registration when not booting with Device Tree Date: Fri, 23 Aug 2013 13:23:26 +0100 Message-Id: <1377260620-18829-27-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1377260620-18829-1-git-send-email-lee.jones@linaro.org> References: <1377260620-18829-1-git-send-email-lee.jones@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.49 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: , It's time to remove all ATAG support from ux500 and rely solely on Device Tree booting. This patch is part of that endeavour. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500.c | 9 --------- arch/arm/mach-ux500/devices-common.h | 11 ----------- arch/arm/mach-ux500/devices-db8500.h | 28 ---------------------------- 3 files changed, 48 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 7763c5b..939ba22 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -80,11 +79,6 @@ struct pl022_ssp_controller ssp0_plat = { .num_chipselect = 5, }; -static void __init mop500_spi_init(struct device *parent) -{ - db8500_add_ssp0(parent, &ssp0_plat); -} - #ifdef CONFIG_STE_DMA40 static struct stedma40_chan_cfg uart0_dma_cfg_rx = { .mode = STEDMA40_MODE_LOGICAL, @@ -163,7 +157,6 @@ static void __init mop500_init_machine(void) mop500_pinmaps_init(); parent = u8500_init_devices(); - mop500_spi_init(parent); mop500_uart_init(parent); /* This board has full regulator constraints */ @@ -179,7 +172,6 @@ static void __init snowball_init_machine(void) snowball_pinmaps_init(); parent = u8500_init_devices(); - mop500_spi_init(parent); mop500_uart_init(parent); /* This board has full regulator constraints */ @@ -195,7 +187,6 @@ static void __init hrefv60_init_machine(void) hrefv60_pinmaps_init(); parent = u8500_init_devices(); - mop500_spi_init(parent); mop500_uart_init(parent); /* This board has full regulator constraints */ diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h index ce48a02..15bf1ab 100644 --- a/arch/arm/mach-ux500/devices-common.h +++ b/arch/arm/mach-ux500/devices-common.h @@ -13,17 +13,6 @@ #include #include -struct spi_master_cntlr; - -static inline struct amba_device * -dbx500_add_spi(struct device *parent, const char *name, resource_size_t base, - int irq, struct spi_master_cntlr *pdata, - u32 periphid) -{ - return amba_ahb_device_add(parent, name, base, SZ_4K, irq, 0, - pdata, periphid); -} - struct amba_pl011_data; static inline struct amba_device * diff --git a/arch/arm/mach-ux500/devices-db8500.h b/arch/arm/mach-ux500/devices-db8500.h index 0b523b5..e6ac6d2 100644 --- a/arch/arm/mach-ux500/devices-db8500.h +++ b/arch/arm/mach-ux500/devices-db8500.h @@ -12,40 +12,12 @@ #include "db8500-regs.h" #include "devices-common.h" -struct pl022_ssp_controller; struct platform_device; extern struct ab8500_platform_data ab8500_platdata; extern struct prcmu_pdata db8500_prcmu_pdata; extern struct platform_device db8500_prcmu_device; -static inline struct amba_device * -db8500_add_ssp(struct device *parent, const char *name, resource_size_t base, - int irq, struct pl022_ssp_controller *pdata) -{ - return amba_ahb_device_add(parent, name, base, SZ_4K, irq, 0, pdata, 0); -} - -#define db8500_add_ssp0(parent, pdata) \ - db8500_add_ssp(parent, "ssp0", U8500_SSP0_BASE, \ - IRQ_DB8500_SSP0, pdata) -#define db8500_add_ssp1(parent, pdata) \ - db8500_add_ssp(parent, "ssp1", U8500_SSP1_BASE, \ - IRQ_DB8500_SSP1, pdata) - -#define db8500_add_spi0(parent, pdata) \ - dbx500_add_spi(parent, "spi0", U8500_SPI0_BASE, \ - IRQ_DB8500_SPI0, pdata, 0) -#define db8500_add_spi1(parent, pdata) \ - dbx500_add_spi(parent, "spi1", U8500_SPI1_BASE, \ - IRQ_DB8500_SPI1, pdata, 0) -#define db8500_add_spi2(parent, pdata) \ - dbx500_add_spi(parent, "spi2", U8500_SPI2_BASE, \ - IRQ_DB8500_SPI2, pdata, 0) -#define db8500_add_spi3(parent, pdata) \ - dbx500_add_spi(parent, "spi3", U8500_SPI3_BASE, \ - IRQ_DB8500_SPI3, pdata, 0) - #define db8500_add_uart0(parent, pdata) \ dbx500_add_uart(parent, "uart0", U8500_UART0_BASE, \ IRQ_DB8500_UART0, pdata)