From patchwork Tue Dec 13 23:01:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrizio Castro X-Patchwork-Id: 32972 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp409061wrn; Tue, 13 Dec 2022 15:02:36 -0800 (PST) X-Google-Smtp-Source: AA0mqf4TvrfVb/Cnm6QmHEgkacVGF9ekyK5y7OiM4mqqU7QGJi1LCQ5TToLQrLsCHUHs6jOUfIfV X-Received: by 2002:a05:6402:444b:b0:463:ba73:9139 with SMTP id o11-20020a056402444b00b00463ba739139mr19044651edb.2.1670972555962; Tue, 13 Dec 2022 15:02:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670972555; cv=none; d=google.com; s=arc-20160816; b=XpKov5pXDtrDn1ZlgiHJwD0ERs50g39sYXVAnHbWtsGN1YUphgjp4VKYOi4Z1QPpA4 aVRmhFwOrrY9Ami859S0a03k3fKdh82rAx2KRmT+r2zWEGzLV1RHRetqBFPRJ1pDfDjP O/RXzVywTFVlx5HySM3UTHRk9GPkB3IbwYzeg/8aeXbj3Prp1sSWG+EVCLraQSMiPDsr PQRmIQgtngPAFFNSOcwIuz4Lbp3RnyWiyfw11rg7xL8Cof/5JYMkxZ9Ngcnnr9okd7kk 3DAMDj/lr+BHBP1euI2nvtcHogQvAPQnEVvVgcBxRS+Tw1UHD8LNdK6Z/iP/Ta/W0C3p Ny4w== 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; bh=DJvSbgpXb89Qqy8MbB1O3yqpZ74WNiJeT67fdg6Xyko=; b=t9PcT4gA60eUM8jjY80gXbcPeR8yUSXUVfMVp/hVuy/LIHgUAPUWU4Lpifj1Ev57mV irT0F5i5JANKvSlfGZv5nYo1Fink/3oUMUIwPrj+CDQqlbXbuGYYTN9hhsVawxxtRS37 Sz0QzA5wuij/nlsB3maj9Q83pvK3W0PfYmNSM0TnKKP7q8NeGSDVDjsP+HqpoURE5lJ5 QL3D9GyYdYfAQFt+wr9A53K4F/YfeE8eg7giiTlvKwdsy9KGGV8KKbU3+APS++k+pgWt lQ4oL08BflGaMjx8MGRAZUMK/wm2OdQZmeZfOXR3T1vCWAtvFjOaVJVvhw/z3RFnmsSK vJfg== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y9-20020a056402440900b0045d27c0ba90si12747361eda.577.2022.12.13.15.02.12; Tue, 13 Dec 2022 15:02:35 -0800 (PST) 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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236898AbiLMXBu (ORCPT + 99 others); Tue, 13 Dec 2022 18:01:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236801AbiLMXBq (ORCPT ); Tue, 13 Dec 2022 18:01:46 -0500 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 4692EC2; Tue, 13 Dec 2022 15:01:45 -0800 (PST) X-IronPort-AV: E=Sophos;i="5.96,242,1665414000"; d="scan'208";a="143231090" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie5.idc.renesas.com with ESMTP; 14 Dec 2022 08:01:44 +0900 Received: from mulinux.home (unknown [10.226.93.1]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id F23E6400D4F6; Wed, 14 Dec 2022 08:01:38 +0900 (JST) From: Fabrizio Castro To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Michael Turquette , Stephen Boyd , Geert Uytterhoeven Cc: Phil Edworthy , Magnus Damm , Wolfram Sang , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, Chris Paterson , Biju Das , Fabrizio Castro , Laurent Pinchart , Jacopo Mondi Subject: [PATCH 1/4] clk: renesas: r9a09g011: Add SDHI/eMMC clock and reset entries Date: Tue, 13 Dec 2022 23:01:26 +0000 Message-Id: <20221213230129.549968-2-fabrizio.castro.jz@renesas.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221213230129.549968-1-fabrizio.castro.jz@renesas.com> References: <20221213230129.549968-1-fabrizio.castro.jz@renesas.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS 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?1752141718845669024?= X-GMAIL-MSGID: =?utf-8?q?1752141718845669024?= From: Phil Edworthy Add SDHI/eMMC clock/reset entries to CPG driver. Signed-off-by: Phil Edworthy Reviewed-by: Geert Uytterhoeven --- This patch can clash with the below patch (which hasn't been reviewed yet): https://patchwork.kernel.org/project/linux-renesas-soc/patch/20221212172804.1277751-2-biju.das.jz@bp.renesas.com/ drivers/clk/renesas/r9a09g011-cpg.c | 34 +++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/drivers/clk/renesas/r9a09g011-cpg.c b/drivers/clk/renesas/r9a09g011-cpg.c index dd5e442ec4a9..8437b7d38e94 100644 --- a/drivers/clk/renesas/r9a09g011-cpg.c +++ b/drivers/clk/renesas/r9a09g011-cpg.c @@ -23,11 +23,14 @@ #define DIV_A DDIV_PACK(0x200, 0, 3) #define DIV_B DDIV_PACK(0x204, 0, 2) +#define DIV_D DDIV_PACK(0x204, 4, 2) #define DIV_E DDIV_PACK(0x204, 8, 1) #define DIV_W DDIV_PACK(0x328, 0, 3) #define SEL_B SEL_PLL_PACK(0x214, 0, 1) +#define SEL_D SEL_PLL_PACK(0x214, 1, 1) #define SEL_E SEL_PLL_PACK(0x214, 2, 1) +#define SEL_SDI SEL_PLL_PACK(0x300, 0, 1) #define SEL_W0 SEL_PLL_PACK(0x32C, 0, 1) enum clk_ids { @@ -50,11 +53,14 @@ enum clk_ids { CLK_PLL4, CLK_DIV_A, CLK_DIV_B, + CLK_DIV_D, CLK_DIV_E, CLK_DIV_W, CLK_SEL_B, CLK_SEL_B_D2, + CLK_SEL_D, CLK_SEL_E, + CLK_SEL_SDI, CLK_SEL_W0, /* Module Clocks */ @@ -81,6 +87,14 @@ static const struct clk_div_table dtable_divb[] = { {0, 0}, }; + +static const struct clk_div_table dtable_divd[] = { + {0, 1}, + {1, 2}, + {2, 4}, + {0, 0}, +}; + static const struct clk_div_table dtable_divw[] = { {0, 6}, {1, 7}, @@ -94,8 +108,10 @@ static const struct clk_div_table dtable_divw[] = { /* Mux clock tables */ static const char * const sel_b[] = { ".main", ".divb" }; +static const char * const sel_d[] = { ".main", ".divd" }; static const char * const sel_e[] = { ".main", ".dive" }; static const char * const sel_w[] = { ".main", ".divw" }; +static const char * const sel_sdi[] = { ".main", ".pll2_200" }; static const struct cpg_core_clk r9a09g011_core_clks[] __initconst = { /* External Clock Inputs */ @@ -115,11 +131,14 @@ static const struct cpg_core_clk r9a09g011_core_clks[] __initconst = { DEF_DIV_RO(".diva", CLK_DIV_A, CLK_PLL1, DIV_A, dtable_diva), DEF_DIV_RO(".divb", CLK_DIV_B, CLK_PLL2_400, DIV_B, dtable_divb), + DEF_DIV_RO(".divd", CLK_DIV_D, CLK_PLL2_200, DIV_D, dtable_divd), DEF_DIV_RO(".dive", CLK_DIV_E, CLK_PLL2_100, DIV_E, NULL), DEF_DIV_RO(".divw", CLK_DIV_W, CLK_PLL4, DIV_W, dtable_divw), DEF_MUX_RO(".selb", CLK_SEL_B, SEL_B, sel_b), + DEF_MUX_RO(".seld", CLK_SEL_D, SEL_D, sel_d), DEF_MUX_RO(".sele", CLK_SEL_E, SEL_E, sel_e), + DEF_MUX(".selsdi", CLK_SEL_SDI, SEL_SDI, sel_sdi), DEF_MUX(".selw0", CLK_SEL_W0, SEL_W0, sel_w), DEF_FIXED(".selb_d2", CLK_SEL_B_D2, CLK_SEL_B, 1, 2), @@ -128,6 +147,18 @@ static const struct cpg_core_clk r9a09g011_core_clks[] __initconst = { static const struct rzg2l_mod_clk r9a09g011_mod_clks[] __initconst = { DEF_MOD("pfc", R9A09G011_PFC_PCLK, CLK_MAIN, 0x400, 2), DEF_MOD("gic", R9A09G011_GIC_CLK, CLK_SEL_B_D2, 0x400, 5), + DEF_MOD("sdi0_aclk", R9A09G011_SDI0_ACLK, CLK_SEL_D, 0x408, 0), + DEF_MOD("sdi0_imclk", R9A09G011_SDI0_IMCLK, CLK_SEL_SDI, 0x408, 1), + DEF_MOD("sdi0_imclk2", R9A09G011_SDI0_IMCLK2, CLK_SEL_SDI, 0x408, 2), + DEF_MOD("sdi0_clk_hs", R9A09G011_SDI0_CLK_HS, CLK_PLL2_800, 0x408, 3), + DEF_MOD("sdi1_aclk", R9A09G011_SDI1_ACLK, CLK_SEL_D, 0x408, 4), + DEF_MOD("sdi1_imclk", R9A09G011_SDI1_IMCLK, CLK_SEL_SDI, 0x408, 5), + DEF_MOD("sdi1_imclk2", R9A09G011_SDI1_IMCLK2, CLK_SEL_SDI, 0x408, 6), + DEF_MOD("sdi1_clk_hs", R9A09G011_SDI1_CLK_HS, CLK_PLL2_800, 0x408, 7), + DEF_MOD("emm_aclk", R9A09G011_EMM_ACLK, CLK_SEL_D, 0x408, 8), + DEF_MOD("emm_imclk", R9A09G011_EMM_IMCLK, CLK_SEL_SDI, 0x408, 9), + DEF_MOD("emm_imclk2", R9A09G011_EMM_IMCLK2, CLK_SEL_SDI, 0x408, 10), + DEF_MOD("emm_clk_hs", R9A09G011_EMM_CLK_HS, CLK_PLL2_800, 0x408, 11), DEF_COUPLED("eth_axi", R9A09G011_ETH0_CLK_AXI, CLK_PLL2_200, 0x40c, 8), DEF_COUPLED("eth_chi", R9A09G011_ETH0_CLK_CHI, CLK_PLL2_100, 0x40c, 8), DEF_MOD("eth_clk_gptp", R9A09G011_ETH0_GPTP_EXT, CLK_PLL2_100, 0x40c, 9), @@ -151,6 +182,9 @@ static const struct rzg2l_mod_clk r9a09g011_mod_clks[] __initconst = { static const struct rzg2l_reset r9a09g011_resets[] = { DEF_RST(R9A09G011_PFC_PRESETN, 0x600, 2), + DEF_RST_MON(R9A09G011_SDI0_IXRST, 0x608, 0, 6), + DEF_RST_MON(R9A09G011_SDI1_IXRST, 0x608, 1, 7), + DEF_RST_MON(R9A09G011_EMM_IXRST, 0x608, 2, 8), DEF_RST_MON(R9A09G011_ETH0_RST_HW_N, 0x608, 11, 11), DEF_RST_MON(R9A09G011_SYC_RST_N, 0x610, 9, 13), DEF_RST(R9A09G011_IIC_GPA_PRESETN, 0x614, 8), From patchwork Tue Dec 13 23:01:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrizio Castro X-Patchwork-Id: 32973 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp409202wrn; Tue, 13 Dec 2022 15:02:51 -0800 (PST) X-Google-Smtp-Source: AA0mqf6IUKuC/MiaKZ6eoXIMLjWNegeYvGIKmmC34S1CI0hkslrV7XcQnBCEHLMKmCc9rN2jrOam X-Received: by 2002:a05:6402:5299:b0:467:4df0:718c with SMTP id en25-20020a056402529900b004674df0718cmr17226118edb.9.1670972571413; Tue, 13 Dec 2022 15:02:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670972571; cv=none; d=google.com; s=arc-20160816; b=vZulykhio5M4OSXhemA/fnTV8s/NDtgCrwFetPeirI11RqHc6HFPADCSyF3+4dHTkl tq3uyXtyE45o2S1En3cNoCaV2xlbpG+KecsklOFWwuk69Y06KilUdFA/PR5UQIbq3Y4p WXHXg8+CX82047kbPWvazZqGnIgaVGPpxD/ypd/+4oGihF6W/XgCoLgU/OiM/bNXA37t CuxnDmsUeTic2EcdsA8OAA+oEWTyAfpxZSzEyTPmdST9wxJEvyMjAPvtlSLnxUGJ9wnP vCvVXfY+vlLBzYwLkAuMVVeAtn/IAPx0FJJDd04D1ABnN4lZ/Wo776igEGW6uGpoKlin srgg== 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; bh=zHBfCZQ0N9OpC2woZ4vFVB5MK9VUAQyWNGQX8cGfSjA=; b=KCSrg/hNgT20WN/Wn/7tXHwKDd+HZOlc0GYfMWBR+4MrbhuJWi7OQqJehXoUl3m+y/ G6WzWdqgMMhPlFY5TlSkCgA21Ab0U3iZIrnwN8v14qiXZf6uW2CZb+1CZ8uyRR4mLRPl oMRBrP2sxuVDtzaix7j6XL+FIuiKTc1GVGkyK4PwBnooXKkEiQVgQFbE2xhlFrQXzqlz UBB2egiYW3bfhhZ4IIPjg2nbzWVHCQX9P9rvMSuu4TNWxMWxIiGJmLN2kk1H3jrKIhSH GswhmAdENa9rJXNxzOTws1i/bPcpy9OQPJrFJJ6967oXMSEV5lQgcM3/aZoJp/HexEUw uf3Q== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sg11-20020a170907a40b00b007ae743c61efsi9637921ejc.1002.2022.12.13.15.02.28; Tue, 13 Dec 2022 15:02:51 -0800 (PST) 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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236910AbiLMXCD (ORCPT + 99 others); Tue, 13 Dec 2022 18:02:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236864AbiLMXBy (ORCPT ); Tue, 13 Dec 2022 18:01:54 -0500 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D4BE6FAED; Tue, 13 Dec 2022 15:01:50 -0800 (PST) X-IronPort-AV: E=Sophos;i="5.96,242,1665414000"; d="scan'208";a="143231109" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie5.idc.renesas.com with ESMTP; 14 Dec 2022 08:01:50 +0900 Received: from mulinux.home (unknown [10.226.93.1]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 3823B400D4DC; Wed, 14 Dec 2022 08:01:44 +0900 (JST) From: Fabrizio Castro To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Michael Turquette , Stephen Boyd , Geert Uytterhoeven Cc: Fabrizio Castro , Magnus Damm , Wolfram Sang , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, Chris Paterson , Biju Das , Laurent Pinchart , Jacopo Mondi Subject: [PATCH 2/4] dt-bindings: mmc: renesas,sdhi: Document RZ/V2M support Date: Tue, 13 Dec 2022 23:01:27 +0000 Message-Id: <20221213230129.549968-3-fabrizio.castro.jz@renesas.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221213230129.549968-1-fabrizio.castro.jz@renesas.com> References: <20221213230129.549968-1-fabrizio.castro.jz@renesas.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS 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?1752141735042907848?= X-GMAIL-MSGID: =?utf-8?q?1752141735042907848?= Document support for the SD Card/MMC interface on the Renesas RZ/V2M (a.k.a. r9a09g011) SoC. Signed-off-by: Fabrizio Castro Acked-by: Rob Herring Reviewed-by: Wolfram Sang --- Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml index 7bfb10c62566..435773607489 100644 --- a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml +++ b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml @@ -59,6 +59,7 @@ properties: - renesas,sdhi-r9a07g043 # RZ/G2UL - renesas,sdhi-r9a07g044 # RZ/G2{L,LC} - renesas,sdhi-r9a07g054 # RZ/V2L + - renesas,sdhi-r9a09g011 # RZ/V2M - const: renesas,rcar-gen3-sdhi # R-Car Gen3 or RZ/G2 - items: - enum: From patchwork Tue Dec 13 23:01:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrizio Castro X-Patchwork-Id: 32974 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp409681wrn; Tue, 13 Dec 2022 15:03:38 -0800 (PST) X-Google-Smtp-Source: AA0mqf5XCyh5JEhI9HOUYuiB2M63ysq12H/wcasDpO/bIVWctGpt6Nfo4na5c13yjCTv4f/fTI6W X-Received: by 2002:a17:906:a41:b0:78d:f455:b5dd with SMTP id x1-20020a1709060a4100b0078df455b5ddmr18601315ejf.29.1670972618761; Tue, 13 Dec 2022 15:03:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670972618; cv=none; d=google.com; s=arc-20160816; b=HqU1H9OLSHGNIJc9gUoXUBUNdhzh6i34GqrAYDzRHRgZ2Pyef1aqSro1wYktq4Og6M pvUdbPSB7HqPJI+spT7F6b44WkyXkf7XPLCPz7Y+C1xjvIz4tJXMa6/u9z5fJhRtnQtW BqmgU6se8JE/ogR0+jRhw5L+3041OGX8j33nry+lKsCL+I6X3WHpbR9zuCpsiuJu27n+ 8md1lDwLwsziC760PBpCbRxwr625odKbEfF+/prYrocqoV8vVnPxIZ4EP8tIAy2h+K/q M5WebQ+tFGsX2aBos6iXVpBvoGV4nMx0ahFCsRUGizLcVRCMi8x5OPCshA5uy93zdY65 Chfw== 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; bh=+nu+g2LJg5lwO/BdbHra2dw9BJQC9ZPuosJX/odCBv8=; b=W3xHhKKcJ2N9ge4z4Fj2XdBnVxXmdztnhc7Fyg11mSMZTpanpJF/slKcd7S+MG5wLZ BjTKui3T1Jkt715+KTqQ94pKPvjQiLVjanC9AmHSv7qEZkYKxgCTmkurQDk1GbF6Ngbj qKCnLj/yLop57nUc2a/i+Ik1ZL59DqCVn3CSCPlcvfOVl8Lzpd4+23DMs4TjEO4zm8kC uAFH2pNdbvEGylZTTIr3RPBcLLS8ndbXoudZiqRDKQgRJydgtMdG0MObULBNVJz9akVE KWi+Wiztnqh501xNoFJNX1jS9I+gIAo940AwTns6PxVHBWRzMmLeAr+9PvPay7E4xHHj yrwg== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dp18-20020a170906c15200b007c18a102d75si2878950ejc.556.2022.12.13.15.03.14; Tue, 13 Dec 2022 15:03:38 -0800 (PST) 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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236980AbiLMXCN (ORCPT + 99 others); Tue, 13 Dec 2022 18:02:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236956AbiLMXCA (ORCPT ); Tue, 13 Dec 2022 18:02:00 -0500 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 01FEC10050; Tue, 13 Dec 2022 15:01:56 -0800 (PST) X-IronPort-AV: E=Sophos;i="5.96,242,1665414000"; d="scan'208";a="143231137" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie5.idc.renesas.com with ESMTP; 14 Dec 2022 08:01:56 +0900 Received: from mulinux.home (unknown [10.226.93.1]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 2A2F2400D4DC; Wed, 14 Dec 2022 08:01:50 +0900 (JST) From: Fabrizio Castro To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Michael Turquette , Stephen Boyd , Geert Uytterhoeven Cc: Fabrizio Castro , Magnus Damm , Wolfram Sang , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, Chris Paterson , Biju Das , Laurent Pinchart , Jacopo Mondi Subject: [PATCH 3/4] mmc: renesas_sdhi: Add RZ/V2M compatible string Date: Tue, 13 Dec 2022 23:01:28 +0000 Message-Id: <20221213230129.549968-4-fabrizio.castro.jz@renesas.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221213230129.549968-1-fabrizio.castro.jz@renesas.com> References: <20221213230129.549968-1-fabrizio.castro.jz@renesas.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS 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?1752141784515802107?= X-GMAIL-MSGID: =?utf-8?q?1752141784515802107?= The SDHI/eMMC IPs found with the RZ/V2M (a.k.a. r9a09g011), are very similar to the ones found in R-Car Gen3, but they are not exactly the same, and as a result need an SoC specific compatible string for fine tuning driver support. Signed-off-by: Fabrizio Castro Reviewed-by: Wolfram Sang --- drivers/mmc/host/renesas_sdhi_internal_dmac.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c index 29f562115c66..f38003f6b1ca 100644 --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c @@ -210,6 +210,11 @@ static const struct renesas_sdhi_quirks sdhi_quirks_r8a77990 = { .manual_tap_correction = true, }; +static const struct renesas_sdhi_quirks sdhi_quirks_r9a09g011 = { + .fixed_addr_mode = true, + .hs400_disabled = true, +}; + /* * Note for r8a7796 / r8a774a1: we can't distinguish ES1.1 and 1.2 as of now. * So, we want to treat them equally and only have a match for ES1.2 to enforce @@ -251,6 +256,11 @@ static const struct renesas_sdhi_of_data_with_quirks of_r8a77990_compatible = { .quirks = &sdhi_quirks_r8a77990, }; +static const struct renesas_sdhi_of_data_with_quirks of_r9a09g011_compatible = { + .of_data = &of_data_rcar_gen3, + .quirks = &sdhi_quirks_r9a09g011, +}; + static const struct renesas_sdhi_of_data_with_quirks of_rcar_gen3_compatible = { .of_data = &of_data_rcar_gen3, }; @@ -274,6 +284,7 @@ static const struct of_device_id renesas_sdhi_internal_dmac_of_match[] = { { .compatible = "renesas,sdhi-r8a77970", .data = &of_r8a77970_compatible, }, { .compatible = "renesas,sdhi-r8a77990", .data = &of_r8a77990_compatible, }, { .compatible = "renesas,sdhi-r8a77995", .data = &of_rcar_gen3_nohs400_compatible, }, + { .compatible = "renesas,sdhi-r9a09g011", .data = &of_r9a09g011_compatible, }, { .compatible = "renesas,rcar-gen3-sdhi", .data = &of_rcar_gen3_compatible, }, { .compatible = "renesas,rcar-gen4-sdhi", .data = &of_rcar_gen3_compatible, }, {}, From patchwork Tue Dec 13 23:01:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrizio Castro X-Patchwork-Id: 32975 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp410074wrn; Tue, 13 Dec 2022 15:04:23 -0800 (PST) X-Google-Smtp-Source: AA0mqf7PPL+UJqlaBhMsG/Bb/PVb7kEPbxHPbhER74Y0gGoxrzwI//FAcDNyC25NWchA8d0Z9Zk1 X-Received: by 2002:a05:6402:2b8b:b0:468:58d4:a0f2 with SMTP id fj11-20020a0564022b8b00b0046858d4a0f2mr17396340edb.23.1670972663609; Tue, 13 Dec 2022 15:04:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670972663; cv=none; d=google.com; s=arc-20160816; b=VJUZLC8P9xbLcA+RaDQcPcr8nadTALtl5xQw78Wf0llZuu7DGCQ5froZ3bu08jjZTw pd8j6mxt0mt81voUO4X9APdp7SxCuYwqfTOOASWWYain8KiPYAtKQZ0YRCA1ALa8KmpD Pp1JwbglCmJYzY/bQYtUkacyRaurb+02++j2DkoR5WZyKJpPmxSZLzlbJuD3NhZenqbO i/IfoGGfuRVkglQLekiwQGVwu6o2ueQIbsICrzWB/ZqJtmyyiyQdxSxYz6OsHBUUg+ZJ p9Ss/iidytarl09vSto/uY2N8pV5n9vCQzfVRwjTRcKtcseOdH2fW1K4qs/NeF8fr+Oy cUsg== 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; bh=vuIY8tqT9SbOA/Htc6uTmB5N+HDTt9YHD/kCrRPTyew=; b=sTBpiytINyKHKaQsGoE/jiD0YnWm4O8gScu4jZJo9YPEfHnr54FZ0xVARsVN/wffBi JkHBIQozfhyM2zAVpEgm7zqJtcQ0txprrb50ubP7Z2eJr5jECDRugAq1vvzuWjMJHivf VEAhvAbZcgh4E3hbzm1VX6/Cynt7gEaBSvLlVvN1E7Yz3NEKmuM2C5cGfJaIIqtaY1xj J03FU2nZ/94uhONgxrlPHZP9mHJh/qlds5K2yWa3wYYciEMIrmvClHceWQzT2f2CXGDL czdQg9dGN6AjfkBbsC+zf54m3HM2JeGaF4/AuuSOiy1rizn38fG72WpYXT8ZrMUO038l 0GQg== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f7-20020aa7d847000000b00469229ef941si9030476eds.468.2022.12.13.15.03.58; Tue, 13 Dec 2022 15:04:23 -0800 (PST) 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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236952AbiLMXC2 (ORCPT + 99 others); Tue, 13 Dec 2022 18:02:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236954AbiLMXCK (ORCPT ); Tue, 13 Dec 2022 18:02:10 -0500 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 3E8FF2AED; Tue, 13 Dec 2022 15:02:03 -0800 (PST) X-IronPort-AV: E=Sophos;i="5.96,242,1665414000"; d="scan'208";a="143231157" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie5.idc.renesas.com with ESMTP; 14 Dec 2022 08:02:02 +0900 Received: from mulinux.home (unknown [10.226.93.1]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 1F508400D4F6; Wed, 14 Dec 2022 08:01:56 +0900 (JST) From: Fabrizio Castro To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Michael Turquette , Stephen Boyd , Geert Uytterhoeven Cc: Fabrizio Castro , Magnus Damm , Wolfram Sang , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, Chris Paterson , Biju Das , Laurent Pinchart , Jacopo Mondi Subject: [PATCH 4/4] arm64: dts: renesas: r9a09g011: Add eMMC and SDHI support Date: Tue, 13 Dec 2022 23:01:29 +0000 Message-Id: <20221213230129.549968-5-fabrizio.castro.jz@renesas.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221213230129.549968-1-fabrizio.castro.jz@renesas.com> References: <20221213230129.549968-1-fabrizio.castro.jz@renesas.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS 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?1752141831567895757?= X-GMAIL-MSGID: =?utf-8?q?1752141831567895757?= The RZ/V2M comes with 2 SDHI interfaces and 1 eMMC interface. Add the relevant nodes to the SoC specific device tree. Signed-off-by: Fabrizio Castro Reviewed-by: Geert Uytterhoeven --- arch/arm64/boot/dts/renesas/r9a09g011.dtsi | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/arch/arm64/boot/dts/renesas/r9a09g011.dtsi b/arch/arm64/boot/dts/renesas/r9a09g011.dtsi index 0373ec409d54..dd35a8ff72ee 100644 --- a/arch/arm64/boot/dts/renesas/r9a09g011.dtsi +++ b/arch/arm64/boot/dts/renesas/r9a09g011.dtsi @@ -69,6 +69,54 @@ gic: interrupt-controller@82010000 { clock-names = "clk"; }; + sdhi0: mmc@85000000 { + compatible = "renesas,sdhi-r9a09g011", + "renesas,rcar-gen3-sdhi"; + reg = <0x0 0x85000000 0 0x2000>; + interrupts = , + ; + clocks = <&cpg CPG_MOD R9A09G011_SDI0_IMCLK>, + <&cpg CPG_MOD R9A09G011_SDI0_CLK_HS>, + <&cpg CPG_MOD R9A09G011_SDI0_IMCLK2>, + <&cpg CPG_MOD R9A09G011_SDI0_ACLK>; + clock-names = "core", "clkh", "cd", "aclk"; + resets = <&cpg R9A09G011_SDI0_IXRST>; + power-domains = <&cpg>; + status = "disabled"; + }; + + sdhi1: mmc@85010000 { + compatible = "renesas,sdhi-r9a09g011", + "renesas,rcar-gen3-sdhi"; + reg = <0x0 0x85010000 0 0x2000>; + interrupts = , + ; + clocks = <&cpg CPG_MOD R9A09G011_SDI1_IMCLK>, + <&cpg CPG_MOD R9A09G011_SDI1_CLK_HS>, + <&cpg CPG_MOD R9A09G011_SDI1_IMCLK2>, + <&cpg CPG_MOD R9A09G011_SDI1_ACLK>; + clock-names = "core", "clkh", "cd", "aclk"; + resets = <&cpg R9A09G011_SDI1_IXRST>; + power-domains = <&cpg>; + status = "disabled"; + }; + + emmc: mmc@85020000 { + compatible = "renesas,sdhi-r9a09g011", + "renesas,rcar-gen3-sdhi"; + reg = <0x0 0x85020000 0 0x2000>; + interrupts = , + ; + clocks = <&cpg CPG_MOD R9A09G011_EMM_IMCLK>, + <&cpg CPG_MOD R9A09G011_EMM_CLK_HS>, + <&cpg CPG_MOD R9A09G011_EMM_IMCLK2>, + <&cpg CPG_MOD R9A09G011_EMM_ACLK>; + clock-names = "core", "clkh", "cd", "aclk"; + resets = <&cpg R9A09G011_EMM_IXRST>; + power-domains = <&cpg>; + status = "disabled"; + }; + avb: ethernet@a3300000 { compatible = "renesas,etheravb-r9a09g011","renesas,etheravb-rzv2m"; reg = <0 0xa3300000 0 0x800>;