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

Merge tag 'omap-for-v6.14/soc-signed' of... 

Merge tag 'omap-for-v6.14/soc-signed' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/arm

soc: omap: minor updates for v6.14

* tag 'omap-for-v6.14/soc-signed' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap:
  ARM: omap1: Fix up the Retu IRQ on Nokia 770
  ARM: omap2plus_defconfig: enable charger of TWL603X
  ARM: OMAP2+: Fix a typo

Link: https://lore.kernel.org/r/7hikqqb41a.fsf@baylibre.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents fac04efc ad455e48

arch/arm/configs/omap2plus_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -428,6 +428,7 @@ CONFIG_POWER_RESET_GPIO=y 
CONFIG_BATTERY_BQ27XXX=m

CONFIG_CHARGER_ISP1704=m

CONFIG_CHARGER_TWL4030=m

CONFIG_CHARGER_TWL6030=m

CONFIG_CHARGER_BQ2415X=m

CONFIG_CHARGER_BQ24190=m

CONFIG_CHARGER_BQ24735=m

arch/arm/mach-omap1/board-nokia770.c

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static struct gpiod_lookup_table nokia770_irq_gpio_table = { 
		GPIO_LOOKUP("gpio-0-15", 15, "ads7846_irq",

			    GPIO_ACTIVE_HIGH),

		/* GPIO used for retu IRQ */

		GPIO_LOOKUP("gpio-48-63", 15, "retu_irq",

		GPIO_LOOKUP("gpio-48-63", 14, "retu_irq",

			    GPIO_ACTIVE_HIGH),

		/* GPIO used for tahvo IRQ */

		GPIO_LOOKUP("gpio-32-47", 8, "tahvo_irq",

arch/arm/mach-omap2/powerdomain.c

+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ int pwrdm_get_mem_bank_count(struct powerdomain *pwrdm) 
 * Set the powerdomain @pwrdm's next power state to @pwrst.  The powerdomain

 * may not enter this state immediately if the preconditions for this state

 * have not been satisfied.  Returns -EINVAL if the powerdomain pointer is

 * null or if the power state is invalid for the powerdomin, or returns 0

 * null or if the power state is invalid for the powerdomain, or returns 0

 * upon success.

 */

int pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst)