Merge branches 'clk-match-string', 'clk-ingenic', 'clk-si544-round-fix' and 'clk...
authorStephen Boyd <sboyd@kernel.org>
Mon, 4 Jun 2018 19:32:33 +0000 (12:32 -0700)
committerStephen Boyd <sboyd@kernel.org>
Mon, 4 Jun 2018 19:32:33 +0000 (12:32 -0700)
commit36851edd7ea96ac74266de27b2ff7870e14563c8
tree130ac48233f332d45863a4ce98c37cde0424af60
parentef1ae47094b506b0194b251888166809e9258cf8
parentd6347445c49637237c5316fd76833be1d0ffa695
parent6ee3d385c263248ce0ab2fcd679835082530445d
parent4d3f36c5e9ca0f947eed71660239c529c501141a
parent5afa881c6635427e68c73861a2c22d8cac00b984
Merge branches 'clk-match-string', 'clk-ingenic', 'clk-si544-round-fix' and 'clk-bcm-stingray' into clk-next

* clk-match-string:
  clk: use match_string() helper
  clk: bcm2835: use match_string() helper

* clk-ingenic:
  clk: ingenic: jz4770: Add 150us delay after enabling VPU clock
  clk: ingenic: jz4770: Enable power of AHB1 bus after ungating VPU clock
  clk: ingenic: jz4770: Modify C1CLK clock to disable CPU clock stop on idle
  clk: ingenic: jz4770: Change OTG from custom to standard gated clock
  clk: ingenic: Support specifying "wait for clock stable" delay
  clk: ingenic: Add support for clocks whose gate bit is inverted

* clk-si544-round-fix:
  clk-si544: Properly round requested frequency to nearest match

* clk-bcm-stingray:
  clk: bcm: Update and add Stingray clock entries
  dt-bindings: clk: Update Stingray binding doc
drivers/clk/bcm/clk-bcm2835.c
drivers/clk/clk.c