diff options
author | Stephen Boyd <sboyd@kernel.org> | 2018-08-14 22:58:42 -0700 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2018-08-14 22:58:42 -0700 |
commit | 139054634b4069a2e3892a8f6c3693ccca5f1c7d (patch) | |
tree | 8abc0ae95a06b523651e963bbaa29e8f9059f9eb /drivers/clk/imx | |
parent | ea4f7872c71adef8897f71bb6bb056856ccc8ed9 (diff) | |
parent | d0897bc85ca89d5ddc6c2fcf2f99e04d4a577b63 (diff) | |
parent | f7b3182232c82bb9769e2d5471d702bae2972d2b (diff) | |
parent | 8097d4c75f00f3fce8f4916521ec61ec0c607324 (diff) | |
parent | da0d2239a56ec8fe6a617aade5901ab3bffc1ef4 (diff) | |
parent | 405fcacbd866cfe75733b94bacdef5bcb4aa6c6c (diff) |
Merge branches 'clk-imx-critical', 'clk-tegra-bpmp', 'clk-tegra-124', 'clk-tegra-critical' and 'clk-tegra-emc-oob' into clk-next
* clk-imx-critical:
: - Convert to CLK_IS_CRITICAL for i.MX51/53 driver
clk: imx51-imx53: Include sizes.h to silence compile errors
clk: imx51-imx53: Annotate critical clocks as CLK_IS_CRITICAL
* clk-tegra-bpmp:
: - Fix Tegra BPMP driver oops when some xlating a NULL clk
clk: tegra: bpmp: Don't crash when a clock fails to register
* clk-tegra-124:
: - Proper default configuration for vic03 and vde clks on Tegra124
clk: tegra: Make vde a child of pll_c3
clk: tegra: Make vic03 a child of pll_c3
* clk-tegra-critical:
: - Mark Tegra memory controller clks as critical
clk: tegra: Mark Memory Controller clock as critical
* clk-tegra-emc-oob:
: - Fix array bounds clamp in Tegra's emc determine_rate() op
clk: tegra: emc: Avoid out-of-bounds bug