mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-28 05:12:49 +00:00
Code Issues Releases Wiki Activity

Amlogic Drivers updates for v5.16:

Browse source 
- soc: amlogic: meson-gx-socinfo: Add the SOC ID for the S905Y2 used in the Radxa Zero
 - soc: amlogic: meson-clk-measure/canvas: Make use of devm_platform_ioremap_resource()
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmFev70ACgkQd9zb2sjI
 SdFiXw/+Km5OZ2wpfejVx0maFbNOg8tEYa1nJJhkxX5yTFfxkViSyjSu69w8Uydt
 HqNJDOdy+YJsxVUsC/HMBwe0D5x7/V+sVkmEH0eV56EtpJ71s286uLXMlwX2Bwv4
 3fPN2Mzmsd08Nkk++LbVIUjC5bY0NO25QiytDmS5/VKqnKSJyK0jRHHYlWkWbTKR
 7V3Xm4Kvfp4/LS1j99/gVLCnsp4fIN90lbGDBcZfRV905J1HvNU6pZClqhHaaoOa
 UyWNxQH/c0MUDOO35IQVZvaynxosSVaI2f6Sca1LIAPmlPU2axJ0oaN7Tgzsfrg4
 ZVNDQTpqOTiBfbBF2HPP7rm1b6YhwjXK4v2HVgaXcBP1my+QKa0L1hQ+1F5guYy1
 l94QHPgjXjKIL00VmmorOA01g8DLIQKYdImqTs0HITdFPaI8vqdv5KnbGmWLAZuq
 B17Q4q2t4fxFeT7qMfdNsN9zNzPyyiZSAU254kNAxtzfExCI1XQtREGuBOGpu1jK
 0Nnyz2XXf4KmwAYSsU+KJbkN/MLZl/UxcAOD0UU0it9bkOb4bD2/cStZ7pbBJMR8
 lELV1ebZDjQVgDgWNQhuo98D0kBDG2mXaGiLxKMvUdmWtBbIifyctmFbHeRWlVZd
 dSyQc4BL+ciGBcmtsHprCECPSDyDloRR1bhvITBHYhdBp3XyjgM=
 =hK3p
 -----END PGP SIGNATURE-----

Merge tag 'amlogic-drivers-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/drivers

Amlogic Drivers updates for v5.16:

Minor cleanups, and the addition of the S905Y2 SoC ID

* tag 'amlogic-drivers-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  soc: amlogic: meson-clk-measure: Make use of the helper function devm_platform_ioremap_resource()
  soc: amlogic: canvas: Make use of the helper function devm_platform_ioremap_resource()
  soc: amlogic: meson-gx-socinfo: Add S905Y2 ID for Radxa Zero

Link: https://lore.kernel.org/r/f8e020d3-29f7-0745-3864-01975edd20f7@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-10-11 10:31:10 +02:00
commit 8855761890
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/soc/amlogic/meson-canvas.c
View file

@ -168,7 +168,6 @@ EXPORT_SYMBOL_GPL(meson_canvas_free);
static int meson_canvas_probe(struct platform_device *pdev)
{
struct resource *res;
struct meson_canvas *canvas;
struct device *dev = &pdev->dev;
@ -176,8 +175,7 @@ static int meson_canvas_probe(struct platform_device *pdev)
if (!canvas)
return -ENOMEM;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
canvas->reg_base = devm_ioremap_resource(dev, res);
canvas->reg_base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(canvas->reg_base))
return PTR_ERR(canvas->reg_base);

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

@ -606,7 +606,6 @@ static int meson_msr_probe(struct platform_device *pdev)
{
const struct meson_msr_id *match_data;
struct meson_msr *priv;
struct resource *res;
struct dentry *root, *clks;
void __iomem *base;
int i;
@ -624,8 +623,7 @@ static int meson_msr_probe(struct platform_device *pdev)
memcpy(priv->msr_table, match_data, sizeof(priv->msr_table));
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
base = devm_ioremap_resource(&pdev->dev, res);
base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(base))
return PTR_ERR(base);

1
drivers/soc/amlogic/meson-gx-socinfo.c
View file

@ -65,6 +65,7 @@ static const struct meson_gx_package_id {
{ "A113X", 0x25, 0x37, 0xff },
{ "A113D", 0x25, 0x22, 0xff },
{ "S905D2", 0x28, 0x10, 0xf0 },
{ "S905Y2", 0x28, 0x30, 0xf0 },
{ "S905X2", 0x28, 0x40, 0xf0 },
{ "A311D", 0x29, 0x10, 0xf0 },
{ "S922X", 0x29, 0x40, 0xf0 },