From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F718C433EF for ; Thu, 3 Mar 2022 06:14:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229845AbiCCGOv (ORCPT ); Thu, 3 Mar 2022 01:14:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229832AbiCCGOt (ORCPT ); Thu, 3 Mar 2022 01:14:49 -0500 Received: from alexa-out-sd-01.qualcomm.com (alexa-out-sd-01.qualcomm.com [199.106.114.38]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 078DF14562B; Wed, 2 Mar 2022 22:14:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; i=@quicinc.com; q=dns/txt; s=qcdkim; t=1646288043; x=1677824043; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=BnNk6OUFPnc+vLPsfLLdU9Fq1XHaDrR7D82fqGD7X9M=; b=y0cVkNZHxvRlGYz0AQ0ogAX9+CmSt7cC+a9UTGbX/CuuexjqnzhqmwYy QGKUXtjpjSciR0HjF/wGyYNqIj0cVoymd3j6BKRU9bZarM4YUYkBftlfK RYHtuGFby43IKIPm7w9/q7LC08iPi/pDLiUbibwBAoW6qJTLr6i/+Chhv k=; Received: from unknown (HELO ironmsg-SD-alpha.qualcomm.com) ([10.53.140.30]) by alexa-out-sd-01.qualcomm.com with ESMTP; 02 Mar 2022 22:14:01 -0800 X-QCInternal: smtphost Received: from nasanex01c.na.qualcomm.com ([10.47.97.222]) by ironmsg-SD-alpha.qualcomm.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Mar 2022 22:14:01 -0800 Received: from nalasex01a.na.qualcomm.com (10.47.209.196) by nasanex01c.na.qualcomm.com (10.47.97.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.15; Wed, 2 Mar 2022 22:14:01 -0800 Received: from c-sanm-linux.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.15; Wed, 2 Mar 2022 22:13:55 -0800 From: Sandeep Maheswaram To: Rob Herring , Andy Gross , "Bjorn Andersson" , Kishon Vijay Abraham I , Vinod Koul , Greg Kroah-Hartman , Wesley Cheng , "Stephen Boyd" , Doug Anderson , "Matthias Kaehlcke" , Krzysztof Kozlowski CC: , , , , , , , Sandeep Maheswaram Subject: [PATCH v2 2/3] phy: qcom-snps: Add support for overriding phy tuning parameters Date: Thu, 3 Mar 2022 11:43:30 +0530 Message-ID: <1646288011-32242-3-git-send-email-quic_c_sanm@quicinc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1646288011-32242-1-git-send-email-quic_c_sanm@quicinc.com> References: <1646288011-32242-1-git-send-email-quic_c_sanm@quicinc.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01a.na.qualcomm.com (10.47.209.196) Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Added support for overriding x0,x1,x2,x3 params for SNPS PHY by reading values from device tree. Signed-off-by: Sandeep Maheswaram --- drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 192 ++++++++++++++++++++++++++ 1 file changed, 192 insertions(+) diff --git a/drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c b/drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c index 7e61202..b5aa06d 100644 --- a/drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c +++ b/drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c @@ -51,6 +51,48 @@ #define USB2_SUSPEND_N BIT(2) #define USB2_SUSPEND_N_SEL BIT(3) +#define USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X0 (0x6c) + +/*USB_PHY_HS_PHY_OVERRIDE_X0 register bits*/ +#define HS_DISCONNECT_MASK GENMASK(2, 0) +#define HS_DISCONNECT_SHIFT 0x0 + +#define SQUELCH_DETECTOR_MASK GENMASK(7, 5) +#define SQUELCH_DETECTOR_SHIFT 0x5 + + +#define USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X1 (0x70) + +/*USB_PHY_HS_PHY_OVERRIDE_X1 register bits*/ +#define HS_AMPLITUDE_MASK GENMASK(3, 0) +#define HS_AMPLITUDE_SHIFT 0x0 + +#define PREEMPHASIS_DURATION_MASK BIT(5) +#define PREEMPHASIS_DURATION_SHIFT 0x5 + +#define PREEMPHASIS_AMPLITUDE_MASK GENMASK(7, 6) +#define PREEMPHASIS_AMPLITUDE_SHIFT 0x6 + + +#define USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X2 (0x74) + +/*USB_PHY_HS_PHY_OVERRIDE_X2 register bits*/ +#define HS_RISE_FALL_MASK GENMASK(1, 0) +#define HS_RISE_FALL_SHIFT 0x0 + +#define HS_CROSSOVER_VOLTAGE_MASK GENMASK(3, 2) +#define HS_CROSSOVER_VOLTAGE_SHIFT 0x2 + +#define HS_OUTPUT_IMPEDANCE_MASK GENMASK(5, 4) +#define HS_OUTPUT_IMPEDANCE_SHIFT 0x4 + + +#define USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X3 (0x78) + +/*USB_PHY_HS_PHY_OVERRIDE_X3 register bits*/ +#define LS_FS_OUTPUT_IMPEDANCE_MASK GENMASK(3, 0) +#define LS_FS_OUTPUT_IMPEDANCE_SHIFT 0x0 + #define USB2_PHY_USB_PHY_CFG0 (0x94) #define UTMI_PHY_DATAPATH_CTRL_OVERRIDE_EN BIT(0) #define UTMI_PHY_CMN_CTRL_OVERRIDE_EN BIT(1) @@ -65,6 +107,43 @@ static const char * const qcom_snps_hsphy_vreg_names[] = { #define SNPS_HS_NUM_VREGS ARRAY_SIZE(qcom_snps_hsphy_vreg_names) +/* struct override_param - structure holding snps phy overriding param + * set override true if the device tree property exists and read and assign + * to value + */ +struct override_param { + bool override; + u8 value; +}; + +/*struct override_params - structure holding snps phy overriding params + * @hs_disconnect: disconnect threshold + * @squelch_detector: threshold to detect valid high-speed data + * @hs_amplitude: high-speed DC level voltage + * @preemphasis_duration: duration for which the HS pre-emphasis current + * is sourced onto DP<#> or DM<#> + * @preemphasis_amplitude: current sourced to DP<#> and DM<#> after + * a J-to-K or K-to-J transition. + * @hs_rise_fall_time: rise/fall times of the high-speed waveform + * @hs_crossover_voltage: voltage at which the DP<#> and DM<#> + * signals cross while transmitting in HS mode + * @hs_output_impedance: driver source impedance to compensate for added series + * resistance on the USB + * @ls_fs_output_impedance: low and full-speed single-ended source + * impedance while driving high + */ +struct override_params { + struct override_param hs_disconnect; + struct override_param squelch_detector; + struct override_param hs_amplitude; + struct override_param preemphasis_duration; + struct override_param preemphasis_amplitude; + struct override_param hs_rise_fall_time; + struct override_param hs_crossover_voltage; + struct override_param hs_output_impedance; + struct override_param ls_fs_output_impedance; +}; + /** * struct qcom_snps_hsphy - snps hs phy attributes * @@ -87,6 +166,7 @@ struct qcom_snps_hsphy { struct clk *ref_clk; struct reset_control *phy_reset; struct regulator_bulk_data vregs[SNPS_HS_NUM_VREGS]; + struct override_params overrides; bool phy_initialized; enum phy_mode mode; @@ -175,6 +255,7 @@ static int qcom_snps_hsphy_set_mode(struct phy *phy, enum phy_mode mode, static int qcom_snps_hsphy_init(struct phy *phy) { struct qcom_snps_hsphy *hsphy = phy_get_drvdata(phy); + struct override_params *or = &hsphy->overrides; int ret; dev_vdbg(&phy->dev, "%s(): Initializing SNPS HS phy\n", __func__); @@ -222,6 +303,60 @@ static int qcom_snps_hsphy_init(struct phy *phy) qcom_snps_hsphy_write_mask(hsphy->base, USB2_PHY_USB_PHY_HS_PHY_CTRL1, VBUSVLDEXT0, VBUSVLDEXT0); + if (or->hs_disconnect.override) + qcom_snps_hsphy_write_mask(hsphy->base, + USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X0, + HS_DISCONNECT_MASK, + or->hs_disconnect.value << HS_DISCONNECT_SHIFT); + + if (or->squelch_detector.override) + qcom_snps_hsphy_write_mask(hsphy->base, + USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X0, + SQUELCH_DETECTOR_MASK, + or->squelch_detector.value << SQUELCH_DETECTOR_SHIFT); + + if (or->hs_amplitude.override) + qcom_snps_hsphy_write_mask(hsphy->base, + USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X1, + HS_AMPLITUDE_MASK, + or->hs_amplitude.value << HS_AMPLITUDE_SHIFT); + + if (or->preemphasis_duration.override) + qcom_snps_hsphy_write_mask(hsphy->base, + USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X1, + PREEMPHASIS_DURATION_MASK, + or->preemphasis_duration.value << PREEMPHASIS_DURATION_SHIFT); + + if (or->preemphasis_amplitude.override) + qcom_snps_hsphy_write_mask(hsphy->base, + USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X1, + PREEMPHASIS_AMPLITUDE_MASK, + or->preemphasis_amplitude.value << PREEMPHASIS_AMPLITUDE_SHIFT); + + if (or->hs_rise_fall_time.override) + qcom_snps_hsphy_write_mask(hsphy->base, + USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X2, + HS_RISE_FALL_MASK, + or->hs_rise_fall_time.value << HS_RISE_FALL_SHIFT); + + if (or->hs_crossover_voltage.override) + qcom_snps_hsphy_write_mask(hsphy->base, + USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X2, + HS_CROSSOVER_VOLTAGE_MASK, + or->hs_crossover_voltage.value << HS_CROSSOVER_VOLTAGE_SHIFT); + + if (or->hs_output_impedance.override) + qcom_snps_hsphy_write_mask(hsphy->base, + USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X2, + HS_OUTPUT_IMPEDANCE_MASK, + or->hs_output_impedance.value << HS_OUTPUT_IMPEDANCE_SHIFT); + + if (or->ls_fs_output_impedance.override) + qcom_snps_hsphy_write_mask(hsphy->base, + USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X3, + LS_FS_OUTPUT_IMPEDANCE_MASK, + or->ls_fs_output_impedance.value << LS_FS_OUTPUT_IMPEDANCE_SHIFT); + qcom_snps_hsphy_write_mask(hsphy->base, USB2_PHY_USB_PHY_HS_PHY_CTRL_COMMON2, VREGBYPASS, VREGBYPASS); @@ -292,12 +427,15 @@ static int qcom_snps_hsphy_probe(struct platform_device *pdev) struct qcom_snps_hsphy *hsphy; struct phy_provider *phy_provider; struct phy *generic_phy; + struct override_params *or; int ret, i; int num; + u32 value; hsphy = devm_kzalloc(dev, sizeof(*hsphy), GFP_KERNEL); if (!hsphy) return -ENOMEM; + or = &hsphy->overrides; hsphy->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(hsphy->base)) @@ -329,6 +467,60 @@ static int qcom_snps_hsphy_probe(struct platform_device *pdev) return ret; } + if (!of_property_read_u32(dev->of_node, "qcom,hs-disconnect", + &value)) { + or->hs_disconnect.value = (u8)value; + or->hs_disconnect.override = true; + } + + if (!of_property_read_u32(dev->of_node, "qcom,squelch-detector", + &value)) { + or->squelch_detector.value = (u8)value; + or->squelch_detector.override = true; + } + + if (!of_property_read_u32(dev->of_node, "qcom,hs-amplitude", + &value)) { + or->hs_amplitude.value = (u8)value; + or->hs_amplitude.override = true; + } + + if (!of_property_read_u32(dev->of_node, "qcom,preemphasis-duration", + &value)) { + or->preemphasis_duration.value = (u8)value; + or->preemphasis_duration.override = true; + } + + if (!of_property_read_u32(dev->of_node, "qcom,preemphasis-amplitude", + &value)) { + or->preemphasis_amplitude.value = (u8)value; + or->preemphasis_amplitude.override = true; + } + + if (!of_property_read_u32(dev->of_node, "qcom,hs-rise-fall-time", + &value)) { + or->hs_rise_fall_time.value = (u8)value; + or->hs_rise_fall_time.override = true; + } + + if (!of_property_read_u32(dev->of_node, "qcom,hs-crossover-voltage", + &value)) { + or->hs_crossover_voltage.value = (u8)value; + or->hs_crossover_voltage.override = true; + } + + if (!of_property_read_u32(dev->of_node, "qcom,hs-output-impedance", + &value)) { + or->hs_output_impedance.value = (u8)value; + or->hs_output_impedance.override = true; + } + + if (!of_property_read_u32(dev->of_node, "qcom,ls-fs-output-impedance", + &value)) { + or->ls_fs_output_impedance.value = (u8)value; + or->ls_fs_output_impedance.override = true; + } + pm_runtime_set_active(dev); pm_runtime_enable(dev); /* -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 61D52C433F5 for ; Thu, 3 Mar 2022 06:14:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=51YZQfJS3hV39R54WFQLbLlgNkEw1zsOFd/2rHlrWqU=; b=PUNY2nst2Zxyry 936L4ySSs/HO5sk1AjHxD5Rwnf6i1WYV0p/xBQOFe1MH3SXou0U1RXiIR1OBiSVsAoSdGWdNRrYFq FCYIbsT2HiF/8hB4KOh3inGTmuDbPZg3XH/pdizcYTwCoOtNN3HgGgz+DFYwyLxocS3xH3TWLe06V CBkWUeFADutAso8QOhVdhaEqUzSuEV+67x/6NXW86Q/xvSOLsg/XhbPKZaA7+l1pPl60EVan7shTO zr0UCBAlphcqilOD+a7hAJrz/QoW/doZCFefjzjtVbZJVWWd9vbr7KvitkL6fsneC/6JQMHGcnTHd ZaWYTS+deSttMp06JgOw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nPeiz-005J11-Sb; Thu, 03 Mar 2022 06:14:05 +0000 Received: from alexa-out-sd-02.qualcomm.com ([199.106.114.39]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nPeiw-005Iz4-VC for linux-phy@lists.infradead.org; Thu, 03 Mar 2022 06:14:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; i=@quicinc.com; q=dns/txt; s=qcdkim; t=1646288042; x=1677824042; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=BnNk6OUFPnc+vLPsfLLdU9Fq1XHaDrR7D82fqGD7X9M=; b=P0xAldLQpfLZCLJk/fZr7/FIeafT8SpjdiFGFtRqLE78r70RQxRqwIqE YVxsnIv7O5fOY7VMl4ijIRb/r3WVyqnZqoRy5tEfJM7xtLjEQR7Q9IQbH 0wgdP9lUsp2maUhzItDNDMgdjQIVS8EXL1aECchRZVUBIPC7l6sZ3eMpo k=; Received: from unknown (HELO ironmsg-SD-alpha.qualcomm.com) ([10.53.140.30]) by alexa-out-sd-02.qualcomm.com with ESMTP; 02 Mar 2022 22:14:01 -0800 X-QCInternal: smtphost Received: from nasanex01c.na.qualcomm.com ([10.47.97.222]) by ironmsg-SD-alpha.qualcomm.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Mar 2022 22:14:01 -0800 Received: from nalasex01a.na.qualcomm.com (10.47.209.196) by nasanex01c.na.qualcomm.com (10.47.97.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.15; Wed, 2 Mar 2022 22:14:01 -0800 Received: from c-sanm-linux.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.15; Wed, 2 Mar 2022 22:13:55 -0800 From: Sandeep Maheswaram To: Rob Herring , Andy Gross , "Bjorn Andersson" , Kishon Vijay Abraham I , Vinod Koul , Greg Kroah-Hartman , Wesley Cheng , "Stephen Boyd" , Doug Anderson , "Matthias Kaehlcke" , Krzysztof Kozlowski CC: , , , , , , , Sandeep Maheswaram Subject: [PATCH v2 2/3] phy: qcom-snps: Add support for overriding phy tuning parameters Date: Thu, 3 Mar 2022 11:43:30 +0530 Message-ID: <1646288011-32242-3-git-send-email-quic_c_sanm@quicinc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1646288011-32242-1-git-send-email-quic_c_sanm@quicinc.com> References: <1646288011-32242-1-git-send-email-quic_c_sanm@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01a.na.qualcomm.com (10.47.209.196) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220302_221403_064122_71FD4AC2 X-CRM114-Status: GOOD ( 15.93 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org Added support for overriding x0,x1,x2,x3 params for SNPS PHY by reading values from device tree. Signed-off-by: Sandeep Maheswaram --- drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 192 ++++++++++++++++++++++++++ 1 file changed, 192 insertions(+) diff --git a/drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c b/drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c index 7e61202..b5aa06d 100644 --- a/drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c +++ b/drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c @@ -51,6 +51,48 @@ #define USB2_SUSPEND_N BIT(2) #define USB2_SUSPEND_N_SEL BIT(3) +#define USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X0 (0x6c) + +/*USB_PHY_HS_PHY_OVERRIDE_X0 register bits*/ +#define HS_DISCONNECT_MASK GENMASK(2, 0) +#define HS_DISCONNECT_SHIFT 0x0 + +#define SQUELCH_DETECTOR_MASK GENMASK(7, 5) +#define SQUELCH_DETECTOR_SHIFT 0x5 + + +#define USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X1 (0x70) + +/*USB_PHY_HS_PHY_OVERRIDE_X1 register bits*/ +#define HS_AMPLITUDE_MASK GENMASK(3, 0) +#define HS_AMPLITUDE_SHIFT 0x0 + +#define PREEMPHASIS_DURATION_MASK BIT(5) +#define PREEMPHASIS_DURATION_SHIFT 0x5 + +#define PREEMPHASIS_AMPLITUDE_MASK GENMASK(7, 6) +#define PREEMPHASIS_AMPLITUDE_SHIFT 0x6 + + +#define USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X2 (0x74) + +/*USB_PHY_HS_PHY_OVERRIDE_X2 register bits*/ +#define HS_RISE_FALL_MASK GENMASK(1, 0) +#define HS_RISE_FALL_SHIFT 0x0 + +#define HS_CROSSOVER_VOLTAGE_MASK GENMASK(3, 2) +#define HS_CROSSOVER_VOLTAGE_SHIFT 0x2 + +#define HS_OUTPUT_IMPEDANCE_MASK GENMASK(5, 4) +#define HS_OUTPUT_IMPEDANCE_SHIFT 0x4 + + +#define USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X3 (0x78) + +/*USB_PHY_HS_PHY_OVERRIDE_X3 register bits*/ +#define LS_FS_OUTPUT_IMPEDANCE_MASK GENMASK(3, 0) +#define LS_FS_OUTPUT_IMPEDANCE_SHIFT 0x0 + #define USB2_PHY_USB_PHY_CFG0 (0x94) #define UTMI_PHY_DATAPATH_CTRL_OVERRIDE_EN BIT(0) #define UTMI_PHY_CMN_CTRL_OVERRIDE_EN BIT(1) @@ -65,6 +107,43 @@ static const char * const qcom_snps_hsphy_vreg_names[] = { #define SNPS_HS_NUM_VREGS ARRAY_SIZE(qcom_snps_hsphy_vreg_names) +/* struct override_param - structure holding snps phy overriding param + * set override true if the device tree property exists and read and assign + * to value + */ +struct override_param { + bool override; + u8 value; +}; + +/*struct override_params - structure holding snps phy overriding params + * @hs_disconnect: disconnect threshold + * @squelch_detector: threshold to detect valid high-speed data + * @hs_amplitude: high-speed DC level voltage + * @preemphasis_duration: duration for which the HS pre-emphasis current + * is sourced onto DP<#> or DM<#> + * @preemphasis_amplitude: current sourced to DP<#> and DM<#> after + * a J-to-K or K-to-J transition. + * @hs_rise_fall_time: rise/fall times of the high-speed waveform + * @hs_crossover_voltage: voltage at which the DP<#> and DM<#> + * signals cross while transmitting in HS mode + * @hs_output_impedance: driver source impedance to compensate for added series + * resistance on the USB + * @ls_fs_output_impedance: low and full-speed single-ended source + * impedance while driving high + */ +struct override_params { + struct override_param hs_disconnect; + struct override_param squelch_detector; + struct override_param hs_amplitude; + struct override_param preemphasis_duration; + struct override_param preemphasis_amplitude; + struct override_param hs_rise_fall_time; + struct override_param hs_crossover_voltage; + struct override_param hs_output_impedance; + struct override_param ls_fs_output_impedance; +}; + /** * struct qcom_snps_hsphy - snps hs phy attributes * @@ -87,6 +166,7 @@ struct qcom_snps_hsphy { struct clk *ref_clk; struct reset_control *phy_reset; struct regulator_bulk_data vregs[SNPS_HS_NUM_VREGS]; + struct override_params overrides; bool phy_initialized; enum phy_mode mode; @@ -175,6 +255,7 @@ static int qcom_snps_hsphy_set_mode(struct phy *phy, enum phy_mode mode, static int qcom_snps_hsphy_init(struct phy *phy) { struct qcom_snps_hsphy *hsphy = phy_get_drvdata(phy); + struct override_params *or = &hsphy->overrides; int ret; dev_vdbg(&phy->dev, "%s(): Initializing SNPS HS phy\n", __func__); @@ -222,6 +303,60 @@ static int qcom_snps_hsphy_init(struct phy *phy) qcom_snps_hsphy_write_mask(hsphy->base, USB2_PHY_USB_PHY_HS_PHY_CTRL1, VBUSVLDEXT0, VBUSVLDEXT0); + if (or->hs_disconnect.override) + qcom_snps_hsphy_write_mask(hsphy->base, + USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X0, + HS_DISCONNECT_MASK, + or->hs_disconnect.value << HS_DISCONNECT_SHIFT); + + if (or->squelch_detector.override) + qcom_snps_hsphy_write_mask(hsphy->base, + USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X0, + SQUELCH_DETECTOR_MASK, + or->squelch_detector.value << SQUELCH_DETECTOR_SHIFT); + + if (or->hs_amplitude.override) + qcom_snps_hsphy_write_mask(hsphy->base, + USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X1, + HS_AMPLITUDE_MASK, + or->hs_amplitude.value << HS_AMPLITUDE_SHIFT); + + if (or->preemphasis_duration.override) + qcom_snps_hsphy_write_mask(hsphy->base, + USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X1, + PREEMPHASIS_DURATION_MASK, + or->preemphasis_duration.value << PREEMPHASIS_DURATION_SHIFT); + + if (or->preemphasis_amplitude.override) + qcom_snps_hsphy_write_mask(hsphy->base, + USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X1, + PREEMPHASIS_AMPLITUDE_MASK, + or->preemphasis_amplitude.value << PREEMPHASIS_AMPLITUDE_SHIFT); + + if (or->hs_rise_fall_time.override) + qcom_snps_hsphy_write_mask(hsphy->base, + USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X2, + HS_RISE_FALL_MASK, + or->hs_rise_fall_time.value << HS_RISE_FALL_SHIFT); + + if (or->hs_crossover_voltage.override) + qcom_snps_hsphy_write_mask(hsphy->base, + USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X2, + HS_CROSSOVER_VOLTAGE_MASK, + or->hs_crossover_voltage.value << HS_CROSSOVER_VOLTAGE_SHIFT); + + if (or->hs_output_impedance.override) + qcom_snps_hsphy_write_mask(hsphy->base, + USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X2, + HS_OUTPUT_IMPEDANCE_MASK, + or->hs_output_impedance.value << HS_OUTPUT_IMPEDANCE_SHIFT); + + if (or->ls_fs_output_impedance.override) + qcom_snps_hsphy_write_mask(hsphy->base, + USB2_PHY_USB_PHY_HS_PHY_OVERRIDE_X3, + LS_FS_OUTPUT_IMPEDANCE_MASK, + or->ls_fs_output_impedance.value << LS_FS_OUTPUT_IMPEDANCE_SHIFT); + qcom_snps_hsphy_write_mask(hsphy->base, USB2_PHY_USB_PHY_HS_PHY_CTRL_COMMON2, VREGBYPASS, VREGBYPASS); @@ -292,12 +427,15 @@ static int qcom_snps_hsphy_probe(struct platform_device *pdev) struct qcom_snps_hsphy *hsphy; struct phy_provider *phy_provider; struct phy *generic_phy; + struct override_params *or; int ret, i; int num; + u32 value; hsphy = devm_kzalloc(dev, sizeof(*hsphy), GFP_KERNEL); if (!hsphy) return -ENOMEM; + or = &hsphy->overrides; hsphy->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(hsphy->base)) @@ -329,6 +467,60 @@ static int qcom_snps_hsphy_probe(struct platform_device *pdev) return ret; } + if (!of_property_read_u32(dev->of_node, "qcom,hs-disconnect", + &value)) { + or->hs_disconnect.value = (u8)value; + or->hs_disconnect.override = true; + } + + if (!of_property_read_u32(dev->of_node, "qcom,squelch-detector", + &value)) { + or->squelch_detector.value = (u8)value; + or->squelch_detector.override = true; + } + + if (!of_property_read_u32(dev->of_node, "qcom,hs-amplitude", + &value)) { + or->hs_amplitude.value = (u8)value; + or->hs_amplitude.override = true; + } + + if (!of_property_read_u32(dev->of_node, "qcom,preemphasis-duration", + &value)) { + or->preemphasis_duration.value = (u8)value; + or->preemphasis_duration.override = true; + } + + if (!of_property_read_u32(dev->of_node, "qcom,preemphasis-amplitude", + &value)) { + or->preemphasis_amplitude.value = (u8)value; + or->preemphasis_amplitude.override = true; + } + + if (!of_property_read_u32(dev->of_node, "qcom,hs-rise-fall-time", + &value)) { + or->hs_rise_fall_time.value = (u8)value; + or->hs_rise_fall_time.override = true; + } + + if (!of_property_read_u32(dev->of_node, "qcom,hs-crossover-voltage", + &value)) { + or->hs_crossover_voltage.value = (u8)value; + or->hs_crossover_voltage.override = true; + } + + if (!of_property_read_u32(dev->of_node, "qcom,hs-output-impedance", + &value)) { + or->hs_output_impedance.value = (u8)value; + or->hs_output_impedance.override = true; + } + + if (!of_property_read_u32(dev->of_node, "qcom,ls-fs-output-impedance", + &value)) { + or->ls_fs_output_impedance.value = (u8)value; + or->ls_fs_output_impedance.override = true; + } + pm_runtime_set_active(dev); pm_runtime_enable(dev); /* -- 2.7.4 -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy