Skip to content

Commit a940d9a

Browse files
torvaldstorvalds
committed
Merge tag 'soc-arm-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC ARM platform updates from Arnd Bergmann: "Most of these updates are for removing dead code on the Samsung S3C, NXP i.MX, TI OMAP and TI DaVinci platforms, though this appears to be a coincidence. There are also cleanups for the Marvell Orion family and the Arm integrator series and a Kconfig change for Broadcom" * tag 'soc-arm-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: ARM: dove: Drop a write-only variable ARM: orion5x: Switch to new sys-off handler API ARM: mvebu: Warn about memory chunks too small for DDR training ARM: imx: Annotate imx7d_enet_init() as __init ARM: OMAP1: Remove unused declarations in arch/arm/mach-omap1/pm.h ARM: s3c: remove unused s3c2410_cpu_suspend() declaration ARM: s3c: remove unused declarations for s3c6400 ARM: s3c: Remove unused s3c_init_uart_irqs() declaration ARM: davinci: remove unused cpuidle code ARM: davinci: remove unused davinci_init_ide() declaration ARM: davinci: remove unused davinci_cfg_reg_list() declaration ARM: mach-imx: imx6sx: Remove Ethernet refclock setting MAINTAINERS: Add entry for Samsung Exynos850 SoC ARM: bcm: Select ARM_GIC_V3 for ARCH_BRCMSTB ARM: omap2: Switch to use kmemdup_array() ARM: omap1: Remove unused struct 'dma_link_info' ARM: s3c: Drop explicit initialization of struct i2c_device_id::driver_data to 0
2 parents 38ea77a + 46d2efc commit a940d9a

27 files changed

+29
-191
lines changed

‎MAINTAINERS

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20243,6 +20243,16 @@ B: mailto:[email protected]
2024320243
F: Documentation/devicetree/bindings/sound/samsung*
2024420244
F: sound/soc/samsung/
2024520245

20246+
SAMSUNG EXYNOS850 SoC SUPPORT
20247+
M: Sam Protsenko <[email protected]>
20248+
L: [email protected] (moderated for non-subscribers)
20249+
L: [email protected]
20250+
S: Maintained
20251+
F: Documentation/devicetree/bindings/clock/samsung,exynos850-clock.yaml
20252+
F: arch/arm64/boot/dts/exynos/exynos850*
20253+
F: drivers/clk/samsung/clk-exynos850.c
20254+
F: include/dt-bindings/clock/exynos850.h
20255+
2024620256
SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER
2024720257
M: Krzysztof Kozlowski <[email protected]>
2024820258
L: [email protected]

‎arch/arm/mach-bcm/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ config ARCH_BRCMSTB
185185
select ARCH_HAS_RESET_CONTROLLER
186186
select ARM_AMBA
187187
select ARM_GIC
188+
select ARM_GIC_V3
188189
select ARM_ERRATA_798181 if SMP
189190
select HAVE_ARM_ARCH_TIMER
190191
select ZONE_DMA if ARM_LPAE

‎arch/arm/mach-davinci/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ obj-$(CONFIG_ARCH_DAVINCI_DA850) += da850.o pdata-quirks.o
1616
obj-y += da8xx-dt.o
1717

1818
# Power Management
19-
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
2019
obj-$(CONFIG_HAVE_CLK) += pm_domain.o
2120
ifeq ($(CONFIG_SUSPEND),y)
2221
obj-$(CONFIG_ARCH_DAVINCI_DA850) += pm.o sleep.o

‎arch/arm/mach-davinci/common.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ struct davinci_soc_info {
5252
extern struct davinci_soc_info davinci_soc_info;
5353

5454
extern void davinci_common_init(const struct davinci_soc_info *soc_info);
55-
extern void davinci_init_ide(void);
5655
void davinci_init_late(void);
5756

5857
#ifdef CONFIG_SUSPEND

‎arch/arm/mach-davinci/cpuidle.c

Lines changed: 0 additions & 99 deletions
This file was deleted.

‎arch/arm/mach-davinci/cpuidle.h

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎arch/arm/mach-davinci/devices-da8xx.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "common.h"
2222
#include "cputype.h"
2323
#include "da8xx.h"
24-
#include "cpuidle.h"
2524
#include "irqs.h"
2625
#include "sram.h"
2726

‎arch/arm/mach-davinci/mux.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -654,14 +654,9 @@ enum davinci_da850_index {
654654
#ifdef CONFIG_DAVINCI_MUX
655655
/* setup pin muxing */
656656
extern int davinci_cfg_reg(unsigned long reg_cfg);
657-
extern int davinci_cfg_reg_list(const short pins[]);
658657
#else
659658
/* boot loader does it all (no warnings from CONFIG_DAVINCI_MUX_WARNINGS) */
660659
static inline int davinci_cfg_reg(unsigned long reg_cfg) { return 0; }
661-
static inline int davinci_cfg_reg_list(const short pins[])
662-
{
663-
return 0;
664-
}
665660
#endif
666661

667662

‎arch/arm/mach-dove/common.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static void __init dove_clk_init(void)
8282
{
8383
struct clk *usb0, *usb1, *sata, *pex0, *pex1, *sdio0, *sdio1;
8484
struct clk *nand, *camera, *i2s0, *i2s1, *crypto, *ac97, *pdma;
85-
struct clk *xor0, *xor1, *ge, *gephy;
85+
struct clk *xor0, *xor1, *ge;
8686

8787
tclk = clk_register_fixed_rate(NULL, "tclk", NULL, 0, dove_tclk);
8888

@@ -102,7 +102,7 @@ static void __init dove_clk_init(void)
102102
pdma = dove_register_gate("pdma", "tclk", CLOCK_GATING_BIT_PDMA);
103103
xor0 = dove_register_gate("xor0", "tclk", CLOCK_GATING_BIT_XOR0);
104104
xor1 = dove_register_gate("xor1", "tclk", CLOCK_GATING_BIT_XOR1);
105-
gephy = dove_register_gate("gephy", "tclk", CLOCK_GATING_BIT_GIGA_PHY);
105+
dove_register_gate("gephy", "tclk", CLOCK_GATING_BIT_GIGA_PHY);
106106
ge = dove_register_gate("ge", "gephy", CLOCK_GATING_BIT_GBE);
107107

108108
orion_clkdev_add(NULL, "orion_spi.0", tclk);

‎arch/arm/mach-imx/mach-imx6sx.c

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,15 @@
77
#include <linux/of_platform.h>
88
#include <linux/regmap.h>
99
#include <linux/mfd/syscon.h>
10-
#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
1110
#include <asm/mach/arch.h>
1211

1312
#include "common.h"
1413
#include "cpuidle.h"
1514

16-
static void __init imx6sx_enet_clk_sel(void)
17-
{
18-
struct regmap *gpr;
19-
20-
gpr = syscon_regmap_lookup_by_compatible("fsl,imx6sx-iomuxc-gpr");
21-
if (!IS_ERR(gpr)) {
22-
regmap_update_bits(gpr, IOMUXC_GPR1,
23-
IMX6SX_GPR1_FEC_CLOCK_MUX_SEL_MASK, 0);
24-
regmap_update_bits(gpr, IOMUXC_GPR1,
25-
IMX6SX_GPR1_FEC_CLOCK_PAD_DIR_MASK, 0);
26-
} else {
27-
pr_err("failed to find fsl,imx6sx-iomux-gpr regmap\n");
28-
}
29-
}
30-
31-
static inline void imx6sx_enet_init(void)
32-
{
33-
imx6sx_enet_clk_sel();
34-
}
35-
3615
static void __init imx6sx_init_machine(void)
3716
{
3817
of_platform_default_populate(NULL, NULL, NULL);
3918

40-
imx6sx_enet_init();
4119
imx_anatop_init();
4220
imx6sx_pm_init();
4321
}

0 commit comments

Comments
 (0)