Commit 70664fc1 authored Jul 22, 2022 by Linus Torvalds

Merge tag 'riscv-for-linus-5.19-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux

Pull RISC-V fixes from Palmer Dabbelt:

 - Two kexec-related build fixes

 - A DTS update to make the GPIO nodes match the upcoming dtschema

 - A fix that passes -mno-relax directly to the assembler when building
   modules, to work around compilers that fail to do so

* tag 'riscv-for-linus-5.19-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: add as-options for modules with assembly compontents
  riscv: dts: align gpio-key node names with dtschema
  RISC-V: kexec: Fix build error without CONFIG_KEXEC
  RISCV: kexec: Fix build error without CONFIG_MODULES

parents ae21fbac c1f6eff3

arch/riscv/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -73,6 +73,7 @@ ifeq ($(CONFIG_PERF_EVENTS),y)
	endif		endif

	KBUILD_CFLAGS_MODULE += $(call cc-option,-mno-relax)		KBUILD_CFLAGS_MODULE += $(call cc-option,-mno-relax)
			KBUILD_AFLAGS_MODULE += $(call as-option,-Wa$(comma)-mno-relax)

	# GCC versions that support the "-mstrict-align" option default to allowing		# GCC versions that support the "-mstrict-align" option default to allowing
	# unaligned accesses. While unaligned accesses are explicitly allowed in the		# unaligned accesses. While unaligned accesses are explicitly allowed in the

arch/riscv/boot/dts/canaan/canaan_kd233.dts

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -35,7 +35,7 @@
	gpio-keys {		gpio-keys {
	compatible = "gpio-keys";		compatible = "gpio-keys";

	key0 {		key {
	label = "KEY0";		label = "KEY0";
	linux,code = <BTN_0>;		linux,code = <BTN_0>;
	gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;		gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;

arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -47,7 +47,7 @@
	gpio-keys {		gpio-keys {
	compatible = "gpio-keys";		compatible = "gpio-keys";

	boot {		key-boot {
	label = "BOOT";		label = "BOOT";
	linux,code = <BTN_0>;		linux,code = <BTN_0>;
	gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;		gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;

arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -52,7 +52,7 @@
	gpio-keys {		gpio-keys {
	compatible = "gpio-keys";		compatible = "gpio-keys";

	boot {		key-boot {
	label = "BOOT";		label = "BOOT";
	linux,code = <BTN_0>;		linux,code = <BTN_0>;
	gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;		gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;

arch/riscv/boot/dts/canaan/sipeed_maix_go.dts

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -46,19 +46,19 @@
	gpio-keys {		gpio-keys {
	compatible = "gpio-keys";		compatible = "gpio-keys";

	up {		key-up {
	label = "UP";		label = "UP";
	linux,code = <BTN_1>;		linux,code = <BTN_1>;
	gpios = <&gpio1_0 7 GPIO_ACTIVE_LOW>;		gpios = <&gpio1_0 7 GPIO_ACTIVE_LOW>;
	};		};

	press {		key-press {
	label = "PRESS";		label = "PRESS";
	linux,code = <BTN_0>;		linux,code = <BTN_0>;
	gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;		gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
	};		};

	down {		key-down {
	label = "DOWN";		label = "DOWN";
	linux,code = <BTN_2>;		linux,code = <BTN_2>;
	gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;		gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;