git.kernelconcepts.de Git - karo-tx-linux.git/log

]> git.kernelconcepts.de Git - karo-tx-linux.git/log

projects / karo-tx-linux.git / log

commit | commitdiff | tree

Lothar Waßmann [Thu, 31 Oct 2013 11:48:15 +0000 (12:48 +0100)]

ARM: imx6q: add missing sentinel to divider table

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

commit | commitdiff | tree

Lothar Waßmann [Tue, 29 Oct 2013 07:46:59 +0000 (08:46 +0100)]

ARM: dts: imx53: Add support for Ka-Ro electronics TX53 modules

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

commit | commitdiff | tree

Lothar Waßmann [Tue, 29 Oct 2013 07:45:04 +0000 (08:45 +0100)]

ARM: dts: imx53: Add another pwm pinctrl

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

commit | commitdiff | tree

Lothar Waßmann [Tue, 29 Oct 2013 07:44:35 +0000 (08:44 +0100)]

ARM: dts: imx53: Add sata support

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

commit | commitdiff | tree

Lothar Waßmann [Thu, 24 Oct 2013 08:23:18 +0000 (10:23 +0200)]

ahci_platform: enable DT probing

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

commit | commitdiff | tree

Lothar Waßmann [Thu, 24 Oct 2013 07:57:09 +0000 (09:57 +0200)]

ahci_platform: fix error return values in ahci_probe() function

- ENODEV is more appropriate than EINVAL if platform_get_resource() fails
- promote the return value from platform_get_irq() rather than inventing
a new one

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

commit | commitdiff | tree

Lothar Waßmann [Thu, 24 Oct 2013 07:44:05 +0000 (09:44 +0200)]

ARM: dts: tx28: use defined constants for GPIO polarity

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

commit | commitdiff | tree

Lothar Waßmann [Thu, 24 Oct 2013 07:38:02 +0000 (09:38 +0200)]

ARM: dts: imx6qdl: add support for Ka-Ro TX6 modules

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

commit | commitdiff | tree

Lothar Waßmann [Thu, 24 Oct 2013 07:36:11 +0000 (09:36 +0200)]

ARM: dts: imx6qdl: add more pinctrls for usbh1

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

commit | commitdiff | tree

Lothar Waßmann [Thu, 24 Oct 2013 07:35:52 +0000 (09:35 +0200)]

ARM: dts: imx6qdl: add more pinctrls for pwm

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

commit | commitdiff | tree

Lothar Waßmann [Thu, 24 Oct 2013 07:35:28 +0000 (09:35 +0200)]

ARM: dts: imx6qdl: rename pinctrl_pwm0 for consistency

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

commit | commitdiff | tree

Lothar Waßmann [Thu, 24 Oct 2013 07:32:06 +0000 (09:32 +0200)]

ARM: dts: imx6qdl: add more pinctrls for flexcan

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

commit | commitdiff | tree

Lothar Waßmann [Thu, 24 Oct 2013 07:31:12 +0000 (09:31 +0200)]

ARM: dts: imx6qdl: add more pinctrls for enet

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

commit | commitdiff | tree

Lothar Waßmann [Thu, 24 Oct 2013 07:29:33 +0000 (09:29 +0200)]

ARM: dts: imx6qdl: add more pinctrls for audmux

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

commit | commitdiff | tree

Lothar Waßmann [Thu, 24 Oct 2013 07:21:37 +0000 (09:21 +0200)]

ARM: dts: imx6qdl: add pinctrl for uart3 RTC/CTS

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

commit | commitdiff | tree

Ming Lei [Wed, 23 Oct 2013 13:44:53 +0000 (21:44 +0800)]

sysfs: fix sysfs_write_file for bin file

Before patch(sysfs: prepare path write for unified regular / bin
file handling), when size of bin file is zero, writting still can
continue, but this patch changes the behaviour.

The worse thing is that firmware loader is broken by this patch,
and user space application can't write to firmware bin file any more
because both firmware loader and drivers can't know at advance how
large the firmware file is and have to set its initialized size as
zero.

This patch fixes the problem and keeps behaviour of writting to bin
as before.

Reported-by: Lothar Waßmann <LW@karo-electronics.de>
Tested-by: Lothar Waßmann <LW@karo-electronics.de>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit | commitdiff | tree

Lothar Waßmann [Tue, 22 Oct 2013 11:49:21 +0000 (13:49 +0200)]

