Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21770332 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c8c6c9ba 444d2d33

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

+20 −0
Original line number Diff line number Diff line
@@ -70,6 +70,26 @@ 
		};

	};



	i2c0: i2c@18008000 {

		compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c";

		reg = <0x18008000 0x100>;

		#address-cells = <1>;

		#size-cells = <0>;

		interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>;

		clock-frequency = <100000>;

		status = "disabled";

	};



	i2c1: i2c@1800b000 {

		compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c";

		reg = <0x1800b000 0x100>;

		#address-cells = <1>;

		#size-cells = <0>;

		interrupts = <GIC_SPI 86 IRQ_TYPE_NONE>;

		clock-frequency = <100000>;

		status = "disabled";

	};



	uart0: serial@18020000 {

		compatible = "snps,dw-apb-uart";

		reg = <0x18020000 0x100>;

arch/arm/boot/dts/bcm63138.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -66,8 +66,9 @@ 
			reg = <0x1d000 0x1000>;

			cache-unified;

			cache-level = <2>;

			cache-sets = <16>;

			cache-size = <0x80000>;

			cache-size = <524288>;

			cache-sets = <1024>;

			cache-line-size = <32>;

			interrupts = <GIC_PPI 0 IRQ_TYPE_LEVEL_HIGH>;

		};

arch/arm/kernel/perf_event_cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ static void cpu_pmu_destroy(struct arm_pmu *cpu_pmu) 
/*

 * PMU platform driver and devicetree bindings.

 */

static struct of_device_id cpu_pmu_of_device_ids[] = {

static const struct of_device_id cpu_pmu_of_device_ids[] = {

	{.compatible = "arm,cortex-a17-pmu",	.data = armv7_a17_pmu_init},

	{.compatible = "arm,cortex-a15-pmu",	.data = armv7_a15_pmu_init},

	{.compatible = "arm,cortex-a12-pmu",	.data = armv7_a12_pmu_init},

arch/arm/mach-at91/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ config SOC_SAMA5D4 
	select SOC_SAMA5

	select CLKSRC_MMIO

	select CACHE_L2X0

	select CACHE_PL310

	select HAVE_FB_ATMEL

	select HAVE_AT91_UTMI

	select HAVE_AT91_SMD

arch/arm/mach-at91/at91rm9200_time.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static struct clock_event_device clkevt = { 
void __iomem *at91_st_base;

EXPORT_SYMBOL_GPL(at91_st_base);



static struct of_device_id at91rm9200_st_timer_ids[] = {

static const struct of_device_id at91rm9200_st_timer_ids[] = {

	{ .compatible = "atmel,at91rm9200-st" },

	{ /* sentinel */ }

};