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

Commit 203ec2fe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Olof Johansson:
 "A handful of fixes. I've been queuing them up a bit too long so the
  list is longer than it otherwise would have been spread out across a
  few -rcs.

  In general, it's a scattering of fixes across several platforms,
  nothing truly serious enough to point out.

  There's a slightly larger batch of them for the Davinci platforms due
  to work to bring them back to life after some time, so there's a
  handful of regressions, some of them going back very far, others more
  recent.

  There's also a few patches fixing DT on Renesas platforms since they
  changed some bindings without remaining backwards compatible,
  splitting up describing LVDS as a proper bridge instead of having it
  as part of the display unit.

  We could push for them to be backwards compatible with old device
  trees, but it's likely to regress eventually if nobody's actually
  using said compatibility"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (36 commits)
  ARM: davinci: board-dm646x-evm: set VPIF capture card name
  ARM: davinci: board-dm646x-evm: pass correct I2C adapter id for VPIF
  ARM: davinci: dm646x: fix timer interrupt generation
  ARM: keystone: fix platform_domain_notifier array overrun
  arm64: dts: exynos: Fix interrupt type for I2S1 device on Exynos5433
  ARM: dts: imx51-zii-rdu1: fix touchscreen bindings
  firmware: arm_scmi: Use after free in scmi_create_protocol_device()
  ARM: dts: cygnus: fix irq type for arm global timer
  Revert "ARM: dts: logicpd-som-lv: Fix pinmux controller references"
  tee: check shm references are consistent in offset/size
  tee: shm: fix use-after-free via temporarily dropped reference
  ARM: dts: imx7s: Pass the 'fsl,sec-era' property
  ARM: dts: tegra20: Revert "Fix ULPI regression on Tegra20"
  ARM: dts: correct missing "compatible" entry for ti81xx SoCs
  ARM: OMAP1: ams-delta: fix deferred_fiq handler
  arm64: tegra: Make BCM89610 PHY interrupt as active low
  ARM: davinci: fix GPIO lookup for I2C
  ARM: dts: logicpd-som-lv: Fix pinmux controller references
  ARM: dts: logicpd-som-lv: Fix Audio Mute
  ARM: dts: logicpd-som-lv: Fix WL127x Startup Issues
  ...
parents 0b449a44 709f490d

Documentation/devicetree/bindings/net/marvell-pp2.txt

+5 −4
Original line number Original line Diff line number Diff line
@@ -21,9 +21,10 @@ Required properties: 
	- main controller clock (for both armada-375-pp2 and armada-7k-pp2)

	- main controller clock (for both armada-375-pp2 and armada-7k-pp2)

	- GOP clock (for both armada-375-pp2 and armada-7k-pp2)

	- GOP clock (for both armada-375-pp2 and armada-7k-pp2)

	- MG clock (only for armada-7k-pp2)

	- MG clock (only for armada-7k-pp2)

	- MG Core clock (only for armada-7k-pp2)

	- AXI clock (only for armada-7k-pp2)

	- AXI clock (only for armada-7k-pp2)

- clock-names: names of used clocks, must be "pp_clk", "gop_clk", "mg_clk"

- clock-names: names of used clocks, must be "pp_clk", "gop_clk", "mg_clk",

  and "axi_clk" (the 2 latter only for armada-7k-pp2).

  "mg_core_clk" and "axi_clk" (the 3 latter only for armada-7k-pp2).





The ethernet ports are represented by subnodes. At least one port is

The ethernet ports are represented by subnodes. At least one port is

required.

required.
@@ -80,8 +81,8 @@ cpm_ethernet: ethernet@0 { 
	compatible = "marvell,armada-7k-pp22";

	compatible = "marvell,armada-7k-pp22";

	reg = <0x0 0x100000>, <0x129000 0xb000>;

	reg = <0x0 0x100000>, <0x129000 0xb000>;

	clocks = <&cpm_syscon0 1 3>, <&cpm_syscon0 1 9>,

	clocks = <&cpm_syscon0 1 3>, <&cpm_syscon0 1 9>,

		 <&cpm_syscon0 1 5>, <&cpm_syscon0 1 18>;

		 <&cpm_syscon0 1 5>, <&cpm_syscon0 1 6>, <&cpm_syscon0 1 18>;

	clock-names = "pp_clk", "gop_clk", "gp_clk", "axi_clk";

	clock-names = "pp_clk", "gop_clk", "mg_clk", "mg_core_clk", "axi_clk";





	eth0: eth0 {

	eth0: eth0 {

		interrupts = <ICU_GRP_NSR 39 IRQ_TYPE_LEVEL_HIGH>,

		interrupts = <ICU_GRP_NSR 39 IRQ_TYPE_LEVEL_HIGH>,

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -69,7 +69,7 @@ 
		timer@20200 {

		timer@20200 {

			compatible = "arm,cortex-a9-global-timer";

			compatible = "arm,cortex-a9-global-timer";

			reg = <0x20200 0x100>;

			reg = <0x20200 0x100>;

			interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;

			clocks = <&periph_clk>;

			clocks = <&periph_clk>;

		};

		};

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -21,8 +21,8 @@ 
		stdout-path = "serial2:115200n8";

		stdout-path = "serial2:115200n8";

	};

	};





	memory {

	memory@c0000000 {

		device_type = "memory";

		/* 128 MB DDR2 SDRAM @ 0xc0000000 */

		reg = <0xc0000000 0x08000000>;

		reg = <0xc0000000 0x08000000>;

	};

	};

arch/arm/boot/dts/da850.dtsi

+10 −3
Original line number Original line Diff line number Diff line
@@ -7,10 +7,19 @@ 
 * Free Software Foundation;  either version 2 of the  License, or (at your

 * Free Software Foundation;  either version 2 of the  License, or (at your

 * option) any later version.

 * option) any later version.

 */

 */

#include "skeleton.dtsi"

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/interrupt-controller/irq.h>





/ {

/ {

	#address-cells = <1>;

	#size-cells = <1>;

	chosen { };

	aliases { };



	memory@c0000000 {

		device_type = "memory";

		reg = <0xc0000000 0x0>;

	};



	arm {

	arm {

		#address-cells = <1>;

		#address-cells = <1>;

		#size-cells = <1>;

		#size-cells = <1>;
@@ -46,8 +55,6 @@ 
		pmx_core: pinmux@14120 {

		pmx_core: pinmux@14120 {

			compatible = "pinctrl-single";

			compatible = "pinctrl-single";

			reg = <0x14120 0x50>;

			reg = <0x14120 0x50>;

			#address-cells = <1>;

			#size-cells = <0>;

			#pinctrl-cells = <2>;

			#pinctrl-cells = <2>;

			pinctrl-single,bit-per-mux;

			pinctrl-single,bit-per-mux;

			pinctrl-single,register-width = <32>;

			pinctrl-single,register-width = <32>;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ 




/ {

/ {

	model = "DM8148 EVM";

	model = "DM8148 EVM";

	compatible = "ti,dm8148-evm", "ti,dm8148";

	compatible = "ti,dm8148-evm", "ti,dm8148", "ti,dm814";





	memory@80000000 {

	memory@80000000 {

		device_type = "memory";

		device_type = "memory";