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

Commit a6023d05 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

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

Fixes (for v4.9):
* Correct PWM clock parent on r8a7794 SoC

Clean-up:
* Remove obsolete vsp1 properties from r8a779[01] SoCs

New boards:
* Add r8a7792/wheat and r7s72100/rskrza1 boards

Enablement:
* Enable LEDs, DU, SDHI on r8a7792/blanche board
* Enable MMCIF and SDHI on r8a7794/alt board
* Add SPI and VSP1 to r8a7792 SoC
* Add ethernet to r7s72100 SoC

* tag 'renesas-dt2-for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (26 commits)
  ARM: dts: wheat: add support for tactile switches
  ARM: dts: wheat: add QSPI support
  ARM: dts: r8a7792: add QSPI support
  ARM: dts: r8a7792: add QSPI clock
  ARM: dts: wheat: add SDHI0 support
  ARM: dts: wheat: add CAN support
  ARM: dts: r8a7794: fix PWM clock parent
  ARM: dts: rskrza1: add ethernet DT support
  ARM: dts: r7s72100: add ethernet to device tree
  ARM: dts: r7s72100: add ethernet clock to device tree
  ARM: dts: rskrza1: initial device tree
  ARM: dts: Add RSKRZA1 DT bindings documentation
  ARM: dts: wheat: add Ethernet support
  ARM: dts: wheat: initial device tree
  ARM: dts: document Wheat board
  ARM: dts: blanche: add support for general purpose LEDs
  ARM: dts: r8a7792: add VSP1V support
  ARM: dts: r8a7792: add VSP1V clocks
  ARM: dts: blanche: add DU support
  ARM: dts: blanche: add SDHI0 support
  ...
parents 29b48f98 fa8f4aba

Documentation/devicetree/bindings/arm/shmobile.txt

+4 −0
Original line number Diff line number Diff line
@@ -63,9 +63,13 @@ Boards: 
    compatible = "renesas,marzen", "renesas,r8a7779"

  - Porter (M2-LCDP)

    compatible = "renesas,porter", "renesas,r8a7791"

  - RSKRZA1 (YR0K77210C000BE)

    compatible = "renesas,rskrza1", "renesas,r7s72100"

  - Salvator-X (RTP0RC7795SIPB0010S)

    compatible = "renesas,salvator-x", "renesas,r8a7795";

  - Salvator-X

    compatible = "renesas,salvator-x", "renesas,r8a7796";

  - SILK (RTP0RC7794LCB00011S)

    compatible = "renesas,silk", "renesas,r8a7794"

  - Wheat

    compatible = "renesas,wheat", "renesas,r8a7792"

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -652,6 +652,7 @@ dtb-$(CONFIG_ARCH_S5PV210) += \ 
dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \

	emev2-kzm9d.dtb \

	r7s72100-genmai.dtb \

	r7s72100-rskrza1.dtb \

	r8a73a4-ape6evm.dtb \

	r8a7740-armadillo800eva.dtb \

	r8a7778-bockw.dtb \
@@ -660,6 +661,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \ 
	r8a7791-koelsch.dtb \

	r8a7791-porter.dtb \

	r8a7792-blanche.dtb \

	r8a7792-wheat.dtb \

	r8a7793-gose.dtb \

	r8a7794-alt.dtb \

	r8a7794-silk.dtb \

arch/arm/boot/dts/r7s72100-rskrza1.dts

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

 * Device Tree Source for the RZ/A1H RSK board

 *

 * 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 = "RSKRZA1";

	compatible = "renesas,rskrza1", "renesas,r7s72100";



	aliases {

		serial0 = &scif2;

	};



	chosen {

		bootargs = "ignore_loglevel";

		stdout-path = "serial0:115200n8";

	};



	memory@8000000 {

		device_type = "memory";

		reg = <0x08000000 0x02000000>;

	};



	lbsc {

		#address-cells = <1>;

		#size-cells = <1>;

	};

};



&extal_clk {

	clock-frequency = <13330000>;

};



&usb_x1_clk {

	clock-frequency = <48000000>;

};



&mtu2 {

	status = "okay";

};



&ether {

	status = "okay";

	renesas,no-ether-link;

	phy-handle = <&phy0>;

	phy0: ethernet-phy@0 {

		reg = <0>;

	};

};



&scif2 {

	status = "okay";

};

arch/arm/boot/dts/r7s72100.dtsi

+22 −0
Original line number Diff line number Diff line
@@ -108,6 +108,15 @@ 
			clock-output-names = "scif0", "scif1", "scif2", "scif3", "scif4", "scif5", "scif6", "scif7";

		};



		mstp7_clks: mstp7_clks@fcfe0430 {

			#clock-cells = <1>;

			compatible = "renesas,r7s72100-mstp-clocks", "renesas,cpg-mstp-clocks";

			reg = <0xfcfe0430 4>;

			clocks = <&p0_clk>;

			clock-indices = <R7S72100_CLK_ETHER>;

			clock-output-names = "ether";

		};



		mstp9_clks: mstp9_clks@fcfe0438 {

			#clock-cells = <1>;

			compatible = "renesas,r7s72100-mstp-clocks", "renesas,cpg-mstp-clocks";
@@ -419,4 +428,17 @@ 
		power-domains = <&cpg_clocks>;

		status = "disabled";

	};



	ether: ethernet@e8203000 {

		compatible = "renesas,ether-r7s72100";

		reg = <0xe8203000 0x800>,

		      <0xe8204800 0x200>;

		interrupts = <GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp7_clks R7S72100_CLK_ETHER>;

		power-domains = <&cpg_clocks>;

		phy-mode = "mii";

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabled";

	};

};

arch/arm/boot/dts/r8a7790.dtsi

+0 −23
Original line number Diff line number Diff line
@@ -944,11 +944,6 @@ 
		interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp1_clks R8A7790_CLK_VSP1_R>;

		power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;



		renesas,has-sru;

		renesas,#rpf = <5>;

		renesas,#uds = <1>;

		renesas,#wpf = <4>;

	};



	vsp1@fe928000 {
@@ -957,12 +952,6 @@ 
		interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp1_clks R8A7790_CLK_VSP1_S>;

		power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;



		renesas,has-lut;

		renesas,has-sru;

		renesas,#rpf = <5>;

		renesas,#uds = <3>;

		renesas,#wpf = <4>;

	};



	vsp1@fe930000 {
@@ -971,12 +960,6 @@ 
		interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp1_clks R8A7790_CLK_VSP1_DU0>;

		power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;



		renesas,has-lif;

		renesas,has-lut;

		renesas,#rpf = <4>;

		renesas,#uds = <1>;

		renesas,#wpf = <4>;

	};



	vsp1@fe938000 {
@@ -985,12 +968,6 @@ 
		interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp1_clks R8A7790_CLK_VSP1_DU1>;

		power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;



		renesas,has-lif;

		renesas,has-lut;

		renesas,#rpf = <4>;

		renesas,#uds = <1>;

		renesas,#wpf = <4>;

	};



	du: display@feb00000 {