drm/imx: convert dev_dbg() to dev_err() for error message

commit | commitdiff | tree

Lothar Waßmann [Mon, 21 Oct 2013 14:43:24 +0000 (16:43 +0200)]

imx-drm: use native mode if available rather than first in list

commit | commitdiff | tree

Lothar Waßmann [Mon, 21 Oct 2013 14:36:23 +0000 (16:36 +0200)]

net: fec: call dma_mapping_error() where appropriate

This patch fixes the warning:
| DMA-API: device driver failed to check map error
when compiled with CONFIG_DMA_API_DEBUG enabled.

commit | commitdiff | tree

Lothar Waßmann [Mon, 21 Oct 2013 14:31:30 +0000 (16:31 +0200)]

net: fec: fix phy-reset-duration limiting

one second are 1000 milliseconds, not just '1'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 16:26:43 +0000 (18:26 +0200)]

Add linux-next specific files for 20131024

Signed-off-by: Thierry Reding <treding@nvidia.com>

commit | commitdiff | tree

Thierry Reding [Mon, 21 Oct 2013 15:26:20 +0000 (17:26 +0200)]

ARM: nommu: Implement dummy early_paging_init()

No-MMU configurations currenty fail to build because they are missing
the early_paging_init() symbol.

Signed-off-by: Thierry Reding <treding@nvidia.com>

commit | commitdiff | tree

Thierry Reding [Mon, 21 Oct 2013 15:25:43 +0000 (17:25 +0200)]

ARM: Use arch_virt_to_idmap() only when available

The arch_virt_to_idmap variable is only available when patching of the
physical to virtual translations at runtime is enabled via the Kconfig
ARM_PATCH_PHYS_VIRT option.

Signed-off-by: Thierry Reding <treding@nvidia.com>

commit | commitdiff | tree

Thierry Reding [Tue, 22 Oct 2013 14:53:18 +0000 (16:53 +0200)]

mmc: sdhci: dove: Fix build breakage

Commit 2d7c51f (mmc: sdhci: Use work structs instead of tasklets)
converts tasklets to work structs, but typos the conversion in the Dove
driver.

Signed-off-by: Thierry Reding <treding@nvidia.com>

commit | commitdiff | tree

Thierry Reding [Mon, 21 Oct 2013 15:25:16 +0000 (17:25 +0200)]

ARM: davinci: Avoid name collisions

Signed-off-by: Thierry Reding <treding@nvidia.com>

commit | commitdiff | tree

Thierry Reding [Wed, 23 Oct 2013 11:21:52 +0000 (13:21 +0200)]

tracing/events: Fix swiotlb tracepoint creation

Tracepoints are only created when Xen support is enabled, but they are
also referenced within lib/swiotlb.c. So unless Xen support is enabled
the tracepoints will be missing, therefore causing builds to fail. Fix
this by moving the tracepoint creation to lib/swiotlb.c, which works
nicely because the Xen swiotlb support selects the generic swiotlb
support.

Signed-off-by: Thierry Reding <treding@nvidia.com>

commit | commitdiff | tree

Thierry Reding [Mon, 21 Oct 2013 15:26:48 +0000 (17:26 +0200)]

gpio: Fix build breakage

Signed-off-by: Thierry Reding <treding@nvidia.com>

commit | commitdiff | tree

Thierry Reding [Tue, 22 Oct 2013 14:55:38 +0000 (16:55 +0200)]

PowerCap: Convert class code to use dev_groups

The newly added power capping framework uses the obsolete .dev_attrs
field of struct class. However this field will be removed in 3.13, so
convert the code to use the .dev_groups field instead.

Signed-off-by: Thierry Reding <treding@nvidia.com>

commit | commitdiff | tree

Thierry Reding [Tue, 22 Oct 2013 15:00:00 +0000 (17:00 +0200)]

sched/wait: Fix build breakage

The wait_event_interruptible_lock_irq() macro is missing a semi-colon
which causes a build failure in the i915 DRM driver.

Signed-off-by: Thierry Reding <treding@nvidia.com>

commit | commitdiff | tree

Mark Brown [Thu, 3 Oct 2013 23:53:01 +0000 (00:53 +0100)]

misc: mic: Update for sysfs_get_dirent() cleanups

Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Mark Brown [Thu, 3 Oct 2013 17:10:55 +0000 (18:10 +0100)]

