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

‎arch/arm/mach-davinci/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,14 @@ config ARCH_DAVINCI_DM646x
3232

3333
config ARCH_DAVINCI_DA830
3434
bool "DA830/OMAP-L137/AM17x based system"
35+
depends on !ARCH_DAVINCI_DMx || AUTO_ZRELADDR
3536
select ARCH_DAVINCI_DA8XX
3637
select CPU_DCACHE_WRITETHROUGH # needed on silicon revs 1.0, 1.1
3738
select CP_INTC
3839

3940
config ARCH_DAVINCI_DA850
4041
bool "DA850/OMAP-L138/AM18x based system"
42+
depends on !ARCH_DAVINCI_DMx || AUTO_ZRELADDR
4143
select ARCH_DAVINCI_DA8XX
4244
select CP_INTC
4345

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#define DA8XX_NUM_UARTS 3
2222

23-
static struct of_device_id da8xx_irq_match[] __initdata = {
23+
static const struct of_device_id da8xx_irq_match[] __initconst = {
2424
{ .compatible = "ti,cp-intc", .data = cp_intc_of_init, },
2525
{ }
2626
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ static void __iomem *pinmux_base;
3030
/*
3131
* Sets the DAVINCI MUX register based on the table
3232
*/
33-
int __init_or_module davinci_cfg_reg(const unsigned long index)
33+
int davinci_cfg_reg(const unsigned long index)
3434
{
3535
static DEFINE_SPINLOCK(mux_spin_lock);
3636
struct davinci_soc_info *soc_info = &davinci_soc_info;
@@ -101,7 +101,7 @@ int __init_or_module davinci_cfg_reg(const unsigned long index)
101101
}
102102
EXPORT_SYMBOL(davinci_cfg_reg);
103103

104-
int __init_or_module davinci_cfg_reg_list(const short pins[])
104+
int davinci_cfg_reg_list(const short pins[])
105105
{
106106
int i, error = -EINVAL;
107107

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ static void __init exynos_dt_machine_init(void)
227227
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
228228
}
229229

230-
static char const *exynos_dt_compat[] __initconst = {
230+
static char const *const exynos_dt_compat[] __initconst = {
231231
"samsung,exynos3",
232232
"samsung,exynos3250",
233233
"samsung,exynos4",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ static struct exynos_pm_data exynos5420_pm_data = {
587587
.cpu_suspend = exynos5420_cpu_suspend,
588588
};
589589

590-
static struct of_device_id exynos_pmu_of_device_ids[] = {
590+
static const struct of_device_id exynos_pmu_of_device_ids[] __initconst = {
591591
{
592592
.compatible = "samsung,exynos3250-pmu",
593593
.data = &exynos3250_pm_data,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ static void __init highbank_init(void)
169169
platform_device_register(&highbank_cpuidle_device);
170170
}
171171

172-
static const char *highbank_match[] __initconst = {
172+
static const char *const highbank_match[] __initconst = {
173173
"calxeda,highbank",
174174
"calxeda,ecx-2000",
175175
NULL,

‎arch/arm/mach-hisi/hisilicon.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static void __init hi3620_map_io(void)
4545
iotable_init(hi3620_io_desc, ARRAY_SIZE(hi3620_io_desc));
4646
}
4747

48-
static const char *hi3xxx_compat[] __initconst = {
48+
static const char *const hi3xxx_compat[] __initconst = {
4949
"hisilicon,hi3620-hi4511",
5050
NULL,
5151
};
@@ -55,7 +55,7 @@ DT_MACHINE_START(HI3620, "Hisilicon Hi3620 (Flattened Device Tree)")
5555
.dt_compat = hi3xxx_compat,
5656
MACHINE_END
5757

58-
static const char *hix5hd2_compat[] __initconst = {
58+
static const char *const hix5hd2_compat[] __initconst = {
5959
"hisilicon,hix5hd2",
6060
NULL,
6161
};
@@ -64,7 +64,7 @@ DT_MACHINE_START(HIX5HD2_DT, "Hisilicon HIX5HD2 (Flattened Device Tree)")
6464
.dt_compat = hix5hd2_compat,
6565
MACHINE_END
6666

67-
static const char *hip04_compat[] __initconst = {
67+
static const char *const hip04_compat[] __initconst = {
6868
"hisilicon,hip04-d01",
6969
NULL,
7070
};
@@ -73,7 +73,7 @@ DT_MACHINE_START(HIP04, "Hisilicon HiP04 (Flattened Device Tree)")
7373
.dt_compat = hip04_compat,
7474
MACHINE_END
7575

76-
static const char *hip01_compat[] __initconst = {
76+
static const char *const hip01_compat[] __initconst = {
7777
"hisilicon,hip01",
7878
"hisilicon,hip01-ca9x2",
7979
NULL,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ int imx_mmdc_get_ddr_type(void)
6868
return ddr_type;
6969
}
7070

71-
static struct of_device_id imx_mmdc_dt_ids[] = {
71+
static const struct of_device_id imx_mmdc_dt_ids[] = {
7272
{ .compatible = "fsl,imx6q-mmdc", },
7373
{ /* sentinel */ }
7474
};

‎arch/arm/mach-ixp4xx/include/mach/io.h

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,10 @@ static inline void outb(u8 value, u32 addr)
245245
}
246246

247247
#define outsb outsb
248-
static inline void outsb(u32 io_addr, const u8 *vaddr, u32 count)
248+
static inline void outsb(u32 io_addr, const void *p, u32 count)
249249
{
250+
const u8 *vaddr = p;
251+
250252
while (count--)
251253
outb(*vaddr++, io_addr);
252254
}
@@ -262,8 +264,9 @@ static inline void outw(u16 value, u32 addr)
262264
}
263265

264266
#define outsw outsw
265-
static inline void outsw(u32 io_addr, const u16 *vaddr, u32 count)
267+
static inline void outsw(u32 io_addr, const void *p, u32 count)
266268
{
269+
const u16 *vaddr = p;
267270
while (count--)
268271
outw(cpu_to_le16(*vaddr++), io_addr);
269272
}
@@ -275,8 +278,9 @@ static inline void outl(u32 value, u32 addr)
275278
}
276279

277280
#define outsl outsl
278-
static inline void outsl(u32 io_addr, const u32 *vaddr, u32 count)
281+
static inline void outsl(u32 io_addr, const void *p, u32 count)
279282
{
283+
const u32 *vaddr = p;
280284
while (count--)
281285
outl(cpu_to_le32(*vaddr++), io_addr);
282286
}
@@ -294,8 +298,9 @@ static inline u8 inb(u32 addr)
294298
}
295299

296300
#define insb insb
297-
static inline void insb(u32 io_addr, u8 *vaddr, u32 count)
301+
static inline void insb(u32 io_addr, void *p, u32 count)
298302
{
303+
u8 *vaddr = p;
299304
while (count--)
300305
*vaddr++ = inb(io_addr);
301306
}
@@ -313,8 +318,9 @@ static inline u16 inw(u32 addr)
313318
}
314319

315320
#define insw insw
316-
static inline void insw(u32 io_addr, u16 *vaddr, u32 count)
321+
static inline void insw(u32 io_addr, void *p, u32 count)
317322
{
323+
u16 *vaddr = p;
318324
while (count--)
319325
*vaddr++ = le16_to_cpu(inw(io_addr));
320326
}
@@ -330,8 +336,9 @@ static inline u32 inl(u32 addr)
330336
}
331337

332338
#define insl insl
333-
static inline void insl(u32 io_addr, u32 *vaddr, u32 count)
339+
static inline void insl(u32 io_addr, void *p, u32 count)
334340
{
341+
u32 *vaddr = p;
335342
while (count--)
336343
*vaddr++ = le32_to_cpu(inl(io_addr));
337344
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ static void __init keystone_init_meminfo(void)
103103
pr_info("Switching to high address space at 0x%llx\n", (u64)offset);
104104
}
105105

106-
static const char *keystone_match[] __initconst = {
106+
static const char *const keystone_match[] __initconst = {
107107
"ti,keystone",
108108
NULL,
109109
};

‎arch/arm/mach-keystone/pm_domain.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ static struct pm_clk_notifier_block platform_domain_notifier = {
6161
.pm_domain = &keystone_pm_domain,
6262
};
6363

64-
static struct of_device_id of_keystone_table[] = {
64+
static const struct of_device_id of_keystone_table[] = {
6565
{.compatible = "ti,keystone"},
6666
{ /* end of list */ },
6767
};

‎arch/arm/mach-mmp/time.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ void __init timer_init(int irq)
213213
}
214214

215215
#ifdef CONFIG_OF
216-
static struct of_device_id mmp_timer_dt_ids[] = {
216+
static const struct of_device_id mmp_timer_dt_ids[] = {
217217
{ .compatible = "mrvl,mmp-timer", },
218218
{}
219219
};

‎arch/arm/mach-mvebu/coherency.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ enum {
5151
COHERENCY_FABRIC_TYPE_ARMADA_380,
5252
};
5353

54-
static struct of_device_id of_coherency_table[] = {
54+
static const struct of_device_id of_coherency_table[] = {
5555
{.compatible = "marvell,coherency-fabric",
5656
.data = (void *) COHERENCY_FABRIC_TYPE_ARMADA_370_XP },
5757
{.compatible = "marvell,armada-375-coherency-fabric",

‎arch/arm/mach-mvebu/pmsu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ static void __iomem *pmsu_mp_base;
104104

105105
static void *mvebu_cpu_resume;
106106

107-
static struct of_device_id of_pmsu_table[] = {
107+
static const struct of_device_id of_pmsu_table[] = {
108108
{ .compatible = "marvell,armada-370-pmsu", },
109109
{ .compatible = "marvell,armada-370-xp-pmsu", },
110110
{ .compatible = "marvell,armada-380-pmsu", },

‎arch/arm/mach-mvebu/system-controller.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ int mvebu_system_controller_get_soc_id(u32 *dev, u32 *rev)
126126
return -ENODEV;
127127
}
128128

129-
#ifdef CONFIG_SMP
129+
#if defined(CONFIG_SMP) && defined(CONFIG_MACH_MVEBU_V7)
130130
void mvebu_armada375_smp_wa_init(void)
131131
{
132132
u32 dev, rev;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "mmio.h"
2828
#include "clcd.h"
2929

30-
static const char *nspire_dt_match[] __initconst = {
30+
static const char *const nspire_dt_match[] __initconst = {
3131
"ti,nspire",
3232
"ti,nspire-cx",
3333
"ti,nspire-tp",

‎arch/arm/mach-omap2/omap4-common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ static int __init omap4_sar_ram_init(void)
242242
}
243243
omap_early_initcall(omap4_sar_ram_init);
244244

245-
static struct of_device_id gic_match[] = {
245+
static const struct of_device_id gic_match[] = {
246246
{ .compatible = "arm,cortex-a9-gic", },
247247
{ .compatible = "arm,cortex-a15-gic", },
248248
{ },

‎arch/arm/mach-omap2/prm3xxx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ int __init omap3xxx_prm_init(void)
674674
return prm_register(&omap3xxx_prm_ll_data);
675675
}
676676

677-
static struct of_device_id omap3_prm_dt_match_table[] = {
677+
static const struct of_device_id omap3_prm_dt_match_table[] = {
678678
{ .compatible = "ti,omap3-prm" },
679679
{ }
680680
};

0 commit comments

Comments
 (0)