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

Commit 74ccbff9 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2015-03-13-merge' of... 

Merge tag 'drm-intel-next-2015-03-13-merge' of git://anongit.freedesktop.org/drm-intel into drm-next

drm-intel-next-2015-03-13-rebased:
- EU count report param for gen9+ (Jeff McGee)
- piles of pll/wm/... fixes for chv, finally out of preliminary hw support
  (Ville, Vijay)
- gen9 rps support from Akash
- more work to move towards atomic from Matt, Ander and others
- runtime pm support for skl (Damien)
- edp1.4 intermediate link clock support (Sonika)
- use frontbuffer tracking for fbc (Paulo)
- remove ilk rc6 (John Harrison)
- a bunch of smaller things and fixes all over

Includes backmerge because git rerere couldn't keep up any more.

* tag 'drm-intel-next-2015-03-13-merge' of git://anongit.freedesktop.org/drm-intel: (366 commits)
  drm/i915: Make sure the primary plane is enabled before reading out the fb state
  drm/i915: Update DRIVER_DATE to 20150313
  drm/i915: Fix vmap_batch page iterator overrun
  drm/i915: Export total subslice and EU counts
  drm/i915: redefine WARN_ON_ONCE to include the condition
  drm/i915/skl: Implement WaDisableHBR2
  drm/i915: Remove the preliminary_hw_support shackles from CHV
  drm/i915: Read CHV_PLL_DW8 from the correct offset
  drm/i915: Rewrite IVB FDI bifurcation conflict checks
  drm/i915: Rewrite some some of the FDI lane checks
  drm/i915/skl: Enable the RPS interrupts programming
  drm/i915/skl: Enabling processing of Turbo interrupts
  drm/i915/skl: Updated the i915_frequency_info debugfs function
  drm/i915: Simplify the way BC bifurcation state consistency is kept
  drm/i915/skl: Updated the act_freq_mhz_show sysfs function
  drm/i915/skl: Updated the gen9_enable_rps function
  drm/i915/skl: Updated the gen6_rps_limits function
  drm/i915/skl: Restructured the gen6_set_rps_thresholds function
  drm/i915/skl: Updated the gen6_set_rps function
  drm/i915/skl: Updated the gen6_init_rps_frequencies function
  ...
parents ae10c224 0f9e9cd6

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

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

	- 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)

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

		are supported currently.

		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

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

defined with a phandle to respective power domain.

defined with a phandle to respective power domain.

Documentation/devicetree/bindings/arm/sti.txt

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

Required root node property:

compatible = "st,stih407";

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:

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

Required root node property:

Required root node property:

compatible = "st,stih418";

compatible = "st,stih418";

Documentation/devicetree/bindings/net/apm-xgene-enet.txt

+4 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,10 @@ Ethernet nodes are defined to describe on-chip ethernet interfaces in 
APM X-Gene SoC.

APM X-Gene SoC.





Required properties for all the ethernet interfaces:

Required properties for all the ethernet interfaces:

- compatible: Should be "apm,xgene-enet"

- compatible: Should state binding information from the following list,

  - "apm,xgene-enet":    RGMII based 1G interface

  - "apm,xgene1-sgenet": SGMII based 1G interface

  - "apm,xgene1-xgenet": XFI based 10G interface

- reg: Address and length of the register set for the device. It contains the

- reg: Address and length of the register set for the device. It contains the

  information of registers in the same order as described by reg-names

  information of registers in the same order as described by reg-names

- reg-names: Should contain the register set names

- reg-names: Should contain the register set names

Documentation/devicetree/bindings/power/power_domain.txt

+29 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,16 @@ Required properties: 
   providing multiple PM domains (e.g. power controllers), but can be any value

   providing multiple PM domains (e.g. power controllers), but can be any value

   as specified by device tree binding documentation of particular provider.

   as specified by device tree binding documentation of particular provider.





Optional properties:

 - power-domains : A phandle and PM domain specifier as defined by bindings of

                   the power controller specified by phandle.

   Some power domains might be powered from another power domain (or have

   other hardware specific dependencies). For representing such dependency

   a standard PM domain consumer binding is used. When provided, all domains

   created by the given provider should be subdomains of the domain

   specified by this binding. More details about power domain specifier are

   available in the next section.



Example:

Example:





	power: power-controller@12340000 {

	power: power-controller@12340000 {
@@ -30,6 +40,25 @@ Example: 
The node above defines a power controller that is a PM domain provider and

The node above defines a power controller that is a PM domain provider and

expects one cell as its phandle argument.

expects one cell as its phandle argument.





Example 2:



	parent: power-controller@12340000 {

		compatible = "foo,power-controller";

		reg = <0x12340000 0x1000>;

		#power-domain-cells = <1>;

	};



	child: power-controller@12340000 {

		compatible = "foo,power-controller";

		reg = <0x12341000 0x1000>;

		power-domains = <&parent 0>;

		#power-domain-cells = <1>;

	};



The nodes above define two power controllers: 'parent' and 'child'.

Domains created by the 'child' power controller are subdomains of '0' power

domain provided by the 'parent' power controller.



==PM domain consumers==

==PM domain consumers==





Required properties:

Required properties: