Merge branches 'clk-starfive', 'clk-ti', 'clk-terminate' and 'clk-cleanup' into clk...

 - Audio clks on StarFive JH7100 RISC-V SoC
 - Terminate arrays with sentinels and make that clearer
 - Cleanup SPDX tags
 - Fix typos in comments

* clk-starfive:
  clk: starfive: Add JH7100 audio clock driver
  clk: starfive: jh7100: Support more clock types
  clk: starfive: jh7100: Make hw clock implementation reusable
  dt-bindings: clock: Add starfive,jh7100-audclk bindings
  dt-bindings: clock: Add JH7100 audio clock definitions
  clk: starfive: jh7100: Handle audio_div clock properly
  clk: starfive: jh7100: Don't round divisor up twice

* clk-ti:
  clk: ti: Drop legacy compatibility clocks for dra7
  clk: ti: Drop legacy compatibility clocks for am4
  clk: ti: Drop legacy compatibility clocks for am3
  clk: ti: Update component clocks to use ti_dt_clk_name()
  clk: ti: Update pll and clockdomain clocks to use ti_dt_clk_name()
  clk: ti: Add ti_dt_clk_name() helper to use clock-output-names
  clk: ti: Use clock-output-names for clkctrl
  clk: ti: Add ti_find_clock_provider() to use clock-output-names
  clk: ti: Optionally parse IO address from parent clock node
  clk: ti: Preserve node in ti_dt_clocks_register()
  clk: ti: Constify clkctrl_name

* clk-terminate:
  clk: actions: Make sentinel elements more obvious
  clk: clps711x: Terminate clk_div_table with sentinel element
  clk: hisilicon: Terminate clk_div_table with sentinel element
  clk: loongson1: Terminate clk_div_table with sentinel element
  clk: actions: Terminate clk_div_table with sentinel element

* clk-cleanup:
  clk: zynq: Update the parameters to zynq_clk_register_periph_clk
  clk: zynq: trivial warning fix
  clk: qcom: sm6125-gcc: fix typos in comments
  clk: ti: clkctrl: fix typos in comments
  clk: COMMON_CLK_LAN966X should depend on SOC_LAN966
  clk: Use of_device_get_match_data()
  clk: bcm2835: Remove unused variable
  clk: tegra: tegra124-emc: Fix missing put_device() call in emc_ensure_emc_driver
  clk: cleanup comments
  clk: socfpga: cleanup spdx tags

diff --combined MAINTAINERS
index 3ef38d9,19a855f,fca970a,ea3e6c9,ea3e6c9..56891a9
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@ -190,9 -190,8 -190,9 -190,8 -190,8 +190,9 @@@@@@ M:      Johannes Berg <johannes@sipsolutions
     L: linux-wireless@vger.kernel.org
     S: Maintained
     W: https://wireless.wiki.kernel.org/
 - --T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 - --T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 + ++Q: https://patchwork.kernel.org/project/linux-wireless/list/
 + ++T: git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git
 + ++T: git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
     F: Documentation/driver-api/80211/cfg80211.rst
     F: Documentation/networking/regulatory.rst
     F: include/linux/ieee80211.h
@@@@@@ -1620,7 -1619,6 -1620,7 -1619,6 -1619,6 +1620,7 @@@@@@ M:        Olof Johansson <olof@lixom.net
     M: soc@kernel.org
     L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
     S: Maintained
 + ++C: irc://irc.libera.chat/armlinux
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
     F: arch/arm/boot/dts/Makefile
     F: arch/arm64/boot/dts/Makefile
@@@@@@ -1628,7 -1626,6 -1628,7 -1626,6 -1626,6 +1628,7 @@@@@@
     ARM SUB-ARCHITECTURES
     L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
     S: Maintained
 + ++C: irc://irc.libera.chat/armlinux
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
     F: arch/arm/mach-*/
     F: arch/arm/plat-*/
@@@@@@ -1782,7 -1779,6 -1782,7 -1779,6 -1779,6 +1782,7 @@@@@@ F:        drivers/irqchip/irq-apple-aic.
     F: drivers/mailbox/apple-mailbox.c
     F: drivers/pinctrl/pinctrl-apple-gpio.c
     F: drivers/soc/apple/*
 + ++F: drivers/watchdog/apple_wdt.c
     F: include/dt-bindings/interrupt-controller/apple-aic.h
     F: include/dt-bindings/pinctrl/apple.h
     F: include/linux/apple-mailbox.h
@@@@@@ -2573,13 -2569,10 -2573,13 -2569,10 -2569,10 +2573,13 @@@@@@ N:  rockchi
     
     ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
     M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 + ++R: Alim Akhtar <alim.akhtar@samsung.com>
     L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
     L: linux-samsung-soc@vger.kernel.org
     S: Maintained
 + ++C: irc://irc.libera.chat/linux-exynos
     Q: https://patchwork.kernel.org/project/linux-samsung-soc/list/
 + ++T: git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
     F: Documentation/arm/samsung/
     F: Documentation/devicetree/bindings/arm/samsung/
     F: Documentation/devicetree/bindings/power/pd-samsung.yaml
@@@@@@ -4163,8 -4156,9 -4163,8 -4156,9 -4156,9 +4163,8 @@@@@@ N:        csk
     K: csky
     
     CA8210 IEEE-802.15.4 RADIO DRIVER
 - --M: Harry Morris <h.morris@cascoda.com>
     L: linux-wpan@vger.kernel.org
 - --S: Maintained
 + ++S: Orphan
     W: https://github.com/Cascoda/ca8210-linux.git
     F: Documentation/devicetree/bindings/net/ieee802154/ca8210.txt
     F: drivers/net/ieee802154/ca8210.c
@@@@@@ -5778,7 -5772,7 -5778,7 -5772,7 -5772,7 +5778,7 @@@@@@ F:        tools/testing/selftests/dma
     
     DMA-BUF HEAPS FRAMEWORK
     M: Sumit Semwal <sumit.semwal@linaro.org>
 - --R: Benjamin Gaignard <benjamin.gaignard@linaro.org>
 + ++R: Benjamin Gaignard <benjamin.gaignard@collabora.com>
     R: Liam Mark <lmark@codeaurora.org>
     R: Laura Abbott <labbott@redhat.com>
     R: Brian Starkey <Brian.Starkey@arm.com>
@@@@@@ -6508,7 -6502,7 -6508,7 -6502,7 -6502,7 +6508,7 @@@@@@ F:        Documentation/devicetree/bindings/di
     F: drivers/gpu/drm/rockchip/
     
     DRM DRIVERS FOR STI
 - --M: Benjamin Gaignard <benjamin.gaignard@linaro.org>
 + ++M: Alain Volmat <alain.volmat@foss.st.com>
     L: dri-devel@lists.freedesktop.org
     S: Maintained
     T: git git://anongit.freedesktop.org/drm/drm-misc
@@@@@@ -6517,8 -6511,8 -6517,8 -6511,8 -6511,8 +6517,8 @@@@@@ F:        drivers/gpu/drm/st
     
     DRM DRIVERS FOR STM
     M: Yannick Fertre <yannick.fertre@foss.st.com>
 + ++M: Raphael Gallais-Pou <raphael.gallais-pou@foss.st.com>
     M: Philippe Cornu <philippe.cornu@foss.st.com>
 - --M: Benjamin Gaignard <benjamin.gaignard@linaro.org>
     L: dri-devel@lists.freedesktop.org
     S: Maintained
     T: git git://anongit.freedesktop.org/drm/drm-misc
@@@@@@ -7214,10 -7208,8 -7214,10 -7208,8 -7208,8 +7214,10 @@@@@@ F:     drivers/net/mdio/of_mdio.
     F: drivers/net/pcs/
     F: drivers/net/phy/
     F: include/dt-bindings/net/qca-ar803x.h
 + ++F: include/linux/linkmode.h
     F: include/linux/*mdio*.h
     F: include/linux/mdio/*.h
 + ++F: include/linux/mii.h
     F: include/linux/of_net.h
     F: include/linux/phy.h
     F: include/linux/phy_fixed.h
@@@@@@ -7581,12 -7573,6 -7581,12 -7573,6 -7573,6 +7581,12 @@@@@@ S:     Maintaine
     W: http://floatingpoint.sourceforge.net/emulator/index.html
     F: arch/x86/math-emu/
     
 + ++FRAMEBUFFER CORE
 + ++M: Daniel Vetter <daniel@ffwll.ch>
 + ++F: drivers/video/fbdev/core/
 + ++S: Odd Fixes
 + ++T: git git://anongit.freedesktop.org/drm/drm-misc
 + ++
     FRAMEBUFFER LAYER
     M: Helge Deller <deller@gmx.de>
     L: linux-fbdev@vger.kernel.org
@@@@@@ -10891,12 -10877,6 -10891,12 -10877,6 -10877,6 +10891,12 @@@@@@ T:       git git://git.kernel.org/pub/scm/lin
     F: drivers/ata/pata_arasan_cf.c
     F: include/linux/pata_arasan_cf_data.h
     
 + ++LIBATA PATA DRIVERS
 + ++R: Sergey Shtylyov <s.shtylyov@omp.ru>
 + ++L: linux-ide@vger.kernel.org
 + ++F: drivers/ata/ata_*.c
 + ++F: drivers/ata/pata_*.c
 + ++
     LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
     M: Linus Walleij <linus.walleij@linaro.org>
     L: linux-ide@vger.kernel.org
@@@@@@ -11386,9 -11366,8 -11386,9 -11366,8 -11366,8 +11386,9 @@@@@@ M:  Johannes Berg <johannes@sipsolutions
     L: linux-wireless@vger.kernel.org
     S: Maintained
     W: https://wireless.wiki.kernel.org/
 - --T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 - --T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 + ++Q: https://patchwork.kernel.org/project/linux-wireless/list/
 + ++T: git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git
 + ++T: git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
     F: Documentation/networking/mac80211-injection.rst
     F: Documentation/networking/mac80211_hwsim/mac80211_hwsim.rst
     F: drivers/net/wireless/mac80211_hwsim.[ch]
@@@@@@ -12417,7 -12396,7 -12417,7 -12396,7 -12396,7 +12417,7 @@@@@@ F:  include/uapi/linux/membarrier.
     F: kernel/sched/membarrier.c
     
     MEMBLOCK
 - --M: Mike Rapoport <rppt@linux.ibm.com>
 + ++M: Mike Rapoport <rppt@kernel.org>
     L: linux-mm@kvack.org
     S: Maintained
     F: Documentation/core-api/boot-time-mm.rst
@@@@@@ -13315,8 -13294,8 -13315,8 -13294,8 -13294,8 +13315,8 @@@@@@ W:  http://www.iptables.org
     W: http://www.nftables.org/
     Q: http://patchwork.ozlabs.org/project/netfilter-devel/list/
     C: irc://irc.libera.chat/netfilter
 - --T: git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
 - --T: git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
 + ++T: git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git
 + ++T: git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git
     F: include/linux/netfilter*
     F: include/linux/netfilter/
     F: include/net/netfilter/
@@@@@@ -13395,10 -13374,9 -13395,10 -13374,9 -13374,9 +13395,10 @@@@@@ NETWORKING DRIVERS (WIRELESS
     M: Kalle Valo <kvalo@kernel.org>
     L: linux-wireless@vger.kernel.org
     S: Maintained
 - --Q: http://patchwork.kernel.org/project/linux-wireless/list/
 - --T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
 - --T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
 + ++W: https://wireless.wiki.kernel.org/
 + ++Q: https://patchwork.kernel.org/project/linux-wireless/list/
 + ++T: git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git
 + ++T: git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
     F: Documentation/devicetree/bindings/net/wireless/
     F: drivers/net/wireless/
     
@@@@@@ -13471,11 -13449,7 -13471,11 -13449,7 -13449,7 +13471,11 @@@@@@ L:       netdev@vger.kernel.or
     S: Maintained
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
     F: arch/x86/net/*
 + ++F: include/linux/ip.h
 + ++F: include/linux/ipv6*
 + ++F: include/net/fib*
     F: include/net/ip*
 + ++F: include/net/route.h
     F: net/ipv4/
     F: net/ipv6/
     
@@@@@@ -13536,6 -13510,10 -13536,6 -13510,10 -13510,10 +13536,6 @@@@@@ F:       include/net/tls.
     F: include/uapi/linux/tls.h
     F: net/tls/*
     
 - --NETWORKING [WIRELESS]
 - --L: linux-wireless@vger.kernel.org
 - --Q: http://patchwork.kernel.org/project/linux-wireless/list/
 - --
     NETXEN (1/10) GbE SUPPORT
     M: Manish Chopra <manishc@marvell.com>
     M: Rahul Verma <rahulv@marvell.com>
@@@@@@ -13583,7 -13561,7 -13583,7 -13561,7 -13561,7 +13583,7 @@@@@@ F:  tools/testing/selftests/nci
     
     NFS, SUNRPC, AND LOCKD CLIENTS
     M: Trond Myklebust <trond.myklebust@hammerspace.com>
 - --M: Anna Schumaker <anna.schumaker@netapp.com>
 + ++M: Anna Schumaker <anna@kernel.org>
     L: linux-nfs@vger.kernel.org
     S: Maintained
     W: http://client.linux-nfs.org
@@@@@@ -13840,10 -13818,7 -13840,7 -13818,7 -13818,7 +13840,10 @@@@@@ M:        Abel Vesa <abel.vesa@nxp.com
     L: linux-clk@vger.kernel.org
     L: linux-imx@nxp.com
     S: Maintained
 ++++T: git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk/imx
 ++++F: Documentation/devicetree/bindings/clock/imx*
     F: drivers/clk/imx/
 ++++F: include/dt-bindings/clock/imx*
     
     NXP i.MX 8MQ DCSS DRIVER
     M: Laurentiu Palcu <laurentiu.palcu@oss.nxp.com>
@@@@@@ -14404,7 -14379,6 -14401,7 -14379,6 -14379,6 +14404,7 @@@@@@ M:  Rob Herring <robh+dt@kernel.org
     M: Frank Rowand <frowand.list@gmail.com>
     L: devicetree@vger.kernel.org
     S: Maintained
 + ++C: irc://irc.libera.chat/devicetree
     W: http://www.devicetree.org/
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
     F: Documentation/ABI/testing/sysfs-firmware-ofw
@@@@@@ -14416,7 -14390,6 -14413,7 -14390,6 -14390,6 +14416,7 @@@@@@ OPEN FIRMWARE AND FLATTENED DEVICE TRE
     M: Rob Herring <robh+dt@kernel.org>
     L: devicetree@vger.kernel.org
     S: Maintained
 + ++C: irc://irc.libera.chat/devicetree
     Q: http://patchwork.ozlabs.org/project/devicetree-bindings/list/
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
     F: Documentation/devicetree/
@@@@@@ -15307,11 -15280,9 -15304,11 -15280,9 -15280,9 +15307,11 @@@@@@ PIN CONTROLLER - SAMSUN
     M: Tomasz Figa <tomasz.figa@gmail.com>
     M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
     M: Sylwester Nawrocki <s.nawrocki@samsung.com>
 + ++R: Alim Akhtar <alim.akhtar@samsung.com>
     L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
     L: linux-samsung-soc@vger.kernel.org
     S: Maintained
 + ++C: irc://irc.libera.chat/linux-exynos
     Q: https://patchwork.kernel.org/project/linux-samsung-soc/list/
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
     F: Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
@@@@@@ -16493,14 -16464,6 -16490,14 -16464,6 -16464,6 +16493,14 @@@@@@ F:       Documentation/devicetree/bindings/i2
     F: drivers/i2c/busses/i2c-rcar.c
     F: drivers/i2c/busses/i2c-sh_mobile.c
     
 + ++RENESAS R-CAR SATA DRIVER
 + ++R: Sergey Shtylyov <s.shtylyov@omp.ru>
 + ++S: Supported
 + ++L: linux-ide@vger.kernel.org
 + ++L: linux-renesas-soc@vger.kernel.org
 + ++F: Documentation/devicetree/bindings/ata/renesas,rcar-sata.yaml
 + ++F: drivers/ata/sata_rcar.c
 + ++
     RENESAS R-CAR THERMAL DRIVERS
     M: Niklas Söderlund <niklas.soderlund@ragnatech.se>
     L: linux-renesas-soc@vger.kernel.org
@@@@@@ -16569,9 -16532,8 -16566,9 -16532,8 -16532,8 +16569,9 @@@@@@ M:  Johannes Berg <johannes@sipsolutions
     L: linux-wireless@vger.kernel.org
     S: Maintained
     W: https://wireless.wiki.kernel.org/
 - --T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 - --T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 + ++Q: https://patchwork.kernel.org/project/linux-wireless/list/
 + ++T: git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git
 + ++T: git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
     F: Documentation/ABI/stable/sysfs-class-rfkill
     F: Documentation/driver-api/rfkill.rst
     F: include/linux/rfkill.h
@@@@@@ -16836,8 -16798,8 -16833,8 -16798,8 -16798,8 +16836,8 @@@@@@ F:  drivers/video/fbdev/savage
     S390
     M: Heiko Carstens <hca@linux.ibm.com>
     M: Vasily Gorbik <gor@linux.ibm.com>
 - --M: Christian Borntraeger <borntraeger@linux.ibm.com>
 - --R: Alexander Gordeev <agordeev@linux.ibm.com>
 + ++M: Alexander Gordeev <agordeev@linux.ibm.com>
 + ++R: Christian Borntraeger <borntraeger@linux.ibm.com>
     R: Sven Schnelle <svens@linux.ibm.com>
     L: linux-s390@vger.kernel.org
     S: Supported
@@@@@@ -17108,7 -17070,6 -17105,7 -17070,6 -17070,6 +17108,7 @@@@@@ SAMSUNG SOC CLOCK DRIVER
     M: Sylwester Nawrocki <s.nawrocki@samsung.com>
     M: Tomasz Figa <tomasz.figa@gmail.com>
     M: Chanwoo Choi <cw00.choi@samsung.com>
 + ++R: Alim Akhtar <alim.akhtar@samsung.com>
     L: linux-samsung-soc@vger.kernel.org
     S: Supported
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git
@@@@@@ -17745,21 -17706,6 -17742,21 -17706,6 -17706,6 +17745,21 @@@@@@ S:       Maintaine
     W: http://www.winischhofer.at/linuxsisusbvga.shtml
     F: drivers/usb/misc/sisusbvga/
     
 + ++SL28 CPLD MFD DRIVER
 + ++M: Michael Walle <michael@walle.cc>
 + ++S: Maintained
 + ++F: Documentation/devicetree/bindings/gpio/kontron,sl28cpld-gpio.yaml
 + ++F: Documentation/devicetree/bindings/hwmon/kontron,sl28cpld-hwmon.yaml
 + ++F: Documentation/devicetree/bindings/interrupt-controller/kontron,sl28cpld-intc.yaml
 + ++F: Documentation/devicetree/bindings/mfd/kontron,sl28cpld.yaml
 + ++F: Documentation/devicetree/bindings/pwm/kontron,sl28cpld-pwm.yaml
 + ++F: Documentation/devicetree/bindings/watchdog/kontron,sl28cpld-wdt.yaml
 + ++F: drivers/gpio/gpio-sl28cpld.c
 + ++F: drivers/hwmon/sl28cpld-hwmon.c
 + ++F: drivers/irqchip/irq-sl28cpld.c
 + ++F: drivers/pwm/pwm-sl28cpld.c
 + ++F: drivers/watchdog/sl28cpld_wdt.c
 + ++
     SLAB ALLOCATOR
     M: Christoph Lameter <cl@linux.com>
     M: Pekka Enberg <penberg@kernel.org>
@@@@@@ -18430,12 -18376,12 -18427,12 -18376,12 -18376,12 +18430,12 @@@@@@ M:    Ion Badulescu <ionut@badula.org
     S: Odd Fixes
     F: drivers/net/ethernet/adaptec/starfire*
     
- ---STARFIVE JH7100 CLOCK DRIVER
+ +++STARFIVE JH7100 CLOCK DRIVERS
     M: Emil Renner Berthing <kernel@esmil.dk>
     S: Maintained
- ---F: Documentation/devicetree/bindings/clock/starfive,jh7100-clkgen.yaml
- ---F: drivers/clk/starfive/clk-starfive-jh7100.c
- ---F: include/dt-bindings/clock/starfive-jh7100.h
+ +++F: Documentation/devicetree/bindings/clock/starfive,jh7100-*.yaml
+ +++F: drivers/clk/starfive/clk-starfive-jh7100*
+ +++F: include/dt-bindings/clock/starfive-jh7100*.h
     
     STARFIVE JH7100 PINCTRL DRIVER
     M: Emil Renner Berthing <kernel@esmil.dk>
@@@@@@ -18476,7 -18422,7 -18473,7 -18422,7 -18422,7 +18476,7 @@@@@@ F:  Documentation/devicetree/bindings/so
     F: sound/soc/sti/
     
     STI CEC DRIVER
 - --M: Benjamin Gaignard <benjamin.gaignard@linaro.org>
 + ++M: Alain Volmat <alain.volmat@foss.st.com>
     S: Maintained
     F: Documentation/devicetree/bindings/media/stih-cec.txt
     F: drivers/media/cec/platform/sti/
@@@@@@ -19630,14 -19576,6 -19627,14 -19576,6 -19576,6 +19630,14 @@@@@@ F:       Documentation/trace/timerlat-tracer.
     F: Documentation/trace/hwlat_detector.rst
     F: arch/*/kernel/trace.c
     
 + ++Real-time Linux Analysis (RTLA) tools
 + ++M: Daniel Bristot de Oliveira <bristot@kernel.org>
 + ++M: Steven Rostedt <rostedt@goodmis.org>
 + ++L: linux-trace-devel@vger.kernel.org
 + ++S: Maintained
 + ++F: Documentation/tools/rtla/
 + ++F: tools/tracing/rtla/
 + ++
     TRADITIONAL CHINESE DOCUMENTATION
     M: Hu Haowen <src.res@email.cn>
     L: linux-doc-tw-discuss@lists.sourceforge.net

