Skip to content

Commit bf1fa6f

Browse files
torvaldstorvalds
committed
Merge tag 'soc-arm-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC updates from Arnd Bergmann: "These are mostly minor cleanups and bugfixes that address harmless problems. The largest branch is a conversion of the omap platform to use GPIO descriptors throughout the tree, for any devices that are not fully converted to devicetree. The Samsung Exynos platform gains back support for the Exynos4212 chip that was previously unused and removed but is now used for the Samsung Galaxy Tab3" * tag 'soc-arm-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (24 commits) ARM: omap2: Fix copy/paste bug MAINTAINERS: Replace my email address Input: ads7846 - fix pointer cast warning Input: ads7846 - Fix usage of match data ARM: omap2: Fix checkpatch issues arm: omap1: replace printk() with pr_err macro ARM: omap: Fix checkpatch issues ARM: s3c: Switch i2c drivers back to use .probe() ARM: versatile: mark mmc_status() static ARM: spear: include "pl080.h" for pl080_get_signal() prototype ARM: sa1100: address missing prototype warnings ARM: pxa: fix missing-prototypes warnings ARM: orion5x: fix d2net gpio initialization ARM: omap2: fix missing tick_broadcast() prototype ARM: omap1: add missing include ARM: lpc32xx: add missing include ARM: imx: add missing include ARM: highbank: add missing include ARM: ep93xx: fix missing-prototype warnings ARM: davinci: fix davinci_cpufreq_init() declaration ...
2 parents 0873694 + c1d57ee commit bf1fa6f

File tree

50 files changed

+135
-99
lines changed

Some content is hidden

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

50 files changed

+135
-99
lines changed

‎MAINTAINERS

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3893,7 +3893,7 @@ S: Supported
38933893
F: drivers/net/ethernet/broadcom/b44.*
38943894

38953895
BROADCOM B53/SF2 ETHERNET SWITCH DRIVER
3896-
M: Florian Fainelli <f.fainelli@gmail.com>
3896+
M: Florian Fainelli <florian.fainelli@broadcom.com>
38973897
L: [email protected]
38983898
L: [email protected] (subscribers-only)
38993899
S: Supported
@@ -3904,7 +3904,7 @@ F: include/linux/dsa/brcm.h
39043904
F: include/linux/platform_data/b53.h
39053905

39063906
BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
3907-
M: Florian Fainelli <f.fainelli@gmail.com>
3907+
M: Florian Fainelli <florian.fainelli@broadcom.com>
39083908
R: Broadcom internal kernel review list <[email protected]>
39093909
L: [email protected] (moderated for non-subscribers)
39103910
L: [email protected] (moderated for non-subscribers)
@@ -3918,7 +3918,7 @@ N: bcm283*
39183918
N: raspberrypi
39193919

39203920
BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
3921-
M: Florian Fainelli <f.fainelli@gmail.com>
3921+
M: Florian Fainelli <florian.fainelli@broadcom.com>
39223922
M: Ray Jui <[email protected]>
39233923
M: Scott Branden <[email protected]>
39243924
R: Broadcom internal kernel review list <[email protected]>
@@ -3957,7 +3957,7 @@ F: Documentation/devicetree/bindings/pinctrl/brcm,bcm4908-pinctrl.yaml
39573957
F: drivers/pinctrl/bcm/pinctrl-bcm4908.c
39583958

39593959
BROADCOM BCM5301X ARM ARCHITECTURE
3960-
M: Florian Fainelli <f.fainelli@gmail.com>
3960+
M: Florian Fainelli <florian.fainelli@broadcom.com>
39613961
M: Hauke Mehrtens <[email protected]>
39623962
M: Rafał Miłecki <[email protected]>
39633963
R: Broadcom internal kernel review list <[email protected]>
@@ -3970,7 +3970,7 @@ F: arch/arm/boot/dts/broadcom/bcm953012*
39703970
F: arch/arm/mach-bcm/bcm_5301x.c
39713971

39723972
BROADCOM BCM53573 ARM ARCHITECTURE
3973-
M: Florian Fainelli <f.fainelli@gmail.com>
3973+
M: Florian Fainelli <florian.fainelli@broadcom.com>
39743974
M: Rafał Miłecki <[email protected]>
39753975
R: Broadcom internal kernel review list <[email protected]>
39763976
L: [email protected] (moderated for non-subscribers)
@@ -3985,7 +3985,7 @@ S: Maintained
39853985
F: drivers/usb/gadget/udc/bcm63xx_udc.*
39863986

