Commit 65f4740e authored Aug 04, 2017 by Linus Torvalds

arm-soc

Pull ARM SoC fixes from Arnd Bergmann:
 "This comes a bit later than I planned, and as a consequence is a
  larger than it should be.

  Most of the changes are devicetree fixes, across lots of platforms:
  Renesas, Samsung Exynos, Marvell EBU, TI OMAP, Rockchips, Amlogic
  Meson, Sigma Desings Tango, Allwinner SUNxi and TI Davinci.

  Also across many platforms, I applied an older series of simple
  randconfig build fixes. This includes making the CONFIG_MTD_XIP option
  compile again, which had been broken for many years and probably has
  not been missed, but it felt wrong to just remove it completely.

  The only other changes are:

   - We enable HWSPINLOCK in defconfig to get some Qualcomm boards to
     work out of the box.

   - A few regression fixes for Texas Instruments OMAP2+.

   - A boot regression fix for the Renesas regulator quirk.

   - A suspend/resume fix for Uniphier SoCs, fixing the resume of the
     system bus"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
  ARM: dts: tango4: Request RGMII RX and TX clock delays
  bus: uniphier-system-bus: set up registers when resuming
  ARM64: dts: marvell: armada-37xx: Fix the number of GPIO on south bridge
  ARM: shmobile: rcar-gen2: Fix deadlock in regulator quirk
  arm64: defconfig: enable missing HWSPINLOCK
  ARM: pxa: select both FB and FB_W100 for eseries
  ARM: ixp4xx: fix ioport_unmap definition
  ARM: ep93xx: use ARM_PATCH_PHYS_VIRT correctly
  ARM: mmp: mark usb_dma_mask as __maybe_unused
  ARM: omap2: mark unused functions as __maybe_unused
  ARM: omap1: avoid unused variable warning
  ARM: sirf: mark sirfsoc_init_late as __maybe_unused
  ARM: ixp4xx: use normal prototype for {read,write}s{b,w,l}
  ARM: omap1/ams-delta: warn about failed regulator enable
  ARM: rpc: rename RAM_SIZE macro
  ARM: w90x900: normalize clk API
  ARM: ep93xx: normalize clk API
  ARM: dts: sun8i: a83t: Switch to CCU device tree binding macros
  arm64: allwinner: sun50i-a64: Correct emac register size
  ARM: dts: sunxi: h3/h5: Correct emac register size
  ...

parents b3c6858f 41c454fa

Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ Optional properties:
		Example for a Mali-T760:

		gpu@ffa30000 {
		compatible = "rockchip,rk3288-mali", "arm,mali-t760", "arm,mali-midgard";
		compatible = "rockchip,rk3288-mali", "arm,mali-t760";
		reg = <0xffa30000 0x10000>;
		interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,

arch/arm/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -380,7 +380,7 @@ config ARCH_EP93XX
		bool "EP93xx-based"
		select ARCH_HAS_HOLES_MEMORYMODEL
		select ARM_AMBA
		select ARM_PATCH_PHYS_VIRT
		imply ARM_PATCH_PHYS_VIRT
		select ARM_VIC
		select AUTO_ZRELADDR
		select CLKDEV_LOOKUP

arch/arm/boot/dts/armada-388-gp.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@
		pinctrl-names = "default";
		pinctrl-0 = <&pca0_pins>;
		interrupt-parent = <&gpio0>;
		interrupts = <18 IRQ_TYPE_EDGE_FALLING>;
		interrupts = <18 IRQ_TYPE_LEVEL_LOW>;
		gpio-controller;
		#gpio-cells = <2>;
		interrupt-controller;
		@@ -87,7 +87,7 @@
		compatible = "nxp,pca9555";
		pinctrl-names = "default";
		interrupt-parent = <&gpio0>;
		interrupts = <18 IRQ_TYPE_EDGE_FALLING>;
		interrupts = <18 IRQ_TYPE_LEVEL_LOW>;
		gpio-controller;
		#gpio-cells = <2>;
		interrupt-controller;

arch/arm/boot/dts/da850-evm.dts

+0 −21

Original line number	Diff line number	Diff line
		@@ -301,25 +301,4 @@
		pinctrl-names = "default";
		pinctrl-0 = <&vpif_capture_pins>, <&vpif_display_pins>;
		status = "okay";

		/* VPIF capture port */
		port@0 {
		vpif_input_ch0: endpoint@0 {
		reg = <0>;
		bus-width = <8>;
		};

		vpif_input_ch1: endpoint@1 {
		reg = <1>;
		bus-width = <8>;
		data-shift = <8>;
		};
		};

		/* VPIF display port */
		port@1 {
		vpif_output_ch0: endpoint {
		bus-width = <8>;
		};
		};
		};

arch/arm/boot/dts/da850-lcdk.dts

+0 −7

Original line number	Diff line number	Diff line
		@@ -318,11 +318,4 @@
		pinctrl-names = "default";
		pinctrl-0 = <&vpif_capture_pins>;
		status = "okay";

		/* VPIF capture port */
		port {
		vpif_ch0: endpoint {
		bus-width = <8>;
		};
		};
		};

Admin message