mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-13 06:08:07 +00:00
Code Issues Releases Wiki Activity

Fix for a new dtc warning.

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAlqj2kgQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgaqOB/9y1t3gsyrUh2A6BwxS5MuHgO34YNsqm2n+
 s8RDLit9Y/oAWU2G0CksTW6ksT8BboHV0xO12kC9HlUG/ia0ISm9XPXtbCc2KOae
 wxc4tJ5BH2fz7NT1cfPEnVTkO3dA+0c3N9R9puOzrh796PVfRsjxYHtPWb2Qe3FT
 Uz1JCA0/I9gSxFU/Mqte2ShtygSY6XznyWgqsRIzDgFbR9AWqyG+6fIdkcabE++O
 uL1ucGaL3eLN8zgmZ6w20ZPAimkev6KbzA5VYtXgotSfXFcWJGEJzzeDpR2QAd0B
 0Cua9ty/PiJLg121MO53iyGppRblB0yZAEnuBK9gQNGhT3u3o7t5
 =sCTW
 -----END PGP SIGNATURE-----

Merge tag 'v4.16-rockchip-dts32fixes-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes

Pull "Rockchip dts32 fixes for 4.16" from Heiko Stübner:

Fix for a new dtc warning.

* tag 'v4.16-rockchip-dts32fixes-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: Add missing #sound-dai-cells on rk3288
This commit is contained in:
Arnd Bergmann 2018-03-12 15:33:03 +01:00
commit 0b187e5ed1
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -927,6 +927,7 @@ spdif: sound@ff88b0000 {
i2s: i2s@ff890000 {
compatible = "rockchip,rk3288-i2s", "rockchip,rk3066-i2s";
reg = <0x0 0xff890000 0x0 0x10000>;
#sound-dai-cells = <0>;
interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
@ -1176,6 +1177,7 @@ hdmi: hdmi@ff980000 {
compatible = "rockchip,rk3288-dw-hdmi";
reg = <0x0 0xff980000 0x0 0x20000>;
reg-io-width = <4>;
#sound-dai-cells = <0>;
rockchip,grf = <&grf>;
interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>, <&cru SCLK_HDMI_CEC>;