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

Commit 56847d85 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (incoming from Andrew) 

Merge second batch of fixes from Andrew Morton:

 - various misc bits

 - some printk updates

 - a new "SRAM" driver.

 - MAINTAINERS updates

 - the backlight driver queue

 - checkpatch updates

 - a few init/ changes

 - a huge number of drivers/rtc changes

 - fatfs updates

 - some lib/idr.c work

 - some renaming of the random driver interfaces

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (285 commits)
  net: rename random32 to prandom
  net/core: remove duplicate statements by do-while loop
  net/core: rename random32() to prandom_u32()
  net/netfilter: rename random32() to prandom_u32()
  net/sched: rename random32() to prandom_u32()
  net/sunrpc: rename random32() to prandom_u32()
  scsi: rename random32() to prandom_u32()
  lguest: rename random32() to prandom_u32()
  uwb: rename random32() to prandom_u32()
  video/uvesafb: rename random32() to prandom_u32()
  mmc: rename random32() to prandom_u32()
  drbd: rename random32() to prandom_u32()
  kernel/: rename random32() to prandom_u32()
  mm/: rename random32() to prandom_u32()
  lib/: rename random32() to prandom_u32()
  x86: rename random32() to prandom_u32()
  x86: pageattr-test: remove srandom32 call
  uuid: use prandom_bytes()
  raid6test: use prandom_bytes()
  sctp: convert sctp_assoc_set_id() to use idr_alloc_cyclic()
  ...
parents 191a7120 8d564368

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -761,6 +761,10 @@ S: Northampton 
S: NN1 3QT

S: United Kingdom



N: Massimo Dal Zotto

E: dz@debian.org

D: i8k Dell laptop SMM driver



N: Uwe Dannowski

E: Uwe.Dannowski@ira.uka.de

W: http://i30www.ira.uka.de/~dannowsk/

Documentation/SubmittingPatches

+8 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ person it names. This tag documents that potentially interested parties 
have been included in the discussion





14) Using Reported-by:, Tested-by: and Reviewed-by:

14) Using Reported-by:, Tested-by:, Reviewed-by: and Suggested-by:



If this patch fixes a problem reported by somebody else, consider adding a

Reported-by: tag to credit the reporter for their contribution.  Please
@@ -468,6 +468,13 @@ done on the patch. Reviewed-by: tags, when supplied by reviewers known to 
understand the subject area and to perform thorough reviews, will normally

increase the likelihood of your patch getting into the kernel.



A Suggested-by: tag indicates that the patch idea is suggested by the person

named and ensures credit to the person for the idea. Please note that this

tag should not be added without the reporter's permission, especially if the

idea was not posted in a public forum. That said, if we diligently credit our

idea reporters, they will, hopefully, be inspired to help us again in the

future.





15) The canonical patch format

Documentation/backlight/lp855x-driver.txt

+0 −7
Original line number Diff line number Diff line
@@ -32,14 +32,10 @@ Platform data for lp855x 
For supporting platform specific data, the lp855x platform data can be used.



* name : Backlight driver name. If it is not defined, default name is set.

* mode : Brightness control mode. PWM or register based.

* device_control : Value of DEVICE CONTROL register.

* initial_brightness : Initial value of backlight brightness.

* period_ns : Platform specific PWM period value. unit is nano.

	     Only valid when brightness is pwm input mode.

* load_new_rom_data :

	0 : use default configuration data

	1 : update values of eeprom or eprom registers on loading driver

* size_program : Total size of lp855x_rom_data.

* rom_data : List of new eeprom/eprom registers.
@@ -54,10 +50,8 @@ static struct lp855x_rom_data lp8552_eeprom_arr[] = { 


static struct lp855x_platform_data lp8552_pdata = {

	.name = "lcd-bl",

	.mode = REGISTER_BASED,

	.device_control = I2C_CONFIG(LP8552),

	.initial_brightness = INITIAL_BRT,

	.load_new_rom_data = 1,

	.size_program = ARRAY_SIZE(lp8552_eeprom_arr),

	.rom_data = lp8552_eeprom_arr,

};
@@ -65,7 +59,6 @@ static struct lp855x_platform_data lp8552_pdata = { 
example 2) lp8556 platform data : pwm input mode with default rom data



static struct lp855x_platform_data lp8556_pdata = {

	.mode = PWM_BASED,

	.device_control = PWM_CONFIG(LP8556),

	.initial_brightness = INITIAL_BRT,

	.period_ns = 1000000,

Documentation/devicetree/bindings/media/coda.txt

0 → 100644
+30 −0
Original line number Diff line number Diff line 
Chips&Media Coda multi-standard codec IP

========================================



Coda codec IPs are present in i.MX SoCs in various versions,

called VPU (Video Processing Unit).



Required properties:

- compatible : should be "fsl,<chip>-src" for i.MX SoCs:

  (a) "fsl,imx27-vpu" for CodaDx6 present in i.MX27

  (b) "fsl,imx53-vpu" for CODA7541 present in i.MX53

  (c) "fsl,imx6q-vpu" for CODA960 present in i.MX6q

- reg: should be register base and length as documented in the

  SoC reference manual

- interrupts : Should contain the VPU interrupt. For CODA960,

  a second interrupt is needed for the MJPEG unit.

- clocks : Should contain the ahb and per clocks, in the order

  determined by the clock-names property.

- clock-names : Should be "ahb", "per"

- iram : phandle pointing to the SRAM device node



Example:



vpu: vpu@63ff4000 {

	compatible = "fsl,imx53-vpu";

	reg = <0x63ff4000 0x1000>;

	interrupts = <9>;

	clocks = <&clks 63>, <&clks 63>;

	clock-names = "ahb", "per";

	iram = <&ocram>;

};

Documentation/devicetree/bindings/misc/sram.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
Generic on-chip SRAM



Simple IO memory regions to be managed by the genalloc API.



Required properties:



- compatible : mmio-sram



- reg : SRAM iomem address range



Example:



sram: sram@5c000000 {

	compatible = "mmio-sram";

	reg = <0x5c000000 0x40000>; /* 256 KiB SRAM at address 0x5c000000 */

};