From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 8 Apr 2021 15:52:01 +0000 (+0200)
Subject: Merge branch 'arm/fixes' into for-next
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a0b3c39c055d3b82f0cb2338fed040198b699df7;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'arm/fixes' into for-next

* arm/fixes: (146 commits)
  arm64: dts: allwinner: h6: beelink-gs1: Remove ext. 32 kHz osc reference
  MAINTAINERS: Match on allwinner keyword
  MAINTAINERS: Add our new mailing-list
  arm64: dts: allwinner: Fix SD card CD GPIO for SOPine systems
  arm64: dts: allwinner: h6: Switch to macros for RSB clock/reset indices
  Linux 5.12-rc6
  firewire: nosy: Fix a use-after-free bug in nosy_ioctl()
  soc: litex: Remove duplicated header file inclusion
  io_uring: fix !CONFIG_BLOCK compilation failure
  block: remove the unused RQF_ALLOCED flag
  block: update a few comments in uapi/linux/blkpg.h
  io_uring: move reissue into regular IO path
  block: don't ignore REQ_NOWAIT for direct IO
  riscv: Make NUMA depend on MMU
  riscv: remove unneeded semicolon
  riscv,entry: fix misaligned base for excp_vect_table
  riscv: evaluate put_user() arg before enabling user access
  riscv: Drop const annotation for sp
  kbuild: lto: Merge module sections if and only if CONFIG_LTO_CLANG is enabled
  tracing: Fix stack trace event size
  ...

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

a0b3c39c055d3b82f0cb2338fed040198b699df7
diff --cc arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
index 669d39fc716a7,b5808047d6e4a..4c462711f26c5
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
@@@ -289,10 -273,22 +289,26 @@@
  	};
  };
  
 +&rtc {
 +	clocks = <&ext_osc32k>;
 +};
 +
+ &r_ir {
+ 	linux,rc-map-name = "rc-beelink-gs1";
+ 	status = "okay";
+ };
+ 
+ &r_pio {
+ 	/*
+ 	 * PL0 and PL1 are used for PMIC I2C
+ 	 * don't enable the pl-supply else
+ 	 * it will fail at boot
+ 	 *
+ 	 * vcc-pl-supply = <&reg_aldo1>;
+ 	 */
+ 	vcc-pm-supply = <&reg_aldo1>;
+ };
+ 
  &spdif {
  	status = "okay";
  };