From patchwork Thu Sep 8 09:11:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 75735 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp738026qgf; Thu, 8 Sep 2016 02:12:19 -0700 (PDT) X-Received: by 10.98.130.137 with SMTP id w131mr89862712pfd.5.1473325939415; Thu, 08 Sep 2016 02:12:19 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f4si32921353pfk.58.2016.09.08.02.12.19; Thu, 08 Sep 2016 02:12:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965242AbcIHJMG (ORCPT + 27 others); Thu, 8 Sep 2016 05:12:06 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:38426 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758705AbcIHJMD (ORCPT ); Thu, 8 Sep 2016 05:12:03 -0400 Received: by mail-wm0-f42.google.com with SMTP id 1so76501208wmz.1 for ; Thu, 08 Sep 2016 02:12:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vv0JMJGCciY3bHBghGqZVxaGllZuwGxJCyLy/exJA78=; b=Nc7ph1xECo2lip5T8SfkfPu5cyT9okWOfeq3/DZANAP7gihbdcAhHb2ZyQG2bzCpYt pBn5h9pGW9ZIlrWG6BBxkhKBLge7By8XzicyPey5bS+MQ3QoLAUNhhMdZtutA2b91Ha5 ovuNieDh+IrQuoqLo2bQxtTFwLKs4VXq+nLAE= 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=vv0JMJGCciY3bHBghGqZVxaGllZuwGxJCyLy/exJA78=; b=mCFAN9WPp6ZhCBnCF3nWf0DMs9bd4O2ozGOWZJ4v8D61phE62439E13tIpkcrNlTWV ZexmBjITutJJd29rUYimmudwdFljI/1shX9OmRzfBY1odsAYZbawVsfj/DZLXiqZ0ofZ r+MlZ+nJ44LuDGq+LwRC5ncl6UIjC8XWyaqIPU+UYllA8lfznDnV7DBzsdl7iNfCH6OS h+lO8aGRkzp4a8JEpA1S9wilU3K3/ZgEr/SMCrUowLAlRRWCAxpbDAW4ZiyGirTS0Rl3 MIicX2w0C6Z/lKVB3rUolLW0Cr/YzwHXuX7ak0O6bgChi1wyOiNB3/fO7plYwQbgdDWH LvjA== X-Gm-Message-State: AE9vXwNoyRcI5hA8dYW7weYIQlhPnDes1bMRFk1PLLEblme/WNi9mAwn0qVlE60sODa8n1zE X-Received: by 10.28.13.149 with SMTP id 143mr8262352wmn.113.1473325922094; Thu, 08 Sep 2016 02:12:02 -0700 (PDT) Received: from localhost.localdomain ([217.46.108.207]) by smtp.gmail.com with ESMTPSA id yj3sm27535005wjb.43.2016.09.08.02.12.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Sep 2016 02:12:01 -0700 (PDT) From: Lee Jones To: ulf.hansson@linaro.org, patrice.chotard@st.com, peter.griffin@linaro.org, robh@kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@stlinux.com, Lee Jones , stable@vger.kernel.org Subject: [PATCH 2/4] ARM: dts: STiH407-family: Provide interconnect clock for consumption in ST SDHCI Date: Thu, 8 Sep 2016 10:11:34 +0100 Message-Id: <20160908091136.17301-3-lee.jones@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160908091136.17301-1-lee.jones@linaro.org> References: <20160908091136.17301-1-lee.jones@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The STiH4{07,10} platform contains some interconnect clocks which are used by various IPs. If these clocks aren't handled correctly by ST's SDHCI driver MMC will break and the following output can be observed: [ 13.916949] mmc0: Timeout waiting for hardware interrupt. [ 13.922349] sdhci: =========== REGISTER DUMP (mmc0)=========== [ 13.928175] sdhci: Sys addr: 0x00000000 | Version: 0x00001002 [ 13.933999] sdhci: Blk size: 0x00007040 | Blk cnt: 0x00000001 [ 13.939825] sdhci: Argument: 0x00fffff0 | Trn mode: 0x00000013 [ 13.945650] sdhci: Present: 0x1fff0206 | Host ctl: 0x00000011 [ 13.951475] sdhci: Power: 0x0000000f | Blk gap: 0x00000080 [ 13.957300] sdhci: Wake-up: 0x00000000 | Clock: 0x00003f07 [ 13.963126] sdhci: Timeout: 0x00000004 | Int stat: 0x00000000 [ 13.968952] sdhci: Int enab: 0x02ff008b | Sig enab: 0x02ff008b [ 13.974777] sdhci: AC12 err: 0x00000000 | Slot int: 0x00000000 [ 13.980602] sdhci: Caps: 0x21ed3281 | Caps_1: 0x00000000 [ 13.986428] sdhci: Cmd: 0x0000063a | Max curr: 0x00000000 [ 13.992252] sdhci: Host ctl2: 0x00000000 [ 13.996166] sdhci: ADMA Err: 0x00000000 | ADMA Ptr: 0x7c048200 [ 14.001990] sdhci: =========================================== [ 14.009802] mmc0: Got data interrupt 0x02000000 even though no data operation was in progress. Cc: stable@vger.kernel.org Tested-by: Peter Griffin Signed-off-by: Lee Jones --- arch/arm/boot/dts/stih407-family.dtsi | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 2.9.3 diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi index 55ecfbe..744c5bc 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi @@ -550,8 +550,9 @@ interrupt-names = "mmcirq"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_mmc0>; - clock-names = "mmc"; - clocks = <&clk_s_c0_flexgen CLK_MMC_0>; + clock-names = "mmc", "icn"; + clocks = <&clk_s_c0_flexgen CLK_MMC_0>, + <&clk_s_c0_flexgen CLK_RX_ICN_HVA>; bus-width = <8>; }; @@ -564,8 +565,9 @@ interrupt-names = "mmcirq"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sd1>; - clock-names = "mmc"; - clocks = <&clk_s_c0_flexgen CLK_MMC_1>; + clock-names = "mmc", "icn"; + clocks = <&clk_s_c0_flexgen CLK_MMC_1>, + <&clk_s_c0_flexgen CLK_RX_ICN_HVA>; resets = <&softreset STIH407_MMC1_SOFTRESET>; bus-width = <4>; };