diff options
author | Stephen Boyd <sboyd@kernel.org> | 2019-05-07 21:44:42 +0300 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2019-05-07 21:44:42 +0300 |
commit | f6111b9d7970df07f783d3891735003fef2bc37e (patch) | |
tree | 4d9b67d53d6588b920f624881b5cea885b7e3274 /drivers/pcmcia/db1xxx_ss.c | |
parent | 2ed3b9103a2b5482f7e00811bda0976feb10ade0 (diff) | |
parent | f14382d7e40cc8872d4e4c71f06000ea499c8384 (diff) | |
parent | 043f44aba9a871da521fe6ebecd5c63e406256ff (diff) | |
parent | 6e4fcc34e6a35b1ca553940cf952e7c0a1ed4cfe (diff) | |
parent | 5834fd75e6236605da8c439a64eaa33f3c8d02fe (diff) | |
download | linux-f6111b9d7970df07f783d3891735003fef2bc37e.tar.xz |
Merge branches 'clk-doc', 'clk-more-critical', 'clk-meson' and 'clk-basic-be' into clk-next
- Remove clk_readl() and introduce BE versions of basic clk types
* clk-doc:
clk: Drop duplicate clk_register() documentation
clk: Document and simplify clk_core_get_rate_nolock()
clk: Remove 'flags' member of struct clk_fixed_rate
clk: nxp: Drop 'flags' on fixed_rate clk macro
clk: Document __clk_mux_determine_rate()
clk: Document CLK_MUX_READ_ONLY mux flag
clk: Document deprecated things
clk: Collapse gpio clk kerneldoc
* clk-more-critical:
clk: highbank: Convert to CLK_IS_CRITICAL
* clk-meson: (21 commits)
clk: meson: axg-audio: add g12a support
clk: meson: axg-audio: don't register inputs in the onecell data
clk: meson: axg_audio: replace prefix axg by aud
dt-bindings: clk: axg-audio: add g12a support
clk: meson: meson8b: add the video decoder clock trees
clk: meson: meson8b: add the VPU clock trees
clk: meson: meson8b: add support for the GP_PLL clock on Meson8m2
clk: meson: meson8b: use a separate clock table for Meson8m2
dt-bindings: clock: meson8b: export the video decoder clocks
clk: meson-g12a: add video decoder clocks
dt-bindings: clock: meson8b: export the VPU clock
clk: meson-g12a: add PCIE PLL clocks
dt-bindings: clock: g12a-aoclk: expose CLKID_AO_CTS_OSCIN
clk: meson-pll: add reduced specific clk_ops for G12A PCIe PLL
dt-bindings: clock: meson8b: drop the "ABP" clock definition
clk: meson: g12a: add cpu clocks
dt-bindings: clk: g12a-clkc: add VDEC clock IDs
dt-bindings: clock: axg-audio: unexpose controller inputs
dt-bindings: clk: g12a-clkc: add PCIE PLL clock ID
clk: g12a-aoclk: re-export CLKID_AO_SAR_ADC_SEL clock id
...
* clk-basic-be:
clk: core: replace clk_{readl,writel} with {readl,writel}
clk: core: remove powerpc special handling
powerpc/512x: mark clocks as big endian
clk: mux: add explicit big endian support
clk: multiplier: add explicit big endian support
clk: gate: add explicit big endian support
clk: fractional-divider: add explicit big endian support
clk: divider: add explicit big endian support