diff --combined drivers/clk/Kconfig
index 2f0d40b,ad4256d,ad4256d,ad4256d,042092d..a46a8a9
--- 1/drivers/clk/Kconfig
--- 2/drivers/clk/Kconfig
--- 3/drivers/clk/Kconfig
--- 4/drivers/clk/Kconfig
--- 5/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@@@@ -197,7 -197,6 -197,6 -197,6 -197,6 +197,7 @@@@@@ config COMMON_CLK_CDCE92
     config COMMON_CLK_CS2000_CP
        tristate "Clock driver for CS2000 Fractional-N Clock Synthesizer & Clock Multiplier"
        depends on I2C
 ++++   select REGMAP_I2C
        help
          If you say yes here you get support for the CS2000 clock multiplier.
     
@@@@@@ -232,6 -231,6 -231,6 -231,6 -231,7 +232,7 @@@@@@ config COMMON_CLK_GEMIN
     
     config COMMON_CLK_LAN966X
        bool "Generic Clock Controller driver for LAN966X SoC"
++++    depends on SOC_LAN966 || COMPILE_TEST
        help
          This driver provides support for Generic Clock Controller(GCK) on
          LAN966X SoC. GCK generates and supplies clock to various peripherals
@@@@@@ -331,6 -330,9 -330,9 -330,9 -331,9 +332,6 @@@@@@ config COMMON_CLK_PX
        help
          Support for the Marvell PXA SoC.
     
 ----config COMMON_CLK_PIC32
 ----   def_bool COMMON_CLK && MACH_PIC32
 ----
     config COMMON_CLK_OXNAS
        bool "Clock driver for the OXNAS SoC Family"
        depends on ARCH_OXNAS || COMPILE_TEST
