Unverified Commit eb865fd2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-6.6-soc' of... 

Merge tag 'tegra-for-6.6-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/drivers

soc/tegra: Changes for v6.6-rc1

This contains a selection of minor cleanups.

* tag 'tegra-for-6.6-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  soc/tegra: cbb: Remove unnecessary print function dev_err()
  soc/tegra: fuse: Sort includes alphabetically
  bus: tegra-gmi: Convert to devm_platform_ioremap_resource()
  soc/tegra: fuse: Use devm_platform_get_and_ioremap_resource()
  soc/tegra: Explicitly include correct DT includes

Link: https://lore.kernel.org/r/20230728094129.3587109-1-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5ac1ba05 10f975f8

drivers/bus/tegra-gmi.c

+1 −3
Original line number Diff line number Diff line
@@ -211,7 +211,6 @@ static int tegra_gmi_probe(struct platform_device *pdev) 
{

	struct device *dev = &pdev->dev;

	struct tegra_gmi *gmi;

	struct resource *res;

	int err;



	gmi = devm_kzalloc(dev, sizeof(*gmi), GFP_KERNEL);
@@ -221,8 +220,7 @@ static int tegra_gmi_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, gmi);

	gmi->dev = dev;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	gmi->base = devm_ioremap_resource(dev, res);

	gmi->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(gmi->base))

		return PTR_ERR(gmi->base);

drivers/soc/tegra/cbb/tegra-cbb.c

+2 −10
Original line number Diff line number Diff line
@@ -7,13 +7,9 @@ 
#include <linux/cpufeature.h>

#include <linux/debugfs.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/device.h>

#include <linux/io.h>

#include <linux/of_irq.h>

#include <linux/of_address.h>

#include <linux/interrupt.h>

#include <linux/ioport.h>

#include <soc/tegra/fuse.h>
@@ -126,20 +122,16 @@ int tegra_cbb_get_irq(struct platform_device *pdev, unsigned int *nonsec_irq, 


	if (num_intr == 2) {

		irq = platform_get_irq(pdev, index);

		if (irq <= 0) {

			dev_err(&pdev->dev, "failed to get non-secure IRQ: %d\n", irq);

		if (irq <= 0)

			return -ENOENT;

		}



		*nonsec_irq = irq;

		index++;

	}



	irq = platform_get_irq(pdev, index);

	if (irq <= 0) {

		dev_err(&pdev->dev, "failed to get secure IRQ: %d\n", irq);

	if (irq <= 0)

		return -ENOENT;

	}



	*sec_irq = irq;

drivers/soc/tegra/cbb/tegra194-cbb.c

+1 −3
Original line number Diff line number Diff line
@@ -15,12 +15,10 @@ 
#include <linux/debugfs.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_address.h>

#include <linux/platform_device.h>

#include <linux/device.h>

#include <linux/io.h>

#include <linux/of_irq.h>

#include <linux/of_address.h>

#include <linux/interrupt.h>

#include <linux/ioport.h>

#include <soc/tegra/fuse.h>

drivers/soc/tegra/cbb/tegra234-cbb.c

+0 −3
Original line number Diff line number Diff line
@@ -16,12 +16,9 @@ 
#include <linux/debugfs.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/device.h>

#include <linux/io.h>

#include <linux/of_irq.h>

#include <linux/of_address.h>

#include <linux/interrupt.h>

#include <linux/ioport.h>

#include <soc/tegra/fuse.h>

drivers/soc/tegra/fuse/fuse-tegra.c

+3 −6
Original line number Diff line number Diff line
@@ -125,13 +125,10 @@ static int tegra_fuse_probe(struct platform_device *pdev) 
		return err;



	/* take over the memory region from the early initialization */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	fuse->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);

	if (IS_ERR(fuse->base))

		return PTR_ERR(fuse->base);

	fuse->phys = res->start;

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

	if (IS_ERR(fuse->base)) {

		err = PTR_ERR(fuse->base);

		return err;

	}



	fuse->clk = devm_clk_get(&pdev->dev, "fuse");

	if (IS_ERR(fuse->clk)) {