Merge branch 'akpm' (incoming from Andrew)

7c2db36e · Linus Torvalds <[email protected]> · 2013-02-21 17:38:49 -08:00

Merge misc patches from Andrew Morton:

 - Florian has vanished so I appear to have become fbdev maintainer
   again :(

 - Joel and Mark are distracted to welcome to the new OCFS2 maintainer

 - The backlight queue

 - Small core kernel changes

 - lib/ updates

 - The rtc queue

 - Various random bits

* akpm: (164 commits)
  rtc: rtc-davinci: use devm_*() functions
  rtc: rtc-max8997: use devm_request_threaded_irq()
  rtc: rtc-max8907: use devm_request_threaded_irq()
  rtc: rtc-da9052: use devm_request_threaded_irq()
  rtc: rtc-wm831x: use devm_request_threaded_irq()
  rtc: rtc-tps80031: use devm_request_threaded_irq()
  rtc: rtc-lp8788: use devm_request_threaded_irq()
  rtc: rtc-coh901331: use devm_clk_get()
  rtc: rtc-vt8500: use devm_*() functions
  rtc: rtc-tps6586x: use devm_request_threaded_irq()
  rtc: rtc-imxdi: use devm_clk_get()
  rtc: rtc-cmos: use dev_warn()/dev_dbg() instead of printk()/pr_debug()
  rtc: rtc-pcf8583: use dev_warn() instead of printk()
  rtc: rtc-sun4v: use pr_warn() instead of printk()
  rtc: rtc-vr41xx: use dev_info() instead of printk()
  rtc: rtc-rs5c313: use pr_err() instead of printk()
  rtc: rtc-at91rm9200: use dev_dbg()/dev_err() instead of printk()/pr_debug()
  rtc: rtc-rs5c372: use dev_dbg()/dev_warn() instead of printk()/pr_debug()
  rtc: rtc-ds2404: use dev_err() instead of printk()
  rtc: rtc-efi: use dev_err()/dev_warn()/pr_err() instead of printk()
  ...

Commit: 7c2db36e730ee4facd341679ecb21ee73ba92831
Parents: 8b5628ab · a47a376f

Merge commit. Changes below are compared with the first parent: 8b5628ab.

Changes

165 files changed · +9671 −1297

File	Status	Add	Del	Content
Documentation/ABI/testing/sysfs-class-bdi	modified	+5	−0	View file
Documentation/backlight/lp855x-driver.txt	modified	+2	−2	View file
Documentation/devicetree/booting-without-of.txt	modified	+1	−1	View file
Documentation/printk-formats.txt	modified	+11	−3	View file
MAINTAINERS	modified	+6	−1	View file
arch/alpha/kernel/osf_sys.c	modified	+9	−11	View file
arch/arm/boot/dts/armada-370-xp.dtsi	modified	+6	−0	View file
arch/arm/configs/pxa910_defconfig	modified	+8	−0	View file
arch/arm/mach-mmp/include/mach/pxa910.h	modified	+4	−1	View file
arch/arm/mach-mmp/pxa910.c	modified	+3	−0	View file
arch/arm/mach-mmp/ttc_dkb.c	modified	+92	−0	View file
arch/cris/include/uapi/asm/posix_types.h	modified	+0	−5	View file
arch/mn10300/unit-asb2305/pci-irq.c	modified	+1	−1	View file
arch/tile/Kconfig	modified	+0	−6	View file
block/blk-core.c	modified	+5	−3	View file
block/blk-integrity.c	modified	+4	−0	View file
drivers/net/ethernet/sun/Kconfig	modified	+2	−2	View file
drivers/pcmcia/cs.c	modified	+30	−7	View file
drivers/rtc/Kconfig	modified	+42	−0	View file
drivers/rtc/Makefile	modified	+5	−0	View file
drivers/rtc/class.c	modified	+3	−1	View file
drivers/rtc/rtc-at91rm9200.c	modified	+8	−9	View file
drivers/rtc/rtc-cmos.c	modified	+5	−10	View file
drivers/rtc/rtc-coh901331.c	modified	+2	−5	View file
drivers/rtc/rtc-da9052.c	modified	+6	−12	View file
drivers/rtc/rtc-davinci.c	modified	+10	−18	View file
drivers/rtc/rtc-dev.c	modified	+6	−5	View file
drivers/rtc/rtc-ds1305.c	modified	+2	−6	View file
drivers/rtc/rtc-ds1307.c	modified	+2	−9	View file
drivers/rtc/rtc-ds2404.c	modified	+3	−15	View file
drivers/rtc/rtc-efi.c	modified	+6	−4	View file
drivers/rtc/rtc-fm3130.c	modified	+4	−29	View file
drivers/rtc/rtc-imxdi.c	modified	+1	−3	View file
drivers/rtc/rtc-isl12022.c	modified	+1	−1	View file
drivers/rtc/rtc-lp8788.c	added	+338	−0	View file
drivers/rtc/rtc-max77686.c	added	+641	−0	View file
drivers/rtc/rtc-max8907.c	modified	+3	−3	View file
drivers/rtc/rtc-max8997.c	added	+552	−0	View file
drivers/rtc/rtc-mpc5121.c	modified	+4	−1	View file
drivers/rtc/rtc-pcf8523.c	modified	+31	−0	View file
drivers/rtc/rtc-pcf8563.c	modified	+1	−1	View file
drivers/rtc/rtc-pcf8583.c	modified	+2	−2	View file
drivers/rtc/rtc-pl031.c	modified	+2	−0	View file
drivers/rtc/rtc-pxa.c	modified	+15	−8	View file
drivers/rtc/rtc-rs5c313.c	modified	+3	−2	View file
drivers/rtc/rtc-rs5c372.c	modified	+4	−6	View file
drivers/rtc/rtc-rx4581.c	added	+314	−0	View file
drivers/rtc/rtc-s3c.c	modified	+9	−9	View file
drivers/rtc/rtc-sa1100.c	modified	+9	−6	View file
drivers/rtc/rtc-snvs.c	modified	+1	−1	View file
drivers/rtc/rtc-stmp3xxx.c	modified	+2	−1	View file
drivers/rtc/rtc-sun4v.c	modified	+6	−4	View file
drivers/rtc/rtc-tps6586x.c	modified	+2	−2	View file
drivers/rtc/rtc-tps65910.c	modified	+16	−28	View file
drivers/rtc/rtc-tps80031.c	added	+349	−0	View file
drivers/rtc/rtc-twl.c	modified	+5	−1	View file
drivers/rtc/rtc-vr41xx.c	modified	+1	−1	View file
drivers/rtc/rtc-vt8500.c	modified	+10	−18	View file
drivers/rtc/rtc-wm831x.c	modified	+4	−5	View file
drivers/video/Kconfig	modified	+13	−2	View file
drivers/video/Makefile	modified	+2	−0	View file
drivers/video/backlight/88pm860x_bl.c	modified	+4	−1	View file
drivers/video/backlight/Kconfig	modified	+23	−1	View file
drivers/video/backlight/Makefile	modified	+46	−43	View file
drivers/video/backlight/aat2870_bl.c	modified	+1	−1	View file
drivers/video/backlight/adp8860_bl.c	modified	+1	−1	View file
drivers/video/backlight/adp8870_bl.c	modified	+1	−1	View file
drivers/video/backlight/ams369fg06.c	modified	+31	−73	View file
drivers/video/backlight/as3711_bl.c	added	+380	−0	View file
drivers/video/backlight/corgi_lcd.c	modified	+9	−9	View file
drivers/video/backlight/hx8357.c	added	+497	−0	View file
drivers/video/backlight/l4f00242t03.c	modified	+11	−25	View file
drivers/video/backlight/ld9040.c	modified	+39	−70	View file
drivers/video/backlight/lm3630_bl.c	modified	+2	−2	View file
drivers/video/backlight/lm3639_bl.c	modified	+1	−4	View file
drivers/video/backlight/lms283gf05.c	modified	+2	−2	View file
drivers/video/backlight/lms501kf03.c	added	+441	−0	View file
drivers/video/backlight/lp855x_bl.c	modified	+130	−39	View file
drivers/video/backlight/ltv350qv.c	modified	+5	−5	View file
drivers/video/backlight/omap1_bl.c	modified	+5	−5	View file
drivers/video/backlight/pwm_bl.c	modified	+4	−4	View file
drivers/video/backlight/s6e63m0.c	modified	+57	−96	View file
drivers/video/backlight/tdo24m.c	modified	+5	−5	View file
drivers/video/backlight/tosa_bl.c	modified	+1	−1	View file
drivers/video/backlight/tosa_lcd.c	modified	+6	−6	View file
drivers/video/backlight/vgg2432a4.c	modified	+4	−5	View file
drivers/video/console/fbcon.c	modified	+9	−1	View file
drivers/video/exynos/exynos_dp_core.c	modified	+15	−8	View file
drivers/video/exynos/exynos_mipi_dsi.c	modified	+18	−52	View file
drivers/video/exynos/s6e8ax0.c	modified	+4	−10	View file
drivers/video/goldfishfb.c	added	+318	−0	View file
drivers/video/mmp/Kconfig	added	+11	−0	View file
drivers/video/mmp/Makefile	added	+1	−0	View file
drivers/video/mmp/core.c	added	+258	−0	View file
drivers/video/mmp/fb/Kconfig	added	+13	−0	View file
drivers/video/mmp/fb/Makefile	added	+1	−0	View file
drivers/video/mmp/fb/mmpfb.c	added	+685	−0	View file
drivers/video/mmp/fb/mmpfb.h	added	+54	−0	View file
drivers/video/mmp/hw/Kconfig	added	+20	−0	View file
drivers/video/mmp/hw/Makefile	added	+2	−0	View file
drivers/video/mmp/hw/mmp_ctrl.c	added	+591	−0	View file
drivers/video/mmp/hw/mmp_ctrl.h	added	+1974	−0	View file
drivers/video/mmp/hw/mmp_spi.c	added	+180	−0	View file
drivers/video/mmp/panel/Kconfig	added	+6	−0	View file
drivers/video/mmp/panel/Makefile	added	+1	−0	View file
drivers/video/mmp/panel/tpo_tj032md01bw.c	added	+186	−0	View file
drivers/video/mx3fb.c	modified	+1	−1	View file
fs/9p/vfs_file.c	modified	+1	−0	View file
fs/binfmt_elf.c	modified	+3	−3	View file
fs/block_dev.c	modified	+1	−0	View file
fs/buffer.c	modified	+1	−1	View file
fs/configfs/dir.c	modified	+3	−2	View file
fs/ext3/super.c	modified	+1	−0	View file
fs/ext4/inode.c	modified	+1	−1	View file
fs/gfs2/file.c	modified	+1	−1	View file
fs/nilfs2/file.c	modified	+1	−1	View file
fs/notify/inotify/inotify_user.c	modified	+0	−4	View file
fs/ocfs2/alloc.c	modified	+1	−2	View file
fs/ocfs2/aops.c	modified	+1	−0	View file
fs/ocfs2/cluster/heartbeat.c	modified	+2	−4	View file
fs/ocfs2/cluster/tcp.c	modified	+2	−4	View file
fs/ocfs2/dlm/dlmdomain.c	modified	+1	−3	View file
fs/ocfs2/dlmglue.c	modified	+4	−1	View file
fs/ocfs2/extent_map.c	modified	+1	−2	View file
fs/ocfs2/journal.c	modified	+3	−7	View file
fs/ocfs2/localalloc.c	modified	+3	−5	View file
fs/ocfs2/stack_o2cb.c	modified	+1	−1	View file
fs/ocfs2/super.c	modified	+2	−4	View file
fs/ocfs2/sysfile.c	modified	+1	−2	View file
fs/ubifs/file.c	modified	+1	−0	View file
include/linux/backing-dev.h	modified	+6	−0	View file
include/linux/bug.h	modified	+26	−21	View file
include/linux/compiler-gcc.h	modified	+3	−0	View file
include/linux/compiler-gcc3.h	modified	+4	−4	View file
include/linux/compiler-gcc4.h	modified	+18	−18	View file
include/linux/compiler.h	modified	+29	−3	View file
include/linux/lockdep.h	modified	+3	−1	View file
include/linux/pagemap.h	modified	+1	−0	View file
include/linux/platform_data/lp855x.h	modified	+19	−0	View file
include/linux/printk.h	modified	+18	−0	View file
include/linux/smp.h	modified	+2	−1	View file
include/uapi/linux/elf.h	modified	+6	−6	View file
include/uapi/linux/fs.h	modified	+3	−0	View file
include/video/exynos_mipi_dsim.h	modified	+0	−1	View file
include/video/mmp_disp.h	added	+352	−0	View file
include/video/samsung_fimd.h	modified	+100	−105	View file
kernel/compat.c	modified	+1	−1	View file
kernel/nsproxy.c	modified	+1	−2	View file
kernel/smp.c	modified	+30	−153	View file
kernel/sys.c	modified	+144	−144	View file
kernel/time.c	modified	+2	−2	View file
lib/Kconfig.debug	modified	+1	−2	View file
lib/parser.c	modified	+3	−3	View file
lib/vsprintf.c	modified	+7	−0	View file
lib/xz/Kconfig	modified	+16	−18	View file
mm/Kconfig	modified	+13	−0	View file
mm/backing-dev.c	modified	+11	−0	View file
mm/bounce.c	modified	+44	−4	View file
mm/filemap.c	modified	+2	−1	View file
mm/page-writeback.c	modified	+24	−0	View file
net/ipv6/Kconfig	modified	+1	−1	View file
scripts/checkpatch.pl	modified	+24	−2	View file
scripts/get_maintainer.pl	modified	+1	−1	View file
scripts/tags.sh	modified	+20	−4	View file
security/device_cgroup.c	modified	+12	−9	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/ABI/testing/sysfs-class-bdi

View file

diff --git a/Documentation/ABI/testing/sysfs-class-bdi b/Documentation/ABI/testing/sysfs-class-bdi
index 5f50097..d773d56 100644
--- a/Documentation/ABI/testing/sysfs-class-bdi
+++ b/Documentation/ABI/testing/sysfs-class-bdi
@@ -48,3 +48,8 @@ max_ratio (read-write)
 	most of the write-back cache.  For example in case of an NFS
 	mount that is prone to get stuck, or a FUSE mount which cannot
 	be trusted to play fair.
+
+stable_pages_required (read-only)
+
+	If set, the backing device requires that all pages comprising a write
+	request must not be changed until writeout is complete.

Documentation/backlight/lp855x-driver.txt

View file

diff --git a/Documentation/backlight/lp855x-driver.txt b/Documentation/backlight/lp855x-driver.txt
index 1529394..18b06ca 100644
--- a/Documentation/backlight/lp855x-driver.txt
+++ b/Documentation/backlight/lp855x-driver.txt
@@ -4,7 +4,7 @@ Kernel driver lp855x
 Backlight driver for LP855x ICs
 
 Supported chips:
-	Texas Instruments LP8550, LP8551, LP8552, LP8553 and LP8556
+	Texas Instruments LP8550, LP8551, LP8552, LP8553, LP8556 and LP8557
 
 Author: Milo(Woogyom) Kim <[email protected]>
 
@@ -24,7 +24,7 @@ Value : pwm based or register based
 
 2) chip_id
 The lp855x chip id.
