tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'arm-fixes-5.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM SoC fixes from Arnd Bergmann:
"Another smaller set of fixes for three of the Arm platforms:

TI OMAP:

Fix swapped mmc device order also for omap3 that got changed with
the recent PROBE_PREFER_ASYNCHRONOUS changes. While eventually the
aliases should be board specific, all the mmc device instances are
all there in the SoC, and we do probe them by default so that PM
runtime can idle the devices if left enabled from the bootloader.

Qualcomm Snapdragon:

This bypasses the recently introduced interconnect handling in
the GENI (serial engine) driver when running off ACPI, as this
causes the GENI probe to fail and the Lenovo Yoga C630 to boot
without keyboard and touchpad.

Allwinner:

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 'arm-fixes-5.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
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
ARM: OMAP2+: Fix uninitialized sr_inst
ARM: dts: Fix swapped mmc order for omap3
ARM: OMAP2+: Fix warning for omap_init_time_of()
soc: qcom: geni: shield geni_icc_get() for ACPI boot

Linus Torvalds 5ffe04cc f5ce0466

+17 -9
+2
MAINTAINERS
··· 1576 1576 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 1577 1577 S: Maintained 1578 1578 T: git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git 1579 + L: linux-sunxi@lists.linux.dev 1579 1580 F: arch/arm/mach-sunxi/ 1580 1581 F: arch/arm64/boot/dts/allwinner/ 1581 1582 F: drivers/clk/sunxi-ng/ 1582 1583 F: drivers/pinctrl/sunxi/ 1583 1584 F: drivers/soc/sunxi/ 1585 + N: allwinner 1584 1586 N: sun[x456789]i 1585 1587 N: sun50i 1586 1588
+3
arch/arm/boot/dts/omap3.dtsi
··· 24 24 i2c0 = &i2c1; 25 25 i2c1 = &i2c2; 26 26 i2c2 = &i2c3; 27 + mmc0 = &mmc1; 28 + mmc1 = &mmc2; 29 + mmc2 = &mmc3; 27 30 serial0 = &uart1; 28 31 serial1 = &uart2; 29 32 serial2 = &uart3;
+1 -1
arch/arm/mach-omap2/board-generic.c
··· 33 33 } 34 34 35 35 /* Clocks are needed early, see drivers/clocksource for the rest */ 36 - void __init __maybe_unused omap_init_time_of(void) 36 + static void __init __maybe_unused omap_init_time_of(void) 37 37 { 38 38 omap_clk_init(); 39 39 timer_probe();
+1 -1
arch/arm/mach-omap2/sr_device.c
··· 188 188 189 189 int __init omap_devinit_smartreflex(void) 190 190 { 191 - const char * const *sr_inst; 191 + const char * const *sr_inst = NULL; 192 192 int i, nr_sr = 0; 193 193 194 194 if (soc_is_omap44xx()) {
+4
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
··· 19 19 }; 20 20 }; 21 21 }; 22 + 23 + &mmc0 { 24 + cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 push-push switch */ 25 + };
+1 -1
arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
··· 34 34 vmmc-supply = <&reg_dcdc1>; 35 35 disable-wp; 36 36 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 */ 38 38 status = "okay"; 39 39 }; 40 40
+2 -2
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
··· 995 995 compatible = "allwinner,sun8i-a23-rsb"; 996 996 reg = <0x07083000 0x400>; 997 997 interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; 998 - clocks = <&r_ccu 13>; 998 + clocks = <&r_ccu CLK_R_APB2_RSB>; 999 999 clock-frequency = <3000000>; 1000 - resets = <&r_ccu 7>; 1000 + resets = <&r_ccu RST_R_APB2_RSB>; 1001 1001 pinctrl-names = "default"; 1002 1002 pinctrl-0 = <&r_rsb_pins>; 1003 1003 status = "disabled";
+3
drivers/soc/qcom/qcom-geni-se.c
··· 756 756 int i, err; 757 757 const char *icc_names[] = {"qup-core", "qup-config", icc_ddr}; 758 758 759 + if (has_acpi_companion(se->dev)) 760 + return 0; 761 + 759 762 for (i = 0; i < ARRAY_SIZE(se->icc_paths); i++) { 760 763 if (!icc_names[i]) 761 764 continue;