# git rev-parse -q --verify 8653b778e454a7708847aeafe689bce07aeeb94e^{commit} 8653b778e454a7708847aeafe689bce07aeeb94e already have revision, skipping fetch # git checkout -q -f -B kisskb 8653b778e454a7708847aeafe689bce07aeeb94e # git clean -qxdf # < git log -1 # commit 8653b778e454a7708847aeafe689bce07aeeb94e # Merge: 8552d28e1401 abe7e32f1d50 # Author: Linus Torvalds # Date: Mon Dec 21 10:39:37 2020 -0800 # # Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux # # Pull clk updates from Stephen Boyd: # "The core framework got some nice improvements this time around. We # gained the ability to get struct clk pointers from a struct clk_hw so # that clk providers can consume the clks they provide, if they need to # do something like that. This has been a long missing part of the clk # provider API that will help us move away from exposing a struct clk # pointer in the struct clk_hw. Tracepoints are added for the # clk_set_rate() "range" functions, similar to the tracepoints we # already have for clk_set_rate() and we added a column to debugfs to # help developers understand the hardware enable state of clks in case # firmware or bootloader state is different than what is expected. # Overall the core changes are mostly improving the clk driver writing # experience. # # At the driver level, we have the usual collection of driver updates # and new drivers for new SoCs. This time around the Qualcomm folks # introduced a good handful of clk drivers for various parts of three or # four SoCs. The SiFive folks added a new clk driver for their FU740 # SoCs, coming in second on the diffstat and then Atmel AT91 and Amlogic # SoCs had lots of work done after that for various new features. One # last thing to note in the driver area is that the i.MX driver has # gained a new binding to support SCU clks after being on the list for # many months. It uses a two cell binding which is sort of rare in clk # DT bindings. Beyond that we have the usual set of driver fixes and # tweaks that come from more testing and finding out that some # configuration was wrong or that a driver could support being built as # a module. # # Summary: # # Core: # - Add some trace points for clk_set_rate() "range" functions # - Add hardware enable information to clk_summary debugfs # - Replace clk-provider.h with of_clk.h when possible # - Add devm variant of clk_notifier_register() # - Add clk_hw_get_clk() to generate a struct clk from a struct clk_hw # # New Drivers: # - Bindings for Canaan K210 SoC clks # - Support for SiFive FU740 PRCI # - Camera clks on Qualcomm SC7180 SoCs # - GCC and RPMh clks on Qualcomm SDX55 SoCs # - RPMh clks on Qualcomm SM8350 SoCs # - LPASS clks on Qualcomm SM8250 SoCs # # Updates: # - DVFS support for AT91 clk driver # - Update git repo branch for Renesas clock drivers # - Add camera (CSI) and video-in (VIN) clocks on Renesas R-Car V3U # - Add RPC (QSPI/HyperFLASH) clocks on Renesas RZ/G2M, RZ/G2N, and RZ/G2E # - Stop using __raw_*() I/O accessors in Renesas clk drivers # - One more conversion of DT bindings to json-schema # - Make i.MX clk-gate2 driver more flexible # - New two cell binding for i.MX SCU clks # - Drop of_match_ptr() in i.MX8 clk drivers # - Add arch dependencies for Rockchip clk drivers # - Fix i2s on Rockchip rk3066 # - Add MIPI DSI clks on Amlogic axg and g12 SoCs # - Support modular builds of Amlogic clk drivers # - Fix an Amlogic Video PLL clock dependency # - Samsung Kconfig dependencies updates for better compile test coverage # - Refactoring of the Samsung PLL clocks driver # - Small Tegra driver cleanups # - Minor fixes to Ingenic and VC5 clk drivers # - Cleanup patches to remove unused variables and plug memory leaks" # # * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (134 commits) # dt-binding: clock: Document canaan,k210-clk bindings # dt-bindings: Add Canaan vendor prefix # clk: vc5: Use "idt,voltage-microvolt" instead of "idt,voltage-microvolts" # clk: ingenic: Fix divider calculation with div tables # clk: sunxi-ng: Make sure divider tables have sentinel # clk: s2mps11: Fix a resource leak in error handling paths in the probe function # clk: mvebu: a3700: fix the XTAL MODE pin to MPP1_9 # clk: si5351: Wait for bit clear after PLL reset # clk: at91: sam9x60: remove atmel,osc-bypass support # clk: at91: sama7g5: register cpu clock # clk: at91: clk-master: re-factor master clock # clk: at91: sama7g5: do not allow cpu pll to go higher than 1GHz # clk: at91: sama7g5: decrease lower limit for MCK0 rate # clk: at91: sama7g5: remove mck0 from parent list of other clocks # clk: at91: clk-sam9x60-pll: allow runtime changes for pll # clk: at91: sama7g5: add 5th divisor for mck0 layout and characteristics # clk: at91: clk-master: add 5th divisor for mck master # clk: at91: sama7g5: allow SYS and CPU PLLs to be exported and referenced in DT # dt-bindings: clock: at91: add sama7g5 pll defines # clk: at91: sama7g5: fix compilation error # ... # < /opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 8653b778e454a7708847aeafe689bce07aeeb94e # < make -s -j 120 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc10 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux- se7619_defconfig # make -s -j 120 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc10 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/traps.c: In function 'nmi_trap_handler': /kisskb/src/arch/sh/kernel/traps.c:183:15: warning: unused variable 'cpu' [-Wunused-variable] 183 | unsigned int cpu = smp_processor_id(); | ^~~ In file included from /kisskb/src/arch/sh/include/asm/hw_irq.h:6, from /kisskb/src/include/linux/irq.h:589, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/sh/include/asm/hardirq.h:9, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/serial_core.h:13, from /kisskb/src/include/linux/serial_sci.h:6, from /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:11: /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:105:24: note: in expansion of macro '_INTC_ARRAY' 105 | _INTC_ARRAY(vectors), _INTC_ARRAY(groups), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:106:2: note: in expansion of macro '_INTC_ARRAY' 106 | _INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:2: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:27: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/drivers/tty/serial/sh-sci.c: In function 'sci_remap_port': /kisskb/src/drivers/tty/serial/sh-sci.c:2677:19: warning: unused variable 'sport' [-Wunused-variable] 2677 | struct sci_port *sport = to_sci_port(port); | ^~~~~ Completed OK # rm -rf /kisskb/build/linus_se7619_defconfig_sh4-gcc10 # Build took: 0:00:18.017009