drm/i915: Resolve interaction with drm-fixes tree

Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Mark Brown [Thu, 3 Oct 2013 12:05:20 +0000 (13:05 +0100)]

ceph: Fix up for iov_iter changes

Extend an earlier fixup by Stephen Rothwell.

Signed-off-by: Mark Brown <broonie@linaro.org>

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 13:02:50 +0000 (15:02 +0200)]

Merge remote-tracking branch 'lzo-update/lzo-update'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 13:02:45 +0000 (15:02 +0200)]

Merge remote-tracking branch 'random/dev'

Conflicts:
drivers/char/random.c

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 13:02:40 +0000 (15:02 +0200)]

Merge remote-tracking branch 'clk/clk-next'

Conflicts:
drivers/clk/Makefile

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 13:02:30 +0000 (15:02 +0200)]

Merge remote-tracking branch 'userns/for-next'

Conflicts:
fs/fuse/dir.c

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 13:02:23 +0000 (15:02 +0200)]

Merge remote-tracking branch 'pwm/for-next'

Conflicts:
arch/arm/mach-omap2/board-zoom-peripherals.c

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 13:02:07 +0000 (15:02 +0200)]

Merge remote-tracking branch 'tegra/for-next'

Conflicts:
MAINTAINERS

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 13:02:00 +0000 (15:02 +0200)]

Merge remote-tracking branch 'samsung/for-next'

Conflicts:
arch/arm/mach-exynos/mach-exynos4-dt.c

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 13:01:49 +0000 (15:01 +0200)]

Merge remote-tracking branch 'renesas/next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 13:01:46 +0000 (15:01 +0200)]

Merge remote-tracking branch 'mvebu/for-next'

Conflicts:
arch/arm/mach-kirkwood/board-dt.c

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 13:00:55 +0000 (15:00 +0200)]

Merge remote-tracking branch 'imx-mxs/for-next'

Conflicts:
arch/arm/mach-imx/mach-imx6q.c

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 13:00:07 +0000 (15:00 +0200)]

Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 13:00:02 +0000 (15:00 +0200)]

Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
MAINTAINERS
arch/arm/boot/dts/omap3-evm.dts
arch/arm/mach-tegra/Kconfig
arch/arm/mach-ux500/board-mop500.c

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:59:44 +0000 (14:59 +0200)]

Merge remote-tracking branch 'gpio/for-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:59:39 +0000 (14:59 +0200)]

Merge remote-tracking branch 'pinctrl/for-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:59:34 +0000 (14:59 +0200)]

Merge remote-tracking branch 'target-updates/for-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:59:32 +0000 (14:59 +0200)]

Merge remote-tracking branch 'scsi/for-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:59:31 +0000 (14:59 +0200)]

Merge remote-tracking branch 'char-misc/char-misc-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:59:28 +0000 (14:59 +0200)]

Merge remote-tracking branch 'staging/staging-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:59:25 +0000 (14:59 +0200)]

Merge remote-tracking branch 'usb-gadget/next'

Conflicts:
drivers/usb/musb/davinci.c

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:59:20 +0000 (14:59 +0200)]

Merge remote-tracking branch 'usb/usb-next'

Conflicts:
drivers/Kconfig

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:59:14 +0000 (14:59 +0200)]

Merge remote-tracking branch 'tty/tty-next'

Conflicts:
drivers/tty/serial/atmel_serial.c
drivers/tty/serial/imx.c

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:59:08 +0000 (14:59 +0200)]

Merge remote-tracking branch 'driver-core/driver-core-next'

Conflicts:
include/linux/netdevice.h

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:59:04 +0000 (14:59 +0200)]

Merge remote-tracking branch 'leds/for-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:58:58 +0000 (14:58 +0200)]

Merge remote-tracking branch 'regmap/for-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:58:53 +0000 (14:58 +0200)]

Merge remote-tracking branch 'workqueues/for-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:58:51 +0000 (14:58 +0200)]

Merge remote-tracking branch 'percpu/for-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:58:49 +0000 (14:58 +0200)]

Merge remote-tracking branch 'xen-tip/linux-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:58:43 +0000 (14:58 +0200)]

Merge remote-tracking branch 'kvm-arm/kvm-arm-next'

