Merge "clk: qcom: Fix compile warnings" (55a90331) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/clk/qcom/mdss/mdss-dp-pll-7nm-util.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -694,7 +694,7 @@ unsigned long dp_vco_recalc_rate_7nm(struct clk_hw *hw,
		vco_rate = DP_VCO_HSCLK_RATE_8100MHZDIV1000;
		}

		pr_debug("hsclk: sel=0x%x, div=0x%x; lclk: sel=%lu, div=%lu, rate=%lu\n",
		pr_debug("hsclk: sel=0x%x, div=0x%x; lclk: sel=%u, div=%u, rate=%lu\n",
		hsclk_sel, hsclk_div, link_clk_divsel, link_clk_div, vco_rate);

		mdss_pll_resource_enable(dp_res, false);

drivers/clk/qcom/mdss/mdss-hdmi-pll-28lpm.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -276,8 +276,8 @@ static void hdmi_phy_pll_calculator_28lpm(unsigned long vco_rate,
		do_div(sdm_cfg2, int_ref_clk_freq);

		pr_debug("lf_cfg0 = 0x%x lf_cfg1 = 0x%x\n", lf_cfg0, lf_cfg1);
		pr_debug("vco_cfg0 = 0x%x vco_cfg4 = 0x%x\n", vco_cfg0, vco_cfg4);
		pr_debug("sdm_cfg0 = 0x%x sdm_cfg1 = 0x%x sdm_cfg2 = 0x%x\n",
		pr_debug("vco_cfg0 = 0x%llx vco_cfg4 = 0x%llx\n", vco_cfg0, vco_cfg4);
		pr_debug("sdm_cfg0 = 0x%llx sdm_cfg1 = 0x%llx sdm_cfg2 = 0x%llx\n",
		sdm_cfg0, sdm_cfg1, sdm_cfg2);

		refclk_cfg = MDSS_PLL_REG_R(pll_base, HDMI_PHY_PLL_REFCLK_CFG);
		@@ -500,7 +500,7 @@ unsigned long hdmi_vco_recalc_rate_28lpm(struct clk_hw *hw,

		if (hdmi_pll_res->vco_current_rate) {
		vco_rate = (unsigned long)hdmi_pll_res->vco_current_rate;
		pr_debug("vco_rate=%ld\n", vco_rate);
		pr_debug("vco_rate=%lld\n", vco_rate);
		return vco_rate;
		}

		@@ -521,7 +521,7 @@ unsigned long hdmi_vco_recalc_rate_28lpm(struct clk_hw *hw,
		mdss_pll_resource_enable(hdmi_pll_res, false);
		}

		pr_debug("vco_rate = %ld\n", vco_rate);
		pr_debug("vco_rate = %lld\n", vco_rate);

		return (unsigned long)vco_rate;
		}

drivers/media/platform/msm/vidc/msm_vidc_common.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -363,7 +363,7 @@ static int hevc_level_v4l2_to_hfi(int value)
		return -EINVAL;
		}

		static int vp9_level_v4l2_to_hfi(value)
		static int vp9_level_v4l2_to_hfi(int value)
		{
		switch (value) {
		case V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_1:

drivers/platform/msm/ipa/ipa_v3/dump/ipa_reg_dump.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@
		#include <linux/types.h>
		#include <linux/string.h>

		#include "ipa_i.h"
		#include "../ipa_i.h"

		#include "ipa_pkt_cntxt.h"
		#include "ipa_hw_common_ex.h"

drivers/platform/msm/ipa/ipa_v3/ipa_mpm.c

+14 −13

Original line number	Diff line number	Diff line
		@@ -429,7 +429,7 @@ static dma_addr_t ipa_mpm_smmu_map(void *va_addr,
		int ret = 0;

		if (carved_iova >= cb->va_end) {
		IPA_MPM_ERR("running out of carved_iova %x\n", carved_iova);
		IPA_MPM_ERR("running out of carved_iova %lx\n", carved_iova);
		ipa_assert();
		}
		/*
		@@ -576,7 +576,7 @@ static u32 ipa_mpm_smmu_map_doorbell(enum mhip_smmu_domain_type smmu_domain,
		u64 offset = 0;

		if (carved_iova >= cb->va_end) {
		IPA_MPM_ERR("running out of carved_iova %x\n", carved_iova);
		IPA_MPM_ERR("running out of carved_iova %lx\n", carved_iova);
		ipa_assert();
		}

		@@ -1407,12 +1407,12 @@ static void ipa_mpm_read_channel(enum ipa_client_type chan)

		ep = &ipa3_ctx->ep[ipa_ep_idx];

		IPA_MPM_ERR("Reading channel for chan %d, ep = %d, gsi_chan_hdl = %d\n",
		IPA_MPM_ERR("Reading channel for chan %d, ep = %pK, gsi_chan_hdl = %ld\n",
		chan, ep, ep->gsi_chan_hdl);

		res = ipa3_get_gsi_chan_info(&chan_info, ep->gsi_chan_hdl);
		if (res)
		IPA_MPM_ERR("Reading of channel failed for ep %d\n", ep);
		IPA_MPM_ERR("Reading of channel failed for ep %pK\n", ep);
		}

		static int ipa_mpm_start_stop_mhip_data_path(int probe_id,
		@@ -1509,7 +1509,7 @@ static int ipa_mpm_mhi_probe_cb(struct mhi_device *mhi_dev,
		probe_id = get_idx_from_id(mhi_id);

		if (probe_id >= IPA_MPM_MHIP_CH_ID_MAX) {
		IPA_MPM_ERR("chan=%s is not supported for now\n", mhi_id);
		IPA_MPM_ERR("chan=%pK is not supported for now\n", mhi_id);
		return -EPERM;
		}

		@@ -1692,7 +1692,7 @@ static int ipa_mpm_mhi_probe_cb(struct mhi_device *mhi_dev,

		iowrite32(wp_addr, db_addr);

		IPA_MPM_DBG("Host UL TR DB = 0X%0x, wp_addr = 0X%0x",
		IPA_MPM_DBG("Host UL TR DB = 0X%pK, wp_addr = 0X%0x",
		db_addr, wp_addr);

		iounmap(db_addr);
		@@ -1711,7 +1711,7 @@ static int ipa_mpm_mhi_probe_cb(struct mhi_device *mhi_dev,
		}
		ep = &ipa3_ctx->ep[ipa_ep_idx];

		IPA_MPM_DBG("for ep_idx %d , gsi_evt_ring_hdl = %d\n",
		IPA_MPM_DBG("for ep_idx %d , gsi_evt_ring_hdl = %ld\n",
		ipa_ep_idx, ep->gsi_evt_ring_hdl);
		gsi_query_evt_ring_db_addr(ep->gsi_evt_ring_hdl,
		&evt_ring_db_addr_low, &evt_ring_db_addr_high);
		@@ -1723,7 +1723,7 @@ static int ipa_mpm_mhi_probe_cb(struct mhi_device *mhi_dev,

		wp_addr = ipa_mpm_ctx->md[probe_id].ul_prod_ring.er_pa +
		((IPA_MPM_RING_LEN + 1) * GSI_EVT_RING_RE_SIZE_16B);
		IPA_MPM_DBG("Host UL ER DB = 0X%0x, wp_addr = 0X%0x",
		IPA_MPM_DBG("Host UL ER DB = 0X%pK, wp_addr = 0X%0x",
		db_addr, wp_addr);

		iowrite32(wp_addr, db_addr);
		@@ -1752,7 +1752,7 @@ static int ipa_mpm_mhi_probe_cb(struct mhi_device *mhi_dev,
		wp_addr = ipa_mpm_ctx->md[probe_id].dl_prod_ring.tr_pa +
		((IPA_MPM_RING_LEN - 1) * GSI_CHAN_RE_SIZE_16B);

		IPA_MPM_DBG("Device DL TR DB = 0X%0X, wp_addr = 0X%0x",
		IPA_MPM_DBG("Device DL TR DB = 0X%pK, wp_addr = 0X%0x",
		db_addr, wp_addr);

		iowrite32(wp_addr, db_addr);
		@@ -1776,7 +1776,7 @@ static int ipa_mpm_mhi_probe_cb(struct mhi_device *mhi_dev,
		((IPA_MPM_RING_LEN + 1) * GSI_EVT_RING_RE_SIZE_16B);

		iowrite32(wp_addr, db_addr);
		IPA_MPM_DBG("Device UL ER DB = 0X%0X,wp_addr = 0X%0x",
		IPA_MPM_DBG("Device UL ER DB = 0X%pK,wp_addr = 0X%0x",
		db_addr, wp_addr);
		iounmap(db_addr);
		}
		@@ -1799,7 +1799,7 @@ static int ipa_mpm_mhi_probe_cb(struct mhi_device *mhi_dev,
		wp_addr = ipa_mpm_ctx->md[probe_id].dl_prod_ring.tr_pa +
		((IPA_MPM_RING_LEN + 1) * GSI_EVT_RING_RE_SIZE_16B);
		iowrite32(wp_addr, db_addr);
		IPA_MPM_DBG("Host DL ER DB = 0X%0X, wp_addr = 0X%0x",
		IPA_MPM_DBG("Host DL ER DB = 0X%pK, wp_addr = 0X%0x",
		db_addr, wp_addr);
		iounmap(db_addr);
		}
		@@ -1835,7 +1835,8 @@ static int ipa_mpm_mhi_probe_cb(struct mhi_device *mhi_dev,
		IPA_CLIENT_USB_PROD);
		break;
		default:
		IPA_MPM_DBG("No op for UL channel, in teth state = %d");
		IPA_MPM_DBG("No op for UL channel, in teth state = %d",
		ipa_mpm_ctx->md[probe_id].teth_state);
		break;
		}

		@@ -2240,7 +2241,7 @@ static int ipa_mpm_populate_smmu_info(struct platform_device *pdev)
		cb->va_end = cb->va_start + cb->va_size;

		if (cb->va_start >= ap_cb->va_start && cb->va_start < ap_cb->va_end) {
		IPA_MPM_ERR("MPM iommu and AP overlap addr 0x%lx\n",
		IPA_MPM_ERR("MPM iommu and AP overlap addr 0x%x\n",
		cb->va_start);
		ipa_assert();
		return -EFAULT;