From patchwork Mon Apr 27 07:31:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 11511341 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 30248912 for ; Mon, 27 Apr 2020 07:32:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0AB802051A for ; Mon, 27 Apr 2020 07:32:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="roB6Qe6a"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="GsD/E2b5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0AB802051A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=H4uRYgMzCOCVHD0nVBinjKJ5xBbYKLU4VlhNcYkWqbw=; b=roB6Qe6a08Wj6U eUo4G3N7tV7PSvVh8p92Yj1Q+NQzynrJnF5HnSIGqFjP3pWcUXSOSKw9Kswf0yg6CKrcJPp1VVXM4 ZTpppn4Guz7tevUqFsRqHHNKMHcy7cPqpwqjqu44+nQ1E75YmXSpqv+A+Euo6IIdmmNLc+zy5kQH8 Lr0FuKx1/UE4RoyEstN5aQTwfLZfxwzJr+oyn4hmrzH59cD15r5J+MF6jzJ/OYHaC+suyPHpGVFUI O//hqXZ25pgVvv3a9ZRS8AAE2iKlGLt2Srluv8YYPRJETIafzKiDS3oVvjbdOpXfJ3g3E1o/QOwiG vSqRn9/4dAmDFY5LCpQg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jSyFX-0008SS-Sa; Mon, 27 Apr 2020 07:32:19 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jSyEz-0007yX-Iu; Mon, 27 Apr 2020 07:31:46 +0000 Received: from wens.tw (mirror2.csie.ntu.edu.tw [140.112.30.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9563C2051A; Mon, 27 Apr 2020 07:31:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587972704; bh=EB/8lQ6+/XniFQ49WgaV6x0TkKREKExmreY0EeEVl70=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GsD/E2b5m33qFTMLKp7RyIht3sckCqUa+LfmwqRzzX99BAadGU5LlmnlU1UR4im0r 0Xvf2kwD7pIYc8aAEyYLWrtF/eFimXP4UA0aSupz+Tq+CPzT1zj9bHqd2OE7mL+qmu QGaMD5TMG/ahGFA2FbW7L4y5HjGV481B+XPjnM44= Received: by wens.tw (Postfix, from userid 1000) id 6F9F15FCE9; Mon, 27 Apr 2020 15:31:42 +0800 (CST) From: Chen-Yu Tsai To: Heiko Stuebner , Rob Herring , Jacek Anaszewski , Pavel Machek , Dan Murphy Subject: [PATCH v2 2/3] arm64: dts: rockchip: rk3399-roc-pc: Fix MMC numbering for LED triggers Date: Mon, 27 Apr 2020 15:31:31 +0800 Message-Id: <20200427073132.29997-3-wens@kernel.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200427073132.29997-1-wens@kernel.org> References: <20200427073132.29997-1-wens@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200427_003145_643386_E91DF854 X-CRM114-Status: GOOD ( 13.46 ) X-Spam-Score: -5.2 (-----) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-5.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [198.145.29.99 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Chen-Yu Tsai , linux-arm-kernel@lists.infradead.org, linux-leds@vger.kernel.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org From: Chen-Yu Tsai With SDIO now enabled, the numbering of the existing MMC host controllers gets incremented by 1, as the SDIO host is the first one. Increment the numbering of the MMC LED triggers to match. Fixes: cf3c5397835f ("arm64: dts: rockchip: Enable sdio0 and uart0 on rk3399-roc-pc-mezzanine") Signed-off-by: Chen-Yu Tsai --- arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts | 8 ++++++++ arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts index 2acb3d500fb9..f0686fc276be 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts @@ -38,6 +38,10 @@ vcc3v3_pcie: vcc3v3-pcie { }; }; +&diy_led { + linux,default-trigger = "mmc2"; +}; + &pcie_phy { status = "okay"; }; @@ -91,3 +95,7 @@ &uart0 { pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>; status = "okay"; }; + +&yellow_led { + linux,default-trigger = "mmc1"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi index 9f225e9c3d54..bc060ac7972d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi @@ -70,14 +70,14 @@ work-led { linux,default-trigger = "heartbeat"; }; - diy-led { + diy_led: diy-led { label = "red:diy"; gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; default-state = "off"; linux,default-trigger = "mmc1"; }; - yellow-led { + yellow_led: yellow-led { label = "yellow:yellow-led"; gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; default-state = "off";