mirror of
https://github.com/torvalds/linux.git
synced 2024-12-30 14:52:05 +00:00
b5a53b61a2
to me not catching up as quickly on patch review than anything else.
Overall it seems normal though, a few small changes to the core, mostly
small non-critical fixes here and there as well as driver updates for new
and existing hardware support. The biggest things are the TI clk driver
rework to lay the groundwork for clkctrl support in the next merge window
and the AmLogic audio/graphics clk support.
Core:
* clk_possible_parents debugfs file so we know which parents a clk
could possibly have
* Fix to make clk rate change notifiers stop on the first failure instead
of continuing
New Drivers:
* Mediatek MT6797 SoCs
* hi655x PMIC clks
* AmLogic Meson SoC i2s and spdif audio clks and Mali graphics clks
* Allwinner H5 SoCs and PRCM hardware
Updates:
* Nvidia Tegra T210 cleanups and non-critical fixes
* TI OMAP cleanups in preparation for clkctrl support
* Trivial fixes like kcalloc(), devm_* conversions, and seq_puts()
* ZTE zx296718 SoC VGA clks
* Rockchip clk-ids, fixups, and rename of rk1108 to rv1108
* Support for IDT VersaClock 5P49V5935
* Renesas R-Car H3 and M3-W IMR clks and ES2.0 rev of R-Car H3 support
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iQIcBAABCAAGBQJZE0YJAAoJEK0CiJfG5JUl9tEQAKVJx8VztYGt1REoFMtEEHmO
azhxT/uYGgdOMAr9a3mQxqfm5cJbjnb1EZj2RfC1XHs31BF66j40y9+5d8hY8Hzu
5IkY86s77TlqxGLwQcAsU75Q9cFrEW9X0KJ6OSzlrcc5hKlAEk/Z5lBKoQAm3mlU
JqD4DSyFqP0X3YSxV5R7yfarb/X3ekCiQ13EDrPRRhyvHUi6ReUJDDgbPHtA+O2c
ftLAARmxjzitzyvdXokXudkfNm8F5KePK+QkVikf6D/q+kx1D0BNJwZIjhpoiksn
z6LImLQ8l91AWghmqqpOFXolxQncPU+bJIL9Pox76p5b3EzbQuthIafiso8KsDST
4g3mHm42Yfx9uoF+U+pR8IeZfj5yQT91bvf8naPz/ngWMAlLP1IKJUvJN6jeTiwe
cO6GIec1OH40Xl7v/9EafMwDcnFG0cwQmzr/M6wi1dUlmbSygP9NOMTHlr6W/0wa
K2hCD6b5UHEgHmdfiJbZ2tKxLO0e8LABW+AU8fQH5S2eNe14vY0GvCzfAq5MArIz
QRpso/kdtGpTpwMEvV6PUmJ0IxYEjtNJVjGJYbORwios0SK0Xl6bJWf7gwn5crB6
nua9tVZtJEOHJS7S+ESp3VvuXj2/UGPoRRf5OsERo1S6ydGUQH+wDi1SJMdo/vtX
bIPzIw6WPxMp24JyKOhh
=/5a/
-----END PGP SIGNATURE-----
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk updates from Stephen Boyd:
"Sort of on the quieter side this time, which is probably due more to
me not catching up as quickly on patch review than anything else.
Overall it seems normal though, a few small changes to the core,
mostly small non-critical fixes here and there as well as driver
updates for new and existing hardware support.
The biggest things are the TI clk driver rework to lay the groundwork
for clkctrl support in the next merge window and the AmLogic
audio/graphics clk support.
Core:
- clk_possible_parents debugfs file so we know which parents a clk
could possibly have
- Fix to make clk rate change notifiers stop on the first failure
instead of continuing
New Drivers:
- Mediatek MT6797 SoCs
- hi655x PMIC clks
- AmLogic Meson SoC i2s and spdif audio clks and Mali graphics clks
- Allwinner H5 SoCs and PRCM hardware
Updates:
- Nvidia Tegra T210 cleanups and non-critical fixes
- TI OMAP cleanups in preparation for clkctrl support
- trivial fixes like kcalloc(), devm_* conversions, and seq_puts()
- ZTE zx296718 SoC VGA clks
- Rockchip clk-ids, fixups, and rename of rk1108 to rv1108
- IDT VersaClock 5P49V5935 support
- Renesas R-Car H3 and M3-W IMR clks and ES2.0 rev of R-Car H3
support"
* tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (151 commits)
clk: x86: pmc-atom: Checking for IS_ERR() instead of NULL
clk: ti: divider: try to fix ti_clk_register_divider
clk: mvebu: Use kcalloc() in two functions
clk: mvebu: Use kcalloc() in of_cpu_clk_setup()
clk: nomadik: Delete error messages for a failed memory allocation in two functions
clk: nomadik: Use seq_puts() in nomadik_src_clk_show()
clk: Improve a size determination in two functions
clk: Replace four seq_printf() calls by seq_putc()
clk: si5351: Delete an error message for a failed memory allocation in si5351_i2c_probe()
clk: si5351: Use devm_kcalloc() in si5351_i2c_probe()
clk: at91: Use kcalloc() in of_at91_clk_pll_get_characteristics()
reset: mediatek: Add MT2701 ethsys reset controller include file
clk: mediatek: add mt2701 ethernet reset
clk: hi6220: Add the hi655x's pmic clock
clk: ti: fix building without legacy omap3
clk: ti: fix linker error with !SOC_OMAP4
clk: hi3620: Fix a typo in one variable name
clk: hi3620: Delete error messages for a failed memory allocation in two functions
clk: hi3620: Use kcalloc() in hi3620_mmc_clk_init()
clk: hisilicon: Delete error messages for failed memory allocations in hisi_clk_init()
...
162 lines
3.2 KiB
Plaintext
162 lines
3.2 KiB
Plaintext
config SUNXI_CCU
|
|
bool "Clock support for Allwinner SoCs"
|
|
depends on ARCH_SUNXI || COMPILE_TEST
|
|
select RESET_CONTROLLER
|
|
default ARCH_SUNXI
|
|
|
|
if SUNXI_CCU
|
|
|
|
# Base clock types
|
|
|
|
config SUNXI_CCU_DIV
|
|
bool
|
|
select SUNXI_CCU_MUX
|
|
|
|
config SUNXI_CCU_FRAC
|
|
bool
|
|
|
|
config SUNXI_CCU_GATE
|
|
def_bool y
|
|
|
|
config SUNXI_CCU_MUX
|
|
bool
|
|
|
|
config SUNXI_CCU_MULT
|
|
bool
|
|
select SUNXI_CCU_MUX
|
|
|
|
config SUNXI_CCU_PHASE
|
|
bool
|
|
|
|
# Multi-factor clocks
|
|
|
|
config SUNXI_CCU_NK
|
|
bool
|
|
select SUNXI_CCU_GATE
|
|
|
|
config SUNXI_CCU_NKM
|
|
bool
|
|
select SUNXI_CCU_GATE
|
|
|
|
config SUNXI_CCU_NKMP
|
|
bool
|
|
select SUNXI_CCU_GATE
|
|
|
|
config SUNXI_CCU_NM
|
|
bool
|
|
select SUNXI_CCU_FRAC
|
|
select SUNXI_CCU_GATE
|
|
|
|
config SUNXI_CCU_MP
|
|
bool
|
|
select SUNXI_CCU_GATE
|
|
select SUNXI_CCU_MUX
|
|
|
|
# SoC Drivers
|
|
|
|
config SUN50I_A64_CCU
|
|
bool "Support for the Allwinner A64 CCU"
|
|
select SUNXI_CCU_DIV
|
|
select SUNXI_CCU_NK
|
|
select SUNXI_CCU_NKM
|
|
select SUNXI_CCU_NKMP
|
|
select SUNXI_CCU_NM
|
|
select SUNXI_CCU_MP
|
|
select SUNXI_CCU_PHASE
|
|
default ARM64 && ARCH_SUNXI
|
|
depends on (ARM64 && ARCH_SUNXI) || COMPILE_TEST
|
|
|
|
config SUN5I_CCU
|
|
bool "Support for the Allwinner sun5i family CCM"
|
|
select SUNXI_CCU_DIV
|
|
select SUNXI_CCU_MULT
|
|
select SUNXI_CCU_NK
|
|
select SUNXI_CCU_NKM
|
|
select SUNXI_CCU_NM
|
|
select SUNXI_CCU_MP
|
|
select SUNXI_CCU_PHASE
|
|
default MACH_SUN5I
|
|
depends on MACH_SUN5I || COMPILE_TEST
|
|
|
|
config SUN6I_A31_CCU
|
|
bool "Support for the Allwinner A31/A31s CCU"
|
|
select SUNXI_CCU_DIV
|
|
select SUNXI_CCU_NK
|
|
select SUNXI_CCU_NKM
|
|
select SUNXI_CCU_NKMP
|
|
select SUNXI_CCU_NM
|
|
select SUNXI_CCU_MP
|
|
select SUNXI_CCU_PHASE
|
|
default MACH_SUN6I
|
|
depends on MACH_SUN6I || COMPILE_TEST
|
|
|
|
config SUN8I_A23_CCU
|
|
bool "Support for the Allwinner A23 CCU"
|
|
select SUNXI_CCU_DIV
|
|
select SUNXI_CCU_MULT
|
|
select SUNXI_CCU_NK
|
|
select SUNXI_CCU_NKM
|
|
select SUNXI_CCU_NKMP
|
|
select SUNXI_CCU_NM
|
|
select SUNXI_CCU_MP
|
|
select SUNXI_CCU_PHASE
|
|
default MACH_SUN8I
|
|
depends on MACH_SUN8I || COMPILE_TEST
|
|
|
|
config SUN8I_A33_CCU
|
|
bool "Support for the Allwinner A33 CCU"
|
|
select SUNXI_CCU_DIV
|
|
select SUNXI_CCU_MULT
|
|
select SUNXI_CCU_NK
|
|
select SUNXI_CCU_NKM
|
|
select SUNXI_CCU_NKMP
|
|
select SUNXI_CCU_NM
|
|
select SUNXI_CCU_MP
|
|
select SUNXI_CCU_PHASE
|
|
default MACH_SUN8I
|
|
depends on MACH_SUN8I || COMPILE_TEST
|
|
|
|
config SUN8I_H3_CCU
|
|
bool "Support for the Allwinner H3 CCU"
|
|
select SUNXI_CCU_DIV
|
|
select SUNXI_CCU_NK
|
|
select SUNXI_CCU_NKM
|
|
select SUNXI_CCU_NKMP
|
|
select SUNXI_CCU_NM
|
|
select SUNXI_CCU_MP
|
|
select SUNXI_CCU_PHASE
|
|
default MACH_SUN8I || (ARM64 && ARCH_SUNXI)
|
|
depends on MACH_SUN8I || (ARM64 && ARCH_SUNXI) || COMPILE_TEST
|
|
|
|
config SUN8I_V3S_CCU
|
|
bool "Support for the Allwinner V3s CCU"
|
|
select SUNXI_CCU_DIV
|
|
select SUNXI_CCU_NK
|
|
select SUNXI_CCU_NKM
|
|
select SUNXI_CCU_NKMP
|
|
select SUNXI_CCU_NM
|
|
select SUNXI_CCU_MP
|
|
select SUNXI_CCU_PHASE
|
|
default MACH_SUN8I
|
|
depends on MACH_SUN8I || COMPILE_TEST
|
|
|
|
config SUN9I_A80_CCU
|
|
bool "Support for the Allwinner A80 CCU"
|
|
select SUNXI_CCU_DIV
|
|
select SUNXI_CCU_MULT
|
|
select SUNXI_CCU_GATE
|
|
select SUNXI_CCU_NKMP
|
|
select SUNXI_CCU_NM
|
|
select SUNXI_CCU_MP
|
|
select SUNXI_CCU_PHASE
|
|
default MACH_SUN9I
|
|
depends on MACH_SUN9I || COMPILE_TEST
|
|
|
|
config SUN8I_R_CCU
|
|
bool "Support for Allwinner SoCs' PRCM CCUs"
|
|
select SUNXI_CCU_DIV
|
|
select SUNXI_CCU_GATE
|
|
default MACH_SUN8I || (ARCH_SUNXI && ARM64)
|
|
|
|
endif
|