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

Commit 40d3f028 authored by Russell King's avatar Russell King
Browse files

Merge branches 'cleanup', 'fixes', 'misc', 'omap-barrier' and 'uaccess' into for-linus

Loading
Loading
Loading
Loading
+17 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ SunXi family
        + User Manual
          http://dl.linux-sunxi.org/A20/A20%20User%20Manual%202013-03-22.pdf

      - Allwinner A23
      - Allwinner A23 (sun8i)
        + Datasheet
          http://dl.linux-sunxi.org/A23/A23%20Datasheet%20V1.0%2020130830.pdf
        + User Manual
@@ -55,7 +55,23 @@ SunXi family
        + User Manual
          http://dl.linux-sunxi.org/A31/A3x_release_document/A31s/IC/A31s%20User%20Manual%20%20V1.0%2020130322.pdf

      - Allwinner A33 (sun8i)
        + Datasheet
          http://dl.linux-sunxi.org/A33/A33%20Datasheet%20release%201.1.pdf
        + User Manual
          http://dl.linux-sunxi.org/A33/A33%20user%20manual%20release%201.1.pdf

      - Allwinner H3 (sun8i)
        + Datasheet
          http://dl.linux-sunxi.org/H3/Allwinner_H3_Datasheet_V1.0.pdf

    * Quad ARM Cortex-A15, Quad ARM Cortex-A7 based SoCs
      - Allwinner A80
        + Datasheet
	  http://dl.linux-sunxi.org/A80/A80_Datasheet_Revision_1.0_0404.pdf

    * Octa ARM Cortex-A7 based SoCs
      - Allwinner A83T
        + Not Supported
        + Datasheet
          http://dl.linux-sunxi.org/A83T/A83T_datasheet_Revision_1.1.pdf
+6 −0
Original line number Diff line number Diff line
@@ -67,6 +67,12 @@ Optional properties:
  disable if zero.
- arm,prefetch-offset : Override prefetch offset value. Valid values are
  0-7, 15, 23, and 31.
- arm,shared-override : The default behavior of the pl310 cache controller with
  respect to the shareable attribute is to transform "normal memory
  non-cacheable transactions" into "cacheable no allocate" (for reads) or
  "write through no write allocate" (for writes).
  On systems where this may cause DMA buffer corruption, this property must be
  specified to indicate that such transforms are precluded.
- prefetch-data : Data prefetch. Value: <0> (forcibly disable), <1>
  (forcibly enable), property absent (retain settings set by firmware)
- prefetch-instr : Instruction prefetch. Value: <0> (forcibly disable),
+2 −0
Original line number Diff line number Diff line
@@ -9,4 +9,6 @@ using one of the following compatible strings:
  allwinner,sun6i-a31
  allwinner,sun7i-a20
  allwinner,sun8i-a23
  allwinner,sun8i-a33
  allwinner,sun8i-h3
  allwinner,sun9i-a80
+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ of the EMIF IP and memory parts attached to it.
Required properties:
- compatible	: Should be of the form "ti,emif-<ip-rev>" where <ip-rev>
  is the IP revision of the specific EMIF instance.
		  For am437x should be ti,emif-am4372.

- phy-type	: <u32> indicating the DDR phy type. Following are the
  allowed values
+11 −2
Original line number Diff line number Diff line
@@ -410,8 +410,17 @@ Documentation/usb/persist.txt.

Q: Can I suspend-to-disk using a swap partition under LVM?

A: No. You can suspend successfully, but you'll not be able to
resume. uswsusp should be able to work with LVM. See suspend.sf.net.
A: Yes and No.  You can suspend successfully, but the kernel will not be able
to resume on its own.  You need an initramfs that can recognize the resume
situation, activate the logical volume containing the swap volume (but not
touch any filesystems!), and eventually call

echo -n "$major:$minor" > /sys/power/resume

where $major and $minor are the respective major and minor device numbers of
the swap volume.

uswsusp works with LVM, too.  See http://suspend.sourceforge.net/

Q: I upgraded the kernel from 2.6.15 to 2.6.16. Both kernels were
compiled with the similar configuration files. Anyway I found that
Loading