Conflicts:
arch/arm/kvm/reset.c

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:58:35 +0000 (14:58 +0200)]

Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
arch/arm/kvm/reset.c

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:58:17 +0000 (14:58 +0200)]

Merge remote-tracking branch 'ftrace/for-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:58:15 +0000 (14:58 +0200)]

Merge remote-tracking branch 'edac-amd/for-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:39:48 +0000 (14:39 +0200)]

Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/h8300/include/asm/Kbuild
include/linux/wait.h
tools/perf/config/Makefile
tools/perf/config/feature-tests.mak

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:37:27 +0000 (14:37 +0200)]

Merge remote-tracking branch 'spi/for-next'

Conflicts:
drivers/spi/spi.c

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:37:24 +0000 (14:37 +0200)]

Merge remote-tracking branch 'dt-rh/for-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:37:22 +0000 (14:37 +0200)]

Merge remote-tracking branch 'devicetree/devicetree/next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:37:14 +0000 (14:37 +0200)]

Merge remote-tracking branch 'trivial/for-next'

Conflicts:
net/netfilter/xt_set.c

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:37:05 +0000 (14:37 +0200)]

Merge remote-tracking branch 'iommu/next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:36:59 +0000 (14:36 +0200)]

Merge remote-tracking branch 'security/next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:36:58 +0000 (14:36 +0200)]

Merge remote-tracking branch 'regulator/for-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:36:54 +0000 (14:36 +0200)]

Merge remote-tracking branch 'fbdev/for-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:36:52 +0000 (14:36 +0200)]

Merge remote-tracking branch 'battery/master'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:36:49 +0000 (14:36 +0200)]

Merge remote-tracking branch 'mfd-lj/for-mfd-next'

Conflicts:
sound/soc/codecs/mc13783.c

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:36:41 +0000 (14:36 +0200)]

Merge remote-tracking branch 'mfd/master'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:36:40 +0000 (14:36 +0200)]

Merge remote-tracking branch 'md/for-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:36:37 +0000 (14:36 +0200)]

Merge remote-tracking branch 'kgdb/kgdb-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:36:35 +0000 (14:36 +0200)]

Merge remote-tracking branch 'mmc/mmc-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:36:26 +0000 (14:36 +0200)]

Merge remote-tracking branch 'block/for-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:36:22 +0000 (14:36 +0200)]

Merge remote-tracking branch 'cgroup/for-next'

Conflicts:
mm/memcontrol.c

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:36:17 +0000 (14:36 +0200)]

Merge remote-tracking branch 'input/next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:36:16 +0000 (14:36 +0200)]

Merge remote-tracking branch 'virtio/virtio-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:36:14 +0000 (14:36 +0200)]

Merge remote-tracking branch 'modules/modules-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:36:06 +0000 (14:36 +0200)]

Merge remote-tracking branch 'sound-asoc/for-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:36:04 +0000 (14:36 +0200)]

Merge remote-tracking branch 'sound/for-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:36:01 +0000 (14:36 +0200)]

Merge remote-tracking branch 'drm-tegra/drm/for-next'

Conflicts:
drivers/gpu/drm/tegra/Kconfig

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:35:56 +0000 (14:35 +0200)]

Merge remote-tracking branch 'drm-intel/for-linux-next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:35:53 +0000 (14:35 +0200)]

Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:35:49 +0000 (14:35 +0200)]

Merge remote-tracking branch 'crypto/master'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:35:47 +0000 (14:35 +0200)]

Merge remote-tracking branch 'l2-mtd/master'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:35:44 +0000 (14:35 +0200)]

Merge remote-tracking branch 'bluetooth/master'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:35:39 +0000 (14:35 +0200)]

Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
drivers/net/wireless/iwlwifi/pcie/drv.c

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:35:29 +0000 (14:35 +0200)]

Merge remote-tracking branch 'ipsec-next/master'

Conflicts:
net/xfrm/xfrm_policy.c

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:35:23 +0000 (14:35 +0200)]

Merge remote-tracking branch 'net-next/master'

Conflicts:
arch/h8300/include/uapi/asm/socket.h
arch/parisc/include/uapi/asm/socket.h

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:34:17 +0000 (14:34 +0200)]

Merge remote-tracking branch 'slave-dma/next'

commit | commitdiff | tree

Thierry Reding [Thu, 24 Oct 2013 12:34:15 +0000 (14:34 +0200)]

Merge remote-tracking branch 'dlm/next'