UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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()
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmC0kP8ACgkQd9zb2sjI
 SdHINRAAl/YoblNGN8pbVjICgaPA+vwKJHcI6iHr6Fp3ErXpmqSRKQsLPYpfx6LO
 HdqItR02fL8KbGjazRVldowy1yd+XWlXaZzqilX92ICyTIVHW/oh9IqpR9PBF718
 e+x9BYDqMxJDj2qc7h3KjbHOYXneXrScd8NchWxI6PjI11+294jQHJ0kOYJeDYQB
 JRIsJq2BsxoUpncodT0GK6FRnDpqIxFTUrKa3Rs7yKSQRaw+XTO7KTFXwDQTTgE8
 YuY47If4UVM+qWBZbP3qAmazxPpBj2NR/zecK8w07A3470vVA9NvB5pdLkK4I9Ax
 qWg8L+uq6CbndYOfNAOGHC420LmVa+95oiN/5/iakXvBCKRhmLLZ230nM08vJxqb
 USLGAEBRx9w/x1y/N3jqE27TyQo4mYWJbeAiXniu3t4M7+o16hpocKVgH8pFMlV7
 hHvj8X+8F8dCeYUtTAY2h/upOVXgYsX9D15NsJCg5uJW+mQ4qW/5XvCuFFstfrlL
 XauNUNyyYLOWlmrvRcoSivCmykBBgkCx5vGydlwZIPf/wa1/tJ0VINxOC2qlGj/l
 rX2BUoLUx0hUoDsmnPxLQGn4ArONhpNwySFTZavnG2fKMO0p2VOluvoLkw+ovepm
 iToxEKU/c0CHLfx74MEqAmiK+K3/EM6RX4EodX4ZdshpRJYojcI=
 =z6p+
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2021-06-05 15:39:22 -07:00
parent 3a2d3ae067 4cce442ffe
commit 3091a9e742
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm64/Kconfig.platforms
View File

@ -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

4
drivers/soc/amlogic/meson-clk-measure.c
View File

@ -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);