Commit 47f36e49 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'arm-perf-4.1' of... 

Merge tag 'arm-perf-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next/drivers

Merge "arm-cci PMU updates for 4.1" from Will Deacon:

CCI-400 PMU updates

This series reworks some of the CCI-400 PMU code so that it can be used
on both ARM and ARM64-based systems, without the need to boot in secure
mode on the latter. This paves the way for CCI-500 support in future.

* tag 'arm-perf-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux

:
  arm-cci: Fix CCI PMU event validation
  arm-cci: Split the code for PMU vs driver support
  arm-cci: Get rid of secure transactions for PMU driver
  arm-cci: Abstract the CCI400 PMU specific definitions
  arm-cci: Rearrange code for splitting PMU vs driver code
  drivers: cci: reject groups spanning multiple HW PMUs
  + Linux 4.0-rc4

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 63fad06a 874c5714

Documentation/CodeOfConflict

0 → 100644
+27 −0
Original line number Diff line number Diff line 
Code of Conflict

----------------



The Linux kernel development effort is a very personal process compared

to "traditional" ways of developing software.  Your code and ideas

behind it will be carefully reviewed, often resulting in critique and

criticism.  The review will almost always require improvements to the

code before it can be included in the kernel.  Know that this happens

because everyone involved wants to see the best possible solution for

the overall success of Linux.  This development process has been proven

to create the most robust operating system kernel ever, and we do not

want to do anything to cause the quality of submission and eventual

result to ever decrease.



If however, anyone feels personally abused, threatened, or otherwise

uncomfortable due to this process, that is not acceptable.  If so,

please contact the Linux Foundation's Technical Advisory Board at

<tab@lists.linux-foundation.org>, or the individual members, and they

will work to resolve the issue to the best of their ability.  For more

information on who is on the Technical Advisory Board and what their

role is, please see:

	http://www.linuxfoundation.org/programs/advisory-councils/tab



As a reviewer of code, please strive to keep things civil and focused on

the technical issues involved.  We are all humans, and frustrations can

be high on both sides of the process.  Try to keep in mind the immortal

words of Bill and Ted, "Be excellent to each other."

Documentation/devicetree/bindings/arm/cci.txt

+5 −2
Original line number Diff line number Diff line
@@ -94,8 +94,11 @@ specific to ARM. 
		- compatible

			Usage: required

			Value type: <string>

			Definition: must be "arm,cci-400-pmu"



			Definition: Must contain one of:

				 "arm,cci-400-pmu,r0"

				 "arm,cci-400-pmu,r1"

				 "arm,cci-400-pmu"  - DEPRECATED, permitted only where OS has

						      secure acces to CCI registers

		- reg:

			Usage: required

			Value type: Integer cells. A register entry, expressed

Documentation/devicetree/bindings/arm/exynos/power_domain.txt

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ Optional Properties: 
	- pclkN, clkN: Pairs of parent of input clock and input clock to the

		devices in this power domain. Maximum of 4 pairs (N = 0 to 3)

		are supported currently.

- power-domains: phandle pointing to the parent power domain, for more details

		 see Documentation/devicetree/bindings/power/power_domain.txt



Node of a device using power domains must have a power-domains property

defined with a phandle to respective power domain.

Documentation/devicetree/bindings/arm/sti.txt

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ Boards with the ST STiH407 SoC shall have the following properties: 
Required root node property:

compatible = "st,stih407";



Boards with the ST STiH410 SoC shall have the following properties:

Required root node property:

compatible = "st,stih410";



Boards with the ST STiH418 SoC shall have the following properties:

Required root node property:

compatible = "st,stih418";

Documentation/devicetree/bindings/i2c/i2c-imx.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties: 
  - "fsl,vf610-i2c" for I2C compatible with the one integrated on Vybrid vf610 SoC

- reg : Should contain I2C/HS-I2C registers location and length

- interrupts : Should contain I2C/HS-I2C interrupt

- clocks : Should contain the I2C/HS-I2C clock specifier



Optional properties:

- clock-frequency : Constains desired I2C/HS-I2C bus clock frequency in Hz.

CRA Git | Maintained and supported by SUSTech CRA and CCSE