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

Commit d14b50cc authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master' into upstream-fixes

parents a34b6fc0 ef7d1b24
Loading
Loading
Loading
Loading
+31 −0
Original line number Original line Diff line number Diff line

What is imacfb?
===============

This is a generic EFI platform driver for Intel based Apple computers.
Imacfb is only for EFI booted Intel Macs.

Supported Hardware
==================

iMac 17"/20"
Macbook
Macbook Pro 15"/17"
MacMini

How to use it?
==============

Imacfb does not have any kind of autodetection of your machine.
You have to add the fillowing kernel parameters in your elilo.conf:
	Macbook :
		video=imacfb:macbook
	MacMini :
		video=imacfb:mini
	Macbook Pro 15", iMac 17" :
		video=imacfb:i17
	Macbook Pro 17", iMac 20" :
		video=imacfb:i20

--
Edgar Hucek <gimli@dark-green.com>
+1 −1
Original line number Original line Diff line number Diff line
@@ -247,7 +247,7 @@ the object-specific fields, which include:
- default_attrs: Default attributes to be exported via sysfs when the
- default_attrs: Default attributes to be exported via sysfs when the
  object is registered.Note that the last attribute has to be
  object is registered.Note that the last attribute has to be
  initialized to NULL ! You can find a complete implementation
  initialized to NULL ! You can find a complete implementation
  in drivers/block/genhd.c
  in block/genhd.c




Instances of struct kobj_type are not registered; only referenced by
Instances of struct kobj_type are not registered; only referenced by
+3 −3
Original line number Original line Diff line number Diff line
@@ -294,15 +294,15 @@ tcp_rmem - vector of 3 INTEGERs: min, default, max
	Default: 87380*2 bytes.
	Default: 87380*2 bytes.


tcp_mem - vector of 3 INTEGERs: min, pressure, max
tcp_mem - vector of 3 INTEGERs: min, pressure, max
	low: below this number of pages TCP is not bothered about its
	min: below this number of pages TCP is not bothered about its
	memory appetite.
	memory appetite.


	pressure: when amount of memory allocated by TCP exceeds this number
	pressure: when amount of memory allocated by TCP exceeds this number
	of pages, TCP moderates its memory consumption and enters memory
	of pages, TCP moderates its memory consumption and enters memory
	pressure mode, which is exited when memory consumption falls
	pressure mode, which is exited when memory consumption falls
	under "low".
	under "min".


	high: number of pages allowed for queueing by all TCP sockets.
	max: number of pages allowed for queueing by all TCP sockets.


	Defaults are calculated at boot time from amount of available
	Defaults are calculated at boot time from amount of available
	memory.
	memory.
+5 −5
Original line number Original line Diff line number Diff line
@@ -1196,7 +1196,7 @@ platforms are moved over to use the flattened-device-tree model.
    - model : Model of the device.  Can be "TSEC", "eTSEC", or "FEC"
    - model : Model of the device.  Can be "TSEC", "eTSEC", or "FEC"
    - compatible : Should be "gianfar"
    - compatible : Should be "gianfar"
    - reg : Offset and length of the register set for the device
    - reg : Offset and length of the register set for the device
    - address : List of bytes representing the ethernet address of
    - mac-address : List of bytes representing the ethernet address of
      this controller
      this controller
    - interrupts : <a b> where a is the interrupt number and b is a
    - interrupts : <a b> where a is the interrupt number and b is a
      field that represents an encoding of the sense and level
      field that represents an encoding of the sense and level
@@ -1216,7 +1216,7 @@ platforms are moved over to use the flattened-device-tree model.
		model = "TSEC";
		model = "TSEC";
		compatible = "gianfar";
		compatible = "gianfar";
		reg = <24000 1000>;
		reg = <24000 1000>;
		address = [ 00 E0 0C 00 73 00 ];
		mac-address = [ 00 E0 0C 00 73 00 ];
		interrupts = <d 3 e 3 12 3>;
		interrupts = <d 3 e 3 12 3>;
		interrupt-parent = <40000>;
		interrupt-parent = <40000>;
		phy-handle = <2452000>
		phy-handle = <2452000>
@@ -1498,7 +1498,7 @@ not necessary as they are usually the same as the root node.
			model = "TSEC";
			model = "TSEC";
			compatible = "gianfar";
			compatible = "gianfar";
			reg = <24000 1000>;
			reg = <24000 1000>;
			address = [ 00 E0 0C 00 73 00 ];
			mac-address = [ 00 E0 0C 00 73 00 ];
			interrupts = <d 3 e 3 12 3>;
			interrupts = <d 3 e 3 12 3>;
			interrupt-parent = <40000>;
			interrupt-parent = <40000>;
			phy-handle = <2452000>;
			phy-handle = <2452000>;
@@ -1511,7 +1511,7 @@ not necessary as they are usually the same as the root node.
			model = "TSEC";
			model = "TSEC";
			compatible = "gianfar";
			compatible = "gianfar";
			reg = <25000 1000>;
			reg = <25000 1000>;
			address = [ 00 E0 0C 00 73 01 ];
			mac-address = [ 00 E0 0C 00 73 01 ];
			interrupts = <13 3 14 3 18 3>;
			interrupts = <13 3 14 3 18 3>;
			interrupt-parent = <40000>;
			interrupt-parent = <40000>;
			phy-handle = <2452001>;
			phy-handle = <2452001>;
@@ -1524,7 +1524,7 @@ not necessary as they are usually the same as the root node.
			model = "FEC";
			model = "FEC";
			compatible = "gianfar";
			compatible = "gianfar";
			reg = <26000 1000>;
			reg = <26000 1000>;
			address = [ 00 E0 0C 00 73 02 ];
			mac-address = [ 00 E0 0C 00 73 02 ];
			interrupts = <19 3>;
			interrupts = <19 3>;
			interrupt-parent = <40000>;
			interrupt-parent = <40000>;
			phy-handle = <2452002>;
			phy-handle = <2452002>;
+8 −0
Original line number Original line Diff line number Diff line
@@ -2656,6 +2656,14 @@ M: chrisw@sous-sol.org
L:	stable@kernel.org
L:	stable@kernel.org
S:	Maintained
S:	Maintained


STABLE BRANCH:
P:	Greg Kroah-Hartman
M:	greg@kroah.com
P:	Chris Wright
M:	chrisw@sous-sol.org
L:	stable@kernel.org
S:	Maintained

TPM DEVICE DRIVER
TPM DEVICE DRIVER
P:	Kylene Hall
P:	Kylene Hall
M:	kjhall@us.ibm.com
M:	kjhall@us.ibm.com
Loading