From patchwork Wed Mar 15 21:28:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrik Grimler X-Patchwork-Id: 70474 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp140585wrt; Wed, 15 Mar 2023 14:48:40 -0700 (PDT) X-Google-Smtp-Source: AK7set9pnur3/vJQxP/khPkeieeaZB/Buh8g86mT2iQYuoi9NrJbzTfWMhqZ4V8OKdxehbV7RsNM X-Received: by 2002:a05:6a20:729c:b0:cc:eb3b:56e9 with SMTP id o28-20020a056a20729c00b000cceb3b56e9mr1767108pzk.1.1678916919544; Wed, 15 Mar 2023 14:48:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678916919; cv=none; d=google.com; s=arc-20160816; b=gUWKOSW+QX3gwAba7rC3hMxFOmJp1kKQ4NbOCnRZukfKx72MU/GaLX+hjfSwMKuTye wJlR4u2RhML0cqxru7FP8hgaZtQnqmKZdVvam3AeNNj5wS+P/E3sVPyydTxrkJK2TD1O UJvaJpLmfjdnu8bZZhu0ib8YUaM5lZREaNwfkF0AjacwNK/tTr5NaqAoYM9j1zVak9ie TUBwIFCNPs23vT8yzafsqyYSgYy5XfCoI1ybExZ8BMXcXtecl1ceGmity9KN8kKLr0OZ 0HWjpF7TvW1Obpn6Nm39ENcrzJMI60Ak/4FmOb8RPKTZIlFU95T34ugpGz0MbfDdTriK VRmw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4b1Gllv9chcAwQ2HUL3kdh3qznUDR7J46Su9EXl4o+Y=; b=vDvK7N6WHSsCAOZbDGWfN2TN3gH+2d51+sqww4gjs48E4VuRwN9AhtTuyTgU4vR8zh cDR/lCuTxlMpb8CkWIkWvFfA652usytYv0EzojWa6/+k9HgYsDkDwXzSIV/anBCiFXuh ZfvUx+f0uVyE7/xdfFP70mdmE1SyICQjLXvYo8BxIatWCj2oV0Ypky1BhlMw1UoGHM03 0mtRS57GVaQDiK92+sfqOK8Tqqu60GogawnYnNgVNpp2g8uC04R7ubyiR3FmVtJIjBjZ AeJ4ZFbWq21UFDt+1OAjDHjDrDVjxxZcZBnl7dqKEnacKa0WeyW5r5h1PPod0egwjiUc G+XA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@grimler.se header.s=key1 header.b=D4FgNlfQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=grimler.se Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m8-20020a655648000000b004fc29a7445bsi5505480pgs.761.2023.03.15.14.48.26; Wed, 15 Mar 2023 14:48:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@grimler.se header.s=key1 header.b=D4FgNlfQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=grimler.se Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233111AbjCOV2x (ORCPT + 99 others); Wed, 15 Mar 2023 17:28:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232956AbjCOV2p (ORCPT ); Wed, 15 Mar 2023 17:28:45 -0400 Received: from out-11.mta0.migadu.com (out-11.mta0.migadu.com [IPv6:2001:41d0:1004:224b::b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4929C1E2B4 for ; Wed, 15 Mar 2023 14:28:37 -0700 (PDT) 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=1678915713; 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=4b1Gllv9chcAwQ2HUL3kdh3qznUDR7J46Su9EXl4o+Y=; b=D4FgNlfQMZbSMxGfyA3tFui6gqGrL/bNhUG49m5WoR3ZeVM7VVkHZbYwO0DAkrL6YzoVtf 9Yi3CJjPyh8TKQCEtIdA9x2XHZQNaaUObWGO9gfo+sAbcsikBjPM1O3LYbJOao6bCCZ/Z5 mwXggzbYS1CqgTKCLJUftL1+gmocILE= From: Henrik Grimler To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, alim.akhtar@samsung.com, m.szyprowski@samsung.com, virag.david003@gmail.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 v2 1/2] arm64: dts: exynos: drop mshc aliases Date: Wed, 15 Mar 2023 22:28:13 +0100 Message-Id: <20230315212814.15908-2-henrik@grimler.se> In-Reply-To: <20230315212814.15908-1-henrik@grimler.se> References: <20230315212814.15908-1-henrik@grimler.se> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760471987867490557?= X-GMAIL-MSGID: =?utf-8?q?1760471987867490557?= Previously, the mshc0 alias has been necessary so that MMC_CAP_1_8V_DDR | MMC_CAP_8_BIT_DATA are set for mshc_0/mmc_0. However, these capabilities should be described in the device tree so that we do not have to rely on the alias. The property mmc-ddr-1_8v replaces MMC_CAP_1_8V_DDR, while bus_width = <8>, which is already set for all the mshc0/mmc0 nodes, replaces MMC_CAP_8_BIT_DATA. Also drop other mshc aliases as they are not needed. Signed-off-by: Henrik Grimler Tested-by: Marek Szyprowski --- Changes since v1: * Add mmc-ddr-1_8v property so that capabilities stays the same when mshc0 alias is removed arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 3 +-- arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi index f54f30633417..868f7b98a637 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi @@ -40,8 +40,6 @@ aliases { spi2 = &spi_2; spi3 = &spi_3; spi4 = &spi_4; - mshc0 = &mshc_0; - mshc2 = &mshc_2; }; chosen { @@ -952,6 +950,7 @@ &i2s1 { &mshc_0 { status = "okay"; + mmc-ddr-1_8v; mmc-hs200-1_8v; mmc-hs400-1_8v; cap-mmc-highspeed; diff --git a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts index f3f4a6ab4b49..35d949099166 100644 --- a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts +++ b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts @@ -18,8 +18,6 @@ / { aliases { serial0 = &serial_2; - mshc0 = &mmc_0; - mshc2 = &mmc_2; }; chosen { @@ -362,6 +360,7 @@ pmic_irq: pmic-irq-pins { &mmc_0 { status = "okay"; cap-mmc-highspeed; + mmc-ddr-1_8v; mmc-hs200-1_8v; non-removable; card-detect-delay = <200>; From patchwork Wed Mar 15 21:28:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrik Grimler X-Patchwork-Id: 70471 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp136555wrt; Wed, 15 Mar 2023 14:37:11 -0700 (PDT) X-Google-Smtp-Source: AK7set/WxbnMiH08gx4vd+pwep9unEo1eMhKBrhSIdQAv78XJDBI9zS7jq2bS+cT7T4T0ljJ8ixz X-Received: by 2002:aa7:8f06:0:b0:625:9736:2b7d with SMTP id x6-20020aa78f06000000b0062597362b7dmr902822pfr.12.1678916231100; Wed, 15 Mar 2023 14:37:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678916231; cv=none; d=google.com; s=arc-20160816; b=F8iIpLJnE47EhsyQqECtYuHBLm9Kh7Ybz6SNAbEqe1IlCQJsS7Wt201oh335rK2l4g GWObd/XqSAI4NSYnbBj4Z1vcauCYysSmbbYbFtB9IhqnwTPDYawvEhsI4cMKCxci8hA/ Pb/aBb192IKRpafaEFiyMyiCj/oQXHX6Ow++9Mm/i7I7OCxh8lU2i5+TzsF231FhO9J1 SEX/QhiUfWt+C0jdx3uwFXc4B21s5XS1wKlpfEuADSCDcEh/PuCNUf6xpT7rOcQ98rCu 3u7vwBq+jZHJd0DjbMMmKng+2Y8Ui0x29pSEKRc6fmnOZszhu4OKAfHIuIVjbWiRDmJe QTcQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vAKBsvws71kJTHTxaksOf1+WTTkfvDgnY5I/sW6xXf0=; b=XbtNM69M6cRjYB2Gbh75V49kr1ABSatval4AjEW2TElL8st3ec5gmY5EpRAK7QGzN+ PDL4UhVnaekRZT0c+YOaGp/n0yt5SPUaG2L7XjU6jZHW4/P16Zx8zDpn4oGYcmLmPukJ R9XyT6CX11ZMdiIcGay7fQ9hIWBwg1SyK2Uw8Ov5zoNzfmZsRicnooHlvwVlkX+See6/ kQdCBY54gEXPqwiEJBTc6tKuPoSCDhmFzurGBVEf66O+QCpXFYZ7PqGyUhVxk1zNxyID +osLF4QaZMHGAn2mpB1GFRanz1YE5PmBr3GLRjMT2q9yanQnSaS5ttB7brWq7icbPSm/ YMFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@grimler.se header.s=key1 header.b=RRpZJfxn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=grimler.se Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e66-20020a621e45000000b005a8ac319433si5909841pfe.178.2023.03.15.14.36.58; Wed, 15 Mar 2023 14:37:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@grimler.se header.s=key1 header.b=RRpZJfxn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=grimler.se Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233090AbjCOV2t (ORCPT + 99 others); Wed, 15 Mar 2023 17:28:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232642AbjCOV2p (ORCPT ); Wed, 15 Mar 2023 17:28:45 -0400 Received: from out-60.mta0.migadu.com (out-60.mta0.migadu.com [IPv6:2001:41d0:1004:224b::3c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 329CCBDD1 for ; Wed, 15 Mar 2023 14:28:37 -0700 (PDT) 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=1678915715; 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=vAKBsvws71kJTHTxaksOf1+WTTkfvDgnY5I/sW6xXf0=; b=RRpZJfxnUBdMfHaEsrfKDDKh87jLgL6H26X87WRndkHucVOt3LI20ooqentwY1tPj6KdI2 5ZxnF7gW2K39pmSB3uxRU6i3JmhonP6jVgoTF7G6lAyQoo4Mi6yO+rPWCGNsNAxTbbO8k1 hvWBUgIxqXHuB20x6AiqwY4iY1bFnts= From: Henrik Grimler To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, alim.akhtar@samsung.com, m.szyprowski@samsung.com, virag.david003@gmail.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 v2 2/2] arm64: dts: exynos: add mmc aliases Date: Wed, 15 Mar 2023 22:28:14 +0100 Message-Id: <20230315212814.15908-3-henrik@grimler.se> In-Reply-To: <20230315212814.15908-1-henrik@grimler.se> References: <20230315212814.15908-1-henrik@grimler.se> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760471265760916704?= X-GMAIL-MSGID: =?utf-8?q?1760471265760916704?= Add aliases for eMMC and SD card where applicable, so that assigned mmc indeces are always the same. Signed-off-by: Henrik Grimler Tested-by: Marek Szyprowski --- Changes since v1: * None arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 2 ++ arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 2 ++ arch/arm64/boot/dts/exynos/exynos7885-jackpotlte.dts | 1 + 3 files changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi index 868f7b98a637..e4ed788413fe 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi @@ -21,6 +21,8 @@ aliases { gsc0 = &gsc_0; gsc1 = &gsc_1; gsc2 = &gsc_2; + mmc0 = &mshc_0; + mmc2 = &mshc_2; pinctrl0 = &pinctrl_alive; pinctrl1 = &pinctrl_aud; pinctrl2 = &pinctrl_cpif; diff --git a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts index 35d949099166..1f2eddcebdd9 100644 --- a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts +++ b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts @@ -17,6 +17,8 @@ / { compatible = "samsung,exynos7-espresso", "samsung,exynos7"; aliases { + mmc0 = &mmc_0; + mmc2 = &mmc_2; serial0 = &serial_2; }; diff --git a/arch/arm64/boot/dts/exynos/exynos7885-jackpotlte.dts b/arch/arm64/boot/dts/exynos/exynos7885-jackpotlte.dts index 5db9a81ac7bb..47a389d9ff7d 100644 --- a/arch/arm64/boot/dts/exynos/exynos7885-jackpotlte.dts +++ b/arch/arm64/boot/dts/exynos/exynos7885-jackpotlte.dts @@ -18,6 +18,7 @@ / { chassis-type = "handset"; aliases { + mmc0 = &mmc_0; serial0 = &serial_0; serial1 = &serial_1; serial2 = &serial_2;