-Value : lp8550/lp8551/lp8552/lp8553/lp8556
+Value : lp8550/lp8551/lp8552/lp8553/lp8556/lp8557
 
 Platform data for lp855x
 ------------------------

Documentation/devicetree/booting-without-of.txt

View file

diff --git a/Documentation/devicetree/booting-without-of.txt b/Documentation/devicetree/booting-without-of.txt
index d4d6675..b2fb2f5 100644
--- a/Documentation/devicetree/booting-without-of.txt
+++ b/Documentation/devicetree/booting-without-of.txt
@@ -1228,7 +1228,7 @@ hierarchy and routing of interrupts in the hardware.
 The interrupt tree model is fully described in the
 document "Open Firmware Recommended Practice: Interrupt
 Mapping Version 0.9".  The document is available at:
-<http://playground.sun.com/1275/practice>.
+<http://www.openfirmware.org/ofwg/practice/>
 
 1) interrupts property
 ----------------------

Documentation/printk-formats.txt

View file

diff --git a/Documentation/printk-formats.txt b/Documentation/printk-formats.txt
index 8ffb274..e8a6aa4 100644
--- a/Documentation/printk-formats.txt
+++ b/Documentation/printk-formats.txt
@@ -53,6 +53,14 @@ Struct Resources:
 	For printing struct resources. The 'R' and 'r' specifiers result in a
 	printed resource with ('R') or without ('r') a decoded flags member.
 
