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

Commit 878e9173 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-dt2-for-v4.13' of... 

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

Second Round of Renesas ARM Based SoC DT Updates for v4.13

Cleanup:
* Correct PCI bus dtc warnings for r8a779x SoCs

Enhancements:
* Add support for iWave G20D-Q7 board based on RZ/G1M SoC
* Add support for GR-Peach board based on r7s72100 SoC
* Add composite video and HDMI input to gose board

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

:
  ARM: dts: r8a779x: Fix PCI bus dtc warnings
  ARM: dts: iwg20d-q7: Add support for iWave G20D-Q7 board based on RZ/G1M
  ARM: dts: iwg20m: Add iWave RZG1M Qseven SOM
  ARM: dts: gose: add composite video input
  ARM: dts: r7s72100: Add support for GR-Peach
  ARM: dts: gose: add HDMI input

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents bf671ec6 f7d569c1

Documentation/devicetree/bindings/arm/shmobile.txt

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ Boards: 
    compatible = "renesas,bockw", "renesas,r8a7778"

  - Genmai (RTK772100BC00000BR)

    compatible = "renesas,genmai", "renesas,r7s72100"

  - GR-Peach (X28A-M01-E/F)

    compatible = "renesas,gr-peach", "renesas,r7s72100"

  - Gose (RTP0RC7793SEB00010S)

    compatible = "renesas,gose", "renesas,r8a7793"

  - H3ULCB (R-Car Starter Kit Premier, RTP0RC7795SKB00010S)

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -704,9 +704,11 @@ dtb-$(CONFIG_ARCH_REALVIEW) += \ 
dtb-$(CONFIG_ARCH_RENESAS) += \

	emev2-kzm9d.dtb \

	r7s72100-genmai.dtb \

	r7s72100-gr-peach.dtb \

	r7s72100-rskrza1.dtb \

	r8a73a4-ape6evm.dtb \

	r8a7740-armadillo800eva.dtb \

	r8a7743-iwg20d-q7.dtb \

	r8a7743-sk-rzg1m.dtb \

	r8a7745-sk-rzg1e.dtb \

	r8a7778-bockw.dtb \

arch/arm/boot/dts/r7s72100-gr-peach.dts

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

 * Device Tree Source for the GR-Peach board

 *

 * Copyright (C) 2017 Jacopo Mondi <jacopo+renesas@jmondi.org>

 * Copyright (C) 2016 Renesas Electronics

 *

 * 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.

 */



/dts-v1/;

#include "r7s72100.dtsi"



/ {

	model = "GR-Peach";

	compatible = "renesas,gr-peach", "renesas,r7s72100";



	aliases {

		serial0 = &scif2;

	};



	chosen {

		bootargs = "ignore_loglevel rw root=/dev/mtdblock0";

		stdout-path = "serial0:115200n8";

	};



	memory@20000000 {

		device_type = "memory";

		reg = <0x20000000 0x00a00000>;



	};



	lbsc {

		#address-cells = <1>;

		#size-cells = <1>;

	};



	flash@18000000 {

		compatible = "mtd-rom";

		probe-type = "map_rom";

		reg = <0x18000000 0x00800000>;

		bank-width = <4>;

		device-width = <1>;



		#address-cells = <1>;

		#size-cells = <1>;



		rootfs@600000 {

			label = "rootfs";

			reg = <0x00600000 0x00200000>;

		};

	};

};



&extal_clk {

	clock-frequency = <13333000>;

};



&usb_x1_clk {

	clock-frequency = <48000000>;

};



&scif2 {

	status = "okay";

};

arch/arm/boot/dts/r8a7743-iwg20d-q7.dts

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

 * Device Tree Source for the iWave-RZG1M Qseven carrier board

 *

 * Copyright (C) 2017 Renesas Electronics Corp.

 *

 * 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.

 */



/dts-v1/;

#include "r8a7743-iwg20m.dtsi"



/ {

	model = "iWave Systems RainboW-G20D-Qseven board based on RZ/G1M";

	compatible = "iwave,g20d", "iwave,g20m", "renesas,r8a7743";



	aliases {

		serial0 = &scif0;

	};

};



&scif0 {

	status = "okay";

};

arch/arm/boot/dts/r8a7743-iwg20m.dtsi

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

 * Device Tree Source for the iWave-RZG1M-20M Qseven SOM

 *

 * Copyright (C) 2017 Renesas Electronics Corp.

 *

 * 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 "r8a7743.dtsi"



/ {

	compatible = "iwave,g20m", "renesas,r8a7743";



	memory@40000000 {

		device_type = "memory";

		reg = <0 0x40000000 0 0x20000000>;

	};



	memory@200000000 {

		device_type = "memory";

		reg = <2 0x00000000 0 0x20000000>;

	};

};



&extal_clk {

	clock-frequency = <20000000>;

};