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

Commit 918c8223 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-arm64-dt2-for-v4.15' of... 

Merge tag 'renesas-arm64-dt2-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Pull "Second Round of Renesas ARM64 Based SoC DT Updates for v4.15" from Simon Horman:

* r8a7795 (H3) and r8a7796 (M3-W) SoCs
  - Use R-Car Gen 3 fallback compat string for GPIO

    Simon Horman says "Use newly added R-Car GPIO Gen 1, 2 and 3 fallback
    compat strings in peace of now deprecated non-generation specific R-Car
    GPIO fallback compat string in the DT of Renesas ARM and arm64 based
    SoCs.

* r8a7795 (H3) and r8a7796 (M3-W) Salvator boards
  - Add dr_mode property for USB2.0 channel 0

    Shimoda-san says "Since Salvator-X[S] have a USB2.0 dual-role channel
    (CN9), this patch
    adds dr_mode property for USB2.0 channel 0 (EHCI/OHCI and HS-USB)
    as "otg".

    Using dual-role channel (or not) is related to the type of USB receptor
    on board specification. So, I added the property into the
    salvator-common.dtsi."

  - Add pfc node for USB3.0 channel 0

    Shimoda-san says "Since a R-Car Gen3 bootloader enables the PFC of
    USB3.0 channel 0, the USB3.0 host controller works without this setting
    on the kernel.  But, this setting should have salvator-common.dtsi. So,
    this patch adds the pfc node for USB3.0 channel 0."

* r8a7795 (H3) and r8a7796 (M3-W) Salvator and ULCB boards
  - Correct audio_clkout

    Morimoto-san says ""audio_clkout" is dummy clock of <&rcar_sound 0> to
    avoid clock loop which invites probe conflct. Thus <&rcar_sound 0> and
    "audio_clkout" should be same value."

* r8a7795 (H3) and r8a7796 (M3-W) Salvator and ULCB, and
  r8a77995 (D3) Draak boards
  - Drop "avb_phy_int" from avb_pins

    Shimoda-san says "Since the Ethernet AVB driver doesn't support
    AVB_PHY_INT handling and it will be handled by a phy driver as a gpio
    pin, this patch removes the "avb_phy_int" from the avb_pins node."

* r8a77995 (D3) Draak board
  - Enable PWM channels

    Shimoda-san says "Each channel connects to LTC2644 for brightness
    control."

* r8a77970 (V3M) Eagle and ULCB Kingfisher boards
  - Add initial device tree support

* tag 'renesas-arm64-dt2-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (31 commits)
  arm64: dts: renesas: salvator-common: add dr_mode property for USB2.0 channel 0
  arm64: dts: r8a7796: Use R-Car GPIO Gen3 fallback compat string
  arm64: dts: r8a7795: Use R-Car GPIO Gen3 fallback compat string
  arm64: renesas: ulcb: fixup audio_clkout
  arm64: renesas: salvator-common: fixup audio_clkout
  arm64: dts: renesas: eagle: add EtherAVB support
  arm64: dts: r8a77995: Add INTC-EX device node
  arm64: dts: r8a77970: Add INTC-EX device node
  arm64: dts: r8a7796: Add INTC-EX device node
  arm64: dts: ulcb-kf: hog USB3 hub control gpios
  arm64: dts: ulcb-kf: enable PCA9548 on I2C4
  arm64: dts: ulcb-kf: enable PCA9548 on I2C2
  arm64: dts: ulcb-kf: enable TCA9539 on I2C4
  arm64: dts: ulcb-kf: enable TCA9539 on I2C2
  arm64: dts: ulcb-kf: enable USB3.0 Host
  arm64: dts: ulcb-kf: enable PCIE0/1
  arm64: dts: ulcb-kf: enable USB2.0 Host channel 0
  arm64: dts: ulcb-kf: enable HSUSB
  arm64: dts: ulcb-kf: enable CAN0/1
  arm64: dts: ulcb-kf: enable SCIF1
  ...
parents 11c3889c e9ce3538

arch/arm64/boot/dts/renesas/Makefile

+4 −0
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-x.dtb r8a7795-h3ulcb.dtb

dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-h3ulcb-kf.dtb

dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-xs.dtb

dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-salvator-x.dtb r8a7795-es1-h3ulcb.dtb

dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-h3ulcb-kf.dtb

dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb

dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-m3ulcb-kf.dtb

dtb-$(CONFIG_ARCH_R8A77970) += r8a77970-eagle.dtb

