From patchwork Thu Mar 20 09:21:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 26669 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F0827202E0 for ; Thu, 20 Mar 2014 09:22:36 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id eb12sf2402747oac.3 for ; Thu, 20 Mar 2014 02:22:36 -0700 (PDT) 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=CjJrj9k0LSes+kV77FwH4TvThwPjp1sL7sX6/iU2Wxg=; b=YIgLHD/ydl8RT2l1k5zh5eqQycR7diXgHOhBlrqb8UGx+ZkPrtMe7M5QFHBgWUfBgD +zJUoIQDhwTDLfNpk1qWYwGT5z9s6NPsXtY1A+lMv1ZdrS0znIJjTROOxfbpSKJCKxgb P9/psmjq1TOz1VaHaA7Z7+/Y0eMLcjdtsNxY0EtwH/MwOLM32OAQJJST47dj1n0DIuel 9DYRODSbt6dLNNVq6UdyqY3TmJxlV8AD4YzvG7bDEFUI5BFqft43Xn+GAj+Q7DM89Ral nipnG4O+/Oq2iuZsX9DlKmpZQoFAqHiUdhGSmpGOKCLtQo2vVEfVF+E/YqWyXq/+Dfwa oIdQ== X-Gm-Message-State: ALoCoQlMj+/WIYDrYxUsmmfXKdHTZf79umm1Fhfhz8GKgFe4BLDpih9rZjN+21ZWF/Kdos0jnyDK X-Received: by 10.43.158.9 with SMTP id ls9mr15726547icc.18.1395307356535; Thu, 20 Mar 2014 02:22:36 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.25.196 with SMTP id 62ls167123qgt.76.gmail; Thu, 20 Mar 2014 02:22:36 -0700 (PDT) X-Received: by 10.52.230.105 with SMTP id sx9mr28605047vdc.10.1395307356427; Thu, 20 Mar 2014 02:22:36 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id sv2si306746vdc.39.2014.03.20.02.22.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Mar 2014 02:22:36 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.171 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.171; Received: by mail-vc0-f171.google.com with SMTP id lg15so607029vcb.30 for ; Thu, 20 Mar 2014 02:22:36 -0700 (PDT) X-Received: by 10.220.191.134 with SMTP id dm6mr33817282vcb.16.1395307356326; Thu, 20 Mar 2014 02:22:36 -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.78.9 with SMTP id i9csp372603vck; Thu, 20 Mar 2014 02:22:35 -0700 (PDT) X-Received: by 10.180.106.167 with SMTP id gv7mr1785443wib.40.1395307355027; Thu, 20 Mar 2014 02:22:35 -0700 (PDT) Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by mx.google.com with ESMTPS id ee7si12095732wic.49.2014.03.20.02.22.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Mar 2014 02:22:35 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.175 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.175; Received: by mail-wi0-f175.google.com with SMTP id cc10so5973925wib.14 for ; Thu, 20 Mar 2014 02:22:34 -0700 (PDT) X-Received: by 10.181.13.11 with SMTP id eu11mr1760752wid.30.1395307354404; Thu, 20 Mar 2014 02:22:34 -0700 (PDT) Received: from lee--X1.home (host109-148-116-196.range109-148.btcentralplus.com. [109.148.116.196]) by mx.google.com with ESMTPSA id di9sm4735120wid.6.2014.03.20.02.22.32 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Mar 2014 02:22:33 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, computersforpeace@gmail.com Cc: linux-mtd@lists.infradead.org, dwmw2@infradead.org, Angus.Clark@st.com, Lee Jones Subject: [PATCH v6 36/36] ARM: STi: Add support for the FSM Serial Flash Controller Date: Thu, 20 Mar 2014 09:21:08 +0000 Message-Id: <1395307268-12721-37-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1395307268-12721-1-git-send-email-lee.jones@linaro.org> References: <1395307268-12721-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.171 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: , Here we add the necessary device nodes required for successful device probing and Pinctrl setup for the FSM. Acked-by: Srinivas Kandagatla Acked-by Angus Clark Signed-off-by: Lee Jones Acked-by: Brian Norris --- arch/arm/boot/dts/stih416-pinctrl.dtsi | 13 +++++++++++++ arch/arm/boot/dts/stih416.dtsi | 13 +++++++++++++ arch/arm/boot/dts/stih41x-b2020.dtsi | 1 + arch/arm/boot/dts/stih41x-b2020x.dtsi | 28 ++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+) create mode 100644 arch/arm/boot/dts/stih41x-b2020x.dtsi diff --git a/arch/arm/boot/dts/stih416-pinctrl.dtsi b/arch/arm/boot/dts/stih416-pinctrl.dtsi index b29ff4b..81df8e7 100644 --- a/arch/arm/boot/dts/stih416-pinctrl.dtsi +++ b/arch/arm/boot/dts/stih416-pinctrl.dtsi @@ -210,6 +210,19 @@ }; }; }; + + fsm { + pinctrl_fsm: fsm { + st,pins { + spi-fsm-clk = <&PIO12 2 ALT1 OUT>; + spi-fsm-cs = <&PIO12 3 ALT1 OUT>; + spi-fsm-mosi = <&PIO12 4 ALT1 OUT>; + spi-fsm-miso = <&PIO12 5 ALT1 IN>; + spi-fsm-hol = <&PIO12 6 ALT1 OUT>; + spi-fsm-wp = <&PIO12 7 ALT1 OUT>; + }; + }; + }; }; pin-controller-rear { diff --git a/arch/arm/boot/dts/stih416.dtsi b/arch/arm/boot/dts/stih416.dtsi index b7ab47b..1e24b9e 100644 --- a/arch/arm/boot/dts/stih416.dtsi +++ b/arch/arm/boot/dts/stih416.dtsi @@ -145,5 +145,18 @@ status = "disabled"; }; + + /* FSM */ + spifsm: spifsm@fe902000 { + compatible = "st,spi-fsm"; + reg = <0xfe902000 0x1000>; + pinctrl-0 = <&pinctrl_fsm>; + + st,syscfg = <&syscfg_rear>; + st,boot-device-reg = <0x958>; + st,boot-device-spi = <0x1a>; + + status = "disabled"; + }; }; }; diff --git a/arch/arm/boot/dts/stih41x-b2020.dtsi b/arch/arm/boot/dts/stih41x-b2020.dtsi index 0ef0a69..01487e0 100644 --- a/arch/arm/boot/dts/stih41x-b2020.dtsi +++ b/arch/arm/boot/dts/stih41x-b2020.dtsi @@ -6,6 +6,7 @@ * it under the terms of the GNU General Public License version 2 as * publishhed by the Free Software Foundation. */ +#include "stih41x-b2020x.dtsi" / { memory{ device_type = "memory"; diff --git a/arch/arm/boot/dts/stih41x-b2020x.dtsi b/arch/arm/boot/dts/stih41x-b2020x.dtsi new file mode 100644 index 0000000..d9af63d --- /dev/null +++ b/arch/arm/boot/dts/stih41x-b2020x.dtsi @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2013 STMicroelectronics (R&D) Limited. + * Author: Lee Jones + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * publishhed by the Free Software Foundation. + */ +/ { + soc { + spifsm: spifsm@fe902000 { + #address-cells = <1>; + #size-cells = <1>; + + status = "okay"; + + partition@0 { + label = "Serial Flash 1"; + reg = <0x00000000 0x00500000>; + }; + + partition@500000 { + label = "Serial Flash 2"; + reg = <0x00500000 0x00b00000>; + }; + }; + }; +};