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

Commit 41a328b9 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 Olof Johansson:
 "A bit larger set than usual, unfortunately -- I've been sitting on
  them longer than I meant to so it's really more like 2 -rc pull
  requests in one, volume-wise.

  Nearly everything is fixes for fallout from the merge window, or other
  fixes for bugs.  The one exception is the highbank L2-enablement
  patch, but it was contained enough that I picked it up anyway:

   - i.MX fixes, mostly for clock and pinctrl changes
   - OMAP fixes, mostly PM-related
   - A patch to enable L2 on highbank
   - A couple of fixes for PXA, Kirkwood, Versatile"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (30 commits)
  ARM: Kirkwood: Fix clk problems modular ethernet driver
  arm: versatile: fix and enable PCI I/O space
  ARM: highbank: Add smc calls to enable/disable the L2
  ARM i.MX imx21ads: Fix overlapping static i/o mappings
  ARM: imx6: exit coherency when shutting down a cpu
  ARM: mx51: Add pinctrl_provide_dummies()
  ARM: mx31: Add pinctrl_provide_dummies()
  ARM: OMAP2+: Fix compile for CONFIG_TIDSPBRIDGE platform init code
  ARM: OMAP3: Fix omap3_l3_block_irq warning when CONFIG_BUG is not set
  ARM: OMAP: Fix MMC_OMAP build when only MMC_OMAP_HS is selected
  OMAP2+: UART: Add mechanism to probe uart pins and configure rx wakeup
  ARM: mmp: fix missing cascade_irq in irq handler
  ARM: dts: update memory size on brownstone
  ARM i.MX27 Visstrim M10: fix gpio handling.
  ARM i.MX53: Fix PLL4 base address
  ARM i.MX pllv2: make round_rate accurate
  ARM i.MX pllv2: use standard register set unconditionally
  ARM: OMAP: Fix lis3lv02d accelerometer to use gpio_to_irq
  ARM: imx: only call l2x0_init if it's available
  ARM: imx: only specify i2c device type once
  ...
parents 485802a6 128789a8

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ config ARCH_VERSATILE 
	select ICST

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select NEED_MACH_IO_H if PCI

	select PLAT_VERSATILE

	select PLAT_VERSATILE_CLCD

	select PLAT_VERSATILE_FPGA_IRQ

arch/arm/boot/dts/mmp2-brownstone.dts

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
/include/ "mmp2.dtsi"



/ {

	model = "Marvell MMP2 Aspenite Development Board";

	model = "Marvell MMP2 Brownstone Development Board";

	compatible = "mrvl,mmp2-brownstone", "mrvl,mmp2";



	chosen {
@@ -19,7 +19,7 @@ 
	};



	memory {

		reg = <0x00000000 0x04000000>;

		reg = <0x00000000 0x08000000>;

	};



	soc {

arch/arm/mach-highbank/Makefile

+5 −1
Original line number Diff line number Diff line 
obj-y					:= clock.o highbank.o system.o

obj-y					:= clock.o highbank.o system.o smc.o



plus_sec := $(call as-instr,.arch_extension sec,+sec)

AFLAGS_smc.o				:=-Wa,-march=armv7-a$(plus_sec)



obj-$(CONFIG_DEBUG_HIGHBANK_UART)	+= lluart.o

obj-$(CONFIG_SMP)			+= platsmp.o

obj-$(CONFIG_HOTPLUG_CPU)		+= hotplug.o

arch/arm/mach-highbank/core.h

+1 −0
Original line number Diff line number Diff line
@@ -8,3 +8,4 @@ extern void highbank_lluart_map_io(void); 
static inline void highbank_lluart_map_io(void) {}

#endif



extern void highbank_smc1(int fn, int arg);

arch/arm/mach-highbank/highbank.c

+14 −0
Original line number Diff line number Diff line
@@ -85,10 +85,24 @@ const static struct of_device_id irq_match[] = { 
	{}

};



#ifdef CONFIG_CACHE_L2X0

static void highbank_l2x0_disable(void)

{

	/* Disable PL310 L2 Cache controller */

	highbank_smc1(0x102, 0x0);

}

#endif



static void __init highbank_init_irq(void)

{

	of_irq_init(irq_match);



#ifdef CONFIG_CACHE_L2X0

	/* Enable PL310 L2 Cache controller */

	highbank_smc1(0x102, 0x1);

	l2x0_of_init(0, ~0UL);

	outer_cache.disable = highbank_l2x0_disable;

#endif

}



static void __init highbank_timer_init(void)