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

Unverified Commit e9fca076 authored by Florian Fainelli's avatar Florian Fainelli
Browse files

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: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents f60d405a 703c605f

Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt

+2 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/boot/dts/bcm2835-rpi-zero-w.dts

+1 −7
Original line number Diff line number Diff line 
// 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/;

arch/arm/boot/dts/bcm2835-rpi-zero.dts

+1 −7
Original line number Diff line number Diff line 
// 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/;

arch/arm/boot/dts/bcm2835-rpi.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ 
			#power-domain-cells = <1>;

		};



		mailbox@7e00b840 {

		vchiq: mailbox@7e00b840 {

			compatible = "brcm,bcm2835-vchiq";

			reg = <0x7e00b840 0xf>;

			reg = <0x7e00b840 0x3c>;

			interrupts = <0 2>;

		};

	};

arch/arm/boot/dts/bcm2836-rpi-2-b.dts

+1 −1
Original line number Diff line number Diff line 
// 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"