Commit 974be36e authored Apr 08, 2021 by Arnd Bergmann

Merge tag 'sunxi-fixes-for-5.12-1' of...

Merge tag 'sunxi-fixes-for-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes

One 32kHz clock fix for the beelink gs1, a CD polarity fix for the SoPine, some
MAINTAINERS maintainance, and a clk / reset switch to our headers.

* tag 'sunxi-fixes-for-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  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

Link: https://lore.kernel.org/r/9972a85e-60b7-49f4-a246-db3396dd4764.lettre@localhost


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

parents e49d033b 7a2f6e69

MAINTAINERS

+2 −0

Original line number	Diff line number	Diff line
		@@ -1576,11 +1576,13 @@ R: Jernej Skrabec <jernej.skrabec@siol.net>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
		L: linux-sunxi@lists.linux.dev
		F: arch/arm/mach-sunxi/
		F: arch/arm64/boot/dts/allwinner/
		F: drivers/clk/sunxi-ng/
		F: drivers/pinctrl/sunxi/
		F: drivers/soc/sunxi/
		N: allwinner
		N: sun[x456789]i
		N: sun50i

arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts

+4 −0

Original line number	Diff line number	Diff line
		@@ -19,3 +19,7 @@
		};
		};
		};

		&mmc0 {
		cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 push-push switch */
		};

arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@
		vmmc-supply = <&reg_dcdc1>;
		disable-wp;
		bus-width = <4>;
		cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
		cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 push-pull switch */
		status = "okay";
		};

arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts

+0 −4

Original line number	Diff line number	Diff line
		@@ -289,10 +289,6 @@
		vcc-pm-supply = <&reg_aldo1>;
		};

		&rtc {
		clocks = <&ext_osc32k>;
		};

		&spdif {
		status = "okay";
		};

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -995,9 +995,9 @@
		compatible = "allwinner,sun8i-a23-rsb";
		reg = <0x07083000 0x400>;
		interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
		clocks = <&r_ccu 13>;
		clocks = <&r_ccu CLK_R_APB2_RSB>;
		clock-frequency = <3000000>;
		resets = <&r_ccu 7>;
		resets = <&r_ccu RST_R_APB2_RSB>;
		pinctrl-names = "default";
		pinctrl-0 = <&r_rsb_pins>;
		status = "disabled";