@@@@@@ -338,15 -340,6 -340,6 -340,6 -341,6 +339,15 @@@@@@
        help
          Support for the OXNAS SoC Family clocks.
     
 ++++config COMMON_CLK_RS9_PCIE
 ++++   tristate "Clock driver for Renesas 9-series PCIe clock generators"
 ++++   depends on I2C
 ++++   depends on OF
 ++++   select REGMAP_I2C
 ++++   help
 ++++     This driver supports the Renesas 9-series PCIe clock generator
 ++++     models 9FGV/9DBV/9DMV/9FGL/9DML/9QXL/9SQ.
 ++++
     config COMMON_CLK_VC5
        tristate "Clock driver for IDT VersaClock 5,6 devices"
        depends on I2C
@@@@@@ -414,7 -407,6 -407,6 -407,6 -408,6 +415,7 @@@@@@ source "drivers/clk/keystone/Kconfig
     source "drivers/clk/mediatek/Kconfig"
     source "drivers/clk/meson/Kconfig"
     source "drivers/clk/mstar/Kconfig"
 ++++source "drivers/clk/microchip/Kconfig"
     source "drivers/clk/mvebu/Kconfig"
     source "drivers/clk/pistachio/Kconfig"
     source "drivers/clk/qcom/Kconfig"
@@@@@@ -436,12 -428,4 -428,4 -428,4 -429,4 +437,12 @@@@@@ source "drivers/clk/x86/Kconfig
     source "drivers/clk/xilinx/Kconfig"
     source "drivers/clk/zynqmp/Kconfig"
     
 ++++# Kunit test cases
 ++++config CLK_GATE_KUNIT_TEST
 ++++   tristate "Basic gate type Kunit test" if !KUNIT_ALL_TESTS
 ++++   depends on KUNIT
 ++++   default KUNIT_ALL_TESTS
 ++++   help
 ++++     Kunit test for the basic clk gate type.
 ++++
     endif

diff --combined drivers/clk/clk-si5341.c
index 071f5a1,f7b4136,f7b4136,f7b4136,4baeb73..41851f4
--- 1/drivers/clk/clk-si5341.c
--- 2/drivers/clk/clk-si5341.c
--- 3/drivers/clk/clk-si5341.c
--- 4/drivers/clk/clk-si5341.c
--- 5/drivers/clk/clk-si5341.c
+++ b/drivers/clk/clk-si5341.c
@@@@@@ -655,7 -655,7 -655,7 -655,7 -655,7 +655,7 @@@@@@ static unsigned long si5341_synth_clk_r
        f = synth->data->freq_vco;
        f *= n_den >> 4;
     
----    /* Now we need to to 64-bit division: f/n_num */
++++    /* Now we need to do 64-bit division: f/n_num */
        /* And compensate for the 4 bits we dropped */
        f = div64_u64(f, (n_num >> 4));
     
@@@@@@ -798,15 -798,6 -798,6 -798,6 -798,6 +798,15 @@@@@@ static unsigned long si5341_output_clk_
        u32 r_divider;
        u8 r[3];
     
 ++++   err = regmap_read(output->data->regmap,
 ++++                   SI5341_OUT_CONFIG(output), &val);
 ++++   if (err < 0)
 ++++           return err;
 ++++
 ++++   /* If SI5341_OUT_CFG_RDIV_FORCE2 is set, r_divider is 2 */
 ++++   if (val & SI5341_OUT_CFG_RDIV_FORCE2)
 ++++           return parent_rate / 2;
 ++++
        err = regmap_bulk_read(output->data->regmap,
                        SI5341_OUT_R_REG(output), r, 3);
        if (err < 0)
@@@@@@ -823,6 -814,13 -814,13 -814,13 -814,13 +823,6 @@@@@@
        r_divider += 1;
        r_divider <<= 1;
     
 ----   err = regmap_read(output->data->regmap,
 ----                   SI5341_OUT_CONFIG(output), &val);
 ----   if (err < 0)
 ----           return err;
 ----
 ----   if (val & SI5341_OUT_CFG_RDIV_FORCE2)
 ----           r_divider = 2;
     
        return parent_rate / r_divider;
     }
@@@@@@ -1470,7 -1468,7 -1468,7 -1468,7 -1468,7 +1470,7 @@@@@@ static ssize_t input_present_show(struc
        if (res < 0)
                return res;
        res = !(status & SI5341_STATUS_LOSREF);
 ----   return snprintf(buf, PAGE_SIZE, "%d\n", res);
 ++++   return sysfs_emit(buf, "%d\n", res);
     }
     static DEVICE_ATTR_RO(input_present);
     
@@@@@@ -1485,7 -1483,7 -1483,7 -1483,7 -1483,7 +1485,7 @@@@@@ static ssize_t input_present_sticky_sho
        if (res < 0)
                return res;
        res = !(status & SI5341_STATUS_LOSREF);
 ----   return snprintf(buf, PAGE_SIZE, "%d\n", res);
 ++++   return sysfs_emit(buf, "%d\n", res);
     }
     static DEVICE_ATTR_RO(input_present_sticky);
     
@@@@@@ -1500,7 -1498,7 -1498,7 -1498,7 -1498,7 +1500,7 @@@@@@ static ssize_t pll_locked_show(struct d
        if (res < 0)
                return res;
        res = !(status & SI5341_STATUS_LOL);
 ----   return snprintf(buf, PAGE_SIZE, "%d\n", res);
 ++++   return sysfs_emit(buf, "%d\n", res);
     }
     static DEVICE_ATTR_RO(pll_locked);
     
@@@@@@ -1515,7 -1513,7 -1513,7 -1513,7 -1513,7 +1515,7 @@@@@@ static ssize_t pll_locked_sticky_show(s
        if (res < 0)
                return res;
        res = !(status & SI5341_STATUS_LOL);
 ----   return snprintf(buf, PAGE_SIZE, "%d\n", res);
 ++++   return sysfs_emit(buf, "%d\n", res);
     }
     static DEVICE_ATTR_RO(pll_locked_sticky);
     

diff --combined drivers/clk/ti/clkctrl.c
index 864c484,864c484,792137a,864c484,170cdf9..064066e
--- 1/drivers/clk/ti/clkctrl.c
--- 2/drivers/clk/ti/clkctrl.c
--- 3/drivers/clk/ti/clkctrl.c
--- 4/drivers/clk/ti/clkctrl.c
--- 5/drivers/clk/ti/clkctrl.c
+++ b/drivers/clk/ti/clkctrl.c
@@@@@@ -469,14 -469,14 -469,32 -469,14 -469,14 +469,32 @@@@@@ static void __init _clkctrl_add_provide
        of_clk_add_hw_provider(np, _ti_omap4_clkctrl_xlate, data);
     }
     
-- --/* Get clock name based on compatible string for clkctrl */
-- --static char * __init clkctrl_get_name(struct device_node *np)
++ ++/*
++ ++ * Get clock name based on "clock-output-names" property or the
++ ++ * compatible property for clkctrl.
++ ++ */
++ ++static const char * __init clkctrl_get_name(struct device_node *np)
     {
        struct property *prop;
        const int prefix_len = 11;
        const char *compat;
++ ++   const char *output;
        char *name;
     
++ ++   if (!of_property_read_string_index(np, "clock-output-names", 0,
++ ++                                      &output)) {
++ ++           const char *end;
++ ++           int len;
++ ++
++ ++           len = strlen(output);
++ ++           end = strstr(output, "_clkctrl");
++ ++           if (end)
++ ++                   len -= strlen(end);
++ ++           name = kstrndup(output, len, GFP_KERNEL);
++ ++
++ ++           return name;
++ ++   }
++ ++
        of_property_for_each_string(np, "compatible", prop, compat) {
                if (!strncmp("ti,clkctrl-", compat, prefix_len)) {
                        /* Two letter minimum name length for l3, l4 etc */
@@@@@@ -505,7 -505,7 -523,7 -505,7 -505,7 +523,7 @@@@@@ static void __init _ti_omap4_clkctrl_se
        struct omap_clkctrl_clk *clkctrl_clk = NULL;
        const __be32 *addrp;
        bool legacy_naming;
-- --   char *clkctrl_name;
++ ++   const char *clkctrl_name;
        u32 addr;
        int ret;
        char *c;
@@@@@@ -527,13 -527,13 -545,8 -527,13 -527,13 +545,8 @@@@@@
                data = omap5_clkctrl_data;
     #endif
     #ifdef CONFIG_SOC_DRA7XX
-- --   if (of_machine_is_compatible("ti,dra7")) {
-- --           if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT)
-- --                   data = dra7_clkctrl_compat_data;
-- --           else
-- --                   data = dra7_clkctrl_data;
-- --   }
-- --
++ ++   if (of_machine_is_compatible("ti,dra7"))
++ ++           data = dra7_clkctrl_data;
        if (of_machine_is_compatible("ti,dra72"))
                soc_mask = CLKF_SOC_DRA72;
        if (of_machine_is_compatible("ti,dra74"))
@@@@@@ -542,27 -542,27 -555,15 -542,27 -542,27 +555,15 @@@@@@
                soc_mask = CLKF_SOC_DRA76;
     #endif
     #ifdef CONFIG_SOC_AM33XX
-- --   if (of_machine_is_compatible("ti,am33xx")) {
-- --           if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT)
-- --                   data = am3_clkctrl_compat_data;
-- --           else
-- --                   data = am3_clkctrl_data;
-- --   }
++ ++   if (of_machine_is_compatible("ti,am33xx"))
++ ++           data = am3_clkctrl_data;
     #endif
     #ifdef CONFIG_SOC_AM43XX
-- --   if (of_machine_is_compatible("ti,am4372")) {
-- --           if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT)
-- --                   data = am4_clkctrl_compat_data;
-- --           else
-- --                   data = am4_clkctrl_data;
-- --   }
++ ++   if (of_machine_is_compatible("ti,am4372"))
++ ++           data = am4_clkctrl_data;
     
-- --   if (of_machine_is_compatible("ti,am438x")) {
-- --           if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT)
-- --                   data = am438x_clkctrl_compat_data;
-- --           else
-- --                   data = am438x_clkctrl_data;
-- --   }
++ ++   if (of_machine_is_compatible("ti,am438x"))
++ ++           data = am438x_clkctrl_data;
     #endif
     #ifdef CONFIG_SOC_TI81XX
        if (of_machine_is_compatible("ti,dm814"))
@@@@@@ -603,7 -603,7 -604,7 -603,7 -603,7 +604,7 @@@@@@
     
        /*
         * The code below can be removed when all clkctrl nodes use domain
----     * specific compatible proprerty and standard clock node naming
++++     * specific compatible property and standard clock node naming
         */
        if (legacy_naming) {
                provider->clkdm_name = kasprintf(GFP_KERNEL, "%pOFnxxx", node->parent);