Skip to content

Commit 974be36

Browse files
committed
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>
2 parents e49d033 + 7a2f6e6 commit 974be36

5 files changed

Lines changed: 9 additions & 7 deletions

File tree

MAINTAINERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,11 +1576,13 @@ R: Jernej Skrabec <jernej.skrabec@siol.net>
15761576
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
15771577
S: Maintained
15781578
T: git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
1579+
L: linux-sunxi@lists.linux.dev
15791580
F: arch/arm/mach-sunxi/
15801581
F: arch/arm64/boot/dts/allwinner/
15811582
F: drivers/clk/sunxi-ng/
15821583
F: drivers/pinctrl/sunxi/
15831584
F: drivers/soc/sunxi/
1585+
N: allwinner
15841586
N: sun[x456789]i
15851587
N: sun50i
15861588

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,7 @@
1919
};
2020
};
2121
};
22+
23+
&mmc0 {
24+
cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 push-push switch */
25+
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
vmmc-supply = <&reg_dcdc1>;
3535
disable-wp;
3636
bus-width = <4>;
37-
cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
37+
cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 push-pull switch */
3838
status = "okay";
3939
};
4040

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,10 +289,6 @@
289289
vcc-pm-supply = <&reg_aldo1>;
290290
};
291291

292-
&rtc {
293-
clocks = <&ext_osc32k>;
294-
};
295-
296292
&spdif {
297293
status = "okay";
298294
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -995,9 +995,9 @@
995995
compatible = "allwinner,sun8i-a23-rsb";
996996
reg = <0x07083000 0x400>;
997997
interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
998-
clocks = <&r_ccu 13>;
998+
clocks = <&r_ccu CLK_R_APB2_RSB>;
999999
clock-frequency = <3000000>;
1000-
resets = <&r_ccu 7>;
1000+
resets = <&r_ccu RST_R_APB2_RSB>;
10011001
pinctrl-names = "default";
10021002
pinctrl-0 = <&r_rsb_pins>;
10031003
status = "disabled";

0 commit comments

Comments
 (0)