From patchwork Wed Jan 4 12:05:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 89822 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp8455407qgi; Wed, 4 Jan 2017 04:04:30 -0800 (PST) X-Received: by 10.99.146.76 with SMTP id s12mr123160968pgn.8.1483531470656; Wed, 04 Jan 2017 04:04:30 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f35si72299094plh.212.2017.01.04.04.04.30; Wed, 04 Jan 2017 04:04:30 -0800 (PST) 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 S967523AbdADMES (ORCPT + 25 others); Wed, 4 Jan 2017 07:04:18 -0500 Received: from mail-wj0-f172.google.com ([209.85.210.172]:33788 "EHLO mail-wj0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752106AbdADMEB (ORCPT ); Wed, 4 Jan 2017 07:04:01 -0500 Received: by mail-wj0-f172.google.com with SMTP id tq7so230437558wjb.0 for ; Wed, 04 Jan 2017 04:04:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=a6C3Xuj7AM4e/c6CtlnKgDvqFoK4d/lSQ5qcYs1K/VI=; b=GuVA3eT0/bHoDiTXUapKx465wC1SxG83+LszNXrr8ksk4PYGXT3g6qkY1CeMEYC+BC 206Luty9WZs/wbXrCyJQECULVJDLczn0+sN0bxIdftFlcRw0RpV+iCE3FfwCPh0oR/O2 2/iY+LRurDmoeEaRURLLZyz+ZjYuwxpmZPaWM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=a6C3Xuj7AM4e/c6CtlnKgDvqFoK4d/lSQ5qcYs1K/VI=; b=FD9YTrbuhrhuusdWVCcvSjQaeyMgwYRjG/8yRuUGtUrtIxpar64KR3L0bRZQsSVyfi F2ViagTeF5P4oyBvbAiFu/ePDl/YZWEjt5YFyaZDshGnLhwlIPTxbfgJuCddVE+siN7H uZ2FUQR13TwsiSvYy3G1XQmoXyQuhVdQoGu7WIQpls4pJkHW+TDUXzeiE9yLGyBllOo3 cVwbbA3Nob8TBI1I5yHoirhR2rOzb6Y2gDgqQg7FNGNJRX86D28MzKhcADDtmQBuj82S lS0/AoK23urKrQmYzych60RgD3SQ1InB1o+TcevbG0HszktDnAN7QMHhpjwLbsU+VOqS 3Fzw== X-Gm-Message-State: AIkVDXKVx7Dw3yCHyl54ih2uC+d56WJX3B7T5ojH3MCgOIK/4DUvDpB3Z6ZYpTkGA+UOBgke X-Received: by 10.194.43.132 with SMTP id w4mr767012wjl.181.1483531439532; Wed, 04 Jan 2017 04:03:59 -0800 (PST) Received: from localhost.localdomain (host81-129-169-215.range81-129.btcentralplus.com. [81.129.169.215]) by smtp.gmail.com with ESMTPSA id s20sm70857320wmb.9.2017.01.04.04.03.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Jan 2017 04:03:58 -0800 (PST) From: Lee Jones To: patrice.chotard@st.com, jassisinghbrar@gmail.com Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@stlinux.com, devicetree@vger.kernel.org, Lee Jones Subject: [PATCH] mailbox: sti: Fix mbox-names copy and paste error Date: Wed, 4 Jan 2017 12:05:27 +0000 Message-Id: <20170104120527.24806-1-lee.jones@linaro.org> X-Mailer: git-send-email 2.10.2 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Due to an over-sight, mbox-names has become mbox-name in some instances. Let's put it right. Signed-off-by: Lee Jones --- Documentation/devicetree/bindings/mailbox/sti-mailbox.txt | 4 ++-- arch/arm/boot/dts/stih407-family.dtsi | 8 ++++---- drivers/mailbox/mailbox-sti.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) -- 2.10.2 diff --git a/Documentation/devicetree/bindings/mailbox/sti-mailbox.txt b/Documentation/devicetree/bindings/mailbox/sti-mailbox.txt index 351f612..648d176 100644 --- a/Documentation/devicetree/bindings/mailbox/sti-mailbox.txt +++ b/Documentation/devicetree/bindings/mailbox/sti-mailbox.txt @@ -9,7 +9,7 @@ Controller Required properties: - compatible : Should be "st,stih407-mailbox" - reg : Offset and length of the device's register set -- mbox-name : Name of the mailbox +- mbox-names : Name of the mailbox - #mbox-cells: : Must be 2 <&phandle instance channel direction> phandle : Label name of controller @@ -26,7 +26,7 @@ mailbox0: mailbox@0 { reg = <0x08f00000 0x1000>; interrupts = ; #mbox-cells = <2>; - mbox-name = "a9"; + mbox-names = "a9"; }; Client diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi index c8b2944..00c67d4 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi @@ -787,7 +787,7 @@ reg = <0x8f00000 0x1000>; interrupts = ; #mbox-cells = <2>; - mbox-name = "a9"; + mbox-names = "a9"; status = "okay"; }; @@ -795,7 +795,7 @@ compatible = "st,stih407-mailbox"; reg = <0x8f01000 0x1000>; #mbox-cells = <2>; - mbox-name = "st231_gp_1"; + mbox-names = "st231_gp_1"; status = "okay"; }; @@ -803,7 +803,7 @@ compatible = "st,stih407-mailbox"; reg = <0x8f02000 0x1000>; #mbox-cells = <2>; - mbox-name = "st231_gp_0"; + mbox-names = "st231_gp_0"; status = "okay"; }; @@ -811,7 +811,7 @@ compatible = "st,stih407-mailbox"; reg = <0x8f03000 0x1000>; #mbox-cells = <2>; - mbox-name = "st231_audio_video"; + mbox-names = "st231_audio_video"; status = "okay"; }; diff --git a/drivers/mailbox/mailbox-sti.c b/drivers/mailbox/mailbox-sti.c index 41bcd33..e532a98 100644 --- a/drivers/mailbox/mailbox-sti.c +++ b/drivers/mailbox/mailbox-sti.c @@ -434,7 +434,7 @@ static int sti_mbox_probe(struct platform_device *pdev) if (IS_ERR(mdev->base)) return PTR_ERR(mdev->base); - ret = of_property_read_string(np, "mbox-name", &mdev->name); + ret = of_property_read_string(np, "mbox-names", &mdev->name); if (ret) mdev->name = np->full_name;