From patchwork Sun Oct 22 09:19:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Joonas_Kylm=C3=A4l=C3=A4?= X-Patchwork-Id: 829009 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lwEV5bRd"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yKYtp2hByz9sRV for ; Sun, 22 Oct 2017 20:21:22 +1100 (AEDT) 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=QtuCX+OULrQnQTLaaIwLbmfMEWt4hcerNde7s7LGsoI=; b=lwEV5bRd9iKmSi Wc2p1oHJitIAj65d4Qii5iwZPmheQwnwlVERe6hVsyLm1Fe9btfez+jL9a6wiRooVvM8ckOvpFL0b MKgKFFBLVzw9qab2OpwYKX0IY+JIGmCmR/klEKKu4Jr7aqZoWU+ajVN2YsZSlAqD2XmcAJB14I3BN dqrxqQQgoHxAhE/jH71IFHReBEgkPGV6Ua7L4/3g49MFq7lCpn5MtMyW/TwFmzAj1EDtugNh0E6SY uiulIce+VT6y1F7xG43tn195uBiqA/nqJNwtbe+OkC+7G7yXjU6XA2ONW5E2b18hGxTu2cs9c1bZS zvYwmK+X0x7DbXIq9XRw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e6CRW-0001HE-Qr; Sun, 22 Oct 2017 09:21:14 +0000 Received: from mail-lf0-f65.google.com ([209.85.215.65]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e6CR9-0000z1-As for linux-arm-kernel@lists.infradead.org; Sun, 22 Oct 2017 09:20:54 +0000 Received: by mail-lf0-f65.google.com with SMTP id p184so17064202lfe.12 for ; Sun, 22 Oct 2017 02:20:30 -0700 (PDT) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=3zMsdwnGz95yw/LghfMosnB3gudyRl4jkGjgJ8Ly05U=; b=Um5CE58gag29/MAWzzHZ6N+3iHr+qKWkZdcXGKklcDB7OOY1nLtrca1URosGeX0vH8 wE44+hvlT+OX4GssOk5bWsXUozjxYHCigYRNmBgtW4JBcnNaHz2og/vvqw3vFjWDJFP8 C7NtEveSu3ADLcCeAiklPh174RF6rhRwqOhwb390paA6pZceGuMjdxJ889cM7QVgIv9s Oyed1fCC0S6vspJa1j0nTWStBB5418nJQ8t00nQMtDn9c+Z6YCbpbFP+uhzMJ/LBvMEe uRarKJZuqk5Q4iV3pIqQUjWB6qZWLrDN4uDnOKT4fARPQ/4/ZJdmz/koBk9UvPCEDTMW BSOg== X-Gm-Message-State: AMCzsaUV0LPpGVfHVFxTOmMarIaKKik14/tt7isTbonba3CJM3rvdssu cWwInRGdpXXvFo21MY3qy1tYPOChbzY= X-Google-Smtp-Source: ABhQp+T9mhlVHygObwr8KFw5zBFAcb3BaaYFTU87De2IHUNl1GedV6sf2AcGRKGUdYDSTWnN6vkvQQ== X-Received: by 10.46.89.10 with SMTP id n10mr4154896ljb.149.1508664029034; Sun, 22 Oct 2017 02:20:29 -0700 (PDT) Received: from host.localdomain (87-100-187-130.bb.dnainternet.fi. [87.100.187.130]) by smtp.gmail.com with ESMTPSA id w9sm1135333ljw.49.2017.10.22.02.20.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Oct 2017 02:20:28 -0700 (PDT) From: =?utf-8?q?Joonas_Kylm=C3=A4l=C3=A4?= To: Maxime Ripard , Chen-Yu Tsai Subject: [PATCH 1/2] ARM: dts: sun8i: h3-h5: Move pinctrl of mmc0 from dts to dtsi Date: Sun, 22 Oct 2017 12:19:56 +0300 Message-Id: <20171022091957.24614-2-joonas.kylmala@iki.fi> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171022091957.24614-1-joonas.kylmala@iki.fi> References: <20171022091957.24614-1-joonas.kylmala@iki.fi> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171022_022051_559597_B4FF7DE7 X-CRM114-Status: GOOD ( 12.28 ) X-Spam-Score: -1.2 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.5 RCVD_IN_SORBS_SPAM RBL: SORBS: sender is a spam source [209.85.215.65 listed in dnsbl.sorbs.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.215.65 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (j.kylmala[at]gmail.com) 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.65 listed in wl.mailspike.net] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-sunxi@googlegroups.com, =?utf-8?q?Joonas_Kylm=C3=A4l=C3=A4?= , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Most of the boards use the mmc0 pins and their attributes defined in mmc0_pins_a and mmc0_cd_pin. Let's default to those by moving the pinctrl attributes to the dtsi file. This makes it easier to modify device trees in the future as there is only one place to change the pinctrl attributes. As a side effect this patch also adds the detect pin of Orange Pi Zero's mmc0 under pinctrl as it should have been there right from the beginning. Signed-off-by: Joonas Kylmälä --- arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 2 -- arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 2 -- arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 2 -- arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 2 -- arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 2 -- arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 2 -- arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 2 -- arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 2 -- arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 2 -- arch/arm/boot/dts/sunxi-h3-h5.dtsi | 2 ++ 10 files changed, 2 insertions(+), 18 deletions(-) diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts index b1502df7b509..7e6a93b49ffe 100644 --- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts @@ -103,8 +103,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */ diff --git a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts index e1dba9ffa94b..a6a55c7acbf9 100644 --- a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts +++ b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts @@ -118,8 +118,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */ diff --git a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts index 10da56e86ab8..37ca09154e56 100644 --- a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts +++ b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts @@ -115,8 +115,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */ diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts index 03ff6f8b93ff..6eea26e6f564 100644 --- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts +++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts @@ -75,8 +75,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */ diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi index 7646e331bd29..5357bf0500e5 100644 --- a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi +++ b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi @@ -97,8 +97,6 @@ bus-width = <4>; cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; cd-inverted; - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; status = "okay"; vmmc-supply = <®_vcc3v3>; }; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts index 1bf51802f5aa..c0e99a83105d 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts @@ -124,8 +124,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */ diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts index a70a1daf4e2c..a492947c27ee 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts @@ -106,8 +106,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */ diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts index a1c6ff6fd05d..de69fff45b48 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts @@ -98,8 +98,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */ diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts index ea4e0029c0d4..9c736cb0acc8 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts @@ -120,8 +120,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */ diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi index d7a71e726a9f..56e7975242c8 100644 --- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi +++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi @@ -103,6 +103,8 @@ mmc0: mmc@1c0f000 { /* compatible and clocks are in per SoC .dtsi file */ reg = <0x01c0f000 0x1000>; + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; resets = <&ccu RST_BUS_MMC0>; reset-names = "ahb"; interrupts = ; From patchwork Sun Oct 22 09:19:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Joonas_Kylm=C3=A4l=C3=A4?= X-Patchwork-Id: 829010 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="VBBc33xx"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yKYvd5k2Gz9sRV for ; Sun, 22 Oct 2017 20:22:05 +1100 (AEDT) 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=8eZn7wxwvnsUgfz/BL/9Zr+X0KMCIcMsefGwXYKbnX4=; b=VBBc33xxxkIsnO Mcy20eiefPSFbfInhNpQBeByRnvRUnnS0ck4y8y+IaiOelBYtpgTUDiSd/EHEA8f5Kg1AGeZaMz16 zYRNgcyu2BbO0SQ48eyHNQ30ldGp3+EDG+Vi9Ju0iA74eeIDqmswD0SEgo+ZYOr7XmmlZhE1dA6oO cL/fb3oj6C3UzIXcWOIpu6H1kW0rPQJz8Ph6+a/V7/0Npz/L8KPHxsj96vvvofI44MdL834ONeSm8 sCjc+qsqocEd5CPZio5GAr94b57wdFAEeqJ8E+PARlhVqfuQCdEKKYymrCqPpyDsWfQmEqstRanIu wKNkZiJ/IpdfaI/GY0KA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e6CSG-0001eh-D7; Sun, 22 Oct 2017 09:22:00 +0000 Received: from mail-lf0-f67.google.com ([209.85.215.67]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e6CR9-0000z2-SZ for linux-arm-kernel@lists.infradead.org; Sun, 22 Oct 2017 09:20:55 +0000 Received: by mail-lf0-f67.google.com with SMTP id a69so17103595lfe.5 for ; Sun, 22 Oct 2017 02:20:31 -0700 (PDT) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=rvwzvyvX9DnKx1dhoffX9WbseEMMmDtr9ESRKx4VViI=; b=h3qV6ZJaSUnZM2HBqwNgIVrHxMQMc73baNMGNpwfSTpRxtL0VOYxw43fqM5dyR4nxr ICm1bafpurmDdMKZIvCOF3t0EaDsLYWM2d0KmEk/hzYCf2E/MxUCoMMklD74Mfoe9DMl 86EIh89WQi1mvg57NUnqDcz1Q733GoUaVuM8abjUGTX4uhRG13RnCTwTzBNLJCJnDnkm 7fSRa1yVxAfQlAy4/XFc2/voufR4Jon2TkDj85dsnvDtdpuqSy/rC0Ni+xfgfgHu1V4d IBWSxaSbVVS+8k+hjlzjFBdygnImVNghZ1+TgCmYweGECitjybaJ5SceFsPSmVxPAl3b +ACA== X-Gm-Message-State: AMCzsaW+vmE5KHPlOhfJ6NrbEOaFmiwS8fFFAhxm3zNXQYe/VVipAKHv Zoumu68wv/143B/y250y5yk= X-Google-Smtp-Source: ABhQp+RMs1bgYPAYtYXKPgecyWzkGZU4LQ83Or9wec//imNGLmv18wXONCGEaEo/OhdFQj58b5nyCw== X-Received: by 10.46.75.25 with SMTP id y25mr4691699lja.141.1508664029874; Sun, 22 Oct 2017 02:20:29 -0700 (PDT) Received: from host.localdomain (87-100-187-130.bb.dnainternet.fi. [87.100.187.130]) by smtp.gmail.com with ESMTPSA id w9sm1135333ljw.49.2017.10.22.02.20.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Oct 2017 02:20:29 -0700 (PDT) From: =?utf-8?q?Joonas_Kylm=C3=A4l=C3=A4?= To: Maxime Ripard , Chen-Yu Tsai Subject: [PATCH 2/2] ARM: dts: sun8i: h3-h5: Move pinctrl of mmc1 from dts to dtsi Date: Sun, 22 Oct 2017 12:19:57 +0300 Message-Id: <20171022091957.24614-3-joonas.kylmala@iki.fi> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171022091957.24614-1-joonas.kylmala@iki.fi> References: <20171022091957.24614-1-joonas.kylmala@iki.fi> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171022_022052_104052_10021E96 X-CRM114-Status: GOOD ( 11.55 ) X-Spam-Score: -1.2 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.5 RCVD_IN_SORBS_SPAM RBL: SORBS: sender is a spam source [209.85.215.67 listed in dnsbl.sorbs.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (j.kylmala[at]gmail.com) 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.67 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.215.67 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-sunxi@googlegroups.com, =?utf-8?q?Joonas_Kylm=C3=A4l=C3=A4?= , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Most of the boards use the mmc1 pins and their attributes defined in mmc1_pins_a. Let's default to that by moving the pinctrl attributes to the dtsi file. This makes it easier to modify device trees in the future as there is only one place to change the pinctrl attributes. Signed-off-by: Joonas Kylmälä --- arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 2 -- arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 2 -- arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 2 -- arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 2 -- arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 2 -- arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 2 -- arch/arm/boot/dts/sunxi-h3-h5.dtsi | 2 ++ 7 files changed, 2 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts index 7e6a93b49ffe..49d18d5bc3e1 100644 --- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts @@ -111,8 +111,6 @@ }; &mmc1 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc1_pins_a>; vmmc-supply = <®_vcc_wifi>; mmc-pwrseq = <&wifi_pwrseq>; bus-width = <4>; diff --git a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts index a6a55c7acbf9..f0023995d14e 100644 --- a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts +++ b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts @@ -126,8 +126,6 @@ }; &mmc1 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc1_pins_a>; vmmc-supply = <®_vcc3v3>; vqmmc-supply = <®_vcc3v3>; mmc-pwrseq = <&wifi_pwrseq>; diff --git a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts index 37ca09154e56..de9e62bb46df 100644 --- a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts +++ b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts @@ -123,8 +123,6 @@ }; &mmc1 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc1_pins_a>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; non-removable; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts index c0e99a83105d..e0c353fa4a1c 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts @@ -132,8 +132,6 @@ }; &mmc1 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc1_pins_a>; vmmc-supply = <®_vcc3v3>; mmc-pwrseq = <&wifi_pwrseq>; bus-width = <4>; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts index a492947c27ee..00394d263d5a 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts @@ -114,8 +114,6 @@ }; &mmc1 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc1_pins_a>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; non-removable; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts index 8b93f5c781a7..babf4cf1b2f6 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts @@ -54,8 +54,6 @@ }; &mmc1 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc1_pins_a>; vmmc-supply = <®_vcc3v3>; bus-width = <4>; non-removable; diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi index 56e7975242c8..eee49a2615b3 100644 --- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi +++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi @@ -116,6 +116,8 @@ mmc1: mmc@1c10000 { /* compatible and clocks are in per SoC .dtsi file */ reg = <0x01c10000 0x1000>; + pinctrl-names = "default"; + pinctrl-0 = <&mmc1_pins_a>; resets = <&ccu RST_BUS_MMC1>; reset-names = "ahb"; interrupts = ;