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

Merge tag 'imx-fixes-5.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes

i.MX fixes for 5.18, 2nd round:

- Fix one sparse warning on imx-weim driver.
- Fix vqmmc regulator to get UHS-I mode work on imx6ull-colibri board.
- Add missing 32.768 kHz PMIC clock for imx8mn-ddr4-evk board to fix
bd718xx-clk probe error.

* tag 'imx-fixes-5.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
arm64: dts: imx8mn-ddr4-evk: Describe the 32.768 kHz PMIC clock
ARM: dts: imx6ull-colibri: fix vqmmc regulator
bus: imx-weim: make symbol 'weim_of_notifier' static

Link: https://lore.kernel.org/r/20220426013427.GB14615@dragon
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+6 -2
+1 -1
arch/arm/boot/dts/imx6ull-colibri.dtsi
··· 37 37 38 38 reg_sd1_vmmc: regulator-sd1-vmmc { 39 39 compatible = "regulator-gpio"; 40 - gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>; 40 + gpios = <&gpio5 9 GPIO_ACTIVE_HIGH>; 41 41 pinctrl-names = "default"; 42 42 pinctrl-0 = <&pinctrl_snvs_reg_sd>; 43 43 regulator-always-on;
+4
arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts
··· 59 59 interrupts = <3 IRQ_TYPE_LEVEL_LOW>; 60 60 rohm,reset-snvs-powered; 61 61 62 + #clock-cells = <0>; 63 + clocks = <&osc_32k 0>; 64 + clock-output-names = "clk-32k-out"; 65 + 62 66 regulators { 63 67 buck1_reg: BUCK1 { 64 68 regulator-name = "buck1";
+1 -1
drivers/bus/imx-weim.c
··· 369 369 return ret; 370 370 } 371 371 372 - struct notifier_block weim_of_notifier = { 372 + static struct notifier_block weim_of_notifier = { 373 373 .notifier_call = of_weim_notify, 374 374 }; 375 375 #endif /* IS_ENABLED(CONFIG_OF_DYNAMIC) */