diff options
| author | Wilson Sung <wilsonsung@google.com> | 2019-12-23 12:28:40 +0800 |
|---|---|---|
| committer | Wilson Sung <wilsonsung@google.com> | 2019-12-23 12:28:54 +0800 |
| commit | df7ee6ef20b0e01af170dc11a81fc85902b2f689 (patch) | |
| tree | 66b7621633e7cefaf2914636bdded53a5d0a7885 /drivers/emac-dwc-eqos/DWC_ETH_QOS_ptp.c | |
| parent | e7210f09d00c91f87b295c7a952f040c73506cc0 (diff) | |
| parent | 7fa0fbc4c4b5344b5c4b9ca7851502f475573fed (diff) | |
| download | data-kernel-df7ee6ef20b0e01af170dc11a81fc85902b2f689.tar.gz | |
Merge branch 'LA.UM.8.1.C9.09.00.00.518.343' via branch 'qcom-msm-4.14' into android-msm-floral-4.14android-r-preview-3_r0.7android-r-preview-2_r0.7android-msm-coral-4.14-r-preview-3android-msm-coral-4.14-r-preview-2
Bug: 146759211
Change-Id: I594bc7e2ab1c248a53a1aa2f49604bc37bdab434
Signed-off-by: Wilson Sung <wilsonsung@google.com>
Diffstat (limited to 'drivers/emac-dwc-eqos/DWC_ETH_QOS_ptp.c')
| -rw-r--r-- | drivers/emac-dwc-eqos/DWC_ETH_QOS_ptp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/emac-dwc-eqos/DWC_ETH_QOS_ptp.c b/drivers/emac-dwc-eqos/DWC_ETH_QOS_ptp.c index 9223244..1bcead3 100644 --- a/drivers/emac-dwc-eqos/DWC_ETH_QOS_ptp.c +++ b/drivers/emac-dwc-eqos/DWC_ETH_QOS_ptp.c @@ -283,8 +283,8 @@ static struct ptp_clock_info DWC_ETH_QOS_ptp_clock_ops = { int DWC_ETH_QOS_ptp_init(struct DWC_ETH_QOS_prv_data *pdata) { int ret = 0; - struct ifr_data_struct req = {0}; #ifdef CONFIG_PPS_OUTPUT + struct ifr_data_struct req = {0}; struct ETH_PPS_Config eth_pps_cfg = {0}; #endif @@ -315,12 +315,13 @@ int DWC_ETH_QOS_ptp_init(struct DWC_ETH_QOS_prv_data *pdata) } #ifdef CONFIG_PPS_OUTPUT - if (pdata->emac_hw_version_type == EMAC_HW_v2_3_1) { - /*Configuaring PPS0 PPS output frequency to defualt 19.2 Mhz*/ + if (pdata->res_data->pps_lpass_conn_en) { + /*Configuring PPS0 PPS output frequency to defualt 19.2 Mhz*/ eth_pps_cfg.ppsout_ch = 0; eth_pps_cfg.ptpclk_freq = DWC_ETH_QOS_DEFAULT_PTP_CLOCK; - eth_pps_cfg.ppsout_freq = 19200000; + eth_pps_cfg.ppsout_freq = DWC_ETH_QOS_DEFAULT_LPASS_PPS_FREQUENCY; eth_pps_cfg.ppsout_start = 1; + eth_pps_cfg.ppsout_duty = 50; req.ptr = (void*)ð_pps_cfg; DWC_ETH_QOS_pps_timer_init(&req); |