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
Этот коммит содержится в:
@@ -239,6 +239,7 @@ static inline struct clk *mpc512x_clk_divider(
|
||||
const char *name, const char *parent_name, u8 clkflags,
|
||||
u32 __iomem *reg, u8 pos, u8 len, int divflags)
|
||||
{
|
||||
divflags |= CLK_DIVIDER_BIG_ENDIAN;
|
||||
return clk_register_divider(NULL, name, parent_name, clkflags,
|
||||
reg, pos, len, divflags, &clklock);
|
||||
}
|
||||
@@ -250,7 +251,7 @@ static inline struct clk *mpc512x_clk_divtable(
|
||||
{
|
||||
u8 divflags;
|
||||
|
||||
divflags = 0;
|
||||
divflags = CLK_DIVIDER_BIG_ENDIAN;
|
||||
return clk_register_divider_table(NULL, name, parent_name, 0,
|
||||
reg, pos, len, divflags,
|
||||
divtab, &clklock);
|
||||
@@ -261,10 +262,12 @@ static inline struct clk *mpc512x_clk_gated(
|
||||
u32 __iomem *reg, u8 pos)
|
||||
{
|
||||
int clkflags;
|
||||
u8 gateflags;
|
||||
|
||||
clkflags = CLK_SET_RATE_PARENT;
|
||||
gateflags = CLK_GATE_BIG_ENDIAN;
|
||||
return clk_register_gate(NULL, name, parent_name, clkflags,
|
||||
reg, pos, 0, &clklock);
|
||||
reg, pos, gateflags, &clklock);
|
||||
}
|
||||
|
||||
static inline struct clk *mpc512x_clk_muxed(const char *name,
|
||||
@@ -275,7 +278,7 @@ static inline struct clk *mpc512x_clk_muxed(const char *name,
|
||||
u8 muxflags;
|
||||
|
||||
clkflags = CLK_SET_RATE_PARENT;
|
||||
muxflags = 0;
|
||||
muxflags = CLK_MUX_BIG_ENDIAN;
|
||||
return clk_register_mux(NULL, name,
|
||||
parent_names, parent_count, clkflags,
|
||||
reg, pos, len, muxflags, &clklock);
|
||||
|
Ссылка в новой задаче
Block a user