From patchwork Mon Jan 18 15:52:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12027577 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 8D66DC433E0 for ; Mon, 18 Jan 2021 15:54:20 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4643722B39 for ; Mon, 18 Jan 2021 15:54:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4643722B39 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id: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=2ltp+wttfhU3o6WQvXl9yMFzQjdu0n+saEmAR/ojctc=; b=JOZFq9ql3QPcXwCTZnZKa/aa3L XdjhuskZmXMzUbOqsGlsLfWkRWQ6f2druz2KINfsuPuCig8rn4nUGOUE7cnlKS+JZujREN1fiidI3 yv8I4nWRZTjKJrarkXMg8d+4yJH97dq46nByqFi2/FR3MbnuFe+qqdDHqMzB6xWbJDZTsSpt+1mJW X/Gndpvr0+aEY2vjlcH/zhsGFfqVgVmBQhEncyPi69ZRAC5SA/ZOPiVLnvUMlIChGXlzH3CIRn6Ww 303BPwfG/ypul6E6GWsRwva8alONafLVcTd8oXy3uDTYF9Vawz1HrWi68ocpgVR8ZJZGLXK3YmMsI 1TDyghlA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1Wpz-0008Kp-Tz; Mon, 18 Jan 2021 15:53:03 +0000 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1Wpq-0008Gv-Hn; Mon, 18 Jan 2021 15:52:55 +0000 Received: by mail-ej1-x62d.google.com with SMTP id ox12so47151ejb.2; Mon, 18 Jan 2021 07:52:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6NAvJviXVZqdWGL+2+dI4d8031tgmcjGj8ZKOUc0HB8=; b=rWYkNV5HGZ5dU9sQCsht4/cxGBzMDcOf1sp4XBycj3BiD6FU3KOV3sbPeEVjD75rWc /DNHtNSJB7eII5qvyYyabeXL3FcIz98InMwGyHBs9mhtpspEK//FQ0lEqO3aO3nJ/Awx zFcTa97JWMC7MqL18mI6Fuj59PdQAY5au1I4t3qnBnie10AV9iE8fKhEsC6WqY9efPQG DWo418IkDLmwUE/QEUuyBelqX2OvOcQfNzPmCIRBIB49BXG2LJ3cqC/a6H45NG91mVCy HXLIM9v+1pIoTVc04Q9gwsX8mOAPv60CBw6jyKWg+Wlp4G9ALl7yZgSdtDjAu/yIkm7r 5Q9A== 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; bh=6NAvJviXVZqdWGL+2+dI4d8031tgmcjGj8ZKOUc0HB8=; b=QshOOPkwHMSB64eUcmhv6wFH+DGt3KQgsxzsjbnPpmMYDU5S8W1hvtJ6sQXClZ/47e 7QMbtS6x2lyYCwaeE3Lw2MvCEjcYCkPmDtpmepkdieYj63ejj+l8vzIKHZgbSB/i0qgV uD4pbVS3QGPirbPWOHNApSV82eyXw/Ok1SJJjRCq9hWmDY0TlJl9U6ZyJUpFpBYTN4Pc TWelxfuSVo4tvKUHZBMIujO8SbiXwa/S8F7WArfJVYUxJbQCpQpU1BN3LKAiKgFwFaMN B4t/XUXjNnPNfW/mZu7qwtWYiStvJ7MHwoZg+jJX8F8u0lGQzhcyWRkhag0fFhh9b526 tvDg== X-Gm-Message-State: AOAM531pZ2nc47WLQxadPAtJK+TfJgsPYHRELzzGFAtSmuRPYT0KsCnO Y++IcrjekaMYWqHLpksRMOc= X-Google-Smtp-Source: ABdhPJzQXHpE4mBL3eBAs7p3pXkRjMXNWmwTKN+Fsv5dFw3ptmhIIaEeAmwQLKPO45KskZDycYJbJA== X-Received: by 2002:a17:906:ca08:: with SMTP id jt8mr220991ejb.368.1610985171523; Mon, 18 Jan 2021 07:52:51 -0800 (PST) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id f13sm9561694ejf.42.2021.01.18.07.52.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jan 2021 07:52:50 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH 2/5] ARM: dts: rockchip: assign a fixed index to mmc devices on rv1108 boards Date: Mon, 18 Jan 2021 16:52:39 +0100 Message-Id: <20210118155242.7172-2-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210118155242.7172-1-jbx6244@gmail.com> References: <20210118155242.7172-1-jbx6244@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210118_105254_624585_BDDDBF87 X-CRM114-Status: GOOD ( 12.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, robh+dt@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Recently introduced async probe on mmc devices can shuffle block IDs. Pin them to fixed values to ease booting in environments where UUIDs are not practical. Use newly introduced aliases for mmcblk devices from [1]. The sort order is based on reg address. [1] https://patchwork.kernel.org/patch/11747669/ Signed-off-by: Johan Jonker --- arch/arm/boot/dts/rv1108.dtsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/boot/dts/rv1108.dtsi b/arch/arm/boot/dts/rv1108.dtsi index bec47e0be..a754851f4 100644 --- a/arch/arm/boot/dts/rv1108.dtsi +++ b/arch/arm/boot/dts/rv1108.dtsi @@ -19,6 +19,9 @@ i2c1 = &i2c1; i2c2 = &i2c2; i2c3 = &i2c3; + mmc0 = &emmc; + mmc1 = &sdio; + mmc2 = &sdmmc; serial0 = &uart0; serial1 = &uart1; serial2 = &uart2;