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

Commit aa1ed457 authored Dec 29, 2013 by Olof Johansson

Merge tag 'renesas-dt2-for-v3.14' of...

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

From Simon Horman:
Second Round of Renesas ARM Based SoC DT Updates for v3.13

* r8a7791 (R-Car M2) based Koelsch board
- Add GPIO keys

* sh73a0 (SH-Mobile AG5) based kzm9g board
  - Add FSI support

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

:
  ARM: shmobile: koelsch: dts: Add gpio-keys device
  ARM: shmobile: kzm9g: add FSI support for DTS
  ARM: shmobile: sh73a0: add FSI support via DTSI

Signed-off-by: Olof Johansson <olof@lixom.net>

parents 8761f3b3 bd060989

arch/arm/boot/dts/r8a7791-koelsch-reference.dts

+54 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,60 @@
		#size-cells = <1>;
		};

		gpio-keys {
		compatible = "gpio-keys";

		key-a {
		gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
		linux,code = <30>;
		label = "SW30";
		gpio-key,wakeup;
		debounce-interval = <20>;
		};
		key-b {
		gpios = <&gpio7 1 GPIO_ACTIVE_LOW>;
		linux,code = <48>;
		label = "SW31";
		gpio-key,wakeup;
		debounce-interval = <20>;
		};
		key-c {
		gpios = <&gpio7 2 GPIO_ACTIVE_LOW>;
		linux,code = <46>;
		label = "SW32";
		gpio-key,wakeup;
		debounce-interval = <20>;
		};
		key-d {
		gpios = <&gpio7 3 GPIO_ACTIVE_LOW>;
		linux,code = <32>;
		label = "SW33";
		gpio-key,wakeup;
		debounce-interval = <20>;
		};
		key-e {
		gpios = <&gpio7 4 GPIO_ACTIVE_LOW>;
		linux,code = <18>;
		label = "SW34";
		gpio-key,wakeup;
		debounce-interval = <20>;
		};
		key-f {
		gpios = <&gpio7 5 GPIO_ACTIVE_LOW>;
		linux,code = <33>;
		label = "SW35";
		gpio-key,wakeup;
		debounce-interval = <20>;
		};
		key-g {
		gpios = <&gpio7 6 GPIO_ACTIVE_LOW>;
		linux,code = <34>;
		label = "SW36";
		gpio-key,wakeup;
		debounce-interval = <20>;
		};
		};

		leds {
		compatible = "gpio-leds";
		led6 {

arch/arm/boot/dts/sh73a0-kzm9g-reference.dts

+33 −0

Original line number	Diff line number	Diff line
		@@ -152,6 +152,20 @@
		label = "SW1";
		};
		};

		sound {
		compatible = "simple-audio-card";
		simple-audio-card,format = "left_j";
		simple-audio-card,cpu {
		sound-dai = <&sh_fsi2 0>;
		};
		simple-audio-card,codec {
		sound-dai = <&ak4648>;
		bitclock-master;
		frame-master;
		system-clock-frequency = <11289600>;
		};
		};
		};

		&i2c0 {
		@@ -226,6 +240,12 @@
		};
		};
		};

		ak4648: ak4648@0x12 {
		#sound-dai-cells = <0>;
		compatible = "asahi-kasei,ak4648";
		reg = <0x12>;
		};
		};

		&i2c3 {
		@@ -289,6 +309,12 @@
		renesas,groups = "sdhi2_data4", "sdhi2_ctrl";
		renesas,function = "sdhi2";
		};

		fsia_pins: sounda {
		renesas,groups = "fsia_mclk_in", "fsia_sclk_in",
		"fsia_data_in", "fsia_data_out";
		renesas,function = "fsia";
		};
		};

		&sdhi0 {
		@@ -309,3 +335,10 @@
		broken-cd;
		status = "okay";
		};

		&sh_fsi2 {
		pinctrl-0 = <&fsia_pins>;
		pinctrl-names = "default";

		status = "okay";
		};

arch/arm/boot/dts/sh73a0.dtsi

+9 −0

Original line number	Diff line number	Diff line
		@@ -243,4 +243,13 @@
		gpio-controller;
		#gpio-cells = <2>;
		};

		sh_fsi2: sound@ec230000 {
		#sound-dai-cells = <1>;
		compatible = "renesas,sh_fsi2";
		reg = <0xec230000 0x400>;
		interrupt-parent = <&gic>;
		interrupts = <0 146 0x4>;
		status = "disabled";
		};
		};