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

Commit 37a59c90 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: arm_cci: add hw-version property"

parents 1270ae50 e7aeb208

Documentation/devicetree/bindings/arm/cci.txt

+6 −0
Original line number Diff line number Diff line
@@ -52,6 +52,12 @@ specific to ARM. 
			    hierarchical bus addressing. CCI interfaces

			    addresses refer to the parent node addressing

			    scheme to declare their register bases.

        - hw-version

		Usage: optional

		Value type: <u32>

		Definition: Hardware version. This value will be used when

			    the device id register cannot be accessed with

			    a non-secure read.



	CCI interconnect node can define the following child nodes:

drivers/bus/arm-cci.c

+2 −0
Original line number Diff line number Diff line
@@ -1133,6 +1133,8 @@ static int cci_probe(void) 
	if (!np)

		return -ENODEV;



	of_property_read_u32(np, "hw-version", &cci_version);



	ret = of_address_to_resource(np, 0, &res);

	if (!ret) {

		cci_ctrl_base = ioremap(res.start, resource_size(&res));