* [GIT PULL 0/4] ARM: mvebu: changes for v3.9
@ 2013-02-01 15:51 Jason Cooper
2013-02-01 15:51 ` [GIT PULL 1/4] ARM: mvebu: cleanup " Jason Cooper
` (4 more replies)
0 siblings, 5 replies; 19+ messages in thread
From: Jason Cooper @ 2013-02-01 15:51 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 19d23dac1b8f95e4a960fcbbb5687c33b9a2cd01:
Merge branch 'fixes' into for-next
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git mvebu/for-next
for you to fetch changes up to 7d8a7dce24f76242daf1c469878597b8acc4f78f:
Merge tag 'tags/dt_for_v3.9' into mvebu/for-next
Jason Cooper (5):
Merge tag 'tags/mvebu_fixes_for_v3.8-rc6' into mvebu/for-next
Merge tag 'tags/cleanup_for_v3.9_round2' into mvebu/for-next
Merge tag 'tags/drivers_for_v3.9' into mvebu/for-next
Merge tag 'tags/boards_for_v3.9' into mvebu/for-next
Merge tag 'tags/dt_for_v3.9' into mvebu/for-next
.../bindings/mmc/brcm,bcm2835-sdhci.txt | 18 ++
.../devicetree/bindings/mmc/orion-sdio.txt | 17 ++
Documentation/filesystems/f2fs.txt | 18 +-
MAINTAINERS | 2 +-
Makefile | 4 +-
arch/arm/boot/dts/Makefile | 2 +
arch/arm/boot/dts/armada-370-db.dts | 15 +
arch/arm/boot/dts/armada-370-mirabox.dts | 10 +
arch/arm/boot/dts/armada-370-rd.dts | 61 ++++
arch/arm/boot/dts/armada-370-xp.dtsi | 14 +
arch/arm/boot/dts/armada-370.dtsi | 12 +
arch/arm/boot/dts/armada-xp-db.dts | 7 +
arch/arm/boot/dts/armada-xp-mv78230.dtsi | 6 +
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 6 +
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 6 +
.../arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 12 +
arch/arm/boot/dts/armada-xp.dtsi | 2 +-
arch/arm/boot/dts/dove-cubox.dts | 28 +-
arch/arm/boot/dts/dove.dtsi | 2 +
arch/arm/boot/dts/kirkwood-6282.dtsi | 17 ++
arch/arm/boot/dts/kirkwood-dreamplug.dts | 7 +
.../boot/dts/kirkwood-guruplug-server-plus.dts | 94 +++++++
arch/arm/boot/dts/kirkwood-mplcec4.dts | 11 +-
arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 6 +
arch/arm/boot/dts/kirkwood-nsa310.dts | 27 ++
arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 116 ++++++++
arch/arm/boot/dts/kirkwood.dtsi | 8 +
arch/arm/configs/dove_defconfig | 28 +-
arch/arm/configs/kirkwood_defconfig | 1 +
arch/arm/configs/mvebu_defconfig | 16 ++
arch/arm/kernel/head.S | 5 +-
arch/arm/kernel/hyp-stub.S | 18 +-
arch/arm/mach-dove/Kconfig | 7 +
arch/arm/mach-dove/Makefile | 4 +-
arch/arm/mach-dove/board-dt.c | 102 +++++++
arch/arm/mach-dove/common.c | 114 +-------
arch/arm/mach-imx/clk-imx25.c | 6 +-
arch/arm/mach-imx/clk-imx27.c | 6 +-
arch/arm/mach-imx/clk-imx31.c | 6 +-
arch/arm/mach-imx/clk-imx35.c | 6 +-
arch/arm/mach-imx/clk-imx51-imx53.c | 6 +-
arch/arm/mach-imx/devices/devices-common.h | 1 +
.../mach-imx/devices/platform-fsl-usb2-udc.c | 15 +-
arch/arm/mach-kirkwood/Kconfig | 7 +
arch/arm/mach-kirkwood/Makefile | 2 +-
arch/arm/mach-kirkwood/board-dreamplug.c | 6 -
arch/arm/mach-kirkwood/board-dt.c | 15 +-
arch/arm/mach-kirkwood/board-guruplug.c | 39 +++
arch/arm/mach-kirkwood/board-ib62x0.c | 1 -
arch/arm/mach-kirkwood/board-mplcec4.c | 8 -
arch/arm/mach-kirkwood/board-ns2.c | 14 -
arch/arm/mach-kirkwood/board-nsa310.c | 51 +---
arch/arm/mach-kirkwood/board-openblocks_a6.c | 44 ---
arch/arm/mach-kirkwood/common.c | 23 ++
arch/arm/mach-kirkwood/common.h | 6 +
arch/arm/mach-kirkwood/dockstar-setup.c | 1 -
arch/arm/mach-kirkwood/include/mach/kirkwood.h | 3 +-
arch/arm/mach-kirkwood/pcie.c | 10 +-
arch/arm/mach-mvebu/irq-armada-370-xp.c | 72 +++++
arch/arm/mm/dma-mapping.c | 18 +-
arch/arm/mm/mmu.c | 2 +-
arch/arm/plat-orion/mpp.c | 2 +-
arch/arm/vfp/entry.S | 6 +-
arch/arm/vfp/vfphw.S | 4 +-
arch/arm64/include/asm/elf.h | 5 +-
arch/ia64/kernel/ptrace.c | 27 --
arch/m68k/include/asm/dma-mapping.h | 16 ++
arch/m68k/include/asm/pgtable_no.h | 2 +
arch/m68k/include/asm/unistd.h | 2 +-
arch/m68k/include/uapi/asm/unistd.h | 1 +
arch/m68k/kernel/syscalltable.S | 1 +
arch/m68k/mm/init.c | 8 +-
arch/parisc/kernel/entry.S | 18 +-
arch/parisc/kernel/irq.c | 6 +-
arch/parisc/kernel/ptrace.c | 2 +-
arch/parisc/kernel/signal.c | 4 +-
arch/parisc/math-emu/cnv_float.h | 11 +-
arch/powerpc/kvm/emulate.c | 2 +
arch/x86/kernel/cpu/perf_event.c | 6 -
arch/x86/kernel/entry_32.S | 1 -
arch/x86/kernel/step.c | 9 +-
arch/x86/xen/smp.c | 7 -
drivers/acpi/apei/apei-base.c | 3 +
drivers/acpi/processor_idle.c | 4 +
drivers/acpi/processor_perflib.c | 7 +
drivers/ata/ahci.c | 8 +-
drivers/ata/libahci.c | 6 +-
drivers/ata/libata-core.c | 22 +-
drivers/ata/libata-eh.c | 2 +-
drivers/base/regmap/regmap-debugfs.c | 2 -
drivers/base/regmap/regmap.c | 2 +-
drivers/block/virtio_blk.c | 7 +-
drivers/cpufreq/Kconfig.x86 | 2 +-
drivers/cpufreq/acpi-cpufreq.c | 7 +
drivers/cpufreq/cpufreq-cpu0.c | 5 +
drivers/cpufreq/omap-cpufreq.c | 3 +
drivers/cpuidle/Kconfig | 6 +
drivers/cpuidle/Makefile | 1 +
.../cpuidle/cpuidle-kirkwood.c | 45 ++-
drivers/devfreq/devfreq.c | 5 +
drivers/devfreq/exynos4_bus.c | 94 +++++--
drivers/dma/imx-dma.c | 5 +-
drivers/dma/ioat/dma_v3.c | 2 +-
drivers/dma/tegra20-apb-dma.c | 8 +-
drivers/gpio/gpio-mvebu.c | 6 -
drivers/gpio/gpio-samsung.c | 14 +-
drivers/gpu/drm/i915/i915_debugfs.c | 3 +
drivers/gpu/drm/i915/i915_drv.h | 3 +
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 21 ++
drivers/gpu/drm/i915/i915_irq.c | 11 +
drivers/gpu/drm/i915/i915_reg.h | 2 +
drivers/gpu/drm/i915/intel_dp.c | 47 +++-
drivers/gpu/drm/i915/intel_pm.c | 17 +-
drivers/gpu/drm/radeon/evergreen.c | 6 +
drivers/gpu/drm/radeon/ni.c | 6 +
drivers/gpu/drm/radeon/r600.c | 6 +
drivers/gpu/drm/radeon/radeon.h | 3 +-
drivers/gpu/drm/radeon/radeon_drv.c | 3 +-
drivers/gpu/drm/radeon/radeon_object.c | 18 +-
drivers/gpu/drm/radeon/radeon_ring.c | 2 +
drivers/gpu/drm/radeon/radeon_semaphore.c | 4 +
drivers/gpu/drm/radeon/reg_srcs/rv515 | 2 +
drivers/gpu/drm/radeon/si.c | 6 +
drivers/gpu/drm/ttm/ttm_bo.c | 1 +
drivers/gpu/drm/ttm/ttm_bo_util.c | 11 +-
drivers/hv/hv_balloon.c | 35 ++-
drivers/i2c/busses/i2c-designware-core.c | 4 +
drivers/i2c/busses/i2c-mxs.c | 6 +-
drivers/i2c/busses/i2c-omap.c | 6 +-
drivers/i2c/busses/i2c-sirf.c | 4 +
drivers/i2c/muxes/i2c-mux-pinctrl.c | 2 +-
drivers/idle/intel_idle.c | 3 +-
drivers/media/i2c/m5mols/m5mols_core.c | 2 +-
drivers/media/platform/omap3isp/ispvideo.c | 3 -
drivers/media/platform/s5p-fimc/fimc-mdevice.c | 2 +-
drivers/media/platform/s5p-mfc/s5p_mfc.c | 88 +++---
drivers/media/usb/gspca/kinect.c | 1 +
drivers/media/usb/gspca/sonixb.c | 13 +-
drivers/media/usb/gspca/sonixj.c | 1 +
drivers/media/usb/uvc/uvc_ctrl.c | 4 +-
drivers/media/usb/uvc/uvc_v4l2.c | 6 +-
drivers/media/v4l2-core/videobuf2-core.c | 4 +-
drivers/misc/ti-st/st_kim.c | 37 ++-
drivers/mmc/card/block.c | 30 +-
drivers/mmc/card/queue.c | 32 ++-
drivers/mmc/card/queue.h | 3 +
drivers/mmc/core/bus.c | 1 +
drivers/mmc/core/core.c | 121 +++++++-
drivers/mmc/core/core.h | 1 +
drivers/mmc/core/sdio.c | 33 ++-
drivers/mmc/core/slot-gpio.c | 57 +++-
drivers/mmc/host/Kconfig | 11 +
drivers/mmc/host/Makefile | 1 +
drivers/mmc/host/mvsdio.c | 131 +++++----
drivers/mmc/host/sdhci-bcm2835.c | 227 +++++++++++++++
drivers/mmc/host/sdhci-esdhc-imx.c | 59 +---
drivers/mmc/host/sdhci-pxav3.c | 12 +-
drivers/mmc/host/sdhci.c | 117 +++++---
drivers/mmc/host/sh_mmcif.c | 280 +++++++++++--------
drivers/mmc/host/tmio_mmc_pio.c | 8 -
drivers/pci/hotplug/pciehp.h | 2 +-
drivers/pci/hotplug/pciehp_core.c | 11 +-
drivers/pci/hotplug/pciehp_ctrl.c | 8 +-
drivers/pci/hotplug/pciehp_hpc.c | 11 +-
drivers/pci/hotplug/shpchp.h | 3 +-
drivers/pci/hotplug/shpchp_core.c | 36 +--
drivers/pci/hotplug/shpchp_ctrl.c | 6 +-
drivers/pci/pcie/Kconfig | 2 +-
drivers/pci/pcie/aer/aerdrv_core.c | 1 +
drivers/pci/pcie/aspm.c | 3 +
drivers/rtc/Kconfig | 2 +-
drivers/staging/iio/adc/mxs-lradc.c | 2 +-
drivers/staging/iio/gyro/adis16080_core.c | 2 +-
drivers/staging/sb105x/sb_pci_mp.c | 2 +-
drivers/staging/vt6656/bssdb.h | 1 -
drivers/staging/vt6656/int.h | 1 -
drivers/staging/vt6656/iocmd.h | 33 ++-
drivers/staging/vt6656/iowpa.h | 8 +-
drivers/staging/wlan-ng/prism2mgmt.c | 2 +-
drivers/tty/pty.c | 2 +
drivers/tty/serial/8250/8250.c | 11 +
drivers/tty/serial/8250/8250.h | 1 +
drivers/tty/serial/8250/8250_dw.c | 2 +-
drivers/tty/serial/8250/8250_pci.c | 42 ++-
drivers/tty/serial/ifx6x60.c | 4 +-
drivers/tty/serial/mxs-auart.c | 6 +-
drivers/tty/serial/samsung.c | 1 -
drivers/tty/serial/vt8500_serial.c | 2 +-
drivers/usb/dwc3/gadget.c | 1 +
drivers/usb/gadget/f_fs.c | 6 +-
drivers/usb/gadget/fsl_mxc_udc.c | 40 ++-
drivers/usb/gadget/fsl_udc_core.c | 42 +--
drivers/usb/gadget/fsl_usb2_udc.h | 5 +-
drivers/usb/host/Kconfig | 2 +-
drivers/usb/host/Makefile | 1 +
drivers/usb/host/ehci-hcd.c | 12 +-
drivers/usb/host/ehci-mxc.c | 120 ++++----
drivers/usb/host/ehci.h | 7 +
drivers/usb/host/uhci-hcd.c | 15 +-
drivers/usb/musb/cppi_dma.c | 4 +-
drivers/usb/serial/io_ti.c | 3 +
drivers/usb/serial/option.c | 9 +-
drivers/vfio/pci/vfio_pci_rdwr.c | 4 +-
drivers/xen/cpu_hotplug.c | 4 +-
drivers/xen/gntdev.c | 130 ++++++---
drivers/xen/grant-table.c | 48 ++--
drivers/xen/privcmd.c | 89 +++---
drivers/xen/xen-pciback/pciback.h | 2 +-
fs/Kconfig | 10 -
fs/btrfs/extent-tree.c | 6 +-
fs/btrfs/extent_map.c | 13 +-
fs/btrfs/extent_map.h | 1 +
fs/btrfs/file-item.c | 4 +-
fs/btrfs/file.c | 10 +-
fs/btrfs/free-space-cache.c | 20 +-
fs/btrfs/inode.c | 137 ++++++---
fs/btrfs/ioctl.c | 129 ++++++---
fs/btrfs/qgroup.c | 20 +-
fs/btrfs/send.c | 4 +-
fs/btrfs/super.c | 2 +-
fs/btrfs/transaction.c | 19 +-
fs/btrfs/tree-log.c | 10 +-
fs/btrfs/volumes.c | 23 +-
fs/cifs/cifs_dfs_ref.c | 2 +
fs/cifs/connect.c | 2 +-
fs/f2fs/acl.c | 13 +-
fs/f2fs/checkpoint.c | 3 +-
fs/f2fs/data.c | 17 +-
fs/f2fs/debug.c | 50 ++--
fs/f2fs/dir.c | 2 +-
fs/f2fs/f2fs.h | 18 +-
fs/f2fs/file.c | 16 +-
fs/f2fs/gc.c | 68 ++---
fs/f2fs/inode.c | 3 +
fs/f2fs/node.c | 19 +-
fs/f2fs/recovery.c | 10 +-
fs/f2fs/segment.c | 2 +-
fs/f2fs/super.c | 97 +++++--
fs/f2fs/xattr.c | 2 +
fs/fuse/Kconfig | 16 +-
fs/fuse/cuse.c | 36 ++-
fs/fuse/dev.c | 5 -
fs/fuse/file.c | 5 +-
include/asm-generic/dma-mapping-broken.h | 16 ++
include/asm-generic/pgtable.h | 6 +-
include/asm-generic/syscalls.h | 2 +
include/linux/ata.h | 8 +-
include/linux/libata.h | 4 +-
include/linux/mmc/card.h | 12 +
include/linux/mmc/core.h | 3 +-
include/linux/mmc/host.h | 25 ++
include/linux/module.h | 10 +-
include/linux/ptrace.h | 1 -
include/linux/sched.h | 11 +-
include/uapi/linux/serial_core.h | 3 +-
init/do_mounts_initrd.c | 4 +
init/main.c | 4 +-
kernel/async.c | 27 +-
kernel/compat.c | 23 +-
kernel/debug/kdb/kdb_main.c | 2 +
kernel/fork.c | 6 +-
kernel/module.c | 154 +++++++---
kernel/ptrace.c | 74 ++++-
kernel/sched/core.c | 3 +-
kernel/signal.c | 24 +-
kernel/trace/ftrace.c | 2 +-
lib/bug.c | 1 +
security/device_cgroup.c | 2 +
security/integrity/evm/evm_crypto.c | 4 +-
sound/pci/hda/hda_codec.c | 5 +-
sound/pci/hda/patch_conexant.c | 9 +
sound/pci/hda/patch_realtek.c | 2 +
tools/perf/MANIFEST | 10 +
tools/perf/Makefile | 2 +-
274 files changed, 3501 insertions(+), 1617 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt
create mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt
create mode 100644 arch/arm/boot/dts/armada-370-rd.dts
create mode 100644 arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
create mode 100644 arch/arm/mach-dove/board-dt.c
create mode 100644 arch/arm/mach-kirkwood/board-guruplug.c
rename arch/arm/mach-kirkwood/cpuidle.c => drivers/cpuidle/cpuidle-kirkwood.c (61%)
create mode 100644 drivers/mmc/host/sdhci-bcm2835.c
^ permalink raw reply [flat|nested] 19+ messages in thread* [GIT PULL 1/4] ARM: mvebu: cleanup for v3.9
2013-02-01 15:51 [GIT PULL 0/4] ARM: mvebu: changes for v3.9 Jason Cooper
@ 2013-02-01 15:51 ` Jason Cooper
2013-02-05 7:10 ` Olof Johansson
2013-02-01 15:51 ` [GIT PULL 2/4] ARM: mvebu: drivers " Jason Cooper
` (3 subsequent siblings)
4 siblings, 1 reply; 19+ messages in thread
From: Jason Cooper @ 2013-02-01 15:51 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit b96e1b1c3c5319294edb0970b6d5bf099c0e85eb:
ARM: Kirkwood: Cleanup unneeded include files
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git tags/cleanup_for_v3.9_round2
for you to fetch changes up to b3af7a1ffd1e5e9ec536a915393b7e07a8793f2a:
ARM: dove: cleanup includes
----------------------------------------------------------------
cleanup for v3.9 round2
- remove unneeded #includes for mach-dove
- remove unneeded #includes and code for the nsa310
----------------------------------------------------------------
Jason Cooper (1):
ARM: kirkwood: nsa310: cleanup includes and unneeded code
Sebastian Hesselbarth (1):
ARM: dove: cleanup includes
arch/arm/mach-dove/common.c | 29 +++++++++--------------------
arch/arm/mach-kirkwood/board-nsa310.c | 8 +-------
2 files changed, 10 insertions(+), 27 deletions(-)
^ permalink raw reply [flat|nested] 19+ messages in thread* [GIT PULL 1/4] ARM: mvebu: cleanup for v3.9
2013-02-01 15:51 ` [GIT PULL 1/4] ARM: mvebu: cleanup " Jason Cooper
@ 2013-02-05 7:10 ` Olof Johansson
0 siblings, 0 replies; 19+ messages in thread
From: Olof Johansson @ 2013-02-05 7:10 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Feb 01, 2013 at 03:51:58PM +0000, Jason Cooper wrote:
> The following changes since commit b96e1b1c3c5319294edb0970b6d5bf099c0e85eb:
>
> ARM: Kirkwood: Cleanup unneeded include files
>
> are available in the git repository at:
>
> git://git.infradead.org/users/jcooper/linux.git tags/cleanup_for_v3.9_round2
>
> for you to fetch changes up to b3af7a1ffd1e5e9ec536a915393b7e07a8793f2a:
>
> ARM: dove: cleanup includes
Pulled, thanks.
-Olof
^ permalink raw reply [flat|nested] 19+ messages in thread
* [GIT PULL 2/4] ARM: mvebu: drivers for v3.9
2013-02-01 15:51 [GIT PULL 0/4] ARM: mvebu: changes for v3.9 Jason Cooper
2013-02-01 15:51 ` [GIT PULL 1/4] ARM: mvebu: cleanup " Jason Cooper
@ 2013-02-01 15:51 ` Jason Cooper
2013-02-05 7:10 ` Olof Johansson
2013-02-01 15:51 ` [GIT PULL 4/4] ARM: mvebu: dt " Jason Cooper
` (2 subsequent siblings)
4 siblings, 1 reply; 19+ messages in thread
From: Jason Cooper @ 2013-02-01 15:51 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 949db153b6466c6f7cad5a427ecea94985927311:
Linux 3.8-rc5
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git tags/drivers_for_v3.9
for you to fetch changes up to 9cfc94eb0f4843af5d1141a37d7b7ca5d3b27220:
cpuidle: kirkwood: Move out of mach directory
----------------------------------------------------------------
mvebu drivers for v3.9
- use rtc-mv in mvebu armv7 SoCs
- add pci-e hotplug for kirkwood
Depends on:
- tags/mvebu_fixes_for_v3.8-rc6
----------------------------------------------------------------
Andrew Lunn (1):
cpuidle: kirkwood: Move out of mach directory
Gregory CLEMENT (1):
rtc: Add support of rtc-mv for MVEBU SoCs
Jason Cooper (1):
Merge tag 'tags/mvebu_fixes_for_v3.8-rc6' into mvebu/drivers
Jason Gunthorpe (1):
ARM: Kirkwood: Support basic hotplug for PCI-E
arch/arm/boot/dts/dove.dtsi | 2 +
arch/arm/configs/kirkwood_defconfig | 1 +
arch/arm/configs/mvebu_defconfig | 2 +
arch/arm/mach-kirkwood/Makefile | 1 -
arch/arm/mach-kirkwood/board-dt.c | 2 +
arch/arm/mach-kirkwood/common.c | 23 ++++++++++
arch/arm/mach-kirkwood/common.h | 1 +
arch/arm/mach-kirkwood/include/mach/kirkwood.h | 3 +-
arch/arm/mach-kirkwood/pcie.c | 10 ++---
arch/arm/plat-orion/mpp.c | 2 +-
drivers/cpuidle/Kconfig | 6 +++
drivers/cpuidle/Makefile | 1 +
.../cpuidle/cpuidle-kirkwood.c | 45 +++++++++++++++++---
drivers/rtc/Kconfig | 2 +-
14 files changed, 84 insertions(+), 17 deletions(-)
rename arch/arm/mach-kirkwood/cpuidle.c => drivers/cpuidle/cpuidle-kirkwood.c (61%)
^ permalink raw reply [flat|nested] 19+ messages in thread* [GIT PULL 2/4] ARM: mvebu: drivers for v3.9
2013-02-01 15:51 ` [GIT PULL 2/4] ARM: mvebu: drivers " Jason Cooper
@ 2013-02-05 7:10 ` Olof Johansson
0 siblings, 0 replies; 19+ messages in thread
From: Olof Johansson @ 2013-02-05 7:10 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Feb 01, 2013 at 03:51:59PM +0000, Jason Cooper wrote:
> The following changes since commit 949db153b6466c6f7cad5a427ecea94985927311:
>
> Linux 3.8-rc5
>
> are available in the git repository at:
>
> git://git.infradead.org/users/jcooper/linux.git tags/drivers_for_v3.9
>
> for you to fetch changes up to 9cfc94eb0f4843af5d1141a37d7b7ca5d3b27220:
>
> cpuidle: kirkwood: Move out of mach directory
>
Pulled, thanks.
-Olof
^ permalink raw reply [flat|nested] 19+ messages in thread
* [GIT PULL 4/4] ARM: mvebu: dt for v3.9
2013-02-01 15:51 [GIT PULL 0/4] ARM: mvebu: changes for v3.9 Jason Cooper
2013-02-01 15:51 ` [GIT PULL 1/4] ARM: mvebu: cleanup " Jason Cooper
2013-02-01 15:51 ` [GIT PULL 2/4] ARM: mvebu: drivers " Jason Cooper
@ 2013-02-01 15:51 ` Jason Cooper
2013-02-01 15:51 ` [GIT PULL 3/4] ARM: mvebu: boards " Jason Cooper
2013-02-04 8:29 ` [GIT PULL 0/4] ARM: mvebu: changes " Gregory CLEMENT
4 siblings, 0 replies; 19+ messages in thread
From: Jason Cooper @ 2013-02-01 15:51 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 949db153b6466c6f7cad5a427ecea94985927311:
Linux 3.8-rc5
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git tags/dt_for_v3.9
for you to fetch changes up to 1bead82fa5a52cd21c30c0c28615157d5c3dac9f:
arm: mvebu: add button for OpenBlocks AX3-4
----------------------------------------------------------------
mvebu dt changes for v3.9
- mvebu
- add rtc support
- add sdio support
- add button support for AX3-4
- kirkwood
- add sdio support
- add twsi1 and nand to 88f6282
- convert openblocks A6 to pinctrl
- convert more of nsa310 to dt
- gpio-poweroff for ns2
- dove
- move led pinctrl to gpio-leds node
- use fixed regulator for usb power
depends on:
- tags/boards_for_v3.9, which pulls in:
- tags/mvebu_fixes_for_v3.8-rc6
- tags/cleanup_for_v3.9_round2
- tags/drivers_for_v3.9
- mmc/mmc-next up to:
d293875 mmc: mvsdio: add pinctrl integration
----------------------------------------------------------------
Andrew Lunn (4):
ARM: Kirkwood: Convert NSA310 to DT based regulators.
ARM: Kirkwood: Convert NSA310 to use gpio-poweroff driver
ARM: Kirkwood: Convert NSA310 I2C to device tree
ARM: Kirkwood: Convert NS2 to gpio-poweroff.
Gregory CLEMENT (1):
arm: mvebu: Add RTC support for Armada 370 and Armada XP
Jason Cooper (1):
Merge tag 'tags/boards_for_v3.9' into mvebu/dt
Nobuhiro Iwamatsu (3):
ARM: Kirkwood: Add pinctrl of TWSI1 to 88f6282
ARM: Kirkwood: Add pinctrl of NAND to 88f6282
ARM: Kirkwood: Convert openblocks A6 board to pinctrl
Sebastian Hesselbarth (2):
ARM: Dove: move CuBox led pinctrl to gpio-leds node
ARM: Dove: add fixed regulator for CuBox USB power
Thomas Petazzoni (11):
arm: mvebu: add DT information for the SDIO interface of Armada 370/XP
arm: mvebu: add pin muxing options for the SDIO interface on Armada 370
arm: mvebu: add pin muxing options for the SDIO interface on Armada XP
arm: mvebu: enable the SD card slot on Armada XP DB board
arm: mvebu: enable the SD card slot on Armada 370 DB board
arm: mvebu: enable the SDIO interface on the Globalscale Mirabox
arm: kirkwood: add Device Tree informations for the SDIO controller
arm: kirkwood: dreamplug: use Device Tree to probe SDIO
arm: kirkwood: mplcec4: use Device Tree to probe SDIO
arm: kirkwood: add pinmux option for the SDIO interface on 88F6282
arm: mvebu: add button for OpenBlocks AX3-4
.../bindings/mmc/brcm,bcm2835-sdhci.txt | 18 ++
.../devicetree/bindings/mmc/orion-sdio.txt | 17 ++
arch/arm/boot/dts/Makefile | 2 +
arch/arm/boot/dts/armada-370-db.dts | 15 +
arch/arm/boot/dts/armada-370-mirabox.dts | 10 +
arch/arm/boot/dts/armada-370-rd.dts | 61 ++++
arch/arm/boot/dts/armada-370-xp.dtsi | 14 +
arch/arm/boot/dts/armada-370.dtsi | 12 +
arch/arm/boot/dts/armada-xp-db.dts | 7 +
arch/arm/boot/dts/armada-xp-mv78230.dtsi | 6 +
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 6 +
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 6 +
.../arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 12 +
arch/arm/boot/dts/armada-xp.dtsi | 2 +-
arch/arm/boot/dts/dove-cubox.dts | 28 +-
arch/arm/boot/dts/dove.dtsi | 2 +
arch/arm/boot/dts/kirkwood-6282.dtsi | 17 ++
arch/arm/boot/dts/kirkwood-dreamplug.dts | 7 +
.../boot/dts/kirkwood-guruplug-server-plus.dts | 94 +++++++
arch/arm/boot/dts/kirkwood-mplcec4.dts | 11 +-
arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 6 +
arch/arm/boot/dts/kirkwood-nsa310.dts | 27 ++
arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 116 ++++++++
arch/arm/boot/dts/kirkwood.dtsi | 8 +
arch/arm/configs/dove_defconfig | 28 +-
arch/arm/configs/kirkwood_defconfig | 1 +
arch/arm/configs/mvebu_defconfig | 16 ++
arch/arm/mach-dove/Kconfig | 7 +
arch/arm/mach-dove/Makefile | 4 +-
arch/arm/mach-dove/board-dt.c | 102 +++++++
arch/arm/mach-dove/common.c | 114 +-------
arch/arm/mach-kirkwood/Kconfig | 7 +
arch/arm/mach-kirkwood/Makefile | 2 +-
arch/arm/mach-kirkwood/board-dreamplug.c | 6 -
arch/arm/mach-kirkwood/board-dt.c | 15 +-
arch/arm/mach-kirkwood/board-guruplug.c | 39 +++
arch/arm/mach-kirkwood/board-ib62x0.c | 1 -
arch/arm/mach-kirkwood/board-mplcec4.c | 8 -
arch/arm/mach-kirkwood/board-ns2.c | 14 -
arch/arm/mach-kirkwood/board-nsa310.c | 51 +---
arch/arm/mach-kirkwood/board-openblocks_a6.c | 44 ---
arch/arm/mach-kirkwood/common.c | 23 ++
arch/arm/mach-kirkwood/common.h | 6 +
arch/arm/mach-kirkwood/dockstar-setup.c | 1 -
arch/arm/mach-kirkwood/include/mach/kirkwood.h | 3 +-
arch/arm/mach-kirkwood/pcie.c | 10 +-
arch/arm/mach-mvebu/irq-armada-370-xp.c | 72 +++++
arch/arm/plat-orion/mpp.c | 2 +-
drivers/cpuidle/Kconfig | 6 +
drivers/cpuidle/Makefile | 1 +
.../cpuidle/cpuidle-kirkwood.c | 45 ++-
drivers/mmc/card/block.c | 30 +-
drivers/mmc/card/queue.c | 32 ++-
drivers/mmc/card/queue.h | 3 +
drivers/mmc/core/bus.c | 1 +
drivers/mmc/core/core.c | 121 +++++++-
drivers/mmc/core/core.h | 1 +
drivers/mmc/core/sdio.c | 33 ++-
drivers/mmc/core/slot-gpio.c | 57 +++-
drivers/mmc/host/Kconfig | 11 +
drivers/mmc/host/Makefile | 1 +
drivers/mmc/host/mvsdio.c | 131 +++++----
drivers/mmc/host/sdhci-bcm2835.c | 227 +++++++++++++++
drivers/mmc/host/sdhci-esdhc-imx.c | 59 +---
drivers/mmc/host/sdhci-pxav3.c | 12 +-
drivers/mmc/host/sdhci.c | 117 +++++---
drivers/mmc/host/sh_mmcif.c | 280 +++++++++++--------
drivers/mmc/host/tmio_mmc_pio.c | 8 -
drivers/rtc/Kconfig | 2 +-
include/linux/mmc/card.h | 12 +
include/linux/mmc/core.h | 3 +-
include/linux/mmc/host.h | 25 ++
72 files changed, 1688 insertions(+), 610 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt
create mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt
create mode 100644 arch/arm/boot/dts/armada-370-rd.dts
create mode 100644 arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
create mode 100644 arch/arm/mach-dove/board-dt.c
create mode 100644 arch/arm/mach-kirkwood/board-guruplug.c
rename arch/arm/mach-kirkwood/cpuidle.c => drivers/cpuidle/cpuidle-kirkwood.c (61%)
create mode 100644 drivers/mmc/host/sdhci-bcm2835.c
^ permalink raw reply [flat|nested] 19+ messages in thread* [GIT PULL 3/4] ARM: mvebu: boards for v3.9
2013-02-01 15:51 [GIT PULL 0/4] ARM: mvebu: changes for v3.9 Jason Cooper
` (2 preceding siblings ...)
2013-02-01 15:51 ` [GIT PULL 4/4] ARM: mvebu: dt " Jason Cooper
@ 2013-02-01 15:51 ` Jason Cooper
2013-02-05 7:10 ` Olof Johansson
2013-02-04 8:29 ` [GIT PULL 0/4] ARM: mvebu: changes " Gregory CLEMENT
4 siblings, 1 reply; 19+ messages in thread
From: Jason Cooper @ 2013-02-01 15:51 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 949db153b6466c6f7cad5a427ecea94985927311:
Linux 3.8-rc5
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git tags/boards_for_v3.9
for you to fetch changes up to c7064904895f69b2e33117b450a05746f75abf3a:
ARM: kirkwood: convert Guruplug Server Plus to use the device tree
----------------------------------------------------------------
mvebu boards for v3.9
- Guruplug Server Plus DT board
- RD-A370-A1 board
- mvebu improved SMP support in interrupt controller
- update defconfigs
- split legacy and DT setup for dove
- remove some redundant clock aliases
depends on:
- tags/mvebu_fixes_for_v3.8-rc6
- tags/cleanup_for_v3.9_round2
- tags/drivers_for_v3.9
- mmc/mmc-next up to:
d293875 mmc: mvsdio: add pinctrl integration
conflicts:
- arm-soc/for-next
- arch/arm/mach-dove/common.c
* remove all DT code (it's now in .../board-dt.c)
build fixes (not merge conflict)
- arm-soc/for-next
- arch/arm/mach-dove/board-dt.c
- .timer no longer used
* s/.timer = &dove_timer/.init_time = dove_timer_init/ (not valid sed)
----------------------------------------------------------------
Andrew Lunn (2):
ARM: Kirkwood: Remove redundent USB clock alias
ARM: Kirkwood: Remove redundent SDIO clock alias
Florian Fainelli (1):
arm: mvebu: add DTS file for Marvell RD-A370-A1 board
Gregory CLEMENT (2):
arm: mvebu: Update defconfig with Marvell RTC support
arm: mvebu: Improve the SMP support of the interrupt controller
Jason Cooper (4):
Merge tag 'tags/mvebu_fixes_for_v3.8-rc6' into mvebu/boards
Merge tag 'tags/cleanup_for_v3.9_round2' into mvebu/boards
Merge tag 'tags/drivers_for_v3.9' into mvebu/boards
Merge commit 'd293875' into mvebu/boards
Olof Johansson (1):
ARM: dove: update dove_defconfig with a few useful options
Sebastian Hesselbarth (1):
ARM: Dove: split legacy and DT setup
Thomas Petazzoni (4):
arm: mvebu: enable SDIO support in mvebu_defconfig
arm: mvebu: enable mwifiex driver in mvebu_defconfig
arm: mvebu: enable btmrvl driver in mvebu_defconfig
arm: mvebu: add LEDs support to defconfig file
Willy Tarreau (1):
ARM: kirkwood: convert Guruplug Server Plus to use the device tree
.../bindings/mmc/brcm,bcm2835-sdhci.txt | 18 ++
.../devicetree/bindings/mmc/orion-sdio.txt | 17 ++
arch/arm/boot/dts/Makefile | 2 +
arch/arm/boot/dts/armada-370-rd.dts | 61 ++++
arch/arm/boot/dts/armada-xp.dtsi | 2 +-
arch/arm/boot/dts/dove.dtsi | 2 +
.../boot/dts/kirkwood-guruplug-server-plus.dts | 94 +++++++
arch/arm/configs/dove_defconfig | 28 +-
arch/arm/configs/kirkwood_defconfig | 1 +
arch/arm/configs/mvebu_defconfig | 16 ++
arch/arm/mach-dove/Kconfig | 5 +
arch/arm/mach-dove/Makefile | 4 +-
arch/arm/mach-dove/board-dt.c | 102 +++++++
arch/arm/mach-dove/common.c | 114 +-------
arch/arm/mach-kirkwood/Kconfig | 7 +
arch/arm/mach-kirkwood/Makefile | 2 +-
arch/arm/mach-kirkwood/board-dt.c | 15 +-
arch/arm/mach-kirkwood/board-guruplug.c | 39 +++
arch/arm/mach-kirkwood/board-ib62x0.c | 1 -
arch/arm/mach-kirkwood/board-mplcec4.c | 1 -
arch/arm/mach-kirkwood/board-nsa310.c | 8 +-
arch/arm/mach-kirkwood/common.c | 23 ++
arch/arm/mach-kirkwood/common.h | 6 +
arch/arm/mach-kirkwood/dockstar-setup.c | 1 -
arch/arm/mach-kirkwood/include/mach/kirkwood.h | 3 +-
arch/arm/mach-kirkwood/pcie.c | 10 +-
arch/arm/mach-mvebu/irq-armada-370-xp.c | 72 +++++
arch/arm/plat-orion/mpp.c | 2 +-
drivers/cpuidle/Kconfig | 6 +
drivers/cpuidle/Makefile | 1 +
.../cpuidle/cpuidle-kirkwood.c | 45 ++-
drivers/mmc/card/block.c | 30 +-
drivers/mmc/card/queue.c | 32 ++-
drivers/mmc/card/queue.h | 3 +
drivers/mmc/core/bus.c | 1 +
drivers/mmc/core/core.c | 121 +++++++-
drivers/mmc/core/core.h | 1 +
drivers/mmc/core/sdio.c | 33 ++-
drivers/mmc/core/slot-gpio.c | 57 +++-
drivers/mmc/host/Kconfig | 11 +
drivers/mmc/host/Makefile | 1 +
drivers/mmc/host/mvsdio.c | 131 +++++----
drivers/mmc/host/sdhci-bcm2835.c | 227 +++++++++++++++
drivers/mmc/host/sdhci-esdhc-imx.c | 59 +---
drivers/mmc/host/sdhci-pxav3.c | 12 +-
drivers/mmc/host/sdhci.c | 117 +++++---
drivers/mmc/host/sh_mmcif.c | 280 +++++++++++--------
drivers/mmc/host/tmio_mmc_pio.c | 8 -
drivers/rtc/Kconfig | 2 +-
include/linux/mmc/card.h | 12 +
include/linux/mmc/core.h | 3 +-
include/linux/mmc/host.h | 25 ++
52 files changed, 1381 insertions(+), 493 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt
create mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt
create mode 100644 arch/arm/boot/dts/armada-370-rd.dts
create mode 100644 arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
create mode 100644 arch/arm/mach-dove/board-dt.c
create mode 100644 arch/arm/mach-kirkwood/board-guruplug.c
rename arch/arm/mach-kirkwood/cpuidle.c => drivers/cpuidle/cpuidle-kirkwood.c (61%)
create mode 100644 drivers/mmc/host/sdhci-bcm2835.c
^ permalink raw reply [flat|nested] 19+ messages in thread* [GIT PULL 3/4] ARM: mvebu: boards for v3.9
2013-02-01 15:51 ` [GIT PULL 3/4] ARM: mvebu: boards " Jason Cooper
@ 2013-02-05 7:10 ` Olof Johansson
2013-02-05 11:21 ` Jason Cooper
0 siblings, 1 reply; 19+ messages in thread
From: Olof Johansson @ 2013-02-05 7:10 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Fri, Feb 01, 2013 at 03:51:59PM +0000, Jason Cooper wrote:
> The following changes since commit 949db153b6466c6f7cad5a427ecea94985927311:
>
> Linux 3.8-rc5
>
> are available in the git repository at:
>
> git://git.infradead.org/users/jcooper/linux.git tags/boards_for_v3.9
>
> for you to fetch changes up to c7064904895f69b2e33117b450a05746f75abf3a:
>
> ARM: kirkwood: convert Guruplug Server Plus to use the device tree
>
> ----------------------------------------------------------------
> mvebu boards for v3.9
> - Guruplug Server Plus DT board
> - RD-A370-A1 board
> - mvebu improved SMP support in interrupt controller
> - update defconfigs
> - split legacy and DT setup for dove
> - remove some redundant clock aliases
>
> depends on:
> - tags/mvebu_fixes_for_v3.8-rc6
> - tags/cleanup_for_v3.9_round2
> - tags/drivers_for_v3.9
> - mmc/mmc-next up to:
> d293875 mmc: mvsdio: add pinctrl integration
Hm. What do you need the mmc branch for? Is it just the removal of the
redundant SDIO clock alias?
If so, I'd say let's keep that as a cleanup until 3.10 instead of bringing this
in as a dependency. If it's something more substantial than that, then let me
know and we'll still pull this in.
Also, it's really hard to tell where code came from when you just merge in
a hash like below:
> Jason Cooper (4):
> Merge tag 'tags/mvebu_fixes_for_v3.8-rc6' into mvebu/boards
> Merge tag 'tags/cleanup_for_v3.9_round2' into mvebu/boards
> Merge tag 'tags/drivers_for_v3.9' into mvebu/boards
> Merge commit 'd293875' into mvebu/boards
That's the mmc-next branch at that commit, but it'd be nice to have a
more descriptive summary in the shortlog.
-Olof
^ permalink raw reply [flat|nested] 19+ messages in thread
* [GIT PULL 3/4] ARM: mvebu: boards for v3.9
2013-02-05 7:10 ` Olof Johansson
@ 2013-02-05 11:21 ` Jason Cooper
2013-02-05 18:23 ` Olof Johansson
0 siblings, 1 reply; 19+ messages in thread
From: Jason Cooper @ 2013-02-05 11:21 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Feb 04, 2013 at 11:10:10PM -0800, Olof Johansson wrote:
> Hi,
>
> On Fri, Feb 01, 2013 at 03:51:59PM +0000, Jason Cooper wrote:
> > The following changes since commit 949db153b6466c6f7cad5a427ecea94985927311:
> >
> > Linux 3.8-rc5
> >
> > are available in the git repository at:
> >
> > git://git.infradead.org/users/jcooper/linux.git tags/boards_for_v3.9
> >
> > for you to fetch changes up to c7064904895f69b2e33117b450a05746f75abf3a:
> >
> > ARM: kirkwood: convert Guruplug Server Plus to use the device tree
> >
> > ----------------------------------------------------------------
> > mvebu boards for v3.9
> > - Guruplug Server Plus DT board
> > - RD-A370-A1 board
> > - mvebu improved SMP support in interrupt controller
> > - update defconfigs
> > - split legacy and DT setup for dove
> > - remove some redundant clock aliases
> >
> > depends on:
> > - tags/mvebu_fixes_for_v3.8-rc6
> > - tags/cleanup_for_v3.9_round2
> > - tags/drivers_for_v3.9
> > - mmc/mmc-next up to:
> > d293875 mmc: mvsdio: add pinctrl integration
>
> Hm. What do you need the mmc branch for? Is it just the removal of the
> redundant SDIO clock alias?
No, it's the four patches of Thomas' to the mvsdio driver:
d293875 mmc: mvsdio: add pinctrl integration
182ce21 mmc: mvsdio: implement a Device Tree binding
aa3738e mmc: mvsdio: use slot-gpio for card detect gpio
9d8b28e5 mmc: mvsdio: use slot-gpio infrastructure for write protect gpio
which mvebu/boards needs before we can activate defconfig options.
> Also, it's really hard to tell where code came from when you just merge in
> a hash like below:
>
> > Jason Cooper (4):
> > Merge tag 'tags/mvebu_fixes_for_v3.8-rc6' into mvebu/boards
> > Merge tag 'tags/cleanup_for_v3.9_round2' into mvebu/boards
> > Merge tag 'tags/drivers_for_v3.9' into mvebu/boards
> > Merge commit 'd293875' into mvebu/boards
>
> That's the mmc-next branch at that commit, but it'd be nice to have a
> more descriptive summary in the shortlog.
Agreed, I started doing this after the first time I pulled in pinctrl as
a dependency. LinusW recommended pulling just up to the commit needed
so that if he did have to do a rebase, the closer it was to the tip of
his tree, the fewer people it would affect.
Would this be better?
"Merge mmc/mmc-next up to 'd293875' into mvebu/boards"
thx,
Jason.
^ permalink raw reply [flat|nested] 19+ messages in thread
* [GIT PULL 3/4] ARM: mvebu: boards for v3.9
2013-02-05 11:21 ` Jason Cooper
@ 2013-02-05 18:23 ` Olof Johansson
2013-02-05 18:30 ` Jason Cooper
0 siblings, 1 reply; 19+ messages in thread
From: Olof Johansson @ 2013-02-05 18:23 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Feb 05, 2013 at 06:21:04AM -0500, Jason Cooper wrote:
> On Mon, Feb 04, 2013 at 11:10:10PM -0800, Olof Johansson wrote:
> > Hi,
> >
> > On Fri, Feb 01, 2013 at 03:51:59PM +0000, Jason Cooper wrote:
> > > The following changes since commit 949db153b6466c6f7cad5a427ecea94985927311:
> > >
> > > Linux 3.8-rc5
> > >
> > > are available in the git repository at:
> > >
> > > git://git.infradead.org/users/jcooper/linux.git tags/boards_for_v3.9
> > >
> > > for you to fetch changes up to c7064904895f69b2e33117b450a05746f75abf3a:
> > >
> > > ARM: kirkwood: convert Guruplug Server Plus to use the device tree
> > >
> > > ----------------------------------------------------------------
> > > mvebu boards for v3.9
> > > - Guruplug Server Plus DT board
> > > - RD-A370-A1 board
> > > - mvebu improved SMP support in interrupt controller
> > > - update defconfigs
> > > - split legacy and DT setup for dove
> > > - remove some redundant clock aliases
> > >
> > > depends on:
> > > - tags/mvebu_fixes_for_v3.8-rc6
> > > - tags/cleanup_for_v3.9_round2
> > > - tags/drivers_for_v3.9
> > > - mmc/mmc-next up to:
> > > d293875 mmc: mvsdio: add pinctrl integration
> >
> > Hm. What do you need the mmc branch for? Is it just the removal of the
> > redundant SDIO clock alias?
>
> No, it's the four patches of Thomas' to the mvsdio driver:
>
> d293875 mmc: mvsdio: add pinctrl integration
> 182ce21 mmc: mvsdio: implement a Device Tree binding
> aa3738e mmc: mvsdio: use slot-gpio for card detect gpio
> 9d8b28e5 mmc: mvsdio: use slot-gpio infrastructure for write protect gpio
>
> which mvebu/boards needs before we can activate defconfig options.
Yeah, those are the patches you need to bring in. What I was wondering is why
you need to bring them in? If it's just for defconfig updates and a couple of
tiny cleanups, then I would say it's not worth the overhead of adding the
dependency branch to do those -- defconfig updates can go in anyway and the
cleanups can happen in the next release.
> > Also, it's really hard to tell where code came from when you just merge in
> > a hash like below:
> >
> > > Jason Cooper (4):
> > > Merge tag 'tags/mvebu_fixes_for_v3.8-rc6' into mvebu/boards
> > > Merge tag 'tags/cleanup_for_v3.9_round2' into mvebu/boards
> > > Merge tag 'tags/drivers_for_v3.9' into mvebu/boards
> > > Merge commit 'd293875' into mvebu/boards
> >
> > That's the mmc-next branch at that commit, but it'd be nice to have a
> > more descriptive summary in the shortlog.
>
> Agreed, I started doing this after the first time I pulled in pinctrl as
> a dependency. LinusW recommended pulling just up to the commit needed
> so that if he did have to do a rebase, the closer it was to the tip of
> his tree, the fewer people it would affect.
>
> Would this be better?
>
> "Merge mmc/mmc-next up to 'd293875' into mvebu/boards"
Yeah, that would have been better (but see above).
-Olof
^ permalink raw reply [flat|nested] 19+ messages in thread
* [GIT PULL 3/4] ARM: mvebu: boards for v3.9
2013-02-05 18:23 ` Olof Johansson
@ 2013-02-05 18:30 ` Jason Cooper
2013-02-05 23:26 ` Olof Johansson
0 siblings, 1 reply; 19+ messages in thread
From: Jason Cooper @ 2013-02-05 18:30 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Feb 05, 2013 at 10:23:33AM -0800, Olof Johansson wrote:
> On Tue, Feb 05, 2013 at 06:21:04AM -0500, Jason Cooper wrote:
> > On Mon, Feb 04, 2013 at 11:10:10PM -0800, Olof Johansson wrote:
> > > Hi,
> > >
> > > On Fri, Feb 01, 2013 at 03:51:59PM +0000, Jason Cooper wrote:
> > > > The following changes since commit 949db153b6466c6f7cad5a427ecea94985927311:
> > > >
> > > > Linux 3.8-rc5
> > > >
> > > > are available in the git repository at:
> > > >
> > > > git://git.infradead.org/users/jcooper/linux.git tags/boards_for_v3.9
> > > >
> > > > for you to fetch changes up to c7064904895f69b2e33117b450a05746f75abf3a:
> > > >
> > > > ARM: kirkwood: convert Guruplug Server Plus to use the device tree
> > > >
> > > > ----------------------------------------------------------------
> > > > mvebu boards for v3.9
> > > > - Guruplug Server Plus DT board
> > > > - RD-A370-A1 board
> > > > - mvebu improved SMP support in interrupt controller
> > > > - update defconfigs
> > > > - split legacy and DT setup for dove
> > > > - remove some redundant clock aliases
> > > >
> > > > depends on:
> > > > - tags/mvebu_fixes_for_v3.8-rc6
> > > > - tags/cleanup_for_v3.9_round2
> > > > - tags/drivers_for_v3.9
> > > > - mmc/mmc-next up to:
> > > > d293875 mmc: mvsdio: add pinctrl integration
> > >
> > > Hm. What do you need the mmc branch for? Is it just the removal of the
> > > redundant SDIO clock alias?
> >
> > No, it's the four patches of Thomas' to the mvsdio driver:
> >
> > d293875 mmc: mvsdio: add pinctrl integration
> > 182ce21 mmc: mvsdio: implement a Device Tree binding
> > aa3738e mmc: mvsdio: use slot-gpio for card detect gpio
> > 9d8b28e5 mmc: mvsdio: use slot-gpio infrastructure for write protect gpio
> >
> > which mvebu/boards needs before we can activate defconfig options.
>
> Yeah, those are the patches you need to bring in. What I was wondering is why
> you need to bring them in? If it's just for defconfig updates and a couple of
> tiny cleanups, then I would say it's not worth the overhead of adding the
> dependency branch to do those -- defconfig updates can go in anyway and the
> cleanups can happen in the next release.
Well, I brought them in to mvebu/boards because of defconfig, but I
need them in mvebu/dt (which depends on mvebu/boards) because we remove
the legacy mvsdio init calls, and add the mvsdio dt blocks to the dts
files.
Would you prefer I put all the defconfig changes into /dt since it's at
the end of the dependency chain?
> > > Also, it's really hard to tell where code came from when you just merge in
> > > a hash like below:
> > >
> > > > Jason Cooper (4):
> > > > Merge tag 'tags/mvebu_fixes_for_v3.8-rc6' into mvebu/boards
> > > > Merge tag 'tags/cleanup_for_v3.9_round2' into mvebu/boards
> > > > Merge tag 'tags/drivers_for_v3.9' into mvebu/boards
> > > > Merge commit 'd293875' into mvebu/boards
> > >
> > > That's the mmc-next branch at that commit, but it'd be nice to have a
> > > more descriptive summary in the shortlog.
> >
> > Agreed, I started doing this after the first time I pulled in pinctrl as
> > a dependency. LinusW recommended pulling just up to the commit needed
> > so that if he did have to do a rebase, the closer it was to the tip of
> > his tree, the fewer people it would affect.
> >
> > Would this be better?
> >
> > "Merge mmc/mmc-next up to 'd293875' into mvebu/boards"
>
> Yeah, that would have been better (but see above).
Ok, I'll do that in the future.
thx,
Jason.
^ permalink raw reply [flat|nested] 19+ messages in thread
* [GIT PULL 3/4] ARM: mvebu: boards for v3.9
2013-02-05 18:30 ` Jason Cooper
@ 2013-02-05 23:26 ` Olof Johansson
2013-02-06 13:20 ` Jason Cooper
0 siblings, 1 reply; 19+ messages in thread
From: Olof Johansson @ 2013-02-05 23:26 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Feb 05, 2013 at 01:30:50PM -0500, Jason Cooper wrote:
> On Tue, Feb 05, 2013 at 10:23:33AM -0800, Olof Johansson wrote:
> > On Tue, Feb 05, 2013 at 06:21:04AM -0500, Jason Cooper wrote:
> > > On Mon, Feb 04, 2013 at 11:10:10PM -0800, Olof Johansson wrote:
> > > > Hi,
> > > >
> > > > On Fri, Feb 01, 2013 at 03:51:59PM +0000, Jason Cooper wrote:
> > > > > The following changes since commit 949db153b6466c6f7cad5a427ecea94985927311:
> > > > >
> > > > > Linux 3.8-rc5
> > > > >
> > > > > are available in the git repository at:
> > > > >
> > > > > git://git.infradead.org/users/jcooper/linux.git tags/boards_for_v3.9
> > > > >
> > > > > for you to fetch changes up to c7064904895f69b2e33117b450a05746f75abf3a:
> > > > >
> > > > > ARM: kirkwood: convert Guruplug Server Plus to use the device tree
> > > > >
> > > > > ----------------------------------------------------------------
> > > > > mvebu boards for v3.9
> > > > > - Guruplug Server Plus DT board
> > > > > - RD-A370-A1 board
> > > > > - mvebu improved SMP support in interrupt controller
> > > > > - update defconfigs
> > > > > - split legacy and DT setup for dove
> > > > > - remove some redundant clock aliases
> > > > >
> > > > > depends on:
> > > > > - tags/mvebu_fixes_for_v3.8-rc6
> > > > > - tags/cleanup_for_v3.9_round2
> > > > > - tags/drivers_for_v3.9
> > > > > - mmc/mmc-next up to:
> > > > > d293875 mmc: mvsdio: add pinctrl integration
> > > >
> > > > Hm. What do you need the mmc branch for? Is it just the removal of the
> > > > redundant SDIO clock alias?
> > >
> > > No, it's the four patches of Thomas' to the mvsdio driver:
> > >
> > > d293875 mmc: mvsdio: add pinctrl integration
> > > 182ce21 mmc: mvsdio: implement a Device Tree binding
> > > aa3738e mmc: mvsdio: use slot-gpio for card detect gpio
> > > 9d8b28e5 mmc: mvsdio: use slot-gpio infrastructure for write protect gpio
> > >
> > > which mvebu/boards needs before we can activate defconfig options.
> >
> > Yeah, those are the patches you need to bring in. What I was wondering is why
> > you need to bring them in? If it's just for defconfig updates and a couple of
> > tiny cleanups, then I would say it's not worth the overhead of adding the
> > dependency branch to do those -- defconfig updates can go in anyway and the
> > cleanups can happen in the next release.
>
> Well, I brought them in to mvebu/boards because of defconfig, but I
> need them in mvebu/dt (which depends on mvebu/boards) because we remove
> the legacy mvsdio init calls, and add the mvsdio dt blocks to the dts
> files.
>
> Would you prefer I put all the defconfig changes into /dt since it's at
> the end of the dependency chain?
The defconfig changes can go in either branch. They end up selecting
new options that will be silently turned off unless the driver change
is also in the same tree, but that's not a big deal since things will
eventually converge.
What makes sense is to hold off the patches that adds dts entries and
removes the platform device registrations to the next release to avoid
this dependency.
-Olof
^ permalink raw reply [flat|nested] 19+ messages in thread
* [GIT PULL 3/4] ARM: mvebu: boards for v3.9
2013-02-05 23:26 ` Olof Johansson
@ 2013-02-06 13:20 ` Jason Cooper
2013-02-10 0:31 ` Olof Johansson
0 siblings, 1 reply; 19+ messages in thread
From: Jason Cooper @ 2013-02-06 13:20 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Feb 05, 2013 at 03:26:04PM -0800, Olof Johansson wrote:
> What makes sense is to hold off the patches that adds dts entries and
> removes the platform device registrations to the next release to avoid
> this dependency.
Hmm, this makes life a *lot* simpler, but it also really slows things
down. I'll go ahead and do this from now on.
Would you like me to redo /boards and /dt in light of this, or just do
it from here forward?
thx,
Jason.
^ permalink raw reply [flat|nested] 19+ messages in thread
* [GIT PULL 3/4] ARM: mvebu: boards for v3.9
2013-02-06 13:20 ` Jason Cooper
@ 2013-02-10 0:31 ` Olof Johansson
2013-02-10 21:05 ` Jason Cooper
0 siblings, 1 reply; 19+ messages in thread
From: Olof Johansson @ 2013-02-10 0:31 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Feb 06, 2013 at 08:20:15AM -0500, Jason Cooper wrote:
> On Tue, Feb 05, 2013 at 03:26:04PM -0800, Olof Johansson wrote:
> > What makes sense is to hold off the patches that adds dts entries and
> > removes the platform device registrations to the next release to avoid
> > this dependency.
>
> Hmm, this makes life a *lot* simpler, but it also really slows things
> down. I'll go ahead and do this from now on.
>
> Would you like me to redo /boards and /dt in light of this, or just do
> it from here forward?
It doesn't necessarily slow things down -- it increases latency though. I.e.
you'll end up building a pipeline over time.
I agree that we're not entirely clear on this, and we're also going back and
forth a bit on how much of this we push back on and not. I don't think we've
found quite a good balance of this yet. Hm.
-Olof
^ permalink raw reply [flat|nested] 19+ messages in thread
* [GIT PULL 3/4] ARM: mvebu: boards for v3.9
2013-02-10 0:31 ` Olof Johansson
@ 2013-02-10 21:05 ` Jason Cooper
0 siblings, 0 replies; 19+ messages in thread
From: Jason Cooper @ 2013-02-10 21:05 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Feb 09, 2013 at 04:31:13PM -0800, Olof Johansson wrote:
> On Wed, Feb 06, 2013 at 08:20:15AM -0500, Jason Cooper wrote:
> > On Tue, Feb 05, 2013 at 03:26:04PM -0800, Olof Johansson wrote:
> > > What makes sense is to hold off the patches that adds dts entries and
> > > removes the platform device registrations to the next release to avoid
> > > this dependency.
> >
> > Hmm, this makes life a *lot* simpler, but it also really slows things
> > down. I'll go ahead and do this from now on.
> >
> > Would you like me to redo /boards and /dt in light of this, or just do
> > it from here forward?
>
> It doesn't necessarily slow things down -- it increases latency though. I.e.
> you'll end up building a pipeline over time.
Yes, that's not a problem.
> I agree that we're not entirely clear on this, and we're also going back and
> forth a bit on how much of this we push back on and not. I don't think we've
> found quite a good balance of this yet. Hm.
Well, it appears to me the crux of it is: How hard is it to merge and
re-merge branches with dependencies on driver trees? If it's a PITA,
then let's do as you've suggested. A sane, but slower process will
incur fewer mistakes.
Also, we can sit down an go ever this (with a few beers) at ELC. ;-)
I'll redo as you've suggested for this go-around, and we can hash it out
in a few weeks.
thx,
Jason.
^ permalink raw reply [flat|nested] 19+ messages in thread
* [GIT PULL 0/4] ARM: mvebu: changes for v3.9
2013-02-01 15:51 [GIT PULL 0/4] ARM: mvebu: changes for v3.9 Jason Cooper
` (3 preceding siblings ...)
2013-02-01 15:51 ` [GIT PULL 3/4] ARM: mvebu: boards " Jason Cooper
@ 2013-02-04 8:29 ` Gregory CLEMENT
2013-02-04 12:05 ` Jason Cooper
4 siblings, 1 reply; 19+ messages in thread
From: Gregory CLEMENT @ 2013-02-04 8:29 UTC (permalink / raw)
To: linux-arm-kernel
Hi Jason,
On 02/01/2013 04:51 PM, Jason Cooper wrote:
> The following changes since commit 19d23dac1b8f95e4a960fcbbb5687c33b9a2cd01:
>
> Merge branch 'fixes' into for-next
>
> are available in the git repository at:
>
> git://git.infradead.org/users/jcooper/linux.git mvebu/for-next
>
> for you to fetch changes up to 7d8a7dce24f76242daf1c469878597b8acc4f78f:
>
> Merge tag 'tags/dt_for_v3.9' into mvebu/for-next
>
> Jason Cooper (5):
> Merge tag 'tags/mvebu_fixes_for_v3.8-rc6' into mvebu/for-next
> Merge tag 'tags/cleanup_for_v3.9_round2' into mvebu/for-next
> Merge tag 'tags/drivers_for_v3.9' into mvebu/for-next
> Merge tag 'tags/boards_for_v3.9' into mvebu/for-next
> Merge tag 'tags/dt_for_v3.9' into mvebu/for-next
I didn't see anything about the USB support for Armada370/XP sent
by Ezequiel. Is there any reason to not have it? Or do you plan
to send a new pull request soon with his patch set?
Thanks,
PS: I noticed that there are a some files not related to mvebu at all
(such as the arch/parisc/... for example), but I guess it is due to some
dependencies.
>
> .../bindings/mmc/brcm,bcm2835-sdhci.txt | 18 ++
> .../devicetree/bindings/mmc/orion-sdio.txt | 17 ++
> Documentation/filesystems/f2fs.txt | 18 +-
> MAINTAINERS | 2 +-
> Makefile | 4 +-
> arch/arm/boot/dts/Makefile | 2 +
> arch/arm/boot/dts/armada-370-db.dts | 15 +
> arch/arm/boot/dts/armada-370-mirabox.dts | 10 +
> arch/arm/boot/dts/armada-370-rd.dts | 61 ++++
> arch/arm/boot/dts/armada-370-xp.dtsi | 14 +
> arch/arm/boot/dts/armada-370.dtsi | 12 +
> arch/arm/boot/dts/armada-xp-db.dts | 7 +
> arch/arm/boot/dts/armada-xp-mv78230.dtsi | 6 +
> arch/arm/boot/dts/armada-xp-mv78260.dtsi | 6 +
> arch/arm/boot/dts/armada-xp-mv78460.dtsi | 6 +
> .../arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 12 +
> arch/arm/boot/dts/armada-xp.dtsi | 2 +-
> arch/arm/boot/dts/dove-cubox.dts | 28 +-
> arch/arm/boot/dts/dove.dtsi | 2 +
> arch/arm/boot/dts/kirkwood-6282.dtsi | 17 ++
> arch/arm/boot/dts/kirkwood-dreamplug.dts | 7 +
> .../boot/dts/kirkwood-guruplug-server-plus.dts | 94 +++++++
> arch/arm/boot/dts/kirkwood-mplcec4.dts | 11 +-
> arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 6 +
> arch/arm/boot/dts/kirkwood-nsa310.dts | 27 ++
> arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 116 ++++++++
> arch/arm/boot/dts/kirkwood.dtsi | 8 +
> arch/arm/configs/dove_defconfig | 28 +-
> arch/arm/configs/kirkwood_defconfig | 1 +
> arch/arm/configs/mvebu_defconfig | 16 ++
> arch/arm/kernel/head.S | 5 +-
> arch/arm/kernel/hyp-stub.S | 18 +-
> arch/arm/mach-dove/Kconfig | 7 +
> arch/arm/mach-dove/Makefile | 4 +-
> arch/arm/mach-dove/board-dt.c | 102 +++++++
> arch/arm/mach-dove/common.c | 114 +-------
> arch/arm/mach-imx/clk-imx25.c | 6 +-
> arch/arm/mach-imx/clk-imx27.c | 6 +-
> arch/arm/mach-imx/clk-imx31.c | 6 +-
> arch/arm/mach-imx/clk-imx35.c | 6 +-
> arch/arm/mach-imx/clk-imx51-imx53.c | 6 +-
> arch/arm/mach-imx/devices/devices-common.h | 1 +
> .../mach-imx/devices/platform-fsl-usb2-udc.c | 15 +-
> arch/arm/mach-kirkwood/Kconfig | 7 +
> arch/arm/mach-kirkwood/Makefile | 2 +-
> arch/arm/mach-kirkwood/board-dreamplug.c | 6 -
> arch/arm/mach-kirkwood/board-dt.c | 15 +-
> arch/arm/mach-kirkwood/board-guruplug.c | 39 +++
> arch/arm/mach-kirkwood/board-ib62x0.c | 1 -
> arch/arm/mach-kirkwood/board-mplcec4.c | 8 -
> arch/arm/mach-kirkwood/board-ns2.c | 14 -
> arch/arm/mach-kirkwood/board-nsa310.c | 51 +---
> arch/arm/mach-kirkwood/board-openblocks_a6.c | 44 ---
> arch/arm/mach-kirkwood/common.c | 23 ++
> arch/arm/mach-kirkwood/common.h | 6 +
> arch/arm/mach-kirkwood/dockstar-setup.c | 1 -
> arch/arm/mach-kirkwood/include/mach/kirkwood.h | 3 +-
> arch/arm/mach-kirkwood/pcie.c | 10 +-
> arch/arm/mach-mvebu/irq-armada-370-xp.c | 72 +++++
> arch/arm/mm/dma-mapping.c | 18 +-
> arch/arm/mm/mmu.c | 2 +-
> arch/arm/plat-orion/mpp.c | 2 +-
> arch/arm/vfp/entry.S | 6 +-
> arch/arm/vfp/vfphw.S | 4 +-
> arch/arm64/include/asm/elf.h | 5 +-
> arch/ia64/kernel/ptrace.c | 27 --
> arch/m68k/include/asm/dma-mapping.h | 16 ++
> arch/m68k/include/asm/pgtable_no.h | 2 +
> arch/m68k/include/asm/unistd.h | 2 +-
> arch/m68k/include/uapi/asm/unistd.h | 1 +
> arch/m68k/kernel/syscalltable.S | 1 +
> arch/m68k/mm/init.c | 8 +-
> arch/parisc/kernel/entry.S | 18 +-
> arch/parisc/kernel/irq.c | 6 +-
> arch/parisc/kernel/ptrace.c | 2 +-
> arch/parisc/kernel/signal.c | 4 +-
> arch/parisc/math-emu/cnv_float.h | 11 +-
> arch/powerpc/kvm/emulate.c | 2 +
> arch/x86/kernel/cpu/perf_event.c | 6 -
> arch/x86/kernel/entry_32.S | 1 -
> arch/x86/kernel/step.c | 9 +-
> arch/x86/xen/smp.c | 7 -
> drivers/acpi/apei/apei-base.c | 3 +
> drivers/acpi/processor_idle.c | 4 +
> drivers/acpi/processor_perflib.c | 7 +
> drivers/ata/ahci.c | 8 +-
> drivers/ata/libahci.c | 6 +-
> drivers/ata/libata-core.c | 22 +-
> drivers/ata/libata-eh.c | 2 +-
> drivers/base/regmap/regmap-debugfs.c | 2 -
> drivers/base/regmap/regmap.c | 2 +-
> drivers/block/virtio_blk.c | 7 +-
> drivers/cpufreq/Kconfig.x86 | 2 +-
> drivers/cpufreq/acpi-cpufreq.c | 7 +
> drivers/cpufreq/cpufreq-cpu0.c | 5 +
> drivers/cpufreq/omap-cpufreq.c | 3 +
> drivers/cpuidle/Kconfig | 6 +
> drivers/cpuidle/Makefile | 1 +
> .../cpuidle/cpuidle-kirkwood.c | 45 ++-
> drivers/devfreq/devfreq.c | 5 +
> drivers/devfreq/exynos4_bus.c | 94 +++++--
> drivers/dma/imx-dma.c | 5 +-
> drivers/dma/ioat/dma_v3.c | 2 +-
> drivers/dma/tegra20-apb-dma.c | 8 +-
> drivers/gpio/gpio-mvebu.c | 6 -
> drivers/gpio/gpio-samsung.c | 14 +-
> drivers/gpu/drm/i915/i915_debugfs.c | 3 +
> drivers/gpu/drm/i915/i915_drv.h | 3 +
> drivers/gpu/drm/i915/i915_gem_execbuffer.c | 21 ++
> drivers/gpu/drm/i915/i915_irq.c | 11 +
> drivers/gpu/drm/i915/i915_reg.h | 2 +
> drivers/gpu/drm/i915/intel_dp.c | 47 +++-
> drivers/gpu/drm/i915/intel_pm.c | 17 +-
> drivers/gpu/drm/radeon/evergreen.c | 6 +
> drivers/gpu/drm/radeon/ni.c | 6 +
> drivers/gpu/drm/radeon/r600.c | 6 +
> drivers/gpu/drm/radeon/radeon.h | 3 +-
> drivers/gpu/drm/radeon/radeon_drv.c | 3 +-
> drivers/gpu/drm/radeon/radeon_object.c | 18 +-
> drivers/gpu/drm/radeon/radeon_ring.c | 2 +
> drivers/gpu/drm/radeon/radeon_semaphore.c | 4 +
> drivers/gpu/drm/radeon/reg_srcs/rv515 | 2 +
> drivers/gpu/drm/radeon/si.c | 6 +
> drivers/gpu/drm/ttm/ttm_bo.c | 1 +
> drivers/gpu/drm/ttm/ttm_bo_util.c | 11 +-
> drivers/hv/hv_balloon.c | 35 ++-
> drivers/i2c/busses/i2c-designware-core.c | 4 +
> drivers/i2c/busses/i2c-mxs.c | 6 +-
> drivers/i2c/busses/i2c-omap.c | 6 +-
> drivers/i2c/busses/i2c-sirf.c | 4 +
> drivers/i2c/muxes/i2c-mux-pinctrl.c | 2 +-
> drivers/idle/intel_idle.c | 3 +-
> drivers/media/i2c/m5mols/m5mols_core.c | 2 +-
> drivers/media/platform/omap3isp/ispvideo.c | 3 -
> drivers/media/platform/s5p-fimc/fimc-mdevice.c | 2 +-
> drivers/media/platform/s5p-mfc/s5p_mfc.c | 88 +++---
> drivers/media/usb/gspca/kinect.c | 1 +
> drivers/media/usb/gspca/sonixb.c | 13 +-
> drivers/media/usb/gspca/sonixj.c | 1 +
> drivers/media/usb/uvc/uvc_ctrl.c | 4 +-
> drivers/media/usb/uvc/uvc_v4l2.c | 6 +-
> drivers/media/v4l2-core/videobuf2-core.c | 4 +-
> drivers/misc/ti-st/st_kim.c | 37 ++-
> drivers/mmc/card/block.c | 30 +-
> drivers/mmc/card/queue.c | 32 ++-
> drivers/mmc/card/queue.h | 3 +
> drivers/mmc/core/bus.c | 1 +
> drivers/mmc/core/core.c | 121 +++++++-
> drivers/mmc/core/core.h | 1 +
> drivers/mmc/core/sdio.c | 33 ++-
> drivers/mmc/core/slot-gpio.c | 57 +++-
> drivers/mmc/host/Kconfig | 11 +
> drivers/mmc/host/Makefile | 1 +
> drivers/mmc/host/mvsdio.c | 131 +++++----
> drivers/mmc/host/sdhci-bcm2835.c | 227 +++++++++++++++
> drivers/mmc/host/sdhci-esdhc-imx.c | 59 +---
> drivers/mmc/host/sdhci-pxav3.c | 12 +-
> drivers/mmc/host/sdhci.c | 117 +++++---
> drivers/mmc/host/sh_mmcif.c | 280 +++++++++++--------
> drivers/mmc/host/tmio_mmc_pio.c | 8 -
> drivers/pci/hotplug/pciehp.h | 2 +-
> drivers/pci/hotplug/pciehp_core.c | 11 +-
> drivers/pci/hotplug/pciehp_ctrl.c | 8 +-
> drivers/pci/hotplug/pciehp_hpc.c | 11 +-
> drivers/pci/hotplug/shpchp.h | 3 +-
> drivers/pci/hotplug/shpchp_core.c | 36 +--
> drivers/pci/hotplug/shpchp_ctrl.c | 6 +-
> drivers/pci/pcie/Kconfig | 2 +-
> drivers/pci/pcie/aer/aerdrv_core.c | 1 +
> drivers/pci/pcie/aspm.c | 3 +
> drivers/rtc/Kconfig | 2 +-
> drivers/staging/iio/adc/mxs-lradc.c | 2 +-
> drivers/staging/iio/gyro/adis16080_core.c | 2 +-
> drivers/staging/sb105x/sb_pci_mp.c | 2 +-
> drivers/staging/vt6656/bssdb.h | 1 -
> drivers/staging/vt6656/int.h | 1 -
> drivers/staging/vt6656/iocmd.h | 33 ++-
> drivers/staging/vt6656/iowpa.h | 8 +-
> drivers/staging/wlan-ng/prism2mgmt.c | 2 +-
> drivers/tty/pty.c | 2 +
> drivers/tty/serial/8250/8250.c | 11 +
> drivers/tty/serial/8250/8250.h | 1 +
> drivers/tty/serial/8250/8250_dw.c | 2 +-
> drivers/tty/serial/8250/8250_pci.c | 42 ++-
> drivers/tty/serial/ifx6x60.c | 4 +-
> drivers/tty/serial/mxs-auart.c | 6 +-
> drivers/tty/serial/samsung.c | 1 -
> drivers/tty/serial/vt8500_serial.c | 2 +-
> drivers/usb/dwc3/gadget.c | 1 +
> drivers/usb/gadget/f_fs.c | 6 +-
> drivers/usb/gadget/fsl_mxc_udc.c | 40 ++-
> drivers/usb/gadget/fsl_udc_core.c | 42 +--
> drivers/usb/gadget/fsl_usb2_udc.h | 5 +-
> drivers/usb/host/Kconfig | 2 +-
> drivers/usb/host/Makefile | 1 +
> drivers/usb/host/ehci-hcd.c | 12 +-
> drivers/usb/host/ehci-mxc.c | 120 ++++----
> drivers/usb/host/ehci.h | 7 +
> drivers/usb/host/uhci-hcd.c | 15 +-
> drivers/usb/musb/cppi_dma.c | 4 +-
> drivers/usb/serial/io_ti.c | 3 +
> drivers/usb/serial/option.c | 9 +-
> drivers/vfio/pci/vfio_pci_rdwr.c | 4 +-
> drivers/xen/cpu_hotplug.c | 4 +-
> drivers/xen/gntdev.c | 130 ++++++---
> drivers/xen/grant-table.c | 48 ++--
> drivers/xen/privcmd.c | 89 +++---
> drivers/xen/xen-pciback/pciback.h | 2 +-
> fs/Kconfig | 10 -
> fs/btrfs/extent-tree.c | 6 +-
> fs/btrfs/extent_map.c | 13 +-
> fs/btrfs/extent_map.h | 1 +
> fs/btrfs/file-item.c | 4 +-
> fs/btrfs/file.c | 10 +-
> fs/btrfs/free-space-cache.c | 20 +-
> fs/btrfs/inode.c | 137 ++++++---
> fs/btrfs/ioctl.c | 129 ++++++---
> fs/btrfs/qgroup.c | 20 +-
> fs/btrfs/send.c | 4 +-
> fs/btrfs/super.c | 2 +-
> fs/btrfs/transaction.c | 19 +-
> fs/btrfs/tree-log.c | 10 +-
> fs/btrfs/volumes.c | 23 +-
> fs/cifs/cifs_dfs_ref.c | 2 +
> fs/cifs/connect.c | 2 +-
> fs/f2fs/acl.c | 13 +-
> fs/f2fs/checkpoint.c | 3 +-
> fs/f2fs/data.c | 17 +-
> fs/f2fs/debug.c | 50 ++--
> fs/f2fs/dir.c | 2 +-
> fs/f2fs/f2fs.h | 18 +-
> fs/f2fs/file.c | 16 +-
> fs/f2fs/gc.c | 68 ++---
> fs/f2fs/inode.c | 3 +
> fs/f2fs/node.c | 19 +-
> fs/f2fs/recovery.c | 10 +-
> fs/f2fs/segment.c | 2 +-
> fs/f2fs/super.c | 97 +++++--
> fs/f2fs/xattr.c | 2 +
> fs/fuse/Kconfig | 16 +-
> fs/fuse/cuse.c | 36 ++-
> fs/fuse/dev.c | 5 -
> fs/fuse/file.c | 5 +-
> include/asm-generic/dma-mapping-broken.h | 16 ++
> include/asm-generic/pgtable.h | 6 +-
> include/asm-generic/syscalls.h | 2 +
> include/linux/ata.h | 8 +-
> include/linux/libata.h | 4 +-
> include/linux/mmc/card.h | 12 +
> include/linux/mmc/core.h | 3 +-
> include/linux/mmc/host.h | 25 ++
> include/linux/module.h | 10 +-
> include/linux/ptrace.h | 1 -
> include/linux/sched.h | 11 +-
> include/uapi/linux/serial_core.h | 3 +-
> init/do_mounts_initrd.c | 4 +
> init/main.c | 4 +-
> kernel/async.c | 27 +-
> kernel/compat.c | 23 +-
> kernel/debug/kdb/kdb_main.c | 2 +
> kernel/fork.c | 6 +-
> kernel/module.c | 154 +++++++---
> kernel/ptrace.c | 74 ++++-
> kernel/sched/core.c | 3 +-
> kernel/signal.c | 24 +-
> kernel/trace/ftrace.c | 2 +-
> lib/bug.c | 1 +
> security/device_cgroup.c | 2 +
> security/integrity/evm/evm_crypto.c | 4 +-
> sound/pci/hda/hda_codec.c | 5 +-
> sound/pci/hda/patch_conexant.c | 9 +
> sound/pci/hda/patch_realtek.c | 2 +
> tools/perf/MANIFEST | 10 +
> tools/perf/Makefile | 2 +-
> 274 files changed, 3501 insertions(+), 1617 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt
> create mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt
> create mode 100644 arch/arm/boot/dts/armada-370-rd.dts
> create mode 100644 arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
> create mode 100644 arch/arm/mach-dove/board-dt.c
> create mode 100644 arch/arm/mach-kirkwood/board-guruplug.c
> rename arch/arm/mach-kirkwood/cpuidle.c => drivers/cpuidle/cpuidle-kirkwood.c (61%)
> create mode 100644 drivers/mmc/host/sdhci-bcm2835.c
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 19+ messages in thread* [GIT PULL 0/4] ARM: mvebu: changes for v3.9
2013-02-04 8:29 ` [GIT PULL 0/4] ARM: mvebu: changes " Gregory CLEMENT
@ 2013-02-04 12:05 ` Jason Cooper
0 siblings, 0 replies; 19+ messages in thread
From: Jason Cooper @ 2013-02-04 12:05 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Feb 04, 2013 at 09:29:10AM +0100, Gregory CLEMENT wrote:
> Hi Jason,
>
> On 02/01/2013 04:51 PM, Jason Cooper wrote:
> > The following changes since commit 19d23dac1b8f95e4a960fcbbb5687c33b9a2cd01:
> >
> > Merge branch 'fixes' into for-next
> >
> > are available in the git repository at:
> >
> > git://git.infradead.org/users/jcooper/linux.git mvebu/for-next
> >
> > for you to fetch changes up to 7d8a7dce24f76242daf1c469878597b8acc4f78f:
> >
> > Merge tag 'tags/dt_for_v3.9' into mvebu/for-next
> >
> > Jason Cooper (5):
> > Merge tag 'tags/mvebu_fixes_for_v3.8-rc6' into mvebu/for-next
> > Merge tag 'tags/cleanup_for_v3.9_round2' into mvebu/for-next
> > Merge tag 'tags/drivers_for_v3.9' into mvebu/for-next
> > Merge tag 'tags/boards_for_v3.9' into mvebu/for-next
> > Merge tag 'tags/dt_for_v3.9' into mvebu/for-next
>
> I didn't see anything about the USB support for Armada370/XP sent
> by Ezequiel. Is there any reason to not have it? Or do you plan
> to send a new pull request soon with his patch set?
Yes, this is a redo of the first series of requests I sent out. I had
to move mvsdio out to the appropriate maintainer tree and depend on it.
As soon as this gets pulled in, I have another round with everything but
Thomas' pci work. His will most likely be a separate pr series.
> PS: I noticed that there are a some files not related to mvebu at all
> (such as the arch/parisc/... for example), but I guess it is due to some
> dependencies.
Yeah, I'm working on that. It's purely in the diffstat, so it's not a
show stopper. It's much cleaner than the first time around, which is an
improvement.
thx,
Jason.
^ permalink raw reply [flat|nested] 19+ messages in thread
* [GIT PULL 0/4] ARM: mvebu: changes for v3.9
@ 2013-01-12 23:29 Jason Cooper
2013-01-12 23:29 ` [GIT PULL 3/4] ARM: mvebu: boards " Jason Cooper
[not found] ` <E1TuAWD-0004Ec-1G@merlin.infradead.org>
0 siblings, 2 replies; 19+ messages in thread
From: Jason Cooper @ 2013-01-12 23:29 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 417f2732930e5c5544ef3a3a0141d44b2639e8e8:
Merge branch 'next/drivers' into for-next (2013-01-08 15:09:33 -0800)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git mvebu/for-next
for you to fetch changes up to 9e896ba256a01808f2804944f258b0ac578d9c2e:
Merge branch 'mvebu/dt' into mvebu/for-next (2013-01-12 22:39:17 +0000)
----------------------------------------------------------------
Andrew Lunn (1):
ARM: Kirkwood: Cleanup unneeded include files
Gregory CLEMENT (6):
arm: mvebu: Improve the SMP support of the interrupt controller
ARM: mvebu: Fix interrupt handling in SMP mode
rtc: Add support of rtc-mv for MVEBU SoCs
arm: mvebu: Update defconfig with Marvell RTC support
arm: mvebu: Add RTC support for Armada 370 and Armada XP
arm: mvebu: Fix memory size for Armada 370 DB
Jason Cooper (9):
Merge branch 'mvebu/drivers' into mvebu/boards
Merge branch 'mvebu/drivers' into mvebu/boards
Merge branch 'mvebu/boards' into mvebu/dt
Merge branch 'mvebu/fixes' into mvebu/dt
Merge branch 'mvebu/fixes' into mvebu/for-next
Merge branch 'mvebu/cleanup' into mvebu/for-next
Merge branch 'mvebu/drivers' into mvebu/for-next
Merge branch 'mvebu/boards' into mvebu/for-next
Merge branch 'mvebu/dt' into mvebu/for-next
Jason Gunthorpe (1):
ARM: Kirkwood: Support basic hotplug for PCI-E
Nobuhiro Iwamatsu (3):
ARM: Kirkwood: Add pinctrl of TWSI1 to 88f6282
ARM: Kirkwood: Add pinctrl of NAND to 88f6282
ARM: Kirkwood: Convert openblocks A6 board to pinctrl
Sebastian Hesselbarth (3):
ARM: Dove: add Cubox sdhci card detect gpio
ARM: Dove: move CuBox led pinctrl to gpio-leds node
ARM: Dove: add fixed regulator for CuBox USB power
Simon Guinot (1):
ARM: Kirkwood: fix ns2 gpios by converting to pinctrl
Thomas Petazzoni (19):
arm: mvebu: use global interrupts for GPIOs on Armada XP
arm: kirkwood: dockstar: remove useless include of SDIO header
mmc: mvsdio: use slot-gpio infrastructure for write protect gpio
mmc: mvsdio: use slot-gpio for card detect gpio
mmc: mvsdio: implement a Device Tree binding
mmc: mvsdio: add pinctrl integration
arm: mvebu: enable SDIO support in mvebu_defconfig
arm: mvebu: enable mwifiex driver in mvebu_defconfig
arm: mvebu: enable btmrvl driver in mvebu_defconfig
arm: mvebu: add DT information for the SDIO interface of Armada 370/XP
arm: mvebu: add pin muxing options for the SDIO interface on Armada 370
arm: mvebu: add pin muxing options for the SDIO interface on Armada XP
arm: mvebu: enable the SD card slot on Armada XP DB board
arm: mvebu: enable the SD card slot on Armada 370 DB board
arm: mvebu: enable the SDIO interface on the Globalscale Mirabox
arm: kirkwood: add Device Tree informations for the SDIO controller
arm: kirkwood: dreamplug: use Device Tree to probe SDIO
arm: kirkwood: mplcec4: use Device Tree to probe SDIO
arm: kirkwood: add pinmux option for the SDIO interface on 88F6282
Willy Tarreau (1):
ARM: kirkwood: convert Guruplug Server Plus to use the device tree
.../devicetree/bindings/mmc/orion-sdio.txt | 17 +++
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/armada-370-db.dts | 17 ++-
arch/arm/boot/dts/armada-370-mirabox.dts | 10 ++
arch/arm/boot/dts/armada-370-xp.dtsi | 14 +++
arch/arm/boot/dts/armada-370.dtsi | 12 ++
arch/arm/boot/dts/armada-xp-db.dts | 7 ++
arch/arm/boot/dts/armada-xp-mv78230.dtsi | 20 +--
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 27 ++--
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 27 ++--
arch/arm/boot/dts/armada-xp.dtsi | 2 +-
arch/arm/boot/dts/dove-cubox.dts | 40 +++++-
arch/arm/boot/dts/kirkwood-6282.dtsi | 17 +++
arch/arm/boot/dts/kirkwood-dreamplug.dts | 7 ++
.../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 94 ++++++++++++++
arch/arm/boot/dts/kirkwood-mplcec4.dts | 11 +-
arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 16 +++
arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 116 ++++++++++++++++++
arch/arm/boot/dts/kirkwood.dtsi | 8 ++
arch/arm/configs/mvebu_defconfig | 9 ++
arch/arm/mach-dove/Kconfig | 2 +
arch/arm/mach-kirkwood/Kconfig | 7 ++
arch/arm/mach-kirkwood/Makefile | 1 +
arch/arm/mach-kirkwood/board-dreamplug.c | 6 -
arch/arm/mach-kirkwood/board-dt.c | 4 +
arch/arm/mach-kirkwood/board-guruplug.c | 39 ++++++
arch/arm/mach-kirkwood/board-ib62x0.c | 1 -
arch/arm/mach-kirkwood/board-mplcec4.c | 8 --
arch/arm/mach-kirkwood/board-ns2.c | 38 ------
arch/arm/mach-kirkwood/board-openblocks_a6.c | 44 -------
arch/arm/mach-kirkwood/common.h | 5 +
arch/arm/mach-kirkwood/dockstar-setup.c | 1 -
arch/arm/mach-kirkwood/pcie.c | 10 +-
arch/arm/mach-mvebu/irq-armada-370-xp.c | 72 +++++++++++
drivers/mmc/host/mvsdio.c | 136 +++++++++------------
drivers/rtc/Kconfig | 2 +-
36 files changed, 629 insertions(+), 219 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt
create mode 100644 arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
create mode 100644 arch/arm/mach-kirkwood/board-guruplug.c
^ permalink raw reply [flat|nested] 19+ messages in thread* [GIT PULL 3/4] ARM: mvebu: boards for v3.9
2013-01-12 23:29 Jason Cooper
@ 2013-01-12 23:29 ` Jason Cooper
[not found] ` <E1TuAWD-0004Ec-1G@merlin.infradead.org>
1 sibling, 0 replies; 19+ messages in thread
From: Jason Cooper @ 2013-01-12 23:29 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit d1c3ed669a2d452cacfb48c2d171a1f364dae2ed:
Linux 3.8-rc2 (2013-01-02 18:13:21 -0800)
are available in the git repository at:
git://git.infradead.org/users/jcooper/linux.git tags/boards_for_v3.9
for you to fetch changes up to 3db7063cd2f8284190ef81e9dd0e9b902c73c5e9:
arm: mvebu: enable btmrvl driver in mvebu_defconfig (2013-01-10 02:49:23 +0000)
----------------------------------------------------------------
mvebu boards for v3.9
- Guruplug Server Plus DT board
- mvebu improved SMP support in interrupt controller
- update mvebu_defconfig
----------------------------------------------------------------
Gregory CLEMENT (4):
arm: mvebu: Improve the SMP support of the interrupt controller
ARM: mvebu: Fix interrupt handling in SMP mode
rtc: Add support of rtc-mv for MVEBU SoCs
arm: mvebu: Update defconfig with Marvell RTC support
Jason Cooper (2):
Merge branch 'mvebu/drivers' into mvebu/boards
Merge branch 'mvebu/drivers' into mvebu/boards
Jason Gunthorpe (1):
ARM: Kirkwood: Support basic hotplug for PCI-E
Thomas Petazzoni (7):
mmc: mvsdio: use slot-gpio infrastructure for write protect gpio
mmc: mvsdio: use slot-gpio for card detect gpio
mmc: mvsdio: implement a Device Tree binding
mmc: mvsdio: add pinctrl integration
arm: mvebu: enable SDIO support in mvebu_defconfig
arm: mvebu: enable mwifiex driver in mvebu_defconfig
arm: mvebu: enable btmrvl driver in mvebu_defconfig
Willy Tarreau (1):
ARM: kirkwood: convert Guruplug Server Plus to use the device tree
.../devicetree/bindings/mmc/orion-sdio.txt | 17 +++
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/armada-xp.dtsi | 2 +-
.../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 94 ++++++++++++++
arch/arm/configs/mvebu_defconfig | 9 ++
arch/arm/mach-kirkwood/Kconfig | 7 ++
arch/arm/mach-kirkwood/Makefile | 1 +
arch/arm/mach-kirkwood/board-dt.c | 4 +
arch/arm/mach-kirkwood/board-guruplug.c | 39 ++++++
arch/arm/mach-kirkwood/common.h | 5 +
arch/arm/mach-kirkwood/pcie.c | 10 +-
arch/arm/mach-mvebu/irq-armada-370-xp.c | 72 +++++++++++
drivers/mmc/host/mvsdio.c | 136 +++++++++------------
drivers/rtc/Kconfig | 2 +-
14 files changed, 315 insertions(+), 84 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt
create mode 100644 arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
create mode 100644 arch/arm/mach-kirkwood/board-guruplug.c
^ permalink raw reply [flat|nested] 19+ messages in thread[parent not found: <E1TuAWD-0004Ec-1G@merlin.infradead.org>]
end of thread, other threads:[~2013-02-10 21:05 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-01 15:51 [GIT PULL 0/4] ARM: mvebu: changes for v3.9 Jason Cooper
2013-02-01 15:51 ` [GIT PULL 1/4] ARM: mvebu: cleanup " Jason Cooper
2013-02-05 7:10 ` Olof Johansson
2013-02-01 15:51 ` [GIT PULL 2/4] ARM: mvebu: drivers " Jason Cooper
2013-02-05 7:10 ` Olof Johansson
2013-02-01 15:51 ` [GIT PULL 4/4] ARM: mvebu: dt " Jason Cooper
2013-02-01 15:51 ` [GIT PULL 3/4] ARM: mvebu: boards " Jason Cooper
2013-02-05 7:10 ` Olof Johansson
2013-02-05 11:21 ` Jason Cooper
2013-02-05 18:23 ` Olof Johansson
2013-02-05 18:30 ` Jason Cooper
2013-02-05 23:26 ` Olof Johansson
2013-02-06 13:20 ` Jason Cooper
2013-02-10 0:31 ` Olof Johansson
2013-02-10 21:05 ` Jason Cooper
2013-02-04 8:29 ` [GIT PULL 0/4] ARM: mvebu: changes " Gregory CLEMENT
2013-02-04 12:05 ` Jason Cooper
-- strict thread matches above, loose matches on Subject: below --
2013-01-12 23:29 Jason Cooper
2013-01-12 23:29 ` [GIT PULL 3/4] ARM: mvebu: boards " Jason Cooper
[not found] ` <E1TuAWD-0004Ec-1G@merlin.infradead.org>
2013-01-13 1:06 ` Russell King - ARM Linux
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.