Unverified Commit 547d67a9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

soc/tegra: Changes for v6.4-rc1

Contains various minor cleanups and fixes as well as support for several
more wake events on Tegra234.

* tag 'tegra-for-6.4-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  soc/tegra: fuse: Remove nvmem root only access
  soc/tegra: cbb: tegra194: Use of_address_count() helper
  soc/tegra: cbb: Remove MODULE_LICENSE in non-modules
  soc/tegra: flowctrl: Use devm_platform_get_and_ioremap_resource()
  soc: tegra: cbb: Drop empty platform remove function
  soc/tegra: pmc: Support software wake-up for SPE
  soc/tegra: pmc: Add wake source interrupt for MGBE
  soc/tegra: pmc: Add the PMIC wake event for Tegra234
  soc/tegra: bpmp: Actually free memory on error path
  soc/tegra: cbb: remove linux/version.h

Link: https://lore.kernel.org/r/20230406124804.970394-2-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents fceb6ba1 821d96e3

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

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/of_address.h>

#include <linux/interrupt.h>

#include <linux/ioport.h>

#include <linux/version.h>

#include <soc/tegra/fuse.h>

#include <soc/tegra/tegra-cbb.h>

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

+1 −5
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/of_address.h>

#include <linux/interrupt.h>

#include <linux/ioport.h>

#include <linux/version.h>

#include <soc/tegra/fuse.h>

#include <soc/tegra/tegra-cbb.h>
@@ -2191,7 +2190,6 @@ MODULE_DEVICE_TABLE(of, tegra194_cbb_match); 
static int tegra194_cbb_get_bridges(struct tegra194_cbb *cbb, struct device_node *np)

{

	struct tegra_cbb *entry;

	struct resource res;

	unsigned long flags;

	unsigned int i;

	int err;
@@ -2211,8 +2209,7 @@ static int tegra194_cbb_get_bridges(struct tegra194_cbb *cbb, struct device_node 
	spin_unlock_irqrestore(&cbb_lock, flags);



	if (!cbb->bridges) {

		while (of_address_to_resource(np, cbb->num_bridges, &res) == 0)

			cbb->num_bridges++;

		cbb->num_bridges = of_address_count(np);



		cbb->bridges = devm_kcalloc(cbb->base.dev, cbb->num_bridges,

					    sizeof(*cbb->bridges), GFP_KERNEL);
@@ -2359,4 +2356,3 @@ module_exit(tegra194_cbb_exit); 


MODULE_AUTHOR("Sumit Gupta <sumitg@nvidia.com>");

MODULE_DESCRIPTION("Control Backbone error handling driver for Tegra194");
 
MODULE_LICENSE("GPL");

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

+0 −8
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <linux/of_address.h>

#include <linux/interrupt.h>

#include <linux/ioport.h>

#include <linux/version.h>

#include <soc/tegra/fuse.h>

#include <soc/tegra/tegra-cbb.h>
@@ -1174,11 +1173,6 @@ static int tegra234_cbb_probe(struct platform_device *pdev) 
	return tegra_cbb_register(&cbb->base);

}



static int tegra234_cbb_remove(struct platform_device *pdev)

{

	return 0;

}



static int __maybe_unused tegra234_cbb_resume_noirq(struct device *dev)

{

	struct tegra234_cbb *cbb = dev_get_drvdata(dev);
@@ -1196,7 +1190,6 @@ static const struct dev_pm_ops tegra234_cbb_pm = { 


static struct platform_driver tegra234_cbb_driver = {

	.probe = tegra234_cbb_probe,

	.remove = tegra234_cbb_remove,

	.driver = {

		.name = "tegra234-cbb",

		.of_match_table = tegra234_cbb_dt_ids,
@@ -1218,4 +1211,3 @@ static void __exit tegra234_cbb_exit(void) 
module_exit(tegra234_cbb_exit);



MODULE_DESCRIPTION("Control Backbone 2.0 error handling driver for Tegra234");
 
MODULE_LICENSE("GPL");

drivers/soc/tegra/flowctrl.c

+1 −3
Original line number Diff line number Diff line
@@ -156,10 +156,8 @@ void flowctrl_cpu_suspend_exit(unsigned int cpuid) 
static int tegra_flowctrl_probe(struct platform_device *pdev)

{

	void __iomem *base = tegra_flowctrl_base;

	struct resource *res;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

	tegra_flowctrl_base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);

	if (IS_ERR(tegra_flowctrl_base))

		return PTR_ERR(tegra_flowctrl_base);

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

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2013-2022, NVIDIA CORPORATION.  All rights reserved.

 * Copyright (c) 2013-2023, NVIDIA CORPORATION.  All rights reserved.

 */



#include <linux/clk.h>
@@ -166,7 +166,7 @@ static int tegra_fuse_probe(struct platform_device *pdev) 
	nvmem.nkeepout = fuse->soc->num_keepouts;

	nvmem.type = NVMEM_TYPE_OTP;

	nvmem.read_only = true;

	nvmem.root_only = true;

	nvmem.root_only = false;

	nvmem.reg_read = tegra_fuse_read;

	nvmem.size = fuse->soc->info->size;

	nvmem.word_size = 4;