From patchwork Thu Jan 26 10:38:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrik Grimler X-Patchwork-Id: 13116869 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6AEA4C54E94 for ; Thu, 26 Jan 2023 10:42:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=222GFR22shjMVx+nPVHlT/1/agJNQrRCSh15KU+Ce0Y=; b=sb8E5TPodkiaf/ ZiZUtyPTBE1UWH8+bCugdXRcAF7wLJlML6OLJQ6rFiBS8H0Ntdpvd7nlL8MPJ8M0M0e/Bo4dbxAfL G9BvNRhZy3yzWT6d8dW2zpqERLPZ+ird+DVatfrtaj4bVDZZ/TZ9XD8QG6OZbBmFu7ZTI4KZB9Fae hCDwOLGAE6NxY7/P2mgv56WEEQUeOZ8d2U9VtPXo7E9YNWfwTIWLdKhuKH5CxA2ecK8Or3yrc/Eht 4sE64LaqWknlTOqKAPOXe96/sSHhA5nfBF8jx9RVk1uL7JftoL+YlhKEDmg/vCd1skHUJwpyzfaS5 GuPyXlv9Me3bJquw6ETA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKzgv-00AVlX-K6; Thu, 26 Jan 2023 10:41:14 +0000 Received: from out0.migadu.com ([2001:41d0:2:267::]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKzfj-00AVNF-Jp for linux-arm-kernel@lists.infradead.org; Thu, 26 Jan 2023 10:40:04 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=grimler.se; s=key1; t=1674729595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mDsZ7CmuBAkMxigCyOthMYIyyRStE/Y8QZvA7AhNAkU=; b=WFcuya1+mDxRpeah511R76HAjFL/HuIKpM/bgRXd9ebbmeD4Zyh6xPLJ5TMyOKtaZz2fvZ h1i5jZa5Qi2bGShoktvQuTyKry4k89aYMgYjmiRZjQZiEEl26Z+BjARW6I8tCx6pgFvEfr HgSCJcvkzhFeyUZ13d/Y368CQbYDbkw= From: Henrik Grimler To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, alim.akhtar@samsung.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht Cc: Henrik Grimler Subject: [PATCH 1/6] ARM: dts: exynos: add mmc aliases for Exynos3250 Date: Thu, 26 Jan 2023 11:38:23 +0100 Message-Id: <20230126103828.481441-2-henrik@grimler.se> In-Reply-To: <20230126103828.481441-1-henrik@grimler.se> References: <20230126103828.481441-1-henrik@grimler.se> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230126_023959_885211_87753A5B X-CRM114-Status: GOOD ( 10.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org So that mmcblk numbering is fixed for the eMMC and sdcard, no matter if a storage device is attached or not. Also remove old, no longer used, mshc alias while we are at it. Signed-off-by: Henrik Grimler --- arch/arm/boot/dts/exynos3250.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi index 54bb323186e4..119fbe4208cd 100644 --- a/arch/arm/boot/dts/exynos3250.dtsi +++ b/arch/arm/boot/dts/exynos3250.dtsi @@ -28,9 +28,9 @@ / { aliases { pinctrl0 = &pinctrl_0; pinctrl1 = &pinctrl_1; - mshc0 = &mshc_0; - mshc1 = &mshc_1; - mshc2 = &mshc_2; + mmc0 = &mshc_0; + mmc1 = &mshc_1; + mmc2 = &mshc_2; spi0 = &spi_0; spi1 = &spi_1; i2c0 = &i2c_0; From patchwork Thu Jan 26 10:38:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrik Grimler X-Patchwork-Id: 13116868 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7247AC54E94 for ; Thu, 26 Jan 2023 10:41:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=sDFnhMQjW4ed0bZCj5hJqKWodeqXN2Qv+3gF5IJx+sM=; b=upVW2evuJje+FE PdqKTfxVMBlyqSc/lEuSK4VYZ1gIQEHGGLndVsKEXasToJG/y2yVn2WL7LM0g0B1tdKwfG8HUD3Io 7lKNrSQvCgw/BBLDm3CAxvjKOUS4/fKlFBNivEivn1J/9Dir+ErvX0M15PG/l1IPh1BpDcPJI9J/T 9l2HZNwYpCLv7XrEucgH7KnpLfTCuoRyObqZGWcLQ+xTglUpyhJNT37uBm7L8grCkFAJZwzJC4DoI WobpvJ+JBFhtQUp+pa9ntkphNLtOD940guVJ9OaHnKpiTgvj79IaOitxd/0yske+tLrcckr5LK34t gPNnQ1Pz63vSMg20tzlA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKzgf-00AVgG-35; Thu, 26 Jan 2023 10:40:57 +0000 Received: from out0.migadu.com ([2001:41d0:2:267::]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKzfj-00AVNk-Jq for linux-arm-kernel@lists.infradead.org; Thu, 26 Jan 2023 10:40:02 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=grimler.se; s=key1; t=1674729597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dGGbMK+Aa92T10Lg4IqZHWu06h+GE9mEep+IJk+dkKA=; b=k4X/C0qU0iTicPPJJh8eiwk4D0yAM4mjUy8dmC1XF2UYKa0G7I+MHtclUP2cuKNOXhp+7Z TJsURaqGBKQrpLH8Pgj187TpxQzCUnOgvsvZLjSznmSTeY5X6Z0LEe1DBqEzhxZ280Plbz agQoS9YmIeyLoXrI3rByxBZL0ZU5syA= From: Henrik Grimler To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, alim.akhtar@samsung.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht Cc: Henrik Grimler Subject: [PATCH 2/6] ARM: dts: exynos: add mmc aliases for Exynos4210 Date: Thu, 26 Jan 2023 11:38:24 +0100 Message-Id: <20230126103828.481441-3-henrik@grimler.se> In-Reply-To: <20230126103828.481441-1-henrik@grimler.se> References: <20230126103828.481441-1-henrik@grimler.se> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230126_023959_836298_68100B63 X-CRM114-Status: UNSURE ( 8.99 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org So that mmcblk numbering is fixed for the eMMC and sdcard, no matter if a storage device is attached or not. Signed-off-by: Henrik Grimler --- arch/arm/boot/dts/exynos4210.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi index 267eff6c97d6..403c28c120f9 100644 --- a/arch/arm/boot/dts/exynos4210.dtsi +++ b/arch/arm/boot/dts/exynos4210.dtsi @@ -23,6 +23,10 @@ / { compatible = "samsung,exynos4210", "samsung,exynos4"; aliases { + mmc0 = &sdhci_0; + mmc1 = &sdhci_1; + mmc2 = &sdhci_2; + mmc3 = &sdhci_3; pinctrl0 = &pinctrl_0; pinctrl1 = &pinctrl_1; pinctrl2 = &pinctrl_2; From patchwork Thu Jan 26 10:38:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrik Grimler X-Patchwork-Id: 13116870 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CEFBBC05027 for ; Thu, 26 Jan 2023 10:42:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8GoDXlOY5Dhnh0BCLk0Mri81yiiNJdoMHyHS/DtIyTI=; b=MOmGrLkhf58elD hx2IXy5Q9NGiXtaBNPoW/bgsQgsjE7CqJ909J77B5j9dqm8D7gg3McB0fkx9/Y2/CSY/dcrvrDk9/ LcV3lqQuMAjOPqyJYN75k43vs318pTApQcbbYwIQMR8om9rOw/LcCW7R4z3jqF5iShVC735QlNt/h RRzyb15QaJsrqTKc5jrzGW3EzqxkNybuGk5j/j6rG5ZF3AhNYC9hhcdVo0fIgFFhRZyUo8ejTVDtk 7AvY1tf/a+uMHXGn+YrFTjnlgOneaOg5zvolxAwkaZo4XeAFZf8IrwwC81x2SpskecE5Rc5CRd4u8 jZqJ+0e4dW4M3wfDNk4w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKzhE-00AVtm-9L; Thu, 26 Jan 2023 10:41:32 +0000 Received: from out0.migadu.com ([94.23.1.103]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKzfm-00AVPH-Fd for linux-arm-kernel@lists.infradead.org; Thu, 26 Jan 2023 10:40:04 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=grimler.se; s=key1; t=1674729601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nU6JQuJ+2Wwb5CYLg12kj2U2wnCf/z9laSYJN5KzBA0=; b=GzlhzEjHH8COW1SHQZEib4icxryX8Z7eNG2XInU5Cu8CUgk+9i2vBXYzeM0AIelILwYq9x z5quTCLm38RZ5EipijOwH7dEVzSWO743P0ZgCWr9LeU5wL7sRYCxKfzy1vSuSjh9j3ddvQ RAEMGD2iQf15VJUi6pEQORRjPap/JSk= From: Henrik Grimler To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, alim.akhtar@samsung.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht Cc: Henrik Grimler Subject: [PATCH 3/6] ARM: dts: exynos: add mmc aliases for Exynos4412 Date: Thu, 26 Jan 2023 11:38:25 +0100 Message-Id: <20230126103828.481441-4-henrik@grimler.se> In-Reply-To: <20230126103828.481441-1-henrik@grimler.se> References: <20230126103828.481441-1-henrik@grimler.se> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230126_024002_723440_95DC1F61 X-CRM114-Status: GOOD ( 10.84 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org So that mmcblk numbering is fixed for the eMMC and sdcard, no matter if a storage device is attached or not. Also remove old, no longer used, mshc alias while we are at it. Signed-off-by: Henrik Grimler --- arch/arm/boot/dts/exynos4412.dtsi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi index 7b4e2c442888..9625e9fe63b1 100644 --- a/arch/arm/boot/dts/exynos4412.dtsi +++ b/arch/arm/boot/dts/exynos4412.dtsi @@ -28,7 +28,10 @@ aliases { pinctrl3 = &pinctrl_3; fimc-lite0 = &fimc_lite_0; fimc-lite1 = &fimc_lite_1; - mshc0 = &mshc_0; + mmc0 = &mshc_0; /* eMMC */ + mmc1 = &sdhci_1; + mmc2 = &sdhci_2; /* uSD */ + mmc3 = &sdhci_3; }; cpus { From patchwork Thu Jan 26 10:38:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrik Grimler X-Patchwork-Id: 13116871 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 843E3C54E94 for ; Thu, 26 Jan 2023 10:42:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MNGZ9QNM0m0laZIw2YaMbOBoHG7Xsl5y3Cx4ALgTdlE=; b=VaJhI/2oYclglJ eNFFx0ZzxycDVVb12+yH1argnAzln+snxpinqmMYpzeBwYSFalZicaEHEeOIrVHiTtXak/KMxw6Rl 7w/kGoiHy6ShIdi7mkj8WoS7fhYVEQZVBPfNJtR+hMjrUM0gX18hMLwBAjceZqg2h92PQST78Ut0G gAQb9LTkDKUzg3tKRIyFjQvRv4kyPZt6h8quGAF8Gg/fOjlwXJRLouifX06aKuRIiV+rK2LklquJ8 96V31Pjv1DlDLBCiMdNUad+FRlUfhB0FeFVIig12/fcSUCpq4gNjSO3ikOcXelBtBHDPwEhtYND2D T/xQ/k6YEOihVrnKwTjQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKzhW-00AW2X-CY; Thu, 26 Jan 2023 10:41:50 +0000 Received: from out0.migadu.com ([94.23.1.103]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKzfp-00AVQk-DX for linux-arm-kernel@lists.infradead.org; Thu, 26 Jan 2023 10:40:07 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=grimler.se; s=key1; t=1674729604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ehHG0agnVWr1E1xr0nOFkM6+aF48oEGwbR19XxQGOeg=; b=WI2X3dm+sj4+isE6DIZ/HXqZWn06/gRlk8G0DxvCiZUwMmh/6MtsbeDLFBOpggT/61fixi vPJ3MRoBPMACMr84h+DxCJJO6E5IGTIy2VZovKqxdUZetuMaaYrfmKwqDJ6W1SSf3tntt7 EIjkJcP5FZZes9Jk0xiIY2ZDAReeOfQ= From: Henrik Grimler To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, alim.akhtar@samsung.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht Cc: Henrik Grimler Subject: [PATCH 4/6] ARM: dts: exynos: add mmc aliases for Exynos5250 Date: Thu, 26 Jan 2023 11:38:26 +0100 Message-Id: <20230126103828.481441-5-henrik@grimler.se> In-Reply-To: <20230126103828.481441-1-henrik@grimler.se> References: <20230126103828.481441-1-henrik@grimler.se> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230126_024005_694955_F4184974 X-CRM114-Status: UNSURE ( 9.90 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org So that mmcblk numbering is fixed for the eMMC and sdcard, no matter if a storage device is attached or not. Also remove old, no longer used, mshc alias while we are at it. Signed-off-by: Henrik Grimler --- arch/arm/boot/dts/exynos5250.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 97e89859ba3d..d030020c5d46 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -30,10 +30,10 @@ aliases { gsc1 = &gsc_1; gsc2 = &gsc_2; gsc3 = &gsc_3; - mshc0 = &mmc_0; - mshc1 = &mmc_1; - mshc2 = &mmc_2; - mshc3 = &mmc_3; + mmc0 = &mmc_0; /* eMMC */ + mmc1 = &mmc_1; + mmc2 = &mmc_2; /* uSD */ + mmc3 = &mmc_3; i2c4 = &i2c_4; i2c5 = &i2c_5; i2c6 = &i2c_6; From patchwork Thu Jan 26 10:38:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrik Grimler X-Patchwork-Id: 13116873 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 267A8C54E94 for ; Thu, 26 Jan 2023 10:43:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=S7JvwL4lCfrqJBEZsvOlGMaM1spi4dnsviX7ECWUsNI=; b=Li5HhCE5igC8PI f/KCRIGZ0xjdBgFZu1HpDrIooGQPZVMxK3Lrq/M8qlXtdU+F39/MApTGHGgAo7fltGXo428VyqtUS iyVs1ktd/kNerfztQJgnWHGBceE9YivloIxw+nisHxU95j8OOukkDbGR/JJcF3JVOJGowFv+MEfcj dWBpL18ZDicLxOMAdWJuJA7+uscmSLfm422O9k9Q/35q8m+1zdhmQwqm/FuUnSqbM6d18rG1Zsq9N ++8vKwMLMwL5vHppAhUinrbap0+GWJ0gj0Ie/k0zigcLhHwxg7uaEaeeSvJm1SYWsUf0rxs6wZaVP vUeknBdqphVq5DA7HtrA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKziM-00AWS0-EW; Thu, 26 Jan 2023 10:42:43 +0000 Received: from out0.migadu.com ([2001:41d0:2:267::]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKzfu-00AVSO-Sz for linux-arm-kernel@lists.infradead.org; Thu, 26 Jan 2023 10:40:17 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=grimler.se; s=key1; t=1674729609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AL7Cx0CdV/CMB1DM1nnXv+J97iJ72P++bxybb/0LZtM=; b=eTtvcUsj7BhtCKWS939C5Vn5hrbCH24z8hrRrFjLw37kuR6JH5CBRxT/QmJKiK//krllF0 /PCvLhBgJBC63H7LbIigd7mgy/WtbdfIlqmbq4CEjuDqebE8uxGkbRNkQDbHeD3XeRf+6T WNyHqd61f2+GXtum2ykbUTHkAdGI6QY= From: Henrik Grimler To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, alim.akhtar@samsung.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht Cc: Henrik Grimler Subject: [PATCH 5/6] ARM: dts: exynos: add mmc aliases for Exynos5410 Date: Thu, 26 Jan 2023 11:38:27 +0100 Message-Id: <20230126103828.481441-6-henrik@grimler.se> In-Reply-To: <20230126103828.481441-1-henrik@grimler.se> References: <20230126103828.481441-1-henrik@grimler.se> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230126_024011_199940_D1C7CA3C X-CRM114-Status: UNSURE ( 9.04 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org So that mmcblk numbering is fixed for the eMMC and sdcard, no matter if a storage device is attached or not. Signed-off-by: Henrik Grimler --- arch/arm/boot/dts/exynos5410.dtsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/boot/dts/exynos5410.dtsi b/arch/arm/boot/dts/exynos5410.dtsi index 350b8afa0a3a..9ecbe3cf27e8 100644 --- a/arch/arm/boot/dts/exynos5410.dtsi +++ b/arch/arm/boot/dts/exynos5410.dtsi @@ -20,6 +20,9 @@ / { interrupt-parent = <&gic>; aliases { + mmc0 = &mmc_0; + mmc1 = &mmc_1; + mmc2 = &mmc_2; pinctrl0 = &pinctrl_0; pinctrl1 = &pinctrl_1; pinctrl2 = &pinctrl_2; From patchwork Thu Jan 26 10:38:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrik Grimler X-Patchwork-Id: 13116872 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 30477C54E94 for ; Thu, 26 Jan 2023 10:43:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ZkSDoG79W+DrcwYwqsz4Sk+BcUqW2YpMWqB2WkDm4jQ=; b=1OLrnaSkOeak/C 6t0PIAfmwnATSm7Ws/jyjdUCAFJ2xFCs1PGG7TEyFzsKyK7K441EHAPs4qY/630aUZitcAByPXwWN MRCUcojL/uQQhZamZbEsZg66i2g3h7UpdcOmyPViQkDZOVIMqMry5YY+F09XnQzQcqdaYFIuJdZop yrJb0E0IpT7mfdqGf5Nypcvo70yA7s39VMPdZ1Hckg0kiaPVxtGvG9XsbNJxErc7gUR2xEZyowkJt oTO0J6YPE8Lo30DKpCHHdhdus27O8wUWOoUg6USIss+76GvXZmeBDQKvQLm5ppO3XJ01LcV/JE2Zg PdPGU0If6HUcnMcFxILg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKzhw-00AWFB-Q0; Thu, 26 Jan 2023 10:42:16 +0000 Received: from out0.migadu.com ([94.23.1.103]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKzfw-00AVTW-IF for linux-arm-kernel@lists.infradead.org; Thu, 26 Jan 2023 10:40:17 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=grimler.se; s=key1; t=1674729611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wz5jcqMJAq6z77aIztno7yadg9KTxRI5ZYyyEhvqWmc=; b=P/FEW+sXAWmosczZS9GovnwfceG/ZYRCiH7Vf6V6XmOHSiQMvEnZg7IvDykMpu7mrpjVyG +x7TAvomwiGEOjDuVEgoz/7UEOxLx5H3qKyw7QYR+wYB2uPMsWsy4IAzR/0td0c01e2682 lsDtfJT5Ywqf9VsoyC/xbHR07vx+nVA= From: Henrik Grimler To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, alim.akhtar@samsung.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht Cc: Henrik Grimler Subject: [PATCH 6/6] ARM: dts: exynos: add mmc aliases for Exynos5420 Date: Thu, 26 Jan 2023 11:38:28 +0100 Message-Id: <20230126103828.481441-7-henrik@grimler.se> In-Reply-To: <20230126103828.481441-1-henrik@grimler.se> References: <20230126103828.481441-1-henrik@grimler.se> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230126_024012_808197_5F446A53 X-CRM114-Status: GOOD ( 10.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org So that mmcblk numbering is fixed for the eMMC and sdcard, no matter if a storage device is attached or not. Also remove old, no longer used, mshc alias while we are at it. Signed-off-by: Henrik Grimler --- arch/arm/boot/dts/exynos5420.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index b1051a7d07af..3179174a23c4 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -19,9 +19,9 @@ / { compatible = "samsung,exynos5420", "samsung,exynos5"; aliases { - mshc0 = &mmc_0; - mshc1 = &mmc_1; - mshc2 = &mmc_2; + mmc0 = &mmc_0; + mmc1 = &mmc_1; + mmc2 = &mmc_2; pinctrl0 = &pinctrl_0; pinctrl1 = &pinctrl_1; pinctrl2 = &pinctrl_2;