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

Commit 9be66f55 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-fixes-for-v4.20' of... 

Merge tag 'renesas-fixes-for-v4.20' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes

Renesas ARM Based SoC Fixes for v4.20

* R-Car V3H (r8a77980) based Condor board
  - Switch from EtherAVB to GEther to match offical boards

* RZ/G2E (ra8774c0) SoC: correct documentation of part number

* R-Car H3 (r8a7795) SoC: reinstate all DMA channels on HSCIF2

* tag 'renesas-fixes-for-v4.20' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  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

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6ff6bc46 eab53fdf

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/arm64/boot/dts/renesas/r8a7795.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ 
			clock-names = "fck", "brg_int", "scif_clk";

			dmas = <&dmac1 0x35>, <&dmac1 0x34>,

			       <&dmac2 0x35>, <&dmac2 0x34>;

			dma-names = "tx", "rx";

			dma-names = "tx", "rx", "tx", "rx";

			power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;

			resets = <&cpg 518>;

			status = "disabled";

arch/arm64/boot/dts/renesas/r8a77980-condor.dts

+24 −23
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


	aliases {

		serial0 = &scif0;

		ethernet0 = &avb;

		ethernet0 = &gether;

	};



	chosen {
@@ -97,23 +97,6 @@ 
	};

};



&avb {

	pinctrl-0 = <&avb_pins>;

	pinctrl-names = "default";



	phy-mode = "rgmii-id";

	phy-handle = <&phy0>;

	renesas,no-ether-link;

	status = "okay";



	phy0: ethernet-phy@0 {

		rxc-skew-ps = <1500>;

		reg = <0>;

		interrupt-parent = <&gpio1>;

		interrupts = <17 IRQ_TYPE_LEVEL_LOW>;

	};

};



&canfd {

	pinctrl-0 = <&canfd0_pins>;

	pinctrl-names = "default";
@@ -139,6 +122,23 @@ 
	clock-frequency = <32768>;

};



&gether {

	pinctrl-0 = <&gether_pins>;

	pinctrl-names = "default";



	phy-mode = "rgmii-id";

	phy-handle = <&phy0>;

	renesas,no-ether-link;

	status = "okay";



	phy0: ethernet-phy@0 {

		rxc-skew-ps = <1500>;

		reg = <0>;

		interrupt-parent = <&gpio4>;

		interrupts = <23 IRQ_TYPE_LEVEL_LOW>;

	};

};



&i2c0 {

	pinctrl-0 = <&i2c0_pins>;

	pinctrl-names = "default";
@@ -236,16 +236,17 @@ 
};



&pfc {

	avb_pins: avb {

		groups = "avb_mdio", "avb_rgmii";

		function = "avb";

	};



	canfd0_pins: canfd0 {

		groups = "canfd0_data_a";

		function = "canfd0";

	};



	gether_pins: gether {

		groups = "gether_mdio_a", "gether_rgmii",

			 "gether_txcrefclk", "gether_txcrefclk_mega";

		function = "gether";

	};



	i2c0_pins: i2c0 {

		groups = "i2c0";

		function = "i2c0";