+Physical addresses:
+
+	%pa	0x01234567 or 0x0123456789abcdef
+
+	For printing a phys_addr_t type (and its derivatives, such as
+	resource_size_t) which can vary based on build options, regardless of
+	the width of the CPU data path. Passed by reference.
+
 Raw buffer as a hex string:
 	%*ph	00 01 02  ...  3f
 	%*phC	00:01:02: ... :3f
@@ -150,9 +158,9 @@ s64 SHOULD be printed with %lld/%llx, (long long):
 	printk("%lld", (long long)s64_var);
 
 If <type> is dependent on a config option for its size (e.g., sector_t,
-blkcnt_t, phys_addr_t, resource_size_t) or is architecture-dependent
-for its size (e.g., tcflag_t), use a format specifier of its largest
-possible type and explicitly cast to it.  Example:
+blkcnt_t) or is architecture-dependent for its size (e.g., tcflag_t), use a
+format specifier of its largest possible type and explicitly cast to it.
+Example:
 
 	printk("test: sector number/total blocks: %llu/%llu\n",
 		(unsigned long long)sector, (unsigned long long)blockcount);

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index f4da1b8..81e4ad8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1956,7 +1956,8 @@ F:	drivers/misc/*
 
 CHECKPATCH
 M:	Andy Whitcroft <[email protected]>
-S:	Supported
+M:	Joe Perches <[email protected]>
+S:	Maintained
 F:	scripts/checkpatch.pl
 
 CHINESE DOCUMENTATION
@@ -5035,6 +5036,10 @@ L:	[email protected]
 W:	http://www.linux-mm.org
 S:	Maintained
 F:	include/linux/mm.h
+F:	include/linux/gfp.h
+F:	include/linux/mmzone.h
+F:	include/linux/memory_hotplug.h
+F:	include/linux/vmalloc.h
 F:	mm/
 
 MEMORY RESOURCE CONTROLLER

arch/alpha/kernel/osf_sys.c

View file

diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index dbc1760..b9e37ad 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -1300,17 +1300,15 @@ static unsigned long
 arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
 		         unsigned long limit)
 {
-	struct vm_area_struct *vma = find_vma(current->mm, addr);
-
-	while (1) {
-		/* At this point:  (!vma || addr < vma->vm_end). */
-		if (limit - len < addr)
-			return -ENOMEM;
-		if (!vma || addr + len <= vma->vm_start)
-			return addr;
-		addr = vma->vm_end;
-		vma = vma->vm_next;
-	}
+	struct vm_unmapped_area_info info;
+
+	info.flags = 0;
+	info.length = len;
+	info.low_limit = addr;
+	info.high_limit = limit;
+	info.align_mask = 0;
+	info.align_offset = 0;
+	return vm_unmapped_area(&info);
 }
 
 unsigned long

