From: Linus Torvalds Date: Sat, 5 Aug 2023 02:35:09 +0000 (-0700) Subject: Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: microblaze-v6.8~797 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=c9d26d8de10f7c4decd10b6e75f5593c11ff9dfc;p=linux-2.6-microblaze.git Merge tag 'clk-fixes-for-linus' of git://git./linux/kernel/git/clk/linux Pull clk fixes from Stephen Boyd: "A few clk driver fixes for some SoC clk drivers: - Change a usleep() to udelay() to avoid scheduling while atomic in the Amlogic PLL code - Revert a patch to the Mediatek MT8183 driver that caused an out-of-bounds write - Return the right error value when devm_of_iomap() fails in imx93_clocks_probe() - Constrain the Kconfig for the fixed mmio clk so that it depends on HAS_IOMEM and can't be compiled on architectures such as s390" * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: clk: fixed-mmio: make COMMON_CLK_FIXED_MMIO depend on HAS_IOMEM clk: imx93: Propagate correct error in imx93_clocks_probe() clk: mediatek: mt8183: Add back SSPM related clocks clk: meson: change usleep_range() to udelay() for atomic context --- c9d26d8de10f7c4decd10b6e75f5593c11ff9dfc