Skip to content

Commit f166da5

Browse files
committed
Merge tag 'samsung-soc-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/arm
Samsung mach/soc changes for v6.12 1. Few ARM32 machine code cleanups, 2. Add dedicated maintainer entry for ARM64 Exynos850 DTS and driver code. * tag 'samsung-soc-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: s3c: remove unused s3c2410_cpu_suspend() declaration ARM: s3c: remove unused declarations for s3c6400 ARM: s3c: Remove unused s3c_init_uart_irqs() declaration MAINTAINERS: Add entry for Samsung Exynos850 SoC ARM: s3c: Drop explicit initialization of struct i2c_device_id::driver_data to 0 Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 35e834e + 3c89664 commit f166da5

File tree

5 files changed

+11
-16
lines changed

5 files changed

+11
-16
lines changed

MAINTAINERS

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

20115+
SAMSUNG EXYNOS850 SoC SUPPORT
20116+
M: Sam Protsenko <[email protected]>
20117+
L: [email protected] (moderated for non-subscribers)
20118+
20119+
S: Maintained
20120+
F: Documentation/devicetree/bindings/clock/samsung,exynos850-clock.yaml
20121+
F: arch/arm64/boot/dts/exynos/exynos850*
20122+
F: drivers/clk/samsung/clk-exynos850.c
20123+
F: include/dt-bindings/clock/exynos850.h
20124+
2011520125
SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER
2011620126
M: Krzysztof Kozlowski <[email protected]>
2011720127

arch/arm/mach-s3c/irq-uart-s3c64xx.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,3 @@ struct s3c_uart_irq {
1212
unsigned int parent_irq;
1313
};
1414

15-
extern void s3c_init_uart_irqs(struct s3c_uart_irq *irq, unsigned int nr_irqs);
16-

arch/arm/mach-s3c/mach-crag6410-module.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ static int wlf_gf_module_probe(struct i2c_client *i2c)
446446
}
447447

448448
static const struct i2c_device_id wlf_gf_module_id[] = {
449-
{ "wlf-gf-module", 0 },
449+
{ "wlf-gf-module" },
450450
{ }
451451
};
452452

arch/arm/mach-s3c/pm.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ extern unsigned long s3c_pm_flags;
4848

4949
/* from sleep.S */
5050

51-
extern int s3c2410_cpu_suspend(unsigned long);
52-
5351
#ifdef CONFIG_PM_SLEEP
5452
extern int s3c_irq_wake(struct irq_data *data, unsigned int state);
5553
extern void s3c_cpu_resume(void);

arch/arm/mach-s3c/s3c64xx.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,6 @@ struct device_node;
2323
void s3c64xx_set_xtal_freq(unsigned long freq);
2424
void s3c64xx_set_xusbxti_freq(unsigned long freq);
2525

26-
#ifdef CONFIG_CPU_S3C6400
27-
28-
extern int s3c6400_init(void);
29-
extern void s3c6400_init_irq(void);
30-
extern void s3c6400_map_io(void);
31-
32-
#else
33-
#define s3c6400_map_io NULL
34-
#define s3c6400_init NULL
35-
#endif
36-
3726
#ifdef CONFIG_CPU_S3C6410
3827

3928
extern int s3c6410_init(void);

0 commit comments

Comments
 (0)