Commit 3091a9e7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'amlogic-fixes-v5.13-rc1' of... 

Merge tag 'amlogic-fixes-v5.13-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/fixes

Amlogic fixes for v5.13-rc1
- arm64: meson: select COMMON_CLK to select a proper implementation of the clock API
- soc: amlogic: meson-clk-measure: remove redundant dev_err call in meson_msr_probe()

* tag 'amlogic-fixes-v5.13-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  arm64: meson: select COMMON_CLK
  soc: amlogic: meson-clk-measure: remove redundant dev_err call in meson_msr_probe()

Link: https://lore.kernel.org/r/73e76706-f3f4-bebf-10dd-d2ec9106a234@baylibre.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3a2d3ae0 4cce442f

arch/arm64/Kconfig.platforms

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ config ARCH_MEDIATEK 


config ARCH_MESON

	bool "Amlogic Platforms"

	select COMMON_CLK

	select MESON_IRQ_GPIO

	help

	  This enables support for the arm64 based Amlogic SoCs

drivers/soc/amlogic/meson-clk-measure.c

+1 −3
Original line number Diff line number Diff line
@@ -626,10 +626,8 @@ static int meson_msr_probe(struct platform_device *pdev) 


	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(base)) {

		dev_err(&pdev->dev, "io resource mapping failed\n");

	if (IS_ERR(base))

		return PTR_ERR(base);

	}



	priv->regmap = devm_regmap_init_mmio(&pdev->dev, base,

					     &meson_clk_msr_regmap_config);