mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-10 15:19:51 +00:00
soc/tegra: Changes for v6.6-rc1
This contains a selection of minor cleanups. -----BEGIN PGP SIGNATURE----- iQJHBAABCAAxFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAmTDhmsTHHRyZWRpbmdA bnZpZGlhLmNvbQAKCRDdI6zXfz6zoVUiD/9FRZ1Izpk02X831LM/ySo7hnRzHZre 9U97FggBLultHQ1MUBNscx3fUruLKCXKLB0qL0IMwzOiIaEFhgteQiiPewpZSYbu l+sln07g5QmBHEtTUQYxtYAmUmWAQbaK1nNxFNUN6VSI4u6Ls41hAK+doy3zGpTc IaSwJr7QNHFOcwzZ37oiFbM2or/q5TXcgSvlcS7q86W4UFJ3DAB5Xg0GuZ/ElM3j Zh/OiSOvOtT/DGkB3LgS02V0HVMQyilwnIJvCLrfInMjNo8Z4equOXj8vQDwjd8m VGYKk0JJ66J7O27XDOVjqNSi05ElxIuQU6qPcKPRfbGwG5NhaxKlGs64UpDsutXs UJ1stIBfQfP8n1jRcKett8G2g0FkezBIXSX/u2d+tPOXBANuYhjGIzGypEA1mzBt HrJhtATJR8DLnYsmjEzDgjYF1dS+7YqtMi81nTerMhHBvPb94E48sSd/vcUs1Hyq yamkT2FfRGRmwxKNSTXxwf06Bi6/nn6oJXZGpWu88wnbUUcvrTG7lZNun5y0Ggi0 Ju6Q1AMK7/Km/ZE7ulbgNyOkyqc2Di14W9pIv8P3V0QqDUCal9AUIJBwJNZNZVwb R0r0ddwkON05JQyj0kqylLqgsHZSfwPEZYgsdXikfaFG6AXPGs8EKmWyZJL3dUuP 6Zlv0fPCQBYCZg== =+oTD -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmTXWI8ACgkQYKtH/8kJ UiddlRAAsFU3c5WrrlM9opjFznw9C4J6RkX+NtVsHHDfEVi+HDj4bl4gU2zvs4A3 QAV3IH/YBJQa/0T5ORnn9Qs7GYXGoXrSKAk+rwc0AkMjc1NfN0fG/24zRE4LHqnv AlJlOUoWnLlQ05iT0g30UWgI7PQMDUYdkA2ASBXMpIrETdqibEhv7KUIcF+ud7DO i1VpfYPozu6mc1w0yl6Kte01L5bgvwfEN18COCsXnvFMLEX4n1NzLBAeFbQnrJT7 Fkz9PP8OONu0zGrNKmEie7+LcDWPZJGdh/llthnlOLYzymeHbZXdiibkCL2Y/D3S q1Yz1pHSfW03ij2YMpCbbijmxS3J+Xee9EL8iV81LlUmeKcnD4tOYgQ7f4QAIHHl /d9HgucS7oXAUZJPT8Ly6gGJClisVFGR73e9zI1JX2VH1FOMsNS8VEYbqIMtWk+p /qwCFwlHF0PFV7z1byoVyredmKLykkxWXLe3LjqPEtzwZc40A9ugEE1+ldo/YaG9 io6Hn4SL3ZjdOYLgOYgHxGxlbalDYndZjexTklNlnQXEYZFVUvDqHf6Slr3q0Jw8 JFdJQHUucRb329MPtpGBR7skFaG3zgX952lxLTgh3O///TCN2W7zBp9NpRaknFvn k2F/WvqVUn6F7wGhINK35ZFBvR/lSlWh47MNetTLAOwhyW+qUUs= =toF6 -----END PGP SIGNATURE----- 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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
eb865fd2fd
@ -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);
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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)) {
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include <linux/io.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/kobject.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
#include <linux/random.h>
|
||||
|
@ -10,8 +10,6 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/nvmem-consumer.h>
|
||||
#include <linux/nvmem-provider.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
#include <linux/random.h>
|
||||
|
@ -4,13 +4,13 @@
|
||||
*/
|
||||
|
||||
#include <linux/export.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
#include <soc/tegra/fuse.h>
|
||||
#include <soc/tegra/common.h>
|
||||
#include <soc/tegra/fuse.h>
|
||||
|
||||
#include "fuse.h"
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user