提交 974be36e 编写于 作者: A 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@localhostSigned-off-by: NArnd Bergmann <arnd@arndb.de>
...@@ -1576,11 +1576,13 @@ R: Jernej Skrabec <jernej.skrabec@siol.net> ...@@ -1576,11 +1576,13 @@ R: Jernej Skrabec <jernej.skrabec@siol.net>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git 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/arm/mach-sunxi/
F: arch/arm64/boot/dts/allwinner/ F: arch/arm64/boot/dts/allwinner/
F: drivers/clk/sunxi-ng/ F: drivers/clk/sunxi-ng/
F: drivers/pinctrl/sunxi/ F: drivers/pinctrl/sunxi/
F: drivers/soc/sunxi/ F: drivers/soc/sunxi/
N: allwinner
N: sun[x456789]i N: sun[x456789]i
N: sun50i N: sun50i
......
...@@ -19,3 +19,7 @@ ...@@ -19,3 +19,7 @@
}; };
}; };
}; };
&mmc0 {
cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 push-push switch */
};
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
disable-wp; disable-wp;
bus-width = <4>; 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"; status = "okay";
}; };
......
...@@ -289,10 +289,6 @@ ...@@ -289,10 +289,6 @@
vcc-pm-supply = <&reg_aldo1>; vcc-pm-supply = <&reg_aldo1>;
}; };
&rtc {
clocks = <&ext_osc32k>;
};
&spdif { &spdif {
status = "okay"; status = "okay";
}; };
......
...@@ -995,9 +995,9 @@ ...@@ -995,9 +995,9 @@
compatible = "allwinner,sun8i-a23-rsb"; compatible = "allwinner,sun8i-a23-rsb";
reg = <0x07083000 0x400>; reg = <0x07083000 0x400>;
interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&r_ccu 13>; clocks = <&r_ccu CLK_R_APB2_RSB>;
clock-frequency = <3000000>; clock-frequency = <3000000>;
resets = <&r_ccu 7>; resets = <&r_ccu RST_R_APB2_RSB>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&r_rsb_pins>; pinctrl-0 = <&r_rsb_pins>;
status = "disabled"; status = "disabled";
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册