From patchwork Mon Jan 18 15:52:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12027575 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 98A0BC433DB 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 57C7E22C7E for ; Mon, 18 Jan 2021 15:54:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 57C7E22C7E 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: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:In-Reply-To:References:List-Owner; bh=CXcJ7o7ZeHevl9MQNFqLkm51b4enoUq+F5VczDvO4AE=; b=sa346BVV7YLqkf08liKc6WaD8D yaCZfvVmRDEZu78HHXPZbeOgbDHu8DsdIZy9t/mMpWpIUWEkGF575OZfYQyLYgWlgLvyvDTTaXWc0 PlDsesQE3F/K+fPE8e+2bdMav4+6e9ho3iYB28Q8aWwXLjniEEzaOecuSlMWubOW+mKd9ByYs8TZ9 ttC3TQVwUGx2v2kMFcqiBxU9x+GJFvb2g/fDLyQXK+5xyaI04zsgHrHewecgTN5zyKsngx5uYzOF8 WboyP/0/wjTLWR+WOPY4UeSglTCAaMXGsuvztEbM/ukVZrK1sybyjECNrrnR5jo+Ub3jUHg5edH4J PAWFc7Zg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1Wpt-0008Ib-4L; Mon, 18 Jan 2021 15:52:57 +0000 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1Wpp-0008Go-GY; Mon, 18 Jan 2021 15:52:54 +0000 Received: by mail-ej1-x62a.google.com with SMTP id by1so17944079ejc.0; Mon, 18 Jan 2021 07:52:51 -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; bh=bpv56niFjct5w6LbQ/DkAciW7isXZ8qi5X4Zeb1XX6Y=; b=IpHuRpIFuVFujFy5t9HcQNNG/7HGMeq6IPbI118FOlbOKiCNMUiYo2EB6e6iYuNUc5 HCUQxQ+WRrk53KVYiL4yppa4qgCeXzBL8MGLTJxVGJjb4xfX7ltqH0amF6XFEoGwpWnr PGRHHG6nAyJVt2jaoetXvuouBCxixHdEgMDb0XsrGTIAxGXdRb1KCGzFGo8j782DB5nP 6Ze7+LnRqdpI9Jo2ffadmsFIgCMS6CfS5X7GYBqVJxCJEA5RohPA/Y2DFRHBTfAwLUol wara7zYTapg8myTlm3FvRskfjWAqxqaXH+RF25woqIl2fogZQIujkm+uEMDuWdAD6UAk sDUg== 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; bh=bpv56niFjct5w6LbQ/DkAciW7isXZ8qi5X4Zeb1XX6Y=; b=TPR7DKsF9B0iL+feT38I0R6fYUUUkHB63x3MMFXxHXMC2ZmGt1rnII33iXFCO27jX/ Yva4QJby9r/ReKxc/95I7RPdacGR2YGXsQxWbsXz4NXipqPG+WUsNR24dK2tiuTHno3w VglnWiYpVk+6G1QElN1RlTGSULmqzNIBKVJTGAkjyHBAd1qEk4jB3aBBHj7ZM4MNg7Wj M+Ik0C1fNzs/+VE5kRx6TpGwBT5bS7kQTAVi5RW0sOvlmr6yp5AozigN1yGMS13JVAF+ M5yea4BSxGapMs4Du2ka+uCJKtJo9XmDxohkOEl/qaryTAhg5t8/jHtIEc3YGsni3WnY CLJQ== X-Gm-Message-State: AOAM531g1uxA8H6whqMfZahfUJGdo2KuiAKh2CJ/E9qgkIpzqWFVHSB9 cqptVMr2xADZHGshmWGbMyEnVZ/2FBQ= X-Google-Smtp-Source: ABdhPJzCkES0uIah85lOrhLCxqlNpN6TfPMxHwPwGpmokPHpCfuVQ2ublkAr1ApqwXEQh+RWsmLlgA== X-Received: by 2002:a17:906:59a:: with SMTP id 26mr206706ejn.309.1610985170471; Mon, 18 Jan 2021 07:52:50 -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.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jan 2021 07:52:49 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH 1/5] ARM: dts: rockchip: assign a fixed index to mmc devices on rk322x boards Date: Mon, 18 Jan 2021 16:52:38 +0100 Message-Id: <20210118155242.7172-1-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210118_105253_558889_6E94AC55 X-CRM114-Status: GOOD ( 11.42 ) 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/rk322x.dtsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi index 9910f9b5c..f10c4d2fa 100644 --- a/arch/arm/boot/dts/rk322x.dtsi +++ b/arch/arm/boot/dts/rk322x.dtsi @@ -14,6 +14,9 @@ interrupt-parent = <&gic>; aliases { + mmc0 = &sdmmc; + mmc1 = &sdio; + mmc2 = &emmc; serial0 = &uart0; serial1 = &uart1; serial2 = &uart2; 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; From patchwork Mon Jan 18 15:52:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12027579 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 5F0E0C433DB for ; Mon, 18 Jan 2021 15:54:40 +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 1ACE921D46 for ; Mon, 18 Jan 2021 15:54:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1ACE921D46 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=omDeSZE1F0akh/7pTN0BNczi6BaOwHbx9JjgayYBjLI=; b=aoFt8mLM3/E3LLMZI9dG+ZmApj dM5HnY8SEmLTOv8SSrFhwST3a4xEZxQGqQpX8TbTYZLR6G2MMPN048aYbtKL9ihp65z0AZNhhNp+d XbeIh21x//0T+Bo3gd6GJO1EuHDM2gEB9AZ76ep9EgV53r6onAjgO0dSuUr/oViS52MOH3iyODmJa WUAihP6e6o1g3xuS5u5RvKAIshDZdXcl3O2Np+GnZamu/7q0CA9Vw6DAGVtg7e26aUeyVHyJiCD9l mH3s8KZ8+FUHKNeZsYRxNnbPLlnslxRlItOiO58rnJPndZhYbRvlae9JPk/UGz/wMP7XJ+qXv0qbu dIufDAkw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1Wq8-0008Mg-Nz; Mon, 18 Jan 2021 15:53:12 +0000 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1Wpr-0008Hg-PH; Mon, 18 Jan 2021 15:52:56 +0000 Received: by mail-ed1-x52d.google.com with SMTP id dj23so15534753edb.13; Mon, 18 Jan 2021 07:52:55 -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=VhphvaoMO0MSplwXzOX+UYmDiouvxFZXbU4yg9NjsGs=; b=Vouj50Rd8oFIgyNCzYWsOiRU+A9x8iFQkL81ktgnKTvoP68En66kpjJvjmRDt7qi5O BS7mKPJqYU81oEA94M8QnH37V8lvuJqL3MdJHaGCuFR8q78g6oTgIbRpSHtFAPCgOQr1 8UYvEn6RTPxSLaQg6z4aum7UZYSvco5dufgb3Osk/Bdr8gAbxoPVZadBJulKRFRqGYob 0M3BKZxyyaFV8MZE9my96BuDpCLF/UHQE9nECh/bkrbwf/4OPIkNvGfvYHT3Mk++jZ0U MSvtbFIwSndQHAgt36qJbAZ8C9lGnJzhWudTTImYTc4WuXKY5kdZiHtcaTQo2TMyNaGo sNOw== 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=VhphvaoMO0MSplwXzOX+UYmDiouvxFZXbU4yg9NjsGs=; b=DRC6z8cozNWVEvTHSpXrCFofbf5SCjwOad0bRqbC2ECu2Ne0mLvpgqAfviB3zZ0tGk U9ZDMfcsYG8PRWyQ7KyxU72UheUTxetvBbBUDGG8sphoo+zfMGOlVdEbPwNI38+Fx/nK AgK4dgnmfV8NJbX1Ah+mhnqB05ThjXJ08rI0NJyFwdK0GSjR82l7oh3WXHmJhtfwuXYq IzeevB9cRnE8WPS1ka2givHfJCgzkVs2SS3zuyQD4tO0xHg0W4Q3uXVyslctdaRm6TTU t8Gtgb4e7yrSxau4O+oDoRRuigUvI0w/bS8rPb60/Y3d0JnhKi1DlF/pLs7HeWonoS90 c8Mw== X-Gm-Message-State: AOAM532/zlMfqVGYG5/UbgAhwhYKFJQFsMGy0TXTeQtxLZwUNOWN8xCd PKijor2hE4uO/QqEf2syOX2CjrB/TpQ= X-Google-Smtp-Source: ABdhPJx4CXf+UBZO2cerSrewnW6s0+YyK4AbWXQlVAenRYhXiU3JbrruS9bNUM4ZC/xsqO88ibUlQw== X-Received: by 2002:aa7:cd4c:: with SMTP id v12mr85455edw.17.1610985174346; Mon, 18 Jan 2021 07:52:54 -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.51 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jan 2021 07:52:53 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH 3/5] arm64: dts: rockchip: assign a fixed index to mmc devices on px30 boards Date: Mon, 18 Jan 2021 16:52:40 +0100 Message-Id: <20210118155242.7172-3-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_105255_872671_E9105409 X-CRM114-Status: GOOD ( 12.42 ) 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/arm64/boot/dts/rockchip/px30.dtsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/px30.dtsi b/arch/arm64/boot/dts/rockchip/px30.dtsi index 1a73a5114..c49366cf4 100644 --- a/arch/arm64/boot/dts/rockchip/px30.dtsi +++ b/arch/arm64/boot/dts/rockchip/px30.dtsi @@ -25,6 +25,9 @@ i2c1 = &i2c1; i2c2 = &i2c2; i2c3 = &i2c3; + mmc0 = &sdmmc; + mmc1 = &sdio; + mmc2 = &emmc; serial0 = &uart0; serial1 = &uart1; serial2 = &uart2; From patchwork Mon Jan 18 15:52:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12027581 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 A11D0C433DB for ; Mon, 18 Jan 2021 15:54:46 +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 6598121D46 for ; Mon, 18 Jan 2021 15:54:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6598121D46 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=CgFaLcfYJIvdZNVUM/L+jCN3ZPV58siD9sfp+oVfmzk=; b=JxSKkcgsd1ASfPdQiKDIyJQJBn JH7f3KSRg4+kV/ccdOuU/bb1SCszyG+QPdMIennqEdbb+nw0VO26BVYItvBpu4nqJUR34FOFDLXLD hulKgm3Oukb6axln7ffonmHp/eVZPX+R3eW4ggPHvjOyN6zXZcitfVSj+nVd4/09IVRa1Cig5G7Ae ikJshpq3Zn/hm5HY9ntR34nw1nNCaXXnqcWgZTg94SKqbvHwwNihI9H8AxG/vKvSjqL83OlqfEzA7 KQv1xq1GUhjMBeht7z62TuQi0hSAoc3PFqqsMFORxbbRzHxahRggiQrtXmUdOlfTbkcrM+goTxOua /yyaAtGA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1WqK-0008Pk-Pc; Mon, 18 Jan 2021 15:53:24 +0000 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1Wpt-0008Ic-U2; Mon, 18 Jan 2021 15:52:59 +0000 Received: by mail-ej1-x62f.google.com with SMTP id a10so7713945ejg.10; Mon, 18 Jan 2021 07:52:57 -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=1X+r3rIHhYyL6aQz5bVp1gC9k/hbSfHY26WTukrVjhI=; b=AoOuDk/mePLd9aT+57VoNa2cx6wInQE6sPmyZWxAx3/YABARdyO8R1uMuv5dkVo6Y+ AYNWfgC3W76LoMtCbG6LWoWX9pUXYvZ8Zl5wiXpJWnMua+VFbbiKKCEsDr8aD6wYoNHw NBLiMRCh01XbA/qFE9AtMz0FgURlVrNjg8cfkfRZYRPGBuVmBx1ZZ1er7Wa6Ox+4arux jDlAg0g7SDyt1D6raDXA3+bKwbDVSfdGhpI+NoYzQ4MI5CN+d9kuJVRxX+CNhn9pokig /hNaRX10ZAoKsuM6sZfaWExtISTPkS2cczFeLJxXsqsZOB9X+sPura6wWwfkZ4A7mP9H /CFQ== 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=1X+r3rIHhYyL6aQz5bVp1gC9k/hbSfHY26WTukrVjhI=; b=Y8cbYOaU34f+fIzAZVV9CTIR6u4OmkRRMT7C5p8KgJDGmtkcXhrJTudo9TWq8e2ZWm QY/pKIqVdwHw5VD0/+TOX/wz58kZ10uThxSwJY2Qr1n1lbd04/ihPJMr6aP89I13ZLAX nyY+h9rsrdEYSLWZ96YwO+fAHXAME9uh3fxtEupZBWr2szihpHfkS0Y3XVKW9N67KLyw 5VI5jVLRQkLJ5c4Y1iFSMGaKV6ugjTNgS/Jzfy07aZjGQ6XKqQY0Y6NPzrBP/6Lqt5Ue Aplt3ANSZApsijYBo+owVfRtTa27t6miF2gl8rqlVT2fCk/pzCbcZEeBMZS4UPnBGvvi hmRw== X-Gm-Message-State: AOAM533M0uOREVP6CCFrKqXSPWA2eexfuM3abO5GnfhEpEpdtwiB+/mP 5WQt3V5yXRjWxfkWMJp23CPWe4fyqoU= X-Google-Smtp-Source: ABdhPJwEe8+OJdHJZhzDww9IlyIFg3M01x6qLnE+hU9+1Dy3bIe7FkeQFyMzYgPif0U0xPwsHfucnQ== X-Received: by 2002:a17:907:3e02:: with SMTP id hp2mr197147ejc.411.1610985176362; Mon, 18 Jan 2021 07:52:56 -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.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jan 2021 07:52:54 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH 4/5] arm64: dts: rockchip: assign a fixed index to mmc devices on rk3308 boards Date: Mon, 18 Jan 2021 16:52:41 +0100 Message-Id: <20210118155242.7172-4-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_105258_003659_00AFB949 X-CRM114-Status: GOOD ( 12.42 ) 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/arm64/boot/dts/rockchip/rk3308.dtsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi index ad54acf5d..b360b059f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi @@ -24,6 +24,9 @@ i2c1 = &i2c1; i2c2 = &i2c2; i2c3 = &i2c3; + mmc0 = &sdmmc; + mmc1 = &emmc; + mmc2 = &sdio; serial0 = &uart0; serial1 = &uart1; serial2 = &uart2; From patchwork Mon Jan 18 15:52:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12027583 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 496E7C433DB for ; Mon, 18 Jan 2021 15:54:49 +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 10B4C21D46 for ; Mon, 18 Jan 2021 15:54:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 10B4C21D46 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=KwLve+wioVKFTpKuNs+CIg1AJ0VGCT3okag9wp981AA=; b=BE+9tqmABEfo+eDVvtFzx2NGXl DlKF8iDAg0GRU58bc/6Lc0terqooyJrEzk3CQk1EllZj/K1HyevpScS6+LPw9CELa3id7fkEOmI9t WQ6911JKwKNNNszkOcqjMEkprZ+x0TyRHGnXeYxXCfHUrHhBSPi3ta+W352JkKropuG+AxrL8VFtc rXqforhLyvLXe7sCwPCHRQBURPBiOCVbyNR9D1JV1evi9xyf+dqfpyG5RQCK/jbGIWnXgvKf8LWv6 Ci831IH7Z+wUGKvF3zLttHCXmqShYloIYBBx4sLyYT4n4WQr6jArG7dp1M0VSzmVJ1dwwY0bZLE73 7J5H/VZA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1WqT-0008TP-1Q; Mon, 18 Jan 2021 15:53:33 +0000 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1Wpx-0008Jo-Az; Mon, 18 Jan 2021 15:53:03 +0000 Received: by mail-ej1-x629.google.com with SMTP id g3so4957291ejb.6; Mon, 18 Jan 2021 07:53:00 -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=kpb7JcnZpNDj5y9zvo53/o01BgnayqHJFM7Z2whUwSY=; b=ho3KVEAACbgNJgVVB0IakErAZc0DXTvi79Cxq2MPxl8e0A0VkVPQJPDxNYVOTbl/1e +gqbzCh0oFFxGp/ImKv69R+L74HvLkzx5mHurEf4W/JshBdcyJZ2vIsLYVyXwyA2vPoX Bra3qOtsJEwLpy7j+1ccVwElfYB362xbhINdCJ2wb/A9HB21MLOH70rOWwq4cTVVECaK fjkAGe3Rw4mWcavDcArReCA8agJ7pvy62MAkE8yjxlfsoY1anSw32Beq5bqpGVpGQYVT puJfp6UG2JyctATvP8y7ij1InfqMUWbFws84BDWYJ3wxAm9JM7sed6KB0rpexXe53zFi qmXA== 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=kpb7JcnZpNDj5y9zvo53/o01BgnayqHJFM7Z2whUwSY=; b=Ffkag2PNXCO7LpivT2DV5BxpKVB1kMTeRG3zA7qKyVP7QsFhQesZQxqJ2jHuf72NfM qTX/f6U1fiTDA4LWjtPpg7fEp9UDjpjEafvXoODU2QImXGFj/uYQdDycVlwPaxkQkmUE mv+dQk05cQHmrOyhYAPX00r66ou44jqPDVVdacf5/RdHd3wCWtdfP6jwXyw3ZlXZ7dsF n9/22vpQnickpJKf+NB1QzTCNBN00S9gT5BnifC7rkSznqb0Ih42TNa1ACARWbBsZl6y 0XmAabwwWJ4RveLwTu29xWLM/ceZ+QCZDiDrkOLvU8H8NZpjqOK/42Y3ouBfS4kxKR94 r/xA== X-Gm-Message-State: AOAM533QLmkxZkyh2hygZ9R9jCOXMATIMJUKNMboUWJ2T3nVvJzHoPrp FCtL5L4E3eSGMpFEprJhTmc= X-Google-Smtp-Source: ABdhPJwG5lsKwya6yX/0XdsfQ+c8vOnv1SnLgugw8ymqhik/gq9wQJUTuib7KzpGEkYuGoWxU47ykA== X-Received: by 2002:a17:906:4003:: with SMTP id v3mr252682ejj.82.1610985179834; Mon, 18 Jan 2021 07:52:59 -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.56 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jan 2021 07:52:57 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH 5/5] arm64: dts: rockchip: assign a fixed index to mmc devices on rk3368 boards Date: Mon, 18 Jan 2021 16:52:42 +0100 Message-Id: <20210118155242.7172-5-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_105301_436939_65500A3A X-CRM114-Status: GOOD ( 12.42 ) 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/arm64/boot/dts/rockchip/rk3368.dtsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi index cd8274a35..b00ed0e74 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi @@ -25,6 +25,9 @@ i2c3 = &i2c3; i2c4 = &i2c4; i2c5 = &i2c5; + mmc0 = &sdmmc; + mmc1 = &sdio0; + mmc2 = &emmc; serial0 = &uart0; serial1 = &uart1; serial2 = &uart2;