From nobody Thu Oct 2 14:27:43 2025 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6EBFF34A33A for ; Tue, 16 Sep 2025 15:03:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758034987; cv=none; b=orfGdORZC+JZsgnhR3OyaqELNYn+rgs5AbIl2ZgelTLX+yvgjPdg1kWXOiby7CCr1fGariuQ+zWQC+miJ5cf/YBYR2D8yQ7xx/CZAfI60OH1+96j+2IMY0AGkIWZyavC/6McpTrYrK4OcqwXtgMfm3MZj8J9e06QCVXDmoBHukE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758034987; c=relaxed/simple; bh=JWAOPJVJwm9JYWeWUAD5rygvd8/WMZojAO7MBTDFeao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N9vIuUwrEsafyyndKcddV5TsyN3Ccvrlb7QXIDWrBRQkrE2artQrL92HRGWcsaWVHbpHSIX6oT+uiFrg1tXlpnO9mC8l4sBb9y/4I39pWIsbfYtanPIwl2wabuDKJA3avSGt+AOSsiR1XBI7QOJ8N/dapfYemrFmhjTs8VcJXUA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=e+znDs0p; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="e+znDs0p" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-45df7dc1b98so38630295e9.1 for ; Tue, 16 Sep 2025 08:03:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758034982; x=1758639782; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Uuy6+KxTBsC6SlUdB1lv3rItTmRywfPxKGtKtkwquJE=; b=e+znDs0pGGlz4NGNnRj7sJynRZQsghAUSe9ow1UgR9AfWB0fUUaQzEGHk8WzKs1LkX jzRA2B0oXpx3SYs+0XBGH50UPYY4MeI6KG4skV8Uzh6fAhredjNSAYt8/MTNB3YSYSBu W68nLQz0KM46e9hWETj6rR4tXlIYDhhBE+jIiH4Vkj37T2r///Mt879u3tN+fXiKNQ8N BDhfL/x4KTVJNfCoZ5EWOLtaaTw8EM6Wr6nyOoRnAn0mU4Ce1l4oQsx115h4ctQPPHPO E7c00ad+H2xnXHE7wUXxuzWr35dIdhAmddfhkBXJZpXrXhzJVsp8gkzgxoDsdH/aMqBk HhFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758034982; x=1758639782; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Uuy6+KxTBsC6SlUdB1lv3rItTmRywfPxKGtKtkwquJE=; b=FNQDBk9eUy7CIwY0rrxD0TfxPl6XSqKr04vJ0IPbybJP6XU1jtn6oVrvSHmshieE05 6fnEWCBAXBjNpf/fvNsWZRhWJM33fKe7wljri+tFl/ZrU03eZOWq01jy3IaqAG8zb9P+ bmnqzT7TIJIztzHDiouJviFC5KJnIgEy44wFJwyOOacuF3SXri9t/CTaNEJSy+ImZnb7 gRV6ckDEgq1tvhWuyNfj+bRBf0L8PySw0U5JOcm4UE4Wfaw/bPkW6yFbuweWpdd1MsGe GWpXquOBPVa4di6Ak/Wd9GwMQIBFigWVC6rUFJx4aFP0/TbxdTV0vp9JIWOVysIAaI+b OAhg== X-Forwarded-Encrypted: i=1; AJvYcCVcUUzQYn7AtOJtv/W77XhP1SSPSvrKL+XaCN5i54NeNdIU+Vk/119J4OKnmM9euYKmbhbUjoocYBJOGq0=@vger.kernel.org X-Gm-Message-State: AOJu0YyzEeZQEaOXkuTfoANBX4WBwefA+f28V8RvkZ+qlS7eoKxazxKI p4DHh7169/rTBZh2hlg6YEineGqhRxnWs8RYqRE3wDuOPaQuO4wuf00qN+2vVUd3 X-Gm-Gg: ASbGnctaqg9Hy2PrBxswKxLeIs8ann20FofjtzyZyB5XX8zAZIrsJh3jLwLg5ve0Qjl EUslSG+OYQKaA4OuNtUn0NPSqj41q/l+9Tns0+exXJezWah9kseoHHP2oJH6Pph1+J7CK93lIgG wfVZKMHQ+v4j7ePFpFBjk9byFGe1BSYW6fk5tdXo2Oj+W05bjZxrHC3HNZbZWJITZOzSbSdJoK6 u1fQePN54SBLCcLJ4A29eYZsisBABQIW7XnZryaiXSt2FN+eKz37Os48e0j0vv0zN24jCRVGrPV E3LVPg+Z47OanYUVI+z5DzUXjUvRNuN/JtYxtLhVH5rREXhXlLGHzjAYV3xOseH1PmkKYP88RNY jMnu9AOUOT6F7S0jf7xXgNYZLBj8d0n5TFeT+PYNgJI0cyEkHt54lt6XlTEgVyh1itiW/mcu7X+ D0rg== X-Google-Smtp-Source: AGHT+IGaK+iWpAtXwRiAraxvEqz36VioS/HwnWCyYlLR+y9IAHh0lXnlG9NgJ3OxFlqx32YU43DzKQ== X-Received: by 2002:a05:6000:4023:b0:3eb:4e88:55e with SMTP id ffacd0b85a97d-3eb4e88099emr5348037f8f.41.1758034981581; Tue, 16 Sep 2025 08:03:01 -0700 (PDT) Received: from biju.lan (host86-139-30-37.range86-139.btcentralplus.com. [86.139.30.37]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3ecdc2deb20sm932154f8f.47.2025.09.16.08.03.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Sep 2025 08:03:01 -0700 (PDT) From: Biju X-Google-Original-From: Biju To: Mathias Nyman , Greg Kroah-Hartman , Geert Uytterhoeven , Magnus Damm Cc: Biju Das , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Prabhakar Mahadev Lad , Biju Das Subject: [PATCH v3 4/9] usb: host: xhci-rcar: Move R-Car reg definitions Date: Tue, 16 Sep 2025 16:02:40 +0100 Message-ID: <20250916150255.4231-5-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250916150255.4231-1-biju.das.jz@bp.renesas.com> References: <20250916150255.4231-1-biju.das.jz@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Biju Das Move xhci-rcar reg definitions to a header file for the preparation of addi= ng support for RZ/G3E XHCI that has different register definitions. Signed-off-by: Biju Das --- v2->v3: * No change. v1->v2: * No change. --- drivers/usb/host/xhci-rcar-regs.h | 49 +++++++++++++++++++++++++++++++ drivers/usb/host/xhci-rcar.c | 45 +--------------------------- 2 files changed, 50 insertions(+), 44 deletions(-) create mode 100644 drivers/usb/host/xhci-rcar-regs.h diff --git a/drivers/usb/host/xhci-rcar-regs.h b/drivers/usb/host/xhci-rcar= -regs.h new file mode 100644 index 000000000000..5ecbda858be0 --- /dev/null +++ b/drivers/usb/host/xhci-rcar-regs.h @@ -0,0 +1,49 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __XHCI_RCAR_H +#define __XHCI_RCAR_H + +/*** Register Offset ***/ +#define RCAR_USB3_AXH_STA 0x104 /* AXI Host Control Status */ +#define RCAR_USB3_INT_ENA 0x224 /* Interrupt Enable */ +#define RCAR_USB3_DL_CTRL 0x250 /* FW Download Control & Status */ +#define RCAR_USB3_FW_DATA0 0x258 /* FW Data0 */ + +#define RCAR_USB3_LCLK 0xa44 /* LCLK Select */ +#define RCAR_USB3_CONF1 0xa48 /* USB3.0 Configuration1 */ +#define RCAR_USB3_CONF2 0xa5c /* USB3.0 Configuration2 */ +#define RCAR_USB3_CONF3 0xaa8 /* USB3.0 Configuration3 */ +#define RCAR_USB3_RX_POL 0xab0 /* USB3.0 RX Polarity */ +#define RCAR_USB3_TX_POL 0xab8 /* USB3.0 TX Polarity */ + +/*** Register Settings ***/ +/* AXI Host Control Status */ +#define RCAR_USB3_AXH_STA_B3_PLL_ACTIVE 0x00010000 +#define RCAR_USB3_AXH_STA_B2_PLL_ACTIVE 0x00000001 +#define RCAR_USB3_AXH_STA_PLL_ACTIVE_MASK (RCAR_USB3_AXH_STA_B3_PLL_ACTIVE= | \ + RCAR_USB3_AXH_STA_B2_PLL_ACTIVE) + +/* Interrupt Enable */ +#define RCAR_USB3_INT_XHC_ENA 0x00000001 +#define RCAR_USB3_INT_PME_ENA 0x00000002 +#define RCAR_USB3_INT_HSE_ENA 0x00000004 +#define RCAR_USB3_INT_ENA_VAL (RCAR_USB3_INT_XHC_ENA | \ + RCAR_USB3_INT_PME_ENA | RCAR_USB3_INT_HSE_ENA) + +/* FW Download Control & Status */ +#define RCAR_USB3_DL_CTRL_ENABLE 0x00000001 +#define RCAR_USB3_DL_CTRL_FW_SUCCESS 0x00000010 +#define RCAR_USB3_DL_CTRL_FW_SET_DATA0 0x00000100 + +/* LCLK Select */ +#define RCAR_USB3_LCLK_ENA_VAL 0x01030001 + +/* USB3.0 Configuration */ +#define RCAR_USB3_CONF1_VAL 0x00030204 +#define RCAR_USB3_CONF2_VAL 0x00030300 +#define RCAR_USB3_CONF3_VAL 0x13802007 + +/* USB3.0 Polarity */ +#define RCAR_USB3_RX_POL_VAL BIT(21) +#define RCAR_USB3_TX_POL_VAL BIT(4) + +#endif /* __XHCI_RCAR_H */ diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c index 1cc082a3b793..6d4662def87f 100644 --- a/drivers/usb/host/xhci-rcar.c +++ b/drivers/usb/host/xhci-rcar.c @@ -14,6 +14,7 @@ =20 #include "xhci.h" #include "xhci-plat.h" +#include "xhci-rcar-regs.h" #include "xhci-rzv2m.h" =20 #define XHCI_RCAR_FIRMWARE_NAME_V1 "r8a779x_usb3_v1.dlmem" @@ -29,50 +30,6 @@ MODULE_FIRMWARE(XHCI_RCAR_FIRMWARE_NAME_V1); MODULE_FIRMWARE(XHCI_RCAR_FIRMWARE_NAME_V3); =20 -/*** Register Offset ***/ -#define RCAR_USB3_AXH_STA 0x104 /* AXI Host Control Status */ -#define RCAR_USB3_INT_ENA 0x224 /* Interrupt Enable */ -#define RCAR_USB3_DL_CTRL 0x250 /* FW Download Control & Status */ -#define RCAR_USB3_FW_DATA0 0x258 /* FW Data0 */ - -#define RCAR_USB3_LCLK 0xa44 /* LCLK Select */ -#define RCAR_USB3_CONF1 0xa48 /* USB3.0 Configuration1 */ -#define RCAR_USB3_CONF2 0xa5c /* USB3.0 Configuration2 */ -#define RCAR_USB3_CONF3 0xaa8 /* USB3.0 Configuration3 */ -#define RCAR_USB3_RX_POL 0xab0 /* USB3.0 RX Polarity */ -#define RCAR_USB3_TX_POL 0xab8 /* USB3.0 TX Polarity */ - -/*** Register Settings ***/ -/* AXI Host Control Status */ -#define RCAR_USB3_AXH_STA_B3_PLL_ACTIVE 0x00010000 -#define RCAR_USB3_AXH_STA_B2_PLL_ACTIVE 0x00000001 -#define RCAR_USB3_AXH_STA_PLL_ACTIVE_MASK (RCAR_USB3_AXH_STA_B3_PLL_ACTIVE= | \ - RCAR_USB3_AXH_STA_B2_PLL_ACTIVE) - -/* Interrupt Enable */ -#define RCAR_USB3_INT_XHC_ENA 0x00000001 -#define RCAR_USB3_INT_PME_ENA 0x00000002 -#define RCAR_USB3_INT_HSE_ENA 0x00000004 -#define RCAR_USB3_INT_ENA_VAL (RCAR_USB3_INT_XHC_ENA | \ - RCAR_USB3_INT_PME_ENA | RCAR_USB3_INT_HSE_ENA) - -/* FW Download Control & Status */ -#define RCAR_USB3_DL_CTRL_ENABLE 0x00000001 -#define RCAR_USB3_DL_CTRL_FW_SUCCESS 0x00000010 -#define RCAR_USB3_DL_CTRL_FW_SET_DATA0 0x00000100 - -/* LCLK Select */ -#define RCAR_USB3_LCLK_ENA_VAL 0x01030001 - -/* USB3.0 Configuration */ -#define RCAR_USB3_CONF1_VAL 0x00030204 -#define RCAR_USB3_CONF2_VAL 0x00030300 -#define RCAR_USB3_CONF3_VAL 0x13802007 - -/* USB3.0 Polarity */ -#define RCAR_USB3_RX_POL_VAL BIT(21) -#define RCAR_USB3_TX_POL_VAL BIT(4) - static void xhci_rcar_start_gen2(struct usb_hcd *hcd) { /* LCLK Select */ --=20 2.43.0