aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@kernel.org>2020-12-20 17:18:05 -0800
committerStephen Boyd <sboyd@kernel.org>2020-12-20 17:18:05 -0800
commitabe7e32f1d50392fbfb6391f4fe1a9f1348b24f3 (patch)
tree6d72d8c1629234132ff50f83073e611609a1e61f /arch
parentb53a1603b46c5ee9b2fd4b276b12b916b33dc3d7 (diff)
parent11a163f2c7d6a9f27ce144cd7e367a81c851621a (diff)
parent4b003f5fcadfa2d0e087e907b0c65d023f6e29fb (diff)
parent48f68de00c1405351fa0e7bc44bca067c49cd0a3 (diff)
parent0c797d2c7e82bfec69e8fceb0d03b1e016eed03b (diff)
parent6f37689cf6b38fff96de52e7f0d3e78f22803ba0 (diff)
Merge branches 'clk-ingenic', 'clk-vc5', 'clk-cleanup', 'clk-canaan' and 'clk-marvell' into clk-next
- Bindings for Canaan K210 SoC clks * clk-ingenic: clk: ingenic: Fix divider calculation with div tables * clk-vc5: clk: vc5: Use "idt,voltage-microvolt" instead of "idt,voltage-microvolts" * clk-cleanup: clk: sunxi-ng: Make sure divider tables have sentinel clk: s2mps11: Fix a resource leak in error handling paths in the probe function clk: bcm: dvp: Add MODULE_DEVICE_TABLE() clk: bcm: dvp: drop a variable that is assigned to only * clk-canaan: dt-binding: clock: Document canaan,k210-clk bindings dt-bindings: Add Canaan vendor prefix * clk-marvell: clk: mvebu: a3700: fix the XTAL MODE pin to MPP1_9