Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3217c038 authored by Mike Turquette's avatar Mike Turquette
Browse files

Merge branch 'clk-fixes' into clk-next

parents 409f0139 d2c834ab
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -1718,7 +1718,7 @@ struct clk *tegra_clk_register_plle_tegra114(const char *name,
					"pll_re_vco");
					"pll_re_vco");
	} else {
	} else {
		val_aux &= ~(PLLE_AUX_PLLRE_SEL | PLLE_AUX_PLLP_SEL);
		val_aux &= ~(PLLE_AUX_PLLRE_SEL | PLLE_AUX_PLLP_SEL);
		pll_writel(val, pll_params->aux_reg, pll);
		pll_writel(val_aux, pll_params->aux_reg, pll);
	}
	}


	clk = _tegra_clk_register_pll(pll, name, parent_name, flags,
	clk = _tegra_clk_register_pll(pll, name, parent_name, flags,