Commit 88557618 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-drivers-for-v5.16' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 61259f9e d54dbe9f

drivers/soc/amlogic/meson-canvas.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

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

+1 −3
Original line number Diff line number Diff line
@@ -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);

drivers/soc/amlogic/meson-gx-socinfo.c

+1 −0
Original line number Diff line number Diff line
@@ -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 },