Skip to content

Commit 73c7bcd

Browse files
committed
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>
2 parents c755ad9 + 0310b5a commit 73c7bcd

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
reg_sd1_vmmc: regulator-sd1-vmmc {
3939
compatible = "regulator-gpio";
40-
gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>;
40+
gpios = <&gpio5 9 GPIO_ACTIVE_HIGH>;
4141
pinctrl-names = "default";
4242
pinctrl-0 = <&pinctrl_snvs_reg_sd>;
4343
regulator-always-on;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
6060
rohm,reset-snvs-powered;
6161

62+
#clock-cells = <0>;
63+
clocks = <&osc_32k 0>;
64+
clock-output-names = "clk-32k-out";
65+
6266
regulators {
6367
buck1_reg: BUCK1 {
6468
regulator-name = "buck1";

drivers/bus/imx-weim.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ static int of_weim_notify(struct notifier_block *nb, unsigned long action,
369369
return ret;
370370
}
371371

372-
struct notifier_block weim_of_notifier = {
372+
static struct notifier_block weim_of_notifier = {
373373
.notifier_call = of_weim_notify,
374374
};
375375
#endif /* IS_ENABLED(CONFIG_OF_DYNAMIC) */

0 commit comments

Comments
 (0)