Commit 6ce076f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm-soc-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC updates from Arnd Bergmann:
 "These are mostly cosmetic changes and minor bugfixes for the SoC
  specific code, across the 32-bit at91, mvebu, davinci, samsung, and
  omap platforms.

  The main notable changes are for the Samsung Exynos platform, which
  sees a rewrite of gpio handling and a change to restore and adds a
  workaround for a problem with cpuidle support"

* tag 'arm-soc-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: socfpga: PM: add missing put_device() call in socfpga_setup_ocram_self_refresh()
  MAINTAINERS: arm/amlogic: add designated reviewers
  ARM: davinci: dm646x-evm: Simplify error handling in 'evm_sw_setup()'
  ARM: davinci: Fix trivial spelling
  ARM: davinci: Replace HTTP links with HTTPS ones
  ARM: s3c24xx: Replace HTTP links with HTTPS ones
  ARM: orion/gpio: Make use of for_each_requested_gpio()
  ARM: at91: Replace HTTP links with HTTPS ones
  ARM: at91: pm: add missing put_device() call in at91_pm_sram_init()
  ARM: rpc: Change blacklist to quirklist in ecode.c file
  ARM: OMAP: Replace HTTP links with HTTPS ones
  ARM: s3c24xx: leds: Convert to use GPIO descriptors
  udc: lpc32xx: mark local function static
  ARM: exynos: MCPM: Restore big.LITTLE cpuidle support
  ARM: exynos: clear L310_AUX_CTRL_FULL_LINE_ZERO in default l2c_aux_val
parents 2f3fbfda a04e84c5

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -1606,6 +1606,9 @@ F: sound/soc/meson/ 














ARM/Amlogic Meson SoC support















M:	Kevin Hilman <khilman@baylibre.com>













R:	Neil Armstrong <narmstrong@baylibre.com>













R:	Jerome Brunet <jbrunet@baylibre.com>













R:	Martin Blumenstingl <martin.blumenstingl@googlemail.com>















L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)















L:	linux-amlogic@lists.infradead.org















S:	Maintained

































arch/arm/boot/dts/da850-evm.dts



+1
−1






























Original line number
Diff line number
Diff line








@@ -2,7 +2,7 @@













/*















 * Device Tree for DA850 EVM board















 *













 * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/













 * Copyright (C) 2012 Texas Instruments Incorporated - https://www.ti.com/















 */















/dts-v1/;















#include "da850.dtsi"

































arch/arm/mach-at91/Makefile.boot



+1
−1






























Original line number
Diff line number
Diff line















# SPDX-License-Identifier: GPL-2.0-only















# Empty file waiting for deletion once Makefile.boot isn't needed any more.















# Patch waits for application at













# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 .












# https://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 .
























arch/arm/mach-at91/pm.c



+8
−3






























Original line number
Diff line number
Diff line








@@ -592,13 +592,13 @@ static void __init at91_pm_sram_init(void)













	sram_pool = gen_pool_get(&pdev->dev, NULL);















	if (!sram_pool) {















		pr_warn("%s: sram pool unavailable!\n", __func__);













		return;













		goto out_put_device;















	}































	sram_base = gen_pool_alloc(sram_pool, at91_pm_suspend_in_sram_sz);















	if (!sram_base) {















		pr_warn("%s: unable to alloc sram!\n", __func__);













		return;













		goto out_put_device;















	}































	sram_pbase = gen_pool_virt_to_phys(sram_pool, sram_base);









@@ -606,12 +606,17 @@ static void __init at91_pm_sram_init(void)













					at91_pm_suspend_in_sram_sz, false);















	if (!at91_suspend_sram_fn) {















		pr_warn("SRAM: Could not map\n");













		return;













		goto out_put_device;















	}































	/* Copy the pm suspend handler to SRAM */















	at91_suspend_sram_fn = fncpy(at91_suspend_sram_fn,















			&at91_pm_suspend_in_sram, at91_pm_suspend_in_sram_sz);













	return;



























out_put_device:













	put_device(&pdev->dev);













	return;















}































static bool __init at91_is_pm_mode_active(int pm_mode)

































arch/arm/mach-davinci/Kconfig



+1
−3






























Original line number
Diff line number
Diff line








@@ -201,15 +201,13 @@ config MACH_MITYOMAPL138













	help















	  Say Y here to select the Critical Link MityDSP-L138/MityARM-1808















	  System on Module.  Information on this SoM may be found at













	  http://www.mitydsp.com













	  https://www.mitydsp.com































config MACH_OMAPL138_HAWKBOARD















	bool "TI AM1808 / OMAPL-138 Hawkboard platform"















	depends on ARCH_DAVINCI_DA850















	help















	  Say Y here to select the TI AM1808 / OMAPL-138 Hawkboard platform .













	  Information of this board may be found at













	  http://www.hawkboard.org/































config DAVINCI_MUX















	bool "DAVINCI multiplexing support"









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE