Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp33103pxf; Wed, 24 Mar 2021 20:02:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwOKFm1wIr+WAjgZZ9t0DZT2+h+OwTn7pIi8qxInwzXVIuy40bj2kCzaKqZTePrZG90WX9S X-Received: by 2002:a17:906:f953:: with SMTP id ld19mr6742138ejb.164.1616641350442; Wed, 24 Mar 2021 20:02:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616641350; cv=none; d=google.com; s=arc-20160816; b=b2upI1yd+Px2b6uqGlQFurkBGKhoMoHI0yoPSWLVXADXX5NjabprzKkl8seqHduY2X EGgjUX9OjinmhXszOP4MBmVYtF1A8LzAzwaaGD27BAgCo1X1X5JKO5QaEaz6ezGE80yc yCt1QGJpzBVBn7iHno1sjK2NBxoizgu+CZ6xR1JTIC1Zw392ixZ6yeNXYkVRcXOtc7zA Ov2m1G4pedohnwnxueUoJhSyxUaV3EuPvz/TktOpi5RQvodUnskxr8X8mCCHEOAYZ98N ZwJmdUZW6OQi6MMkRBX8JwZcoAOyttbUK00vlVm/9wtGJfzxSe5CyUj7vcOA3TNBfQgR jGOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=pQKmPH0d4VcjWXL5Rzk6W+6If2f039flwOJa4wK/QlE=; b=ArNdhM0GG2pBnekeYzIcESfc7dRmiHIAD6+BN5sTid5H/sweHQ+eGWXPkApbK278OO fQoEc44hPmHJfeEY+lSHODK04zblz2NiYUqTz31YRVphT4dI79P75+92tefX9P9IBySl P23Br+Fs7Ez1RQ+h6j9CPrTEm5MN1f00R1JWCttwKi673do9noABqWV9Trz3YR2ffc/1 AI3f4Wz3jXn7glBttJv4zhfV26negQbI/KdwZUbPsmw39K6S+a0LM2xL1GsGsg2OOSS1 AxnmPuNYrdgPCV/Bvt+niGC7j298UUsHj0Rl9JV5/8iNdClCDmmf4JUvw/JcOd2c7WDH HHTw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id pk25si3294194ejb.402.2021.03.24.20.02.07; Wed, 24 Mar 2021 20:02:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233339AbhCXMXW (ORCPT + 99 others); Wed, 24 Mar 2021 08:23:22 -0400 Received: from gloria.sntech.de ([185.11.138.130]:33796 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230510AbhCXMWm (ORCPT ); Wed, 24 Mar 2021 08:22:42 -0400 Received: from [95.90.166.74] (helo=phil.lan) by gloria.sntech.de with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lP2X0-00009P-Qr; Wed, 24 Mar 2021 13:22:38 +0100 From: Heiko Stuebner To: heiko@sntech.de Cc: jagan@amarulasolutions.com, jbx6244@gmail.com, robin.murphy@arm.com, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, arnd@kernel.org, Heiko Stuebner Subject: [PATCH 1/7] ARM: dts: rockchip: move rk322x mmcx aliases to board dts files Date: Wed, 24 Mar 2021 13:22:29 +0100 Message-Id: <20210324122235.1059292-1-heiko@sntech.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Heiko Stuebner As suggested by Arnd Bergmann, mmc-aliases are supposed to be board-specific, so move the newly added general aliases to the board-level on rk322x-based boards. Suggested-by: Arnd Bergmann Signed-off-by: Heiko Stuebner --- arch/arm/boot/dts/rk3228-evb.dts | 4 ++++ arch/arm/boot/dts/rk3229-evb.dts | 4 ++++ arch/arm/boot/dts/rk3229-xms6.dts | 6 ++++++ arch/arm/boot/dts/rk322x.dtsi | 3 --- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/rk3228-evb.dts b/arch/arm/boot/dts/rk3228-evb.dts index aed879db6c15..69a5e239ed1a 100644 --- a/arch/arm/boot/dts/rk3228-evb.dts +++ b/arch/arm/boot/dts/rk3228-evb.dts @@ -8,6 +8,10 @@ / { model = "Rockchip RK3228 Evaluation board"; compatible = "rockchip,rk3228-evb", "rockchip,rk3228"; + aliases { + mmc0 = &emmc; + }; + memory@60000000 { device_type = "memory"; reg = <0x60000000 0x40000000>; diff --git a/arch/arm/boot/dts/rk3229-evb.dts b/arch/arm/boot/dts/rk3229-evb.dts index 350497a3ca86..797476e8bef1 100644 --- a/arch/arm/boot/dts/rk3229-evb.dts +++ b/arch/arm/boot/dts/rk3229-evb.dts @@ -9,6 +9,10 @@ / { model = "Rockchip RK3229 Evaluation board"; compatible = "rockchip,rk3229-evb", "rockchip,rk3229"; + aliases { + mmc0 = &emmc; + }; + memory@60000000 { device_type = "memory"; reg = <0x60000000 0x40000000>; diff --git a/arch/arm/boot/dts/rk3229-xms6.dts b/arch/arm/boot/dts/rk3229-xms6.dts index 263393ac4fa6..7bfbfd11fb55 100644 --- a/arch/arm/boot/dts/rk3229-xms6.dts +++ b/arch/arm/boot/dts/rk3229-xms6.dts @@ -9,6 +9,12 @@ / { model = "Mecer Xtreme Mini S6"; compatible = "mecer,xms6", "rockchip,rk3229"; + aliases { + mmc0 = &sdmmc; + mmc1 = &sdio; + mmc2 = &emmc; + }; + memory@60000000 { device_type = "memory"; reg = <0x60000000 0x40000000>; diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi index a4dd50aaf3fc..4d003afd0e3e 100644 --- a/arch/arm/boot/dts/rk322x.dtsi +++ b/arch/arm/boot/dts/rk322x.dtsi @@ -14,9 +14,6 @@ / { interrupt-parent = <&gic>; aliases { - mmc0 = &sdmmc; - mmc1 = &sdio; - mmc2 = &emmc; serial0 = &uart0; serial1 = &uart1; serial2 = &uart2; -- 2.29.2