39873987
BROADCOM BCM7XXX ARM ARCHITECTURE
3988-
M: Florian Fainelli <f.fainelli@gmail.com>
3988+
M: Florian Fainelli <florian.fainelli@broadcom.com>
39893989
R: Broadcom internal kernel review list <[email protected]>
39903990
L: [email protected] (moderated for non-subscribers)
39913991
S: Maintained
@@ -4005,7 +4005,7 @@ BROADCOM BCMBCA ARM ARCHITECTURE
40054005
M: William Zhang <[email protected]>
40064006
M: Anand Gore <[email protected]>
40074007
M: Kursad Oney <[email protected]>
4008-
M: Florian Fainelli <f.fainelli@gmail.com>
4008+
M: Florian Fainelli <florian.fainelli@broadcom.com>
40094009
M: Rafał Miłecki <[email protected]>
40104010
R: Broadcom internal kernel review list <[email protected]>
40114011
L: [email protected] (moderated for non-subscribers)
@@ -4030,7 +4030,7 @@ N: bcm[9]?6858
40304030
N: bcm[9]?6878
40314031

40324032
BROADCOM BDC DRIVER
4033-
M: Justin Chen <justinpopo6@gmail.com>
4033+
M: Justin Chen <justin.chen@broadcom.com>
40344034
M: Al Cooper <[email protected]>
40354035
R: Broadcom internal kernel review list <[email protected]>
40364036
L: [email protected]
@@ -4046,7 +4046,7 @@ S: Maintained
40464046
F: drivers/cpufreq/bmips-cpufreq.c
40474047

40484048
BROADCOM BMIPS MIPS ARCHITECTURE
4049-
M: Florian Fainelli <f.fainelli@gmail.com>
4049+
M: Florian Fainelli <florian.fainelli@broadcom.com>
40504050
R: Broadcom internal kernel review list <[email protected]>
40514051
L: [email protected]
40524052
S: Maintained
@@ -4114,14 +4114,14 @@ F: drivers/net/wireless/broadcom/brcm80211/
41144114

41154115
BROADCOM BRCMSTB GPIO DRIVER
41164116
M: Doug Berger <[email protected]>
4117-
M: Florian Fainelli <f.fainelli@gmail.com>
4117+
M: Florian Fainelli <florian.fainelli@broadcom>
41184118
R: Broadcom internal kernel review list <[email protected]>
41194119
S: Supported
41204120
F: Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.yaml
41214121
F: drivers/gpio/gpio-brcmstb.c
41224122

41234123
BROADCOM BRCMSTB I2C DRIVER
4124-
M: Kamal Dasu <kdasu.kdev@gmail.com>
4124+
M: Kamal Dasu <kamal.dasu@broadcom.com>
41254125
R: Broadcom internal kernel review list <[email protected]>
41264126
L: [email protected]
41274127
S: Supported
@@ -4137,7 +4137,7 @@ F: Documentation/devicetree/bindings/serial/brcm,bcm7271-uart.yaml
41374137
F: drivers/tty/serial/8250/8250_bcm7271.c
41384138

41394139
BROADCOM BRCMSTB USB EHCI DRIVER
4140-
M: Justin Chen <justinpopo6@gmail.com>
4140+
M: Justin Chen <justin.chen@broadcom.com>
41414141
M: Al Cooper <[email protected]>
41424142
R: Broadcom internal kernel review list <[email protected]>
41434143
L: [email protected]
@@ -4154,7 +4154,7 @@ F: Documentation/devicetree/bindings/usb/brcm,usb-pinmap.yaml
41544154
F: drivers/usb/misc/brcmstb-usb-pinmap.c
41554155

41564156
BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
4157-
M: Justin Chen <justinpopo6@gmail.com>
4157+
M: Justin Chen <justin.chen@broadcom.com>
41584158
M: Al Cooper <[email protected]>
41594159
R: Broadcom internal kernel review list <[email protected]>
41604160
L: [email protected]
@@ -4173,7 +4173,7 @@ F: drivers/spi/spi-bcm63xx-hsspi.c
41734173
F: drivers/spi/spi-bcmbca-hsspi.c
41744174

41754175
BROADCOM ETHERNET PHY DRIVERS
4176-
M: Florian Fainelli <f.fainelli@gmail.com>
4176+
M: Florian Fainelli <florian.fainelli@broadcom.com>
41774177
R: Broadcom internal kernel review list <[email protected]>
41784178
L: [email protected]
41794179
S: Supported
@@ -4184,7 +4184,7 @@ F: include/linux/brcmphy.h
41844184

41854185
BROADCOM GENET ETHERNET DRIVER
41864186
M: Doug Berger <[email protected]>
4187-
M: Florian Fainelli <f.fainelli@gmail.com>
4187+
M: Florian Fainelli <florian.fainelli@broadcom.com>
41884188
R: Broadcom internal kernel review list <[email protected]>
41894189
L: [email protected]
41904190
S: Supported
@@ -4268,7 +4268,7 @@ F: drivers/firmware/broadcom/*
42684268

42694269
BROADCOM PMB (POWER MANAGEMENT BUS) DRIVER
42704270
M: Rafał Miłecki <[email protected]>
4271-
M: Florian Fainelli <f.fainelli@gmail.com>
4271+
M: Florian Fainelli <florian.fainelli@broadcom.com>
42724272
R: Broadcom internal kernel review list <[email protected]>
42734273
L: [email protected]
42744274
S: Maintained
@@ -4284,7 +4284,7 @@ F: drivers/bcma/
42844284
F: include/linux/bcma/
42854285

42864286
BROADCOM SPI DRIVER
4287-
M: Kamal Dasu <kdasu.kdev@gmail.com>
4287+
M: Kamal Dasu <kamal.dasu@broadcom.com>
42884288
R: Broadcom internal kernel review list <[email protected]>
42894289
S: Maintained
42904290
F: Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml
@@ -4318,7 +4318,7 @@ F: drivers/memory/brcmstb_dpfe.c
43184318

43194319
BROADCOM STB NAND FLASH DRIVER
43204320
M: Brian Norris <[email protected]>
4321-
M: Kamal Dasu <kdasu.kdev@gmail.com>
4321+
M: Kamal Dasu <kamal.dasu@broadcom.com>
43224322
R: Broadcom internal kernel review list <[email protected]>
43234323
L: [email protected]
43244324
S: Maintained
@@ -4328,15 +4328,15 @@ F: include/linux/platform_data/brcmnand.h
43284328
BROADCOM STB PCIE DRIVER
43294329
M: Jim Quinlan <[email protected]>
43304330
M: Nicolas Saenz Julienne <[email protected]>
4331-
M: Florian Fainelli <f.fainelli@gmail.com>
4331+
M: Florian Fainelli <florian.fainelli@broadcom.com>
43324332
R: Broadcom internal kernel review list <[email protected]>
43334333
L: [email protected]
43344334
S: Maintained
43354335
F: Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
43364336
F: drivers/pci/controller/pcie-brcmstb.c
43374337

43384338
BROADCOM SYSTEMPORT ETHERNET DRIVER
4339-
M: Florian Fainelli <f.fainelli@gmail.com>
4339+
M: Florian Fainelli <florian.fainelli@broadcom.com>
43404340
R: Broadcom internal kernel review list <[email protected]>
43414341
L: [email protected]
43424342
S: Supported
@@ -19032,7 +19032,7 @@ K: \bsecure_computing
1903219032
K: \bTIF_SECCOMP\b
1903319033

1903419034
SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) Broadcom BRCMSTB DRIVER
19035-
M: Kamal Dasu <kdasu.kdev@gmail.com>
19035+
M: Kamal Dasu <kamal.dasu@broadcom.com>
1903619036
M: Al Cooper <[email protected]>
1903719037
R: Broadcom internal kernel review list <[email protected]>
1903819038
L: [email protected]

‎arch/arm/common/sa1111.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ static u32 sa1111_dma_mask[] = {
695695
/*
696696
* Configure the SA1111 shared memory controller.
697697
*/
698-
void
698+
static void
699699
sa1111_configure_smc(struct sa1111 *sachip, int sdram, unsigned int drac,
700700
unsigned int cas_latency)
701701
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <linux/etherdevice.h>
1212
#include <linux/davinci_emac.h>
1313
#include <linux/dma-mapping.h>
14+
#include <linux/platform_data/davinci-cpufreq.h>
1415

1516
#include <asm/tlb.h>
1617
#include <asm/mach/map.h>

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,6 @@ extern void davinci_common_init(const struct davinci_soc_info *soc_info);
5555
extern void davinci_init_ide(void);
5656
void davinci_init_late(void);
5757

58-
#ifdef CONFIG_CPU_FREQ
59-
int davinci_cpufreq_init(void);
60-
#else
61-
static inline int davinci_cpufreq_init(void) { return 0; }
62-
#endif
63-
6458
#ifdef CONFIG_SUSPEND
6559
int davinci_pm_init(void);
6660
#else

‎arch/arm/mach-ep93xx/timer-ep93xx.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <linux/io.h>
1010
#include <asm/mach/time.h>
1111
#include "soc.h"
12+
#include "platform.h"
1213

