From patchwork Tue Nov 27 12:46:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 10700457 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5D6BB14D6 for ; Tue, 27 Nov 2018 13:11:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D6EF2B298 for ; Tue, 27 Nov 2018 13:11:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 41D902B2A4; Tue, 27 Nov 2018 13:11:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DD2D92B2AC for ; Tue, 27 Nov 2018 13:11:35 +0000 (UTC) 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=NcEcN0HwsIRH4Xq5SOIDgfj+Q8HUExo4WsklssL2Kd4=; b=UXljnBcgOvRRzG 8geO9zD7tzkOpqEyeR0OvQICJbJrKaGmGsNiGhOnPtObEzlgrrZ7Mik3UgFs92NwZ0/7s8YpoSBd/ C19jlFejydlwpCZpBP1/6NuWyztlrZjgtB8DjIR1fR7IqTMX3zlOETC/qKmOOzplNGNPSgSoWU8p3 LBwZIfWHxv4IT+y5BzdRAtn6KfjtO/WKeWIwQ0tuP8+VzkxULYbVy9bc5r+FdyUpIOFqpDqaccW2E 3RPGv/xSyp6iC/ErEqKun45BvbngacwEwUNZlGaNK50IDqIj+pKFPw25y+k4rntAG+CSvv1/9sC4g PC9KSHVpkuzXXnCoZmXA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gRd9D-000376-GJ; Tue, 27 Nov 2018 13:11:27 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gRd8z-0002nF-RC for linux-arm-kernel@bombadil.infradead.org; Tue, 27 Nov 2018 13:11:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=USSP9LJKHzDMwnrLf1atwG39JUGNWfZ9NJmzfBAqGhM=; b=uig5Z93pUkHvCd3uXzmrrjsLj6 7AlPcJFoOmuhz08e8td7ztrre2nAOj5OXxPrRHvwrO35hXka0GCNptx4AqN6A14aMVahC7rZJvoeG RHyZIUSGYxcAm2+dhyG4WWOwhiG+vnzN06OKJJbOViCaUA204sIOFwZGnTuwlvyYKpzFzT1hCtoOj w0kD13DjDnHGhePqV2Y7xD/2zC/jjSsaozfSuI7yQYyWj2nJkmrKzPIhz/APYhBhuUxSkvOnIL2+N ajIWcR2nkk+24/Tgjvn2kdJgfEJE8TB658Ali4MNcPjlM4wJhiGiURjL5ddmJojlEN6UTPpNhdLUP q96DS1/w==; Received: from mail.bootlin.com ([62.4.15.54]) by casper.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gRclu-000454-Bp for linux-arm-kernel@lists.infradead.org; Tue, 27 Nov 2018 12:47:26 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id 53CDB20DFB; Tue, 27 Nov 2018 13:47:10 +0100 (CET) Received: from localhost (aaubervilliers-681-1-94-205.w90-88.abo.wanadoo.fr [90.88.35.205]) by mail.bootlin.com (Postfix) with ESMTPSA id A25CF213F9; Tue, 27 Nov 2018 13:46:42 +0100 (CET) From: Maxime Ripard To: Chen-Yu Tsai , Maxime Ripard Subject: [PATCH 71/77] ARM: dts: sun8i: v3s: Provide default muxing for relevant controllers Date: Tue, 27 Nov 2018 13:46:12 +0100 Message-Id: <6c20c272b6fc4082f02edeb86ef99841031d225a.1543321707.git-series.maxime.ripard@bootlin.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181127_124722_519946_762349AA X-CRM114-Status: GOOD ( 15.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The MMC0 controllers have only one muxing option in the SoC. In such a case, we can just move the muxing into the DTSI, and remove it from the DTS. Signed-off-by: Maxime Ripard Acked-by: Chen-Yu Tsai --- arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts | 2 -- arch/arm/boot/dts/sun8i-v3s.dtsi | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts b/arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts index 333df90e8037..99c8cf7bb86c 100644 --- a/arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts +++ b/arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts @@ -78,8 +78,6 @@ }; &mmc0 { - pinctrl-0 = <&mmc0_pins>; - pinctrl-names = "default"; broken-cd; bus-width = <4>; vmmc-supply = <®_vcc3v3>; diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi b/arch/arm/boot/dts/sun8i-v3s.dtsi index 92fcb756a08a..21e1806ca509 100644 --- a/arch/arm/boot/dts/sun8i-v3s.dtsi +++ b/arch/arm/boot/dts/sun8i-v3s.dtsi @@ -192,6 +192,8 @@ resets = <&ccu RST_BUS_MMC0>; reset-names = "ahb"; interrupts = ; + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins>; status = "disabled"; #address-cells = <1>; #size-cells = <0>;