From patchwork Fri Jan 24 09:27:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 233000 Return-Path: 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 80661C35242 for ; Fri, 24 Jan 2020 11:15:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4995E214AF for ; Fri, 24 Jan 2020 11:15:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864531; bh=LulBTmAi/2rxwJpwT9kpq/dyMu0maR6zY2C7ZSGsSbQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QziC4LEttqQVY97jBKprpd8LYnXnm7mCK2p9ch0UMYApm7htGa/lu+pBOcxevCDH5 ty+4RSLRvxpgzqy+Od/Unwai0TDlTmwDbiv9r2QncohDzH7momUuD9IjT3b5T2eZdC HAGDMtFlYoIT9wQHIgH8YLmyFxcnvXT6+jniCoko= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390130AbgAXLO1 (ORCPT ); Fri, 24 Jan 2020 06:14:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:50852 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390138AbgAXLO0 (ORCPT ); Fri, 24 Jan 2020 06:14:26 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (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 477EE2467F; Fri, 24 Jan 2020 11:14:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864466; bh=LulBTmAi/2rxwJpwT9kpq/dyMu0maR6zY2C7ZSGsSbQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kCBXMytqdigdHstd7PM4Bvcc2U2UxuTbGHYOurJ8q4lt0kkV12JFZnEJCxflhWfCC pLsI4Mkyv0hTp87W/joLrr+fdmcWtHzO78iapmf9hqD95HMX7qhdlhtX03JD1sekbJ Ks1A4tOIuoMLsoeKb8vFR5OBSjQlPy7QmQ+HlPWk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chen-Yu Tsai , Maxime Ripard , Sasha Levin Subject: [PATCH 4.19 273/639] ARM: dts: sun8i: a33: Reintroduce default pinctrl muxing Date: Fri, 24 Jan 2020 10:27:23 +0100 Message-Id: <20200124093120.930243702@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Maxime Ripard [ Upstream commit fa44328f4eb0b762a1fcb148809068e9646e7156 ] Commit d02752149759 ("ARM: dts: sun8i-a23-a33: Move NAND controller device node to sort by address") moved the NAND controller node around, but dropped the default muxing in the process. Reintroduce it. Fixes: d02752149759 ("ARM: dts: sun8i-a23-a33: Move NAND controller device node to sort by address") Acked-by: Chen-Yu Tsai Signed-off-by: Maxime Ripard Signed-off-by: Sasha Levin --- arch/arm/boot/dts/sun8i-a23-a33.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi index a272a69519a26..1efad1a6bcfd9 100644 --- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi @@ -163,6 +163,8 @@ clock-names = "ahb", "mod"; resets = <&ccu RST_BUS_NAND>; reset-names = "ahb"; + pinctrl-names = "default"; + pinctrl-0 = <&nand_pins &nand_pins_cs0 &nand_pins_rb0>; status = "disabled"; #address-cells = <1>; #size-cells = <0>;