From patchwork Mon Apr 14 18:15:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 3985171 Return-Path: X-Original-To: patchwork-linux-sh@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 A632B9F2BA for ; Mon, 14 Apr 2014 18:16:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CA4D72018E for ; Mon, 14 Apr 2014 18:16:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DABD8201FB for ; Mon, 14 Apr 2014 18:16:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755110AbaDNSQJ (ORCPT ); Mon, 14 Apr 2014 14:16:09 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:49347 "EHLO albert.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755030AbaDNSP7 (ORCPT ); Mon, 14 Apr 2014 14:15:59 -0400 Received: from ayla.of.borg ([84.193.72.141]) by albert.telenet-ops.be with bizsmtp id puFx1n00m32ts5g06uFx2D; Mon, 14 Apr 2014 20:15:57 +0200 Received: from geert by ayla.of.borg with local (Exim 4.76) (envelope-from ) id 1WZlQD-00038i-Jc; Mon, 14 Apr 2014 20:15:57 +0200 From: Geert Uytterhoeven To: Simon Horman , Magnus Damm Cc: linux-sh@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v3 3/5] ARM: shmobile: lager legacy: Add MSIOF support Date: Mon, 14 Apr 2014 20:15:39 +0200 Message-Id: <1397499341-11964-4-git-send-email-geert@linux-m68k.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1397499341-11964-1-git-send-email-geert@linux-m68k.org> References: <1397499341-11964-1-git-send-email-geert@linux-m68k.org> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Acked-by: Magnus Damm --- v3: - Add Acked-by 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 f8b1e05463cc..a7c82ecf1e48 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 | SPI_TX_QUAD | SPI_RX_QUAD, - .max_speed_hz = 30000000, - .bus_num = 0, - .chip_select = 0, + .modalias = "m25p80", + .platform_data = &spi_flash_data, + .mode = SPI_MODE_0 | SPI_TX_QUAD | SPI_RX_QUAD, + .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 */ }, }; @@ -708,6 +727,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"), @@ -816,6 +844,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++,