mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-10 10:39:26 +00:00
Code Issues Releases Wiki Activity

SPDIF device nodes for the newly added driver.

Browse source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJWIlmfAAoJEPOmecmc0R2BQGIH/16YsYkAoxTnZBQ3dgRu5dpf
 2vFkFZz11eQzdxIbaaMCNoDw6MeMZr3JsBg3vT3UkDbPnQD0US0dCETotXhs78An
 M07EyrUAVgIaJ4eyZtlGuC315uebSpj0uS9+oaiV0XaTP/WT2n+JNYci238Z96MZ
 +8+Kp3hfGHcTal2bWoJJLDwuJZRXdv5W/zXpSR5pi0eMM1z5A4RDokLwdOZt2Yup
 TxL1dhlIguOloXoT4zjMuv4nRqdiz/DnxyJtetT3mIhVE7/zVLm+wdziejipMrYN
 qISuUF3EYDikpaBv8fFdfRJs0kJMqIOeoGB0LmbuGSM9BnG0xCw0X5O6/jDuy7U=
 =4bh1
 -----END PGP SIGNATURE-----

Merge tag 'v4.4-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

SPDIF device nodes for the newly added driver.

* tag 'v4.4-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: Add SPDIF optical out on Radxa Rock2 Square
  ARM: dts: rockchip: Add SPDIF transceiver for RK3288
  ARM: dts: rockchip: Add SPDIF optical out on Radxa Rock
  ARM: dts: rockchip: Add SPDIF transceiver for RK3188

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2015-10-23 10:19:04 -07:00
commit 4751424117
4 changed files with 78 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
arch/arm/boot/dts/rk3188-radxarock.dts
View file

@ -90,6 +90,21 @@ sleep {
};
};
sound {
compatible = "simple-audio-card";
simple-audio-card,name = "SPDIF";
simple-audio-card,dai-link@1 { /* S/PDIF - S/PDIF */
cpu { sound-dai = <&spdif>; };
codec { sound-dai = <&spdif_out>; };
};
};
spdif_out: spdif-out {
compatible = "linux,spdif-dit";
#sound-dai-cells = <0>;
};
ir_recv: gpio-ir-receiver {
compatible = "gpio-ir-receiver";
gpios = <&gpio0 10 1>;
@ -345,6 +360,10 @@ otg_vbus_drv: otg-vbus-drv {
};
};
&spdif {
status = "okay";
};
&uart0 {
status = "okay";
};

20
arch/arm/boot/dts/rk3188.dtsi
View file

@ -121,6 +121,20 @@ i2s0: i2s@1011a000 {
status = "disabled";
};
spdif: sound@1011e000 {
compatible = "rockchip,rk3188-spdif", "rockchip,rk3066-spdif";
reg = <0x1011e000 0x2000>;
#sound-dai-cells = <0>;
clock-names = "hclk", "mclk";
clocks = <&cru HCLK_SPDIF>, <&cru SCLK_SPDIF>;
dmas = <&dmac1_s 8>;
dma-names = "tx";
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&spdif_tx>;
status = "disabled";
};
cru: clock-controller@20000000 {
compatible = "rockchip,rk3188-cru";
reg = <0x20000000 0x1000>;
@ -484,6 +498,12 @@ i2s0_bus: i2s0-bus {
<RK_GPIO1 21 RK_FUNC_1 &pcfg_pull_none>;
};
};
spdif {
spdif_tx: spdif-tx {
rockchip,pins = <RK_GPIO1 14 RK_FUNC_1 &pcfg_pull_none>;
};
};
};
};

18
arch/arm/boot/dts/rk3288-rock2-square.dts
View file

@ -49,6 +49,20 @@ chosen {
stdout-path = "serial2:115200n8";
};
sound {
compatible = "simple-audio-card";
simple-audio-card,name = "SPDIF";
simple-audio-card,dai-link@1 { /* S/PDIF - S/PDIF */
cpu { sound-dai = <&spdif>; };
codec { sound-dai = <&spdif_out>; };
};
};
spdif_out: spdif-out {
compatible = "linux,spdif-dit";
#sound-dai-cells = <0>;
};
vcc_usb_host: vcc-host-regulator {
compatible = "regulator-fixed";
enable-active-high;
@ -136,6 +150,10 @@ sdmmc_pwr: sdmmc-pwr {
};
};
&spdif {
status = "okay";
};
&uart2 {
status = "okay";
};

21
arch/arm/boot/dts/rk3288.dtsi
View file

@ -744,6 +744,21 @@ wdt: watchdog@ff800000 {
status = "disabled";
};
spdif: sound@ff88b0000 {
compatible = "rockchip,rk3288-spdif", "rockchip,rk3066-spdif";
reg = <0xff8b0000 0x10000>;
#sound-dai-cells = <0>;
clock-names = "hclk", "mclk";
clocks = <&cru HCLK_SPDIF8CH>, <&cru SCLK_SPDIF8CH>;
dmas = <&dmac_bus_s 3>;
dma-names = "tx";
interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&spdif_tx>;
rockchip,grf = <&grf>;
status = "disabled";
};
i2s: i2s@ff890000 {
compatible = "rockchip,rk3288-i2s", "rockchip,rk3066-i2s";
reg = <0xff890000 0x10000>;
@ -1437,5 +1452,11 @@ rmii_pins: rmii-pins {
<4 3 3 &pcfg_pull_none>;
};
};
spdif {
spdif_tx: spdif-tx {
rockchip,pins = <RK_GPIO6 11 RK_FUNC_1 &pcfg_pull_none>;
};
};
};
};