]> rtime.felk.cvut.cz Git - zynq/linux.git/commit
Merge commit 'v3.8' into master-next
authorMichal Simek <michal.simek@xilinx.com>
Fri, 15 Mar 2013 17:39:09 +0000 (18:39 +0100)
committerMichal Simek <michal.simek@xilinx.com>
Tue, 19 Mar 2013 08:39:59 +0000 (09:39 +0100)
commit068160c0befae2e4d1cd98f781161424683339e9
tree25e7e66fb714ae480d7dac87fe8a525b35cae031
parent2530265d0e9c9bec31d9dc0c32604035c38f8fb7
parent19f949f52599ba7c3f67a5897ac6be14bfcb1200
Merge commit 'v3.8' into master-next

ARM Zynq:
Start to use ARM MULTI option (side-effect remove mach-zynq/include folder)
Use smp_operations

Drivers:
Remove mainline clk driver and use origin one.
Remove __devinit, __devexit, __definitdata, __devexit_p, __exit_p from
all drivers

dma:
DMA: PL330: Remove controller clock enable/disable
(sha1: faf6fbc6f2ca3b34bf464a8bb079a998e571957c)
DMA: PL330: Remove redundant runtime_suspend/resume functions
(sha1: 7c71b8eb268ee38235f7e924d943ea9d90e59469)

Nand:
"mtd: kill MTD_NAND_VERIFY_WRITE"
(sha1: 657f28f8811c92724db10d18bbbec70d540147d6)

USB ehci:
USB: EHCI: remove ehci_port_power() routine
(sha1: c73cee717e7d5da0698acb720ad1219646fe4f46)

USB gadget:
usb: gadget: remove global variable composite in composite.c
(sha1: ffe0b335062505a98d7296dae2c2a197713f87e0)
usb: gadget: Clear usb_endpoint_descriptor inside the struct usb_ep on disable
(sha1: f9c56cdd3905c96c600456203637bd7ec8ec6383)
usb: gadget: rename usb_gadget_driver::speed to max_speed
(sha1: 7177aed44f515d949f587170e0e177ce17e74793)
usb: udc: Fix gadget driver's speed check in various UDC drivers
(sha1: bfe0658b402dab3d6fbef4b7bd81a46d0e68eb86)
USB: use usb_endpoint_maxp() instead of le16_to_cpu()
(sha1: 29cc88979a8818cd8c5019426e945aed118b400e)

