Skip to content

Commit 6ce076f

Browse files
torvaldstorvalds
committed
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
2 parents 2f3fbfd + a04e84c commit 6ce076f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+267
-142
lines changed

‎MAINTAINERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1606,6 +1606,9 @@ F: sound/soc/meson/
16061606

16071607
ARM/Amlogic Meson SoC support
16081608
M: Kevin Hilman <[email protected]>
1609+
R: Neil Armstrong <[email protected]>
1610+
R: Jerome Brunet <[email protected]>
1611+
R: Martin Blumenstingl <[email protected]>
16091612
L: [email protected] (moderated for non-subscribers)
16101613
L: [email protected]
16111614
S: Maintained

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/*
33
* Device Tree for DA850 EVM board
44
*
5-
* Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
5+
* Copyright (C) 2012 Texas Instruments Incorporated - https://www.ti.com/
66
*/
77
/dts-v1/;
88
#include "da850.dtsi"

‎arch/arm/mach-at91/Makefile.boot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
# Empty file waiting for deletion once Makefile.boot isn't needed any more.
33
# Patch waits for application at
4-
# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 .
4+
# https://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 .

‎arch/arm/mach-at91/pm.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -592,26 +592,31 @@ static void __init at91_pm_sram_init(void)
592592
sram_pool = gen_pool_get(&pdev->dev, NULL);
593593
if (!sram_pool) {
594594
pr_warn("%s: sram pool unavailable!\n", __func__);
595-
return;
595+
goto out_put_device;
596596
}
597597

598598
sram_base = gen_pool_alloc(sram_pool, at91_pm_suspend_in_sram_sz);
599599
if (!sram_base) {
600600
pr_warn("%s: unable to alloc sram!\n", __func__);
601-
return;
601+
goto out_put_device;
602602
}
603603

604604
sram_pbase = gen_pool_virt_to_phys(sram_pool, sram_base);
605605
at91_suspend_sram_fn = __arm_ioremap_exec(sram_pbase,
606606
at91_pm_suspend_in_sram_sz, false);
607607
if (!at91_suspend_sram_fn) {
608608
pr_warn("SRAM: Could not map\n");
609-
return;
609+
goto out_put_device;
610610
}
611611

612612
/* Copy the pm suspend handler to SRAM */
613613
at91_suspend_sram_fn = fncpy(at91_suspend_sram_fn,
614614
&at91_pm_suspend_in_sram, at91_pm_suspend_in_sram_sz);
615+
return;
616+
617+
out_put_device:
618+
put_device(&pdev->dev);
619+
return;
615620
}
616621

617622
static bool __init at91_is_pm_mode_active(int pm_mode)

‎arch/arm/mach-davinci/Kconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,15 +201,13 @@ config MACH_MITYOMAPL138
201201
help
202202
Say Y here to select the Critical Link MityDSP-L138/MityARM-1808
203203
System on Module. Information on this SoM may be found at
204-
http://www.mitydsp.com
204+
https://www.mitydsp.com
205205

206206
config MACH_OMAPL138_HAWKBOARD
207207
bool "TI AM1808 / OMAPL-138 Hawkboard platform"
208208
depends on ARCH_DAVINCI_DA850
209209
help
210210
Say Y here to select the TI AM1808 / OMAPL-138 Hawkboard platform .
211-
Information of this board may be found at
212-
http://www.hawkboard.org/
213211

214212
config DAVINCI_MUX
215213
bool "DAVINCI multiplexing support"

‎arch/arm/mach-davinci/board-da830-evm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ static struct mtd_partition da830_evm_nand_partitions[] = {
266266
}
267267
};
268268

269-
/* flash bbt decriptors */
269+
/* flash bbt descriptors */
270270
static uint8_t da830_evm_nand_bbt_pattern[] = { 'B', 'b', 't', '0' };
271271
static uint8_t da830_evm_nand_mirror_pattern[] = { '1', 't', 'b', 'B' };
272272

‎arch/arm/mach-davinci/board-da850-evm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* TI DA850/OMAP-L138 EVM board
33
*
4-
* Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.com/
4+
* Copyright (C) 2009 Texas Instruments Incorporated - https://www.ti.com/
55
*
66
* Derived from: arch/arm/mach-davinci/board-da830-evm.c
77
* Original Copyrights follow:

‎arch/arm/mach-davinci/board-dm646x-evm.c

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -267,20 +267,15 @@ static int evm_sw_setup(struct i2c_client *client, int gpio,
267267
evm_sw_gpio[i] = gpio++;
268268

269269
status = gpio_direction_input(evm_sw_gpio[i]);
270-
if (status) {
271-
gpio_free(evm_sw_gpio[i]);
272-
evm_sw_gpio[i] = -EINVAL;
270+
if (status)
273271
goto out_free;
274-
}
275272

276273
status = gpio_export(evm_sw_gpio[i], 0);
277-
if (status) {
278-
gpio_free(evm_sw_gpio[i]);
279-
evm_sw_gpio[i] = -EINVAL;
274+
if (status)
280275
goto out_free;
281-
}
282276
}
283-
return status;
277+
return 0;
278+
284279
out_free:
285280
for (i = 0; i < 4; ++i) {
286281
if (evm_sw_gpio[i] != -EINVAL) {

‎arch/arm/mach-davinci/board-mityomapl138.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Critical Link MityOMAP-L138 SoM
33
*
4-
* Copyright (C) 2010 Critical Link LLC - http://www.criticallink.com
4+
* Copyright (C) 2010 Critical Link LLC - https://www.criticallink.com
55
*
66
* This file is licensed under the terms of the GNU General Public License
77
* version 2. This program is licensed "as is" without any warranty of

‎arch/arm/mach-davinci/board-neuros-osd2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ static __init void davinci_ntosd2_init(void)
214214
* Mux the pins to be GPIOs, VLYNQEN is already done at startup.
215215
* The AEAWx are five new AEAW pins that can be muxed by separately.
216216
* They are a bitmask for GPIO management. According TI
217-
* documentation (http://www.ti.com/lit/gpn/tms320dm6446) to employ
217+
* documentation (https://www.ti.com/lit/gpn/tms320dm6446) to employ
218218
* gpio(10,11,12,13) for leds any combination of bits works except
219219
* four last. So we are to reset all five.
220220
*/

0 commit comments

Comments
 (0)