arch/arm/boot/dts/armada-370-xp.dtsi

View file

diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 4c0abe8..5b29225 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -131,6 +131,12 @@
 			clocks = <&coreclk 0>;
 			status = "disabled";
 		};
+
+		rtc@10300 {
+			compatible = "marvell,orion-rtc";
+			reg = <0xd0010300 0x20>;
+			interrupts = <50>;
+		};
 	};
 };
 

arch/arm/configs/pxa910_defconfig

View file

diff --git a/arch/arm/configs/pxa910_defconfig b/arch/arm/configs/pxa910_defconfig
index 191118c..3bb7771 100644
--- a/arch/arm/configs/pxa910_defconfig
+++ b/arch/arm/configs/pxa910_defconfig
@@ -42,6 +42,14 @@ CONFIG_SMC91X=y
 # CONFIG_SERIO is not set
 CONFIG_SERIAL_PXA=y
 CONFIG_SERIAL_PXA_CONSOLE=y
+CONFIG_SPI=y
+CONFIG_FB=y
+CONFIG_MMP_DISP=y
+CONFIG_MMP_DISP_CONTROLLER=y
+CONFIG_MMP_SPI=y
+CONFIG_MMP_PANEL_TPOHVGA=y
+CONFIG_MMP_FB=y
+CONFIG_LOGO=y
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_HWMON is not set

