Skip to content

Commit 2177033

Browse files
torvaldstorvalds
committed
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann: "A few fixes that came in too late to make it into the first set of pull requests but would still be nice to have in -rc1. The majority of these are trivial build fixes for bugs that I found myself using randconfig testing, and a set of two patches from Uwe to mark DT strings as 'const' where appropriate, to resolve inconsistent section attributes" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: make of_device_ids const ARM: make arrays containing machine compatible strings const ARM: mm: Remove Kconfig symbol CACHE_PL310 ARM: rockchip: force built-in regulator support for PM ARM: mvebu: build armada375-smp code conditionally ARM: sti: always enable RESET_CONTROLLER ARM: rockchip: make rockchip_suspend_init conditional ARM: ixp4xx: fix {in,out}s{bwl} data types ARM: prima2: do not select SMP_ON_UP ARM: at91: fix pm declarations ARM: davinci: multi-soc kernels require AUTO_ZRELADDR ARM: davinci: davinci_cfg_reg cannot be init ARM: BCM: put back ARCH_MULTI_V7 dependency for mobile ARM: vexpress: use ARM_CPU_SUSPEND if needed ARM: dts: add I2C device nodes for Broadcom Cygnus ARM: dts: BCM63xx: fix L2 cache properties
2 parents c8c6c9b + 444d2d3 commit 2177033

File tree

41 files changed

+88
-58
lines changed

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

+88
-58
lines changed

‎arch/arm/boot/dts/bcm-cygnus.dtsi‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,26 @@
7070
};
7171
};
7272

73+
i2c0: i2c@18008000 {
74+
compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c";
75+
reg = <0x18008000 0x100>;
76+
#address-cells = <1>;
77+
#size-cells = <0>;
78+
interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>;
79+
clock-frequency = <100000>;
80+
status = "disabled";
81+
};
82+
83+
i2c1: i2c@1800b000 {
84+
compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c";
85+
reg = <0x1800b000 0x100>;
86+
#address-cells = <1>;
87+
#size-cells = <0>;
88+
interrupts = <GIC_SPI 86 IRQ_TYPE_NONE>;
89+
clock-frequency = <100000>;
90+
status = "disabled";
91+
};
92+
7393
uart0: serial@18020000 {
7494
compatible = "snps,dw-apb-uart";
7595
reg = <0x18020000 0x100>;

‎arch/arm/boot/dts/bcm63138.dtsi‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,9 @@
6666
reg = <0x1d000 0x1000>;
6767
cache-unified;
6868
cache-level = <2>;
69-
cache-sets = <16>;
70-
cache-size = <0x80000>;
69+
cache-size = <524288>;
70+
cache-sets = <1024>;
71+
cache-line-size = <32>;
7172
interrupts = <GIC_PPI 0 IRQ_TYPE_LEVEL_HIGH>;
7273
};
7374

‎arch/arm/kernel/perf_event_cpu.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ static void cpu_pmu_destroy(struct arm_pmu *cpu_pmu)
231231
/*
232232
* PMU platform driver and devicetree bindings.
233233
*/
234-
static struct of_device_id cpu_pmu_of_device_ids[] = {
234+
static const struct of_device_id cpu_pmu_of_device_ids[] = {
235235
{.compatible = "arm,cortex-a17-pmu", .data = armv7_a17_pmu_init},
236236
{.compatible = "arm,cortex-a15-pmu", .data = armv7_a15_pmu_init},
237237
{.compatible = "arm,cortex-a12-pmu", .data = armv7_a12_pmu_init},

‎arch/arm/mach-at91/Kconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ config SOC_SAMA5D4
6464
select SOC_SAMA5
6565
select CLKSRC_MMIO
6666
select CACHE_L2X0
67-
select CACHE_PL310
6867
select HAVE_FB_ATMEL
6968
select HAVE_AT91_UTMI
7069
select HAVE_AT91_SMD

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ static struct clock_event_device clkevt = {
183183
void __iomem *at91_st_base;
184184
EXPORT_SYMBOL_GPL(at91_st_base);
185185

186-
static struct of_device_id at91rm9200_st_timer_ids[] = {
186+
static const struct of_device_id at91rm9200_st_timer_ids[] = {
187187
{ .compatible = "atmel,at91rm9200-st" },
188188
{ /* sentinel */ }
189189
};

‎arch/arm/mach-at91/generic.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ extern void __init at91sam9260_pm_init(void);
3535
extern void __init at91sam9g45_pm_init(void);
3636
extern void __init at91sam9x5_pm_init(void);
3737
#else
38-
void __init at91rm9200_pm_init(void) { }
39-
void __init at91sam9260_pm_init(void) { }
40-
void __init at91sam9g45_pm_init(void) { }
41-
void __init at91sam9x5_pm_init(void) { }
38+
static inline void __init at91rm9200_pm_init(void) { }
39+
static inline void __init at91sam9260_pm_init(void) { }
40+
static inline void __init at91sam9g45_pm_init(void) { }
41+
static inline void __init at91sam9x5_pm_init(void) { }
4242
#endif
4343

4444
#endif /* _AT91_GENERIC_H */

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,15 +226,15 @@ void at91_pm_set_standby(void (*at91_standby)(void))
226226
}
227227
}
228228

229-
static struct of_device_id ramc_ids[] = {
229+
static const struct of_device_id ramc_ids[] __initconst = {
230230
{ .compatible = "atmel,at91rm9200-sdramc", .data = at91rm9200_standby },
231231
{ .compatible = "atmel,at91sam9260-sdramc", .data = at91sam9_sdram_standby },
232232
{ .compatible = "atmel,at91sam9g45-ddramc", .data = at91_ddr_standby },
233233
{ .compatible = "atmel,sama5d3-ddramc", .data = at91_ddr_standby },
234234
{ /*sentinel*/ }
235235
};
236236

237-
static void at91_dt_ramc(void)
237+
static __init void at91_dt_ramc(void)
238238
{
239239
struct device_node *np;
240240
const struct of_device_id *of_id;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <linux/init.h>
1717
#include <asm/mach/arch.h>
1818

19-
static const char *axxia_dt_match[] __initconst = {
19+
static const char *const axxia_dt_match[] __initconst = {
2020
"lsi,axm5516",
2121
"lsi,axm5516-sim",
2222
"lsi,axm5516-emu",

‎arch/arm/mach-bcm/Kconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ config ARCH_BCM_MOBILE
6868
This enables support for systems based on Broadcom mobile SoCs.
6969

7070
config ARCH_BCM_281XX
71-
bool "Broadcom BCM281XX SoC family"
71+
bool "Broadcom BCM281XX SoC family" if ARCH_MULTI_V7
7272
select ARCH_BCM_MOBILE
7373
select HAVE_SMP
7474
help
@@ -77,7 +77,7 @@ config ARCH_BCM_281XX
7777
variants.
7878

7979
config ARCH_BCM_21664
80-
bool "Broadcom BCM21664 SoC family"
80+
bool "Broadcom BCM21664 SoC family" if ARCH_MULTI_V7
8181
select ARCH_BCM_MOBILE
8282
select HAVE_SMP
8383
help

‎arch/arm/mach-bcm/brcmstb.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <asm/mach-types.h>
1818
#include <asm/mach/arch.h>
1919

20-
static const char *brcmstb_match[] __initconst = {
20+
static const char *const brcmstb_match[] __initconst = {
2121
"brcm,bcm7445",
2222
"brcm,brcmstb",
2323
NULL

0 commit comments

Comments
 (0)