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

Commit 47514241 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v4.4-rockchip-dts32-2' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents d8f440b6 fea37552

arch/arm/boot/dts/rk3188-radxarock.dts

+19 −0
Original line number Diff line number Diff line
@@ -90,6 +90,21 @@ 
		};

	};



	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 @@ 
	};

};



&spdif {

	status = "okay";

};



&uart0 {

	status = "okay";

};

arch/arm/boot/dts/rk3188.dtsi

+20 −0
Original line number Diff line number Diff line
@@ -121,6 +121,20 @@ 
		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 @@ 
						<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>;

			};

		};

	};

};

arch/arm/boot/dts/rk3288-rock2-square.dts

+18 −0
Original line number Diff line number Diff line
@@ -49,6 +49,20 @@ 
		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 @@ 
	};

};



&spdif {

	status = "okay";

};



&uart2 {

	status = "okay";

};

arch/arm/boot/dts/rk3288.dtsi

+21 −0
Original line number Diff line number Diff line
@@ -744,6 +744,21 @@ 
		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 @@ 
						<4 3 3 &pcfg_pull_none>;

			};

		};



		spdif {

			spdif_tx: spdif-tx {

				rockchip,pins = <RK_GPIO6 11 RK_FUNC_1 &pcfg_pull_none>;

			};

		};

	};

};