Commit 5d82ca7b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sh-for-v6.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux 

Pull sh updates from John Paul Adrian Glaubitz:
 "Fixes and improvements for sh:

   - replace seq_printf() with the more efficient
     seq_put_decimal_ull_width() to increase performance when stress
     reading /proc/interrupts (David Wang)

   - migrate sh to the generic rule for built-in DTB to help avoid race
     conditions during parallel builds which can occur because Kbuild
     decends into arch/*/boot/dts twice (Masahiro Yamada)

   - replace select with imply in the board Kconfig for enabling
     hardware with complex dependencies. This addresses warnings which
     were reported by the kernel test robot (Geert Uytterhoeven)"

* tag 'sh-for-v6.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux:
  sh: boards: Use imply to enable hardware with complex dependencies
  sh: Migrate to the generic rule for built-in DTB
  sh: irq: Use seq_put_decimal_ull_width() for decimal values
parents a86bf228 909f3c55

arch/sh/Kbuild

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-y				+= kernel/ mm/ boards/

obj-$(CONFIG_SH_FPU_EMU)	+= math-emu/

obj-$(CONFIG_USE_BUILTIN_DTB)	+= boot/dts/



obj-$(CONFIG_HD6446X_SERIES)	+= cchips/hd6446x/

arch/sh/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -648,10 +648,11 @@ endmenu 


menu "Boot options"



config USE_BUILTIN_DTB

config BUILTIN_DTB

	bool "Use builtin DTB"

	default n

	depends on SH_DEVICE_TREE

	select GENERIC_BUILTIN_DTB

	help

	  Link a device tree blob for particular hardware into the kernel,

	  suppressing use of the DTB pointer provided by the bootloader.
@@ -659,10 +660,10 @@ config USE_BUILTIN_DTB 
	  not capable of providing a DTB to the kernel, or for experimental

	  hardware without stable device tree bindings.



config BUILTIN_DTB_SOURCE

config BUILTIN_DTB_NAME

	string "Source file for builtin DTB"

	default ""

	depends on USE_BUILTIN_DTB

	depends on BUILTIN_DTB

	help

	  Base name (without suffix, relative to arch/sh/boot/dts) for the

	  a DTS file that will be used to produce the DTB linked into the

arch/sh/boards/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -80,8 +80,8 @@ config SH_7724_SOLUTION_ENGINE 
	select SOLUTION_ENGINE

	depends on CPU_SUBTYPE_SH7724

	select GPIOLIB

	select SND_SOC_AK4642 if SND_SIMPLE_CARD

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	imply SND_SOC_AK4642 if SND_SIMPLE_CARD

	help

	  Select 7724 SolutionEngine if configuring for a Hitachi SH7724

	  evaluation board.
@@ -259,8 +259,8 @@ config SH_ECOVEC 
	bool "EcoVec"

	depends on CPU_SUBTYPE_SH7724

	select GPIOLIB

	select SND_SOC_DA7210 if SND_SIMPLE_CARD

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	imply SND_SOC_DA7210 if SND_SIMPLE_CARD

	help

	  Renesas "R0P7724LC0011/21RL (EcoVec)" support.

arch/sh/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-$(CONFIG_USE_BUILTIN_DTB) += $(addsuffix .dtb.o, $(CONFIG_BUILTIN_DTB_SOURCE))
 
obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .dtb.o, $(CONFIG_BUILTIN_DTB_NAME))

arch/sh/kernel/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ int arch_show_interrupts(struct seq_file *p, int prec) 


	seq_printf(p, "%*s:", prec, "NMI");

	for_each_online_cpu(j)

		seq_printf(p, "%10u ", per_cpu(irq_stat.__nmi_count, j));

		seq_put_decimal_ull_width(p, " ", per_cpu(irq_stat.__nmi_count, j), 10);

	seq_printf(p, "  Non-maskable interrupts\n");



	seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));