From patchwork Wed Jan 21 15:24:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 43461 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 99EE4218DB for ; Wed, 21 Jan 2015 15:25:02 +0000 (UTC) Received: by mail-lb0-f200.google.com with SMTP id u10sf6232396lbd.3 for ; Wed, 21 Jan 2015 07:25:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=z+6JXHC07cU1fERVO+PrNrEc33+b08AL6UieuwnFXPE=; b=CEn4jumlEiwVXS7EqCLQ8BARSP2r2YPTupqPjOL1HdyVIpXTkEquT8Nv9eTmpXBOTf b6CKSqZCrZxcRxVEpgh/Ahk3u4dYzgAOzwRkVNv1hk+7cW6xOnZV0UbMkmxhMClDWX// 4svlJucfnnjMvAzdoA5DehTKuM41ovvpNZJnxb/OSpwaoKe67W5r7K6CFNJ83kNCKvGG wg+SHVw8H2GBFGFmpmjGtRLfqeiwZsjTqJZiQj9MkI3cScPCozg1t82Du9HTaxmqpfp/ LqiYPcFRsrWPIWMvgu5tIi/5s6FTowNoLToUOvHmWlwRW3k16JfoxgZAvsBLX7XWLX54 J9NA== X-Gm-Message-State: ALoCoQl7RI8WkMtk5RtVDSfgBV8jSVpTTkPMaDnELf1cOSQmGsFlpPm5hBpBDzO4sRB6mNwUPioI X-Received: by 10.152.43.50 with SMTP id t18mr1247020lal.3.1421853901467; Wed, 21 Jan 2015 07:25:01 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.42.234 with SMTP id r10ls44074lal.17.gmail; Wed, 21 Jan 2015 07:25:01 -0800 (PST) X-Received: by 10.152.87.210 with SMTP id ba18mr3446379lab.3.1421853901329; Wed, 21 Jan 2015 07:25:01 -0800 (PST) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id n3si19611508lah.45.2015.01.21.07.25.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 21 Jan 2015 07:25:01 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by mail-lb0-f178.google.com with SMTP id u10so9246151lbd.9 for ; Wed, 21 Jan 2015 07:25:01 -0800 (PST) X-Received: by 10.112.14.6 with SMTP id l6mr45237256lbc.91.1421853901230; Wed, 21 Jan 2015 07:25:01 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.9.200 with SMTP id c8csp1812470lbb; Wed, 21 Jan 2015 07:25:00 -0800 (PST) X-Received: by 10.66.146.167 with SMTP id td7mr62929165pab.101.1421853899234; Wed, 21 Jan 2015 07:24:59 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id km10si8781028pbd.45.2015.01.21.07.24.58; Wed, 21 Jan 2015 07:24:59 -0800 (PST) Received-SPF: none (google.com: devicetree-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753971AbbAUPYx (ORCPT + 5 others); Wed, 21 Jan 2015 10:24:53 -0500 Received: from mail-ie0-f179.google.com ([209.85.223.179]:61729 "EHLO mail-ie0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754109AbbAUPYq (ORCPT ); Wed, 21 Jan 2015 10:24:46 -0500 Received: by mail-ie0-f179.google.com with SMTP id x19so8588474ier.10 for ; Wed, 21 Jan 2015 07:24:44 -0800 (PST) X-Received: by 10.50.43.138 with SMTP id w10mr2185486igl.19.1421853884758; Wed, 21 Jan 2015 07:24:44 -0800 (PST) Received: from localhost.localdomain (host86-181-29-86.range86-181.btcentralplus.com. [86.181.29.86]) by mx.google.com with ESMTPSA id y5sm1411873ign.7.2015.01.21.07.24.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Jan 2015 07:24:44 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: lee.jones@linaro.org, kernel@stlinux.com, linux-mtd@lists.infradead.org, computersforpeace@gmail.com, devicetree@vger.kernel.org Subject: [PATCH v4 02/10] mtd: st_spi_fsm: Fetch boot device locations from DT match tables Date: Wed, 21 Jan 2015 15:24:20 +0000 Message-Id: <1421853868-8262-3-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1421853868-8262-1-git-send-email-lee.jones@linaro.org> References: <1421853868-8262-1-git-send-email-lee.jones@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , To trim down on the amount of properties used by this driver and to conform to the newly agreed method of acquiring syscfg registers/offsets, we now obtain this information using match tables. In the process we are deprecating the old generic compatible string and providing 3 shiny new ones for each of the support platforms. The deprecated compatible string will be removed in due course. Cc: devicetree@vger.kernel.org Signed-off-by: Lee Jones --- drivers/mtd/devices/st_spi_fsm.c | 74 ++++++++++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 18 deletions(-) diff --git a/drivers/mtd/devices/st_spi_fsm.c b/drivers/mtd/devices/st_spi_fsm.c index 3060025..9e4fded 100644 --- a/drivers/mtd/devices/st_spi_fsm.c +++ b/drivers/mtd/devices/st_spi_fsm.c @@ -29,6 +29,21 @@ #include "serial_flash_cmds.h" /* + * FSM SPI Boot Mode Registers/Masks + */ +#define STID127_SYSCON_BOOT_DEV_REG 0x0D8 +#define STID127_SYSCON_BOOT_DEV_SPI 0x068 +#define STID127_SYSCON_BOOT_DEV_MASK 0x07C + +#define STIH407_SYSCON_BOOT_DEV_REG 0x8C4 +#define STIH407_SYSCON_BOOT_DEV_SPI 0x068 +#define STIH407_SYSCON_BOOT_DEV_MASK 0x07C + +#define STIH416_SYSCON_BOOT_DEV_REG 0x958 +#define STIH416_SYSCON_BOOT_DEV_SPI 0x01A +#define STIH416_SYSCON_BOOT_DEV_MASK 0x01F + +/* * FSM SPI Controller Registers */ #define SPI_CLOCKDIV 0x0010 @@ -288,6 +303,12 @@ struct seq_rw_config { uint8_t dummy_cycles; /* No. of DUMMY cycles */ }; +struct stfsm_boot_dev { + uint32_t reg; + uint32_t spi; + uint32_t mask; +}; + /* SPI Flash Device Table */ struct flash_info { char *name; @@ -313,6 +334,24 @@ struct flash_info { int (*config)(struct stfsm *); }; +static struct stfsm_boot_dev stfsm_stid127_data = { + .reg = STID127_SYSCON_BOOT_DEV_REG, + .spi = STID127_SYSCON_BOOT_DEV_SPI, + .mask = STID127_SYSCON_BOOT_DEV_MASK, +}; + +static struct stfsm_boot_dev stfsm_stih407_data = { + .reg = STIH407_SYSCON_BOOT_DEV_REG, + .spi = STIH407_SYSCON_BOOT_DEV_SPI, + .mask = STIH407_SYSCON_BOOT_DEV_MASK, +}; + +static struct stfsm_boot_dev stfsm_stih416_data = { + .reg = STIH416_SYSCON_BOOT_DEV_REG, + .spi = STIH416_SYSCON_BOOT_DEV_SPI, + .mask = STIH416_SYSCON_BOOT_DEV_MASK, +}; + static int stfsm_n25q_config(struct stfsm *fsm); static int stfsm_mx25_config(struct stfsm *fsm); static int stfsm_s25fl_config(struct stfsm *fsm); @@ -1977,14 +2016,22 @@ static int stfsm_init(struct stfsm *fsm) return 0; } +static const struct of_device_id stfsm_match[] = { + { .compatible = "st,stid127-spi-fsm", .data = &stfsm_stid127_data }, + { .compatible = "st,stih407-spi-fsm", .data = &stfsm_stih407_data }, + { .compatible = "st,stih416-spi-fsm", .data = &stfsm_stih416_data }, + {}, +}; +MODULE_DEVICE_TABLE(of, stfsm_match); + static void stfsm_fetch_platform_configs(struct platform_device *pdev) { struct stfsm *fsm = platform_get_drvdata(pdev); struct device_node *np = pdev->dev.of_node; + const struct stfsm_boot_dev *boot_dev; + const struct of_device_id *match; struct regmap *regmap; - uint32_t boot_device_reg; - uint32_t boot_device_spi; - uint32_t boot_device; /* Value we read from *boot_device_reg */ + uint32_t boot_device; /* Value we read from the boot dev mode pins */ int ret; /* Booting from SPI NOR Flash is the default */ @@ -1998,21 +2045,18 @@ static void stfsm_fetch_platform_configs(struct platform_device *pdev) fsm->reset_por = of_property_read_bool(np, "st,reset-por"); - /* Where in the syscon the boot device information lives */ - ret = of_property_read_u32(np, "st,boot-device-reg", &boot_device_reg); - if (ret) + match = of_match_node(stfsm_match, np); + if (!match) goto boot_device_fail; + boot_dev = match->data; - /* Boot device value when booted from SPI NOR */ - ret = of_property_read_u32(np, "st,boot-device-spi", &boot_device_spi); + ret = regmap_read(regmap, boot_dev->reg, &boot_device); if (ret) goto boot_device_fail; - ret = regmap_read(regmap, boot_device_reg, &boot_device); - if (ret) - goto boot_device_fail; + boot_device &= boot_dev->mask; - if (boot_device != boot_device_spi) + if (boot_device != boot_dev->spi) fsm->booted_from_spi = false; return; @@ -2156,12 +2200,6 @@ static int stfsmfsm_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(stfsm_pm_ops, stfsmfsm_suspend, stfsmfsm_resume); -static const struct of_device_id stfsm_match[] = { - { .compatible = "st,spi-fsm", }, - {}, -}; -MODULE_DEVICE_TABLE(of, stfsm_match); - static struct platform_driver stfsm_driver = { .probe = stfsm_probe, .remove = stfsm_remove,