mirror of
https://github.com/torvalds/linux
synced 2024-10-22 19:25:51 +00:00
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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSt5klAAoJENfPZGlqN0++OoMP/R/4ZgyskwR7sGVEKv6gK550 bJhjhqng9ciNTcyfwG4TD/7tTBefZD1Wdivgzud56YpRAFTI2s4/a5+bKSTpM6iY P++3UpPQE4Y3ESla0Tx/m2Drxa88UHo1opAdzy/Zzv8RjKaJIl4BiJFLfhixWUNB gXLoS1O4cgOspDXWNEdRvaTl2ING8e1Gts+l+bme8Qwfnwv01unyS+9aARHGU7PP Syes9yXJH9soP755+yNx+YIJq3HFi70VUwm+FpQmK7m1AFKDjtaW+hvqzzVLX9di ouSJy0oeIe8v985zUwmbskLCXxtek2U0T7IyH3gdaKnslXrz27I7YpSk9FtnUx73 8OBMGMsGXY6D7M3f7nQ13Hd8MeDz10L9VX3PGbBRZU5IuoPLfKrBikNb45h5uQE/ uNAzVXeQhvsghmcivoLwci1zUZgH4ZQDh0WcXE5sJC1ead+9MEjg9spL3zQrofpj qGobCkg/g27Gk+zYgOLcDyyDytA2EtsJBi9jD3+uhaKACHM60f2XgXr3YIh8RcGE KlfnwG0B66cA/cdiUyk0LiWY7PMQuo+c+Zy0Fdewm2XH/OxpKIAg01a0r/9cRgId skIM5kK664n590B+ZB4w3XSu1B2kIco8eEF1ZFIV+Yxv53up4bL2Dsxx1V+egHEJ tiTzkJS2vd5hAeMgU/3a =qbIt -----END PGP SIGNATURE----- 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>
This commit is contained in:
Olof Johansson
commit
aa1ed457ae
|
|
@ -31,6 +31,60 @@ lbsc {
|
|||
#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 {
|
||||
|
|
|
|||
|
|
@ -152,6 +152,20 @@ home-key {
|
|||
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 @@ ldo8 {
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
ak4648: ak4648@0x12 {
|
||||
#sound-dai-cells = <0>;
|
||||
compatible = "asahi-kasei,ak4648";
|
||||
reg = <0x12>;
|
||||
};
|
||||
};
|
||||
|
||||
&i2c3 {
|
||||
|
|
@ -289,6 +309,12 @@ sdhi2_pins: sd2 {
|
|||
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 @@ &sdhi2 {
|
|||
broken-cd;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&sh_fsi2 {
|
||||
pinctrl-0 = <&fsia_pins>;
|
||||
pinctrl-names = "default";
|
||||
|
||||
status = "okay";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -243,4 +243,13 @@ pfc: pfc@e6050000 {
|
|||
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";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue