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

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

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

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

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

Enhancements:
* Add device nodes for PRR
* Add m3ulcb board
* Enable I2C on r8a7796/salvator-x board
* Enable SDHI0 on h3ulcb board

* tag 'renesas-arm64-dt2-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  arm64: dts: r8a7796: Add device node for PRR
  arm64: dts: r8a7795: Add device node for PRR
  arm64: dts: h3ulcb: rename SDHI0 pins
  arm64: dts: h3ulcb: enable SDHI2
  arm64: dts: m3ulcb: enable SDHI2
  arm64: dts: m3ulcb: enable SDHI0
  arm64: dts: m3ulcb: enable WDT
  arm64: dts: m3ulcb: enable EXTALR clk
  arm64: dts: m3ulcb: enable GPIO keys
  arm64: dts: m3ulcb: enable GPIO leds
  arm64: dts: m3ulcb: enable SCIF clk and pins
  arm64: dts: m3ulcb: initial device tree
  arm64: dts: m3ulcb: add M3ULCB board DT bindings
  arm64: dts: h3ulcb: update header
  arm64: dts: h3ulcb: update documentation with official board name
  arm64: dts: r8a7796: salvator-x: enable I2C
  arm64: dts: r8a7796: Enable I2C DMA
  arm64: dts: r8a7796: add I2C support
parents f98121f3 5de68961

Documentation/devicetree/bindings/arm/shmobile.txt

+3 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ Boards: 
    compatible = "renesas,genmai", "renesas,r7s72100"

  - Gose

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

  - H3ULCB (RTP0RC7795SKB00010S)

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

    compatible = "renesas,h3ulcb", "renesas,r8a7795";

  - Henninger

    compatible = "renesas,henninger", "renesas,r8a7791"
@@ -61,6 +61,8 @@ Boards: 
    compatible = "renesas,kzm9g", "renesas,sh73a0"

  - Lager (RTP0RC7790SEB00010S)

    compatible = "renesas,lager", "renesas,r8a7790"

  - M3ULCB (R-Car Starter Kit Pro, RTP0RC7796SKB00010S)

    compatible = "renesas,m3ulcb", "renesas,r8a7796";

  - Marzen

    compatible = "renesas,marzen", "renesas,r8a7779"

  - Porter (M2-LCDP)

arch/arm64/boot/dts/renesas/Makefile

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

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

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



always		:= $(dtb-y)

clean-files	:= *.dtb

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

+48 −5
Original line number Diff line number Diff line 
/*

 * Device Tree Source for the H3ULCB board

 * Device Tree Source for the H3ULCB (R-Car Starter Kit Premier) board

 *

 * Copyright (C) 2016 Renesas Electronics Corp.

 * Copyright (C) 2016 Cogent Embedded, Inc.
@@ -62,6 +62,24 @@ 
		clock-frequency = <24576000>;

	};



	reg_1p8v: regulator0 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-1.8V";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-boot-on;

		regulator-always-on;

	};



	reg_3p3v: regulator1 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-3.3V";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-boot-on;

		regulator-always-on;

	};



	vcc_sdhi0: regulator-vcc-sdhi0 {

		compatible = "regulator-fixed";
@@ -145,18 +163,30 @@ 
		function = "avb";

	};



	sdhi0_pins_3v3: sd0_3v3 {

	sdhi0_pins: sd0 {

		groups = "sdhi0_data4", "sdhi0_ctrl";

		function = "sdhi0";

		power-source = <3300>;

	};



	sdhi0_pins_1v8: sd0_1v8 {

	sdhi0_pins_uhs: sd0 {

		groups = "sdhi0_data4", "sdhi0_ctrl";

		function = "sdhi0";

		power-source = <1800>;

	};



	sdhi2_pins: sd2 {

		groups = "sdhi2_data8", "sdhi2_ctrl";

		function = "sdhi2";

		power-source = <3300>;

	};



	sdhi2_pins_uhs: sd2_uhs {

		groups = "sdhi2_data8", "sdhi2_ctrl";

		function = "sdhi2";

		power-source = <1800>;

	};



	sound_pins: sound {

		groups = "ssi01239_ctrl", "ssi0_data", "ssi1_data_a";

		function = "ssi";
@@ -261,8 +291,8 @@ 
};



&sdhi0 {

	pinctrl-0 = <&sdhi0_pins_3v3>;

	pinctrl-1 = <&sdhi0_pins_1v8>;

	pinctrl-0 = <&sdhi0_pins>;

	pinctrl-1 = <&sdhi0_pins_uhs>;

	pinctrl-names = "default", "state_uhs";



	vmmc-supply = <&vcc_sdhi0>;
@@ -273,6 +303,19 @@ 
	status = "okay";

};



&sdhi2 {

	/* used for on-board 8bit eMMC */

	pinctrl-0 = <&sdhi2_pins>;

	pinctrl-1 = <&sdhi2_pins_uhs>;

	pinctrl-names = "default", "state_uhs";



	vmmc-supply = <&reg_3p3v>;

	vqmmc-supply = <&reg_1p8v>;

	bus-width = <8>;

	non-removable;

	status = "okay";

};



&ssi1 {

	shared-pin;

};

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

+5 −0
Original line number Diff line number Diff line
@@ -321,6 +321,11 @@ 
			#power-domain-cells = <0>;

		};



		prr: chipid@fff00044 {

			compatible = "renesas,prr";

			reg = <0 0xfff00044 0 4>;

		};



		sysc: system-controller@e6180000 {

			compatible = "renesas,r8a7795-sysc";

			reg = <0 0xe6180000 0 0x0400>;

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

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

 * Device Tree Source for the M3ULCB (R-Car Starter Kit Pro) board

 *

 * Copyright (C) 2016 Renesas Electronics Corp.

 * Copyright (C) 2016 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.

 */



/dts-v1/;

#include "r8a7796.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>



/ {

	model = "Renesas M3ULCB board based on r8a7796";

	compatible = "renesas,m3ulcb", "renesas,r8a7796";



	aliases {

		serial0 = &scif2;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	memory@48000000 {

		device_type = "memory";

		/* first 128MB is reserved for secure area. */

		reg = <0x0 0x48000000 0x0 0x38000000>;

	};



	leds {

		compatible = "gpio-leds";



		led5 {

			gpios = <&gpio6 12 GPIO_ACTIVE_HIGH>;

		};

		led6 {

			gpios = <&gpio6 13 GPIO_ACTIVE_HIGH>;

		};

	};



	keyboard {

		compatible = "gpio-keys";



		key-1 {

			linux,code = <KEY_1>;

			label = "SW3";

			wakeup-source;

			debounce-interval = <20>;

			gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;

		};

	};



	reg_1p8v: regulator0 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-1.8V";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-boot-on;

		regulator-always-on;

	};



	reg_3p3v: regulator1 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-3.3V";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-boot-on;

		regulator-always-on;

	};



	vcc_sdhi0: regulator-vcc-sdhi0 {

		compatible = "regulator-fixed";



		regulator-name = "SDHI0 Vcc";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;



		gpio = <&gpio5 2 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	vccq_sdhi0: regulator-vccq-sdhi0 {

		compatible = "regulator-gpio";



		regulator-name = "SDHI0 VccQ";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;



		gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;

		gpios-states = <1>;

		states = <3300000 1

			  1800000 0>;

	};

};



&extal_clk {

	clock-frequency = <16666666>;

};



&extalr_clk {

	clock-frequency = <32768>;

};



&pfc {

	pinctrl-0 = <&scif_clk_pins>;

	pinctrl-names = "default";



	scif2_pins: scif2 {

		groups = "scif2_data_a";

		function = "scif2";

	};



	scif_clk_pins: scif_clk {

		groups = "scif_clk_a";

		function = "scif_clk";

	};



	sdhi0_pins: sd0 {

		groups = "sdhi0_data4", "sdhi0_ctrl";

		function = "sdhi0";

		power-source = <3300>;

	};



	sdhi0_pins_uhs: sd0_uhs {

		groups = "sdhi0_data4", "sdhi0_ctrl";

		function = "sdhi0";

		power-source = <1800>;

	};



	sdhi2_pins: sd2 {

		groups = "sdhi2_data8", "sdhi2_ctrl";

		function = "sdhi2";

		power-source = <3300>;

	};



	sdhi2_pins_uhs: sd2_uhs {

		groups = "sdhi2_data8", "sdhi2_ctrl";

		function = "sdhi2";

		power-source = <1800>;

	};

};



&sdhi0 {

	pinctrl-0 = <&sdhi0_pins>;

	pinctrl-1 = <&sdhi0_pins_uhs>;

	pinctrl-names = "default", "state_uhs";



	vmmc-supply = <&vcc_sdhi0>;

	vqmmc-supply = <&vccq_sdhi0>;

	cd-gpios = <&gpio3 12 GPIO_ACTIVE_LOW>;

	bus-width = <4>;

	sd-uhs-sdr50;

	status = "okay";

};



&sdhi2 {

	/* used for on-board 8bit eMMC */

	pinctrl-0 = <&sdhi2_pins>;

	pinctrl-1 = <&sdhi2_pins_uhs>;

	pinctrl-names = "default", "state_uhs";



	vmmc-supply = <&reg_3p3v>;

	vqmmc-supply = <&reg_1p8v>;

	bus-width = <8>;

	non-removable;

	status = "okay";

};



&scif2 {

	pinctrl-0 = <&scif2_pins>;

	pinctrl-names = "default";



	status = "okay";

};



&scif_clk {

	clock-frequency = <14745600>;

	status = "okay";

};



&wdt0 {

	timeout-sec = <60>;

	status = "okay";

};