Commit 37820108 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 set of fixes and some minor cleanups for -rc2:

   - A series from Arnd that fixes warnings in drivers and other code
     included by ARM defconfigs.  Most have been acked by corresponding
     maintainers (and seem quite hard to argue not picking up anyway in
     the few exception cases).
   - A few misc patches from the list for integrator/vt8500/i.MX
   - A batch of fixes to OMAP platforms, fixing:
     - boot problems on beaglebone,
     - regression fixes for local timers
     - clockdomain locking fixes
     - a few boot/sparse warnings
   - For Tegra:
     - Clock rate calculation overflow fix
     - Revert a change that removed timer clocks and a fix for symbol
       name clashes
   - For Renesas:
     - IO accessor / annotation cleanups to remove warnings
   - For Kirkwood/Dove/mvebu:
     - Fixes for device trees for Dove (some minor cleanups, some fixes)
     - Fixes for the mvebu gpio driver
     - Fix build problem for Feroceon due to missing ifdefs
     - Fix lsxl DTS files"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits)
  ARM: kirkwood: fix buttons on lsxl boards
  ARM: kirkwood: fix LEDs names for lsxl boards
  ARM: Kirkwood: fix disabling CACHE_FEROCEON_L2
  gpio: mvebu: Add missing breaks in mvebu_gpio_irq_set_type
  ARM: dove: Add crypto engine to DT
  ARM: dove: Remove watchdog from DT
  ARM: dove: Restructure SoC device tree descriptor
  ARM: dove: Fix clock names of sata and gbe
  ARM: dove: Fix tauros2 device tree init
  ARM: dove: Add pcie clock support
  ARM: OMAP2+: Allow kernel to boot even if GPMC fails to reserve memory
  ARM: OMAP: clockdomain: Fix locking on _clkdm_clk_hwmod_enable / disable
  ARM: s3c: mark s3c2440_clk_add as __init_refok
  spi/s3c64xx: use correct dma_transfer_direction type
  ARM: OMAP4: devices: fixup OMAP4 DMIC platform device error message
  ARM: OMAP2+: clock data: Add dev-id for the omap-gpmc dummy fck
  ARM: OMAP: resolve sparse warning concerning debug_card_init()
  ARM: OMAP4: Fix twd_local_timer_register regression
  ARM: tegra: add tegra_timer clock
  ARM: tegra: rename tegra system timer
  ...
parents caabe240 70f3900e

arch/arm/boot/dts/Makefile

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

	exynos5250-smdk5250.dtb

dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb

dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \

	integratorcp.dtb

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

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

	kirkwood-dns325.dtb \

arch/arm/boot/dts/dove.dtsi

+32 −17
Original line number Diff line number Diff line
@@ -4,22 +4,33 @@ 
	compatible = "marvell,dove";

	model = "Marvell Armada 88AP510 SoC";



	soc@f1000000 {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		interrupt-parent = <&intc>;



		ranges = <0xc8000000 0xc8000000 0x0100000   /* CESA SRAM   1M */

		          0xe0000000 0xe0000000 0x8000000   /* PCIe0 Mem 128M */

		          0xe8000000 0xe8000000 0x8000000   /* PCIe1 Mem 128M */

		          0xf0000000 0xf0000000 0x0100000   /* ScratchPad  1M */

		          0x00000000 0xf1000000 0x1000000   /* SB/NB regs 16M */

		          0xf2000000 0xf2000000 0x0100000   /* PCIe0 I/O   1M */

		          0xf2100000 0xf2100000 0x0100000   /* PCIe0 I/O   1M */

		          0xf8000000 0xf8000000 0x8000000>; /* BootROM   128M */



		l2: l2-cache {

			compatible = "marvell,tauros2-cache";

			marvell,tauros2-cache-features = <0>;

		};



		intc: interrupt-controller {

			compatible = "marvell,orion-intc";

			interrupt-controller;

			#interrupt-cells = <1>;

		reg = <0xf1020204 0x04>,

		      <0xf1020214 0x04>;

			reg = <0x20204 0x04>, <0x20214 0x04>;

		};



	mbus@f1000000 {

		compatible = "simple-bus";

		ranges = <0 0xf1000000 0x4000000>;

		#address-cells = <1>;

		#size-cells = <1>;



		uart0: serial@12000 {

			compatible = "ns16550a";

			reg = <0x12000 0x100>;
@@ -56,11 +67,6 @@ 
			status = "disabled";

		};



		wdt: wdt@20300 {

			compatible = "marvell,orion-wdt";

			reg = <0x20300 0x28>;

		};



		gpio0: gpio@d0400 {

			compatible = "marvell,orion-gpio";

			#gpio-cells = <2>;
@@ -139,5 +145,14 @@ 
			nr-ports = <1>;

			status = "disabled";

		};



		crypto: crypto@30000 {

			compatible = "marvell,orion-crypto";

			reg = <0x30000 0x10000>,

			      <0xc8000000 0x800>;

			reg-names = "regs", "sram";

			interrupts = <31>;

			status = "okay";

		};

	};

};

arch/arm/boot/dts/imx6q-arm2.dts

+9 −1
Original line number Diff line number Diff line
@@ -37,6 +37,13 @@ 
					pinctrl_hog: hoggrp {

						fsl,pins = <

							176  0x80000000	/* MX6Q_PAD_EIM_D25__GPIO_3_25 */

						>;

					};

				};



				arm2 {

					pinctrl_usdhc3_arm2: usdhc3grp-arm2 {

						fsl,pins = <

							1363 0x80000000	/* MX6Q_PAD_NANDF_CS0__GPIO_6_11 */

							1369 0x80000000 /* MX6Q_PAD_NANDF_CS1__GPIO_6_14 */

						>;
@@ -58,7 +65,8 @@ 
				wp-gpios = <&gpio6 14 0>;

				vmmc-supply = <&reg_3p3v>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usdhc3_1>;

				pinctrl-0 = <&pinctrl_usdhc3_1

					     &pinctrl_usdhc3_arm2>;

				status = "okay";

			};

arch/arm/boot/dts/kirkwood-lsxl.dtsi

+10 −8
Original line number Diff line number Diff line
@@ -48,17 +48,19 @@ 
		#size-cells = <0>;

		button@1 {

			label = "Function Button";

			linux,code = <132>;

			linux,code = <357>;

			gpios = <&gpio1 9 1>;

		};

		button@2 {

			label = "Power-on Switch";

			linux,code = <116>;

			linux,code = <0>;

			linux,input-type = <5>;

			gpios = <&gpio1 10 1>;

		};

		button@3 {

			label = "Power-auto Switch";

			linux,code = <142>;

			linux,code = <1>;

			linux,input-type = <5>;

			gpios = <&gpio1 11 1>;

		};

	};
@@ -67,28 +69,28 @@ 
		compatible = "gpio-leds";



		led@1 {

			label = "lschlv2:blue:func";

			label = "lsxl:blue:func";

			gpios = <&gpio1 4 1>;

		};



		led@2 {

			label = "lschlv2:red:alarm";

			label = "lsxl:red:alarm";

			gpios = <&gpio1 5 1>;

		};



		led@3 {

			label = "lschlv2:amber:info";

			label = "lsxl:amber:info";

			gpios = <&gpio1 6 1>;

		};



		led@4 {

			label = "lschlv2:blue:power";

			label = "lsxl:blue:power";

			gpios = <&gpio1 7 1>;

			linux,default-trigger = "default-on";

		};



		led@5 {

			label = "lschlv2:red:func";

			label = "lsxl:red:func";

			gpios = <&gpio1 16 1>;

		};

	};

arch/arm/boot/dts/wm8505.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -71,13 +71,13 @@ 
		ehci@d8007100 {

			compatible = "via,vt8500-ehci";

			reg = <0xd8007100 0x200>;

			interrupts = <43>;

			interrupts = <1>;

		};



		uhci@d8007300 {

			compatible = "platform-uhci";

			reg = <0xd8007300 0x200>;

			interrupts = <43>;

			interrupts = <0>;

		};



		fb@d8050800 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE