This pull request adds a compatible string to the DT necessary for the

firmware and VCHI driver to coordinate on using the correct cache line
 size for the platform.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE/JuuFDWp9/ZkuCBXtdYpNtH8nugFAlv9sgoACgkQtdYpNtH8
 nuiXWhAArqokJBWAt2j3PzOD43i2WG1cJoPvrerUdk962fvzX3HlIOgptvWAWQ1f
 drbfU+5TC8W5f6WVJaA4Xp2hHI778AyI2ij8TB4s5HJRUL+t6Znx53tkUuISswVp
 /duV8wKZbdyg6iQv3ylv0wAvvVOh2927m6+CoU4Gf0IDr2Y4d/2riD8AbCB42pv5
 LNOafJaYNJhPt2pkGgZ/8xvmBMXbJwP4F+GkyoqSW+02L/mua9JcZWoss+BNTIzb
 6Qw46Rhp/bWzVjZaDJw1BzX8XLAL39xSJytUkTdQe9rVR/Nj8BiCNNEvwfi6Sbrx
 mZl6mEYzv9coDffeoe1lK1qElcBIc98RzmGaEMduX4XKEnSkG7sPjkNqA5ghG8i4
 QOH+sQo9WZAcZrD1oe1tp6Oc8RsSABvpKpuhGr2n5nyYqZ8wZwyM2nn9wcfpVWZU
 MqcCag3wvf4LFVaSy/qFaV5f43/fp+Dw75Hx1UwkBP10snjWvZ6ytyRNXoniRIqS
 boqGZ4kwhPxCRwFJY/di8P356WNrMQzaCuyEB0c4xfBYHzE9MUMuYn8uWUiaYuyh
 Wc4/PFQzb2jO5ZIt/PuSHNFoEyQndcF6gUE9v2yyyseu/dvJqqDNSl2VyjdVbGL/
 aMTfFCNcwM8wEUyFHRbI0x69FA1KRmI4Ic18agIS2OsMYoJ8NV0=
 =BEZr
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAlv90pcACgkQh9CWnEQH
 BwRoyQ//Wy0AjmVf3inDdvtCI4oOnUG/I1bTXQJLachpHmUId4jYIs1TsOrs4CeF
 jMLj7QskySXYfPyglL2LQD03VydArKv26tQup3UHI7RgTphma5r/4q+/jX3KO0Ak
 FgW0OfN6JU4PQz1yC4qOHYdvxv+36FiZFjACFS4PDLiXkdvUtipBnDYxsZi9F0Oj
 Ut4q5lFumZBuc9JUGcW47N1F43ezV+D2HcyaeaQmPTxlvN7Ax3CcvWEDPEreICvr
 hCGBguVB5c2qmDzyKg66TPP3kZ7vfSR2Q8oLezLVYzXPfJ+XMorIEgfaxCJbz+a8
 ef6tjJiILdXARSdGenrgK+oUElVpQtBszjSwe7+ptZyKwKr3+p61J89pLQuLHSXT
 u9bilEqbaNuN8iS939XCvkdl8F/T2/jNBKB0JCUDaXE7wwpHucIuIxeeCL1Dhs5J
 IeYriOHyLYPsuuvr8vXe3C14Ej5fs6OXJdtYkGEYUH6VWoH4Yxa3MaqjyX6BE6oO
 gwUCaJM2jkpSyEXWxu2tQ015tKlw0A0wMFKseIoe+jPGcnihC9XWfRaeOny1TgTa
 J5mQL9pQntL++LCMYiXgZZU/Ff5dHBQU/yMJWfG8glS74RqJfDyrt1IBNb/199yC
 6+ONHv0mtGH3ttKO8vxJUP2dlhirjvuDvDxsidgLxvnDhMmsRpQ=
 =zY4r
 -----END PGP SIGNATURE-----

Merge tag 'tags/bcm2835-dt-next-2018-11-27' into devicetree/next

This pull request adds a compatible string to the DT necessary for the
firmware and VCHI driver to coordinate on using the correct cache line
size for the platform.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
This commit is contained in:
Florian Fainelli 2018-11-27 15:26:06 -08:00
commit e9fca07656
9 changed files with 16 additions and 21 deletions

View File

@ -2,7 +2,8 @@ Broadcom VCHIQ firmware services
Required properties:
- compatible: Should be "brcm,bcm2835-vchiq"
- compatible: Should be "brcm,bcm2835-vchiq" on BCM2835, otherwise
"brcm,bcm2836-vchiq".
- reg: Physical base address and length of the doorbell register pair
- interrupts: The interrupt number
See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt

View File

@ -1,12 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2017 Stefan Wahren <stefan.wahren@i2se.com>
*
* The code contained herein is licensed under the GNU General Public
* License. You may obtain a copy of the GNU General Public License
* Version 2 or later at the following locations:
*
* http://www.opensource.org/licenses/gpl-license.html
* http://www.gnu.org/copyleft/gpl.html
*/
/dts-v1/;

View File

@ -1,12 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2016 Stefan Wahren <stefan.wahren@i2se.com>
*
* The code contained herein is licensed under the GNU General Public
* License. You may obtain a copy of the GNU General Public License
* Version 2 or later at the following locations:
*
* http://www.opensource.org/licenses/gpl-license.html
* http://www.gnu.org/copyleft/gpl.html
*/
/dts-v1/;

View File

@ -30,9 +30,9 @@ power: power {
#power-domain-cells = <1>;
};
mailbox@7e00b840 {
vchiq: mailbox@7e00b840 {
compatible = "brcm,bcm2835-vchiq";
reg = <0x7e00b840 0xf>;
reg = <0x7e00b840 0x3c>;
interrupts = <0 2>;
};
};

View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
/dts-v1/;
#include "bcm2836.dtsi"
#include "bcm2835-rpi.dtsi"
#include "bcm2836-rpi.dtsi"
#include "bcm283x-rpi-smsc9514.dtsi"
#include "bcm283x-rpi-usb-host.dtsi"

View File

@ -0,0 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#include "bcm2835-rpi.dtsi"
&vchiq {
compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq";
};

View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
/dts-v1/;
#include "bcm2837.dtsi"
#include "bcm2835-rpi.dtsi"
#include "bcm2836-rpi.dtsi"
#include "bcm283x-rpi-lan7515.dtsi"
#include "bcm283x-rpi-usb-host.dtsi"

View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
/dts-v1/;
#include "bcm2837.dtsi"
#include "bcm2835-rpi.dtsi"
#include "bcm2836-rpi.dtsi"
#include "bcm283x-rpi-smsc9514.dtsi"
#include "bcm283x-rpi-usb-host.dtsi"

View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
/dts-v1/;
#include "bcm2837.dtsi"
#include "bcm2835-rpi.dtsi"
#include "bcm2836-rpi.dtsi"
/ {
memory {