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-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull SoC fixes from Arnd Bergmann:
"There are seven oneline patches that each address a distinct problem
on the NXP i.MX platform, mostly the popular i.MX8M variant.

The only other two fixes are for error handling on the psci firmware
driver and SD card support on the milkv duo riscv board"

* tag 'arm-fixes-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
firmware: psci: Fix return value from psci_system_suspend()
riscv: dts: sophgo: disable write-protection for milkv duo
arm64: dts: imx8qm-mek: fix gpio number for reg_usdhc2_vmmc
arm64: dts: freescale: imx8mm-verdin: enable hysteresis on slow input pin
arm64: dts: imx93-11x11-evk: Remove the 'no-sdio' property
arm64: dts: freescale: imx8mp-venice-gw73xx-2x: fix BT shutdown GPIO
arm: dts: imx53-qsb-hdmi: Disable panel instead of deleting node
arm64: dts: imx8mp: Fix TC9595 input clock on DH i.MX8M Plus DHCOM SoM
arm64: dts: freescale: imx8mm-verdin: Fix GPU speed

Linus Torvalds 56bf7334 d4ba3313

+14 -9
+1 -1
arch/arm/boot/dts/nxp/imx/imx53-qsb-common.dtsi
··· 85 85 }; 86 86 }; 87 87 88 - panel { 88 + panel_dpi: panel { 89 89 compatible = "sii,43wvf1g"; 90 90 pinctrl-names = "default"; 91 91 pinctrl-0 = <&pinctrl_display_power>;
+4 -2
arch/arm/boot/dts/nxp/imx/imx53-qsb-hdmi.dtso
··· 10 10 /plugin/; 11 11 12 12 &{/} { 13 - /delete-node/ panel; 14 - 15 13 hdmi: connector-hdmi { 16 14 compatible = "hdmi-connector"; 17 15 label = "hdmi"; ··· 78 80 }; 79 81 }; 80 82 }; 83 + }; 84 + 85 + &panel_dpi { 86 + status = "disabled"; 81 87 }; 82 88 83 89 &tve {
+2 -1
arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi
··· 6 6 #include <dt-bindings/phy/phy-imx8-pcie.h> 7 7 #include <dt-bindings/pwm/pwm.h> 8 8 #include "imx8mm.dtsi" 9 + #include "imx8mm-overdrive.dtsi" 9 10 10 11 / { 11 12 chosen { ··· 936 935 /* Verdin GPIO_9_DSI (pulled-up as active-low) */ 937 936 pinctrl_gpio_9_dsi: gpio9dsigrp { 938 937 fsl,pins = 939 - <MX8MM_IOMUXC_NAND_RE_B_GPIO3_IO15 0x146>; /* SODIMM 17 */ 938 + <MX8MM_IOMUXC_NAND_RE_B_GPIO3_IO15 0x1c6>; /* SODIMM 17 */ 940 939 }; 941 940 942 941 /* Verdin GPIO_10_DSI (pulled-up as active-low) */
+1 -1
arch/arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi
··· 254 254 <&clk IMX8MP_CLK_CLKOUT2>, 255 255 <&clk IMX8MP_AUDIO_PLL2_OUT>; 256 256 assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL2_OUT>; 257 - assigned-clock-rates = <13000000>, <13000000>, <156000000>; 257 + assigned-clock-rates = <13000000>, <13000000>, <208000000>; 258 258 reset-gpios = <&gpio4 1 GPIO_ACTIVE_HIGH>; 259 259 status = "disabled"; 260 260
+1 -1
arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi
··· 219 219 220 220 bluetooth { 221 221 compatible = "brcm,bcm4330-bt"; 222 - shutdown-gpios = <&gpio4 16 GPIO_ACTIVE_HIGH>; 222 + shutdown-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; 223 223 }; 224 224 }; 225 225
+1 -1
arch/arm64/boot/dts/freescale/imx8qm-mek.dts
··· 36 36 regulator-name = "SD1_SPWR"; 37 37 regulator-min-microvolt = <3000000>; 38 38 regulator-max-microvolt = <3000000>; 39 - gpio = <&lsio_gpio4 19 GPIO_ACTIVE_HIGH>; 39 + gpio = <&lsio_gpio4 7 GPIO_ACTIVE_HIGH>; 40 40 enable-active-high; 41 41 }; 42 42
-1
arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts
··· 296 296 vmmc-supply = <&reg_usdhc2_vmmc>; 297 297 bus-width = <4>; 298 298 status = "okay"; 299 - no-sdio; 300 299 no-mmc; 301 300 }; 302 301
+1
arch/riscv/boot/dts/sophgo/cv1800b-milkv-duo.dts
··· 45 45 no-1-8-v; 46 46 no-mmc; 47 47 no-sdio; 48 + disable-wp; 48 49 }; 49 50 50 51 &uart0 {
+3 -1
drivers/firmware/psci/psci.c
··· 497 497 498 498 static int psci_system_suspend(unsigned long unused) 499 499 { 500 + int err; 500 501 phys_addr_t pa_cpu_resume = __pa_symbol(cpu_resume); 501 502 502 - return invoke_psci_fn(PSCI_FN_NATIVE(1_0, SYSTEM_SUSPEND), 503 + err = invoke_psci_fn(PSCI_FN_NATIVE(1_0, SYSTEM_SUSPEND), 503 504 pa_cpu_resume, 0, 0); 505 + return psci_to_linux_errno(err); 504 506 } 505 507 506 508 static int psci_system_suspend_enter(suspend_state_t state)