1314
/*************************************************************************
1415
* Timer handling for EP93xx
@@ -60,7 +61,7 @@ static u64 notrace ep93xx_read_sched_clock(void)
6061
return ret;
6162
}
6263

63-
u64 ep93xx_clocksource_read(struct clocksource *c)
64+
static u64 ep93xx_clocksource_read(struct clocksource *c)
6465
{
6566
u64 ret;
6667

‎arch/arm/mach-exynos/Kconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@ config CPU_EXYNOS4210
7878
default y
7979
depends on ARCH_EXYNOS4
8080

81+
config SOC_EXYNOS4212
82+
bool "Samsung Exynos4212"
83+
default y
84+
depends on ARCH_EXYNOS4
85+
8186
config SOC_EXYNOS4412
8287
bool "Samsung Exynos4412"
8388
default y

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#define EXYNOS3_SOC_MASK 0xFFFFF000
1616

1717
#define EXYNOS4210_CPU_ID 0x43210000
18+
#define EXYNOS4212_CPU_ID 0x43220000
1819
#define EXYNOS4412_CPU_ID 0xE4412200
1920
#define EXYNOS4_CPU_MASK 0xFFFE0000
2021

@@ -34,6 +35,7 @@ static inline int is_samsung_##name(void) \
3435

3536
IS_SAMSUNG_CPU(exynos3250, EXYNOS3250_SOC_ID, EXYNOS3_SOC_MASK)
3637
IS_SAMSUNG_CPU(exynos4210, EXYNOS4210_CPU_ID, EXYNOS4_CPU_MASK)
38+
IS_SAMSUNG_CPU(exynos4212, EXYNOS4212_CPU_ID, EXYNOS4_CPU_MASK)
3739
IS_SAMSUNG_CPU(exynos4412, EXYNOS4412_CPU_ID, EXYNOS4_CPU_MASK)
3840
IS_SAMSUNG_CPU(exynos5250, EXYNOS5250_SOC_ID, EXYNOS5_SOC_MASK)
3941
IS_SAMSUNG_CPU(exynos5410, EXYNOS5410_SOC_ID, EXYNOS5_SOC_MASK)
@@ -52,6 +54,12 @@ IS_SAMSUNG_CPU(exynos5800, EXYNOS5800_SOC_ID, EXYNOS5_SOC_MASK)
5254
# define soc_is_exynos4210() 0
5355
#endif
5456

57+
#if defined(CONFIG_SOC_EXYNOS4212)
58+
# define soc_is_exynos4212() is_samsung_exynos4212()
59+
#else
60+
# define soc_is_exynos4212() 0
61+
#endif
62+
5563
#if defined(CONFIG_SOC_EXYNOS4412)
5664
# define soc_is_exynos4412() is_samsung_exynos4412()
5765
#else

‎arch/arm/mach-exynos/exynos.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ static void __init exynos_dt_machine_init(void)
180180
exynos_cpuidle.dev.platform_data = &cpuidle_coupled_exynos_data;
181181
#endif
182182
if (of_machine_is_compatible("samsung,exynos4210") ||
183+
of_machine_is_compatible("samsung,exynos4212") ||
183184
(of_machine_is_compatible("samsung,exynos4412") &&
184185
(of_machine_is_compatible("samsung,trats2") ||
185186
of_machine_is_compatible("samsung,midas") ||
@@ -194,6 +195,7 @@ static char const *const exynos_dt_compat[] __initconst = {
194195
"samsung,exynos3250",
195196
"samsung,exynos4",
196197
"samsung,exynos4210",
198+
"samsung,exynos4212",
197199
"samsung,exynos4412",
198200
"samsung,exynos5",
199201
"samsung,exynos5250",

‎arch/arm/mach-exynos/firmware.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,18 @@ static int exynos_cpu_boot(int cpu)
6363
*
6464
* On Exynos5 devices the call is ignored by trustzone firmware.
6565
*/
66-
if (!soc_is_exynos4210() && !soc_is_exynos4412())
66+
if (!soc_is_exynos4210() && !soc_is_exynos4212() &&
67+
!soc_is_exynos4412())
6768
return 0;
6869

6970
/*
7071
* The second parameter of SMC_CMD_CPU1BOOT command means CPU id.
72+
* But, Exynos4212 has only one secondary CPU so second parameter
73+
* isn't used for informing secure firmware about CPU id.
7174
*/
75+
if (soc_is_exynos4212())
76+
cpu = 0;
77+
7278
exynos_smc(SMC_CMD_CPU1BOOT, cpu, 0, 0);
7379
return 0;
7480
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ void exynos_enter_aftr(void)
161161

162162
exynos_pm_central_suspend();
163163

164-
if (soc_is_exynos4412()) {
164+
if (soc_is_exynos4212() || soc_is_exynos4412()) {
165165
/* Setting SEQ_OPTION register */
166166
pmu_raw_writel(S5P_USE_STANDBY_WFI0 | S5P_USE_STANDBY_WFE0,
167167
S5P_CENTRAL_SEQ_OPTION);

0 commit comments

Comments
 (0)