evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ARM: dts: msm: enable qcom,no-smr-check for mmss smmu for msmcobalt"

Browse source
This commit is contained in:
Linux Build Service Account 2016-07-13 15:45:21 -07:00 • committed by Gerrit - the friendly Code Review server
commit c50c09ee13
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/boot/dts/qcom/msm-arm-smmu-cobalt.dtsi
View file

@ -113,6 +113,7 @@
reg = <0xcd00000 0x40000>; reg = <0xcd00000 0x40000>;
#iommu-cells = <1>; #iommu-cells = <1>;
qcom,register-save; qcom,register-save;
qcom,no-smr-check;
qcom,skip-init; qcom,skip-init;
#global-interrupts = <2>; #global-interrupts = <2>;
interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>,

2
arch/arm/boot/dts/qcom/msmcobalt.dtsi
View file

@ -2776,6 +2776,8 @@
&gdsc_bimc_smmu { &gdsc_bimc_smmu {
clock-names = "bus_clk"; clock-names = "bus_clk";
clocks = <&clock_mmss clk_mmss_bimc_smmu_axi_clk>; clocks = <&clock_mmss clk_mmss_bimc_smmu_axi_clk>;
proxy-supply = <&gdsc_bimc_smmu>;
qcom,proxy-consumer-enable;
status = "ok"; status = "ok";
}; };

10
drivers/clk/msm/mdss/mdss-dsi-pll-cobalt.c
View file

@ -509,7 +509,7 @@ static unsigned long dsi_pll_get_vco_rate(struct clk *c)
16); 16);
/* OUTDIV_1:0 field is (log(outdiv, 2)) */ /* OUTDIV_1:0 field is (log(outdiv, 2)) */
outdiv = MDSS_PLL_REG_R(pll->pll_base, PLL_OUTDIV); outdiv = MDSS_PLL_REG_R(pll->pll_base, PLL_PLL_OUTDIV_RATE);
outdiv &= 0x3; outdiv &= 0x3;
outdiv = 1 << outdiv; outdiv = 1 << outdiv;
@ -521,12 +521,12 @@ static unsigned long dsi_pll_get_vco_rate(struct clk *c)
multiplier = 1 << 18; multiplier = 1 << 18;
pll_freq = dec * (ref_clk * 2); pll_freq = dec * (ref_clk * 2);
tmp64 = (ref_clk * 2 * frac); tmp64 = (ref_clk * 2 * frac);
pll_freq += do_div(tmp64, multiplier); pll_freq += div_u64(tmp64, multiplier);
vco_rate = do_div(pll_freq, outdiv); vco_rate = div_u64(pll_freq, outdiv);
pr_debug("dec=0x%x\n, frac=0x%x, outdiv=%d, vco=%lu\n", pr_debug("dec=0x%x, frac=0x%x, outdiv=%d, vco=%llu\n",
dec, frac, outdiv, (unsigned long)vco_rate); dec, frac, outdiv, vco_rate);
(void)mdss_pll_resource_enable(pll, false); (void)mdss_pll_resource_enable(pll, false);