Message ID | 20200601174019.076908390@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <SRS0=Ycwd=7O=vger.kernel.org=stable-owner@kernel.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80F7FC433E0 for <stable@archiver.kernel.org>; Mon, 1 Jun 2020 18:57:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 531C6206C3 for <stable@archiver.kernel.org>; Mon, 1 Jun 2020 18:57:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591037834; bh=yYeTSMmM5FxusSZEIdctCarTpv7x8v6BuKfesZquWXk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gfxXaxykPdkUn55VVZEtNt5+IHCdb5XLkm2nVerqdWT/NKCewFGdsStC1Wo0ewh57 sId+BumoftWmXyyNPGcdajFuAeVGoJTlk+bIrVF5Rl3KFRYai1iVj5GjdzBbp+ekfQ E2CBEsVesOM8HCwR4BqmFTboBOyGSDPU01k1c76I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728811AbgFASAA (ORCPT <rfc822;stable@archiver.kernel.org>); Mon, 1 Jun 2020 14:00:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:42554 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729584AbgFAR77 (ORCPT <rfc822;stable@vger.kernel.org>); Mon, 1 Jun 2020 13:59:59 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 3BEE4206E2; Mon, 1 Jun 2020 17:59:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034398; bh=yYeTSMmM5FxusSZEIdctCarTpv7x8v6BuKfesZquWXk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jW0l8ftMFS+nu4E/z5msiF9IPnJpHCVpB7lIWcyZ+viDcl2XYVMLP2mRwxmCKRASs b6HyWQkKXS4CChQfepqL/FZODf+2jW5RG/+4ytERbXoVtHBLsHTIcxrEKJm4h3j0fh piPJDCWqhLrlU7yMey6ArNqCoS5u6m21iJP2Wvdc= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Johan Jonker <jbx6244@gmail.com>, Heiko Stuebner <heiko@sntech.de>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.14 14/77] ARM: dts: rockchip: fix pinctrl sub nodename for spi in rk322x.dtsi Date: Mon, 1 Jun 2020 19:53:19 +0200 Message-Id: <20200601174019.076908390@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174016.396817032@linuxfoundation.org> References: <20200601174016.396817032@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi index f59f7cc62be6..0c60dbc4b46a 100644 --- a/arch/arm/boot/dts/rk322x.dtsi +++ b/arch/arm/boot/dts/rk322x.dtsi @@ -950,7 +950,7 @@ }; }; - spi-0 { + spi0 { spi0_clk: spi0-clk { rockchip,pins = <0 9 RK_FUNC_2 &pcfg_pull_up>; }; @@ -968,7 +968,7 @@ }; }; - spi-1 { + spi1 { spi1_clk: spi1-clk { rockchip,pins = <0 23 RK_FUNC_2 &pcfg_pull_up>; };