dtb-$(CONFIG_ARCH_R8A77995) += r8a77995-draak.dtb



always		:= $(dtb-y)

arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * Device Tree Source for the H3ULCB Kingfisher board

 *

 * Copyright (C) 2017 Renesas Electronics Corp.

 * Copyright (C) 2017 Cogent Embedded, Inc.

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */



#include "r8a7795-es1-h3ulcb.dts"

#include "ulcb-kf.dtsi"



/ {

	model = "Renesas H3ULCB Kingfisher board based on r8a7795 ES1.x";

	compatible = "shimafuji,kingfisher", "renesas,h3ulcb",

		     "renesas,r8a7795";

};

arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * Device Tree Source for the H3ULCB Kingfisher board

 *

 * Copyright (C) 2017 Renesas Electronics Corp.

 * Copyright (C) 2017 Cogent Embedded, Inc.

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */



#include "r8a7795-h3ulcb.dts"

#include "ulcb-kf.dtsi"



/ {

	model = "Renesas H3ULCB Kingfisher board based on r8a7795 ES2.0+";

	compatible = "shimafuji,kingfisher", "renesas,h3ulcb",

		     "renesas,r8a7795";

};

arch/arm64/boot/dts/renesas/r8a7795.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ 


		gpio0: gpio@e6050000 {

			compatible = "renesas,gpio-r8a7795",

				     "renesas,gpio-rcar";

				     "renesas,rcar-gen3-gpio";

			reg = <0 0xe6050000 0 0x50>;

			interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;

			#gpio-cells = <2>;
@@ -235,7 +235,7 @@ 


		gpio1: gpio@e6051000 {

			compatible = "renesas,gpio-r8a7795",

				     "renesas,gpio-rcar";

				     "renesas,rcar-gen3-gpio";

			reg = <0 0xe6051000 0 0x50>;

			interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;

			#gpio-cells = <2>;
@@ -250,7 +250,7 @@ 


		gpio2: gpio@e6052000 {

			compatible = "renesas,gpio-r8a7795",

				     "renesas,gpio-rcar";

				     "renesas,rcar-gen3-gpio";

			reg = <0 0xe6052000 0 0x50>;

			interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;

			#gpio-cells = <2>;
@@ -265,7 +265,7 @@ 


		gpio3: gpio@e6053000 {

			compatible = "renesas,gpio-r8a7795",

				     "renesas,gpio-rcar";

				     "renesas,rcar-gen3-gpio";

			reg = <0 0xe6053000 0 0x50>;

			interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;

			#gpio-cells = <2>;
@@ -280,7 +280,7 @@ 


		gpio4: gpio@e6054000 {

			compatible = "renesas,gpio-r8a7795",

				     "renesas,gpio-rcar";

				     "renesas,rcar-gen3-gpio";

			reg = <0 0xe6054000 0 0x50>;

			interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;

			#gpio-cells = <2>;
@@ -295,7 +295,7 @@ 


		gpio5: gpio@e6055000 {

			compatible = "renesas,gpio-r8a7795",

				     "renesas,gpio-rcar";

				     "renesas,rcar-gen3-gpio";

			reg = <0 0xe6055000 0 0x50>;

			interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;

			#gpio-cells = <2>;
@@ -310,7 +310,7 @@ 


		gpio6: gpio@e6055400 {

			compatible = "renesas,gpio-r8a7795",

				     "renesas,gpio-rcar";

				     "renesas,rcar-gen3-gpio";

			reg = <0 0xe6055400 0 0x50>;

			interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;

			#gpio-cells = <2>;
@@ -325,7 +325,7 @@ 


		gpio7: gpio@e6055800 {

			compatible = "renesas,gpio-r8a7795",

				     "renesas,gpio-rcar";

				     "renesas,rcar-gen3-gpio";

			reg = <0 0xe6055800 0 0x50>;

			interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

			#gpio-cells = <2>;

arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * Device Tree Source for the M3ULCB Kingfisher board

 *

 * Copyright (C) 2017 Renesas Electronics Corp.

 * Copyright (C) 2017 Cogent Embedded, Inc.

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */



#include "r8a7796-m3ulcb.dts"

#include "ulcb-kf.dtsi"



/ {

	model = "Renesas M3ULCB Kingfisher board based on r8a7796";

	compatible = "shimafuji,kingfisher", "renesas,m3ulcb",

		     "renesas,r8a7796";

};