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

Commit e09d51ad 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 few more fixes that have come in, and one revert of a previous fix.

  I was a bit too trigger happy to enable PREEMPT on multi_v7_defconfig,
  and it ended up regressing at least BeagleBone XM boards. While we get
  that debugged for next merge window, let's disable it again.

  Beyond that:

   - Stratix change to fix multicast filtering

   - Minor DT fixes for Renesas and i.MX

   - Ethernet fix for a Renesas board (switching main interfaces)

   - Ethernet phy regulator fix for i.MX6SX"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  arm64: dts: stratix10: fix multicast filtering
  ARM: defconfig: Disable PREEMPT again on  multi_v7
  arm64: dts: renesas: condor: switch from EtherAVB to GEther
  dt-bindings: arm: Fix RZ/G2E part number
  arm64: dts: renesas: r8a7795: add missing dma-names on hscif2
  ARM: dts: imx6sx-sdb: Fix enet phy regulator
  ARM: dts: fsl: Fix improperly quoted stdout-path values
  ARM: dts: imx6sll: fix typo for fsl,imx6sll-i2c node
parents ecb4d529 a89f84a5

Documentation/devicetree/bindings/arm/shmobile.txt

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ SoCs: 
    compatible = "renesas,r8a77470"

  - RZ/G2M (R8A774A1)

    compatible = "renesas,r8a774a1"

  - RZ/G2E (RA8774C0)

  - RZ/G2E (R8A774C0)

    compatible = "renesas,r8a774c0"

  - R-Car M1A (R8A77781)

    compatible = "renesas,r8a7778"

arch/arm/boot/dts/imx53-ppd.dts

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
	};



	chosen {

		stdout-path = "&uart1:115200n8";

		stdout-path = "serial0:115200n8";

	};



	memory@70000000 {

arch/arm/boot/dts/imx6sll.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ 
			i2c1: i2c@21a0000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "fs,imx6sll-i2c", "fsl,imx21-i2c";

				compatible = "fsl,imx6sll-i2c", "fsl,imx21-i2c";

				reg = <0x021a0000 0x4000>;

				interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX6SLL_CLK_I2C1>;

arch/arm/boot/dts/imx6sx-sdb.dtsi

+6 −1
Original line number Diff line number Diff line
@@ -117,7 +117,9 @@ 
		regulator-name = "enet_3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;

		gpio = <&gpio2 6 GPIO_ACTIVE_LOW>;

		regulator-boot-on;

		regulator-always-on;

	};



	reg_pcie_gpio: regulator-pcie-gpio {
@@ -180,6 +182,7 @@ 
	phy-supply = <&reg_enet_3v3>;

	phy-mode = "rgmii";

	phy-handle = <&ethphy1>;

	phy-reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;

	status = "okay";



	mdio {
@@ -373,6 +376,8 @@ 
				MX6SX_PAD_RGMII1_RD3__ENET1_RX_DATA_3	0x3081

				MX6SX_PAD_RGMII1_RX_CTL__ENET1_RX_EN	0x3081

				MX6SX_PAD_ENET2_RX_CLK__ENET2_REF_CLK_25M	0x91

				/* phy reset */

				MX6SX_PAD_ENET2_CRS__GPIO2_IO_7		0x10b0

			>;

		};

arch/arm/boot/dts/vf610m4-colibri.dts

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ 
	compatible = "fsl,vf610m4";



	chosen {

		bootargs = "console=ttyLP2,115200 clk_ignore_unused init=/linuxrc rw";

		stdout-path = "&uart2";

		bootargs = "clk_ignore_unused init=/linuxrc rw";

		stdout-path = "serial2:115200";

	};



	memory@8c000000 {