Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'soc-arm-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC arm platform code updates from Arnd Bergmann:
"The updates here add code for the Microchip SAMA7D65 SoC, as well as
minor bugfixes for OMAP"
* tag 'soc-arm-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
ARM: omap1: Fix up the Retu IRQ on Nokia 770
ARM: omap2plus_defconfig: enable charger of TWL603X
ARM: at91: add new SoC sama7d65
ARM: at91: pm: change BU Power Switch to automatic mode
soc: atmel: fix device_node release in atmel_soc_device_init()
ARM: OMAP2+: Fix a typo
+35
-14
+1
arch/arm/configs/omap2plus_defconfig
+1
arch/arm/configs/omap2plus_defconfig
+11
arch/arm/mach-at91/Kconfig
+11
arch/arm/mach-at91/Kconfig
···
58
58
help
59
59
Select this if you are using one of Microchip's SAMA5D4 family SoC.
60
60
61
+
config SOC_SAMA7D65
62
+
bool "SAMA7D65 family"
63
+
depends on ARCH_MULTI_V7
64
+
select HAVE_AT91_GENERATED_CLK
65
+
select HAVE_AT91_SAM9X60_PLL
66
+
select HAVE_AT91_USB_CLK
67
+
select HAVE_AT91_UTMI
68
+
select SOC_SAMA7
69
+
help
70
+
Select this if you are using one of Microchip's SAMA7D65 family SoC.
71
+
61
72
config SOC_SAMA7G5
62
73
bool "SAMA7G5 family"
63
74
depends on ARCH_MULTI_V7
+20
-11
arch/arm/mach-at91/pm.c
+20
-11
arch/arm/mach-at91/pm.c
···
598
598
return 0;
599
599
}
600
600
601
-
static void at91_pm_switch_ba_to_vbat(void)
601
+
/**
602
+
* at91_pm_switch_ba_to_auto() - Configure Backup Unit Power Switch
603
+
* to automatic/hardware mode.
604
+
*
605
+
* The Backup Unit Power Switch can be managed either by software or hardware.
606
+
* Enabling hardware mode allows the automatic transition of power between
607
+
* VDDANA (or VDDIN33) and VDDBU (or VBAT, respectively), based on the
608
+
* availability of these power sources.
609
+
*
610
+
* If the Backup Unit Power Switch is already in automatic mode, no action is
611
+
* required. If it is in software-controlled mode, it is switched to automatic
612
+
* mode to enhance safety and eliminate the need for toggling between power
613
+
* sources.
614
+
*/
615
+
static void at91_pm_switch_ba_to_auto(void)
602
616
{
603
617
unsigned int offset = offsetof(struct at91_pm_sfrbu_regs, pswbu);
604
618
unsigned int val;
···
623
609
624
610
val = readl(soc_pm.data.sfrbu + offset);
625
611
626
-
/* Already on VBAT. */
627
-
if (!(val & soc_pm.sfrbu_regs.pswbu.state))
612
+
/* Already on auto/hardware. */
613
+
if (!(val & soc_pm.sfrbu_regs.pswbu.ctrl))
628
614
return;
629
615
630
-
val &= ~soc_pm.sfrbu_regs.pswbu.softsw;
631
-
val |= soc_pm.sfrbu_regs.pswbu.key | soc_pm.sfrbu_regs.pswbu.ctrl;
616
+
val &= ~soc_pm.sfrbu_regs.pswbu.ctrl;
617
+
val |= soc_pm.sfrbu_regs.pswbu.key;
632
618
writel(val, soc_pm.data.sfrbu + offset);
633
-
634
-
/* Wait for update. */
635
-
val = readl(soc_pm.data.sfrbu + offset);
636
-
while (val & soc_pm.sfrbu_regs.pswbu.state)
637
-
val = readl(soc_pm.data.sfrbu + offset);
638
619
}
639
620
640
621
static void at91_pm_suspend(suspend_state_t state)
641
622
{
642
623
if (soc_pm.data.mode == AT91_PM_BACKUP) {
643
-
at91_pm_switch_ba_to_vbat();
624
+
at91_pm_switch_ba_to_auto();
644
625
645
626
cpu_suspend(0, at91_suspend_finish);
646
627
+1
-1
arch/arm/mach-omap1/board-nokia770.c
+1
-1
arch/arm/mach-omap1/board-nokia770.c
···
289
289
GPIO_LOOKUP("gpio-0-15", 15, "ads7846_irq",
290
290
GPIO_ACTIVE_HIGH),
291
291
/* GPIO used for retu IRQ */
292
-
GPIO_LOOKUP("gpio-48-63", 15, "retu_irq",
292
+
GPIO_LOOKUP("gpio-48-63", 14, "retu_irq",
293
293
GPIO_ACTIVE_HIGH),
294
294
/* GPIO used for tahvo IRQ */
295
295
GPIO_LOOKUP("gpio-32-47", 8, "tahvo_irq",
+1
-1
arch/arm/mach-omap2/powerdomain.c
+1
-1
arch/arm/mach-omap2/powerdomain.c
···
523
523
* Set the powerdomain @pwrdm's next power state to @pwrst. The powerdomain
524
524
* may not enter this state immediately if the preconditions for this state
525
525
* have not been satisfied. Returns -EINVAL if the powerdomain pointer is
526
-
* null or if the power state is invalid for the powerdomin, or returns 0
526
+
* null or if the power state is invalid for the powerdomain, or returns 0
527
527
* upon success.
528
528
*/
529
529
int pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst)
+1
-1
drivers/soc/atmel/soc.c
+1
-1
drivers/soc/atmel/soc.c