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

Merge tag 'samsung-fixes-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/fixes

Samsung fixes for v5.19

Both fixes are for issues present before v5.19 merge window:
1. Correct UART clocks on Exynos7885. Although the initial, fixed
DTS commit is from v5.18, the issue will be exposed with a upcoming fix
to Exynos7885 clock driver, so we need to correct the DTS earlier.
2. Fix theoretical OF node leak in Exynos machine code.

* tag 'samsung-fixes-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: exynos: Fix refcount leak in exynos_map_pmu
arm64: dts: exynos: Correct UART clocks on Exynos7885

Link: https://lore.kernel.org/r/20220624080423.31427-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 416e95a4 b262b3b5

options
unified split
Changed files
+7 -6
arch
arm
mach-exynos
exynos.c
arm64
boot
dts
exynos
exynos7885.dtsi
+1
arch/arm/mach-exynos/exynos.c
··· 149 149 np = of_find_matching_node(NULL, exynos_dt_pmu_match); 150 150 if (np) 151 151 pmu_base_addr = of_iomap(np, 0); 152 + of_node_put(np); 152 153 } 153 154 154 155 static void __init exynos_init_irq(void)
+6 -6
arch/arm64/boot/dts/exynos/exynos7885.dtsi
··· 280 280 interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>; 281 281 pinctrl-names = "default"; 282 282 pinctrl-0 = <&uart0_bus>; 283 - clocks = <&cmu_peri CLK_GOUT_UART0_EXT_UCLK>, 284 - <&cmu_peri CLK_GOUT_UART0_PCLK>; 283 + clocks = <&cmu_peri CLK_GOUT_UART0_PCLK>, 284 + <&cmu_peri CLK_GOUT_UART0_EXT_UCLK>; 285 285 clock-names = "uart", "clk_uart_baud0"; 286 286 samsung,uart-fifosize = <64>; 287 287 status = "disabled"; ··· 293 293 interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>; 294 294 pinctrl-names = "default"; 295 295 pinctrl-0 = <&uart1_bus>; 296 - clocks = <&cmu_peri CLK_GOUT_UART1_EXT_UCLK>, 297 - <&cmu_peri CLK_GOUT_UART1_PCLK>; 296 + clocks = <&cmu_peri CLK_GOUT_UART1_PCLK>, 297 + <&cmu_peri CLK_GOUT_UART1_EXT_UCLK>; 298 298 clock-names = "uart", "clk_uart_baud0"; 299 299 samsung,uart-fifosize = <256>; 300 300 status = "disabled"; ··· 306 306 interrupts = <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>; 307 307 pinctrl-names = "default"; 308 308 pinctrl-0 = <&uart2_bus>; 309 - clocks = <&cmu_peri CLK_GOUT_UART2_EXT_UCLK>, 310 - <&cmu_peri CLK_GOUT_UART2_PCLK>; 309 + clocks = <&cmu_peri CLK_GOUT_UART2_PCLK>, 310 + <&cmu_peri CLK_GOUT_UART2_EXT_UCLK>; 311 311 clock-names = "uart", "clk_uart_baud0"; 312 312 samsung,uart-fifosize = <256>; 313 313 status = "disabled";