Skip to content

Commit 416e95a

Browse files
committed
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>
2 parents b262b3b + c4c7952 commit 416e95a

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

arch/arm/mach-exynos/exynos.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ static void exynos_map_pmu(void)
149149
np = of_find_matching_node(NULL, exynos_dt_pmu_match);
150150
if (np)
151151
pmu_base_addr = of_iomap(np, 0);
152+
of_node_put(np);
152153
}
153154

154155
static void __init exynos_init_irq(void)

arch/arm64/boot/dts/exynos/exynos7885.dtsi

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,8 @@
280280
interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
281281
pinctrl-names = "default";
282282
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>;
285285
clock-names = "uart", "clk_uart_baud0";
286286
samsung,uart-fifosize = <64>;
287287
status = "disabled";
@@ -293,8 +293,8 @@
293293
interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
294294
pinctrl-names = "default";
295295
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>;
298298
clock-names = "uart", "clk_uart_baud0";
299299
samsung,uart-fifosize = <256>;
300300
status = "disabled";
@@ -306,8 +306,8 @@
306306
interrupts = <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>;
307307
pinctrl-names = "default";
308308
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>;
311311
clock-names = "uart", "clk_uart_baud0";
312312
samsung,uart-fifosize = <256>;
313313
status = "disabled";

0 commit comments

Comments
 (0)