Unverified Commit 73c7bcdc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-5.18-2' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents c755ad98 0310b5aa

arch/arm/boot/dts/imx6ull-colibri.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 


	reg_sd1_vmmc: regulator-sd1-vmmc {

		compatible = "regulator-gpio";

		gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>;

		gpios = <&gpio5 9 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_snvs_reg_sd>;

		regulator-always-on;

arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts

+4 −0
Original line number Diff line number Diff line
@@ -59,6 +59,10 @@ 
		interrupts = <3 IRQ_TYPE_LEVEL_LOW>;

		rohm,reset-snvs-powered;



		#clock-cells = <0>;

		clocks = <&osc_32k 0>;

		clock-output-names = "clk-32k-out";



		regulators {

			buck1_reg: BUCK1 {

				regulator-name = "buck1";

drivers/bus/imx-weim.c

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ static int of_weim_notify(struct notifier_block *nb, unsigned long action, 
	return ret;

}



struct notifier_block weim_of_notifier = {

static struct notifier_block weim_of_notifier = {

	.notifier_call = of_weim_notify,

};

#endif /* IS_ENABLED(CONFIG_OF_DYNAMIC) */