From nobody Mon Feb 9 01:33:02 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78B07C6FD1E for ; Tue, 7 Mar 2023 16:31:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230266AbjCGQbf (ORCPT ); Tue, 7 Mar 2023 11:31:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229914AbjCGQbJ (ORCPT ); Tue, 7 Mar 2023 11:31:09 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E684384F57 for ; Tue, 7 Mar 2023 08:31:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=JtgpuSK8MmevXI itz6mQVyFwa8KVkr2/FF+DSt6FhcE=; b=tyKU84erH9mXtS96aLIMQKmyVSd9L3 ZS1PHqinNMVw4uzLZioEtVQewxGVlp1FYSsHs+bLNjI8rdqUhOF7bCoZiTMhNvN9 JSyLEQ7lm3IwtF6a+KvacNjqBY/D0XS7XVvgQcjo1ktaJnGqkujpq3oi0H34OJxL V3Q7L7KzZf5Q8= Received: (qmail 751874 invoked from network); 7 Mar 2023 17:31:02 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:02 +0100 X-UD-Smtp-Session: l3s3148p1@DE3z71H2QI0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Laurent Pinchart , Geert Uytterhoeven , Joerg Roedel , Will Deacon , Robin Murphy , iommu@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 01/11] iommu/ipmmu-vmsa: remove R-Car H3 ES1.* handling Date: Tue, 7 Mar 2023 17:30:29 +0100 Message-Id: <20230307163041.3815-2-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" R-Car H3 ES1.* was only available to an internal development group and needed a lot of quirks and workarounds. These become a maintenance burden now, so our development group decided to remove upstream support and disable booting for this SoC. Public users only have ES2 onwards. Reviewed-by: Laurent Pinchart Reviewed-by: Geert Uytterhoeven Signed-off-by: Wolfram Sang --- Please apply individually per subsystem. There are no dependencies and the = SoC doesn't boot anymore since v6.3-rc1. drivers/iommu/ipmmu-vmsa.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c index bdf1a4e5eae0..ba42001a6f57 100644 --- a/drivers/iommu/ipmmu-vmsa.c +++ b/drivers/iommu/ipmmu-vmsa.c @@ -697,7 +697,6 @@ static const struct soc_device_attribute soc_needs_opt_= in[] =3D { =20 static const struct soc_device_attribute soc_denylist[] =3D { { .soc_id =3D "r8a774a1", }, - { .soc_id =3D "r8a7795", .revision =3D "ES1.*" }, { .soc_id =3D "r8a7795", .revision =3D "ES2.*" }, { .soc_id =3D "r8a7796", }, { /* sentinel */ } --=20 2.35.1 From nobody Mon Feb 9 01:33:02 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D491C678D5 for ; Tue, 7 Mar 2023 16:31:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229816AbjCGQbp (ORCPT ); Tue, 7 Mar 2023 11:31:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230019AbjCGQbK (ORCPT ); Tue, 7 Mar 2023 11:31:10 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A52D81CE9 for ; Tue, 7 Mar 2023 08:31:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=r8NJlSYVQC97KP ANJwbJ5dxBfAnx+TEcfLLwOb6eoh8=; b=E1ggGJn6imOYD6aNKrT5pHezz7nQYY F/QCUUzkEtJQmHsQNNP1FWrwomOKs4rLXAtuDRntfKowCo0o5qpP2wy69oDqVkUK ClgyzVJudK/4BUgZnr8d+uwDsWMf6WWIRgdNLjGJkR2s62vSY9qsxa5nZJeNxVlu 9i8e7q0916XJs= Received: (qmail 751936 invoked from network); 7 Mar 2023 17:31:03 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:03 +0100 X-UD-Smtp-Session: l3s3148p1@lYsB8FH2RI0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Laurent Pinchart , Kieran Bingham , David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 02/11] drm: rcar-du: remove R-Car H3 ES1.* workarounds Date: Tue, 7 Mar 2023 17:30:30 +0100 Message-Id: <20230307163041.3815-3-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" R-Car H3 ES1.* was only available to an internal development group and needed a lot of quirks and workarounds. These become a maintenance burden now, so our development group decided to remove upstream support and disable booting for this SoC. Public users only have ES2 onwards. Signed-off-by: Wolfram Sang Reviewed-by: Kieran Bingham --- Please apply individually per subsystem. There are no dependencies and the = SoC doesn't boot anymore since v6.3-rc1. drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 37 ++------------------ drivers/gpu/drm/rcar-du/rcar_du_drv.c | 48 -------------------------- drivers/gpu/drm/rcar-du/rcar_du_drv.h | 2 -- drivers/gpu/drm/rcar-du/rcar_du_regs.h | 3 +- 4 files changed, 4 insertions(+), 86 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-= du/rcar_du_crtc.c index 008e172ed43b..84411c452e30 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c @@ -223,20 +223,6 @@ static void rcar_du_crtc_set_display_timing(struct rca= r_du_crtc *rcrtc) * DU channels that have a display PLL can't use the internal * system clock, and have no internal clock divider. */ - - /* - * The H3 ES1.x exhibits dot clock duty cycle stability issues. - * We can work around them by configuring the DPLL to twice the - * desired frequency, coupled with a /2 post-divider. Restrict - * the workaround to H3 ES1.x as ES2.0 and all other SoCs have - * no post-divider when a display PLL is present (as shown by - * the workaround breaking HDMI output on M3-W during testing). - */ - if (rcdu->info->quirks & RCAR_DU_QUIRK_H3_ES1_PCLK_STABILITY) { - target *=3D 2; - div =3D 1; - } - extclk =3D clk_get_rate(rcrtc->extclock); rcar_du_dpll_divider(rcrtc, &dpll, extclk, target); =20 @@ -245,30 +231,13 @@ static void rcar_du_crtc_set_display_timing(struct rc= ar_du_crtc *rcrtc) | DPLLCR_N(dpll.n) | DPLLCR_M(dpll.m) | DPLLCR_STBY; =20 - if (rcrtc->index =3D=3D 1) { + if (rcrtc->index =3D=3D 1) dpllcr |=3D DPLLCR_PLCS1 | DPLLCR_INCS_DOTCLKIN1; - } else { - dpllcr |=3D DPLLCR_PLCS0_PLL + else + dpllcr |=3D DPLLCR_PLCS0 | DPLLCR_INCS_DOTCLKIN0; =20 - /* - * On ES2.x we have a single mux controlled via bit 21, - * which selects between DCLKIN source (bit 21 =3D 0) and - * a PLL source (bit 21 =3D 1), where the PLL is always - * PLL1. - * - * On ES1.x we have an additional mux, controlled - * via bit 20, for choosing between PLL0 (bit 20 =3D 0) - * and PLL1 (bit 20 =3D 1). We always want to use PLL1, - * so on ES1.x, in addition to setting bit 21, we need - * to set the bit 20. - */ - - if (rcdu->info->quirks & RCAR_DU_QUIRK_H3_ES1_PLL) - dpllcr |=3D DPLLCR_PLCS0_H3ES1X_PLL1; - } - rcar_du_group_write(rcrtc->group, DPLLCR, dpllcr); =20 escr =3D ESCR_DCLKSEL_DCLKIN | div; diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-d= u/rcar_du_drv.c index b9a94c5260e9..1ffde19cb87f 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c @@ -16,7 +16,6 @@ #include #include #include -#include #include =20 #include @@ -387,43 +386,6 @@ static const struct rcar_du_device_info rcar_du_r8a779= 5_info =3D { .dpll_mask =3D BIT(2) | BIT(1), }; =20 -static const struct rcar_du_device_info rcar_du_r8a7795_es1_info =3D { - .gen =3D 3, - .features =3D RCAR_DU_FEATURE_CRTC_IRQ - | RCAR_DU_FEATURE_CRTC_CLOCK - | RCAR_DU_FEATURE_VSP1_SOURCE - | RCAR_DU_FEATURE_INTERLACED - | RCAR_DU_FEATURE_TVM_SYNC, - .quirks =3D RCAR_DU_QUIRK_H3_ES1_PCLK_STABILITY - | RCAR_DU_QUIRK_H3_ES1_PLL, - .channels_mask =3D BIT(3) | BIT(2) | BIT(1) | BIT(0), - .routes =3D { - /* - * R8A7795 has one RGB output, two HDMI outputs and one - * LVDS output. - */ - [RCAR_DU_OUTPUT_DPAD0] =3D { - .possible_crtcs =3D BIT(3), - .port =3D 0, - }, - [RCAR_DU_OUTPUT_HDMI0] =3D { - .possible_crtcs =3D BIT(1), - .port =3D 1, - }, - [RCAR_DU_OUTPUT_HDMI1] =3D { - .possible_crtcs =3D BIT(2), - .port =3D 2, - }, - [RCAR_DU_OUTPUT_LVDS0] =3D { - .possible_crtcs =3D BIT(0), - .port =3D 3, - }, - }, - .num_lvds =3D 1, - .num_rpf =3D 5, - .dpll_mask =3D BIT(2) | BIT(1), -}; - static const struct rcar_du_device_info rcar_du_r8a7796_info =3D { .gen =3D 3, .features =3D RCAR_DU_FEATURE_CRTC_IRQ @@ -614,11 +576,6 @@ static const struct of_device_id rcar_du_of_table[] = =3D { =20 MODULE_DEVICE_TABLE(of, rcar_du_of_table); =20 -static const struct soc_device_attribute rcar_du_soc_table[] =3D { - { .soc_id =3D "r8a7795", .revision =3D "ES1.*", .data =3D &rcar_du_r8a779= 5_es1_info }, - { /* sentinel */ } -}; - const char *rcar_du_output_name(enum rcar_du_output output) { static const char * const names[] =3D { @@ -707,7 +664,6 @@ static void rcar_du_shutdown(struct platform_device *pd= ev) =20 static int rcar_du_probe(struct platform_device *pdev) { - const struct soc_device_attribute *soc_attr; struct rcar_du_device *rcdu; unsigned int mask; int ret; @@ -725,10 +681,6 @@ static int rcar_du_probe(struct platform_device *pdev) =20 rcdu->info =3D of_device_get_match_data(rcdu->dev); =20 - soc_attr =3D soc_device_match(rcar_du_soc_table); - if (soc_attr) - rcdu->info =3D soc_attr->data; - platform_set_drvdata(pdev, rcdu); =20 /* I/O resources */ diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h b/drivers/gpu/drm/rcar-d= u/rcar_du_drv.h index acc3673fefe1..5cfa2bb7ad93 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h @@ -34,8 +34,6 @@ struct rcar_du_device; #define RCAR_DU_FEATURE_NO_BLENDING BIT(5) /* PnMR.SPIM does not have ALP = nor EOR bits */ =20 #define RCAR_DU_QUIRK_ALIGN_128B BIT(0) /* Align pitches to 128 bytes */ -#define RCAR_DU_QUIRK_H3_ES1_PCLK_STABILITY BIT(1) /* H3 ES1 has pclk stab= ility issue */ -#define RCAR_DU_QUIRK_H3_ES1_PLL BIT(2) /* H3 ES1 PLL setup differs from n= on-ES1 */ =20 enum rcar_du_output { RCAR_DU_OUTPUT_DPAD0, diff --git a/drivers/gpu/drm/rcar-du/rcar_du_regs.h b/drivers/gpu/drm/rcar-= du/rcar_du_regs.h index 789ae9285108..288eff12b2b1 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_regs.h +++ b/drivers/gpu/drm/rcar-du/rcar_du_regs.h @@ -283,8 +283,7 @@ #define DPLLCR 0x20044 #define DPLLCR_CODE (0x95 << 24) #define DPLLCR_PLCS1 (1 << 23) -#define DPLLCR_PLCS0_PLL (1 << 21) -#define DPLLCR_PLCS0_H3ES1X_PLL1 (1 << 20) +#define DPLLCR_PLCS0 (1 << 21) #define DPLLCR_CLKE (1 << 18) #define DPLLCR_FDPLL(n) ((n) << 12) #define DPLLCR_N(n) ((n) << 5) --=20 2.35.1 From nobody Mon Feb 9 01:33:02 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2C39C6FD1D for ; Tue, 7 Mar 2023 16:31:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230462AbjCGQbj (ORCPT ); Tue, 7 Mar 2023 11:31:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230014AbjCGQbK (ORCPT ); Tue, 7 Mar 2023 11:31:10 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D68DC81CD9 for ; Tue, 7 Mar 2023 08:31:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=k1; bh=K SmFdOPKLYCNJfgM7xNMVh9zw+j6Ry9MBKk15S61PCk=; b=QoFqkIOdij8DrVq4M B12B1L6LVsd0RXz4z9JgR8m9f8RPeKHcwpu+ILuQdUzWBgEwpR2wQPBPMGh62OVn csP6BIRhBcdYCH78xmZf5vba1Dh0JnU9I0aFQ3h8LA1HjWjY0TnVER2u5chWm5JR v+2Q5G+uIAnx5gpZaOY2euP8dk= Received: (qmail 751963 invoked from network); 7 Mar 2023 17:31:03 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:03 +0100 X-UD-Smtp-Session: l3s3148p1@wTYM8FH2To0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Laurent Pinchart , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Geert Uytterhoeven , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 03/11] media: rcar-vin: remove R-Car H3 ES1.* handling Date: Tue, 7 Mar 2023 17:30:31 +0100 Message-Id: <20230307163041.3815-4-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org R-Car H3 ES1.* was only available to an internal development group and needed a lot of quirks and workarounds. These become a maintenance burden now, so our development group decided to remove upstream support and disable booting for this SoC. Public users only have ES2 onwards. Reviewed-by: Laurent Pinchart Reviewed-by: Niklas S=C3=B6derlund Reviewed-by: Geert Uytterhoeven Signed-off-by: Wolfram Sang --- Please apply individually per subsystem. There are no dependencies and the = SoC doesn't boot anymore since v6.3-rc1. .../platform/renesas/rcar-vin/rcar-core.c | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-core.c b/drivers/= media/platform/renesas/rcar-vin/rcar-core.c index 5e53d6b7036c..ac8f2126540b 100644 --- a/drivers/media/platform/renesas/rcar-vin/rcar-core.c +++ b/drivers/media/platform/renesas/rcar-vin/rcar-core.c @@ -17,7 +17,6 @@ #include #include #include -#include =20 #include #include @@ -1183,24 +1182,6 @@ static const struct rvin_info rcar_info_r8a7795 =3D { .scaler =3D rvin_scaler_gen3, }; =20 -static const struct rvin_group_route rcar_info_r8a7795es1_routes[] =3D { - { .master =3D 0, .csi =3D RVIN_CSI20, .chsel =3D 0x04 }, - { .master =3D 0, .csi =3D RVIN_CSI21, .chsel =3D 0x05 }, - { .master =3D 0, .csi =3D RVIN_CSI40, .chsel =3D 0x03 }, - { .master =3D 4, .csi =3D RVIN_CSI20, .chsel =3D 0x04 }, - { .master =3D 4, .csi =3D RVIN_CSI21, .chsel =3D 0x05 }, - { .master =3D 4, .csi =3D RVIN_CSI41, .chsel =3D 0x03 }, - { /* Sentinel */ } -}; - -static const struct rvin_info rcar_info_r8a7795es1 =3D { - .model =3D RCAR_GEN3, - .use_mc =3D true, - .max_width =3D 4096, - .max_height =3D 4096, - .routes =3D rcar_info_r8a7795es1_routes, -}; - static const struct rvin_group_route rcar_info_r8a7796_routes[] =3D { { .master =3D 0, .csi =3D RVIN_CSI20, .chsel =3D 0x04 }, { .master =3D 0, .csi =3D RVIN_CSI40, .chsel =3D 0x03 }, @@ -1372,17 +1353,8 @@ static const struct of_device_id rvin_of_id_table[] = =3D { }; MODULE_DEVICE_TABLE(of, rvin_of_id_table); =20 -static const struct soc_device_attribute r8a7795es1[] =3D { - { - .soc_id =3D "r8a7795", .revision =3D "ES1.*", - .data =3D &rcar_info_r8a7795es1, - }, - { /* Sentinel */ } -}; - static int rcar_vin_probe(struct platform_device *pdev) { - const struct soc_device_attribute *attr; struct rvin_dev *vin; int irq, ret; =20 @@ -1394,14 +1366,6 @@ static int rcar_vin_probe(struct platform_device *pd= ev) vin->info =3D of_device_get_match_data(&pdev->dev); vin->alpha =3D 0xff; =20 - /* - * Special care is needed on r8a7795 ES1.x since it - * uses different routing than r8a7795 ES2.0. - */ - attr =3D soc_device_match(r8a7795es1); - if (attr) - vin->info =3D attr->data; - vin->base =3D devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(vin->base)) return PTR_ERR(vin->base); --=20 2.35.1 From nobody Mon Feb 9 01:33:02 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15C4EC6FD1A for ; Tue, 7 Mar 2023 16:31:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229579AbjCGQbu (ORCPT ); Tue, 7 Mar 2023 11:31:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229963AbjCGQbc (ORCPT ); Tue, 7 Mar 2023 11:31:32 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B16B8537E for ; Tue, 7 Mar 2023 08:31:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=k1; bh=2 xmX64li5R8XVTY3e1IAV+jsSJYToTSbgonh9QmzGO8=; b=Asljh3Po8WQaM88UM /Qq2Lpzu4SxwtJIev27pFgr42fbPqqVDHXgovSh6/rAueps5ji3Y76gowGbtp9Qi HP1dbCiOJCFgwEYaiGQjEoam7gl0rx9DZ0B5ppkUZ6AqeCJF1T2X6XTCBQ4huIg9 sJIqXFRFl+YsGj4lRQLREZ7rK8= Received: (qmail 751992 invoked from network); 7 Mar 2023 17:31:04 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:04 +0100 X-UD-Smtp-Session: l3s3148p1@a1AX8FH2XI0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Laurent Pinchart , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/11] media: rcar-vin: csi2: remove R-Car H3 ES1.* handling Date: Tue, 7 Mar 2023 17:30:32 +0100 Message-Id: <20230307163041.3815-5-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org R-Car H3 ES1.* was only available to an internal development group and needed a lot of quirks and workarounds. These become a maintenance burden now, so our development group decided to remove upstream support and disable booting for this SoC. Public users only have ES2 onwards. Reviewed-by: Laurent Pinchart Reviewed-by: Niklas S=C3=B6derlund Signed-off-by: Wolfram Sang --- Please apply individually per subsystem. There are no dependencies and the = SoC doesn't boot anymore since v6.3-rc1. .../media/platform/renesas/rcar-vin/rcar-csi2.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c b/drivers/= media/platform/renesas/rcar-vin/rcar-csi2.c index 174aa6176f54..5dbd0daa8735 100644 --- a/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c +++ b/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c @@ -345,7 +345,7 @@ static const struct rcsi2_mbps_reg hsfreqrange_h3_v3h_m= 3n[] =3D { { /* sentinel */ }, }; =20 -static const struct rcsi2_mbps_reg hsfreqrange_m3w_h3es1[] =3D { +static const struct rcsi2_mbps_reg hsfreqrange_m3w[] =3D { { .mbps =3D 80, .reg =3D 0x00 }, { .mbps =3D 90, .reg =3D 0x10 }, { .mbps =3D 100, .reg =3D 0x20 }, @@ -1369,11 +1369,6 @@ static const struct rcar_csi2_info rcar_csi2_info_r8= a7795 =3D { .clear_ulps =3D true, }; =20 -static const struct rcar_csi2_info rcar_csi2_info_r8a7795es1 =3D { - .hsfreqrange =3D hsfreqrange_m3w_h3es1, - .num_channels =3D 4, -}; - static const struct rcar_csi2_info rcar_csi2_info_r8a7795es2 =3D { .init_phtw =3D rcsi2_init_phtw_h3es2, .hsfreqrange =3D hsfreqrange_h3_v3h_m3n, @@ -1383,12 +1378,12 @@ static const struct rcar_csi2_info rcar_csi2_info_r= 8a7795es2 =3D { }; =20 static const struct rcar_csi2_info rcar_csi2_info_r8a7796 =3D { - .hsfreqrange =3D hsfreqrange_m3w_h3es1, + .hsfreqrange =3D hsfreqrange_m3w, .num_channels =3D 4, }; =20 static const struct rcar_csi2_info rcar_csi2_info_r8a77961 =3D { - .hsfreqrange =3D hsfreqrange_m3w_h3es1, + .hsfreqrange =3D hsfreqrange_m3w, .num_channels =3D 4, }; =20 @@ -1481,10 +1476,6 @@ static const struct of_device_id rcar_csi2_of_table[= ] =3D { MODULE_DEVICE_TABLE(of, rcar_csi2_of_table); =20 static const struct soc_device_attribute r8a7795[] =3D { - { - .soc_id =3D "r8a7795", .revision =3D "ES1.*", - .data =3D &rcar_csi2_info_r8a7795es1, - }, { .soc_id =3D "r8a7795", .revision =3D "ES2.*", .data =3D &rcar_csi2_info_r8a7795es2, --=20 2.35.1 From nobody Mon Feb 9 01:33:02 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55265C6FD1A for ; Tue, 7 Mar 2023 16:31:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230519AbjCGQbz (ORCPT ); Tue, 7 Mar 2023 11:31:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229958AbjCGQbc (ORCPT ); Tue, 7 Mar 2023 11:31:32 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3220C85A42 for ; Tue, 7 Mar 2023 08:31:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=BL47/9gshlsQiA D5V7ioQV+yS8e/Scob5w8583YxF3o=; b=JDSYoj8VlQmdXygO7ag7zGmEizmUR4 rmYi5kQbOz4dp6qm+SOZ12S6B5zg5R1o8Kg9yxr6EmDyWyo4SJUD5Ia8qNI39dSv rvXDSYTdsSwBBj/B8rb1CLBD2QULzLezh88j6DLbeUFrATr7zs1eJiy2ajVsPO9y U02JKNT4atRw8= Received: (qmail 752025 invoked from network); 7 Mar 2023 17:31:05 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:05 +0100 X-UD-Smtp-Session: l3s3148p1@ROgh8FH2bI0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Geert Uytterhoeven , Kieran Bingham , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/11] media: renesas: fdp1: remove R-Car H3 ES1.* handling Date: Tue, 7 Mar 2023 17:30:33 +0100 Message-Id: <20230307163041.3815-6-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" R-Car H3 ES1.* was only available to an internal development group and needed a lot of quirks and workarounds. These become a maintenance burden now, so our development group decided to remove upstream support and disable booting for this SoC. Public users only have ES2 onwards. Reviewed-by: Geert Uytterhoeven Signed-off-by: Wolfram Sang Reviewed-by: Kieran Bingham --- Please apply individually per subsystem. There are no dependencies and the = SoC doesn't boot anymore since v6.3-rc1. drivers/media/platform/renesas/rcar_fdp1.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/media/platform/renesas/rcar_fdp1.c b/drivers/media/pla= tform/renesas/rcar_fdp1.c index 37ecf489d112..f4a1fc8ce595 100644 --- a/drivers/media/platform/renesas/rcar_fdp1.c +++ b/drivers/media/platform/renesas/rcar_fdp1.c @@ -254,7 +254,6 @@ MODULE_PARM_DESC(debug, "activate debug info"); =20 /* Internal Data (HW Version) */ #define FD1_IP_INTDATA 0x0800 -#define FD1_IP_H3_ES1 0x02010101 #define FD1_IP_M3W 0x02010202 #define FD1_IP_H3 0x02010203 #define FD1_IP_M3N 0x02010204 @@ -2359,9 +2358,6 @@ static int fdp1_probe(struct platform_device *pdev) =20 hw_version =3D fdp1_read(fdp1, FD1_IP_INTDATA); switch (hw_version) { - case FD1_IP_H3_ES1: - dprintk(fdp1, "FDP1 Version R-Car H3 ES1\n"); - break; case FD1_IP_M3W: dprintk(fdp1, "FDP1 Version R-Car M3-W\n"); break; --=20 2.35.1 From nobody Mon Feb 9 01:33:02 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30928C6FD1A for ; Tue, 7 Mar 2023 16:32:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230526AbjCGQcB (ORCPT ); Tue, 7 Mar 2023 11:32:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230120AbjCGQbd (ORCPT ); Tue, 7 Mar 2023 11:31:33 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D98585A6B for ; Tue, 7 Mar 2023 08:31:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=k1; bh=n MY5bp/F1Kn36OJqLi8QTMaLHuNLJdfOvyLRKL/dfXI=; b=dKsH9dmTF5NW5Pq15 dDiu59gIoegD8bIv8XjwHOAdxhvUTYJ20c+A+ZmGn9DQojqDbaWWjQDEANvOv0io qQI3k/s91plKOYXSXQia4cnVRPWd06KwhDHpsj4xsSv10RNrYvDQn7tLD2N1nX8L dq33zlAgKwpq/6pAgpm4irwXIM= Received: (qmail 752052 invoked from network); 7 Mar 2023 17:31:06 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:06 +0100 X-UD-Smtp-Session: l3s3148p1@1Bwt8FH2bo0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Laurent Pinchart , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Geert Uytterhoeven , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , "Rafael J. Wysocki" , Daniel Lezcano , Amit Kucheria , Zhang Rui , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/11] thermal/drivers/rcar_gen3_thermal: remove R-Car H3 ES1.* handling Date: Tue, 7 Mar 2023 17:30:34 +0100 Message-Id: <20230307163041.3815-7-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org R-Car H3 ES1.* was only available to an internal development group and needed a lot of quirks and workarounds. These become a maintenance burden now, so our development group decided to remove upstream support and disable booting for this SoC. Public users only have ES2 onwards. Reviewed-by: Laurent Pinchart Reviewed-by: Niklas S=C3=B6derlund Reviewed-by: Geert Uytterhoeven Signed-off-by: Wolfram Sang --- Please apply individually per subsystem. There are no dependencies and the = SoC doesn't boot anymore since v6.3-rc1. drivers/thermal/rcar_gen3_thermal.c | 52 ++--------------------------- 1 file changed, 2 insertions(+), 50 deletions(-) diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen= 3_thermal.c index d6b5b59c5c53..e97d1798b5a3 100644 --- a/drivers/thermal/rcar_gen3_thermal.c +++ b/drivers/thermal/rcar_gen3_thermal.c @@ -14,7 +14,6 @@ #include #include #include -#include #include =20 #include "thermal_hwmon.h" @@ -27,7 +26,6 @@ #define REG_GEN3_IRQTEMP1 0x14 #define REG_GEN3_IRQTEMP2 0x18 #define REG_GEN3_IRQTEMP3 0x1C -#define REG_GEN3_CTSR 0x20 #define REG_GEN3_THCTR 0x20 #define REG_GEN3_TEMP 0x28 #define REG_GEN3_THCODE1 0x50 @@ -46,14 +44,6 @@ #define IRQ_TEMPD2 BIT(4) #define IRQ_TEMPD3 BIT(5) =20 -/* CTSR bits */ -#define CTSR_PONM BIT(8) -#define CTSR_AOUT BIT(7) -#define CTSR_THBGR BIT(5) -#define CTSR_VMEN BIT(4) -#define CTSR_VMST BIT(1) -#define CTSR_THSST BIT(0) - /* THCTR bits */ #define THCTR_PONM BIT(6) #define THCTR_THSST BIT(0) @@ -88,8 +78,6 @@ struct rcar_gen3_thermal_priv { struct rcar_gen3_thermal_tsc *tscs[TSC_MAX_NUM]; struct thermal_zone_device_ops ops; unsigned int num_tscs; - void (*thermal_init)(struct rcar_gen3_thermal_priv *priv, - struct rcar_gen3_thermal_tsc *tsc); int ptat[3]; }; =20 @@ -248,11 +236,6 @@ static irqreturn_t rcar_gen3_thermal_irq(int irq, void= *data) return IRQ_HANDLED; } =20 -static const struct soc_device_attribute r8a7795es1[] =3D { - { .soc_id =3D "r8a7795", .revision =3D "ES1.*" }, - { /* sentinel */ } -}; - static bool rcar_gen3_thermal_read_fuses(struct rcar_gen3_thermal_priv *pr= iv) { unsigned int i; @@ -311,34 +294,6 @@ static bool rcar_gen3_thermal_read_fuses(struct rcar_g= en3_thermal_priv *priv) return true; } =20 -static void rcar_gen3_thermal_init_r8a7795es1(struct rcar_gen3_thermal_pri= v *priv, - struct rcar_gen3_thermal_tsc *tsc) -{ - rcar_gen3_thermal_write(tsc, REG_GEN3_CTSR, CTSR_THBGR); - rcar_gen3_thermal_write(tsc, REG_GEN3_CTSR, 0x0); - - usleep_range(1000, 2000); - - rcar_gen3_thermal_write(tsc, REG_GEN3_CTSR, CTSR_PONM); - - rcar_gen3_thermal_write(tsc, REG_GEN3_IRQCTL, 0x3F); - rcar_gen3_thermal_write(tsc, REG_GEN3_IRQMSK, 0); - if (priv->ops.set_trips) - rcar_gen3_thermal_write(tsc, REG_GEN3_IRQEN, - IRQ_TEMPD1 | IRQ_TEMP2); - - rcar_gen3_thermal_write(tsc, REG_GEN3_CTSR, - CTSR_PONM | CTSR_AOUT | CTSR_THBGR | CTSR_VMEN); - - usleep_range(100, 200); - - rcar_gen3_thermal_write(tsc, REG_GEN3_CTSR, - CTSR_PONM | CTSR_AOUT | CTSR_THBGR | CTSR_VMEN | - CTSR_VMST | CTSR_THSST); - - usleep_range(1000, 2000); -} - static void rcar_gen3_thermal_init(struct rcar_gen3_thermal_priv *priv, struct rcar_gen3_thermal_tsc *tsc) { @@ -474,9 +429,6 @@ static int rcar_gen3_thermal_probe(struct platform_devi= ce *pdev) return -ENOMEM; =20 priv->ops =3D rcar_gen3_tz_of_ops; - priv->thermal_init =3D rcar_gen3_thermal_init; - if (soc_device_match(r8a7795es1)) - priv->thermal_init =3D rcar_gen3_thermal_init_r8a7795es1; =20 platform_set_drvdata(pdev, priv); =20 @@ -516,7 +468,7 @@ static int rcar_gen3_thermal_probe(struct platform_devi= ce *pdev) for (i =3D 0; i < priv->num_tscs; i++) { struct rcar_gen3_thermal_tsc *tsc =3D priv->tscs[i]; =20 - priv->thermal_init(priv, tsc); + rcar_gen3_thermal_init(priv, tsc); rcar_gen3_thermal_calc_coefs(priv, tsc, *ths_tj_1); =20 zone =3D devm_thermal_of_zone_register(dev, i, tsc, &priv->ops); @@ -564,7 +516,7 @@ static int __maybe_unused rcar_gen3_thermal_resume(stru= ct device *dev) for (i =3D 0; i < priv->num_tscs; i++) { struct rcar_gen3_thermal_tsc *tsc =3D priv->tscs[i]; =20 - priv->thermal_init(priv, tsc); + rcar_gen3_thermal_init(priv, tsc); } =20 return 0; --=20 2.35.1 From nobody Mon Feb 9 01:33:02 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF1EBC678D5 for ; Tue, 7 Mar 2023 16:32:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231147AbjCGQcE (ORCPT ); Tue, 7 Mar 2023 11:32:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229906AbjCGQbd (ORCPT ); Tue, 7 Mar 2023 11:31:33 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3E6F867F5 for ; Tue, 7 Mar 2023 08:31:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=GpZGDUwUsE0ds3 5pzFLaSmr9UzqZGY5gVr/k+4eStUI=; b=d8U3ZjUdS2Nw+DeBbeC04ON8UrepdH YdMmmpWc+wEMSdxPTDCRtV/+gV+d1IXrtqFEIAHk2TsR2FKaPX06lQCnuoA9QmwN bPbSwtm1Ll0zjXq8c/bm0K94IvQWEiN2IE8Zvw6XnCH0cfdDejo3Y78WIC/YRyNW +SvV5BjoxHBik= Received: (qmail 752076 invoked from network); 7 Mar 2023 17:31:06 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:06 +0100 X-UD-Smtp-Session: l3s3148p1@b+848FH2dI0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Laurent Pinchart , Geert Uytterhoeven , Sergey Shtylyov , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 07/11] ravb: remove R-Car H3 ES1.* handling Date: Tue, 7 Mar 2023 17:30:35 +0100 Message-Id: <20230307163041.3815-8-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" R-Car H3 ES1.* was only available to an internal development group and needed a lot of quirks and workarounds. These become a maintenance burden now, so our development group decided to remove upstream support and disable booting for this SoC. Public users only have ES2 onwards. Reviewed-by: Laurent Pinchart Reviewed-by: Geert Uytterhoeven Signed-off-by: Wolfram Sang Reviewed-by: Sergey Shtylyov --- Please apply individually per subsystem. There are no dependencies and the = SoC doesn't boot anymore since v6.3-rc1. drivers/net/ethernet/renesas/ravb_main.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/etherne= t/renesas/ravb_main.c index 0f54849a3823..b81f0d8dfda8 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include =20 @@ -1390,11 +1389,6 @@ static void ravb_adjust_link(struct net_device *ndev) phy_print_status(phydev); } =20 -static const struct soc_device_attribute r8a7795es10[] =3D { - { .soc_id =3D "r8a7795", .revision =3D "ES1.0", }, - { /* sentinel */ } -}; - /* PHY init function */ static int ravb_phy_init(struct net_device *ndev) { @@ -1434,15 +1428,6 @@ static int ravb_phy_init(struct net_device *ndev) goto err_deregister_fixed_link; } =20 - /* This driver only support 10/100Mbit speeds on R-Car H3 ES1.0 - * at this time. - */ - if (soc_device_match(r8a7795es10)) { - phy_set_max_speed(phydev, SPEED_100); - - netdev_info(ndev, "limited PHY to 100Mbit/s\n"); - } - if (!info->half_duplex) { /* 10BASE, Pause and Asym Pause is not supported */ phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_10baseT_Half_BIT); --=20 2.35.1 From nobody Mon Feb 9 01:33:02 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55A9DC6FD1A for ; Tue, 7 Mar 2023 16:32:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231157AbjCGQcH (ORCPT ); Tue, 7 Mar 2023 11:32:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230172AbjCGQbe (ORCPT ); Tue, 7 Mar 2023 11:31:34 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8A22867FF for ; Tue, 7 Mar 2023 08:31:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=/K+5ZHq3qxSf+u vMlu2Mbiy40EGhHX9fwgqPWBWOR8I=; b=bXVpGEvcPTMHGGn12V34q06RQqS/TJ MSkDKcNVIhNZGp7VZjENZqlGZICMjLAgfjIKNchkI9GePBemruUWSrM+vofyci+n b3iCFgHU4k7Vor6ZOMq4EWTXI6xjoJImlsPOWXkNpZqK/w6J6an/8HkMAIvd3pwc NZDsuJLSKxJho= Received: (qmail 752100 invoked from network); 7 Mar 2023 17:31:07 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:07 +0100 X-UD-Smtp-Session: l3s3148p1@lJ5E8FH2go0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Laurent Pinchart , Geert Uytterhoeven , Ulf Hansson , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 08/11] mmc: renesas_sdhi: remove R-Car H3 ES1.* handling Date: Tue, 7 Mar 2023 17:30:36 +0100 Message-Id: <20230307163041.3815-9-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" R-Car H3 ES1.* was only available to an internal development group and needed a lot of quirks and workarounds. These become a maintenance burden now, so our development group decided to remove upstream support and disable booting for this SoC. Public users only have ES2 onwards. Reviewed-by: Laurent Pinchart Reviewed-by: Geert Uytterhoeven Signed-off-by: Wolfram Sang --- Please apply individually per subsystem. There are no dependencies and the = SoC doesn't boot anymore since v6.3-rc1. drivers/mmc/host/renesas_sdhi_internal_dmac.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/ho= st/renesas_sdhi_internal_dmac.c index f38003f6b1ca..9ab813903b2c 100644 --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c @@ -72,11 +72,10 @@ enum renesas_sdhi_dma_cookie { =20 static unsigned long global_flags; /* - * Workaround for avoiding to use RX DMAC by multiple channels. - * On R-Car H3 ES1.* and M3-W ES1.0, when multiple SDHI channels use - * RX DMAC simultaneously, sometimes hundreds of bytes data are not - * stored into the system memory even if the DMAC interrupt happened. - * So, this driver then uses one RX DMAC channel only. + * Workaround for avoiding to use RX DMAC by multiple channels. On R-Car M= 3-W + * ES1.0, when multiple SDHI channels use RX DMAC simultaneously, sometimes + * hundreds of data bytes are not stored into the system memory even if the + * DMAC interrupt happened. So, this driver then uses one RX DMAC channel = only. */ #define SDHI_INTERNAL_DMAC_RX_IN_USE 0 =20 @@ -222,7 +221,6 @@ static const struct renesas_sdhi_quirks sdhi_quirks_r9a= 09g011 =3D { */ static const struct soc_device_attribute sdhi_quirks_match[] =3D { { .soc_id =3D "r8a774a1", .revision =3D "ES1.[012]", .data =3D &sdhi_quir= ks_4tap_nohs400 }, - { .soc_id =3D "r8a7795", .revision =3D "ES1.*", .data =3D &sdhi_quirks_4t= ap_nohs400_one_rx }, { .soc_id =3D "r8a7795", .revision =3D "ES2.0", .data =3D &sdhi_quirks_4t= ap }, { .soc_id =3D "r8a7796", .revision =3D "ES1.0", .data =3D &sdhi_quirks_4t= ap_nohs400_one_rx }, { .soc_id =3D "r8a7796", .revision =3D "ES1.[12]", .data =3D &sdhi_quirks= _4tap_nohs400 }, --=20 2.35.1 From nobody Mon Feb 9 01:33:02 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 085C9C6FD1B for ; Tue, 7 Mar 2023 16:32:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230513AbjCGQcR (ORCPT ); Tue, 7 Mar 2023 11:32:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230199AbjCGQbf (ORCPT ); Tue, 7 Mar 2023 11:31:35 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA32B85B37 for ; Tue, 7 Mar 2023 08:31:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=tgR8Ib7gK0xta9 gDLehMBy5oVmognDSKS3+BEb2nqRg=; b=OtSAgJqkwCb6Mk0PQ1uS5dTxmbrriB z12jHlsAq1QaKoaNz3LyOZvaAsGJNQLOxSB+vDtlbV++blTyISQXyUCNW180CXnG LGv5vGJr+bfv0IklUrgYAUh0R4z/LAkOdX2gqKzJ6GGhMXLYSk86uRJHWUFhPfMh /zVCxFrB7G4aA= Received: (qmail 752141 invoked from network); 7 Mar 2023 17:31:08 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:08 +0100 X-UD-Smtp-Session: l3s3148p1@VDhQ8FH2hI0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Geert Uytterhoeven , Mathias Nyman , Greg Kroah-Hartman , Yoshihiro Shimoda , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 09/11] usb: host: xhci-rcar: remove leftover quirk handling Date: Tue, 7 Mar 2023 17:30:37 +0100 Message-Id: <20230307163041.3815-10-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Loading V3 firmware does not need a quirk anymore, remove the leftover code. Fixes: ed8603e11124 ("usb: host: xhci-rcar: Simplify getting the firmware n= ame for R-Car Gen3") Reviewed-by: Geert Uytterhoeven Signed-off-by: Wolfram Sang --- Please apply individually per subsystem. This is in preparation for R-Car H3 ES1 removal. There are no dependencies. drivers/usb/host/xhci-rcar.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c index 7f18509a1d39..567b096a24e9 100644 --- a/drivers/usb/host/xhci-rcar.c +++ b/drivers/usb/host/xhci-rcar.c @@ -80,7 +80,6 @@ MODULE_FIRMWARE(XHCI_RCAR_FIRMWARE_NAME_V3); =20 /* For soc_device_attribute */ #define RCAR_XHCI_FIRMWARE_V2 BIT(0) /* FIRMWARE V2 */ -#define RCAR_XHCI_FIRMWARE_V3 BIT(1) /* FIRMWARE V3 */ =20 static const struct soc_device_attribute rcar_quirks_match[] =3D { { @@ -152,8 +151,6 @@ static int xhci_rcar_download_firmware(struct usb_hcd *= hcd) =20 if (quirks & RCAR_XHCI_FIRMWARE_V2) firmware_name =3D XHCI_RCAR_FIRMWARE_NAME_V2; - else if (quirks & RCAR_XHCI_FIRMWARE_V3) - firmware_name =3D XHCI_RCAR_FIRMWARE_NAME_V3; else firmware_name =3D priv->firmware_name; =20 --=20 2.35.1 From nobody Mon Feb 9 01:33:02 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF850C6FD1A for ; Tue, 7 Mar 2023 16:32:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230267AbjCGQcO (ORCPT ); Tue, 7 Mar 2023 11:32:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229621AbjCGQbf (ORCPT ); Tue, 7 Mar 2023 11:31:35 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F13E687DB7 for ; Tue, 7 Mar 2023 08:31:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=juPKvg3mXsPI+d KK+OfMfbvis/2IhqLMDrHF/YQ7PsQ=; b=3lkWw1PH2ESzdu3ChWiC3w9aDSEBH7 pQir+nKMoHWKsaU1AarnaMTWjb3cU52GhXObeKKQevM/KoLNJhAoUdBBieIvEesl 33+0VqNGSJz7gJ+IsWZqbiJs+XsMzHzjhdtUm47IebC9fvhS0cXn+arvU2qdUuie MJJYshY1vj544= Received: (qmail 752176 invoked from network); 7 Mar 2023 17:31:09 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:09 +0100 X-UD-Smtp-Session: l3s3148p1@QeZb8FH2iI0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Laurent Pinchart , Geert Uytterhoeven , Mathias Nyman , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 10/11] usb: host: xhci-rcar: remove R-Car H3 ES1.* handling Date: Tue, 7 Mar 2023 17:30:38 +0100 Message-Id: <20230307163041.3815-11-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" R-Car H3 ES1.* was only available to an internal development group and needed a lot of quirks and workarounds. These become a maintenance burden now, so our development group decided to remove upstream support and disable booting for this SoC. Public users only have ES2 onwards. Reviewed-by: Laurent Pinchart Reviewed-by: Geert Uytterhoeven Signed-off-by: Wolfram Sang --- Please apply individually per subsystem. There are no dependencies and the = SoC doesn't boot anymore since v6.3-rc1. drivers/usb/host/xhci-rcar.c | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c index 567b096a24e9..c4925f8d6b06 100644 --- a/drivers/usb/host/xhci-rcar.c +++ b/drivers/usb/host/xhci-rcar.c @@ -12,26 +12,22 @@ #include #include #include -#include =20 #include "xhci.h" #include "xhci-plat.h" #include "xhci-rzv2m.h" =20 #define XHCI_RCAR_FIRMWARE_NAME_V1 "r8a779x_usb3_v1.dlmem" -#define XHCI_RCAR_FIRMWARE_NAME_V2 "r8a779x_usb3_v2.dlmem" #define XHCI_RCAR_FIRMWARE_NAME_V3 "r8a779x_usb3_v3.dlmem" =20 /* -* - The V3 firmware is for almost all R-Car Gen3 (except r8a7795 ES1.x) -* - The V2 firmware is for r8a7795 ES1.x. +* - The V3 firmware is for all R-Car Gen3 * - The V2 firmware is possible to use on R-Car Gen2. However, the V2 caus= es * performance degradation. So, this driver continues to use the V1 if R-= Car * Gen2. * - The V1 firmware is impossible to use on R-Car Gen3. */ MODULE_FIRMWARE(XHCI_RCAR_FIRMWARE_NAME_V1); -MODULE_FIRMWARE(XHCI_RCAR_FIRMWARE_NAME_V2); MODULE_FIRMWARE(XHCI_RCAR_FIRMWARE_NAME_V3); =20 /*** Register Offset ***/ @@ -78,17 +74,6 @@ MODULE_FIRMWARE(XHCI_RCAR_FIRMWARE_NAME_V3); #define RCAR_USB3_RX_POL_VAL BIT(21) #define RCAR_USB3_TX_POL_VAL BIT(4) =20 -/* For soc_device_attribute */ -#define RCAR_XHCI_FIRMWARE_V2 BIT(0) /* FIRMWARE V2 */ - -static const struct soc_device_attribute rcar_quirks_match[] =3D { - { - .soc_id =3D "r8a7795", .revision =3D "ES1.*", - .data =3D (void *)RCAR_XHCI_FIRMWARE_V2, - }, - { /* sentinel */ } -}; - static void xhci_rcar_start_gen2(struct usb_hcd *hcd) { /* LCLK Select */ @@ -134,9 +119,6 @@ static int xhci_rcar_download_firmware(struct usb_hcd *= hcd) const struct firmware *fw; int retval, index, j; u32 data, val, temp; - u32 quirks =3D 0; - const struct soc_device_attribute *attr; - const char *firmware_name; =20 /* * According to the datasheet, "Upon the completion of FW Download, @@ -145,17 +127,8 @@ static int xhci_rcar_download_firmware(struct usb_hcd = *hcd) if (readl(regs + RCAR_USB3_DL_CTRL) & RCAR_USB3_DL_CTRL_FW_SUCCESS) return 0; =20 - attr =3D soc_device_match(rcar_quirks_match); - if (attr) - quirks =3D (uintptr_t)attr->data; - - if (quirks & RCAR_XHCI_FIRMWARE_V2) - firmware_name =3D XHCI_RCAR_FIRMWARE_NAME_V2; - else - firmware_name =3D priv->firmware_name; - /* request R-Car USB3.0 firmware */ - retval =3D request_firmware(&fw, firmware_name, dev); + retval =3D request_firmware(&fw, priv->firmware_name, dev); if (retval) return retval; =20 --=20 2.35.1 From nobody Mon Feb 9 01:33:02 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC93DC678D5 for ; Tue, 7 Mar 2023 16:32:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229961AbjCGQc1 (ORCPT ); Tue, 7 Mar 2023 11:32:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230367AbjCGQbh (ORCPT ); Tue, 7 Mar 2023 11:31:37 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1869B8ABFB for ; Tue, 7 Mar 2023 08:31:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=FoqjTA8Za4V7Be 7RYCx6I7pfuapKZ/gfbeqrJ+oZq7U=; b=lVTYO2h09AuGHmx0lS5IH2B2gRy/0H EZD0zooyaK8UpeBrlro8t4Tzzbzcz4t9pOD+XRaWvoigrKiZgaGBHxlTPDr7IlC8 VzNsnewjdkjffMs9YN5AVi8287uiSh8D+GZn/VX/mx8ejokS/1pNbbDjHEUBQLKl jwU1HcVVWmawE= Received: (qmail 752222 invoked from network); 7 Mar 2023 17:31:09 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:09 +0100 X-UD-Smtp-Session: l3s3148p1@ggVo8FH2io0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Laurent Pinchart , Geert Uytterhoeven , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 11/11] usb: gadget: udc: renesas_usb3: remove R-Car H3 ES1.* handling Date: Tue, 7 Mar 2023 17:30:39 +0100 Message-Id: <20230307163041.3815-12-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" R-Car H3 ES1.* was only available to an internal development group and needed a lot of quirks and workarounds. These become a maintenance burden now, so our development group decided to remove upstream support and disable booting for this SoC. Public users only have ES2 onwards. Reviewed-by: Laurent Pinchart Reviewed-by: Geert Uytterhoeven Signed-off-by: Wolfram Sang --- Please apply individually per subsystem. There are no dependencies and the = SoC doesn't boot anymore since v6.3-rc1. drivers/usb/gadget/udc/renesas_usb3.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc= /renesas_usb3.c index bee6bceafc4f..f2ac6447b748 100644 --- a/drivers/usb/gadget/udc/renesas_usb3.c +++ b/drivers/usb/gadget/udc/renesas_usb3.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -2781,13 +2780,6 @@ static void renesas_usb3_init_ram(struct renesas_usb= 3 *usb3, struct device *dev, } } =20 -static const struct renesas_usb3_priv renesas_usb3_priv_r8a7795_es1 =3D { - .ramsize_per_ramif =3D SZ_16K, - .num_ramif =3D 2, - .ramsize_per_pipe =3D SZ_4K, - .workaround_for_vbus =3D true, -}; - static const struct renesas_usb3_priv renesas_usb3_priv_gen3 =3D { .ramsize_per_ramif =3D SZ_16K, .num_ramif =3D 4, @@ -2829,14 +2821,6 @@ static const struct of_device_id usb3_of_match[] =3D= { }; MODULE_DEVICE_TABLE(of, usb3_of_match); =20 -static const struct soc_device_attribute renesas_usb3_quirks_match[] =3D { - { - .soc_id =3D "r8a7795", .revision =3D "ES1.*", - .data =3D &renesas_usb3_priv_r8a7795_es1, - }, - { /* sentinel */ } -}; - static const unsigned int renesas_usb3_cable[] =3D { EXTCON_USB, EXTCON_USB_HOST, @@ -2854,13 +2838,8 @@ static int renesas_usb3_probe(struct platform_device= *pdev) struct renesas_usb3 *usb3; int irq, ret; const struct renesas_usb3_priv *priv; - const struct soc_device_attribute *attr; =20 - attr =3D soc_device_match(renesas_usb3_quirks_match); - if (attr) - priv =3D attr->data; - else - priv =3D of_device_get_match_data(&pdev->dev); + priv =3D of_device_get_match_data(&pdev->dev); =20 irq =3D platform_get_irq(pdev, 0); if (irq < 0) --=20 2.35.1