Unverified Commit 416e95a4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-fixes-5.19' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents b262b3b5 c4c79525

arch/arm/mach-exynos/exynos.c

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ static void exynos_map_pmu(void) 
	np = of_find_matching_node(NULL, exynos_dt_pmu_match);

	if (np)

		pmu_base_addr = of_iomap(np, 0);

	of_node_put(np);

}



static void __init exynos_init_irq(void)

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

+6 −6
Original line number Diff line number Diff line
@@ -280,8 +280,8 @@ 
			interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;

			pinctrl-names = "default";

			pinctrl-0 = <&uart0_bus>;

			clocks = <&cmu_peri CLK_GOUT_UART0_EXT_UCLK>,

				 <&cmu_peri CLK_GOUT_UART0_PCLK>;

			clocks = <&cmu_peri CLK_GOUT_UART0_PCLK>,

				 <&cmu_peri CLK_GOUT_UART0_EXT_UCLK>;

			clock-names = "uart", "clk_uart_baud0";

			samsung,uart-fifosize = <64>;

			status = "disabled";
@@ -293,8 +293,8 @@ 
			interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;

			pinctrl-names = "default";

			pinctrl-0 = <&uart1_bus>;

			clocks = <&cmu_peri CLK_GOUT_UART1_EXT_UCLK>,

				 <&cmu_peri CLK_GOUT_UART1_PCLK>;

			clocks = <&cmu_peri CLK_GOUT_UART1_PCLK>,

				 <&cmu_peri CLK_GOUT_UART1_EXT_UCLK>;

			clock-names = "uart", "clk_uart_baud0";

			samsung,uart-fifosize = <256>;

			status = "disabled";
@@ -306,8 +306,8 @@ 
			interrupts = <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>;

			pinctrl-names = "default";

			pinctrl-0 = <&uart2_bus>;

			clocks = <&cmu_peri CLK_GOUT_UART2_EXT_UCLK>,

				 <&cmu_peri CLK_GOUT_UART2_PCLK>;

			clocks = <&cmu_peri CLK_GOUT_UART2_PCLK>,

				 <&cmu_peri CLK_GOUT_UART2_EXT_UCLK>;

			clock-names = "uart", "clk_uart_baud0";

			samsung,uart-fifosize = <256>;

			status = "disabled";