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

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

Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC fixes from Olof Johansson:
 "A series of fixes (and in some cases, some cleanups):

  Via Tony Lindgren:
   - A collection of OMAP regression fixes, in particular because
     firmware no longer sets up all pin states before starting the
     kernel.
   - cpufreq fixes for OMAP (Rafael is on vacation and this was
     pre-agreed).
   - A longer series of misc regression fixes and cleanups, warning
     removals, etc for OMAP

  From Arnd Bergmann:
   - A series of warning fixes for various platforms (defconfig builds)

  Misc:
   - A couple of tegra fixes, one for i.MX, some vt8500 fixes, etc."

* tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (73 commits)
  ARM: pxa: armcore: fix PCI PIO warnings
  ARM: integrator: use __iomem pointers for MMIO, part 2
  ARM: assabet: fix bogus warning in get_assabet_scr (again)
  ARM: shmobile: mark shmobile_init_late as __init
  ARM: integrator_cp: fix build failure
  ARM: OMAP4/AM335x: hwmod: fix disable_module regression in hardreset handling
  ARM: OMAP3: fix workaround for EMU clockdomain
  arm/omap: Replace board_ref_clock with enum values
  ARM: OMAP2+: remove duplicated include from board-omap3stalker.c
  arch/arm/plat-omap/omap-pm-noop.c: Remove unecessary semicolon
  arch/arm/mach-omap2: Remove unecessary semicolon
  arch/arm/mach-omap1/devices.c: Remove unecessary semicolon
  ARM/dts: omap5-evm: pinmux configuration for audio
  ARM/dts: Add pinctrl driver entries for omap5
  ARM/dts: omap4-panda: pinmux configuration for audio
  ARM/dts: omap4-sdp: pinmux configuration for audio
  ARM/dts: omap5-evm: Disable unused McBSP3
  ARM/dts: omap4-sdp: Disable unused McBSP3
  ARM/dts: omap4-panda: Disable unused audio IPs
  ARM: OMAP: board-omap4panda: Pin mux configuration for audio needs
  ...
parents 49999ab2 6bd5dbda

Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ as "armctrl" in the SoC documentation, hence naming of this binding. 


Required properties:



- compatible : should be "brcm,bcm2835-armctrl-ic.txt"

- compatible : should be "brcm,bcm2835-armctrl-ic"

- reg : Specifies base physical address and size of the registers.

- interrupt-controller : Identifies the node as an interrupt controller

- #interrupt-cells : Specifies the number of cells needed to encode an

Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ free running counter values, and generates an interrupt. 


Required properties:



- compatible : should be "brcm,bcm2835-system-timer.txt"

- compatible : should be "brcm,bcm2835-system-timer"

- reg : Specifies base physical address and size of the registers.

- interrupts : A list of 4 interrupt sinks; one per timer channel.

- clock-frequency : The frequency of the clock that drives the counter, in Hz.

arch/arm/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -494,7 +494,6 @@ config ARCH_IOP32X 
	depends on MMU

	select CPU_XSCALE

	select NEED_MACH_GPIO_H

	select NEED_MACH_IO_H

	select NEED_RET_TO_USER

	select PLAT_IOP

	select PCI
@@ -508,7 +507,6 @@ config ARCH_IOP33X 
	depends on MMU

	select CPU_XSCALE

	select NEED_MACH_GPIO_H

	select NEED_MACH_IO_H

	select NEED_RET_TO_USER

	select PLAT_IOP

	select PCI
@@ -1772,6 +1770,7 @@ source "mm/Kconfig" 
config FORCE_MAX_ZONEORDER

	int "Maximum zone order" if ARCH_SHMOBILE

	range 11 64 if ARCH_SHMOBILE

	default "12" if SOC_AM33XX

	default "9" if SA1111

	default "11"

	help

arch/arm/boot/dts/Makefile

+6 −9
Original line number Diff line number Diff line
@@ -25,14 +25,6 @@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \ 
	exynos4210-trats.dtb \

	exynos5250-smdk5250.dtb

dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb

dtb-$(CONFIG_ARCH_IMX5) += imx51-babbage.dtb \

	imx53-ard.dtb \

	imx53-evk.dtb \

	imx53-qsb.dtb \

	imx53-smd.dtb

dtb-$(CONFIG_SOC_IMX6Q) += imx6q-arm2.dtb \

	imx6q-sabrelite.dtb \

	imx6q-sabresd.dtb

dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb

dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \

	kirkwood-dns325.dtb \
@@ -76,7 +68,9 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	omap4-pandaES.dtb \

	omap4-var_som.dtb \

	omap4-sdp.dtb \

	omap5-evm.dtb

	omap5-evm.dtb \

	am335x-evm.dtb \

	am335x-bone.dtb

dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb

dtb-$(CONFIG_ARCH_U8500) += snowball.dtb

dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
@@ -104,5 +98,8 @@ dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \ 
	vexpress-v2p-ca15-tc1.dtb \

	vexpress-v2p-ca15_a7.dtb \

	xenvm-4.2.dtb

dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \

	wm8505-ref.dtb \

	wm8650-mid.dtb



endif

arch/arm/boot/dts/omap4-panda.dts

+47 −0
Original line number Diff line number Diff line
@@ -59,6 +59,41 @@ 
	};

};



&omap4_pmx_core {

	pinctrl-names = "default";

	pinctrl-0 = <

			&twl6040_pins

			&mcpdm_pins

			&mcbsp1_pins

	>;



	twl6040_pins: pinmux_twl6040_pins {

		pinctrl-single,pins = <

			0xe0 0x3	/* hdq_sio.gpio_127 OUTPUT | MODE3 */

			0x160 0x100	/* sys_nirq2.sys_nirq2 INPUT | MODE0 */

		>;

	};



	mcpdm_pins: pinmux_mcpdm_pins {

		pinctrl-single,pins = <

			0xc6 0x108	/* abe_pdm_ul_data.abe_pdm_ul_data INPUT PULLDOWN | MODE0 */

			0xc8 0x108	/* abe_pdm_dl_data.abe_pdm_dl_data INPUT PULLDOWN | MODE0 */

			0xca 0x118	/* abe_pdm_frame.abe_pdm_frame INPUT PULLUP | MODE0 */

			0xcc 0x108	/* abe_pdm_lb_clk.abe_pdm_lb_clk INPUT PULLDOWN | MODE0 */

			0xce 0x108	/* abe_clks.abe_clks INPUT PULLDOWN | MODE0 */

		>;

	};



	mcbsp1_pins: pinmux_mcbsp1_pins {

		pinctrl-single,pins = <

			0xbe 0x100	/* abe_mcbsp1_clkx.abe_mcbsp1_clkx INPUT | MODE0 */

			0xc0 0x108	/* abe_mcbsp1_dr.abe_mcbsp1_dr INPUT PULLDOWN | MODE0 */

			0xc2 0x8		/* abe_mcbsp1_dx.abe_mcbsp1_dx OUTPUT PULLDOWN | MODE0 */

			0xc4 0x100	/* abe_mcbsp1_fsx.abe_mcbsp1_fsx INPUT | MODE0 */

		>;

	};

};



&i2c1 {

	clock-frequency = <400000>;
@@ -137,3 +172,15 @@ 
	cs1-used;

	device-handle = <&elpida_ECB240ABACN>;

};



&mcbsp2 {

	status = "disabled";

};



&mcbsp3 {

	status = "disabled";

};



&dmic {

	status = "disabled";

};