USB otg:
usb: move children to struct usb_port
(sha1: ff823c79a5c33194c2e5594f7c4686ea3547910c)

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
130 files changed:
Documentation/devicetree/bindings/clock/zynq-7000.txt
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/boot/Makefile
arch/arm/boot/dts/Makefile
arch/arm/common/gic.c
arch/arm/configs/xilinx_zynq_defconfig
arch/arm/include/asm/page.h
arch/arm/include/asm/smp.h
arch/arm/kernel/setup.c
arch/arm/kernel/smp.c
arch/arm/kernel/vmlinux.lds.S
arch/arm/mach-zynq/Kconfig
arch/arm/mach-zynq/common.c
arch/arm/mach-zynq/common.h
arch/arm/mach-zynq/platsmp.c
arch/arm/mach-zynq/slcr.c
arch/arm/mach-zynq/xaxipcie-msi.c
arch/arm/mach-zynq/xaxipcie.c
arch/arm/mm/mmu.c
arch/microblaze/Kconfig
arch/microblaze/Makefile
arch/microblaze/pci/pci-common.c
arch/microblaze/pci/xilinx_axipcie.c
arch/powerpc/boot/.gitignore
arch/powerpc/boot/Makefile
arch/powerpc/kernel/entry_32.S
arch/powerpc/kernel/traps.c
arch/powerpc/platforms/Kconfig
drivers/Kconfig
drivers/Makefile
drivers/block/xsysace.c
drivers/char/Kconfig
drivers/char/Makefile
drivers/char/xilinx_devcfg.c
drivers/clk/Makefile
drivers/clk/zynq/clk.c
drivers/cpufreq/Kconfig.arm
drivers/cpufreq/Makefile
drivers/dma/Kconfig
drivers/dma/Makefile
drivers/dma/dmatest.c
drivers/dma/pl330.c
drivers/dma/xilinx/xilinx_axicdma.c
drivers/dma/xilinx/xilinx_axidma.c
drivers/dma/xilinx/xilinx_axivdma.c
drivers/gpio/Kconfig
drivers/gpio/Makefile
drivers/gpio/gpio-xilinx.c
drivers/gpio/gpio-xilinxps.c
drivers/hwmon/Kconfig
drivers/hwmon/Makefile
drivers/hwmon/xilinx-xadcps.c
drivers/i2c/busses/Kconfig
drivers/i2c/busses/Makefile
drivers/i2c/busses/i2c-xilinx_ps.c
drivers/memory/Makefile
drivers/memory/zynq-smc.c
drivers/mfd/timberdale.c
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/mmc/host/Kconfig
drivers/mmc/host/Makefile
drivers/mmc/host/sdhci-of-xilinxps.c
drivers/mtd/devices/m25p80.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/Makefile
drivers/mtd/nand/nand_base.c
drivers/mtd/nand/xilinx_nandps.c
drivers/net/ethernet/xilinx/ll_temac_main.c
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
drivers/net/ethernet/xilinx/xilinx_emaclite.c
drivers/net/ethernet/xilinx/xilinx_emacps.c
drivers/net/ethernet/xilinx/xilinx_lltemac/xlltemac_main.c
drivers/net/phy/marvell.c
drivers/of/irq.c
drivers/pmods/pmodoled-gpio.c
drivers/remoteproc/Kconfig
drivers/remoteproc/Makefile
drivers/remoteproc/mb_remoteproc.c
drivers/remoteproc/remoteproc_core.c
drivers/remoteproc/zynq_remoteproc.c
drivers/rpmsg/Kconfig
drivers/rpmsg/rpmsg_freertos_statistic.c
drivers/rpmsg/rpmsg_omx.c
drivers/rpmsg/virtio_rpmsg_bus.c
drivers/spi/Kconfig
drivers/spi/Makefile
drivers/spi/spi-xilinx-ps.c
drivers/spi/spi-xilinx-qps.c
drivers/spi/spi-xilinx.c
drivers/tty/serial/8250/8250.c
drivers/tty/serial/Kconfig
drivers/tty/serial/of_serial.c
drivers/tty/serial/uartlite.c
drivers/tty/serial/xilinx_uartps.c
drivers/uio/Kconfig
drivers/uio/Makefile
drivers/uio/uio_pdrv_genirq.c
drivers/usb/Kconfig
drivers/usb/c67x00/c67x00-drv.c
drivers/usb/core/hub.c
drivers/usb/gadget/Kconfig
drivers/usb/gadget/Makefile
drivers/usb/gadget/xilinx_udc.c
drivers/usb/gadget/xilinx_usbps_udc.c
drivers/usb/host/Kconfig
drivers/usb/host/Makefile
drivers/usb/host/ehci-hcd.c
drivers/usb/host/ehci-hub.c
drivers/usb/host/ehci-xilinx-usbps.c
drivers/usb/host/ehci.h
drivers/usb/host/xusbps-dr-of.c
drivers/usb/otg/Kconfig
drivers/usb/otg/xilinx_usbps_otg.c
drivers/video/Kconfig
drivers/video/Makefile
drivers/video/xilinxfb.c
drivers/video/xylon/xylonfb/of/xylonfb-of.c
drivers/watchdog/Kconfig
drivers/watchdog/Makefile
drivers/watchdog/mpcore_wdt.c
drivers/watchdog/of_xilinx_wdt.c
drivers/watchdog/xilinx_wdtps.c
include/asm-generic/io.h
include/linux/amba/bus.h
include/linux/clk/zynq.h
include/linux/remoteproc.h
include/linux/socket.h
include/net/rpmsg.h