From patchwork Fri Aug 23 12:23:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 19452 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 89A48248E6 for ; Fri, 23 Aug 2013 12:24:28 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id ox1sf438102veb.4 for ; Fri, 23 Aug 2013 05:24:28 -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=etB/5TeSNkvBB7JTIhzNwl3RAGwVkwO/dMnh38ighS8=; b=c+Mbf95HTw2Cx/BIQii0SF3MSZ3bdG68U+jBkIfwBjCJzWxN9TtbXURJEWi8eiUXzF iW+UDz1wWINocaEUS+FNPuYYckaa4+6aFJqU4zNVXhSUSSgpbqz/wWFH7w9rnIWO0aO6 SPytbATZDA9t4UNxU1gAF3m6sRXw+sct2A0K5QxrHOcJQEy/ZLlNpG9iz5tATkOjaAso cHtx+kQf0lV599vOJqqImvhXTb37MaiZpvfyZePG11A46Fhalv9xd9koaHPpwVb6JxT9 JsOKEN8e0r5k49fO2aIR/1uELbK9detcduDiG1CpUzC+5+raobsidVM7TcCOY4rt1gzq MROA== X-Received: by 10.224.4.138 with SMTP id 10mr16735136qar.8.1377260668373; Fri, 23 Aug 2013 05:24:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.25.46 with SMTP id z14ls1528233qef.98.gmail; Fri, 23 Aug 2013 05:24:28 -0700 (PDT) X-Received: by 10.221.51.206 with SMTP id vj14mr16501460vcb.17.1377260668238; Fri, 23 Aug 2013 05:24:28 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id fw17si5476154vec.28.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:28 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id gf12so352359vcb.36 for ; Fri, 23 Aug 2013 05:24:28 -0700 (PDT) X-Gm-Message-State: ALoCoQnuCUkKqWtG4td6JZBGcxGKMPFnGwAoV9AC52Q41zcqpXDgVLm9nnlU3SKrVc4JNFDYXaOW X-Received: by 10.58.237.105 with SMTP id vb9mr16304810vec.2.1377260668147; Fri, 23 Aug 2013 05:24:28 -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 u4csp90112vcz; Fri, 23 Aug 2013 05:24:27 -0700 (PDT) X-Received: by 10.15.95.9 with SMTP id bc9mr61478eeb.97.1377260667005; Fri, 23 Aug 2013 05:24:27 -0700 (PDT) Received: from mail-ea0-f170.google.com (mail-ea0-f170.google.com [209.85.215.170]) by mx.google.com with ESMTPS id r9si16774123eew.132.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:26 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.170 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.215.170; Received: by mail-ea0-f170.google.com with SMTP id h14so264417eak.15 for ; Fri, 23 Aug 2013 05:24:26 -0700 (PDT) X-Received: by 10.14.184.3 with SMTP id r3mr26338793eem.49.1377260666354; Fri, 23 Aug 2013 05:24:26 -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:25 -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 18/40] ARM: ux500: Purge SDI support for ATAG booting Date: Fri, 23 Aug 2013 13:23:18 +0100 Message-Id: <1377260620-18829-19-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.220.177 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-sdi.c | 39 ---------------------------------- arch/arm/mach-ux500/board-mop500.c | 3 --- arch/arm/mach-ux500/board-mop500.h | 3 --- arch/arm/mach-ux500/devices-common.h | 10 --------- arch/arm/mach-ux500/devices-db8500.h | 19 ----------------- 5 files changed, 74 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c index 1ae5999..26600a1 100644 --- a/arch/arm/mach-ux500/board-mop500-sdi.c +++ b/arch/arm/mach-ux500/board-mop500-sdi.c @@ -65,12 +65,6 @@ struct mmci_platform_data mop500_sdi0_data = { #endif }; -static void sdi0_configure(struct device *parent) -{ - /* Add the device, force v2 to subrevision 1 */ - db8500_add_sdi0(parent, &mop500_sdi0_data, U8500_SDI_V2_PERIPHID); -} - /* * SDI1 (SDIO WLAN) */ @@ -172,36 +166,3 @@ struct mmci_platform_data mop500_sdi4_data = { .dma_tx_param = &mop500_sdi4_dma_cfg_tx, #endif }; - -void __init mop500_sdi_init(struct device *parent) -{ - /* PoP:ed eMMC */ - db8500_add_sdi2(parent, &mop500_sdi2_data, U8500_SDI_V2_PERIPHID); - /* On-board eMMC */ - db8500_add_sdi4(parent, &mop500_sdi4_data, U8500_SDI_V2_PERIPHID); -} - -void __init snowball_sdi_init(struct device *parent) -{ - /* On Snowball MMC_CAP_SD_HIGHSPEED isn't supported (Hardware issue?) */ - mop500_sdi0_data.capabilities &= ~MMC_CAP_SD_HIGHSPEED; - /* On-board eMMC */ - db8500_add_sdi4(parent, &mop500_sdi4_data, U8500_SDI_V2_PERIPHID); - /* External Micro SD slot */ - mop500_sdi0_data.gpio_cd = SNOWBALL_SDMMC_CD_GPIO; - mop500_sdi0_data.cd_invert = true; - sdi0_configure(parent); -} - -void __init hrefv60_sdi_init(struct device *parent) -{ - /* PoP:ed eMMC */ - db8500_add_sdi2(parent, &mop500_sdi2_data, U8500_SDI_V2_PERIPHID); - /* On-board eMMC */ - db8500_add_sdi4(parent, &mop500_sdi4_data, U8500_SDI_V2_PERIPHID); - /* External Micro SD slot */ - mop500_sdi0_data.gpio_cd = HREFV60_SDMMC_CD_GPIO; - sdi0_configure(parent); - /* WLAN SDIO channel */ - db8500_add_sdi1(parent, &mop500_sdi1_data, U8500_SDI_V2_PERIPHID); -} diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 447d37d..d53d672 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -165,7 +165,6 @@ static void __init mop500_init_machine(void) mop500_pinmaps_init(); parent = u8500_init_devices(); - mop500_sdi_init(parent); mop500_spi_init(parent); mop500_uart_init(parent); @@ -182,7 +181,6 @@ static void __init snowball_init_machine(void) snowball_pinmaps_init(); parent = u8500_init_devices(); - snowball_sdi_init(parent); mop500_spi_init(parent); mop500_uart_init(parent); @@ -199,7 +197,6 @@ static void __init hrefv60_init_machine(void) hrefv60_pinmaps_init(); parent = u8500_init_devices(); - hrefv60_sdi_init(parent); mop500_spi_init(parent); mop500_uart_init(parent); diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h index 341fad1..06eb894 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h @@ -94,9 +94,6 @@ extern struct amba_pl011_data uart2_plat; extern struct pl022_ssp_controller ssp0_plat; extern struct stedma40_platform_data dma40_plat_data; -extern void mop500_sdi_init(struct device *parent); -extern void snowball_sdi_init(struct device *parent); -extern void hrefv60_sdi_init(struct device *parent); void __init mop500_u8500uib_init(void); void __init mop500_stuib_init(void); void __init mop500_pinmaps_init(void); diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h index 34ec2f7..030f5a0 100644 --- a/arch/arm/mach-ux500/devices-common.h +++ b/arch/arm/mach-ux500/devices-common.h @@ -24,16 +24,6 @@ dbx500_add_spi(struct device *parent, const char *name, resource_size_t base, pdata, periphid); } -struct mmci_platform_data; - -static inline struct amba_device * -dbx500_add_sdi(struct device *parent, const char *name, resource_size_t base, - int irq, struct mmci_platform_data *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 64667f6..e47039b 100644 --- a/arch/arm/mach-ux500/devices-db8500.h +++ b/arch/arm/mach-ux500/devices-db8500.h @@ -49,25 +49,6 @@ db8500_add_ssp(struct device *parent, const char *name, resource_size_t base, ux500_add_usb(parent, U8500_USBOTG_BASE, \ IRQ_DB8500_USBOTG, rx_cfg, tx_cfg) -#define db8500_add_sdi0(parent, pdata, pid) \ - dbx500_add_sdi(parent, "sdi0", U8500_SDI0_BASE, \ - IRQ_DB8500_SDMMC0, pdata, pid) -#define db8500_add_sdi1(parent, pdata, pid) \ - dbx500_add_sdi(parent, "sdi1", U8500_SDI1_BASE, \ - IRQ_DB8500_SDMMC1, pdata, pid) -#define db8500_add_sdi2(parent, pdata, pid) \ - dbx500_add_sdi(parent, "sdi2", U8500_SDI2_BASE, \ - IRQ_DB8500_SDMMC2, pdata, pid) -#define db8500_add_sdi3(parent, pdata, pid) \ - dbx500_add_sdi(parent, "sdi3", U8500_SDI3_BASE, \ - IRQ_DB8500_SDMMC3, pdata, pid) -#define db8500_add_sdi4(parent, pdata, pid) \ - dbx500_add_sdi(parent, "sdi4", U8500_SDI4_BASE, \ - IRQ_DB8500_SDMMC4, pdata, pid) -#define db8500_add_sdi5(parent, pdata, pid) \ - dbx500_add_sdi(parent, "sdi5", U8500_SDI5_BASE, \ - IRQ_DB8500_SDMMC5, pdata, pid) - #define db8500_add_ssp0(parent, pdata) \ db8500_add_ssp(parent, "ssp0", U8500_SSP0_BASE, \ IRQ_DB8500_SSP0, pdata)