From patchwork Sat Apr 12 20:26:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivaylo Ivanov X-Patchwork-Id: 880585 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 CDCE5194124; Sat, 12 Apr 2025 20:26:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744489620; cv=none; b=Ym/KH1M/M8BfFpjQ8AUS8iv/pCvhsp4ie9dOo0Q9dD6AbDMAEemDNM987VC00iCqE/SZGq10rw14GBScKiAGiLXb2OQFdXyQ9BAKan7eg5nR2lpYacgA2ct1jz/CDr/dl6kgtaTgQXnFK4wFIK0x/o1pxtcHCBcmsjFuHWlZz2A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744489620; c=relaxed/simple; bh=QZ+uianZEUz8/XAB2IogwiYrS7vYk3h2iBHIvEq1MA4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rN8LXMM6F38vGch2+fjN4/cmEH4/Lzn+wVapz249jD5EF8UgLyzGtYGNm+8t80lqPuiOkQgaezqziERpZnwlSz8jFIPstdw95lID7bTVLabBePtPxke7X16IUfmShMHImy2xZ6RdV8GAhMO95J75j/IVjTmOByHe5Kv3KTgzAbs= 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=TN+YKEAZ; arc=none smtp.client-ip=209.85.128.53 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="TN+YKEAZ" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-43d07ca6a80so14699905e9.1; Sat, 12 Apr 2025 13:26:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744489617; x=1745094417; 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=LsQ/Xff2+RA/VYwRRvqpIoChOLpkXdtKapMvgQDbuBs=; b=TN+YKEAZbQdzxAGuqlIxmHJtvwWx1A2V7eWMB3vZ5QoveuizwwhgeU+WjGqWZsjQLR EGig88DrX8Jb2Caym8TYqBTdy6GoK4MKLj3BBYEkNSwZkv/qcKKv/Kk+PbgFVFs6M0xm jCaYl18IvaoCYC8p+Sme3883qvu0zCfDR57XWUxX2VA0hZOhK+M1PLvlGMLDBbv6jOIQ bwd1ZzpUTmFuIa6HPktnPkJ1rMl4gCur7Fs80J3XxdXEqylGNLcudVvFKv3IZLPF/KAe UoMHAj95bMHM3xZkhL8FkCF3lbByzdRBkE2rFCti4+gcvKhYlaFEMA1/Kg5sP2JoJkpE hZUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744489617; x=1745094417; 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=LsQ/Xff2+RA/VYwRRvqpIoChOLpkXdtKapMvgQDbuBs=; b=wd9hCJeIEi4OD/ffUgN6PnawPMruIRqsrCmRrXwwsEIajSH9DYZq0p/8O4Z47gWSAx /9zT3Fggbr+RFqThpO/DYgGI/xgDl5/+rhVYF/9907BRu7//evCRm/kjnf2fC9vodsmu jkKW/SUC4ctnnZwp1GJCpjv/SsOJZMWuLpVaVtCai+hBEqv4hrUXWDYBv3+Wdo0B4Kmd IPyQZLliRDKZlfs0RZfP8arD4dEqFWdrCyjaHcnVI781WVU4K7SIr5x9MgiR141Waw2Z fUcH1sNnyYPLaEszVN8gFGwvyECVcKlStPqaeWu9NXUnRYSOR9mCBcJHOMlVRnX9e2qt q6pA== X-Forwarded-Encrypted: i=1; AJvYcCVtddb9MWjw6qKPt0DEaREEsBHvGrQy1Euw2DIQpBBvO0dbY72IQ+/zBf8Z3+CIuAKlcojDOL3WBniA@vger.kernel.org, AJvYcCX3MO13CLA0QOHk5Bc3tmoueuYPR1dRgYHInM0OC2XOZniJVps8FNJZFEcvWpYdFl6xl2UVkCPSnOllFKFS@vger.kernel.org, AJvYcCXexnQhfM3kkW1zStZgSHTJRO8mSxrzZAlk+4xgKOPz/TazCkotxh6zwZMBxc5pjXr6smpnwCUKV8z8mIQpOw==@vger.kernel.org X-Gm-Message-State: AOJu0Yw2ehvvT8RwEpebKTGaCyUfzvA5+Mn1bzBgQF+Ov/pxeV8HE+Sb B/vcGdbh+qPBYyWZjUAnjprnWe8hOaozP4NihF6yte0GK62vxPDk X-Gm-Gg: ASbGnctWrnwznGlaXvLITselmHvKtQ+lTkoItvi/n/r8VkjydO5xliGhka9w+5EViID CmrWrVWa3zSRx5AmfEBeIJoq6zoXFiyAF1xSOTOTwrLQnt0sDo6xUBaoeeo7Fv48P9gOD5wfyT+ fmgdloNGFg1/sqRorJ3pEeUMNgrVEWLbkPp+A7pDzfZcIzmPVhGhDh66qWnNpYhIc6bxTbywd7s HZmRVqFWPsVDdy1HZWImTBDXoxAdn1k9vNzz+CMcbPyGvK1hzQbnAHJfGchaNnP4y6P2GWJ3nRR C8nrD+c9jP3qMSdD2mZk6MwJY/AWVi2lMEg6lSozW6fMsSM6fef1bpXUU5WciFMnRNKiNThkixi qkPxXDIH2rdgY8lC5 X-Google-Smtp-Source: AGHT+IFP+XkFysoPsINc3NpIKIT4Gtr8job/cOX6Be9DaYeNjIosjEEY2429amZfVdkYJ3ZD3XRl9A== X-Received: by 2002:a05:600c:b90:b0:43d:fa58:8377 with SMTP id 5b1f17b1804b1-43f3a9afb11mr62712575e9.32.1744489616759; Sat, 12 Apr 2025 13:26:56 -0700 (PDT) Received: from ivaylo-T580.. (91-139-201-119.stz.ddns.bulsat.com. [91.139.201.119]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f2338d802sm131797845e9.1.2025.04.12.13.26.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Apr 2025 13:26:56 -0700 (PDT) From: Ivaylo Ivanov To: Krzysztof Kozlowski , Vinod Koul , Conor Dooley , Alim Akhtar , Kishon Vijay Abraham I , Rob Herring , Philipp Zabel Cc: linux-samsung-soc@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v4 01/10] dt-bindings: phy: add exynos2200 eusb2 phy support Date: Sat, 12 Apr 2025 23:26:11 +0300 Message-ID: <20250412202620.738150-2-ivo.ivanov.ivanov1@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250412202620.738150-1-ivo.ivanov.ivanov1@gmail.com> References: <20250412202620.738150-1-ivo.ivanov.ivanov1@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Document the exynos2200 eUSB2 compatible. Unlike the currently documented Qualcomm SoCs, the driver doesn't make use of reset lines for reset control and uses more clocks. Signed-off-by: Ivaylo Ivanov --- .../bindings/phy/samsung,snps-eusb2-phy.yaml | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/samsung,snps-eusb2-phy.yaml diff --git a/Documentation/devicetree/bindings/phy/samsung,snps-eusb2-phy.yaml b/Documentation/devicetree/bindings/phy/samsung,snps-eusb2-phy.yaml new file mode 100644 index 000000000..09d3fdd4a --- /dev/null +++ b/Documentation/devicetree/bindings/phy/samsung,snps-eusb2-phy.yaml @@ -0,0 +1,79 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/phy/samsung,snps-eusb2-phy.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Samsung SNPS eUSB2 phy controller + +maintainers: + - Ivaylo Ivanov + +description: + eUSB2 controller supports LS/FS/HS usb connectivity on Exynos2200. + +properties: + compatible: + enum: + - samsung,exynos2200-snps-eusb2-phy + + reg: + maxItems: 1 + + "#phy-cells": + const: 0 + + clocks: + items: + - description: Reference clock + - description: Bus (APB) clock + - description: Control clock + + clock-names: + items: + - const: ref + - const: bus + - const: ctrl + + resets: + maxItems: 1 + + phys: + maxItems: 1 + description: + Phandle to eUSB2 to USB 2.0 repeater + + vdd-supply: + description: + Phandle to 0.88V regulator supply to PHY digital circuit. + + vdda12-supply: + description: + Phandle to 1.2V regulator supply to PHY refclk pll block. + +required: + - compatible + - reg + - "#phy-cells" + - clocks + - clock-names + - vdd-supply + - vdda12-supply + +additionalProperties: false + +examples: + - | + usb_hsphy: phy@10ab0000 { + compatible = "samsung,exynos2200-snps-eusb2-phy"; + reg = <0x10ab0000 0x10000>; + #phy-cells = <0>; + + clocks = <&cmu_hsi0 7>, + <&cmu_hsi0 5>, + <&cmu_hsi0 8>; + clock-names = "ref", "bus", "ctrl"; + + vdd-supply = <&vreg_0p88>; + vdda12-supply = <&vreg_1p2>; + }; From patchwork Sat Apr 12 20:26:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivaylo Ivanov X-Patchwork-Id: 880922 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 EF3F7224B04; Sat, 12 Apr 2025 20:26:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744489623; cv=none; b=a9YZKK4UDnYkS1t6DJ+aNLwxXnyOXqaO1EfdL9d7SbxUYIWv9qs2dhVrAVrIJNx5qyLLJY/1kHnYDYufAFn0kYWB4vXAr3dLKm1Z2iwU7G8/UeSofKKLQjbaVR+U4ERAzrj7fyaaXzaF315ioaGntQJhsGFn0Q4bwX78PHp3020= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744489623; c=relaxed/simple; bh=Nd+e6Ws+xwrtaSYE3dh3Uuwq9ccaQODygYUBbBo6uZg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VpxxSbfNb4AwcsIYNjnFlFbwFdCKWZHlQ3Ldw5uxlV/3ZRmyECxGzh0QTQt7yUclogOHzldWwdoGCA/agDCPY6Yi1EMKnXp5CZyJPrNR6ZviRZbQC/rxhIQ7i5zEneuBelE5cKiAkx2vZrzHHLP3hAubPSjbMByfAYNBXHqO7qo= 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=iGXTbH9B; arc=none smtp.client-ip=209.85.128.43 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="iGXTbH9B" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-43cf05f0c3eso21428025e9.0; Sat, 12 Apr 2025 13:26:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744489618; x=1745094418; 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=FGZMdc52q13yeO94asjBB7hiXHPLQfLBvZpzYqeIrBI=; b=iGXTbH9BGawuFFvmVHCP2wWsL2Ls3m7qCOHelbpdbaFdMIHw6cgWhW28X15jfdpFdM tGzK+DC9G9vmOoio/XH2K+CMwQMh2dUI+P4J8y2OlcR/49+SrjvAbK1/XLcrJcbcm4+n 1kjYXbBcz1twBMiB/ke9FIw1m3Eb7jhWieUIsbKcddSdXQlJM8xtqSwvyjyEpySAhZEk ameXV4dDKz0+kcH0zkiG/NICSXSsortBz9IofXcnbHTfaefdpMg/Yj+RE9vAespqYIpM F3lN94ar/pigiOLT6FRs1MtV5s/F3MKtMkY85V3xwfx62X+m9Px0UKA4rYDdJbaFZMOG DgdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744489618; x=1745094418; 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=FGZMdc52q13yeO94asjBB7hiXHPLQfLBvZpzYqeIrBI=; b=vgihKB3xgZZi6oHWOicqrGS6h5kQhPoesCcfZEj8YGWqj2CmR8YwbzOpd3TTlXRQ3Z LRjnlZBCYRjRO6cVfou5GkB3RJ0K+wBEVp/pBPgTLPlY5EKLUwg7MjsOL7VVB6TBXR8e TXhdnCUb4SgLJmjYKUomQKIh8Cak7gNpscW1LUTpKMy+8QYQvcYgItVr8nvc2j/da+S5 /x92f2Dv5SkIWYSOj9vEDMH9mtdbxfuI1lZbWqGqMBS9jkG5GPXj5wepll/flotH0q9X LGpyMSj1SunkziOSMlDJnhhe4/IpGlWbqGJvIW13WfNPGobuPr5gTzLmta7+Uip3UAk5 vsHQ== X-Forwarded-Encrypted: i=1; AJvYcCUShp8DQ6MDjOePl40aFIA+UVvDrpFGQKogfX/pd9wp9mLi/3is0i/Zz3y1AFmATDRnv0RpMTNWTFr4VaQ2@vger.kernel.org, AJvYcCVGR5iqPgxF84DL/gQaoVv66RM47ZUh/PuXoHm+Ajt0s2bf4AbbKC16stLV0gFvXfR12jm/WA6F3jMT@vger.kernel.org, AJvYcCWMhSMFfJ2Y+QLxYTCVtbuQm65YxIUeDvC/CVNlpnG5jVRsy5DAUloYPxIYm+ki2m4E3ie91b7np251FKIhlg==@vger.kernel.org X-Gm-Message-State: AOJu0YwPo5senFgc1O37UO1FQdeccSAqCHh8gyCSAnKqCNuFK6zinwU9 2MU+UPT8YIdmGostFJ/DuI8jF3IOI0W7+FMkN2wFr/qBT8bG/nTnjQRTtg== X-Gm-Gg: ASbGncuaX9+myZhY7ogbg45lbko+Fu/a6S51MgrOq1DdiFvyea3cAS8nHlaF5tEf6Zf iN7wvq7kwKGs0yv0AqlpsoBhO05rMW3e/Am/f0BYernC7ETf6cY6Vnd897Nk3cL6ch3XV+R6XL+ 9qjGbK9umyfrHCuxcCHyy4ZflK3uY/VKzIviB549pUWQyCNuraDXDgLJum02Tpt2qdwb7tQ2XPL sehVntxiIJYLpVfkRQpMwEH/uOyqlb9h4UCVsLkdFMfNJ+UUuzyQRBWO4id91weAt8riUhL27Wk SGOXeM+JYkxCS4OPS2txQcqVDy2rBxKdV7bBpNqAQQwzMMe7zYfHkA0JTUHadoOt/31O+JEMS8p ohHGoO+NQJYIvSR82 X-Google-Smtp-Source: AGHT+IGx6h+geTf/v9W2DKJjLgpVdgmXIoVjN4mCIjEb6l8h9zRIXZaS88d0GwzNPTfrjVbCyUePFg== X-Received: by 2002:a05:600c:c06:b0:43d:8ea:8d7a with SMTP id 5b1f17b1804b1-43f3a9b00c2mr60408365e9.28.1744489618240; Sat, 12 Apr 2025 13:26:58 -0700 (PDT) Received: from ivaylo-T580.. (91-139-201-119.stz.ddns.bulsat.com. [91.139.201.119]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f2338d802sm131797845e9.1.2025.04.12.13.26.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Apr 2025 13:26:57 -0700 (PDT) From: Ivaylo Ivanov To: Krzysztof Kozlowski , Vinod Koul , Conor Dooley , Alim Akhtar , Kishon Vijay Abraham I , Rob Herring , Philipp Zabel Cc: linux-samsung-soc@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v4 02/10] dt-bindings: phy: samsung,usb3-drd-phy: add exynos2200 support Date: Sat, 12 Apr 2025 23:26:12 +0300 Message-ID: <20250412202620.738150-3-ivo.ivanov.ivanov1@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250412202620.738150-1-ivo.ivanov.ivanov1@gmail.com> References: <20250412202620.738150-1-ivo.ivanov.ivanov1@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Document support for Exynos2200. As the USBDRD 3.2 4nm controller consists of Synopsys eUSB2.0 phy and USBDP/SS combophy, which will be handled by external drivers, define only the bus clocked used by the link controller. Signed-off-by: Ivaylo Ivanov Reviewed-by: Krzysztof Kozlowski --- .../bindings/phy/samsung,usb3-drd-phy.yaml | 38 +++++++++++++++++-- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/phy/samsung,usb3-drd-phy.yaml b/Documentation/devicetree/bindings/phy/samsung,usb3-drd-phy.yaml index 27295acbb..4506c5801 100644 --- a/Documentation/devicetree/bindings/phy/samsung,usb3-drd-phy.yaml +++ b/Documentation/devicetree/bindings/phy/samsung,usb3-drd-phy.yaml @@ -26,6 +26,7 @@ properties: compatible: enum: - google,gs101-usb31drd-phy + - samsung,exynos2200-usb32drd-phy - samsung,exynos5250-usbdrd-phy - samsung,exynos5420-usbdrd-phy - samsung,exynos5433-usbdrd-phy @@ -33,24 +34,32 @@ properties: - samsung,exynos850-usbdrd-phy clocks: - minItems: 2 + minItems: 1 maxItems: 5 clock-names: - minItems: 2 + minItems: 1 maxItems: 5 description: | - At least two clocks:: + Typically two clocks: - Main PHY clock (same as USB DRD controller i.e. DWC3 IP clock), used for register access. - PHY reference clock (usually crystal clock), used for PHY operations, associated by phy name. It is used to determine bit values for clock settings register. For Exynos5420 this is given as 'sclk_usbphy30' - in the CMU. + in the CMU. It's not needed for Exynos2200. "#phy-cells": const: 1 + phys: + maxItems: 1 + description: + USBDRD-underlying high-speed PHY + + phy-names: + const: hs + port: $ref: /schemas/graph.yaml#/properties/port description: @@ -150,6 +159,27 @@ allOf: - vdda-usbdp-supply - vddh-usbdp-supply + - if: + properties: + compatible: + contains: + enum: + - samsung,exynos2200-usb32drd-phy + then: + properties: + clocks: + maxItems: 1 + clock-names: + items: + - const: phy + reg: + maxItems: 1 + reg-names: + maxItems: 1 + required: + - phys + - phy-names + - if: properties: compatible: From patchwork Sat Apr 12 20:26:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivaylo Ivanov X-Patchwork-Id: 880584 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 F41AE224B05; Sat, 12 Apr 2025 20:27:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744489623; cv=none; b=Ps9b+qdaEba+wlHdff1gL9M2/qyPNo/2PebcvlTgJT+qs6x95adAoFk+20JWPUgvhNKEwg1B+iBQ66+41tBO1rw8rNxnjMZ+OfWoWdHvAhykdXdX6Rf7RRimmi2VKqFS0UhJpA4qJGVwz0vs2NAtMkRtyCUHrzqGLqDoAhlnUus= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744489623; c=relaxed/simple; bh=aTojt8Dh7gclUi44xp/qnVu5croeoXM5gZOR4fhmKuc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m5mU5m8g4fM6VnoLBbPuX7VyR0rzXpS34hQ0rt/kskfurkND5roOxCqrVnB6hQuxpWlH7egMFYE3bwWiyJgzL7yRVy8rmDRH2ul/NIYq7kM6X33n6ojggV2IJts8usYX8W9UlLlHTzJSATIXeNliBwTVwfpF5+mS2yhvirTAzs0= 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=gH0wqI+H; arc=none smtp.client-ip=209.85.128.42 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="gH0wqI+H" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-43cf257158fso22207815e9.2; Sat, 12 Apr 2025 13:27:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744489620; x=1745094420; 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=2usqzIFp+F+sor9mgGvMP54EUED928aPFjm+huTcOyg=; b=gH0wqI+H5U8AqzOobtjDYSkvq/KGGQLy9A5hoBmFxhsUDSttJW1IwXEI3B6VOhtlXh mM3w3Bst8orU1Vp9IsSXjzfGltZs7sB7plZWaNJkOTL1sG4vVYdlnEm+upvcoGftT7hS 55RZWKFW0ZltpFjDxLHRrxIwS8PQE+k2cTVcag7tuGIElwsSGCHTVudpDF9md7mc3QuC wMeLlBiMPGRdHvVU2FI+lEMIgGVCnL1nnZnbDNs+6cFA+ROGI1jgNsKPCXyAX3VxrhiV tN6W1BTI7LyqjDGgl6JEDK55jiYgBXZtotxk19ii+aoCGH7v0yoQtqiaTV7OQtjrL/bq U+xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744489620; x=1745094420; 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=2usqzIFp+F+sor9mgGvMP54EUED928aPFjm+huTcOyg=; b=H+4I8i9vi7vUSDSBKFhuC2ZPGddejl5cjbv1daSp/8otveaeIUA6N/X4oY14E35ZJR qaW2yxMuWUQzh9iqHjLVi69/a0qJv23FYmj2EdAcnIBUC+oecUZIeWoF8WIYntdAxaI6 6l0Obs8halHZH2+tvCGUFDZha5l1rZO6aAPnVQ1x9AJ/v/EyDkwdmf7ijCtPcjH98FSx qW+GZLI7fpdaelzQxigCNc7FhpnAtwOxTeerZfR+mz7/zll60cT+SyytGfwBiUhOkFXH pGpefGJracG71OdnJdPc/Do21DxFSPbcLiP0/SyA8wdwInq7ShoBopxuK6BNFxJ+r2Gf LqFg== X-Forwarded-Encrypted: i=1; AJvYcCUjEZJ6+1wZ9Hj+kJTC4DN8Cy5b2z/xNFg21de92SymYpetxJxrsbURXpkx0tMJPBZOvKTArUwhGKi0p09bhQ==@vger.kernel.org, AJvYcCUndabWacIRESwUsLxi+Dg/UfIie1frkDMISuNJHh5o1pP4/pem3KDYS37D190Pp0gqAe7QWRMGkIu4@vger.kernel.org, AJvYcCVDL4uu8IbYsitS6fVIHsS9Xu0Bw17aLgQPpkEbSfg8+drV8KAlJCYmbUAYgvzk5dALOTm5H/Zt6Y+2e2tj@vger.kernel.org X-Gm-Message-State: AOJu0YxAzh47wh5Gaaw8zEYrzosjaU5c7J9EFy8pfGed1PxPb+F3Ya3Y hUakK+N1T6pdYeBsoJJLpprjuxYLPY9lcgzG8fj6OWQHE1s1u6/m X-Gm-Gg: ASbGncur0/FbWUj3nMlwE36vb3HxKud+XhTx+vd7NFw86zKGflTJRKxDYQsjg4BE/5H XBa4nWNiik3PbbJE1VEtxRjnkgG6iwIajMA3DCCMAeMO1TaCSdU1WWsr9S/l6Woh3mgukEaIMsx oEwiPnNsSw+IGbBhGnj4FZ8K0dRAzRzDOhunHbVt5alVLRFEBy2srnZ9WgJiYiqLF4ZKNo2GQ3h LeN8l+qU+bsQoMglrOUoSX7JqpZOGMCgwL0zq6lO9Mw6PAgs1YdRMhr6Kiy7C0yymlsjwSS0CsE UVgKqBi6eDQqkZTjWj/jlVPlCFWt3VN4xXcKWcLp0iCpdz8Zfk1Zm+85pl2dNcddm0/eJlfHkNU fUyBUsJc8hQDTmZet X-Google-Smtp-Source: AGHT+IEah7+QhHhcMI502D3K184AdzgML6oZ4zalt7NAyqUNE6otZecWQFpnPiMPSdxHbSRclrEr4g== X-Received: by 2002:a05:600c:5107:b0:43d:4e9:27ff with SMTP id 5b1f17b1804b1-43f3a925477mr59707825e9.7.1744489619878; Sat, 12 Apr 2025 13:26:59 -0700 (PDT) Received: from ivaylo-T580.. (91-139-201-119.stz.ddns.bulsat.com. [91.139.201.119]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f2338d802sm131797845e9.1.2025.04.12.13.26.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Apr 2025 13:26:59 -0700 (PDT) From: Ivaylo Ivanov To: Krzysztof Kozlowski , Vinod Koul , Conor Dooley , Alim Akhtar , Kishon Vijay Abraham I , Rob Herring , Philipp Zabel Cc: linux-samsung-soc@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v4 03/10] phy: move phy-qcom-snps-eusb2 out of its vendor sub-directory Date: Sat, 12 Apr 2025 23:26:13 +0300 Message-ID: <20250412202620.738150-4-ivo.ivanov.ivanov1@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250412202620.738150-1-ivo.ivanov.ivanov1@gmail.com> References: <20250412202620.738150-1-ivo.ivanov.ivanov1@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 As not only Qualcomm, but also Samsung is using the Synopsys eUSB2 IP (albeit with a different register layout) in their newer SoCs, move the driver out of its vendor sub-directory and rename it to phy-snps-eusb2. Suggested-by: Krzysztof Kozlowski Signed-off-by: Ivaylo Ivanov Reviewed-by: Dmitry Baryshkov --- drivers/phy/Kconfig | 8 ++++++++ drivers/phy/Makefile | 1 + .../{qualcomm/phy-qcom-snps-eusb2.c => phy-snps-eusb2.c} | 0 drivers/phy/qualcomm/Kconfig | 9 --------- drivers/phy/qualcomm/Makefile | 1 - 5 files changed, 9 insertions(+), 10 deletions(-) rename drivers/phy/{qualcomm/phy-qcom-snps-eusb2.c => phy-snps-eusb2.c} (100%) diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig index 8d58efe99..11c166204 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -43,6 +43,14 @@ config PHY_PISTACHIO_USB help Enable this to support the USB2.0 PHY on the IMG Pistachio SoC. +config PHY_SNPS_EUSB2 + tristate "SNPS eUSB2 PHY Driver" + depends on OF && (ARCH_QCOM || COMPILE_TEST) + select GENERIC_PHY + help + Enable support for the USB high-speed SNPS eUSB2 phy on select + SoCs. The PHY is usually paired with a Synopsys DWC3 USB controller. + config PHY_XGENE tristate "APM X-Gene 15Gbps PHY support" depends on HAS_IOMEM && OF && (ARCH_XGENE || COMPILE_TEST) diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile index e281442ac..c670a8dac 100644 --- a/drivers/phy/Makefile +++ b/drivers/phy/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_PHY_CAN_TRANSCEIVER) += phy-can-transceiver.o obj-$(CONFIG_PHY_LPC18XX_USB_OTG) += phy-lpc18xx-usb-otg.o obj-$(CONFIG_PHY_XGENE) += phy-xgene.o obj-$(CONFIG_PHY_PISTACHIO_USB) += phy-pistachio-usb.o +obj-$(CONFIG_PHY_SNPS_EUSB2) += phy-snps-eusb2.o obj-$(CONFIG_USB_LGM_PHY) += phy-lgm-usb.o obj-$(CONFIG_PHY_AIROHA_PCIE) += phy-airoha-pcie.o obj-$(CONFIG_PHY_NXP_PTN3222) += phy-nxp-ptn3222.o diff --git a/drivers/phy/qualcomm/phy-qcom-snps-eusb2.c b/drivers/phy/phy-snps-eusb2.c similarity index 100% rename from drivers/phy/qualcomm/phy-qcom-snps-eusb2.c rename to drivers/phy/phy-snps-eusb2.c diff --git a/drivers/phy/qualcomm/Kconfig b/drivers/phy/qualcomm/Kconfig index c1e0a11dd..ef14f4e33 100644 --- a/drivers/phy/qualcomm/Kconfig +++ b/drivers/phy/qualcomm/Kconfig @@ -125,15 +125,6 @@ config PHY_QCOM_QUSB2 PHY which is usually paired with either the ChipIdea or Synopsys DWC3 USB IPs on MSM SOCs. -config PHY_QCOM_SNPS_EUSB2 - tristate "Qualcomm SNPS eUSB2 PHY Driver" - depends on OF && (ARCH_QCOM || COMPILE_TEST) - select GENERIC_PHY - help - Enable support for the USB high-speed SNPS eUSB2 phy on Qualcomm - chipsets. The PHY is paired with a Synopsys DWC3 USB controller - on Qualcomm SOCs. - config PHY_QCOM_EUSB2_REPEATER tristate "Qualcomm SNPS eUSB2 Repeater Driver" depends on OF && (ARCH_QCOM || COMPILE_TEST) diff --git a/drivers/phy/qualcomm/Makefile b/drivers/phy/qualcomm/Makefile index 42038bc30..3851e28a2 100644 --- a/drivers/phy/qualcomm/Makefile +++ b/drivers/phy/qualcomm/Makefile @@ -15,7 +15,6 @@ obj-$(CONFIG_PHY_QCOM_QMP_USB) += phy-qcom-qmp-usb.o obj-$(CONFIG_PHY_QCOM_QMP_USB_LEGACY) += phy-qcom-qmp-usb-legacy.o obj-$(CONFIG_PHY_QCOM_QUSB2) += phy-qcom-qusb2.o -obj-$(CONFIG_PHY_QCOM_SNPS_EUSB2) += phy-qcom-snps-eusb2.o obj-$(CONFIG_PHY_QCOM_EUSB2_REPEATER) += phy-qcom-eusb2-repeater.o obj-$(CONFIG_PHY_QCOM_UNIPHY_PCIE_28LP) += phy-qcom-uniphy-pcie-28lp.o obj-$(CONFIG_PHY_QCOM_USB_HS) += phy-qcom-usb-hs.o From patchwork Sat Apr 12 20:26:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivaylo Ivanov X-Patchwork-Id: 880921 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (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 84C48226888; Sat, 12 Apr 2025 20:27:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744489625; cv=none; b=kluZt4BD85cmw7cF+QWYAfYbz6ZspqoDd58hD6zVV3Pbx07vYueNWtamN4tVTKoNHDycgXiCabm9th9/zsjbryseIjuAITdYVdfNbwjy87IThUfSbD2ld8G7Zahez7v8zWbm2BwHiZlcGchgyAFSV6CR9xUus3Rtg1HH14XSGEw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744489625; c=relaxed/simple; bh=+OIIOz2hdxGL78KHMo4lMpF6RDi0hxMvLnncPwM8Y6c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EG9M88/yHzBn/tO9T3rQXwJvw5ZknFX5hgQiuTcFRs8T+tG5BsUS7T2g2SyszlowMjjc/ZKRNpVYfIsC80isFwILTQVa7fPr9gwP/smoP/j6UA7H18djKPXx94+WEL7dBYDI+/5FoDa7trl+3hN0Rc3ip/hwfcBon/GTwR46lP4= 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=DYKpLwCt; arc=none smtp.client-ip=209.85.128.44 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="DYKpLwCt" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-43cf034d4abso31503415e9.3; Sat, 12 Apr 2025 13:27:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744489622; x=1745094422; 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=o5tSHqpXtWFPabFBWZB93znRyMEz1UyBewsCCfTVVvw=; b=DYKpLwCtbPVcJYUCkkghvOhYqSQMB3/HUO+jZow9ZKq89EtVHKl3ZQ2OrMHyUhw0sV HQGZtQXb6OqKs3QpnWPs4p9MkZ9cHMqPpmZG5iOAmwYvVt3NpRCa6kBoMZFZ01JHfB5b B9fkklBIXcwCIDTbDUZPtiIpe/jI96MQshStgvAzlPjlOtnmI8drB2slKkSK/2pPL+Qg MRjXlU4+ca93DOzHV9b/v3XZWy8gR4jiKmul2LpLPu3hm3u+Rpt4K9XMUt/zmMdI5qtc bK+NRTEmhhfPCX1ltSF3D/n3ya+0PTB6bHHb7A0VkEn9Ndz8aP97qZEJG9IkB73TyBCj 7Btw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744489622; x=1745094422; 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=o5tSHqpXtWFPabFBWZB93znRyMEz1UyBewsCCfTVVvw=; b=toql4SzkbXtBft7/HkBT+GzUFENYtJDd1ocP9oV+i8Ym9BNzuZ4HUyS7AxwtAWB84J Z4sXqvDjSWRktIMB2B3HrAch0zJXM5OEVI8CptrZ5ISyV15kwjtKPkAKIm+NQpxUmgyE N15XZwbuOnkAjfWU0UKVpVkUSrnVoWDx4J60DsKBy1mPAkurpyM29ov6Xmo8DhXc/Xht ZdNhJc2mNOOHcevf+pjs/Q3Tq9x5zRvIp1JCYTYIfaNhfKReM11KrXAgzhJXNz2qffIE 7QSdAdvPA82iZB39YhrIVHZs4UQk/dp8F1C6RJujZBCiy1OzFhF1hpDMDmrVCKYBsBZY 8uGQ== X-Forwarded-Encrypted: i=1; AJvYcCUFuK2RZQpiNi/TpLRHhsMHzJRtySIM7znyA8+O5JkRWMkC+YAcrx2cN7iDrdve+IBCm1/M4CBgaPwu@vger.kernel.org, AJvYcCWbjxh+mEUnb23pL5y12lljoXHaQBMy7zHlgJXLXuhHfIoAO+jGWnUQstCn71wnJPDfA6Th9nG48QbJ7stT@vger.kernel.org, AJvYcCWfYczKz6D9pRehvjsLpyVszE4JUc0cGOXU+loebCc0rEF38HFCt+UXkG5DN3QSI5g2gJ3Qg9ZO8wV2IMZ0NA==@vger.kernel.org X-Gm-Message-State: AOJu0YyvsQzUEKP1Iw3HB8ZuK61fD/mZ2uxUZxqywLf3eNxB8ep+qm/E m6YyLmrVn+moaSDUT8x3sj9LjAsZrt0xD/Sg2NWjs2Am8cmrladxsBtd9w== X-Gm-Gg: ASbGncttuhDqZTBUummCPF3zVrJi4U0oZMfpAANbH4cXXHuNNAxeCuC4eDaAaM8PjQZ N3xJhVov3U8wx3vCarC9zCY5x8PJxuwLc/X1r1pKuZTNLwTx4H1zIOxuAKI5tJkQ8gaVIHQbXtw nHrY6F5kgz7pNXtMJxGW4DY6tr6T7CxcMyz5DAoG+ZhfwZ76u1PiMK6h3ReTeansXOvk0C53bv5 XG3RznT27uuTPMOulK0++u7jYS2lKxzLufwnW9lDa6N3x3wA8x6DGKJYX7ARY45eqdgkXD7xvBe sbSgpBech3NuqdPHy3NuG0Kku+/D9YL1fiffXEoHkr4tkhqJf4kDSPqSBboogmniisQoGuOyqVB Q7F8E1Z+DAtu3cFRU X-Google-Smtp-Source: AGHT+IFGERhEFeIkVDOYD6Yzb6G2rEUf354mEF4ppJQHj7t1UF49/aGi/PdBkH1u06EYB3XnlcOnRg== X-Received: by 2002:a05:600c:1d84:b0:43d:fa:1f9a with SMTP id 5b1f17b1804b1-43f3a9aedc7mr76266225e9.30.1744489621370; Sat, 12 Apr 2025 13:27:01 -0700 (PDT) Received: from ivaylo-T580.. (91-139-201-119.stz.ddns.bulsat.com. [91.139.201.119]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f2338d802sm131797845e9.1.2025.04.12.13.26.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Apr 2025 13:27:00 -0700 (PDT) From: Ivaylo Ivanov To: Krzysztof Kozlowski , Vinod Koul , Conor Dooley , Alim Akhtar , Kishon Vijay Abraham I , Rob Herring , Philipp Zabel Cc: linux-samsung-soc@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v4 04/10] phy: phy-snps-eusb2: refactor constructs names Date: Sat, 12 Apr 2025 23:26:14 +0300 Message-ID: <20250412202620.738150-5-ivo.ivanov.ivanov1@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250412202620.738150-1-ivo.ivanov.ivanov1@gmail.com> References: <20250412202620.738150-1-ivo.ivanov.ivanov1@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 As the driver now resides outside the phy subdirectory under a different name, refactor all definitions, structures and functions to explicitly specify what code is Qualcomm-specific and what is not. Signed-off-by: Ivaylo Ivanov Reviewed-by: Dmitry Baryshkov --- drivers/phy/phy-snps-eusb2.c | 256 +++++++++++++++++------------------ 1 file changed, 128 insertions(+), 128 deletions(-) diff --git a/drivers/phy/phy-snps-eusb2.c b/drivers/phy/phy-snps-eusb2.c index 1484691a4..e1b175f48 100644 --- a/drivers/phy/phy-snps-eusb2.c +++ b/drivers/phy/phy-snps-eusb2.c @@ -13,15 +13,15 @@ #include #include -#define USB_PHY_UTMI_CTRL0 (0x3c) +#define QCOM_USB_PHY_UTMI_CTRL0 (0x3c) #define SLEEPM BIT(0) #define OPMODE_MASK GENMASK(4, 3) #define OPMODE_NONDRIVING BIT(3) -#define USB_PHY_UTMI_CTRL5 (0x50) +#define QCOM_USB_PHY_UTMI_CTRL5 (0x50) #define POR BIT(1) -#define USB_PHY_HS_PHY_CTRL_COMMON0 (0x54) +#define QCOM_USB_PHY_HS_PHY_CTRL_COMMON0 (0x54) #define PHY_ENABLE BIT(0) #define SIDDQ_SEL BIT(1) #define SIDDQ BIT(2) @@ -30,15 +30,15 @@ #define FSEL_19_2_MHZ_VAL (0x0) #define FSEL_38_4_MHZ_VAL (0x4) -#define USB_PHY_CFG_CTRL_1 (0x58) +#define QCOM_USB_PHY_CFG_CTRL_1 (0x58) #define PHY_CFG_PLL_CPBIAS_CNTRL_MASK GENMASK(7, 1) -#define USB_PHY_CFG_CTRL_2 (0x5c) +#define QCOM_USB_PHY_CFG_CTRL_2 (0x5c) #define PHY_CFG_PLL_FB_DIV_7_0_MASK GENMASK(7, 0) #define DIV_7_0_19_2_MHZ_VAL (0x90) #define DIV_7_0_38_4_MHZ_VAL (0xc8) -#define USB_PHY_CFG_CTRL_3 (0x60) +#define QCOM_USB_PHY_CFG_CTRL_3 (0x60) #define PHY_CFG_PLL_FB_DIV_11_8_MASK GENMASK(3, 0) #define DIV_11_8_19_2_MHZ_VAL (0x1) #define DIV_11_8_38_4_MHZ_VAL (0x0) @@ -46,73 +46,73 @@ #define PHY_CFG_PLL_REF_DIV GENMASK(7, 4) #define PLL_REF_DIV_VAL (0x0) -#define USB_PHY_HS_PHY_CTRL2 (0x64) +#define QCOM_USB_PHY_HS_PHY_CTRL2 (0x64) #define VBUSVLDEXT0 BIT(0) #define USB2_SUSPEND_N BIT(2) #define USB2_SUSPEND_N_SEL BIT(3) #define VBUS_DET_EXT_SEL BIT(4) -#define USB_PHY_CFG_CTRL_4 (0x68) +#define QCOM_USB_PHY_CFG_CTRL_4 (0x68) #define PHY_CFG_PLL_GMP_CNTRL_MASK GENMASK(1, 0) #define PHY_CFG_PLL_INT_CNTRL_MASK GENMASK(7, 2) -#define USB_PHY_CFG_CTRL_5 (0x6c) +#define QCOM_USB_PHY_CFG_CTRL_5 (0x6c) #define PHY_CFG_PLL_PROP_CNTRL_MASK GENMASK(4, 0) #define PHY_CFG_PLL_VREF_TUNE_MASK GENMASK(7, 6) -#define USB_PHY_CFG_CTRL_6 (0x70) +#define QCOM_USB_PHY_CFG_CTRL_6 (0x70) #define PHY_CFG_PLL_VCO_CNTRL_MASK GENMASK(2, 0) -#define USB_PHY_CFG_CTRL_7 (0x74) +#define QCOM_USB_PHY_CFG_CTRL_7 (0x74) -#define USB_PHY_CFG_CTRL_8 (0x78) +#define QCOM_USB_PHY_CFG_CTRL_8 (0x78) #define PHY_CFG_TX_FSLS_VREF_TUNE_MASK GENMASK(1, 0) #define PHY_CFG_TX_FSLS_VREG_BYPASS BIT(2) #define PHY_CFG_TX_HS_VREF_TUNE_MASK GENMASK(5, 3) #define PHY_CFG_TX_HS_XV_TUNE_MASK GENMASK(7, 6) -#define USB_PHY_CFG_CTRL_9 (0x7c) +#define QCOM_USB_PHY_CFG_CTRL_9 (0x7c) #define PHY_CFG_TX_PREEMP_TUNE_MASK GENMASK(2, 0) #define PHY_CFG_TX_RES_TUNE_MASK GENMASK(4, 3) #define PHY_CFG_TX_RISE_TUNE_MASK GENMASK(6, 5) #define PHY_CFG_RCAL_BYPASS BIT(7) -#define USB_PHY_CFG_CTRL_10 (0x80) +#define QCOM_USB_PHY_CFG_CTRL_10 (0x80) -#define USB_PHY_CFG0 (0x94) +#define QCOM_USB_PHY_CFG0 (0x94) #define DATAPATH_CTRL_OVERRIDE_EN BIT(0) #define CMN_CTRL_OVERRIDE_EN BIT(1) -#define UTMI_PHY_CMN_CTRL0 (0x98) +#define QCOM_UTMI_PHY_CMN_CTRL0 (0x98) #define TESTBURNIN BIT(6) -#define USB_PHY_FSEL_SEL (0xb8) +#define QCOM_USB_PHY_FSEL_SEL (0xb8) #define FSEL_SEL BIT(0) -#define USB_PHY_APB_ACCESS_CMD (0x130) +#define QCOM_USB_PHY_APB_ACCESS_CMD (0x130) #define RW_ACCESS BIT(0) #define APB_START_CMD BIT(1) #define APB_LOGIC_RESET BIT(2) -#define USB_PHY_APB_ACCESS_STATUS (0x134) +#define QCOM_USB_PHY_APB_ACCESS_STATUS (0x134) #define ACCESS_DONE BIT(0) #define TIMED_OUT BIT(1) #define ACCESS_ERROR BIT(2) #define ACCESS_IN_PROGRESS BIT(3) -#define USB_PHY_APB_ADDRESS (0x138) +#define QCOM_USB_PHY_APB_ADDRESS (0x138) #define APB_REG_ADDR_MASK GENMASK(7, 0) -#define USB_PHY_APB_WRDATA_LSB (0x13c) +#define QCOM_USB_PHY_APB_WRDATA_LSB (0x13c) #define APB_REG_WRDATA_7_0_MASK GENMASK(3, 0) -#define USB_PHY_APB_WRDATA_MSB (0x140) +#define QCOM_USB_PHY_APB_WRDATA_MSB (0x140) #define APB_REG_WRDATA_15_8_MASK GENMASK(7, 4) -#define USB_PHY_APB_RDDATA_LSB (0x144) +#define QCOM_USB_PHY_APB_RDDATA_LSB (0x144) #define APB_REG_RDDATA_7_0_MASK GENMASK(3, 0) -#define USB_PHY_APB_RDDATA_MSB (0x148) +#define QCOM_USB_PHY_APB_RDDATA_MSB (0x148) #define APB_REG_RDDATA_15_8_MASK GENMASK(7, 4) static const char * const eusb2_hsphy_vreg_names[] = { @@ -121,7 +121,7 @@ static const char * const eusb2_hsphy_vreg_names[] = { #define EUSB2_NUM_VREGS ARRAY_SIZE(eusb2_hsphy_vreg_names) -struct qcom_snps_eusb2_hsphy { +struct snps_eusb2_hsphy { struct phy *phy; void __iomem *base; @@ -135,17 +135,17 @@ struct qcom_snps_eusb2_hsphy { struct phy *repeater; }; -static int qcom_snps_eusb2_hsphy_set_mode(struct phy *p, enum phy_mode mode, int submode) +static int snps_eusb2_hsphy_set_mode(struct phy *p, enum phy_mode mode, int submode) { - struct qcom_snps_eusb2_hsphy *phy = phy_get_drvdata(p); + struct snps_eusb2_hsphy *phy = phy_get_drvdata(p); phy->mode = mode; return phy_set_mode_ext(phy->repeater, mode, submode); } -static void qcom_snps_eusb2_hsphy_write_mask(void __iomem *base, u32 offset, - u32 mask, u32 val) +static void snps_eusb2_hsphy_write_mask(void __iomem *base, u32 offset, + u32 mask, u32 val) { u32 reg; @@ -158,65 +158,65 @@ static void qcom_snps_eusb2_hsphy_write_mask(void __iomem *base, u32 offset, readl_relaxed(base + offset); } -static void qcom_eusb2_default_parameters(struct qcom_snps_eusb2_hsphy *phy) +static void qcom_eusb2_default_parameters(struct snps_eusb2_hsphy *phy) { /* default parameters: tx pre-emphasis */ - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_CFG_CTRL_9, - PHY_CFG_TX_PREEMP_TUNE_MASK, - FIELD_PREP(PHY_CFG_TX_PREEMP_TUNE_MASK, 0)); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_9, + PHY_CFG_TX_PREEMP_TUNE_MASK, + FIELD_PREP(PHY_CFG_TX_PREEMP_TUNE_MASK, 0)); /* tx rise/fall time */ - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_CFG_CTRL_9, - PHY_CFG_TX_RISE_TUNE_MASK, - FIELD_PREP(PHY_CFG_TX_RISE_TUNE_MASK, 0x2)); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_9, + PHY_CFG_TX_RISE_TUNE_MASK, + FIELD_PREP(PHY_CFG_TX_RISE_TUNE_MASK, 0x2)); /* source impedance adjustment */ - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_CFG_CTRL_9, - PHY_CFG_TX_RES_TUNE_MASK, - FIELD_PREP(PHY_CFG_TX_RES_TUNE_MASK, 0x1)); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_9, + PHY_CFG_TX_RES_TUNE_MASK, + FIELD_PREP(PHY_CFG_TX_RES_TUNE_MASK, 0x1)); /* dc voltage level adjustement */ - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_CFG_CTRL_8, - PHY_CFG_TX_HS_VREF_TUNE_MASK, - FIELD_PREP(PHY_CFG_TX_HS_VREF_TUNE_MASK, 0x3)); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_8, + PHY_CFG_TX_HS_VREF_TUNE_MASK, + FIELD_PREP(PHY_CFG_TX_HS_VREF_TUNE_MASK, 0x3)); /* transmitter HS crossover adjustement */ - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_CFG_CTRL_8, - PHY_CFG_TX_HS_XV_TUNE_MASK, - FIELD_PREP(PHY_CFG_TX_HS_XV_TUNE_MASK, 0x0)); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_8, + PHY_CFG_TX_HS_XV_TUNE_MASK, + FIELD_PREP(PHY_CFG_TX_HS_XV_TUNE_MASK, 0x0)); } -static int qcom_eusb2_ref_clk_init(struct qcom_snps_eusb2_hsphy *phy) +static int qcom_eusb2_ref_clk_init(struct snps_eusb2_hsphy *phy) { unsigned long ref_clk_freq = clk_get_rate(phy->ref_clk); switch (ref_clk_freq) { case 19200000: - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_HS_PHY_CTRL_COMMON0, - FSEL_MASK, - FIELD_PREP(FSEL_MASK, FSEL_19_2_MHZ_VAL)); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_HS_PHY_CTRL_COMMON0, + FSEL_MASK, + FIELD_PREP(FSEL_MASK, FSEL_19_2_MHZ_VAL)); - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_CFG_CTRL_2, - PHY_CFG_PLL_FB_DIV_7_0_MASK, - DIV_7_0_19_2_MHZ_VAL); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_2, + PHY_CFG_PLL_FB_DIV_7_0_MASK, + DIV_7_0_19_2_MHZ_VAL); - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_CFG_CTRL_3, - PHY_CFG_PLL_FB_DIV_11_8_MASK, - DIV_11_8_19_2_MHZ_VAL); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_3, + PHY_CFG_PLL_FB_DIV_11_8_MASK, + DIV_11_8_19_2_MHZ_VAL); break; case 38400000: - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_HS_PHY_CTRL_COMMON0, - FSEL_MASK, - FIELD_PREP(FSEL_MASK, FSEL_38_4_MHZ_VAL)); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_HS_PHY_CTRL_COMMON0, + FSEL_MASK, + FIELD_PREP(FSEL_MASK, FSEL_38_4_MHZ_VAL)); - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_CFG_CTRL_2, - PHY_CFG_PLL_FB_DIV_7_0_MASK, - DIV_7_0_38_4_MHZ_VAL); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_2, + PHY_CFG_PLL_FB_DIV_7_0_MASK, + DIV_7_0_38_4_MHZ_VAL); - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_CFG_CTRL_3, - PHY_CFG_PLL_FB_DIV_11_8_MASK, - DIV_11_8_38_4_MHZ_VAL); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_3, + PHY_CFG_PLL_FB_DIV_11_8_MASK, + DIV_11_8_38_4_MHZ_VAL); break; default: @@ -224,15 +224,15 @@ static int qcom_eusb2_ref_clk_init(struct qcom_snps_eusb2_hsphy *phy) return -EINVAL; } - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_CFG_CTRL_3, - PHY_CFG_PLL_REF_DIV, PLL_REF_DIV_VAL); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_3, + PHY_CFG_PLL_REF_DIV, PLL_REF_DIV_VAL); return 0; } -static int qcom_snps_eusb2_hsphy_init(struct phy *p) +static int snps_eusb2_hsphy_init(struct phy *p) { - struct qcom_snps_eusb2_hsphy *phy = phy_get_drvdata(p); + struct snps_eusb2_hsphy *phy = phy_get_drvdata(p); int ret; ret = regulator_bulk_enable(ARRAY_SIZE(phy->vregs), phy->vregs); @@ -265,73 +265,73 @@ static int qcom_snps_eusb2_hsphy_init(struct phy *p) goto disable_ref_clk; } - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_CFG0, - CMN_CTRL_OVERRIDE_EN, CMN_CTRL_OVERRIDE_EN); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG0, + CMN_CTRL_OVERRIDE_EN, CMN_CTRL_OVERRIDE_EN); - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_UTMI_CTRL5, POR, POR); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_UTMI_CTRL5, POR, POR); - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_HS_PHY_CTRL_COMMON0, - PHY_ENABLE | RETENABLEN, PHY_ENABLE | RETENABLEN); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_HS_PHY_CTRL_COMMON0, + PHY_ENABLE | RETENABLEN, PHY_ENABLE | RETENABLEN); - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_APB_ACCESS_CMD, - APB_LOGIC_RESET, APB_LOGIC_RESET); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_APB_ACCESS_CMD, + APB_LOGIC_RESET, APB_LOGIC_RESET); - qcom_snps_eusb2_hsphy_write_mask(phy->base, UTMI_PHY_CMN_CTRL0, TESTBURNIN, 0); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_UTMI_PHY_CMN_CTRL0, TESTBURNIN, 0); - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_FSEL_SEL, - FSEL_SEL, FSEL_SEL); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_FSEL_SEL, + FSEL_SEL, FSEL_SEL); /* update ref_clk related registers */ ret = qcom_eusb2_ref_clk_init(phy); if (ret) - goto disable_ref_clk; + return ret; - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_CFG_CTRL_1, - PHY_CFG_PLL_CPBIAS_CNTRL_MASK, - FIELD_PREP(PHY_CFG_PLL_CPBIAS_CNTRL_MASK, 0x1)); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_1, + PHY_CFG_PLL_CPBIAS_CNTRL_MASK, + FIELD_PREP(PHY_CFG_PLL_CPBIAS_CNTRL_MASK, 0x1)); - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_CFG_CTRL_4, - PHY_CFG_PLL_INT_CNTRL_MASK, - FIELD_PREP(PHY_CFG_PLL_INT_CNTRL_MASK, 0x8)); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_4, + PHY_CFG_PLL_INT_CNTRL_MASK, + FIELD_PREP(PHY_CFG_PLL_INT_CNTRL_MASK, 0x8)); - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_CFG_CTRL_4, - PHY_CFG_PLL_GMP_CNTRL_MASK, - FIELD_PREP(PHY_CFG_PLL_GMP_CNTRL_MASK, 0x1)); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_4, + PHY_CFG_PLL_GMP_CNTRL_MASK, + FIELD_PREP(PHY_CFG_PLL_GMP_CNTRL_MASK, 0x1)); - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_CFG_CTRL_5, - PHY_CFG_PLL_PROP_CNTRL_MASK, - FIELD_PREP(PHY_CFG_PLL_PROP_CNTRL_MASK, 0x10)); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_5, + PHY_CFG_PLL_PROP_CNTRL_MASK, + FIELD_PREP(PHY_CFG_PLL_PROP_CNTRL_MASK, 0x10)); - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_CFG_CTRL_6, - PHY_CFG_PLL_VCO_CNTRL_MASK, - FIELD_PREP(PHY_CFG_PLL_VCO_CNTRL_MASK, 0x0)); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_6, + PHY_CFG_PLL_VCO_CNTRL_MASK, + FIELD_PREP(PHY_CFG_PLL_VCO_CNTRL_MASK, 0x0)); - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_CFG_CTRL_5, - PHY_CFG_PLL_VREF_TUNE_MASK, - FIELD_PREP(PHY_CFG_PLL_VREF_TUNE_MASK, 0x1)); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_5, + PHY_CFG_PLL_VREF_TUNE_MASK, + FIELD_PREP(PHY_CFG_PLL_VREF_TUNE_MASK, 0x1)); - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_HS_PHY_CTRL2, - VBUS_DET_EXT_SEL, VBUS_DET_EXT_SEL); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_HS_PHY_CTRL2, + VBUS_DET_EXT_SEL, VBUS_DET_EXT_SEL); /* set default parameters */ qcom_eusb2_default_parameters(phy); - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_HS_PHY_CTRL2, - USB2_SUSPEND_N_SEL | USB2_SUSPEND_N, - USB2_SUSPEND_N_SEL | USB2_SUSPEND_N); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_HS_PHY_CTRL2, + USB2_SUSPEND_N_SEL | USB2_SUSPEND_N, + USB2_SUSPEND_N_SEL | USB2_SUSPEND_N); - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_UTMI_CTRL0, SLEEPM, SLEEPM); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_UTMI_CTRL0, SLEEPM, SLEEPM); - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_HS_PHY_CTRL_COMMON0, - SIDDQ_SEL, SIDDQ_SEL); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_HS_PHY_CTRL_COMMON0, + SIDDQ_SEL, SIDDQ_SEL); - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_HS_PHY_CTRL_COMMON0, - SIDDQ, 0); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_HS_PHY_CTRL_COMMON0, + SIDDQ, 0); - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_UTMI_CTRL5, POR, 0); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_UTMI_CTRL5, POR, 0); - qcom_snps_eusb2_hsphy_write_mask(phy->base, USB_PHY_HS_PHY_CTRL2, - USB2_SUSPEND_N_SEL, 0); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_HS_PHY_CTRL2, + USB2_SUSPEND_N_SEL, 0); return 0; @@ -344,9 +344,9 @@ static int qcom_snps_eusb2_hsphy_init(struct phy *p) return ret; } -static int qcom_snps_eusb2_hsphy_exit(struct phy *p) +static int snps_eusb2_hsphy_exit(struct phy *p) { - struct qcom_snps_eusb2_hsphy *phy = phy_get_drvdata(p); + struct snps_eusb2_hsphy *phy = phy_get_drvdata(p); clk_disable_unprepare(phy->ref_clk); @@ -357,18 +357,18 @@ static int qcom_snps_eusb2_hsphy_exit(struct phy *p) return 0; } -static const struct phy_ops qcom_snps_eusb2_hsphy_ops = { - .init = qcom_snps_eusb2_hsphy_init, - .exit = qcom_snps_eusb2_hsphy_exit, - .set_mode = qcom_snps_eusb2_hsphy_set_mode, +static const struct phy_ops snps_eusb2_hsphy_ops = { + .init = snps_eusb2_hsphy_init, + .exit = snps_eusb2_hsphy_exit, + .set_mode = snps_eusb2_hsphy_set_mode, .owner = THIS_MODULE, }; -static int qcom_snps_eusb2_hsphy_probe(struct platform_device *pdev) +static int snps_eusb2_hsphy_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; - struct qcom_snps_eusb2_hsphy *phy; + struct snps_eusb2_hsphy *phy; struct phy_provider *phy_provider; struct phy *generic_phy; int ret, i; @@ -405,7 +405,7 @@ static int qcom_snps_eusb2_hsphy_probe(struct platform_device *pdev) return dev_err_probe(dev, PTR_ERR(phy->repeater), "failed to get repeater\n"); - generic_phy = devm_phy_create(dev, NULL, &qcom_snps_eusb2_hsphy_ops); + generic_phy = devm_phy_create(dev, NULL, &snps_eusb2_hsphy_ops); if (IS_ERR(generic_phy)) { dev_err(dev, "failed to create phy %d\n", ret); return PTR_ERR(generic_phy); @@ -418,25 +418,25 @@ static int qcom_snps_eusb2_hsphy_probe(struct platform_device *pdev) if (IS_ERR(phy_provider)) return PTR_ERR(phy_provider); - dev_info(dev, "Registered Qcom-eUSB2 phy\n"); + dev_info(dev, "Registered Snps-eUSB2 phy\n"); return 0; } -static const struct of_device_id qcom_snps_eusb2_hsphy_of_match_table[] = { +static const struct of_device_id snps_eusb2_hsphy_of_match_table[] = { { .compatible = "qcom,sm8550-snps-eusb2-phy", }, { }, }; -MODULE_DEVICE_TABLE(of, qcom_snps_eusb2_hsphy_of_match_table); +MODULE_DEVICE_TABLE(of, snps_eusb2_hsphy_of_match_table); -static struct platform_driver qcom_snps_eusb2_hsphy_driver = { - .probe = qcom_snps_eusb2_hsphy_probe, +static struct platform_driver snps_eusb2_hsphy_driver = { + .probe = snps_eusb2_hsphy_probe, .driver = { - .name = "qcom-snps-eusb2-hsphy", - .of_match_table = qcom_snps_eusb2_hsphy_of_match_table, + .name = "snps-eusb2-hsphy", + .of_match_table = snps_eusb2_hsphy_of_match_table, }, }; -module_platform_driver(qcom_snps_eusb2_hsphy_driver); -MODULE_DESCRIPTION("Qualcomm SNPS eUSB2 HS PHY driver"); +module_platform_driver(snps_eusb2_hsphy_driver); +MODULE_DESCRIPTION("Synopsys eUSB2 HS PHY driver"); MODULE_LICENSE("GPL"); From patchwork Sat Apr 12 20:26:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivaylo Ivanov X-Patchwork-Id: 880583 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (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 1A0BD22D78E; Sat, 12 Apr 2025 20:27:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744489626; cv=none; b=hszu4a3L8ByZIhBXjcn0bkeQQ9M963mO4pDxAP7DTjoPY6rOWJ6/R5YzfU9eInGhMT3Iv6/R+ZiykRljfv9TFDpXje7UI2FuiD0P00DJuYusiVv5m3Ql4s9v0/T5fpnbXzf5Spn6lrur4/78R3ZYidKKOXMajGMWxKfreM92wy4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744489626; c=relaxed/simple; bh=2yy6EjiXxSAPVufYCa9ePZHsjODKDJ7K9wk6lj3SPyY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WX9zkkK4KCa6FxVhreAZT+8kqgvaNch+MnkMNKQn2XAFT1eamLFCV5h+ncG1fvxGJ964XbJsaLJNfNWFjfD83UxyJqDoeT7JHtlATIjTnR9QyWEs9Ci10kdjxYHZIw1j7VSfEgpW13y5dt9qt5Fu+waHaUjWIRDwDpIjyYi1TX8= 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=Sj8cAfai; arc=none smtp.client-ip=209.85.221.46 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="Sj8cAfai" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-39c0dfad22aso1674899f8f.2; Sat, 12 Apr 2025 13:27:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744489623; x=1745094423; 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=S/2ZMg6LQNzP+WqoJGSl/J+PhbKTk0j0hhnJ6TPVsHY=; b=Sj8cAfaiTTgqr/FjwvLSttXs4xT/GFl1I2BQL14AymDqMySD+ZO9ueVZUn7lfOqeoR balx4JBhce8bhiZn8/XhZ0qnJtY02LFiLCgltlOzFDApT0CT9kKu1TgiRUIoCNHfLesl CS1dktEW+1J095GTocALigh23W/8ZpqsR3dbU6E/sCrgQAEzg2lOcFo/wYY2EebTMEaH UpDHdI60R/mbg8RlXdrDbpWIpFLH1unYjvLGoTnGjfT1yrUiWv9fIbIETXcwOyKiGOfG INj3Nkwz4VboXZR/xkqzIZwEfHZYWMxzMBo6oarSccJoe3SG7KT03Le+fdyhIY0Bengx cjmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744489623; x=1745094423; 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=S/2ZMg6LQNzP+WqoJGSl/J+PhbKTk0j0hhnJ6TPVsHY=; b=HU7IXqcuXY58ss0t0Yhi3PqVe+iyfg7KbGy7uHoWpJrhK5spVwcsIQBN4M488dx8pw ML3pIzJFNuXaqrtmEeE4ReTelw4Vcqaso6U8/6LQutWj5/CWeZtYKrByZzmEWOnVX/jt cVqLV1uFGeRqBUDkQNcJA0/oYlFgwyEP/9yUQj7koh8w5M+2OMW0MlRZcWehTZLx738s XV3iDoTiplN4Pm4PTfKlgs5R7Z6Pchpf4+Hd7oYUwmojywm6xS8JFPWApxZO52tuCfk1 BAIFk71VKGMilm+KFGlMxk8UYb6U/fQFEUdxYmErQyjGzrejiwE9p4hx8RANpxK9zRGl 2XIg== X-Forwarded-Encrypted: i=1; AJvYcCU+OqNm13PZvSnzVNi4JkRkz/41DDGhsPOXTn/Mvg+339ODQWGiY+hmnnaZ0Yc404Rz6v3wGEQFPW9fbJfF@vger.kernel.org, AJvYcCUXOk5njWqPN/VmH9Jv6POlNkXgavI70Z/aDrYY8eSkWaU8NH68GQWdWPmwOSV5oji100T2wF8O3u+2@vger.kernel.org, AJvYcCUxwytJI8BdYo7ffJDD60oftcCSH9wSFQKXLMIm2aBS+FhHPTmQTvF54ieSVsUO9FegEETEA25qAK818JdvJg==@vger.kernel.org X-Gm-Message-State: AOJu0Yxw6TPa9MhW7Qt6ewLC2Rj9IzPAVpKT4zu56W0jk4ScQuK+oBu1 aATg6hXdwOYF/7LAlzeC/fzR6BCF6bwfIao2eKJt9LJ2Tyoj1w2PunWQMw== X-Gm-Gg: ASbGnctFIOXrsp/SA2Tk/mPWa+p38uS/UjJ0rlvPz25pI1IdB+yFJsNXY8molNjhKp9 x9WpVl3bS1fbiWci5Jkgzlr+fW/yAjUYW9nmSO2RwIYJi7p6mW/RcWZZDsMX0bRCXUpTXHr1xsI AEzLuxcNi2qHUr6XcRkp+RPGIvOfaToMsMBMkMKVSaZgghfQwGVnVDXz7yRYWqrhWYCCczGHikS WswMCP4pWEr+hMchGUgdsiQGoi5+97WAANXw9sJYEPWwHPFqFD4gwQVrUaN3+awhfN5PQsMDVrZ UK9D6aN4p2uvv0+pY0U2qJ9bOGUsZ6Xfwhlj/FDmINrB9objN7wCxKtcBaP5inxd4K05qAjIF3d HAyxCbAD7Aw+FfxEy X-Google-Smtp-Source: AGHT+IFJDUur0adD/E+6mc6RzqJoyEDVCAPitJd/TRf5iOWy3NXGIjLX4HQcNm9eTWMzQfsVlLv4vQ== X-Received: by 2002:a05:6000:40cd:b0:39c:266c:421 with SMTP id ffacd0b85a97d-39e9f3d9c2cmr5527869f8f.0.1744489622902; Sat, 12 Apr 2025 13:27:02 -0700 (PDT) Received: from ivaylo-T580.. (91-139-201-119.stz.ddns.bulsat.com. [91.139.201.119]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f2338d802sm131797845e9.1.2025.04.12.13.27.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Apr 2025 13:27:02 -0700 (PDT) From: Ivaylo Ivanov To: Krzysztof Kozlowski , Vinod Koul , Conor Dooley , Alim Akhtar , Kishon Vijay Abraham I , Rob Herring , Philipp Zabel Cc: linux-samsung-soc@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v4 05/10] phy: phy-snps-eusb2: split phy init code Date: Sat, 12 Apr 2025 23:26:15 +0300 Message-ID: <20250412202620.738150-6-ivo.ivanov.ivanov1@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250412202620.738150-1-ivo.ivanov.ivanov1@gmail.com> References: <20250412202620.738150-1-ivo.ivanov.ivanov1@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The current phy init consists of hardware power-up, as well as QCOM-specific eUSB2 init code. Split it into two parts, to make room for such non-QCOM init code. Signed-off-by: Ivaylo Ivanov Reviewed-by: Dmitry Baryshkov --- drivers/phy/phy-snps-eusb2.c | 94 +++++++++++++++++++++++------------- 1 file changed, 61 insertions(+), 33 deletions(-) diff --git a/drivers/phy/phy-snps-eusb2.c b/drivers/phy/phy-snps-eusb2.c index e1b175f48..1933e8440 100644 --- a/drivers/phy/phy-snps-eusb2.c +++ b/drivers/phy/phy-snps-eusb2.c @@ -121,6 +121,10 @@ static const char * const eusb2_hsphy_vreg_names[] = { #define EUSB2_NUM_VREGS ARRAY_SIZE(eusb2_hsphy_vreg_names) +struct snps_eusb2_phy_drvdata { + int (*phy_init)(struct phy *p); +}; + struct snps_eusb2_hsphy { struct phy *phy; void __iomem *base; @@ -133,6 +137,8 @@ struct snps_eusb2_hsphy { enum phy_mode mode; struct phy *repeater; + + const struct snps_eusb2_phy_drvdata *data; }; static int snps_eusb2_hsphy_set_mode(struct phy *p, enum phy_mode mode, int submode) @@ -230,41 +236,11 @@ static int qcom_eusb2_ref_clk_init(struct snps_eusb2_hsphy *phy) return 0; } -static int snps_eusb2_hsphy_init(struct phy *p) +static int qcom_snps_eusb2_hsphy_init(struct phy *p) { struct snps_eusb2_hsphy *phy = phy_get_drvdata(p); int ret; - ret = regulator_bulk_enable(ARRAY_SIZE(phy->vregs), phy->vregs); - if (ret) - return ret; - - ret = phy_init(phy->repeater); - if (ret) { - dev_err(&p->dev, "repeater init failed. %d\n", ret); - goto disable_vreg; - } - - ret = clk_prepare_enable(phy->ref_clk); - if (ret) { - dev_err(&p->dev, "failed to enable ref clock, %d\n", ret); - goto disable_vreg; - } - - ret = reset_control_assert(phy->phy_reset); - if (ret) { - dev_err(&p->dev, "failed to assert phy_reset, %d\n", ret); - goto disable_ref_clk; - } - - usleep_range(100, 150); - - ret = reset_control_deassert(phy->phy_reset); - if (ret) { - dev_err(&p->dev, "failed to de-assert phy_reset, %d\n", ret); - goto disable_ref_clk; - } - snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG0, CMN_CTRL_OVERRIDE_EN, CMN_CTRL_OVERRIDE_EN); @@ -334,6 +310,52 @@ static int snps_eusb2_hsphy_init(struct phy *p) USB2_SUSPEND_N_SEL, 0); return 0; +} + +static const struct snps_eusb2_phy_drvdata sm8550_snps_eusb2_phy = { + .phy_init = qcom_snps_eusb2_hsphy_init, +}; + +static int snps_eusb2_hsphy_init(struct phy *p) +{ + struct snps_eusb2_hsphy *phy = phy_get_drvdata(p); + int ret; + + ret = regulator_bulk_enable(ARRAY_SIZE(phy->vregs), phy->vregs); + if (ret) + return ret; + + ret = phy_init(phy->repeater); + if (ret) { + dev_err(&p->dev, "repeater init failed. %d\n", ret); + goto disable_vreg; + } + + ret = clk_prepare_enable(phy->ref_clk); + if (ret) { + dev_err(&p->dev, "failed to enable ref clock, %d\n", ret); + goto disable_vreg; + } + + ret = reset_control_assert(phy->phy_reset); + if (ret) { + dev_err(&p->dev, "failed to assert phy_reset, %d\n", ret); + goto disable_ref_clk; + } + + usleep_range(100, 150); + + ret = reset_control_deassert(phy->phy_reset); + if (ret) { + dev_err(&p->dev, "failed to de-assert phy_reset, %d\n", ret); + goto disable_ref_clk; + } + + ret = phy->data->phy_init(p); + if (ret) + goto disable_ref_clk; + + return 0; disable_ref_clk: clk_disable_unprepare(phy->ref_clk); @@ -378,6 +400,10 @@ static int snps_eusb2_hsphy_probe(struct platform_device *pdev) if (!phy) return -ENOMEM; + phy->data = device_get_match_data(dev); + if (!phy->data) + return -EINVAL; + phy->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(phy->base)) return PTR_ERR(phy->base); @@ -424,8 +450,10 @@ static int snps_eusb2_hsphy_probe(struct platform_device *pdev) } static const struct of_device_id snps_eusb2_hsphy_of_match_table[] = { - { .compatible = "qcom,sm8550-snps-eusb2-phy", }, - { }, + { + .compatible = "qcom,sm8550-snps-eusb2-phy", + .data = &sm8550_snps_eusb2_phy, + }, { }, }; MODULE_DEVICE_TABLE(of, snps_eusb2_hsphy_of_match_table); From patchwork Sat Apr 12 20:26:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivaylo Ivanov X-Patchwork-Id: 880920 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 51116230BCF; Sat, 12 Apr 2025 20:27:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744489629; cv=none; b=R3NMFdtMxA7Nh7V8QdCyRVZSzlFUR4l/9MBKGkigD83ECplEy47RWdUVYYTB0UKLWDDxGsOs3370Iyw9JjrzLxee9s+YerNDbelmnxE5NXWAy8Fsq7Alfp125DogkQqFf7tfb0rFXvzdLQqnhPsnKv4JwoWkF+uOvnOSLPaBJws= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744489629; c=relaxed/simple; bh=tTlRXxdg/HE/Xx4UoLaC/7E8D2Teyq2hyKBHoUvS6Z0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s2nfHlShMNNynXdBzUpENkDYTfdH1XbgcHwd+sOuMfg9xNv12DXHNmvXz059dBjEjlphe9+QqY5suLDRKjJZe/QPYOPDJFBwTE0SNhU2x/AGtqSsZBW4OYLU5K+iEz1mWj1o4e2bCBv80BKoWFkE66Pbv7TWtc8uMSt3p9LL/to= 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=iwa6ZwVx; arc=none smtp.client-ip=209.85.128.43 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="iwa6ZwVx" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-43d04ea9d9aso14965055e9.3; Sat, 12 Apr 2025 13:27:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744489624; x=1745094424; 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=4mVbqwsxzgFPfZ9lDdnu8dfGQADmGRwdt2QEaF4tnGI=; b=iwa6ZwVxilHfUi3ktLl28USW55015ijymAqHih0AcyP0sbBI56coPC/f9V/7ZOb1HQ k2GkHQXJr4BejfbzVoUbIdUDxNf6amnaFvS1JkXW+t37kHefv8FmFNYvQWmJSLZ0CldA YWNp4BO9gLqBKC01OGrB87lahI0oYNfZLBBnCGYAJr0QGcyu+QPn/NBrQX9PlZVwH+yC pUVtDQUyuwfoPGBd8PNG38HdRr3StbLC0auAHXb5+CxH8M7PnD6TcfBQ4Vxg6KY805Wn BT7KTaqo45ZIRnaLIVf/mi5xDUdWcb+OiLFSwLfOP8ikUx1orourSR4nPPFyqTfiQOOm ZQ8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744489624; x=1745094424; 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=4mVbqwsxzgFPfZ9lDdnu8dfGQADmGRwdt2QEaF4tnGI=; b=SxNz6Yaj9SoCQhyswRhmUf9jgLHnB1i8huhi7FEyQA+CVcu0X/1y0FRgK8qJ2ccJPc XI2GqbwbWNSccMJETV1xzE8ElVg/AJ866/pNVA9xdxxthZSguoVTRlBfu6M3CRBGyHia g7Bj/ndusQVMoiXQFQZg6PVSDqStb4ojT1lEaWrNF/r8+ThMyYlGDG0dOp7uVQHaG3xx b/wrUhNgltHVxjYeyYXWWrAOJ/5D/PqeJE+qyOXWPFWKILgXLRNtPpn9ZpYnia5QmzVo UGj4heNinPDSFIH3CFMOptTgJd9Chuelhp9P23SfX7bXoEGHDwusCALtM8rBq29ni0AY rfzw== X-Forwarded-Encrypted: i=1; AJvYcCWBXhinQXJLeTOo/gfqMsYFdrUZUxR6nYEA52HASl6DC+glEkpb5N4QUf9lFISAY/OwTSaLN9YSTNKrUnrANQ==@vger.kernel.org, AJvYcCXXx9ovXsNZecazu9SujLF6UZZqDe0tRzUaoqsUHxkTyNVOyyu5wgPh3jKSEV5eWVgYEhuFu6nGuHYqa2zL@vger.kernel.org, AJvYcCXuhOns3X1KsLN8hmFm7hSjjSk4hMxlK/6BwQEqOri0B20ZL1e9b5kyZx3dSwyrxAHxRKVaYYkP9HUu@vger.kernel.org X-Gm-Message-State: AOJu0YzEF6unhJ52xOG5h2/8I6ifwgrIhTUJBB1KT62kyirHb4PKbpjv beX47E5GxuTniF6KiAU50B0QLHKd9o4lfPQ0bqq4InVZO1wPs53g X-Gm-Gg: ASbGncsxRL45rbZRnu+BQdSHtPpah4GONa7ijdBFNLQKJtdQ4KjegzKPmMPgewjF7n5 QLA8fIT3lygdYvszN81eA/ghFPLsTV4tUlcfv0hr1+8N83gufB0OtSael0FhNBNrtCMvtvWnMwn Rk99ltlHFw+xlD2OLOVOq9+wQYJgFD2DQXHVoxU4wnctdtImpHQYWfIcArEzwdTLM6O9JLeFI0k 9ves3Ixu9jCXeUWJjU2C6wi34XHhBlcK3vc5S0t0b4wBbz7oJ8F0nxxi4iaK0z7kuQsvwH/MVjH bWmN9QmmmvJDBXvyaTz8fTbjaeHRgpWgtd4Xt5TJP4tgsFxx2l8ziMJzE2QCOHrYB2YOTQs88FV dn92FDnMZ0VD2puxZ X-Google-Smtp-Source: AGHT+IEsgvtrWdgSeL0DlLpKGI9k/yst2bpThSyr13W7zdJuj6gazbdG6ZqfVwdkcHDp3Ks5PdCzxQ== X-Received: by 2002:a05:600c:1e18:b0:43d:2230:303b with SMTP id 5b1f17b1804b1-43f3a9ab06bmr50489615e9.20.1744489624337; Sat, 12 Apr 2025 13:27:04 -0700 (PDT) Received: from ivaylo-T580.. (91-139-201-119.stz.ddns.bulsat.com. [91.139.201.119]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f2338d802sm131797845e9.1.2025.04.12.13.27.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Apr 2025 13:27:03 -0700 (PDT) From: Ivaylo Ivanov To: Krzysztof Kozlowski , Vinod Koul , Conor Dooley , Alim Akhtar , Kishon Vijay Abraham I , Rob Herring , Philipp Zabel Cc: linux-samsung-soc@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v4 06/10] phy: phy-snps-eusb2: make repeater optional Date: Sat, 12 Apr 2025 23:26:16 +0300 Message-ID: <20250412202620.738150-7-ivo.ivanov.ivanov1@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250412202620.738150-1-ivo.ivanov.ivanov1@gmail.com> References: <20250412202620.738150-1-ivo.ivanov.ivanov1@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 As described in the device tree bindings, it's not necessary for the SNPS eUSB2 phy to be connected to a repeater. In configurations where there are such instances, the driver probing fails and the usb controller does not work. Make the repeater optional to avoid that, which also lets us use the eUSB2 phy when it's connected to a repeater that is not configurable by the kernel (for example it's missing a driver), as long as it has been configured beforehand (usually by the bootloader). Signed-off-by: Ivaylo Ivanov Acked-by: Neil Armstrong Reviewed-by: Dmitry Baryshkov --- drivers/phy/phy-snps-eusb2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/phy/phy-snps-eusb2.c b/drivers/phy/phy-snps-eusb2.c index 1933e8440..4094786d2 100644 --- a/drivers/phy/phy-snps-eusb2.c +++ b/drivers/phy/phy-snps-eusb2.c @@ -426,7 +426,7 @@ static int snps_eusb2_hsphy_probe(struct platform_device *pdev) return dev_err_probe(dev, ret, "failed to get regulator supplies\n"); - phy->repeater = devm_of_phy_get_by_index(dev, np, 0); + phy->repeater = devm_of_phy_optional_get(dev, np, 0); if (IS_ERR(phy->repeater)) return dev_err_probe(dev, PTR_ERR(phy->repeater), "failed to get repeater\n"); From patchwork Sat Apr 12 20:26:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivaylo Ivanov X-Patchwork-Id: 880582 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 C0EFF230BDC; Sat, 12 Apr 2025 20:27:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744489629; cv=none; b=oR4lfnWpnIZZ95ukke74nROCdWB/TsehkITsxpcIGiBXdeiUR66ZEXWIqnhie/8iCTWeRXGCQh9YMI751B88IlKiQoVLhRYQsT/kHHdeyZXa6AI9AooAxauIVEuHkVJ+WWVP1Azgop7tX55sQFztz2mPu8z9WNNBsm4UfF7mx48= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744489629; c=relaxed/simple; bh=9jGBgw7X4dT0+5FklcYtTpf6XdRbcwhpMrfLuBnypSE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lERb+Bc7fh4Fv44cJuCQO4K+voCBQ3QsVSy5a677fVnKpFxKYtk+BYMjilyC8HlbmnptN2PU1tKAIFZTA16573JXJe7/0EcmSSJXCg2X+tfNU+Kgfg4lbXrLc1lcSUWE7//vD2ufyiBri2+tos1xmPCOFvMI6nO8+XTMkB26TBA= 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=Qgs4Q/zB; arc=none smtp.client-ip=209.85.128.49 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="Qgs4Q/zB" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-43edecbfb46so21564845e9.0; Sat, 12 Apr 2025 13:27:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744489626; x=1745094426; 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=RbJk9bz6EFQthks8Ev5pNh2F644o6dRNVZmRCAlT3D8=; b=Qgs4Q/zBC6q/9pEF1orjgmUBBvIWHrzeNkiIjqmwc2/RDp0kHHgwKR6MFX5UddN0bv TF6S9cDQFk98P87fc7XNeVIBkWPy4mjEjaLTOxYBJpNfb7KJWgaYxqKQ4slAnskgVTEy 5tKyim3K3lUJg9X/Jxp03cciKIDRkMRgvOStv68TfJomFf6wYehXA+c8UUXA+J1TJJgy bm2mOHxdaMLmKW7EXuZTQiC8VuH4DmgI3ZAmPT74gU6TpVWOVPj5AmIPDHQKZIUpUxnq usKFPePBYysWaozoe5RL/pwFV87KWpxvGLQtldRUxm/RejR+W1TSan+xda8lO7SDUTpF 1JnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744489626; x=1745094426; 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=RbJk9bz6EFQthks8Ev5pNh2F644o6dRNVZmRCAlT3D8=; b=EZGjXyPco2QasiCi6HL1XbiAy3Bv/NiXEV9JzzTH8wBjKGNfazBTZbXWD5ONrIoiuR Yf73kDBT9kBCJPVfcnB48+omT3lcuFGw3oFThsrGjTfHKqAyPpz+UFaMAqjJs0FVQtUf Ji91nV8i9mNSuMKzznAKO2moz537F0nHl5M1FgtIF3hkiZX/wcjEJuifqqc6ZCmQf4OG u1nGMOoIErirmtH/QNGxuBYWTD301P/oxyzZ0Af4OeswylL9h8uJdfqvYGNzIy9L6JLZ huheelqRs8OwtKE9+Z9wC3Om9tdDK1gizRFX7ZhQGEcaySN9mWxw1Sy9Khvjpxs7Jo2m 91/g== X-Forwarded-Encrypted: i=1; AJvYcCW5els2GtXE4q+B0YFs9eQCLFAKpvXyXx2BJ6lEkYsAFPCORO0LjAgsZd/t0htPtHqxXTbjMdT3m4RZHm5NYA==@vger.kernel.org, AJvYcCWaqVlV43LX9NebdeZZUZ9jA2zr6W33uGS4L9x4Bi7CzMTo5DxjG1yp7sUPCsFYF7jHQkIxRQw4hU8W@vger.kernel.org, AJvYcCWmgUC7evfrWuo076KoKhtLQG7wluMlvdNdHCsfreY+24dPXzuYpIwli+WShbTU6dbbJKexdJdrKIfYVmh8@vger.kernel.org X-Gm-Message-State: AOJu0Yxws7lpZgrE1fDDVGJd8KHVw7K1Wn2gnUijb1Tt6DdjnGTwFH5J M2THS5sduhqdDTM4YGLQoUy5EBdVz6ybjeLCs3kSL37lOhIEEIGawUSu9g== X-Gm-Gg: ASbGnctmhgG7UbXNiqvmegQPaA/SlFzOL5U/1jnwEqAtFKTi3l0Oqvg0HzI24ayMq4e FySbhHlxZ9ctSlEw8wQ5ubbyV5XxL8rlCejbZvpW3bWI5jD69B0luWjlkGQEyNbUE2lM0/Etn9t 9KV28mPLWdEtIR7of/xhXvuqbxgjFrLHOGjresaL0vHwoyhb5nS2FruENHodG0Q2Oe7VPQJMGhv OAZEVs3hGvSwGZlWZo3/9f4yr+DAFzjyuI7YIPO09Fa0TBFY1ucre+CURqb9Mja52Kol3fB4WQl a1XYxFkdJ3l9vwMNEdIyBq886PvUaJQFJ4p1clelQlItfztI2Aq87A4A5Qy4Z5h+P5lb4CbaphK mkxRjS5IvsfU7Abia X-Google-Smtp-Source: AGHT+IF7eQA+y8Lqvzil16h/BZ20xtsseNQHcX3MasiH+W36JGiRILYfIiYVwPVlNIgUn3fdc+Vv5Q== X-Received: by 2002:a05:600c:3ac6:b0:43c:f8fc:f69a with SMTP id 5b1f17b1804b1-43f3a925e28mr71377265e9.4.1744489625722; Sat, 12 Apr 2025 13:27:05 -0700 (PDT) Received: from ivaylo-T580.. (91-139-201-119.stz.ddns.bulsat.com. [91.139.201.119]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f2338d802sm131797845e9.1.2025.04.12.13.27.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Apr 2025 13:27:05 -0700 (PDT) From: Ivaylo Ivanov To: Krzysztof Kozlowski , Vinod Koul , Conor Dooley , Alim Akhtar , Kishon Vijay Abraham I , Rob Herring , Philipp Zabel Cc: linux-samsung-soc@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v4 07/10] phy: phy-snps-eusb2: make reset control optional Date: Sat, 12 Apr 2025 23:26:17 +0300 Message-ID: <20250412202620.738150-8-ivo.ivanov.ivanov1@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250412202620.738150-1-ivo.ivanov.ivanov1@gmail.com> References: <20250412202620.738150-1-ivo.ivanov.ivanov1@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Not all SoCs expose the reset line controls to the kernel, so make them optional. Signed-off-by: Ivaylo Ivanov Reviewed-by: Dmitry Baryshkov --- drivers/phy/phy-snps-eusb2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/phy/phy-snps-eusb2.c b/drivers/phy/phy-snps-eusb2.c index 4094786d2..f05333901 100644 --- a/drivers/phy/phy-snps-eusb2.c +++ b/drivers/phy/phy-snps-eusb2.c @@ -408,7 +408,7 @@ static int snps_eusb2_hsphy_probe(struct platform_device *pdev) if (IS_ERR(phy->base)) return PTR_ERR(phy->base); - phy->phy_reset = devm_reset_control_get_exclusive(dev, NULL); + phy->phy_reset = devm_reset_control_get_optional_exclusive(dev, NULL); if (IS_ERR(phy->phy_reset)) return PTR_ERR(phy->phy_reset); From patchwork Sat Apr 12 20:26:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivaylo Ivanov X-Patchwork-Id: 880919 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 CCDA1230BF7; Sat, 12 Apr 2025 20:27:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744489630; cv=none; b=uiffMfhlRklrw0/uIlrK6z9uZUqLg0Aft/IRRPli20u8yy8FbiUL38YC7QIIcTHNCdSx+VAr1EfnxaTi6WfrXwVC3+TH/Wksc7TNtV1ergvsMQ0RS7uORZ/y6P4jgEL4vw+7A5pUKDtYZ39IsckNTrlLfIu+q9JR+vuOy/Kfmg4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744489630; c=relaxed/simple; bh=AkBmi3smSWITHl2bmr29dOmbgvhXHgDHeSc21unzXPg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mxVTFY6lg18qqBUKBFyLyVWtbPFvhJ0nK04CJgeLiobLRPcwRUiakTkE08U51WKeWXKquoMDR0SYUiJm1B1gtbiFFmo74cOazqwZ7q5elrrz+VEBUep8o4/3O+qiBTJqvoBJaGfdpa+BIurGVcKyAnmgW0n8y8g4wzggopBidWU= 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=NfbnsuJ6; arc=none smtp.client-ip=209.85.128.46 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="NfbnsuJ6" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-43cfa7e7f54so19467525e9.1; Sat, 12 Apr 2025 13:27:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744489627; x=1745094427; 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=H8Z64jhMWr4f68K+GRZRK+Jca5FzqJ7OziWBl/OdXKA=; b=NfbnsuJ6Tg4ypbzr5rpH48BGiVCXqe+NZ5PKNAI5qZ9C6vS7Zh+cPZlsEvG/h0Hu3o JgdFnG6VHdT5S3WOP2Afq9u6ergPBSODLDeHK2SVcw14M1MTkzPObb2OKSRG44ajQSsn 4PXXYHcNhPqNRogV+zu2IzMoX7bdlv9pAMyYZsQrWiY6BN6PCrGbjWGzIdgkSdzhSjGI F1CbtSVK8WtVHyBeznSuWM5y5+abCDUuTBkXtgF97ZSyKwwUK6VU99d848V8+cp1gdXT XGYkMKsRkaqEAL5AlVWtapfzdZpHGhVDRGaG4qAz94E0VQq6ptCT90g1gVFWAMWvZ74e 1xhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744489627; x=1745094427; 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=H8Z64jhMWr4f68K+GRZRK+Jca5FzqJ7OziWBl/OdXKA=; b=rhLDiU21aVkcPnhL4Ta9FAsFDpKiKnr/gg1OdUkO54oO050dOl6mmVc6I3iUUzlRLk GlFH6Bnui9/aVaoBiqyJjp9ZyPElM5+HO+5QKqFXbqxE3mxJ497K+coCawMp4ynkzjBX Te2SxJWosckMcNvN/7u+WXcuBJjfsOHvgjZYzPRSpHBeE4E4eUBE2r1ptm3sDcm2z5T5 HBqCObEOemBBZZJf7WrhYrsqTa0Jiso7HEm2S36KWIzvbR5MSGi0tPeS8sblK0Y42jcK ECtBToNISr82gA54sx/iEcdboxS99fnWwDTttP/V2JhyIoKFBJQrZq3YjKqB3I+aIVQR GXMA== X-Forwarded-Encrypted: i=1; AJvYcCVAUEraGwcnzhTMVcXCjbM81hF1iSTCIQS4v4W/P8vM4cqFmEZD/8wQTw2vgLYTRwz+Qg/TTCeTxJ9fj9ZqWg==@vger.kernel.org, AJvYcCVPL3RaLOj1CTComffMbUZMeVzxEc86IYodZMHu0L+odmORI8WR1OKv2WCLNjGFrdIQlGG9HvDqQP85@vger.kernel.org, AJvYcCXawgnrbvc0tdZEXpeANPEh/fH6aZUc4IrGfvAfTClMVAViz3911fdkt39dWz/HwogRIbjbHFoUcyrK77Lt@vger.kernel.org X-Gm-Message-State: AOJu0YxbtFYcvSsXWSd3ef31vqhEZjcBKsdOPOiNPDzwiNyu4rvyNrXV A4Sf+daVhiSk5K9gi1zxb+RBMAM4B1+2BLY+1NAb0mudFzpeTVeI X-Gm-Gg: ASbGncvb3cQp4fZZgRasRvlQNYoQj/AcPjZWySTnqbFmE3RNBC5ePEamsIC27u6NbsB T5YOwQ3ermRiILQaIzjibV8uX13kg6q/OZpx0sb+d+oJPcVvkgL5l7KHIy5IXMg0YIr6/z8rQLI /biG/4RV15e2LgDCEYvbr4q8MLsHrzr+FnwrhFcYIKkDT1u8uL4rsYaLPwv+4+pB6kgN5XkNKow ocrU8tZB2COaoPVJMDTQ1ZWCGADTv/CqkdDbaKW3yTbdQYY2J8f5H7o2Gl1vl/8ga5lrN/qIQl1 8NYusvWfL99MBV2sNQR+DLw58xoaKCAY0ctNQiGQvatPo83x0unvajyTWLt7jKLwUvmAskHsE0R xxr0wptzrClAN0H4AAJUT/LJ3xCg= X-Google-Smtp-Source: AGHT+IG73wjyA14hJiUHlYys0uHoP/Gq7sjSROhJNkoVVZBSO2iuHMJltm4VuHHk5qyF/mQobHC8yg== X-Received: by 2002:a05:600c:1e1c:b0:43d:1bf6:15e1 with SMTP id 5b1f17b1804b1-43f39622728mr61973155e9.1.1744489627005; Sat, 12 Apr 2025 13:27:07 -0700 (PDT) Received: from ivaylo-T580.. (91-139-201-119.stz.ddns.bulsat.com. [91.139.201.119]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f2338d802sm131797845e9.1.2025.04.12.13.27.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Apr 2025 13:27:06 -0700 (PDT) From: Ivaylo Ivanov To: Krzysztof Kozlowski , Vinod Koul , Conor Dooley , Alim Akhtar , Kishon Vijay Abraham I , Rob Herring , Philipp Zabel Cc: linux-samsung-soc@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v4 08/10] phy: phy-snps-eusb2: refactor reference clock init Date: Sat, 12 Apr 2025 23:26:18 +0300 Message-ID: <20250412202620.738150-9-ivo.ivanov.ivanov1@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250412202620.738150-1-ivo.ivanov.ivanov1@gmail.com> References: <20250412202620.738150-1-ivo.ivanov.ivanov1@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Instead of matching frequencies with a switch and case, introduce a table-based lookup. This improves readability, reduces redundancy, and makes it easier to extend support for additional frequencies in the future. Signed-off-by: Ivaylo Ivanov Reviewed-by: Dmitry Baryshkov --- drivers/phy/phy-snps-eusb2.c | 61 +++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/drivers/phy/phy-snps-eusb2.c b/drivers/phy/phy-snps-eusb2.c index f05333901..8caa62c0b 100644 --- a/drivers/phy/phy-snps-eusb2.c +++ b/drivers/phy/phy-snps-eusb2.c @@ -192,44 +192,47 @@ static void qcom_eusb2_default_parameters(struct snps_eusb2_hsphy *phy) FIELD_PREP(PHY_CFG_TX_HS_XV_TUNE_MASK, 0x0)); } +struct snps_eusb2_ref_clk { + unsigned long freq; + u32 fsel_val; + u32 div_7_0_val; + u32 div_11_8_val; +}; + +static const struct snps_eusb2_ref_clk qcom_eusb2_ref_clk[] = { + { 19200000, FSEL_19_2_MHZ_VAL, DIV_7_0_19_2_MHZ_VAL, DIV_11_8_19_2_MHZ_VAL }, + { 38400000, FSEL_38_4_MHZ_VAL, DIV_7_0_38_4_MHZ_VAL, DIV_11_8_38_4_MHZ_VAL }, +}; + static int qcom_eusb2_ref_clk_init(struct snps_eusb2_hsphy *phy) { + const struct snps_eusb2_ref_clk *config = NULL; unsigned long ref_clk_freq = clk_get_rate(phy->ref_clk); - switch (ref_clk_freq) { - case 19200000: - snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_HS_PHY_CTRL_COMMON0, - FSEL_MASK, - FIELD_PREP(FSEL_MASK, FSEL_19_2_MHZ_VAL)); - - snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_2, - PHY_CFG_PLL_FB_DIV_7_0_MASK, - DIV_7_0_19_2_MHZ_VAL); - - snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_3, - PHY_CFG_PLL_FB_DIV_11_8_MASK, - DIV_11_8_19_2_MHZ_VAL); - break; - - case 38400000: - snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_HS_PHY_CTRL_COMMON0, - FSEL_MASK, - FIELD_PREP(FSEL_MASK, FSEL_38_4_MHZ_VAL)); - - snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_2, - PHY_CFG_PLL_FB_DIV_7_0_MASK, - DIV_7_0_38_4_MHZ_VAL); - - snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_3, - PHY_CFG_PLL_FB_DIV_11_8_MASK, - DIV_11_8_38_4_MHZ_VAL); - break; + for (int i = 0; i < ARRAY_SIZE(qcom_eusb2_ref_clk); i++) { + if (qcom_eusb2_ref_clk[i].freq == ref_clk_freq) { + config = &qcom_eusb2_ref_clk[i]; + break; + } + } - default: + if (!config) { dev_err(&phy->phy->dev, "unsupported ref_clk_freq:%lu\n", ref_clk_freq); return -EINVAL; } + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_HS_PHY_CTRL_COMMON0, + FSEL_MASK, + FIELD_PREP(FSEL_MASK, config->fsel_val)); + + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_2, + PHY_CFG_PLL_FB_DIV_7_0_MASK, + config->div_7_0_val); + + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_3, + PHY_CFG_PLL_FB_DIV_11_8_MASK, + config->div_11_8_val); + snps_eusb2_hsphy_write_mask(phy->base, QCOM_USB_PHY_CFG_CTRL_3, PHY_CFG_PLL_REF_DIV, PLL_REF_DIV_VAL); From patchwork Sat Apr 12 20:26:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivaylo Ivanov X-Patchwork-Id: 880581 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 C14BD233727; Sat, 12 Apr 2025 20:27:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744489633; cv=none; b=uwJT0L9mPnznULtdaiuzZPZpCfelC72AAESKOeCt/+GHLf/qyyS+qttaSoZ/Jl4qcBcghmQbTp3l0xGg6/1EOo6ZSS7KlvKBuQ3jtgM7t+i89q7PBI6MUlThMt8wSFDlkVUw+oKzor1NfbapwjA5Rb1+42th3VAP+fZ0DKHUcA0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744489633; c=relaxed/simple; bh=0HfmoJ1eKCUXeAcBueVOMB1m2AGBavKU7wCDRnfCPc8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EzQGzQrUtthQlCBbvFkyCQzyctoKK+VZ/Jas3kTG5nF14qBXiGsujlf0mlVusT8WUSVaBsa+Tdim0I9Dxb3evcwKaNKBb3Mmkcn+RWWJTn0l1AHA6pYAbXK+XdAMOJQOFVJi9KbLo3FLCPVd00xr0Z0zd/edU+YUMGDfwTkkwz8= 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=KSLeIvqe; arc=none smtp.client-ip=209.85.128.43 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="KSLeIvqe" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-43cf848528aso24698275e9.2; Sat, 12 Apr 2025 13:27:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744489629; x=1745094429; 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=oiAf53C7ZnTbYps0PrN9/DfVbsgINyfTunf3aDFoB+k=; b=KSLeIvqeTgw+5RSjOOMHi5F0X3kD3MLg4+gQFB8EZvWWFYaT8wZpxTnlh7Eg3IKX5G 6gd4XAXEw8Cd18AYcHoW3DuFMLQhEJaePB3MEUgg//gRsDAzW3hLP7PcnsWr2I/ZQWeW 5BfNXoqpKfh/3dhaEOecTioK0DpGjzhQ+OftQKu6Al9BdUcTxuV0n5qtlA1+c+0CgUJQ K+XPFdXoFyYzBxGWtLWoIrcdreex4sgFNuSYfZlDcKFCYVYsYY/ZuhVFT0cKxkk5yRzT Osbtv3IeTwu4Oq4hLBhL+6v4m2xbh2whHHp08vEki3rQP4Tvk+Zs+eDpid+sDru+oFak f14w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744489629; x=1745094429; 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=oiAf53C7ZnTbYps0PrN9/DfVbsgINyfTunf3aDFoB+k=; b=WoHizd/srOhYdr+9Go5KU/FL/pUF0EqGyzpnD5RzPm1C3zfdHurDdGqgqGbg3IdeIR +hKy32H9T1taDobNxBvEhAdvz6CUPJHkaA+ZkKcw/69Cpi1B6jahTQRqU8NSnOXCAh8H 4HB0b9TLqqHi65VX3eJg0rzuLUhy+wxOfo5c/H0+LUx01OgV6wkqQSH2mM+4fptuL/HL nsKb3cLceUqi37/1WXC0buUHHBpgdO+Duz/j+tHsYvyMYboYWzzEdP0scEPuEifVWV8e PEIIeUhY9cRkMAMfKxPG7/PYZ5x/Dnw55GjqL7ycGq9Z6wB4lIVc89QKBrmoEtR/NCTa dB7Q== X-Forwarded-Encrypted: i=1; AJvYcCU/fXXU06oewirii3wTYMqnOuReSO0gtAdS/5AXvyLYI2WxXPZLFwepRscFD7+C1J9Exo0oveKV/4p5qW49FQ==@vger.kernel.org, AJvYcCWf6za9TlNmrkMMJ3UbcggN0QK+8ILHzURm8qTnUwwcPe0N6UNrXO44+QjaY7Uuuwladc58sKMZ3+rJ@vger.kernel.org, AJvYcCXYM3ZPWDmy+yUL/1V3sVK1RlvwjFMxkND1mEMS8+EEk3schTPsfcP2CvkyvheoQw2Mkuh/j4baBjLMKsSM@vger.kernel.org X-Gm-Message-State: AOJu0YwgcS1qN/wrGkEvJXKgArkYmFAaG11aLPwgktBkNlBiEi5CM8/F boOBiSJGbD23c12wESdaU8dvBSLbnOTKh4X9WQm7JaQnXvKdnLITDipqmg== X-Gm-Gg: ASbGncs3edsoU5frNCmpn1AWYo2xJxsGjppsPk3XCblkU3ODH7M5p3NSTN5koyrTWi2 sh1RGhYSwFr+XG5mbT9eAgyWxOnNc400rHuZNfZ7mEu2oF6go1PcF1fPHZHNcL0hAYddW5uUH7a W4DikMZP04e3KU2ZmnlyqSHj+H7tCjJwRiW2QsesdeQ7Rm9H3JfkKW9fAYgoOS18844jQEt3DMz OcUmX/d/v029tQ6CnUt/4b3BuCUDlVWceD38j+fxVwMXHZHTLAoC7oIc4B5sOTJXLjJeiz/b99L AkCMvbrQl39p2P1P5qzdKoz9GkujL3SIY9+2EcUm1od/3aNKHD4jUEa+irrrkaXbiPWBlrhie2l d/F0h0VOYGSk13HuBfZHUOu5Qs4Y= X-Google-Smtp-Source: AGHT+IG0+EQ5ZHlXT+K0utbNPBKa36hf+YEVRE97ohaH5aCTaJIRJCESsDT0lPqorgHmB8JT1EHFPw== X-Received: by 2002:a05:600c:83c4:b0:43c:fb8e:aec0 with SMTP id 5b1f17b1804b1-43f3a925ademr59846615e9.1.1744489628646; Sat, 12 Apr 2025 13:27:08 -0700 (PDT) Received: from ivaylo-T580.. (91-139-201-119.stz.ddns.bulsat.com. [91.139.201.119]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f2338d802sm131797845e9.1.2025.04.12.13.27.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Apr 2025 13:27:07 -0700 (PDT) From: Ivaylo Ivanov To: Krzysztof Kozlowski , Vinod Koul , Conor Dooley , Alim Akhtar , Kishon Vijay Abraham I , Rob Herring , Philipp Zabel Cc: linux-samsung-soc@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v4 09/10] phy: phy-snps-eusb2: add support for exynos2200 Date: Sat, 12 Apr 2025 23:26:19 +0300 Message-ID: <20250412202620.738150-10-ivo.ivanov.ivanov1@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250412202620.738150-1-ivo.ivanov.ivanov1@gmail.com> References: <20250412202620.738150-1-ivo.ivanov.ivanov1@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The Exynos2200 SoC reuses the Synopsis eUSB2 PHY IP, alongside an external repeater, for USB 2.0. Add support for it to the existing driver, while keeping in mind that it requires enabled more than the reference clock. Signed-off-by: Ivaylo Ivanov Acked-by: Dmitry Baryshkov --- drivers/phy/Kconfig | 2 +- drivers/phy/phy-snps-eusb2.c | 162 ++++++++++++++++++++++++++++++++++- 2 files changed, 159 insertions(+), 5 deletions(-) diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig index 11c166204..58c911e1b 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -45,7 +45,7 @@ config PHY_PISTACHIO_USB config PHY_SNPS_EUSB2 tristate "SNPS eUSB2 PHY Driver" - depends on OF && (ARCH_QCOM || COMPILE_TEST) + depends on OF && (ARCH_EXYNOS || ARCH_QCOM || COMPILE_TEST) select GENERIC_PHY help Enable support for the USB high-speed SNPS eUSB2 phy on select diff --git a/drivers/phy/phy-snps-eusb2.c b/drivers/phy/phy-snps-eusb2.c index 8caa62c0b..1ce18cbac 100644 --- a/drivers/phy/phy-snps-eusb2.c +++ b/drivers/phy/phy-snps-eusb2.c @@ -13,6 +13,39 @@ #include #include +#define EXYNOS_USB_PHY_HS_PHY_CTRL_RST (0x0) +#define USB_PHY_RST_MASK GENMASK(1, 0) +#define UTMI_PORT_RST_MASK GENMASK(5, 4) + +#define EXYNOS_USB_PHY_HS_PHY_CTRL_COMMON (0x4) +#define RPTR_MODE BIT(10) +#define FSEL_20_MHZ_VAL (0x1) +#define FSEL_24_MHZ_VAL (0x2) +#define FSEL_26_MHZ_VAL (0x3) +#define FSEL_48_MHZ_VAL (0x2) + +#define EXYNOS_USB_PHY_CFG_PLLCFG0 (0x8) +#define PHY_CFG_PLL_FB_DIV_19_8_MASK GENMASK(19, 8) +#define DIV_19_8_19_2_MHZ_VAL (0x170) +#define DIV_19_8_20_MHZ_VAL (0x160) +#define DIV_19_8_24_MHZ_VAL (0x120) +#define DIV_19_8_26_MHZ_VAL (0x107) +#define DIV_19_8_48_MHZ_VAL (0x120) + +#define EXYNOS_USB_PHY_CFG_PLLCFG1 (0xc) +#define EXYNOS_PHY_CFG_PLL_FB_DIV_11_8_MASK GENMASK(11, 8) +#define EXYNOS_DIV_11_8_19_2_MHZ_VAL (0x0) +#define EXYNOS_DIV_11_8_20_MHZ_VAL (0x0) +#define EXYNOS_DIV_11_8_24_MHZ_VAL (0x0) +#define EXYNOS_DIV_11_8_26_MHZ_VAL (0x0) +#define EXYNOS_DIV_11_8_48_MHZ_VAL (0x1) + +#define EXYNOS_PHY_CFG_TX (0x14) +#define EXYNOS_PHY_CFG_TX_FSLS_VREF_TUNE_MASK GENMASK(2, 1) + +#define EXYNOS_USB_PHY_UTMI_TESTSE (0x20) +#define TEST_IDDQ BIT(6) + #define QCOM_USB_PHY_UTMI_CTRL0 (0x3c) #define SLEEPM BIT(0) #define OPMODE_MASK GENMASK(4, 3) @@ -123,6 +156,8 @@ static const char * const eusb2_hsphy_vreg_names[] = { struct snps_eusb2_phy_drvdata { int (*phy_init)(struct phy *p); + const char * const *clk_names; + int num_clks; }; struct snps_eusb2_hsphy { @@ -130,6 +165,7 @@ struct snps_eusb2_hsphy { void __iomem *base; struct clk *ref_clk; + struct clk_bulk_data *clks; struct reset_control *phy_reset; struct regulator_bulk_data vregs[EUSB2_NUM_VREGS]; @@ -199,6 +235,46 @@ struct snps_eusb2_ref_clk { u32 div_11_8_val; }; +static const struct snps_eusb2_ref_clk exynos_eusb2_ref_clk[] = { + { 19200000, FSEL_19_2_MHZ_VAL, DIV_19_8_19_2_MHZ_VAL, EXYNOS_DIV_11_8_19_2_MHZ_VAL }, + { 20000000, FSEL_20_MHZ_VAL, DIV_19_8_20_MHZ_VAL, EXYNOS_DIV_11_8_20_MHZ_VAL }, + { 24000000, FSEL_24_MHZ_VAL, DIV_19_8_24_MHZ_VAL, EXYNOS_DIV_11_8_24_MHZ_VAL }, + { 26000000, FSEL_26_MHZ_VAL, DIV_19_8_26_MHZ_VAL, EXYNOS_DIV_11_8_26_MHZ_VAL }, + { 48000000, FSEL_48_MHZ_VAL, DIV_19_8_48_MHZ_VAL, EXYNOS_DIV_11_8_48_MHZ_VAL }, +}; + +static int exynos_eusb2_ref_clk_init(struct snps_eusb2_hsphy *phy) +{ + const struct snps_eusb2_ref_clk *config = NULL; + unsigned long ref_clk_freq = clk_get_rate(phy->ref_clk); + + for (int i = 0; i < ARRAY_SIZE(exynos_eusb2_ref_clk); i++) { + if (exynos_eusb2_ref_clk[i].freq == ref_clk_freq) { + config = &exynos_eusb2_ref_clk[i]; + break; + } + } + + if (!config) { + dev_err(&phy->phy->dev, "unsupported ref_clk_freq:%lu\n", ref_clk_freq); + return -EINVAL; + } + + snps_eusb2_hsphy_write_mask(phy->base, EXYNOS_USB_PHY_HS_PHY_CTRL_COMMON, + FSEL_MASK, + FIELD_PREP(FSEL_MASK, config->fsel_val)); + + snps_eusb2_hsphy_write_mask(phy->base, EXYNOS_USB_PHY_CFG_PLLCFG0, + PHY_CFG_PLL_FB_DIV_19_8_MASK, + FIELD_PREP(PHY_CFG_PLL_FB_DIV_19_8_MASK, + config->div_7_0_val)); + + snps_eusb2_hsphy_write_mask(phy->base, EXYNOS_USB_PHY_CFG_PLLCFG1, + EXYNOS_PHY_CFG_PLL_FB_DIV_11_8_MASK, + config->div_11_8_val); + return 0; +} + static const struct snps_eusb2_ref_clk qcom_eusb2_ref_clk[] = { { 19200000, FSEL_19_2_MHZ_VAL, DIV_7_0_19_2_MHZ_VAL, DIV_11_8_19_2_MHZ_VAL }, { 38400000, FSEL_38_4_MHZ_VAL, DIV_7_0_38_4_MHZ_VAL, DIV_11_8_38_4_MHZ_VAL }, @@ -239,6 +315,55 @@ static int qcom_eusb2_ref_clk_init(struct snps_eusb2_hsphy *phy) return 0; } +static int exynos_snps_eusb2_hsphy_init(struct phy *p) +{ + struct snps_eusb2_hsphy *phy = phy_get_drvdata(p); + int ret; + + snps_eusb2_hsphy_write_mask(phy->base, EXYNOS_USB_PHY_HS_PHY_CTRL_RST, + USB_PHY_RST_MASK | UTMI_PORT_RST_MASK, + USB_PHY_RST_MASK | UTMI_PORT_RST_MASK); + fsleep(50); /* required after holding phy in reset */ + + snps_eusb2_hsphy_write_mask(phy->base, EXYNOS_USB_PHY_HS_PHY_CTRL_COMMON, + RPTR_MODE, RPTR_MODE); + + /* update ref_clk related registers */ + ret = exynos_eusb2_ref_clk_init(phy); + if (ret) + return ret; + + /* default parameter: tx fsls-vref */ + snps_eusb2_hsphy_write_mask(phy->base, EXYNOS_PHY_CFG_TX, + EXYNOS_PHY_CFG_TX_FSLS_VREF_TUNE_MASK, + FIELD_PREP(EXYNOS_PHY_CFG_TX_FSLS_VREF_TUNE_MASK, 0x0)); + + snps_eusb2_hsphy_write_mask(phy->base, EXYNOS_USB_PHY_UTMI_TESTSE, + TEST_IDDQ, 0); + fsleep(10); /* required after releasing test_iddq */ + + snps_eusb2_hsphy_write_mask(phy->base, EXYNOS_USB_PHY_HS_PHY_CTRL_RST, + USB_PHY_RST_MASK, 0); + + snps_eusb2_hsphy_write_mask(phy->base, EXYNOS_USB_PHY_HS_PHY_CTRL_COMMON, + PHY_ENABLE, PHY_ENABLE); + + snps_eusb2_hsphy_write_mask(phy->base, EXYNOS_USB_PHY_HS_PHY_CTRL_RST, + UTMI_PORT_RST_MASK, 0); + + return 0; +} + +static const char * const exynos_eusb2_hsphy_clock_names[] = { + "ref", "bus", "ctrl", +}; + +static const struct snps_eusb2_phy_drvdata exynos2200_snps_eusb2_phy = { + .phy_init = exynos_snps_eusb2_hsphy_init, + .clk_names = exynos_eusb2_hsphy_clock_names, + .num_clks = ARRAY_SIZE(exynos_eusb2_hsphy_clock_names), +}; + static int qcom_snps_eusb2_hsphy_init(struct phy *p) { struct snps_eusb2_hsphy *phy = phy_get_drvdata(p); @@ -315,8 +440,14 @@ static int qcom_snps_eusb2_hsphy_init(struct phy *p) return 0; } +static const char * const qcom_eusb2_hsphy_clock_names[] = { + "ref", +}; + static const struct snps_eusb2_phy_drvdata sm8550_snps_eusb2_phy = { .phy_init = qcom_snps_eusb2_hsphy_init, + .clk_names = qcom_eusb2_hsphy_clock_names, + .num_clks = ARRAY_SIZE(qcom_eusb2_hsphy_clock_names), }; static int snps_eusb2_hsphy_init(struct phy *p) @@ -334,7 +465,7 @@ static int snps_eusb2_hsphy_init(struct phy *p) goto disable_vreg; } - ret = clk_prepare_enable(phy->ref_clk); + ret = clk_bulk_prepare_enable(phy->data->num_clks, phy->clks); if (ret) { dev_err(&p->dev, "failed to enable ref clock, %d\n", ret); goto disable_vreg; @@ -361,7 +492,7 @@ static int snps_eusb2_hsphy_init(struct phy *p) return 0; disable_ref_clk: - clk_disable_unprepare(phy->ref_clk); + clk_bulk_disable_unprepare(phy->data->num_clks, phy->clks); disable_vreg: regulator_bulk_disable(ARRAY_SIZE(phy->vregs), phy->vregs); @@ -415,8 +546,28 @@ static int snps_eusb2_hsphy_probe(struct platform_device *pdev) if (IS_ERR(phy->phy_reset)) return PTR_ERR(phy->phy_reset); - phy->ref_clk = devm_clk_get(dev, "ref"); - if (IS_ERR(phy->ref_clk)) + phy->clks = devm_kcalloc(dev, phy->data->num_clks, sizeof(*phy->clks), + GFP_KERNEL); + if (!phy->clks) + return -ENOMEM; + + for (int i = 0; i < phy->data->num_clks; ++i) + phy->clks[i].id = phy->data->clk_names[i]; + + ret = devm_clk_bulk_get(dev, phy->data->num_clks, phy->clks); + if (ret) + return dev_err_probe(dev, ret, + "failed to get phy clock(s)\n"); + + phy->ref_clk = NULL; + for (int i = 0; i < phy->data->num_clks; ++i) { + if (!strcmp(phy->clks[i].id, "ref")) { + phy->ref_clk = phy->clks[i].clk; + break; + } + } + + if (IS_ERR_OR_NULL(phy->ref_clk)) return dev_err_probe(dev, PTR_ERR(phy->ref_clk), "failed to get ref clk\n"); @@ -456,6 +607,9 @@ static const struct of_device_id snps_eusb2_hsphy_of_match_table[] = { { .compatible = "qcom,sm8550-snps-eusb2-phy", .data = &sm8550_snps_eusb2_phy, + }, { + .compatible = "samsung,exynos2200-snps-eusb2-phy", + .data = &exynos2200_snps_eusb2_phy, }, { }, }; MODULE_DEVICE_TABLE(of, snps_eusb2_hsphy_of_match_table); From patchwork Sat Apr 12 20:26:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivaylo Ivanov X-Patchwork-Id: 880918 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 4A48A233736; Sat, 12 Apr 2025 20:27:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744489634; cv=none; b=nJcD956Ht1CcCVA5sE58ooVyHkqVBqaQ1D9TAZcC78w638arHUSXoBtzW8e/Qix/sv5wFlJ+QqiTj0VkWnRbbpq0al//skZDiPf76xA5KTcQAzhZJBel4ErIJ3B395gyjMBIybaAUFLwG5MrH2j6MK/AaeTSuk5gLywCQrvR/f0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744489634; c=relaxed/simple; bh=419pGHS6E3Wy9OaZ5aQdZp14d/QKmc0lbbOW28DgCzA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WxjN3AR88LvNv1TbO6XPPP8PMTFeuPKagnLty6/3aA6/tDGVhHKlg4TJIm6jRMqxZufB2rdi6xun48W4rlARxWTBTV3lKmxwZhfIjEZ+3uFn+O5CW678ntOwUaCfm52FhCjx4V7k/oKOtVkw7jOuEbEgsuWtUOi4/Gyac0DBaCs= 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=EQrMGxyM; arc=none smtp.client-ip=209.85.128.46 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="EQrMGxyM" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-43d0618746bso23513205e9.2; Sat, 12 Apr 2025 13:27:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744489630; x=1745094430; 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=olWmtpJVJyP5ihquepeKVhUKSgcRCRnX8hMSMQjAVm0=; b=EQrMGxyMQ1m1skX4uhdkU+NtXBIty2FAoNPN9AY6pvB/SCCLim+RtK0H4sNGqLwoNI q6Az02e/DtwavmHJQpc85IbHFuvjsE0CorD9/LjGZbuNhlS9Ds/plcnFUC2no7h3ytfV dzROjWoTe6D0s/SIc5sEIrhONkQKwpIvpNRi+0VewKuuSQkFA8WvODllU1Q23LlpgmFf 6pgiUGKsLhB4mRM+ybKxhjfeTp/Ev9IwjGaUXs1w20sRYEcV6+hWBuWxMl1VCLjIYyRr /1QZoLcwxAhcBloFnjVSdhBvknPfmN8eIOCkxvN2LT+x1q3NVJ7N2c/1hNdhfAOuDlOw upSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744489630; x=1745094430; 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=olWmtpJVJyP5ihquepeKVhUKSgcRCRnX8hMSMQjAVm0=; b=xJFYl88xn2mUvMEqiqj7f2biA6/EZnmc3rt9eBc97jmv3e0nqC5kIcR87+ryNRDMxo XSL/H3jrtBo3+cEQhzCtUCQnCfSHCa1U7huCdHmUKLOcG8o7RgWMLAg2jc0CLFMIGMsr FyYGMQXpFbmdoavOJcDClyHhK4pVnpRjBPPOFWJWuA+Vi/VctJBMTF3bFXJD1Gwb8z1H vPzMWeOeWSdTgQD0xVCMsS6f/1wmtgl9rP9R/YaJo0RkXLtuF/drvOjJ9SGsn9Lr/0PB 7+Cg7E1onqmVno32iF2kC7zfMhIKA/FOYsApRp6u6UHk4KqsRfdlG0+ebug4pwul9TEX anng== X-Forwarded-Encrypted: i=1; AJvYcCUeCbbe9YPs1PUmz52pb3Of7yHlxsSzCwj7PlMT/KYOsqFEGbOIU9DjAkI2n1gsjn6hvP8ExaW2vDk3/VYdEQ==@vger.kernel.org, AJvYcCVhGz5EQynlj82FNIBn889IfEDgkSCXlrvTlqZ2I8swUle8G0Ekv5vNWKYKWiHcq/Eb5n10SmFy3FoA@vger.kernel.org, AJvYcCW3F9cXgfjI14/V/MyhFgcIdo3wCt1v/KmkNeR5ENQGTMnAaXfk3+S56//YqFvuHjwtO+dyskLyiLEgdZik@vger.kernel.org X-Gm-Message-State: AOJu0YwuwB10llGeQ+KSIo1OkObUE+JZisDo4k2ZIyX/FPpvGHw8bQxa IgGiP9FthsHA5nCo4ieD6H9X5kNhUjHNT5RRII3fNBzdHyQs24do X-Gm-Gg: ASbGncvL1Hps7zmxmuzjj1JrlndbFmchvj44oz8NfBvuPp1rakACSky79RS+7YXHUtN DroPfv1LQFvrwW9XPAQcluHJAJzv+Dn93H97enyPGmiu0rM4+DeuMS86IJZuywd9daT7A8CKAiR 5ogBWlmnOTWvEFdYvRY0xDDa0888cO3SkZsV1NvCIlI0Rr6j3acODiYK19UiWCk0rCwIMIMSRik L6UXns8836+zvRAG7r5QuAJHnNXPlMg5eF2Ie4VqZ/VM/bi/PVWX4jhsdMH75TnKl+6lQ/OvnOr KGiZLamQDW5a/XWqrO98yQkvX4vD4qH0sJeSk802mUkOFXwn0gDvg826h94ybZiU0WbMC9eNo/3 aBHJCSdArb5DCQCZj X-Google-Smtp-Source: AGHT+IEtxyW3UZ/3u0BXgkHZsM+YoFZNao9NjKVr3gYfBTIxWSJRFnSO9EXDpk7LBa79WamAspfqPg== X-Received: by 2002:a05:600c:3b19:b0:43d:b3:fb1 with SMTP id 5b1f17b1804b1-43f3a9b02f9mr74840105e9.27.1744489630266; Sat, 12 Apr 2025 13:27:10 -0700 (PDT) Received: from ivaylo-T580.. (91-139-201-119.stz.ddns.bulsat.com. [91.139.201.119]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f2338d802sm131797845e9.1.2025.04.12.13.27.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Apr 2025 13:27:09 -0700 (PDT) From: Ivaylo Ivanov To: Krzysztof Kozlowski , Vinod Koul , Conor Dooley , Alim Akhtar , Kishon Vijay Abraham I , Rob Herring , Philipp Zabel Cc: linux-samsung-soc@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v4 10/10] phy: exynos5-usbdrd: support Exynos USBDRD 3.2 4nm controller Date: Sat, 12 Apr 2025 23:26:20 +0300 Message-ID: <20250412202620.738150-11-ivo.ivanov.ivanov1@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250412202620.738150-1-ivo.ivanov.ivanov1@gmail.com> References: <20250412202620.738150-1-ivo.ivanov.ivanov1@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add support for the Exynos USB 3.2 DRD 4nm controller. It's used in recent 4nm SoCs like Exynos2200 and Exynos2400. This device consists of 3 underlying and independent phys: SEC link control phy, Synopsys eUSB 2.0 and Synopsys USBDP/SS combophy. Unlike older device designs, where the internal phy blocks were all IP of Samsung, Synopsys phys are present. This means that the link controller is now mapped differently to account for missing bits and registers. The Synopsys phys also have separate register bases. As there are non-SEC PHYs present now, it doesn't make much sense to implement them in this driver. They are expected to be configured by external drivers, so pass phandles to them. USBDRD3.2 link controller set up is still required beforehand. This commit adds the necessary changes for USB HS to work. USB SS and DisplayPort are out of scope in this commit and will be introduced in the future. Signed-off-by: Ivaylo Ivanov --- drivers/phy/samsung/phy-exynos5-usbdrd.c | 227 ++++++++++++++++++-- include/linux/soc/samsung/exynos-regs-pmu.h | 3 + 2 files changed, 215 insertions(+), 15 deletions(-) diff --git a/drivers/phy/samsung/phy-exynos5-usbdrd.c b/drivers/phy/samsung/phy-exynos5-usbdrd.c index 817fddee0..f9a657642 100644 --- a/drivers/phy/samsung/phy-exynos5-usbdrd.c +++ b/drivers/phy/samsung/phy-exynos5-usbdrd.c @@ -36,6 +36,21 @@ #define EXYNOS5_FSEL_26MHZ 0x6 #define EXYNOS5_FSEL_50MHZ 0x7 +/* USB 3.2 DRD 4nm PHY link controller registers */ +#define EXYNOS2200_DRD_CLKRST 0x0c +#define EXYNOS2200_CLKRST_LINK_PCLK_SEL BIT(1) + +#define EXYNOS2200_DRD_UTMI 0x10 +#define EXYNOS2200_UTMI_FORCE_VBUSVALID BIT(1) +#define EXYNOS2200_UTMI_FORCE_BVALID BIT(0) + +#define EXYNOS2200_DRD_HSP_MISC 0x114 +#define HSP_MISC_SET_REQ_IN2 BIT(4) +#define HSP_MISC_RES_TUNE GENMASK(1, 0) +#define RES_TUNE_PHY1_PHY2 0x1 +#define RES_TUNE_PHY1 0x2 +#define RES_TUNE_PHY2 0x3 + /* Exynos5: USB 3.0 DRD PHY registers */ #define EXYNOS5_DRD_LINKSYSTEM 0x04 #define LINKSYSTEM_XHCI_VERSION_CONTROL BIT(27) @@ -389,6 +404,7 @@ struct exynos5_usbdrd_phy_drvdata { * @clks: clocks for register access * @core_clks: core clocks for phy (ref, pipe3, utmi+, ITP, etc. as required) * @drv_data: pointer to SoC level driver data structure + * @hs_phy: pointer to non-Samsung IP high-speed phy controller * @phy_mutex: mutex protecting phy_init/exit & TCPC callbacks * @phys: array for 'EXYNOS5_DRDPHYS_NUM' number of PHY * instances each with its 'phy' and 'phy_cfg'. @@ -406,6 +422,7 @@ struct exynos5_usbdrd_phy { struct clk_bulk_data *clks; struct clk_bulk_data *core_clks; const struct exynos5_usbdrd_phy_drvdata *drv_data; + struct phy *hs_phy; struct mutex phy_mutex; struct phy_usb_instance { struct phy *phy; @@ -1075,6 +1092,149 @@ static const struct phy_ops exynos5_usbdrd_phy_ops = { .owner = THIS_MODULE, }; +static void exynos2200_usbdrd_utmi_init(struct exynos5_usbdrd_phy *phy_drd) +{ + /* Configure non-Samsung IP PHY, responsible for UTMI */ + phy_init(phy_drd->hs_phy); +} + +static void exynos2200_usbdrd_link_init(struct exynos5_usbdrd_phy *phy_drd) +{ + void __iomem *regs_base = phy_drd->reg_phy; + u32 reg; + + /* + * Disable HWACG (hardware auto clock gating control). This will force + * QACTIVE signal in Q-Channel interface to HIGH level, to make sure + * the PHY clock is not gated by the hardware. + */ + reg = readl(regs_base + EXYNOS850_DRD_LINKCTRL); + reg |= LINKCTRL_FORCE_QACT; + writel(reg, regs_base + EXYNOS850_DRD_LINKCTRL); + + /* De-assert link reset */ + reg = readl(regs_base + EXYNOS2200_DRD_CLKRST); + reg &= ~CLKRST_LINK_SW_RST; + writel(reg, regs_base + EXYNOS2200_DRD_CLKRST); + + /* Set link VBUS Valid */ + reg = readl(regs_base + EXYNOS2200_DRD_UTMI); + reg |= EXYNOS2200_UTMI_FORCE_BVALID | EXYNOS2200_UTMI_FORCE_VBUSVALID; + writel(reg, regs_base + EXYNOS2200_DRD_UTMI); +} + +static void +exynos2200_usbdrd_link_attach_detach_pipe3_phy(struct phy_usb_instance *inst) +{ + struct exynos5_usbdrd_phy *phy_drd = to_usbdrd_phy(inst); + void __iomem *regs_base = phy_drd->reg_phy; + u32 reg; + + reg = readl(regs_base + EXYNOS850_DRD_LINKCTRL); + if (inst->phy_cfg->id == EXYNOS5_DRDPHY_UTMI) { + /* force pipe3 signal for link */ + reg &= ~LINKCTRL_FORCE_PHYSTATUS; + reg |= LINKCTRL_FORCE_PIPE_EN | LINKCTRL_FORCE_RXELECIDLE; + } else { + /* disable forcing pipe interface */ + reg &= ~LINKCTRL_FORCE_PIPE_EN; + } + writel(reg, regs_base + EXYNOS850_DRD_LINKCTRL); + + reg = readl(regs_base + EXYNOS2200_DRD_HSP_MISC); + if (inst->phy_cfg->id == EXYNOS5_DRDPHY_UTMI) { + /* calibrate only eUSB phy */ + reg |= FIELD_PREP(HSP_MISC_RES_TUNE, RES_TUNE_PHY1); + reg |= HSP_MISC_SET_REQ_IN2; + } else { + /* calibrate for dual phy */ + reg |= FIELD_PREP(HSP_MISC_RES_TUNE, RES_TUNE_PHY1_PHY2); + reg &= ~HSP_MISC_SET_REQ_IN2; + } + writel(reg, regs_base + EXYNOS2200_DRD_HSP_MISC); + + reg = readl(regs_base + EXYNOS2200_DRD_CLKRST); + if (inst->phy_cfg->id == EXYNOS5_DRDPHY_UTMI) + reg &= ~EXYNOS2200_CLKRST_LINK_PCLK_SEL; + else + reg |= EXYNOS2200_CLKRST_LINK_PCLK_SEL; + + writel(reg, regs_base + EXYNOS2200_DRD_CLKRST); +} + +static int exynos2200_usbdrd_phy_init(struct phy *phy) +{ + struct phy_usb_instance *inst = phy_get_drvdata(phy); + struct exynos5_usbdrd_phy *phy_drd = to_usbdrd_phy(inst); + int ret; + + if (inst->phy_cfg->id == EXYNOS5_DRDPHY_UTMI) { + /* Power-on PHY ... */ + ret = regulator_bulk_enable(phy_drd->drv_data->n_regulators, + phy_drd->regulators); + if (ret) { + dev_err(phy_drd->dev, + "Failed to enable PHY regulator(s)\n"); + return ret; + } + } + /* + * ... and ungate power via PMU. Without this here, we get an SError + * trying to access PMA registers + */ + exynos5_usbdrd_phy_isol(inst, false); + + ret = clk_bulk_prepare_enable(phy_drd->drv_data->n_clks, phy_drd->clks); + if (ret) + return ret; + + /* Set up the link controller */ + exynos2200_usbdrd_link_init(phy_drd); + + /* UTMI or PIPE3 link preparation */ + exynos2200_usbdrd_link_attach_detach_pipe3_phy(inst); + + /* UTMI or PIPE3 specific init */ + inst->phy_cfg->phy_init(phy_drd); + + clk_bulk_disable_unprepare(phy_drd->drv_data->n_clks, phy_drd->clks); + + return 0; +} + +static int exynos2200_usbdrd_phy_exit(struct phy *phy) +{ + struct phy_usb_instance *inst = phy_get_drvdata(phy); + struct exynos5_usbdrd_phy *phy_drd = to_usbdrd_phy(inst); + void __iomem *regs_base = phy_drd->reg_phy; + u32 reg; + int ret; + + ret = clk_bulk_prepare_enable(phy_drd->drv_data->n_clks, phy_drd->clks); + if (ret) + return ret; + + reg = readl(regs_base + EXYNOS2200_DRD_UTMI); + reg &= ~(EXYNOS2200_UTMI_FORCE_BVALID | EXYNOS2200_UTMI_FORCE_VBUSVALID); + writel(reg, regs_base + EXYNOS2200_DRD_UTMI); + + reg = readl(regs_base + EXYNOS2200_DRD_CLKRST); + reg |= CLKRST_LINK_SW_RST; + writel(reg, regs_base + EXYNOS2200_DRD_CLKRST); + + clk_bulk_disable_unprepare(phy_drd->drv_data->n_clks, phy_drd->clks); + + exynos5_usbdrd_phy_isol(inst, true); + return regulator_bulk_disable(phy_drd->drv_data->n_regulators, + phy_drd->regulators); +} + +static const struct phy_ops exynos2200_usbdrd_phy_ops = { + .init = exynos2200_usbdrd_phy_init, + .exit = exynos2200_usbdrd_phy_exit, + .owner = THIS_MODULE, +}; + static void exynos5_usbdrd_usb_v3p1_pipe_override(struct exynos5_usbdrd_phy *phy_drd) { @@ -1384,27 +1544,37 @@ static int exynos5_usbdrd_phy_clk_handle(struct exynos5_usbdrd_phy *phy_drd) return dev_err_probe(phy_drd->dev, ret, "failed to get phy core clock(s)\n"); - ref_clk = NULL; - for (int i = 0; i < phy_drd->drv_data->n_core_clks; ++i) { - if (!strcmp(phy_drd->core_clks[i].id, "ref")) { - ref_clk = phy_drd->core_clks[i].clk; - break; + if (phy_drd->drv_data->n_core_clks) { + ref_clk = NULL; + for (int i = 0; i < phy_drd->drv_data->n_core_clks; ++i) { + if (!strcmp(phy_drd->core_clks[i].id, "ref")) { + ref_clk = phy_drd->core_clks[i].clk; + break; + } } - } - if (!ref_clk) - return dev_err_probe(phy_drd->dev, -ENODEV, - "failed to find phy reference clock\n"); + if (!ref_clk) + return dev_err_probe(phy_drd->dev, -ENODEV, + "failed to find phy reference clock\n"); - ref_rate = clk_get_rate(ref_clk); - ret = exynos5_rate_to_clk(ref_rate, &phy_drd->extrefclk); - if (ret) - return dev_err_probe(phy_drd->dev, ret, - "clock rate (%ld) not supported\n", - ref_rate); + ref_rate = clk_get_rate(ref_clk); + ret = exynos5_rate_to_clk(ref_rate, &phy_drd->extrefclk); + if (ret) + return dev_err_probe(phy_drd->dev, ret, + "clock rate (%ld) not supported\n", + ref_rate); + } return 0; } +static const struct exynos5_usbdrd_phy_config phy_cfg_exynos2200[] = { + { + .id = EXYNOS5_DRDPHY_UTMI, + .phy_isol = exynos5_usbdrd_phy_isol, + .phy_init = exynos2200_usbdrd_utmi_init, + }, +}; + static int exynos5_usbdrd_orien_sw_set(struct typec_switch_dev *sw, enum typec_orientation orientation) { @@ -1525,6 +1695,19 @@ static const char * const exynos5_regulator_names[] = { "vbus", "vbus-boost", }; +static const struct exynos5_usbdrd_phy_drvdata exynos2200_usb32drd_phy = { + .phy_cfg = phy_cfg_exynos2200, + .phy_ops = &exynos2200_usbdrd_phy_ops, + .pmu_offset_usbdrd0_phy = EXYNOS2200_PHY_CTRL_USB20, + .clk_names = exynos5_clk_names, + .n_clks = ARRAY_SIZE(exynos5_clk_names), + /* clocks and regulators are specific to the underlying PHY blocks */ + .core_clk_names = NULL, + .n_core_clks = 0, + .regulator_names = NULL, + .n_regulators = 0, +}; + static const struct exynos5_usbdrd_phy_drvdata exynos5420_usbdrd_phy = { .phy_cfg = phy_cfg_exynos5, .phy_ops = &exynos5_usbdrd_phy_ops, @@ -1769,6 +1952,9 @@ static const struct of_device_id exynos5_usbdrd_phy_of_match[] = { { .compatible = "google,gs101-usb31drd-phy", .data = &gs101_usbd31rd_phy + }, { + .compatible = "samsung,exynos2200-usb32drd-phy", + .data = &exynos2200_usb32drd_phy, }, { .compatible = "samsung,exynos5250-usbdrd-phy", .data = &exynos5250_usbdrd_phy @@ -1841,6 +2027,17 @@ static int exynos5_usbdrd_phy_probe(struct platform_device *pdev) return PTR_ERR(phy_drd->reg_phy); } + /* + * USB32DRD 4nm controller implements Synopsys eUSB2.0 PHY + * and Synopsys SS/USBDP COMBOPHY, managed by external code. + */ + if (of_property_present(dev->of_node, "phy-names")) { + phy_drd->hs_phy = devm_of_phy_get(dev, dev->of_node, "hs"); + if (IS_ERR(phy_drd->hs_phy)) + return dev_err_probe(dev, PTR_ERR(phy_drd->hs_phy), + "failed to get hs_phy\n"); + } + ret = exynos5_usbdrd_phy_clk_handle(phy_drd); if (ret) return ret; diff --git a/include/linux/soc/samsung/exynos-regs-pmu.h b/include/linux/soc/samsung/exynos-regs-pmu.h index ce1a3790d..b77187ba5 100644 --- a/include/linux/soc/samsung/exynos-regs-pmu.h +++ b/include/linux/soc/samsung/exynos-regs-pmu.h @@ -185,6 +185,9 @@ /* Only for S5Pv210 */ #define S5PV210_EINT_WAKEUP_MASK 0xC004 +/* Only for Exynos2200 */ +#define EXYNOS2200_PHY_CTRL_USB20 0x72C + /* Only for Exynos4210 */ #define S5P_CMU_CLKSTOP_LCD1_LOWPWR 0x1154 #define S5P_CMU_RESET_LCD1_LOWPWR 0x1174