From 2c3541c01bd0b5c45d9a1e31e46cdda65b8db6bd Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Tue, 14 Jun 2011 05:53:18 -0700 Subject: [PATCH] --- yaml --- r: 253740 b: refs/heads/master c: e9e35c5a2b2c803b5e2f25906d8ffe110670ceb6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/CREDITS | 8 + trunk/Documentation/kernel-parameters.txt | 2 + trunk/MAINTAINERS | 17 +- trunk/Makefile | 18 +- trunk/arch/arm/mach-ep93xx/core.c | 6 +- trunk/arch/arm/mach-exynos4/Kconfig | 6 + trunk/arch/arm/mach-exynos4/Makefile | 2 +- trunk/arch/arm/mach-exynos4/cpu.c | 2 +- .../mach-exynos4/include/mach/regs-usb-phy.h | 2 +- .../{usb-phy.c => setup-usb-phy.c} | 0 trunk/arch/arm/mach-exynos4/time.c | 2 + trunk/arch/arm/mach-omap1/Makefile | 4 +- trunk/arch/arm/mach-omap1/dma.c | 11 +- trunk/arch/arm/mach-omap1/pm_bus.c | 8 +- trunk/arch/arm/mach-omap2/board-2430sdp.c | 2 +- trunk/arch/arm/mach-omap2/board-3430sdp.c | 6 +- trunk/arch/arm/mach-omap2/board-4430sdp.c | 11 +- trunk/arch/arm/mach-omap2/board-apollon.c | 2 +- trunk/arch/arm/mach-omap2/board-cm-t35.c | 2 - trunk/arch/arm/mach-omap2/board-cm-t3517.c | 5 +- trunk/arch/arm/mach-omap2/board-devkit8000.c | 2 - trunk/arch/arm/mach-omap2/board-omap3beagle.c | 8 +- .../arch/arm/mach-omap2/board-omap3pandora.c | 7 +- .../arm/mach-omap2/board-omap3touchbook.c | 2 - trunk/arch/arm/mach-omap2/board-omap4panda.c | 8 +- trunk/arch/arm/mach-omap2/board-overo.c | 4 +- .../arm/mach-omap2/board-rx51-peripherals.c | 3 +- .../arch/arm/mach-omap2/board-zoom-display.c | 2 +- .../arm/mach-omap2/common-board-devices.c | 20 +- .../arm/mach-omap2/common-board-devices.h | 2 + trunk/arch/arm/mach-omap2/devices.c | 2 +- trunk/arch/arm/mach-omap2/hsmmc.c | 16 +- trunk/arch/arm/mach-omap2/hsmmc.h | 1 + trunk/arch/arm/mach-omap2/mux.c | 5 +- trunk/arch/arm/mach-omap2/mux.h | 6 +- trunk/arch/arm/mach-omap2/mux44xx.c | 5 +- trunk/arch/arm/mach-omap2/omap_hwmod.c | 2 +- .../arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +- trunk/arch/arm/mach-omap2/omap_phy_internal.c | 4 +- trunk/arch/arm/mach-omap2/pm-debug.c | 4 +- trunk/arch/arm/mach-s3c2410/Makefile | 1 - trunk/arch/arm/mach-s3c2410/irq.c | 34 - trunk/arch/arm/mach-s5pv210/cpufreq.c | 8 +- trunk/arch/arm/mach-ux500/cpu-db8500.c | 3 + .../arch/arm/plat-nomadik/include/plat/gpio.h | 1 + trunk/arch/arm/plat-omap/include/plat/flash.h | 1 + trunk/arch/arm/plat-omap/include/plat/iovmm.h | 3 - trunk/arch/arm/plat-omap/include/plat/mmc.h | 3 + trunk/arch/arm/plat-omap/iovmm.c | 4 - trunk/arch/arm/plat-omap/omap_device.c | 19 +- trunk/arch/arm/plat-omap/sram.c | 12 +- trunk/arch/arm/plat-s3c24xx/dma.c | 2 +- trunk/arch/arm/plat-s3c24xx/irq.c | 6 + trunk/arch/arm/plat-s5p/dev-onenand.c | 12 - .../arch/arm/plat-s5p/include/plat/map-s5p.h | 2 +- trunk/arch/arm/plat-samsung/dev-onenand.c | 12 - .../arch/arm/plat-samsung/include/plat/devs.h | 6 +- trunk/arch/mn10300/kernel/traps.c | 4 +- trunk/arch/mn10300/kernel/vmlinux.lds.S | 1 + .../arch/mn10300/mm/cache-dbg-flush-by-reg.S | 4 +- trunk/arch/powerpc/boot/.gitignore | 1 - trunk/arch/powerpc/boot/dtc-src/.gitignore | 3 - trunk/arch/powerpc/include/asm/rio.h | 2 +- trunk/arch/powerpc/kernel/cputable.c | 2 +- trunk/arch/powerpc/kernel/prom.c | 27 +- trunk/arch/powerpc/mm/init_32.c | 15 - trunk/arch/powerpc/mm/init_64.c | 14 - trunk/arch/powerpc/mm/mem.c | 19 + trunk/arch/powerpc/sysdev/fsl_lbc.c | 6 +- trunk/arch/s390/Kconfig | 1 + trunk/arch/s390/include/asm/pgalloc.h | 8 +- trunk/arch/s390/include/asm/pgtable.h | 39 +- trunk/arch/s390/include/asm/qdio.h | 119 +-- trunk/arch/s390/include/asm/tlb.h | 94 +- trunk/arch/s390/kvm/kvm-s390.c | 1 + trunk/arch/s390/kvm/sie64a.S | 2 + trunk/arch/s390/mm/pgtable.c | 292 +++--- trunk/arch/sparc/Kconfig | 18 +- trunk/arch/sparc/include/asm/floppy_32.h | 8 +- trunk/arch/sparc/include/asm/floppy_64.h | 4 +- trunk/arch/sparc/include/asm/leon.h | 3 + trunk/arch/sparc/include/asm/leon_pci.h | 21 + trunk/arch/sparc/include/asm/pci_32.h | 24 + trunk/arch/sparc/include/asm/pcic.h | 2 +- trunk/arch/sparc/include/asm/system_32.h | 2 +- trunk/arch/sparc/include/asm/system_64.h | 2 +- trunk/arch/sparc/kernel/Makefile | 4 +- trunk/arch/sparc/kernel/apc.c | 2 +- trunk/arch/sparc/kernel/auxio_32.c | 2 +- trunk/arch/sparc/kernel/chmc.c | 2 +- trunk/arch/sparc/kernel/entry.S | 8 +- trunk/arch/sparc/kernel/leon_kernel.c | 31 + trunk/arch/sparc/kernel/leon_pci.c | 253 +++++ trunk/arch/sparc/kernel/leon_pci_grpci2.c | 897 ++++++++++++++++++ trunk/arch/sparc/kernel/module.c | 2 +- trunk/arch/sparc/kernel/pci_common.c | 4 +- trunk/arch/sparc/kernel/pci_schizo.c | 6 +- trunk/arch/sparc/kernel/prom_irqtrans.c | 2 +- trunk/arch/sparc/kernel/psycho_common.c | 2 +- trunk/arch/sparc/kernel/sbus.c | 4 +- trunk/arch/sparc/kernel/setup_32.c | 2 +- trunk/arch/sparc/kernel/setup_64.c | 2 +- trunk/arch/sparc/kernel/smp_32.c | 6 +- trunk/arch/sparc/kernel/sun4d_irq.c | 126 ++- trunk/arch/sparc/kernel/sys_sparc32.c | 2 +- trunk/arch/sparc/kernel/sys_sparc_64.c | 6 +- trunk/arch/sparc/kernel/time_64.c | 2 +- trunk/arch/sparc/kernel/traps_64.c | 2 +- trunk/arch/sparc/kernel/unaligned_64.c | 6 +- trunk/arch/sparc/kernel/us2e_cpufreq.c | 6 +- trunk/arch/sparc/kernel/us3_cpufreq.c | 4 +- trunk/arch/sparc/kernel/viohs.c | 2 +- trunk/arch/sparc/kernel/visemul.c | 14 +- trunk/arch/sparc/mm/fault_32.c | 2 +- trunk/arch/sparc/mm/init_32.c | 2 +- trunk/arch/sparc/mm/init_64.c | 6 +- trunk/arch/sparc/mm/srmmu.c | 4 +- trunk/arch/sparc/mm/sun4c.c | 8 +- trunk/arch/sparc/mm/tsb.c | 6 +- trunk/arch/sparc/prom/console_32.c | 2 +- trunk/arch/sparc/prom/init_32.c | 2 +- trunk/arch/sparc/prom/mp.c | 2 +- trunk/arch/unicore32/Kconfig | 4 - trunk/arch/unicore32/Makefile | 38 +- trunk/arch/unicore32/boot/compressed/Makefile | 2 +- .../{debug_defconfig => unicore32_defconfig} | 8 +- trunk/arch/unicore32/include/asm/Kbuild | 59 ++ trunk/arch/unicore32/kernel/Makefile | 1 - trunk/arch/unicore32/kernel/vmlinux.lds.S | 2 +- trunk/arch/x86/kernel/amd_iommu.c | 48 +- trunk/arch/x86/kernel/amd_iommu_init.c | 8 +- trunk/arch/x86/kernel/apic/apic.c | 3 +- trunk/arch/x86/kernel/devicetree.c | 11 + trunk/arch/x86/kernel/process_32.c | 1 - trunk/arch/x86/kernel/process_64.c | 1 - trunk/arch/x86/kernel/smpboot.c | 13 + trunk/arch/x86/kvm/emulate.c | 82 +- trunk/arch/x86/oprofile/op_model_amd.c | 13 +- trunk/arch/x86/xen/multicalls.c | 12 +- trunk/drivers/ata/libata-eh.c | 12 +- trunk/drivers/base/power/clock_ops.c | 16 +- trunk/drivers/firmware/iscsi_ibft_find.c | 2 + trunk/drivers/gpio/Kconfig | 28 +- trunk/drivers/gpio/gpio-exynos4.c | 29 +- trunk/drivers/gpio/gpio-nomadik.c | 40 +- trunk/drivers/gpio/gpio-omap.c | 23 +- trunk/drivers/gpu/drm/i915/i915_debugfs.c | 2 +- trunk/drivers/gpu/drm/i915/i915_drv.h | 8 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 26 +- trunk/drivers/gpu/drm/i915/i915_irq.c | 2 +- trunk/drivers/gpu/drm/i915/intel_crt.c | 4 + trunk/drivers/gpu/drm/i915/intel_display.c | 89 +- trunk/drivers/gpu/drm/i915/intel_dp.c | 15 +- trunk/drivers/gpu/drm/i915/intel_drv.h | 1 + trunk/drivers/gpu/drm/i915/intel_hdmi.c | 16 +- trunk/drivers/gpu/drm/i915/intel_lvds.c | 8 + trunk/drivers/gpu/drm/i915/intel_modes.c | 30 + trunk/drivers/gpu/drm/i915/intel_sdvo.c | 14 +- trunk/drivers/gpu/drm/nouveau/nouveau_hw.c | 2 + trunk/drivers/gpu/drm/nouveau/nouveau_mem.c | 4 +- trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_state.c | 114 +-- trunk/drivers/gpu/drm/nouveau/nouveau_vm.c | 1 + trunk/drivers/gpu/drm/nouveau/nv04_crtc.c | 8 +- trunk/drivers/gpu/drm/nouveau/nvreg.h | 2 + trunk/drivers/gpu/drm/radeon/Kconfig | 9 +- trunk/drivers/gpu/drm/radeon/atombios_crtc.c | 12 +- .../gpu/drm/radeon/cayman_blit_shaders.c | 326 ++++++- .../gpu/drm/radeon/cayman_blit_shaders.h | 3 + trunk/drivers/gpu/drm/radeon/evergreen.c | 104 +- .../gpu/drm/radeon/evergreen_blit_kms.c | 561 ++++++----- trunk/drivers/gpu/drm/radeon/evergreend.h | 8 +- trunk/drivers/gpu/drm/radeon/ni.c | 13 +- trunk/drivers/gpu/drm/radeon/r600.c | 12 + trunk/drivers/gpu/drm/radeon/r600_cs.c | 28 +- trunk/drivers/gpu/drm/radeon/r600d.h | 3 + trunk/drivers/gpu/drm/radeon/radeon_asic.c | 8 +- trunk/drivers/gpu/drm/radeon/radeon_cs.c | 1 + trunk/drivers/gpu/drm/radeon/radeon_device.c | 3 + trunk/drivers/gpu/drm/radeon/radeon_display.c | 13 +- trunk/drivers/gpu/drm/radeon/radeon_drv.c | 4 +- .../drivers/gpu/drm/radeon/radeon_encoders.c | 17 +- trunk/drivers/gpu/drm/radeon/radeon_family.h | 2 + trunk/drivers/gpu/drm/radeon/radeon_pm.c | 1 + trunk/drivers/gpu/drm/radeon/reg_srcs/r600 | 1 - trunk/drivers/ide/ide-cd.c | 3 +- trunk/drivers/isdn/hardware/mISDN/hfcsusb.c | 1 + trunk/drivers/media/dvb/dvb-usb/anysee.c | 17 +- trunk/drivers/media/media-devnode.c | 4 +- .../media/video/cx23885/cx23885-cards.c | 2 +- .../media/video/gspca/coarse_expo_autogain.h | 116 --- trunk/drivers/media/video/gspca/ov519.c | 8 +- trunk/drivers/media/video/gspca/sonixj.c | 2 +- .../media/video/gspca/stv06xx/stv06xx_hdcs.h | 2 +- trunk/drivers/media/video/ivtv/ivtv-driver.c | 10 +- .../drivers/media/video/ivtv/ivtv-firmware.c | 11 +- trunk/drivers/media/video/ivtv/ivtv-ioctl.c | 129 +-- trunk/drivers/media/video/ivtv/ivtv-ioctl.h | 3 +- trunk/drivers/media/video/ivtv/ivtv-streams.c | 4 +- trunk/drivers/media/video/ivtv/ivtv-vbi.c | 2 +- trunk/drivers/media/video/ivtv/ivtvfb.c | 33 +- trunk/drivers/media/video/omap3isp/isp.c | 2 +- trunk/drivers/media/video/soc_camera.c | 2 +- trunk/drivers/media/video/uvc/uvc_entity.c | 2 +- trunk/drivers/mmc/host/omap_hsmmc.c | 3 + trunk/drivers/net/arm/am79c961a.c | 126 +-- trunk/drivers/net/arm/ep93xx_eth.c | 82 +- trunk/drivers/net/bonding/bond_main.c | 11 + trunk/drivers/net/dl2k.c | 2 +- trunk/drivers/net/gianfar.c | 29 +- trunk/drivers/net/gianfar.h | 8 +- trunk/drivers/net/gianfar_ethtool.c | 64 +- trunk/drivers/net/igb/igb_main.c | 3 + trunk/drivers/net/qlcnic/qlcnic_hw.c | 1 + trunk/drivers/net/qlcnic/qlcnic_main.c | 1 + trunk/drivers/net/smc91x.c | 6 +- trunk/drivers/net/wireless/ath/ath5k/base.c | 11 +- trunk/drivers/net/wireless/ath/ath5k/reset.c | 5 +- .../drivers/net/wireless/iwlegacy/iwl-4965.c | 12 +- .../drivers/net/wireless/iwlegacy/iwl-core.c | 30 +- .../drivers/net/wireless/iwlegacy/iwl-core.h | 2 +- trunk/drivers/net/wireless/iwlegacy/iwl-dev.h | 13 +- .../net/wireless/iwlegacy/iwl4965-base.c | 20 +- trunk/drivers/net/wireless/iwlwifi/iwl-2000.c | 74 -- trunk/drivers/net/wireless/iwlwifi/iwl-5000.c | 3 - trunk/drivers/net/wireless/iwlwifi/iwl-6000.c | 2 - .../net/wireless/iwlwifi/iwl-agn-hcmd.c | 12 +- .../net/wireless/iwlwifi/iwl-agn-rxon.c | 19 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 19 +- trunk/drivers/net/wireless/iwlwifi/iwl-core.c | 6 +- trunk/drivers/net/wireless/iwlwifi/iwl-core.h | 1 + trunk/drivers/net/wireless/iwlwifi/iwl-dev.h | 13 +- trunk/drivers/net/wireless/iwlwifi/iwl-rx.c | 24 +- trunk/drivers/net/wireless/libertas/if_sdio.c | 21 +- .../net/wireless/rt2x00/rt2x00config.c | 3 +- trunk/drivers/net/wireless/rt2x00/rt2x00dev.c | 4 + trunk/drivers/net/wireless/rtlwifi/pci.c | 30 +- trunk/drivers/oprofile/buffer_sync.c | 21 +- trunk/drivers/pci/Makefile | 1 + trunk/drivers/pci/intel-iommu.c | 2 +- trunk/drivers/ptp/ptp_chardev.c | 11 +- trunk/drivers/rtc/Kconfig | 9 + trunk/drivers/rtc/Makefile | 1 + trunk/drivers/rtc/interface.c | 2 +- trunk/drivers/rtc/rtc-dev.c | 3 +- trunk/drivers/rtc/rtc-m41t93.c | 2 +- .../kernel/rtc.c => drivers/rtc/rtc-puv3.c} | 14 +- trunk/drivers/s390/cio/qdio_main.c | 6 +- trunk/drivers/s390/net/qeth_core.h | 2 +- trunk/drivers/s390/net/qeth_core_main.c | 57 +- trunk/drivers/s390/scsi/zfcp_fsf.c | 45 +- trunk/drivers/s390/scsi/zfcp_qdio.c | 11 +- trunk/drivers/s390/scsi/zfcp_qdio.h | 9 +- trunk/drivers/spi/amba-pl022.c | 1 + trunk/drivers/spi/omap2_mcspi.c | 2 +- trunk/drivers/ssb/driver_pcicore.c | 10 +- trunk/drivers/staging/Kconfig | 18 - .../staging/altera-stapl/altera-jtag.c | 2 +- trunk/drivers/staging/altera-stapl/altera.c | 2 +- .../staging/altera-stapl}/altera.h | 0 trunk/drivers/staging/ath6kl/Kconfig | 1 + .../staging/ath6kl/os/linux/cfg80211.c | 3 +- .../staging/brcm80211/brcmfmac/wl_iw.c | 2 - trunk/drivers/staging/gma500/psb_drv.c | 15 +- trunk/drivers/staging/gma500/psb_fb.c | 10 + trunk/drivers/staging/gma500/psb_intel_bios.c | 13 +- trunk/drivers/staging/iio/dac/max517.c | 2 +- .../drivers/staging/iio/imu/adis16400_ring.c | 10 +- .../staging/iio/industrialio-trigger.c | 1 + trunk/drivers/staging/mei/init.c | 4 +- trunk/drivers/staging/olpc_dcon/Kconfig | 1 + trunk/drivers/staging/rts_pstor/sd.c | 2 +- trunk/drivers/staging/usbip/stub_dev.c | 21 + trunk/drivers/staging/usbip/stub_rx.c | 20 +- trunk/drivers/tty/tty_buffer.c | 14 +- trunk/drivers/usb/class/cdc-acm.c | 2 + trunk/drivers/usb/core/hub.c | 6 +- trunk/drivers/usb/core/inode.c | 1 - trunk/drivers/usb/gadget/Kconfig | 5 +- trunk/drivers/usb/gadget/amd5536udc.c | 1 + trunk/drivers/usb/gadget/at91_udc.c | 1 + trunk/drivers/usb/gadget/dummy_hcd.c | 1 + trunk/drivers/usb/gadget/inode.c | 4 +- trunk/drivers/usb/gadget/mv_udc_core.c | 8 +- trunk/drivers/usb/gadget/net2280.c | 1 + trunk/drivers/usb/gadget/pxa25x_udc.c | 5 +- trunk/drivers/usb/gadget/s3c-hsotg.c | 22 +- trunk/drivers/usb/gadget/s3c-hsudc.c | 7 +- trunk/drivers/usb/gadget/s3c2410_udc.c | 1 + trunk/drivers/usb/host/ohci-pxa27x.c | 7 +- trunk/drivers/usb/host/xhci-dbg.c | 8 +- trunk/drivers/usb/host/xhci-mem.c | 14 +- trunk/drivers/usb/host/xhci-pci.c | 14 +- trunk/drivers/usb/host/xhci-ring.c | 2 +- trunk/drivers/usb/host/xhci.c | 18 +- trunk/drivers/usb/host/xhci.h | 6 + trunk/drivers/usb/musb/musb_core.c | 1 + trunk/drivers/usb/renesas_usbhs/mod_gadget.c | 1 + trunk/drivers/usb/serial/ftdi_sio.c | 1 + trunk/drivers/usb/serial/ftdi_sio_ids.h | 1 + trunk/drivers/usb/serial/option.c | 34 +- trunk/drivers/usb/storage/transport.c | 29 + trunk/drivers/usb/storage/unusual_devs.h | 19 + trunk/drivers/usb/storage/usb.c | 13 +- trunk/drivers/usb/storage/usb.h | 2 + trunk/drivers/video/arcfb.c | 5 +- trunk/drivers/video/bf537-lq035.c | 1 + trunk/drivers/video/broadsheetfb.c | 4 +- trunk/drivers/video/efifb.c | 34 +- trunk/drivers/video/hecubafb.c | 5 +- trunk/drivers/video/imxfb.c | 4 +- trunk/drivers/video/metronomefb.c | 4 +- trunk/drivers/video/modedb.c | 1 + trunk/drivers/video/pxa168fb.c | 17 +- trunk/drivers/video/savage/savagefb_driver.c | 16 + trunk/drivers/video/sh_mobile_lcdcfb.c | 4 +- trunk/drivers/video/vga16fb.c | 2 + trunk/drivers/video/xen-fbfront.c | 3 +- trunk/drivers/xen/events.c | 18 +- trunk/drivers/xen/swiotlb-xen.c | 12 +- trunk/fs/btrfs/ctree.c | 10 +- trunk/fs/btrfs/disk-io.c | 5 +- trunk/fs/btrfs/extent-tree.c | 55 +- trunk/fs/btrfs/extent_io.h | 2 +- trunk/fs/btrfs/free-space-cache.c | 163 +++- trunk/fs/btrfs/inode.c | 4 +- trunk/fs/btrfs/ioctl.c | 23 +- trunk/fs/btrfs/scrub.c | 69 +- trunk/fs/btrfs/super.c | 2 +- trunk/fs/btrfs/transaction.c | 7 +- trunk/fs/btrfs/volumes.c | 8 +- trunk/fs/ceph/addr.c | 2 +- trunk/fs/ceph/caps.c | 10 +- trunk/fs/ceph/dir.c | 11 +- trunk/fs/ceph/export.c | 4 +- trunk/fs/ceph/file.c | 35 +- trunk/fs/ceph/inode.c | 18 +- trunk/fs/ceph/ioctl.c | 6 +- trunk/fs/ceph/locks.c | 29 +- trunk/fs/ceph/snap.c | 2 +- trunk/fs/ceph/xattr.c | 6 +- trunk/fs/cifs/Kconfig | 3 +- trunk/fs/cifs/cifsencrypt.c | 2 +- trunk/fs/cifs/connect.c | 6 +- trunk/fs/dcookies.c | 3 + trunk/fs/exec.c | 5 +- trunk/fs/fat/file.c | 2 +- trunk/fs/fuse/inode.c | 2 + trunk/fs/gfs2/glock.c | 9 +- trunk/fs/jfs/jfs_logmgr.c | 2 +- trunk/fs/namei.c | 11 +- trunk/fs/nilfs2/btree.c | 39 +- trunk/fs/nilfs2/segment.c | 2 +- trunk/fs/ocfs2/super.c | 2 +- trunk/fs/super.c | 2 +- trunk/include/drm/drm_pciids.h | 11 + trunk/include/linux/basic_mmio_gpio.h | 1 + trunk/include/linux/ethtool.h | 6 +- trunk/include/linux/fs.h | 12 +- trunk/include/linux/if_packet.h | 2 + trunk/include/linux/if_vlan.h | 25 +- trunk/include/linux/irqreturn.h | 6 +- trunk/include/linux/netdevice.h | 2 +- .../linux/netfilter/nf_conntrack_common.h | 3 + trunk/include/linux/percpu.h | 3 + trunk/include/linux/perf_event.h | 8 +- trunk/include/linux/sched.h | 1 + trunk/include/linux/seqlock.h | 1 + trunk/include/linux/skbuff.h | 5 + trunk/include/linux/swiotlb.h | 1 + trunk/include/linux/usb_usual.h | 4 +- trunk/include/media/v4l2-dev.h | 4 +- trunk/kernel/events/core.c | 22 +- trunk/kernel/irq/handle.c | 6 - trunk/kernel/irq/irqdesc.c | 14 +- trunk/kernel/irq/manage.c | 27 +- trunk/kernel/irq/spurious.c | 31 +- trunk/kernel/lockdep.c | 2 +- trunk/kernel/sched.c | 33 +- trunk/kernel/sysctl.c | 6 + trunk/kernel/time/clockevents.c | 5 +- trunk/kernel/timer.c | 15 +- trunk/kernel/trace/ftrace.c | 9 +- trunk/kernel/trace/trace_kprobe.c | 8 +- trunk/lib/swiotlb.c | 5 + trunk/lib/vsprintf.c | 4 +- trunk/mm/filemap.c | 2 +- trunk/mm/slab.c | 9 +- trunk/mm/slub.c | 12 +- trunk/net/8021q/vlan_core.c | 60 +- trunk/net/bridge/br_netfilter.c | 6 + trunk/net/ceph/osd_client.c | 15 +- trunk/net/core/dev.c | 23 +- trunk/net/core/net_namespace.c | 16 +- trunk/net/core/netpoll.c | 7 + trunk/net/ipv4/ip_output.c | 6 +- trunk/net/ipv4/netfilter/ip_queue.c | 3 +- trunk/net/ipv4/netfilter/ipt_CLUSTERIP.c | 6 +- trunk/net/ipv4/netfilter/ipt_MASQUERADE.c | 2 +- .../netfilter/nf_conntrack_l3proto_ipv4.c | 2 +- .../ipv4/netfilter/nf_conntrack_proto_icmp.c | 2 +- trunk/net/ipv4/netfilter/nf_nat_core.c | 2 +- trunk/net/ipv4/netfilter/nf_nat_helper.c | 2 +- trunk/net/ipv4/netfilter/nf_nat_rule.c | 2 +- trunk/net/ipv4/netfilter/nf_nat_standalone.c | 4 +- trunk/net/ipv4/route.c | 78 +- trunk/net/ipv6/af_inet6.c | 4 + trunk/net/ipv6/netfilter/ip6_queue.c | 3 +- .../netfilter/nf_conntrack_l3proto_ipv6.c | 2 +- .../netfilter/nf_conntrack_proto_icmpv6.c | 2 +- trunk/net/irda/iriap.c | 5 + trunk/net/l2tp/l2tp_debugfs.c | 2 +- trunk/net/mac80211/ibss.c | 6 +- trunk/net/mac80211/ieee80211_i.h | 3 - trunk/net/mac80211/iface.c | 4 + trunk/net/mac80211/key.c | 21 +- trunk/net/mac80211/mlme.c | 6 - trunk/net/mac80211/tx.c | 7 +- trunk/net/netfilter/ipset/ip_set_core.c | 2 +- .../netfilter/ipset/ip_set_hash_ipportnet.c | 10 +- trunk/net/netfilter/ipset/ip_set_hash_net.c | 8 +- .../net/netfilter/ipset/ip_set_hash_netport.c | 6 +- trunk/net/netfilter/ipvs/ip_vs_core.c | 16 +- trunk/net/netfilter/nf_conntrack_core.c | 7 +- trunk/net/netfilter/nf_conntrack_ftp.c | 2 +- trunk/net/netfilter/nf_conntrack_h323_main.c | 10 +- trunk/net/netfilter/nf_conntrack_irc.c | 3 +- trunk/net/netfilter/nf_conntrack_pptp.c | 3 +- trunk/net/netfilter/nf_conntrack_sane.c | 2 +- trunk/net/netfilter/nf_conntrack_sip.c | 2 +- trunk/net/netfilter/xt_socket.c | 4 +- trunk/net/packet/af_packet.c | 2 + trunk/net/sched/sch_generic.c | 3 +- trunk/net/wireless/nl80211.c | 9 +- trunk/net/xfrm/xfrm_replay.c | 4 +- trunk/scripts/Makefile.asm-generic | 1 + trunk/scripts/depmod.sh | 48 + trunk/security/apparmor/lsm.c | 2 +- trunk/security/selinux/hooks.c | 25 +- trunk/sound/core/misc.c | 40 +- trunk/sound/pci/hda/patch_conexant.c | 1 + trunk/sound/pci/hda/patch_realtek.c | 15 +- trunk/sound/soc/atmel/atmel_ssc_dai.c | 5 +- trunk/sound/soc/blackfin/bf5xx-ad1836.c | 4 +- trunk/sound/soc/codecs/ad1836.c | 14 +- trunk/sound/soc/codecs/ad1836.h | 6 + trunk/sound/soc/codecs/wm8804.c | 9 +- trunk/sound/soc/codecs/wm8915.c | 3 +- trunk/sound/soc/codecs/wm8962.c | 4 +- trunk/sound/soc/fsl/fsl_dma.c | 9 +- trunk/sound/soc/samsung/i2s.c | 4 +- trunk/sound/soc/soc-cache.c | 3 + trunk/sound/soc/soc-dapm.c | 17 +- trunk/tools/perf/builtin-test.c | 2 +- trunk/tools/perf/util/PERF-VERSION-GEN | 7 +- trunk/tools/perf/util/event.c | 16 - trunk/tools/perf/util/event.h | 2 - trunk/tools/perf/util/evlist.c | 68 +- trunk/tools/perf/util/evlist.h | 6 +- trunk/tools/perf/util/evsel.c | 16 + trunk/tools/perf/util/evsel.h | 7 + trunk/tools/perf/util/python.c | 14 +- trunk/tools/perf/util/session.c | 12 +- trunk/virt/kvm/kvm_main.c | 15 +- 465 files changed, 5023 insertions(+), 2796 deletions(-) rename trunk/arch/arm/mach-exynos4/{usb-phy.c => setup-usb-phy.c} (100%) delete mode 100644 trunk/arch/arm/mach-s3c2410/irq.c delete mode 100644 trunk/arch/powerpc/boot/dtc-src/.gitignore create mode 100644 trunk/arch/sparc/include/asm/leon_pci.h create mode 100644 trunk/arch/sparc/kernel/leon_pci.c create mode 100644 trunk/arch/sparc/kernel/leon_pci_grpci2.c rename trunk/arch/unicore32/configs/{debug_defconfig => unicore32_defconfig} (97%) delete mode 100644 trunk/drivers/media/video/gspca/coarse_expo_autogain.h rename trunk/{arch/unicore32/kernel/rtc.c => drivers/rtc/rtc-puv3.c} (98%) rename trunk/{include/staging => drivers/staging/altera-stapl}/altera.h (100%) create mode 100755 trunk/scripts/depmod.sh diff --git a/[refs] b/[refs] index fa0cac247b81..d0d27064e654 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8e0bf95fc01d6e2ca585fe08010800b6c56e823 +refs/heads/master: e9e35c5a2b2c803b5e2f25906d8ffe110670ceb6 diff --git a/trunk/CREDITS b/trunk/CREDITS index a7ea8e343836..d78359f5f64d 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -518,6 +518,14 @@ N: Zach Brown E: zab@zabbo.net D: maestro pci sound +M: David Brownell +D: Kernel engineer, mentor, and friend. Maintained USB EHCI and +D: gadget layers, SPI subsystem, GPIO subsystem, and more than a few +D: device drivers. His encouragement also helped many engineers get +D: started working on the Linux kernel. David passed away in early +D: 2011, and will be greatly missed. +W: https://lkml.org/lkml/2011/4/5/36 + N: Gary Brubaker E: xavyer@ix.netcom.com D: USB Serial Empeg Empeg-car Mark I/II Driver diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index d9a203b058f1..fd248a318211 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -2598,6 +2598,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. unlock ejectable media); m = MAX_SECTORS_64 (don't transfer more than 64 sectors = 32 KB at a time); + n = INITIAL_READ10 (force a retry of the + initial READ(10) command); o = CAPACITY_OK (accept the capacity reported by the device); r = IGNORE_RESIDUE (the device reports diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 29801f760b6f..e50fc6eb99e0 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1739,7 +1739,7 @@ S: Supported F: drivers/net/enic/ CIRRUS LOGIC EP93XX ETHERNET DRIVER -M: Lennert Buytenhek +M: Hartley Sweeten L: netdev@vger.kernel.org S: Maintained F: drivers/net/arm/ep93xx_eth.c @@ -4252,8 +4252,7 @@ F: drivers/mmc/ F: include/linux/mmc/ MULTIMEDIA CARD (MMC) ETC. OVER SPI -M: David Brownell -S: Odd Fixes +S: Orphan F: drivers/mmc/host/mmc_spi.c F: include/linux/spi/mmc_spi.h @@ -4603,7 +4602,6 @@ F: drivers/media/video/omap3isp/* OMAP USB SUPPORT M: Felipe Balbi -M: David Brownell L: linux-usb@vger.kernel.org L: linux-omap@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git @@ -4947,6 +4945,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.gi F: drivers/input/serio/i8042-unicore32io.h F: drivers/i2c/busses/i2c-puv3.c F: drivers/video/fb-puv3.c +F: drivers/rtc/rtc-puv3.c PMC SIERRA MaxRAID DRIVER M: Anil Ravindranath @@ -5984,7 +5983,6 @@ F: Documentation/serial/specialix.txt F: drivers/staging/tty/specialix* SPI SUBSYSTEM -M: David Brownell M: Grant Likely L: spi-devel-general@lists.sourceforge.net Q: http://patchwork.kernel.org/project/spi-devel-general/list/ @@ -6432,9 +6430,8 @@ S: Maintained F: drivers/usb/misc/rio500* USB EHCI DRIVER -M: David Brownell L: linux-usb@vger.kernel.org -S: Odd Fixes +S: Orphan F: Documentation/usb/ehci.txt F: drivers/usb/host/ehci* @@ -6448,9 +6445,10 @@ S: Maintained F: drivers/media/video/et61x251/ USB GADGET/PERIPHERAL SUBSYSTEM -M: David Brownell +M: Felipe Balbi L: linux-usb@vger.kernel.org W: http://www.linux-usb.org/gadget +T: git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git S: Maintained F: drivers/usb/gadget/ F: include/linux/usb/gadget* @@ -6492,9 +6490,8 @@ S: Maintained F: sound/usb/midi.* USB OHCI DRIVER -M: David Brownell L: linux-usb@vger.kernel.org -S: Odd Fixes +S: Orphan F: Documentation/usb/ohci.txt F: drivers/usb/host/ohci* diff --git a/trunk/Makefile b/trunk/Makefile index 0f1db8d90741..badb9239e2bb 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -rc2 +EXTRAVERSION = -rc3 NAME = Sneaky Weasel # *DOCUMENTATION* @@ -378,7 +378,7 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds # Read KERNELRELEASE from include/config/kernel.release (if it exists) KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) -KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) +KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC @@ -1005,7 +1005,7 @@ endef define filechk_version.h (echo \#define LINUX_VERSION_CODE $(shell \ - expr $(VERSION) \* 65536 + $(PATCHLEVEL) \* 256 + $(SUBLEVEL)); \ + expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \ echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';) endef @@ -1110,11 +1110,6 @@ modules_install: _modinst_ _modinst_post PHONY += _modinst_ _modinst_: - @if [ -z "`$(DEPMOD) -V 2>/dev/null | grep module-init-tools`" ]; then \ - echo "Warning: you may need to install module-init-tools"; \ - echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt";\ - sleep 1; \ - fi @rm -rf $(MODLIB)/kernel @rm -f $(MODLIB)/source @mkdir -p $(MODLIB)/kernel @@ -1531,12 +1526,7 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files)) # Run depmod only if we have System.map and depmod is executable quiet_cmd_depmod = DEPMOD $(KERNELRELEASE) - cmd_depmod = \ - if [ -r System.map -a -x $(DEPMOD) ]; then \ - $(DEPMOD) -ae -F System.map \ - $(if $(strip $(INSTALL_MOD_PATH)), -b $(INSTALL_MOD_PATH) ) \ - $(KERNELRELEASE); \ - fi + cmd_depmod = $(srctree)/scripts/depmod.sh $(DEPMOD) $(KERNELRELEASE) # Create temporary dir for module support files # clean it up only when building all modules diff --git a/trunk/arch/arm/mach-ep93xx/core.c b/trunk/arch/arm/mach-ep93xx/core.c index 82079545adc4..1d4b65fd673e 100644 --- a/trunk/arch/arm/mach-ep93xx/core.c +++ b/trunk/arch/arm/mach-ep93xx/core.c @@ -402,11 +402,15 @@ static struct resource ep93xx_eth_resource[] = { } }; +static u64 ep93xx_eth_dma_mask = DMA_BIT_MASK(32); + static struct platform_device ep93xx_eth_device = { .name = "ep93xx-eth", .id = -1, .dev = { - .platform_data = &ep93xx_eth_data, + .platform_data = &ep93xx_eth_data, + .coherent_dma_mask = DMA_BIT_MASK(32), + .dma_mask = &ep93xx_eth_dma_mask, }, .num_resources = ARRAY_SIZE(ep93xx_eth_resource), .resource = ep93xx_eth_resource, diff --git a/trunk/arch/arm/mach-exynos4/Kconfig b/trunk/arch/arm/mach-exynos4/Kconfig index b92c1e557145..1435fc31c4b2 100644 --- a/trunk/arch/arm/mach-exynos4/Kconfig +++ b/trunk/arch/arm/mach-exynos4/Kconfig @@ -91,6 +91,11 @@ config EXYNOS4_SETUP_FIMC help Common setup code for the camera interfaces. +config EXYNOS4_SETUP_USB_PHY + bool + help + Common setup code for USB PHY controller + # machine support menu "EXYNOS4 Machines" @@ -176,6 +181,7 @@ config MACH_NURI select EXYNOS4_SETUP_I2C3 select EXYNOS4_SETUP_I2C5 select EXYNOS4_SETUP_SDHCI + select EXYNOS4_SETUP_USB_PHY select SAMSUNG_DEV_PWM help Machine support for Samsung Mobile NURI Board. diff --git a/trunk/arch/arm/mach-exynos4/Makefile b/trunk/arch/arm/mach-exynos4/Makefile index a9bb94fabaa7..60fe5ecf3599 100644 --- a/trunk/arch/arm/mach-exynos4/Makefile +++ b/trunk/arch/arm/mach-exynos4/Makefile @@ -56,4 +56,4 @@ obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD) += setup-keypad.o obj-$(CONFIG_EXYNOS4_SETUP_SDHCI) += setup-sdhci.o obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o -obj-$(CONFIG_USB_SUPPORT) += usb-phy.o +obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY) += setup-usb-phy.o diff --git a/trunk/arch/arm/mach-exynos4/cpu.c b/trunk/arch/arm/mach-exynos4/cpu.c index 08813a6f66b1..9babe4473e88 100644 --- a/trunk/arch/arm/mach-exynos4/cpu.c +++ b/trunk/arch/arm/mach-exynos4/cpu.c @@ -98,7 +98,7 @@ static struct map_desc exynos4_iodesc[] __initdata = { .length = SZ_4K, .type = MT_DEVICE, }, { - .virtual = (unsigned long)S5P_VA_USB_HSPHY, + .virtual = (unsigned long)S3C_VA_USB_HSPHY, .pfn = __phys_to_pfn(EXYNOS4_PA_HSPHY), .length = SZ_4K, .type = MT_DEVICE, diff --git a/trunk/arch/arm/mach-exynos4/include/mach/regs-usb-phy.h b/trunk/arch/arm/mach-exynos4/include/mach/regs-usb-phy.h index 703118d5173c..c337cf3a71bf 100644 --- a/trunk/arch/arm/mach-exynos4/include/mach/regs-usb-phy.h +++ b/trunk/arch/arm/mach-exynos4/include/mach/regs-usb-phy.h @@ -11,7 +11,7 @@ #ifndef __PLAT_S5P_REGS_USB_PHY_H #define __PLAT_S5P_REGS_USB_PHY_H -#define EXYNOS4_HSOTG_PHYREG(x) ((x) + S5P_VA_USB_HSPHY) +#define EXYNOS4_HSOTG_PHYREG(x) ((x) + S3C_VA_USB_HSPHY) #define EXYNOS4_PHYPWR EXYNOS4_HSOTG_PHYREG(0x00) #define PHY1_HSIC_NORMAL_MASK (0xf << 9) diff --git a/trunk/arch/arm/mach-exynos4/usb-phy.c b/trunk/arch/arm/mach-exynos4/setup-usb-phy.c similarity index 100% rename from trunk/arch/arm/mach-exynos4/usb-phy.c rename to trunk/arch/arm/mach-exynos4/setup-usb-phy.c diff --git a/trunk/arch/arm/mach-exynos4/time.c b/trunk/arch/arm/mach-exynos4/time.c index 86b9fa0d3639..ebb8f38d5405 100644 --- a/trunk/arch/arm/mach-exynos4/time.c +++ b/trunk/arch/arm/mach-exynos4/time.c @@ -206,6 +206,7 @@ static cycle_t exynos4_pwm4_read(struct clocksource *cs) return (cycle_t) ~__raw_readl(S3C_TIMERREG(0x40)); } +#ifdef CONFIG_PM static void exynos4_pwm4_resume(struct clocksource *cs) { unsigned long pclk; @@ -218,6 +219,7 @@ static void exynos4_pwm4_resume(struct clocksource *cs) exynos4_pwm_init(4, ~0); exynos4_pwm_start(4, 1); } +#endif struct clocksource pwm_clocksource = { .name = "pwm_timer4", diff --git a/trunk/arch/arm/mach-omap1/Makefile b/trunk/arch/arm/mach-omap1/Makefile index af98117043d2..5b114d1558c8 100644 --- a/trunk/arch/arm/mach-omap1/Makefile +++ b/trunk/arch/arm/mach-omap1/Makefile @@ -4,14 +4,14 @@ # Common support obj-y := io.o id.o sram.o time.o irq.o mux.o flash.o serial.o devices.o dma.o -obj-y += clock.o clock_data.o opp_data.o reset.o +obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o # Power Management -obj-$(CONFIG_PM) += pm.o sleep.o pm_bus.o +obj-$(CONFIG_PM) += pm.o sleep.o # DSP obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o diff --git a/trunk/arch/arm/mach-omap1/dma.c b/trunk/arch/arm/mach-omap1/dma.c index d8559344c6e2..f5a52204b89f 100644 --- a/trunk/arch/arm/mach-omap1/dma.c +++ b/trunk/arch/arm/mach-omap1/dma.c @@ -284,14 +284,15 @@ static int __init omap1_system_dma_init(void) dma_base = ioremap(res[0].start, resource_size(&res[0])); if (!dma_base) { pr_err("%s: Unable to ioremap\n", __func__); - return -ENODEV; + ret = -ENODEV; + goto exit_device_put; } ret = platform_device_add_resources(pdev, res, ARRAY_SIZE(res)); if (ret) { dev_err(&pdev->dev, "%s: Unable to add resources for %s%d\n", __func__, pdev->name, pdev->id); - goto exit_device_del; + goto exit_device_put; } p = kzalloc(sizeof(struct omap_system_dma_plat_info), GFP_KERNEL); @@ -299,7 +300,7 @@ static int __init omap1_system_dma_init(void) dev_err(&pdev->dev, "%s: Unable to allocate 'p' for %s\n", __func__, pdev->name); ret = -ENOMEM; - goto exit_device_put; + goto exit_device_del; } d = kzalloc(sizeof(struct omap_dma_dev_attr), GFP_KERNEL); @@ -380,10 +381,10 @@ static int __init omap1_system_dma_init(void) kfree(d); exit_release_p: kfree(p); -exit_device_put: - platform_device_put(pdev); exit_device_del: platform_device_del(pdev); +exit_device_put: + platform_device_put(pdev); return ret; } diff --git a/trunk/arch/arm/mach-omap1/pm_bus.c b/trunk/arch/arm/mach-omap1/pm_bus.c index fe31d933f0ed..334fb8871bc3 100644 --- a/trunk/arch/arm/mach-omap1/pm_bus.c +++ b/trunk/arch/arm/mach-omap1/pm_bus.c @@ -56,9 +56,13 @@ static struct dev_power_domain default_power_domain = { USE_PLATFORM_PM_SLEEP_OPS }, }; +#define OMAP1_PWR_DOMAIN (&default_power_domain) +#else +#define OMAP1_PWR_DOMAIN NULL +#endif /* CONFIG_PM_RUNTIME */ static struct pm_clk_notifier_block platform_bus_notifier = { - .pwr_domain = &default_power_domain, + .pwr_domain = OMAP1_PWR_DOMAIN, .con_ids = { "ick", "fck", NULL, }, }; @@ -72,4 +76,4 @@ static int __init omap1_pm_runtime_init(void) return 0; } core_initcall(omap1_pm_runtime_init); -#endif /* CONFIG_PM_RUNTIME */ + diff --git a/trunk/arch/arm/mach-omap2/board-2430sdp.c b/trunk/arch/arm/mach-omap2/board-2430sdp.c index d54969be0a54..5de6eac0a725 100644 --- a/trunk/arch/arm/mach-omap2/board-2430sdp.c +++ b/trunk/arch/arm/mach-omap2/board-2430sdp.c @@ -26,13 +26,13 @@ #include #include #include +#include #include #include #include #include -#include #include #include #include diff --git a/trunk/arch/arm/mach-omap2/board-3430sdp.c b/trunk/arch/arm/mach-omap2/board-3430sdp.c index ae2963a98041..5dac974be625 100644 --- a/trunk/arch/arm/mach-omap2/board-3430sdp.c +++ b/trunk/arch/arm/mach-omap2/board-3430sdp.c @@ -622,19 +622,19 @@ static struct omap_device_pad serial3_pads[] __initdata = { OMAP_MUX_MODE0), }; -static struct omap_board_data serial1_data = { +static struct omap_board_data serial1_data __initdata = { .id = 0, .pads = serial1_pads, .pads_cnt = ARRAY_SIZE(serial1_pads), }; -static struct omap_board_data serial2_data = { +static struct omap_board_data serial2_data __initdata = { .id = 1, .pads = serial2_pads, .pads_cnt = ARRAY_SIZE(serial2_pads), }; -static struct omap_board_data serial3_data = { +static struct omap_board_data serial3_data __initdata = { .id = 2, .pads = serial3_pads, .pads_cnt = ARRAY_SIZE(serial3_pads), diff --git a/trunk/arch/arm/mach-omap2/board-4430sdp.c b/trunk/arch/arm/mach-omap2/board-4430sdp.c index 73fa90bb6953..63de2d396e2d 100644 --- a/trunk/arch/arm/mach-omap2/board-4430sdp.c +++ b/trunk/arch/arm/mach-omap2/board-4430sdp.c @@ -258,7 +258,7 @@ static struct gpio sdp4430_eth_gpios[] __initdata = { { ETH_KS8851_IRQ, GPIOF_IN, "eth_irq" }, }; -static int omap_ethernet_init(void) +static int __init omap_ethernet_init(void) { int status; @@ -322,6 +322,7 @@ static struct omap2_hsmmc_info mmc[] = { .gpio_wp = -EINVAL, .nonremovable = true, .ocr_mask = MMC_VDD_29_30, + .no_off_init = true, }, { .mmc = 1, @@ -681,19 +682,19 @@ static struct omap_device_pad serial4_pads[] __initdata = { OMAP_PIN_OUTPUT | OMAP_MUX_MODE0), }; -static struct omap_board_data serial2_data = { +static struct omap_board_data serial2_data __initdata = { .id = 1, .pads = serial2_pads, .pads_cnt = ARRAY_SIZE(serial2_pads), }; -static struct omap_board_data serial3_data = { +static struct omap_board_data serial3_data __initdata = { .id = 2, .pads = serial3_pads, .pads_cnt = ARRAY_SIZE(serial3_pads), }; -static struct omap_board_data serial4_data = { +static struct omap_board_data serial4_data __initdata = { .id = 3, .pads = serial4_pads, .pads_cnt = ARRAY_SIZE(serial4_pads), @@ -729,7 +730,7 @@ static void __init omap_4430sdp_init(void) if (omap_rev() == OMAP4430_REV_ES1_0) package = OMAP_PACKAGE_CBL; - omap4_mux_init(board_mux, package); + omap4_mux_init(board_mux, NULL, package); omap_board_config = sdp4430_config; omap_board_config_size = ARRAY_SIZE(sdp4430_config); diff --git a/trunk/arch/arm/mach-omap2/board-apollon.c b/trunk/arch/arm/mach-omap2/board-apollon.c index f3beb8eeef77..b124bdfb4239 100644 --- a/trunk/arch/arm/mach-omap2/board-apollon.c +++ b/trunk/arch/arm/mach-omap2/board-apollon.c @@ -27,13 +27,13 @@ #include #include #include +#include #include #include #include #include -#include #include #include #include diff --git a/trunk/arch/arm/mach-omap2/board-cm-t35.c b/trunk/arch/arm/mach-omap2/board-cm-t35.c index c63115bc1536..77456dec93ea 100644 --- a/trunk/arch/arm/mach-omap2/board-cm-t35.c +++ b/trunk/arch/arm/mach-omap2/board-cm-t35.c @@ -63,8 +63,6 @@ #define SB_T35_SMSC911X_CS 4 #define SB_T35_SMSC911X_GPIO 65 -#define NAND_BLOCK_SIZE SZ_128K - #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) #include #include diff --git a/trunk/arch/arm/mach-omap2/board-cm-t3517.c b/trunk/arch/arm/mach-omap2/board-cm-t3517.c index 08f08e812492..c3a9fd35034a 100644 --- a/trunk/arch/arm/mach-omap2/board-cm-t3517.c +++ b/trunk/arch/arm/mach-omap2/board-cm-t3517.c @@ -48,6 +48,7 @@ #include "mux.h" #include "control.h" +#include "common-board-devices.h" #if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE) static struct gpio_led cm_t3517_leds[] = { @@ -177,7 +178,7 @@ static struct usbhs_omap_board_data cm_t3517_ehci_pdata __initdata = { .reset_gpio_port[2] = -EINVAL, }; -static int cm_t3517_init_usbh(void) +static int __init cm_t3517_init_usbh(void) { int err; @@ -203,8 +204,6 @@ static inline int cm_t3517_init_usbh(void) #endif #if defined(CONFIG_MTD_NAND_OMAP2) || defined(CONFIG_MTD_NAND_OMAP2_MODULE) -#define NAND_BLOCK_SIZE SZ_128K - static struct mtd_partition cm_t3517_nand_partitions[] = { { .name = "xloader", diff --git a/trunk/arch/arm/mach-omap2/board-devkit8000.c b/trunk/arch/arm/mach-omap2/board-devkit8000.c index cf520d7dd614..34956ec83296 100644 --- a/trunk/arch/arm/mach-omap2/board-devkit8000.c +++ b/trunk/arch/arm/mach-omap2/board-devkit8000.c @@ -61,8 +61,6 @@ #include "timer-gp.h" #include "common-board-devices.h" -#define NAND_BLOCK_SIZE SZ_128K - #define OMAP_DM9000_GPIO_IRQ 25 #define OMAP3_DEVKIT_TS_GPIO 27 diff --git a/trunk/arch/arm/mach-omap2/board-omap3beagle.c b/trunk/arch/arm/mach-omap2/board-omap3beagle.c index be71426359f2..7f21d24bd437 100644 --- a/trunk/arch/arm/mach-omap2/board-omap3beagle.c +++ b/trunk/arch/arm/mach-omap2/board-omap3beagle.c @@ -54,8 +54,6 @@ #include "pm.h" #include "common-board-devices.h" -#define NAND_BLOCK_SIZE SZ_128K - /* * OMAP3 Beagle revision * Run time detection of Beagle revision is done by reading GPIO. @@ -106,6 +104,9 @@ static void __init omap3_beagle_init_rev(void) beagle_rev = gpio_get_value(171) | (gpio_get_value(172) << 1) | (gpio_get_value(173) << 2); + gpio_free_array(omap3_beagle_rev_gpios, + ARRAY_SIZE(omap3_beagle_rev_gpios)); + switch (beagle_rev) { case 7: printk(KERN_INFO "OMAP3 Beagle Rev: Ax/Bx\n"); @@ -579,6 +580,9 @@ static void __init omap3_beagle_init(void) omap_nand_flash_init(NAND_BUSWIDTH_16, omap3beagle_nand_partitions, ARRAY_SIZE(omap3beagle_nand_partitions)); + /* Ensure msecure is mux'd to be able to set the RTC. */ + omap_mux_init_signal("sys_drm_msecure", OMAP_PIN_OFF_OUTPUT_HIGH); + /* Ensure SDRC pins are mux'd for self-refresh */ omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT); omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT); diff --git a/trunk/arch/arm/mach-omap2/board-omap3pandora.c b/trunk/arch/arm/mach-omap2/board-omap3pandora.c index a3d655c0a49b..2a0bb4818cae 100644 --- a/trunk/arch/arm/mach-omap2/board-omap3pandora.c +++ b/trunk/arch/arm/mach-omap2/board-omap3pandora.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -41,7 +42,6 @@ #include #include -#include #include #include #include @@ -57,8 +57,6 @@ #define PANDORA_WIFI_NRESET_GPIO 23 #define OMAP3_PANDORA_TS_GPIO 94 -#define NAND_BLOCK_SIZE SZ_128K - static struct mtd_partition omap3pandora_nand_partitions[] = { { .name = "xloader", @@ -86,8 +84,7 @@ static struct mtd_partition omap3pandora_nand_partitions[] = { static struct omap_nand_platform_data pandora_nand_data = { .cs = 0, - .devsize = NAND_BUSWIDTH_16, - .xfer_type = NAND_OMAP_PREFETCH_DMA, + .devsize = 1, /* '0' for 8-bit, '1' for 16-bit device */ .parts = omap3pandora_nand_partitions, .nr_parts = ARRAY_SIZE(omap3pandora_nand_partitions), }; diff --git a/trunk/arch/arm/mach-omap2/board-omap3touchbook.c b/trunk/arch/arm/mach-omap2/board-omap3touchbook.c index 82872d7d313b..5f649faf7377 100644 --- a/trunk/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/trunk/arch/arm/mach-omap2/board-omap3touchbook.c @@ -56,8 +56,6 @@ #include -#define NAND_BLOCK_SIZE SZ_128K - #define OMAP3_AC_GPIO 136 #define OMAP3_TS_GPIO 162 #define TB_BL_PWM_TIMER 9 diff --git a/trunk/arch/arm/mach-omap2/board-omap4panda.c b/trunk/arch/arm/mach-omap2/board-omap4panda.c index 90485fced973..0cfe2005cb50 100644 --- a/trunk/arch/arm/mach-omap2/board-omap4panda.c +++ b/trunk/arch/arm/mach-omap2/board-omap4panda.c @@ -526,19 +526,19 @@ static struct omap_device_pad serial4_pads[] __initdata = { OMAP_PIN_OUTPUT | OMAP_MUX_MODE0), }; -static struct omap_board_data serial2_data = { +static struct omap_board_data serial2_data __initdata = { .id = 1, .pads = serial2_pads, .pads_cnt = ARRAY_SIZE(serial2_pads), }; -static struct omap_board_data serial3_data = { +static struct omap_board_data serial3_data __initdata = { .id = 2, .pads = serial3_pads, .pads_cnt = ARRAY_SIZE(serial3_pads), }; -static struct omap_board_data serial4_data = { +static struct omap_board_data serial4_data __initdata = { .id = 3, .pads = serial4_pads, .pads_cnt = ARRAY_SIZE(serial4_pads), @@ -687,7 +687,7 @@ static void __init omap4_panda_init(void) if (omap_rev() == OMAP4430_REV_ES1_0) package = OMAP_PACKAGE_CBL; - omap4_mux_init(board_mux, package); + omap4_mux_init(board_mux, NULL, package); if (wl12xx_set_platform_data(&omap_panda_wlan_data)) pr_err("error setting wl12xx data\n"); diff --git a/trunk/arch/arm/mach-omap2/board-overo.c b/trunk/arch/arm/mach-omap2/board-overo.c index 1555918e3ffa..175e1ab2b04d 100644 --- a/trunk/arch/arm/mach-omap2/board-overo.c +++ b/trunk/arch/arm/mach-omap2/board-overo.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -45,7 +46,6 @@ #include #include