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

Commit 7de24deb authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-dt-for-v3.16' of... 

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

Merge "Renesas ARM Based SoC DT Updates for v3.16" from Simon Horman:

r8a7791 (R-Car M2) and r8a7790 (R-Car H2) SoCs
* Add MSIOF nodes and aliases
* Correct I2C clock parents

r8a7791 (R-Car M2) SoC
* Add EHCI MSTP clock

r8a7791 (R-Car M2) based Koelsch and r8a7790 (R-Car H2) based Lager boards
* Add MSIOF nodes
* Add gpio-keys support for SW2
* Enable I2C
* Enable Quad SPI transfers for the SPI FLASH
* Rename and lable spi to qspi, add spi0 alias
* Set ethernet PHY LED mode

r8a7779 (R-Car H1) and r8a7778 (R-Car M2) SoCs
* Improve and correct HSPI nodes

r8a7778 (R-Car M2) based Bock-W board
* Add SPI FLASH

r8a7740 (R-Mobile A1) SoC
* Use r8a7740 suffix for i2c, mmcif, fsi2 compat strings

r8a7740 (R-Mobile A1) based Armadillo800 EVA board
* Enable RTC
* Use KEY_* macros for gpio-keys

EMEV2 (Emma Mobile EV2) based kzm9g board
* Use KEY_* macros for gpio-keys

* tag 'renesas-dt-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

: (33 commits)
  ARM: shmobile: armadillo-reference dts: Seiko Instruments, Inc is "sii"
  ARM: shmobile: lager dts: Enable Quad SPI transfers for the SPI FLASH
  ARM: shmobile: koelsch dts: Enable Quad SPI transfers for the SPI FLASH
  ARM: shmobile: r8a7790: add IIC(B) cores to dtsi
  ARM: shmobile: r8a7790: add IIC(B) clocks to dtsi
  ARM: shmobile: r8a7790: add IIC0-2 clock macros
  ARM: shmobile: r8a7791: Fix the I2C clocks parents in DT
  ARM: shmobile: r8a7790: Fix the I2C clocks parents in DT
  ARM: shmobile: lager: Correct setting of ethernet PHY LED mode
  ARM: shmobile: armadillo-reference dts: enable RTC
  ARM: shmobile: r8a7791: Add EHCI MSTP clock
  ARM: shmobile: Use r8a7740 suffix for i2c, mmcif, fsi2 compat strings
  ARM: shmobile: koelsch: activate i2c6 bus
  ARM: shmobile: koelsch: make i2c2-pfc node unique
  ARM: shmobile: r8a7791: add IIC(B) cores to dtsi
  ARM: shmobile: r8a7791: add IIC(B) clocks to dtsi
  ARM: shmobile: r8a7791: add IIC0/1 clock macros
  ARM: shmobile: kzm9g-reference dts: Use KEY_* macros for gpio-keys
  ARM: shmobile: armadillo-reference dts: Use KEY_* macros for gpio-keys
  ARM: shmobile: koelsch: Set ethernet PHY LED mode
  ...

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

arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts

+23 −4
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
/dts-v1/;

#include "r8a7740.dtsi"

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

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

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/pwm/pwm.h>
@@ -77,26 +78,26 @@ 


		power-key {

			gpios = <&pfc 99 GPIO_ACTIVE_LOW>;

			linux,code = <116>;

			linux,code = <KEY_POWER>;

			label = "SW3";

			gpio-key,wakeup;

		};



		back-key {

			gpios = <&pfc 100 GPIO_ACTIVE_LOW>;

			linux,code = <158>;

			linux,code = <KEY_BACK>;

			label = "SW4";

		};



		menu-key {

			gpios = <&pfc 97 GPIO_ACTIVE_LOW>;

			linux,code = <139>;

			linux,code = <KEY_MENU>;

			label = "SW5";

		};



		home-key {

			gpios = <&pfc 98 GPIO_ACTIVE_LOW>;

			linux,code = <102>;

			linux,code = <KEY_HOME>;

			label = "SW6";

		};

	};
@@ -117,6 +118,16 @@ 
		};

	};



	i2c2: i2c@2 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "i2c-gpio";

		gpios = <&pfc 208 GPIO_ACTIVE_HIGH /* sda */

			 &pfc 91 GPIO_ACTIVE_HIGH /* scl */

			>;

		i2c-gpio,delay-us = <5>;

	};



	backlight {

		compatible = "pwm-backlight";

		pwms = <&tpu 2 33333 PWM_POLARITY_INVERTED>;
@@ -166,6 +177,14 @@ 
	};

};



&i2c2 {

	status = "okay";

	rtc@30 {

		compatible = "sii,s35390a";

		reg = <0x30>;

	};

};



&pfc {

	pinctrl-0 = <&scifa1_pins>;

	pinctrl-names = "default";

arch/arm/boot/dts/r8a7740.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ 
	i2c0: i2c@fff20000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		compatible = "renesas,iic-r8a7740", "renesas,rmobile-iic";

		reg = <0xfff20000 0x425>;

		interrupt-parent = <&gic>;

		interrupts = <0 201 IRQ_TYPE_LEVEL_HIGH
@@ -138,7 +138,7 @@ 
	i2c1: i2c@e6c20000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "renesas,rmobile-iic";

		compatible = "renesas,iic-r8a7740", "renesas,rmobile-iic";

		reg = <0xe6c20000 0x425>;

		interrupt-parent = <&gic>;

		interrupts = <0 70 IRQ_TYPE_LEVEL_HIGH
@@ -173,7 +173,7 @@ 
	};



	mmcif0: mmc@e6bd0000 {

		compatible = "renesas,sh-mmcif";

		compatible = "renesas,mmcif-r8a7740", "renesas,sh-mmcif";

		reg = <0xe6bd0000 0x100>;

		interrupt-parent = <&gic>;

		interrupts = <0 56 IRQ_TYPE_LEVEL_HIGH
@@ -219,7 +219,7 @@ 


	sh_fsi2: sound@fe1f0000 {

		#sound-dai-cells = <1>;

		compatible = "renesas,sh_fsi2";

		compatible = "renesas,fsi2-r8a7740", "renesas,sh_fsi2";

		reg = <0xfe1f0000 0x400>;

		interrupt-parent = <&gic>;

		interrupts = <0 9 0x4>;

arch/arm/boot/dts/r8a7778-bockw-reference.dts

+14 −0
Original line number Diff line number Diff line
@@ -109,4 +109,18 @@ 
	pinctrl-0 = <&hspi0_pins>;

	pinctrl-names = "default";

	status = "okay";



	flash: flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "spansion,s25fl008k";

		reg = <0>;

		spi-max-frequency = <104000000>;

		m25p,fast-read;



		partition@0 {

			label = "data(spi)";

			reg = <0x00000000 0x00100000>;

		};

	};

};

arch/arm/boot/dts/r8a7778.dtsi

+12 −6
Original line number Diff line number Diff line
@@ -204,26 +204,32 @@ 
	};



	hspi0: spi@fffc7000 {

		compatible = "renesas,hspi";

		compatible = "renesas,hspi-r8a7778", "renesas,hspi";

		reg = <0xfffc7000 0x18>;

		interrupt-controller = <&gic>;

		interrupt-parent = <&gic>;

		interrupts = <0 63 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabled";

	};



	hspi1: spi@fffc8000 {

		compatible = "renesas,hspi";

		compatible = "renesas,hspi-r8a7778", "renesas,hspi";

		reg = <0xfffc8000 0x18>;

		interrupt-controller = <&gic>;

		interrupt-parent = <&gic>;

		interrupts = <0 84 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabled";

	};



	hspi2: spi@fffc6000 {

		compatible = "renesas,hspi";

		compatible = "renesas,hspi-r8a7778", "renesas,hspi";

		reg = <0xfffc6000 0x18>;

		interrupt-controller = <&gic>;

		interrupt-parent = <&gic>;

		interrupts = <0 85 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabled";

	};

};

arch/arm/boot/dts/r8a7779.dtsi

+12 −6
Original line number Diff line number Diff line
@@ -256,26 +256,32 @@ 
	};



	hspi0: spi@fffc7000 {

		compatible = "renesas,hspi";

		compatible = "renesas,hspi-r8a7779", "renesas,hspi";

		reg = <0xfffc7000 0x18>;

		interrupt-controller = <&gic>;

		interrupt-parent = <&gic>;

		interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabled";

	};



	hspi1: spi@fffc8000 {

		compatible = "renesas,hspi";

		compatible = "renesas,hspi-r8a7779", "renesas,hspi";

		reg = <0xfffc8000 0x18>;

		interrupt-controller = <&gic>;

		interrupt-parent = <&gic>;

		interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabled";

	};



	hspi2: spi@fffc6000 {

		compatible = "renesas,hspi";

		compatible = "renesas,hspi-r8a7779", "renesas,hspi";

		reg = <0xfffc6000 0x18>;

		interrupt-controller = <&gic>;

		interrupt-parent = <&gic>;

		interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabled";

	};

};