arch/arm/mach-mmp/include/mach/pxa910.h

View file

diff --git a/arch/arm/mach-mmp/include/mach/pxa910.h b/arch/arm/mach-mmp/include/mach/pxa910.h
index eff31ab..b914afa 100644
--- a/arch/arm/mach-mmp/include/mach/pxa910.h
+++ b/arch/arm/mach-mmp/include/mach/pxa910.h
@@ -8,6 +8,7 @@ extern void __init pxa910_init_irq(void);
 #include <linux/i2c/pxa-i2c.h>
 #include <mach/devices.h>
 #include <linux/platform_data/mtd-nand-pxa3xx.h>
+#include <video/mmp_disp.h>
 
 extern struct pxa_device_desc pxa910_device_uart1;
 extern struct pxa_device_desc pxa910_device_uart2;
@@ -21,7 +22,9 @@ extern struct pxa_device_desc pxa910_device_nand;
 extern struct platform_device pxa168_device_u2o;
 extern struct platform_device pxa168_device_u2ootg;
 extern struct platform_device pxa168_device_u2oehci;
-
+extern struct pxa_device_desc pxa910_device_disp;
+extern struct pxa_device_desc pxa910_device_fb;
+extern struct pxa_device_desc pxa910_device_panel;
 extern struct platform_device pxa910_device_gpio;
 extern struct platform_device pxa910_device_rtc;
 

arch/arm/mach-mmp/pxa910.c

View file

diff --git a/arch/arm/mach-mmp/pxa910.c b/arch/arm/mach-mmp/pxa910.c
index c6a89f1..36cb321 100644
--- a/arch/arm/mach-mmp/pxa910.c
+++ b/arch/arm/mach-mmp/pxa910.c
@@ -134,6 +134,9 @@ PXA910_DEVICE(pwm2, "pxa910-pwm", 1, NONE, 0xd401a400, 0x10);
 PXA910_DEVICE(pwm3, "pxa910-pwm", 2, NONE, 0xd401a800, 0x10);
 PXA910_DEVICE(pwm4, "pxa910-pwm", 3, NONE, 0xd401ac00, 0x10);
 PXA910_DEVICE(nand, "pxa3xx-nand", -1, NAND, 0xd4283000, 0x80, 97, 99);
+PXA910_DEVICE(disp, "mmp-disp", 0, LCD, 0xd420b000, 0x1ec);
+PXA910_DEVICE(fb, "mmp-fb", -1, NONE, 0, 0);
+PXA910_DEVICE(panel, "tpo-hvga", -1, NONE, 0, 0);
 
 struct resource pxa910_resource_gpio[] = {
 	{

arch/arm/mach-mmp/ttc_dkb.c

View file

diff --git a/arch/arm/mach-mmp/ttc_dkb.c b/arch/arm/mach-mmp/ttc_dkb.c
index 6e47490..22a9058 100644
--- a/arch/arm/mach-mmp/ttc_dkb.c
+++ b/arch/arm/mach-mmp/ttc_dkb.c
@@ -19,6 +19,8 @@
 #include <linux/gpio.h>
 #include <linux/mfd/88pm860x.h>
 #include <linux/platform_data/mv_usb.h>
+#include <linux/spi/spi.h>
+#include <linux/delay.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -184,6 +186,92 @@ static struct pxa3xx_nand_platform_data dkb_nand_info = {
 };
 #endif
 
+#ifdef CONFIG_MMP_DISP
+/* path config */
+#define CFG_IOPADMODE(iopad)   (iopad)  /* 0x0 ~ 0xd */
+#define SCLK_SOURCE_SELECT(x)  (x << 30) /* 0x0 ~ 0x3 */
+/* link config */
+#define CFG_DUMBMODE(mode)     (mode << 28) /* 0x0 ~ 0x6*/
+#define CFG_GRA_SWAPRB(x)      (x << 0) /* 1: rbswap enabled */
+static struct mmp_mach_path_config dkb_disp_config[] = {
+	[0] = {
+		.name = "mmp-parallel",
+		.overlay_num = 2,
+		.output_type = PATH_OUT_PARALLEL,
+		.path_config = CFG_IOPADMODE(0x1)
+			| SCLK_SOURCE_SELECT(0x1),
+		.link_config = CFG_DUMBMODE(0x2)
+			| CFG_GRA_SWAPRB(0x1),
+	},
+};
+
+static struct mmp_mach_plat_info dkb_disp_info = {
+	.name = "mmp-disp",
+	.clk_name = "disp0",
+	.path_num = 1,
+	.paths = dkb_disp_config,
+};
+
+static struct mmp_buffer_driver_mach_info dkb_fb_info = {
+	.name = "mmp-fb",
+	.path_name = "mmp-parallel",
+	.overlay_id = 0,
+	.dmafetch_id = 1,
+	.default_pixfmt = PIXFMT_RGB565,
+};
+
+static void dkb_tpo_panel_power(int on)
+{
+	int err;
+	u32 spi_reset = mfp_to_gpio(MFP_PIN_GPIO106);
+
+	if (on) {
+		err = gpio_request(spi_reset, "TPO_LCD_SPI_RESET");
+		if (err) {
+			pr_err("failed to request GPIO for TPO LCD RESET\n");
+			return;
+		}
+		gpio_direction_output(spi_reset, 0);
+		udelay(100);
+		gpio_set_value(spi_reset, 1);
+		gpio_free(spi_reset);
+	} else {
+		err = gpio_request(spi_reset, "TPO_LCD_SPI_RESET");
+		if (err) {
+			pr_err("failed to request LCD RESET gpio\n");
+			return;
+		}
+		gpio_set_value(spi_reset, 0);
+		gpio_free(spi_reset);
+	}
+}
+
+static struct mmp_mach_panel_info dkb_tpo_panel_info = {
+	.name = "tpo-hvga",
+	.plat_path_name = "mmp-parallel",
+	.plat_set_onoff = dkb_tpo_panel_power,
+};
+
+static struct spi_board_info spi_board_info[] __initdata = {
+	{
+		.modalias       = "tpo-hvga",
+		.platform_data  = &dkb_tpo_panel_info,
+		.bus_num        = 5,
+	}
+};
+
+static void __init add_disp(void)
+{
+	pxa_register_device(&pxa910_device_disp,
+		&dkb_disp_info, sizeof(dkb_disp_info));
+	spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
+	pxa_register_device(&pxa910_device_fb,
+		&dkb_fb_info, sizeof(dkb_fb_info));
+	pxa_register_device(&pxa910_device_panel,
+		&dkb_tpo_panel_info, sizeof(dkb_tpo_panel_info));
+}
+#endif
+
 static void __init ttc_dkb_init(void)
 {
 	mfp_config(ARRAY_AND_SIZE(ttc_dkb_pin_config));
@@ -212,6 +300,10 @@ static void __init ttc_dkb_init(void)
 	pxa168_device_u2ootg.dev.platform_data = &ttc_usb_pdata;
 	platform_device_register(&pxa168_device_u2ootg);
 #endif
+
+#ifdef CONFIG_MMP_DISP
+	add_disp();
+#endif
 }
 
 MACHINE_START(TTC_DKB, "PXA910-based TTC_DKB Development Platform")

arch/cris/include/uapi/asm/posix_types.h

View file

diff --git a/arch/cris/include/uapi/asm/posix_types.h b/arch/cris/include/uapi/asm/posix_types.h
index ce4e517..0f22e6a 100644
--- a/arch/cris/include/uapi/asm/posix_types.h
+++ b/arch/cris/include/uapi/asm/posix_types.h
@@ -22,11 +22,6 @@ typedef unsigned short	__kernel_uid_t;
 typedef unsigned short	__kernel_gid_t;
 #define __kernel_uid_t __kernel_uid_t
 
-typedef __SIZE_TYPE__	__kernel_size_t;
-typedef long		__kernel_ssize_t;
-typedef int		__kernel_ptrdiff_t;
-#define __kernel_size_t __kernel_size_t
-
 typedef unsigned short	__kernel_old_dev_t;
 #define __kernel_old_dev_t __kernel_old_dev_t
 

arch/mn10300/unit-asb2305/pci-irq.c

View file

diff --git a/arch/mn10300/unit-asb2305/pci-irq.c b/arch/mn10300/unit-asb2305/pci-irq.c
index 91212ea..77439da 100644
--- a/arch/mn10300/unit-asb2305/pci-irq.c
+++ b/arch/mn10300/unit-asb2305/pci-irq.c
@@ -29,7 +29,7 @@ void __init pcibios_fixup_irqs(void)
 	struct pci_dev *dev = NULL;
 	u8 line, pin;
 
-	while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+	for_each_pci_dev(dev) {
 		pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
 		if (pin) {
 			dev->irq = XIRQ1;

arch/tile/Kconfig

View file

diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 36136e8..4ce6e4c 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -413,12 +413,6 @@ config TILE_USB
 	  Provides USB host adapter support for the built-in EHCI and OHCI
 	  interfaces on TILE-Gx chips.
 
-# USB OHCI needs the bounce pool since tilegx will often have more
-# than 4GB of memory, but we don't currently use the IOTLB to present
-# a 32-bit address to OHCI.  So we need to use a bounce pool instead.
-config NEED_BOUNCE_POOL
-	def_bool USB_OHCI_HCD
-
 source "drivers/pci/hotplug/Kconfig"
 
 endmenu

block/blk-core.c

View file

diff --git a/block/blk-core.c b/block/blk-core.c
index c973249..277134c 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1474,6 +1474,11 @@ void blk_queue_bio(struct request_queue *q, struct bio *bio)
 	 */
 	blk_queue_bounce(q, &bio);
 
+	if (bio_integrity_enabled(bio) && bio_integrity_prep(bio)) {
+		bio_endio(bio, -EIO);
+		return;
+	}
+
 	if (bio->bi_rw & (REQ_FLUSH | REQ_FUA)) {
 		spin_lock_irq(q->queue_lock);
 		where = ELEVATOR_INSERT_FLUSH;
@@ -1714,9 +1719,6 @@ generic_make_request_checks(struct bio *bio)
 	 */
 	blk_partition_remap(bio);
 
-	if (bio_integrity_enabled(bio) && bio_integrity_prep(bio))
-		goto end_io;
-
 	if (bio_check_eod(bio, nr_sectors))
 		goto end_io;
 

block/blk-integrity.c

View file

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index da2a818..dabd221 100644
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -420,6 +420,8 @@ int blk_integrity_register(struct gendisk *disk, struct blk_integrity *template)
 	} else
 		bi->name = bi_unsupported_name;
 
+	disk->queue->backing_dev_info.capabilities |= BDI_CAP_STABLE_WRITES;
+
 	return 0;
 }
 EXPORT_SYMBOL(blk_integrity_register);
@@ -438,6 +440,8 @@ void blk_integrity_unregister(struct gendisk *disk)
 	if (!disk || !disk->integrity)
 		return;
 
+	disk->queue->backing_dev_info.capabilities &= ~BDI_CAP_STABLE_WRITES;
+
 	bi = disk->integrity;
 
 	kobject_uevent(&bi->kobj, KOBJ_REMOVE);

drivers/net/ethernet/sun/Kconfig

View file

diff --git a/drivers/net/ethernet/sun/Kconfig b/drivers/net/ethernet/sun/Kconfig
index ae3a355..3074aa3 100644
--- a/drivers/net/ethernet/sun/Kconfig
+++ b/drivers/net/ethernet/sun/Kconfig
@@ -61,7 +61,7 @@ config SUNGEM
 	select SUNGEM_PHY
 	---help---
 	  Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0.  See also
-	  <http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>.
+	  <http://docs.oracle.com/cd/E19455-01/806-3985-10/806-3985-10.pdf>.
 
 config CASSINI
 	tristate "Sun Cassini support"
@@ -69,7 +69,7 @@ config CASSINI
 	select CRC32
 	---help---
 	  Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also
-	  <http://www.sun.com/products-n-solutions/hardware/docs/pdf/817-4341-10.pdf>
+	  <http://docs.oracle.com/cd/E19113-01/giga.ether.pci/817-4341-10/817-4341-10.pdf>.
 
 config SUNVNET
 	tristate "Sun Virtual Network support"

drivers/pcmcia/cs.c

View file

diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index 673c14e..5292db6 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -484,7 +484,7 @@ static int socket_early_resume(struct pcmcia_socket *skt)
 
 static int socket_late_resume(struct pcmcia_socket *skt)
 {
-	int ret;
+	int ret = 0;
 
 	mutex_lock(&skt->ops_mutex);
 	skt->state &= ~SOCKET_SUSPEND;
@@ -511,19 +511,31 @@ static int socket_late_resume(struct pcmcia_socket *skt)
 		return socket_insert(skt);
 	}
 
+	if (!(skt->state & SOCKET_CARDBUS) && (skt->callback))
+		ret = skt->callback->early_resume(skt);
+	return ret;
+}
+
+/*
+ * Finalize the resume. In case of a cardbus socket, we have
+ * to rebind the devices as we can't be certain that it has been
+ * replaced, or not.
+ */
+static int socket_complete_resume(struct pcmcia_socket *skt)
+{
+	int ret = 0;
 #ifdef CONFIG_CARDBUS
 	if (skt->state & SOCKET_CARDBUS) {
 		/* We can't be sure the CardBus card is the same
 		 * as the one previously inserted. Therefore, remove
 		 * and re-add... */
 		cb_free(skt);
-		cb_alloc(skt);
-		return 0;
+		ret = cb_alloc(skt);
+		if (ret)
+			cb_free(skt);
 	}
 #endif
-	if (!(skt->state & SOCKET_CARDBUS) && (skt->callback))
-		skt->callback->early_resume(skt);
-	return 0;
+	return ret;
 }
 
 /*
@@ -533,11 +545,15 @@ static int socket_late_resume(struct pcmcia_socket *skt)
  */
 static int socket_resume(struct pcmcia_socket *skt)
 {
+	int err;
 	if (!(skt->state & SOCKET_SUSPEND))
 		return -EBUSY;
 
 	socket_early_resume(skt);
-	return socket_late_resume(skt);
+	err = socket_late_resume(skt);
+	if (!err)
+		err = socket_complete_resume(skt);
+	return err;
 }
 
 static void socket_remove(struct pcmcia_socket *skt)
@@ -848,6 +864,12 @@ static int __used pcmcia_socket_dev_resume(struct device *dev)
 	return __pcmcia_pm_op(dev, socket_late_resume);
 }
 
+static void __used pcmcia_socket_dev_complete(struct device *dev)
+{
+	WARN(__pcmcia_pm_op(dev, socket_complete_resume),
+		"failed to complete resume");
+}
+
 static const struct dev_pm_ops pcmcia_socket_pm_ops = {
 	/* dev_resume may be called with IRQs enabled */
 	SET_SYSTEM_SLEEP_PM_OPS(NULL,
@@ -862,6 +884,7 @@ static const struct dev_pm_ops pcmcia_socket_pm_ops = {
 	.resume_noirq = pcmcia_socket_dev_resume_noirq,
 	.thaw_noirq = pcmcia_socket_dev_resume_noirq,
 	.restore_noirq = pcmcia_socket_dev_resume_noirq,
+	.complete = pcmcia_socket_dev_complete,
 };
 
 #define PCMCIA_SOCKET_CLASS_PM_OPS (&pcmcia_socket_pm_ops)

drivers/rtc/Kconfig

View file

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 476d064..e6ab071 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -204,6 +204,12 @@ config RTC_DRV_DS3232
 	  This driver can also be built as a module.  If so, the module
 	  will be called rtc-ds3232.
 
+config RTC_DRV_LP8788
+	tristate "TI LP8788 RTC driver"
+	depends on MFD_LP8788
+	help
+	  Say Y to enable support for the LP8788 RTC/ALARM driver.
+
 config RTC_DRV_MAX6900
 	tristate "Maxim MAX6900"
 	help
@@ -243,6 +249,26 @@ config RTC_DRV_MAX8998
 	  This driver can also be built as a module. If so, the module
 	  will be called rtc-max8998.
 
+config RTC_DRV_MAX8997
+	tristate "Maxim MAX8997"
+	depends on MFD_MAX8997
+	help
+	  If you say yes here you will get support for the
+	  RTC of Maxim MAX8997 PMIC.
+
+	  This driver can also be built as a module. If so, the module
+	  will be called rtc-max8997.
+
+config RTC_DRV_MAX77686
+	tristate "Maxim MAX77686"
+	depends on MFD_MAX77686
+	help
+	  If you say yes here you will get support for the
+	  RTC of Maxim MAX77686 PMIC.
+
+	  This driver can also be built as a module. If so, the module
+	  will be called rtc-max77686.
+
 config RTC_DRV_RS5C372
 	tristate "Ricoh R2025S/D, RS5C372A/B, RV5C386, RV5C387A"
 	help
@@ -380,6 +406,14 @@ config RTC_DRV_TPS65910
 	  This driver can also be built as a module. If so, the module
 	  will be called rtc-tps65910.
 
+config RTC_DRV_TPS80031
+	tristate "TI TPS80031/TPS80032 RTC driver"
+	depends on MFD_TPS80031
+	help
+	  TI Power Managment IC TPS80031 supports RTC functionality
+	  along with alarm. This driver supports the RTC driver for
+	  the TPS80031 RTC module.
+
 config RTC_DRV_RC5T583
 	tristate "RICOH 5T583 RTC driver"
 	depends on MFD_RC5T583
@@ -537,6 +571,14 @@ config RTC_DRV_PCF2123
 	  This driver can also be built as a module. If so, the module
 	  will be called rtc-pcf2123.
 
+config RTC_DRV_RX4581
+	tristate "Epson RX-4581"
+	help
+	  If you say yes here you will get support for the Epson RX-4581.
+
+	  This driver can also be built as a module. If so the module
+	  will be called rtc-rx4581.