]>
git.kernelconcepts.de Git - karo-tx-linux.git/log
Lothar Waßmann [Fri, 12 Feb 2016 13:26:24 +0000 (14:26 +0100)]
ARM: dts: imx6ul: add sdma support
Add device node for the i.MX6UL SDMA unit.
Lothar Waßmann [Fri, 12 Feb 2016 13:26:21 +0000 (14:26 +0100)]
ARM: dts: imx6ul: add pwm[1-4] nodes
Add device nodes for the PWM uinits 1..4 which were missing in the
original commit for i.MX6UL support.
Lothar Waßmann [Fri, 12 Feb 2016 13:26:18 +0000 (14:26 +0100)]
ARM: dts: imx6ul: disable PWMs by default
Since PWMs are only useful if they are actually connected to an output pin,
let users enable them explicitly in their device trees where they should
also set up the pin configuration. This is in sync with a recent change
(commit
e2675266b39b ("ARM: dts: imx6qdl: disable PWMs by default"))
to other i.MX SoCs.
Lothar Waßmann [Fri, 12 Feb 2016 13:26:14 +0000 (14:26 +0100)]
ARM: dts: imx6ul: specify proper clocks for the PWM nodes
i.MX6UL PWMs require real clocks. Define the appropriate clocks for
the PWM units.
Lothar Waßmann [Fri, 12 Feb 2016 13:26:11 +0000 (14:26 +0100)]
ARM: dts: imx6ul: specify proper clocks for GPT node
The i.MX6UL GPT unit requires real clocks. Define the appropriate
clocks to make it work.
Lothar Waßmann [Fri, 12 Feb 2016 13:26:07 +0000 (14:26 +0100)]
ARM: dts: imx6ul: move dt-bindings/input/input.h include to dtsi file
imx6ul.dtsi references the macro 'KEY_POWER' from
dt-bindings/input/input.h. Thus, move the include statement for this
file from imx6ul-14x14-evk.dts to imx6ul.dtsi itself.
Lothar Waßmann [Fri, 12 Feb 2016 13:26:04 +0000 (14:26 +0100)]
ARM: dts: imx6ul: move tsc node to appropriate place in the DTB
Move the tsc node to keep the nodes sorted in ascending order by unit
address.
Lothar Waßmann [Fri, 12 Feb 2016 13:26:01 +0000 (14:26 +0100)]
ARM: dts: imx6ul: whitespace cleanup; no functional change
Remove whitespace before TAB in indentation.
Stephen Rothwell [Thu, 11 Feb 2016 05:12:39 +0000 (16:12 +1100)]
Add linux-next specific files for
20160211
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Stephen Rothwell [Thu, 11 Feb 2016 04:47:41 +0000 (15:47 +1100)]
Merge branch 'akpm/master'
Andrew Morton [Tue, 9 Feb 2016 23:14:05 +0000 (10:14 +1100)]
drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
This cast is no longer needed.
Cc: Johannes Berg <johannes.berg@intel.com>
Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Cc: Intel Linux Wireless <linuxwifi@intel.com>
Cc: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stephen Rothwell [Thu, 11 Feb 2016 04:34:56 +0000 (15:34 +1100)]
Merge branch 'akpm-current/current'
Stephen Rothwell [Thu, 11 Feb 2016 04:07:23 +0000 (15:07 +1100)]
Merge remote-tracking branch 'rtc/rtc-next'
Stephen Rothwell [Thu, 11 Feb 2016 04:05:59 +0000 (15:05 +1100)]
Merge remote-tracking branch 'coresight/next'
Stephen Rothwell [Thu, 11 Feb 2016 04:03:54 +0000 (15:03 +1100)]
Merge remote-tracking branch 'livepatching/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 04:02:22 +0000 (15:02 +1100)]
Merge remote-tracking branch 'y2038/y2038'
Stephen Rothwell [Thu, 11 Feb 2016 04:01:59 +0000 (15:01 +1100)]
Merge remote-tracking branch 'llvmlinux/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 03:39:49 +0000 (14:39 +1100)]
Stephen Rothwell [Thu, 11 Feb 2016 03:26:48 +0000 (14:26 +1100)]
Merge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Thu, 11 Feb 2016 03:24:39 +0000 (14:24 +1100)]
Merge remote-tracking branch 'gpio/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 03:23:11 +0000 (14:23 +1100)]
Merge remote-tracking branch 'remoteproc/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 03:21:07 +0000 (14:21 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 03:17:38 +0000 (14:17 +1100)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 03:15:35 +0000 (14:15 +1100)]
Merge remote-tracking branch 'extcon/extcon-next'
Stephen Rothwell [Thu, 11 Feb 2016 03:13:28 +0000 (14:13 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Thu, 11 Feb 2016 03:06:14 +0000 (14:06 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Thu, 11 Feb 2016 03:04:48 +0000 (14:04 +1100)]
Merge remote-tracking branch 'usb-chipidea-next/ci-for-usb-next'
Stephen Rothwell [Thu, 11 Feb 2016 02:54:40 +0000 (13:54 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Thu, 11 Feb 2016 02:43:47 +0000 (13:43 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Thu, 11 Feb 2016 02:40:39 +0000 (13:40 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Thu, 11 Feb 2016 02:39:15 +0000 (13:39 +1100)]
Merge remote-tracking branch 'ipmi/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 02:36:28 +0000 (13:36 +1100)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 02:35:03 +0000 (13:35 +1100)]
Merge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 02:32:39 +0000 (13:32 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 02:31:15 +0000 (13:31 +1100)]
Merge remote-tracking branch 'drivers-x86/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 02:29:38 +0000 (13:29 +1100)]
Merge remote-tracking branch 'kvms390/next'
Stephen Rothwell [Thu, 11 Feb 2016 02:28:08 +0000 (13:28 +1100)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Thu, 11 Feb 2016 02:17:00 +0000 (13:17 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Thu, 11 Feb 2016 02:16:54 +0000 (13:16 +1100)]
Merge remote-tracking branch 'irqchip/irqchip/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 02:15:29 +0000 (13:15 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 02:15:25 +0000 (13:15 +1100)]
Merge remote-tracking branch 'clockevents/clockevents/next'
Stephen Rothwell [Thu, 11 Feb 2016 02:04:12 +0000 (13:04 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Thu, 11 Feb 2016 02:01:43 +0000 (13:01 +1100)]
Merge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 02:00:18 +0000 (13:00 +1100)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 01:57:55 +0000 (12:57 +1100)]
Merge remote-tracking branch 'audit/next'
Stephen Rothwell [Thu, 11 Feb 2016 01:47:49 +0000 (12:47 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 01:46:25 +0000 (12:46 +1100)]
Merge remote-tracking branch 'jc_docs/docs-next'
Stephen Rothwell [Thu, 11 Feb 2016 01:44:21 +0000 (12:44 +1100)]
Merge remote-tracking branch 'dwmw2-iommu/master'
Stephen Rothwell [Thu, 11 Feb 2016 01:42:57 +0000 (12:42 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Thu, 11 Feb 2016 01:40:50 +0000 (12:40 +1100)]
Merge remote-tracking branch 'selinux/next'
Stephen Rothwell [Thu, 11 Feb 2016 01:38:46 +0000 (12:38 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 01:36:38 +0000 (12:36 +1100)]
Merge remote-tracking branch 'mfd/for-mfd-next'
Stephen Rothwell [Thu, 11 Feb 2016 01:34:22 +0000 (12:34 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 11 Feb 2016 01:32:17 +0000 (12:32 +1100)]
Merge remote-tracking branch 'mmc-uh/next'
Stephen Rothwell [Thu, 11 Feb 2016 01:30:10 +0000 (12:30 +1100)]
Merge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 01:27:35 +0000 (12:27 +1100)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 01:26:09 +0000 (12:26 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 11 Feb 2016 01:24:21 +0000 (12:24 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 01:22:57 +0000 (12:22 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 01:21:32 +0000 (12:21 +1100)]
Merge remote-tracking branch 'hdlcd/for-upstream/hdlcd'
Stephen Rothwell [Thu, 11 Feb 2016 01:18:49 +0000 (12:18 +1100)]
Merge remote-tracking branch 'drm-misc/topic/drm-misc'
Stephen Rothwell [Thu, 11 Feb 2016 01:17:24 +0000 (12:17 +1100)]
Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 01:15:05 +0000 (12:15 +1100)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Thu, 11 Feb 2016 01:15:01 +0000 (12:15 +1100)]
Merge remote-tracking branch 'drm-panel/drm/panel/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 01:12:31 +0000 (12:12 +1100)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Thu, 11 Feb 2016 01:09:36 +0000 (12:09 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 11 Feb 2016 01:07:33 +0000 (12:07 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 11 Feb 2016 01:04:35 +0000 (12:04 +1100)]
Merge remote-tracking branch 'mac80211-next/master'
Stephen Rothwell [Thu, 11 Feb 2016 01:03:08 +0000 (12:03 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 11 Feb 2016 01:01:31 +0000 (12:01 +1100)]
Merge remote-tracking branch 'wireless-drivers-next/master'
Stephen Rothwell [Thu, 11 Feb 2016 01:00:06 +0000 (12:00 +1100)]
Merge remote-tracking branch 'ipvs-next/master'
Stephen Rothwell [Thu, 11 Feb 2016 00:54:03 +0000 (11:54 +1100)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Thu, 11 Feb 2016 00:43:06 +0000 (11:43 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 11 Feb 2016 00:41:02 +0000 (11:41 +1100)]
Merge remote-tracking branch 'thermal-soc/next'
Stephen Rothwell [Thu, 11 Feb 2016 00:38:49 +0000 (11:38 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Thu, 11 Feb 2016 00:37:24 +0000 (11:37 +1100)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 00:35:21 +0000 (11:35 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 00:32:43 +0000 (11:32 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Thu, 11 Feb 2016 00:31:18 +0000 (11:31 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 11 Feb 2016 00:31:14 +0000 (11:31 +1100)]
Merge branch 'dmi/master'
Stephen Rothwell [Thu, 11 Feb 2016 00:29:51 +0000 (11:29 +1100)]
Merge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Thu, 11 Feb 2016 00:28:20 +0000 (11:28 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 00:23:43 +0000 (11:23 +1100)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Thu, 11 Feb 2016 00:23:30 +0000 (11:23 +1100)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 00:14:08 +0000 (11:14 +1100)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 00:12:33 +0000 (11:12 +1100)]
Merge remote-tracking branch 'orangefs/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 00:11:05 +0000 (11:11 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Thu, 11 Feb 2016 00:08:57 +0000 (11:08 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Thu, 11 Feb 2016 00:07:30 +0000 (11:07 +1100)]
Merge remote-tracking branch 'gfs2/for-next'
Stephen Rothwell [Thu, 11 Feb 2016 00:07:15 +0000 (11:07 +1100)]
Merge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Thu, 11 Feb 2016 00:05:51 +0000 (11:05 +1100)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Thu, 11 Feb 2016 00:04:19 +0000 (11:04 +1100)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 10 Feb 2016 23:54:16 +0000 (10:54 +1100)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Wed, 10 Feb 2016 23:52:47 +0000 (10:52 +1100)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Wed, 10 Feb 2016 23:52:42 +0000 (10:52 +1100)]
Merge remote-tracking branch 'ceph/master'
Stephen Rothwell [Wed, 10 Feb 2016 23:51:14 +0000 (10:51 +1100)]
Merge remote-tracking branch 'btrfs-kdave/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 23:49:44 +0000 (10:49 +1100)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Wed, 10 Feb 2016 23:48:18 +0000 (10:48 +1100)]
Merge remote-tracking branch 'uml/linux-next'
Stephen Rothwell [Wed, 10 Feb 2016 23:46:54 +0000 (10:46 +1100)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Wed, 10 Feb 2016 23:45:28 +0000 (10:45 +1100)]
Merge remote-tracking branch 's390/features'