Skip to contentSkip to conversation

More clk changes for the merge window

GIT PULL Merged Stephen Boyd 3 participants 3 messages Nov 13, 2021 Common clk

lore
Share & tools
lore

Stephen Boyd

author maintainer
#0 lore raw

The following changes since commit e2ceaa867d266472b31f3e03ba16f3120aefc152:

Merge branches 'clk-composite-determine-fix', 'clk-allwinner', 'clk-amlogic' and 'clk-samsung' into clk-next (2021-11-02 11:27:06 -0700)

are available in the Git repository at:

https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git tags/clk-for-linus

for you to fetch changes up to 05cf3ec00d460b50088d421fb878a0f83f57e262:

clk: qcom: gcc-msm8996: Drop (again) gcc_aggre1_pnoc_ahb_clk (2021-11-05 15:29:43 -0700)

----------------------------------------------------------------
This is the second batch of clk driver updates that needed a little more time to soak in linux-next.

- Use modern i2c probe in vc5
- Cleanup some includes
- Update links to datasheets
- Add UniPhier NX1 SoC clk support
- Fix DT bindings for SiFive FU740
- Revert the module platform driver support for Rockchip out because it wasn't actually tested
- Fix the composite clk code again as the previous fix had a one line bug that broke rate changes for clks that want to use the same parent still
- Use the right table for a divider in ast2600 driver
- Get rid of gcc_aggre1_pnoc_ahb_clk in qcom clk driver again because its critical but unused

----------------------------------------------------------------
Alexander Stein (2):
clk: composite: Fix 'switching' to same clock
clk: imx8m: Do not set IMX_COMPOSITE_CORE for non-regular composites

Dmitry Baryshkov (1):
clk: qcom: gcc-msm8996: Drop (again) gcc_aggre1_pnoc_ahb_clk

Heiko Stuebner (2):
Revert "clk: rockchip: use module_platform_driver_probe"
clk: rockchip: drop module parts from rk3399 and rk3568 drivers

Jens Renner (1):
clk: si5351: Update datasheet references

Joel Stanley (1):
clk/ast2600: Fix soc revision for AHB

Krzysztof Kozlowski (1):
dt-bindings: clock: fu740-prci: add reset-cells

Kunihiko Hayashi (5):
clk: uniphier: Add audio system and video input clock control for PXs3
dt-bindings: clock: uniphier: Add NX1 clock binding
clk: uniphier: Add NX1 clock support
dt-bindings: clock: uniphier: Add clock binding for SoC-glue
clk: uniphier: Add SoC-glue clock source selector support for Pro4

Luca Ceresoli (1):
clk: vc5: Use i2c .probe_new

Mianhan Liu (1):
clk/actions/owl-factor.c: remove superfluous headers

Paul Cercueil (1):
clk: ingenic: Fix bugs with divided dividers

Ran Jianping (1):
clk:mediatek: remove duplicate include in clk-mt8195-imp_iic_wrap.c

 .../bindings/clock/sifive/fu740-prci.yaml          |  4 ++
 .../devicetree/bindings/clock/silabs,si5351.txt    |  2 +-
 .../bindings/clock/socionext,uniphier-clock.yaml   |  6 +++
 drivers/clk/actions/owl-factor.c                   |  1 -
 drivers/clk/clk-ast2600.c                          | 12 +++---
 drivers/clk/clk-composite.c                        |  1 +
 drivers/clk/clk-si5351.c                           |  8 ++--
 drivers/clk/clk-si5351.h                           |  2 +-
 drivers/clk/clk-versaclock5.c                      |  4 +-
 drivers/clk/imx/clk.h                              |  4 +-
 drivers/clk/ingenic/cgu.c                          |  6 +--
 drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c     |  2 -
 drivers/clk/qcom/gcc-msm8996.c                     | 15 -------
 drivers/clk/rockchip/Kconfig                       |  4 +-
 drivers/clk/rockchip/clk-rk3399.c                  |  6 +--
 drivers/clk/rockchip/clk-rk3568.c                  |  6 +--
 drivers/clk/uniphier/clk-uniphier-core.c           | 17 ++++++++
 drivers/clk/uniphier/clk-uniphier-sys.c            | 47 ++++++++++++++++++++++
 drivers/clk/uniphier/clk-uniphier.h                |  6 +++
 19 files changed, 105 insertions(+), 48 deletions(-)
Signature · 2 lines
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/
https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git
#1 lore raw
Quoted 3 lines · Stephen Boyd

- Revert the module platform driver support for Rockchip out because it wasn't actually tested

I'm not sure how to parse that sentence, and the actual commit didn't give me any hints either.

I ended up just removing the word "out".

Linus

merge bot Merged
#2 lore raw
In reply to Stephen Boyd
The pull request you sent on Fri, 12 Nov 2021 22:36:48 -0800:

The pull request you sent on Fri, 12 Nov 2021 22:36:48 -0800:

Quoted 1 line

https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git tags/clk-for-linus

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/3ad7befd4842afa2449026715987122a1c6dcb85

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html