From patchwork Tue Feb 25 10:30:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 3715541 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 755949F2ED for ; Tue, 25 Feb 2014 11:13:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 81163201BF for ; Tue, 25 Feb 2014 11:13:04 +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 194C82016C for ; Tue, 25 Feb 2014 11:13:03 +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 1WIFK6-0004bA-UQ; Tue, 25 Feb 2014 10:33:17 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIFJG-0004pv-TK; Tue, 25 Feb 2014 10:32:22 +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 1WIFHk-0004ei-PX for linux-arm-kernel@lists.infradead.org; Tue, 25 Feb 2014 10:30:59 +0000 Received: from ayla.of.borg ([84.193.72.141]) by michel.telenet-ops.be with bizsmtp id WaWN1n00l32ts5g06aWND4; Tue, 25 Feb 2014 11:30:24 +0100 Received: from geert by ayla.of.borg with local (Exim 4.76) (envelope-from ) id 1WIFHK-0000t3-Fd; Tue, 25 Feb 2014 11:30:22 +0100 From: Geert Uytterhoeven To: Simon Horman , Magnus Damm Subject: [PATCH v2 03/11] ARM: shmobile: lager legacy: Add MSIOF support Date: Tue, 25 Feb 2014 11:30:11 +0100 Message-Id: <1393324219-3317-4-git-send-email-geert@linux-m68k.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1393324219-3317-1-git-send-email-geert@linux-m68k.org> References: <1393324219-3317-1-git-send-email-geert@linux-m68k.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140225_053050_266504_9ADE4A30 X-CRM114-Status: GOOD ( 14.34 ) X-Spam-Score: -1.9 (-) Cc: Geert Uytterhoeven , 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.2 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 MSIOF resources, platform data, platform device, pinctrl, and SPI child device. - Only MSIOF1 is in use, and thus registered. Its bus contains a single device (a Renesas R2A11302FT PMIC). - Platform device numbering is 1-based for compatibility with the BSP, as QSPI uses zero, so MSIOF1's device name is "spi_r8a7790_msiof.2". Signed-off-by: Geert Uytterhoeven --- v2: - Removed resources for unused MSIOF channels. arch/arm/mach-shmobile/board-lager.c | 46 +++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c index f0104bfe544e..9d2d3b03af99 100644 --- a/arch/arm/mach-shmobile/board-lager.c +++ b/arch/arm/mach-shmobile/board-lager.c @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -287,6 +288,17 @@ static const struct platform_device_info ether_info __initconst = { .dma_mask = DMA_BIT_MASK(32), }; +/* MSIOF1 */ +static const struct resource sh_msiof1_resources[] __initconst = { + DEFINE_RES_MEM(0xe6e10000, 0x0064), + DEFINE_RES_IRQ(gic_spi(157)), +}; + +static const struct sh_msiof_spi_info sh_msiof_info __initconst = { + .rx_fifo_override = 256, + .num_chipselect = 1, +}; + /* SPI Flash memory (Spansion S25FL512SAGMFIG11 64Mb) */ static struct mtd_partition spi_flash_part[] = { /* Reserved for user loader program, read-only */ @@ -325,12 +337,19 @@ static const struct rspi_plat_data qspi_pdata __initconst = { static const struct spi_board_info spi_info[] __initconst = { { - .modalias = "m25p80", - .platform_data = &spi_flash_data, - .mode = SPI_MODE_0, - .max_speed_hz = 30000000, - .bus_num = 0, - .chip_select = 0, + .modalias = "m25p80", + .platform_data = &spi_flash_data, + .mode = SPI_MODE_0, + .max_speed_hz = 30000000, + .bus_num = 0, + .chip_select = 0, + }, { + .modalias = "r2a1130x", + .max_speed_hz = 6000000, + .chip_select = 0, + .bus_num = 2, + .mode = SPI_MODE_3, + .controller_data = (void *)-ENOENT, /* HW controlled CS */ }, }; @@ -703,6 +722,15 @@ static const struct pinctrl_map lager_pinctrl_map[] = { /* I2C2 */ PIN_MAP_MUX_GROUP_DEFAULT("i2c-rcar.2", "pfc-r8a7790", "i2c2", "i2c2"), + /* MSIOF1 */ + PIN_MAP_MUX_GROUP_DEFAULT("spi_r8a7790_msiof.2", "pfc-r8a7790", + "msiof1_clk", "msiof1"), + PIN_MAP_MUX_GROUP_DEFAULT("spi_r8a7790_msiof.2", "pfc-r8a7790", + "msiof1_sync", "msiof1"), + PIN_MAP_MUX_GROUP_DEFAULT("spi_r8a7790_msiof.2", "pfc-r8a7790", + "msiof1_rx", "msiof1"), + PIN_MAP_MUX_GROUP_DEFAULT("spi_r8a7790_msiof.2", "pfc-r8a7790", + "msiof1_tx", "msiof1"), /* QSPI */ PIN_MAP_MUX_GROUP_DEFAULT("qspi.0", "pfc-r8a7790", "qspi_ctrl", "qspi"), @@ -811,6 +839,12 @@ static void __init lager_add_standard_devices(void) qspi_resources, ARRAY_SIZE(qspi_resources), &qspi_pdata, sizeof(qspi_pdata)); + platform_device_register_resndata(&platform_bus, "spi_r8a7790_msiof", + 1 + 1, sh_msiof1_resources, + ARRAY_SIZE(sh_msiof1_resources), + &sh_msiof_info, + sizeof(struct sh_msiof_spi_info)); + spi_register_board_info(spi_info, ARRAY_SIZE(spi_info)); platform_device_register_data(&platform_bus, "reg-fixed-voltage", fixed_regulator_idx++,