mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 23:27:06 +00:00
Code Issues Releases Wiki Activity

soc/tegra: Changes for v6.1-rc1

Browse source 
This contains an assortment of small fixes and cleanups. One new feature
 is introduced in the form of simple wake events which are needed to wake
 the system from sleep on USB port events.
 -----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCAAxFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAmMkSdoTHHRyZWRpbmdA
 bnZpZGlhLmNvbQAKCRDdI6zXfz6zoRRuD/4nQx1gh1JlXR5Rp+/ER2O2FQp0qWBe
 o55Kbrz+USiuOUy2zJkK/34A+mQIVrMiJmXxU+pHoGDuyzb4po5OFwEoRY+saV3O
 CC0VtVHh7yjfOYa1Y4JPBYPhvlnLi1dT9yRVfBoHyS7SkTwVeoS7b5L/s0Xl5KMq
 L9yO2kLZkhevP2Mu9IQkyXOvS7CJlLeZDIdANLr4Jwv6wvwSXHDqmySpuQKO5pBa
 FUO/r52l0efH/gLw9nRALMeZNdWrqo5HQsHlLeQ1wR3zodkzZBkM+5GtuJIXFGhP
 6GJYYoaBDUz3d/G+PEbPMHZROmTMz5yyc9g+DuR5vxxTdYZdzK4ZHD0cdQNBpanR
 NJoB93mioiVuZa2GZ3qaJqjhcdCOTjtSoRl31dddD+/zQ5p3mhqVH9TDY8RsvE1L
 wSE3N2K6VzePvsfe7kVmF+hvRWUmxJW81bC4O3n+yxGuaAjHdFP516MdvMkV6H+o
 c0SAXM1kAlbb36xFwZoJdZD9FFsXOX3UZVQGVzw0mWdxR6dRMgXyEE2lsRdhfKK1
 XqfqOpa0Z7oWwpTGgrnbFfOFNms2ICNMiT2TSBHTfmzOGB1UY0n6SUvdflihaDmr
 TQjA73573/xQrl1tAJjc27SgDFgjutC+uw1G1n4d7rL5J8ISRtIhjk556xA/lAJk
 mqb3tRogCxcx8w==
 =Ifpc
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmMt0ZQACgkQmmx57+YA
 GNms+xAAwZBxhDZ1OzomOeuvy44XRVJemixvuIJf2ai4ekIh8bSLVOzWB4YGWdnF
 4yYfjzsKgvs2/BlsZfMnqsFrqgRK88+6/ujpurIMueAhpEtmMwmnMAkQUeFg8D9z
 Gb+EpUpMuv9j7HdZqiU0FcfbcRjBRYfVG5KxkcXsKq2M9CCzfzW3P4CDbE1FOYQq
 56prVIClG9dVHsqdyYgHH2hD0k8Ydi2Q1fC9gvDITefS/5JWOW7mqzzNSiEbH9II
 j73V7IF+wL6Uc97ociC7wY0RbgKyaxRh3x/6TQA+6W0Fl9Dfy1DjRp7U8voQNo/J
 IMPNT42j8B5e938RluM24H6bbn/BkNcE+8h86LQ+MqWp1JerkmX64WeKfqofHaSQ
 8iWTglCSpMfqdGynKB1vFtxIf3Kw8YMfvqMKftLiisRVaqT27MNIWay+rC/OeCf/
 oWuP5zfuMKOBeVuBYoyMMyYhb0x43forBzjrDaX0ccg41pNZ+p8sdG8h1yQA1kyE
 CVlS/fDuJe6KEdpXvombk8wdouzgPBqHxYZ5AEstACgDA0TEUqyQF2bnyzJM+0/H
 KgtdktMXCtqeAD4IDv4Ad27kCKOfvdQryUdx42ouSUUgJ0zc5AgaTlMY0tTTVu5p
 8bGoanA32IJtWG3Hh1pFW2gtGUdW61dvBqg7O5dFJ99RyYAZglI=
 =aKjC
 -----END PGP SIGNATURE-----

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

soc/tegra: Changes for v6.1-rc1

This contains an assortment of small fixes and cleanups. One new feature
is introduced in the form of simple wake events which are needed to wake
the system from sleep on USB port events.

* tag 'tegra-for-6.1-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  soc/tegra: pmc: Check device node status property
  soc/tegra: pmc: Use devm_clk_get_optional()
  soc/tegra: fuse: Drop Kconfig dependency on TEGRA20_APB_DMA
  soc/tegra: pmc: Add USB port wake events for Tegra194
  soc/tegra: pmc: Add support for simple wake events
  soc/tegra: pmc: Remove leading space
  soc/tegra: fuse: Add missing of_node_put()
  soc/tegra: fuse: Add missing of_node_put() in tegra_init_fuse()

Link: https://lore.kernel.org/r/20220916101957.1635854-1-thierry.reding@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-09-23 17:32:34 +02:00
commit 3879b6604c
4 changed files with 38 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/soc/tegra/Kconfig
View file

@ -136,7 +136,6 @@ config SOC_TEGRA_FUSE
def_bool y
depends on ARCH_TEGRA
select SOC_BUS
select TEGRA20_APB_DMA if ARCH_TEGRA_2x_SOC
config SOC_TEGRA_FLOWCTRL
bool

1
drivers/soc/tegra/fuse/fuse-tegra.c
View file

@ -568,6 +568,7 @@ static int __init tegra_init_fuse(void)
np = of_find_matching_node(NULL, car_match);
if (np) {
void __iomem *base = of_iomap(np, 0);
of_node_put(np);
if (base) {
tegra_enable_fuse_clk(base);
iounmap(base);

7
drivers/soc/tegra/fuse/tegra-apbmisc.c
View file

@ -182,12 +182,12 @@ void __init tegra_init_apbmisc(void)
*/
if (of_address_to_resource(np, 0, &apbmisc) < 0) {
pr_err("failed to get APBMISC registers\n");
return;
goto put;
}
if (of_address_to_resource(np, 1, &straps) < 0) {
pr_err("failed to get strapping options registers\n");
return;
goto put;
}
}
@ -208,4 +208,7 @@ void __init tegra_init_apbmisc(void)
}
long_ram_code = of_property_read_bool(np, "nvidia,long-ram-code");
put:
of_node_put(np);
}

45
drivers/soc/tegra/pmc.c
View file

@ -296,6 +296,17 @@ struct tegra_wake_event {
} gpio;
};
#define TEGRA_WAKE_SIMPLE(_name, _id) \
{ \
.name = _name, \
.id = _id, \
.irq = 0, \
.gpio = { \
.instance = UINT_MAX, \
.pin = UINT_MAX, \
}, \
}
#define TEGRA_WAKE_IRQ(_name, _id, _irq) \
{ \
.name = _name, \
@ -2239,6 +2250,7 @@ static int tegra_pmc_irq_alloc(struct irq_domain *domain, unsigned int virq,
for (i = 0; i < soc->num_wake_events; i++) {
const struct tegra_wake_event *event = &soc->wake_events[i];
/* IRQ and simple wake events */
if (fwspec->param_count == 2) {
struct irq_fwspec spec;
@ -2251,6 +2263,12 @@ static int tegra_pmc_irq_alloc(struct irq_domain *domain, unsigned int virq,
if (err < 0)
break;
/* simple hierarchies stop at the PMC level */
if (event->irq == 0) {
err = irq_domain_disconnect_hierarchy(domain->parent, virq);
break;
}
spec.fwnode = &pmc->dev->of_node->fwnode;
spec.param_count = 3;
spec.param[0] = GIC_SPI;
@ -2263,6 +2281,7 @@ static int tegra_pmc_irq_alloc(struct irq_domain *domain, unsigned int virq,
break;
}
/* GPIO wake events */
if (fwspec->param_count == 3) {
if (event->gpio.instance != fwspec->param[0] ||
event->gpio.pin != fwspec->param[1])
@ -2274,7 +2293,7 @@ static int tegra_pmc_irq_alloc(struct irq_domain *domain, unsigned int virq,
/* GPIO hierarchies stop at the PMC level */
if (!err && domain->parent)
err = irq_domain_disconnect_hierarchy(domain->parent,
err = irq_domain_disconnect_hierarchy(domain->parent,
virq);
break;
}
@ -2885,17 +2904,10 @@ static int tegra_pmc_probe(struct platform_device *pdev)
pmc->scratch = base;
}
pmc->clk = devm_clk_get(&pdev->dev, "pclk");
if (IS_ERR(pmc->clk)) {
err = PTR_ERR(pmc->clk);
if (err != -ENOENT) {
dev_err(&pdev->dev, "failed to get pclk: %d\n", err);
return err;
}
pmc->clk = NULL;
}
pmc->clk = devm_clk_get_optional(&pdev->dev, "pclk");
if (IS_ERR(pmc->clk))
return dev_err_probe(&pdev->dev, PTR_ERR(pmc->clk),
"failed to get pclk\n");
/*
* PMC should be last resort for restarting since it soft-resets
@ -3757,6 +3769,13 @@ static const struct tegra_wake_event tegra194_wake_events[] = {
TEGRA_WAKE_IRQ("pmu", 24, 209),
TEGRA_WAKE_GPIO("power", 29, 1, TEGRA194_AON_GPIO(EE, 4)),
TEGRA_WAKE_IRQ("rtc", 73, 10),
TEGRA_WAKE_SIMPLE("usb3-port-0", 76),
TEGRA_WAKE_SIMPLE("usb3-port-1", 77),
TEGRA_WAKE_SIMPLE("usb3-port-2-3", 78),
TEGRA_WAKE_SIMPLE("usb2-port-0", 79),
TEGRA_WAKE_SIMPLE("usb2-port-1", 80),
TEGRA_WAKE_SIMPLE("usb2-port-2", 81),
TEGRA_WAKE_SIMPLE("usb2-port-3", 82),
};
static const struct tegra_pmc_soc tegra194_pmc_soc = {
@ -4025,7 +4044,7 @@ static int __init tegra_pmc_early_init(void)
return -ENXIO;
}
if (np) {
if (of_device_is_available(np)) {
pmc->soc = match->data;
if (pmc->soc->maybe_tz_only)