From patchwork Fri Jan 24 12:49:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 3534561 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 F2838C02DC for ; Fri, 24 Jan 2014 13:17:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 559882012E for ; Fri, 24 Jan 2014 13:16:58 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9253020109 for ; Fri, 24 Jan 2014 13:16:53 +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 1W6gcS-0004IB-Nu; Fri, 24 Jan 2014 13:16:27 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6gGG-0005wU-6y; Fri, 24 Jan 2014 12:53:28 +0000 Received: from michel.telenet-ops.be ([195.130.137.88]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6gDP-0005e4-EG for linux-arm-kernel@lists.infradead.org; Fri, 24 Jan 2014 12:50:42 +0000 Received: from ayla.of.borg ([84.193.72.141]) by michel.telenet-ops.be with bizsmtp id Hoq51n00832ts5g06oq5W0; Fri, 24 Jan 2014 13:50:05 +0100 Received: from geert by ayla.of.borg with local (Exim 4.76) (envelope-from ) id 1W6gCz-0002Po-10; Fri, 24 Jan 2014 13:50:05 +0100 From: Geert Uytterhoeven To: Simon Horman , Magnus Damm Subject: [PATCH v4 02/15] ARM: shmobile: genmai legacy: Add RSPI support Date: Fri, 24 Jan 2014 13:49:38 +0100 Message-Id: <1390567791-8988-3-git-send-email-geert@linux-m68k.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1390567791-8988-1-git-send-email-geert@linux-m68k.org> References: <1390567791-8988-1-git-send-email-geert@linux-m68k.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140124_075032_228232_0865409A X-CRM114-Status: GOOD ( 12.09 ) X-Spam-Score: -1.9 (-) Cc: Geert Uytterhoeven , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org 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=-4.8 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 From: Geert Uytterhoeven Add RSPI platform device, resources, platform data, and SPI child. On this board, only rspi4 is in use. Its bus contains a single device (a wm8978 audio codec). Signed-off-by: Geert Uytterhoeven --- v4: - The platform device basename was changed from "rspi" to "rspi-rz", dropping the platform data flags in the process - Switch to named IRQs v3: - Move platform devices from setup-r7s72100.c to board-genmai.c, as genmai-reference will use devices instantiated from DT - Merge with "ARM: shmobile: genmai: Add RSPI children", as this now touches the same file - Instantiate SPI children in C on genmai only, as genmai-reference will instantiate them from DT v2: - Correct platform device names ("rspi%u.0" -> "rspi.%u") - Add missing platform data - Correct summary (resources -> platform devices) arch/arm/mach-shmobile/board-genmai.c | 42 +++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/arch/arm/mach-shmobile/board-genmai.c b/arch/arm/mach-shmobile/board-genmai.c index a1f6fe1fb06f..0b01b7f7e240 100644 --- a/arch/arm/mach-shmobile/board-genmai.c +++ b/arch/arm/mach-shmobile/board-genmai.c @@ -21,6 +21,8 @@ #include #include #include +#include +#include #include #include #include @@ -41,11 +43,51 @@ static const struct resource ether_resources[] __initconst = { DEFINE_RES_IRQ(gic_iid(359)), }; +/* RSPI */ +#define RSPI_RESOURCE(idx, baseaddr, irq) \ +static const struct resource rspi##idx##_resources[] __initconst = { \ + DEFINE_RES_MEM(baseaddr, 0x24), \ + DEFINE_RES_IRQ_NAMED(irq, "error"), \ + DEFINE_RES_IRQ_NAMED(irq + 1, "rx"), \ + DEFINE_RES_IRQ_NAMED(irq + 2, "tx"), \ +} + +RSPI_RESOURCE(0, 0xe800c800, gic_iid(270)); +RSPI_RESOURCE(1, 0xe800d000, gic_iid(273)); +RSPI_RESOURCE(2, 0xe800d800, gic_iid(276)); +RSPI_RESOURCE(3, 0xe800e000, gic_iid(279)); +RSPI_RESOURCE(4, 0xe800e800, gic_iid(282)); + +static const struct rspi_plat_data rspi_pdata __initconst = { + .num_chipselect = 1, +}; + +#define r7s72100_register_rspi(idx) \ + platform_device_register_resndata(&platform_bus, "rspi-rz", idx, \ + rspi##idx##_resources, \ + ARRAY_SIZE(rspi##idx##_resources), \ + &rspi_pdata, sizeof(rspi_pdata)) + +static const struct spi_board_info spi_info[] __initconst = { + { + .modalias = "wm8978", + .max_speed_hz = 5000000, + .bus_num = 4, + .chip_select = 0, + }, +}; + static void __init genmai_add_standard_devices(void) { r7s72100_clock_init(); r7s72100_add_dt_devices(); + r7s72100_register_rspi(0); + r7s72100_register_rspi(1); + r7s72100_register_rspi(2); + r7s72100_register_rspi(3); + r7s72100_register_rspi(4); + spi_register_board_info(spi_info, ARRAY_SIZE(spi_info)); platform_device_register_resndata(&platform_bus, "r7s72100-ether", -1, ether_resources, ARRAY_SIZE(ether_resources),