Commit 1e94320f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next

parents e1b239f3 f3d83317
Loading
Loading
Loading
Loading
+3 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,9 @@ Properties:
  Second cell specifies the irq distribution mode to cores
  Second cell specifies the irq distribution mode to cores
     0=Round Robin; 1=cpu0, 2=cpu1, 4=cpu2, 8=cpu3
     0=Round Robin; 1=cpu0, 2=cpu1, 4=cpu2, 8=cpu3


  The second cell in interrupts property is deprecated and may be ignored by
  the kernel.

  intc accessed via the special ARC AUX register interface, hence "reg" property
  intc accessed via the special ARC AUX register interface, hence "reg" property
  is not specified.
  is not specified.


+1 −1
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ have dual GMAC each represented by a child node..
* Ethernet controller node
* Ethernet controller node


Required properties:
Required properties:
- compatible: Should be "mediatek,mt7623-eth"
- compatible: Should be "mediatek,mt2701-eth"
- reg: Address and length of the register set for the device
- reg: Address and length of the register set for the device
- interrupts: Should contain the three frame engines interrupts in numeric
- interrupts: Should contain the three frame engines interrupts in numeric
	order. These are fe_int0, fe_int1 and fe_int2.
	order. These are fe_int0, fe_int1 and fe_int2.
+3 −2
Original line number Original line Diff line number Diff line
@@ -19,8 +19,9 @@ Optional Properties:
  specifications. If neither of these are specified, the default is to
  specifications. If neither of these are specified, the default is to
  assume clause 22.
  assume clause 22.


  If the phy's identifier is known then the list may contain an entry
  If the PHY reports an incorrect ID (or none at all) then the
  of the form: "ethernet-phy-idAAAA.BBBB" where
  "compatible" list may contain an entry with the correct PHY ID in the
  form: "ethernet-phy-idAAAA.BBBB" where
     AAAA - The value of the 16 bit Phy Identifier 1 register as
     AAAA - The value of the 16 bit Phy Identifier 1 register as
            4 hex digits. This is the chip vendor OUI bits 3:18
            4 hex digits. This is the chip vendor OUI bits 3:18
     BBBB - The value of the 16 bit Phy Identifier 2 register as
     BBBB - The value of the 16 bit Phy Identifier 2 register as
+3 −2
Original line number Original line Diff line number Diff line
@@ -212,10 +212,11 @@ asynchronous manner and the value may not be very precise. To see a precise
snapshot of a moment, you can see /proc/<pid>/smaps file and scan page table.
snapshot of a moment, you can see /proc/<pid>/smaps file and scan page table.
It's slow but very precise.
It's slow but very precise.


Table 1-2: Contents of the status files (as of 4.1)
Table 1-2: Contents of the status files (as of 4.8)
..............................................................................
..............................................................................
 Field                       Content
 Field                       Content
 Name                        filename of the executable
 Name                        filename of the executable
 Umask                       file mode creation mask
 State                       state (R is running, S is sleeping, D is sleeping
 State                       state (R is running, S is sleeping, D is sleeping
                             in an uninterruptible wait, Z is zombie,
                             in an uninterruptible wait, Z is zombie,
			     T is traced or stopped)
			     T is traced or stopped)
@@ -226,7 +227,6 @@ Table 1-2: Contents of the status files (as of 4.1)
 TracerPid                   PID of process tracing this process (0 if not)
 TracerPid                   PID of process tracing this process (0 if not)
 Uid                         Real, effective, saved set, and  file system UIDs
 Uid                         Real, effective, saved set, and  file system UIDs
 Gid                         Real, effective, saved set, and  file system GIDs
 Gid                         Real, effective, saved set, and  file system GIDs
 Umask                       file mode creation mask
 FDSize                      number of file descriptor slots currently allocated
 FDSize                      number of file descriptor slots currently allocated
 Groups                      supplementary group list
 Groups                      supplementary group list
 NStgid                      descendant namespace thread group ID hierarchy
 NStgid                      descendant namespace thread group ID hierarchy
@@ -236,6 +236,7 @@ Table 1-2: Contents of the status files (as of 4.1)
 VmPeak                      peak virtual memory size
 VmPeak                      peak virtual memory size
 VmSize                      total program size
 VmSize                      total program size
 VmLck                       locked memory size
 VmLck                       locked memory size
 VmPin                       pinned memory size
 VmHWM                       peak resident set size ("high water mark")
 VmHWM                       peak resident set size ("high water mark")
 VmRSS                       size of memory portions. It contains the three
 VmRSS                       size of memory portions. It contains the three
                             following parts (VmRSS = RssAnon + RssFile + RssShmem)
                             following parts (VmRSS = RssAnon + RssFile + RssShmem)
+1 −3
Original line number Original line Diff line number Diff line
@@ -35,9 +35,7 @@ only one way to cause the system to go into the Suspend-To-RAM state (write
The default suspend mode (ie. the one to be used without writing anything into
The default suspend mode (ie. the one to be used without writing anything into
/sys/power/mem_sleep) is either "deep" (if Suspend-To-RAM is supported) or
/sys/power/mem_sleep) is either "deep" (if Suspend-To-RAM is supported) or
"s2idle", but it can be overridden by the value of the "mem_sleep_default"
"s2idle", but it can be overridden by the value of the "mem_sleep_default"
parameter in the kernel command line.  On some ACPI-based systems, depending on
parameter in the kernel command line.
the information in the FADT, the default may be "s2idle" even if Suspend-To-RAM
is supported.


The properties of all of the sleep states are described below.
The properties of all of the sleep states are described below.


Loading