From patchwork Thu Jan 23 10:31:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 313510 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2D35F2C0092 for ; Thu, 23 Jan 2014 22:03:47 +1100 (EST) Received: from merlin.infradead.org ([205.233.59.134]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6I3a-0008Nx-Vm; Thu, 23 Jan 2014 11:02:48 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6I2v-0004l6-ES; Thu, 23 Jan 2014 11:02:05 +0000 Received: from bombadil.infradead.org ([2001:1868:205::9]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6I2W-0004dX-DU for linux-mtd@merlin.infradead.org; Thu, 23 Jan 2014 11:01:40 +0000 Received: from mail-wi0-f178.google.com ([209.85.212.178]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6HbR-00081T-K0 for linux-mtd@lists.infradead.org; Thu, 23 Jan 2014 10:33:42 +0000 Received: by mail-wi0-f178.google.com with SMTP id cc10so1590757wib.11 for ; Thu, 23 Jan 2014 02:33:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HlBd171ZBBHarpdiT4EGcwidbW+V1e9BAVJ70PjVMto=; b=WnfYPY6GsdFiExtoLEPNluzyCIqkl8/zfwehSUmVZlhNgcNR4/92G0KYcs24HWfzuB OQSJmzzPSpxzAHuaI6YJp0I0YUYlFE1sK4IZy9VWFMamBozM9ZuJKd1m4qKyvPh7hrJ1 nkbZjr3gdHQfmusUpdcIpYi631I9uZVrJAMS2i6gKyM84+TlFobr8erclyWKyfD0Ettu zG9LK1kH7CZMb4GRUqICtjt85Kn0TSYt0SwdMG7WrbHtFjHjYk/oSfWGfAD3oc0HnS6p b4I+l9nO/w7ISFKQ2X3NxX1YqNvoR52q8l4noGyfAtgxemBnI90mFNNGlt8EodsxjvMM bskA== X-Gm-Message-State: ALoCoQkV4KzA5AdK3iSpMmsV8ar6vFfoG41zZjpG8xE8KO8nfajAimICKBHbUWaQm6foSnaz1gc9 X-Received: by 10.194.2.70 with SMTP id 6mr5985897wjs.25.1390473199285; Thu, 23 Jan 2014 02:33:19 -0800 (PST) Received: from localhost.localdomain ([80.76.198.141]) by mx.google.com with ESMTPSA id ay6sm21257831wjb.23.2014.01.23.02.33.16 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 Jan 2014 02:33:18 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH RESEND v4 37/37] ARM: STi: Add support for the FSM Serial Flash Controller Date: Thu, 23 Jan 2014 10:31:25 +0000 Message-Id: <1390473085-24626-38-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1390473085-24626-1-git-send-email-lee.jones@linaro.org> References: <1390473085-24626-1-git-send-email-lee.jones@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140123_023341_810006_2FDABC3A X-CRM114-Status: UNSURE ( 8.03 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.178 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record Cc: olivier.clergeaud@st.com, Angus.Clark@st.com, Lee Jones , linus.walleij@linaro.org, linux-mtd@lists.infradead.org, computersforpeace@gmail.com, dwmw2@infradead.org, DCG_UPD_stlinux_kernel@list.st.com X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Here we add the necessary device nodes required for successful device probing and Pinctrl setup for the FSM. Acked-by: Srinivas Kandagatla Signed-off-by: Lee Jones --- arch/arm/boot/dts/stih416-b2105.dts | 14 ++++++++++++++ arch/arm/boot/dts/stih416-pinctrl.dtsi | 12 ++++++++++++ 2 files changed, 26 insertions(+) diff --git a/arch/arm/boot/dts/stih416-b2105.dts b/arch/arm/boot/dts/stih416-b2105.dts index e518eb0..dd7ac88 100644 --- a/arch/arm/boot/dts/stih416-b2105.dts +++ b/arch/arm/boot/dts/stih416-b2105.dts @@ -33,6 +33,20 @@ status = "okay"; }; + /* FSM */ + spifsm: spifsm@fe902000{ + compatible = "st,spi-fsm"; + reg = <0xfe902000 0x1000>; + reg-names = "spi-fsm"; + pinctrl-0 = <&pinctrl_fsm>; + + st,syscfg = <&syscfg_rear>; + st,boot-device-reg = <0x958>; + st,boot-device-spi = <0x1a>; + + status = "okay"; + }; + leds { compatible = "gpio-leds"; fp_led { diff --git a/arch/arm/boot/dts/stih416-pinctrl.dtsi b/arch/arm/boot/dts/stih416-pinctrl.dtsi index 10bb4df..9a48710 100644 --- a/arch/arm/boot/dts/stih416-pinctrl.dtsi +++ b/arch/arm/boot/dts/stih416-pinctrl.dtsi @@ -235,6 +235,18 @@ }; }; + fsm { + pinctrl_fsm: fsm { + st,pins { + spi-fsm-clk = <&PIO12 2 OUT ALT1>; + spi-fsm-cs = <&PIO12 3 OUT ALT1>; + spi-fsm-mosi = <&PIO12 4 OUT ALT1>; + spi-fsm-miso = <&PIO12 5 IN ALT1>; + spi-fsm-hol = <&PIO12 6 OUT ALT1>; + spi-fsm-wp = <&PIO12 7 OUT ALT1>; + }; + }; + }; }; pin-controller-rear {