Linus Torvalds
2795343705
arm-soc: clock driver changes ...
The new clock subsystem was merged in linux-3.4 without any users, this
now moves the first three platforms over to it: imx, mxs and spear.
The series also contains the changes for the clock subsystem itself,
since Mike preferred to have it together with the platforms that require
these changes, in order to avoid interdependencies and conflicts.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJPuexPAAoJEIwa5zzehBx3YBsP/0nFhXjb5t1PdLfFzGKtcZVB
j4zXWXMHQ1fA7wIfEpZF3Nnco6MQkufF5wJPoPdn1+wmkzCn3D6IwNVWVtW4U5i9
VGyShSbgusAAYXUe/9yYj8eN+bbRQSvdN4eWYWU6+rRXShGZ5dZZmp+IPNl54dnW
6F8uCnHX0cnIMCpGqV+41zZgZ/4wL2k9gdqu0LO6pi07o4tGd0Z4gcySgUFAnn1R
kofNHueYIP4UgOg8DREoBzVKlpRqMou3S2kSZUfMeb3Q9ryF7UIvaGqIILyi7PKL
kWd3nptg0EPavfL21SwXHiGpnDpB/Gj/F70kcPLus5RYujB24C9bvBmc26z68NZx
Sz9mbElkkIU5duZsl1nxBWJ8IZ/tSWdtmC2xQMznmV7gHyGgVwr4j47f4Uv5sBvM
14JHDO7mqN6E6FnTFZu/oPAN5pDjgL+TVNK5BU6Wkq0zitrA6eyKDqCvBCqkO6Nn
tNzOuyRDzMOwM7HzqXhxqtzJWXylO1Mldc4bM8X4Cocf4pnLna/X6uP6dgE6A+JY
azVYx4I/0NdEPerDTzIcEhBDgZeBVROhUQr+kHxc4rf6WzUUbu/wEo1UKXWV66oW
1jb1yAFFWqYjkQuQc2PD4JSx35sFJaoSaoneRtmzBzRDfzSr5KjKj1E0e1skyMFq
7ZVLCqZD0cB9DhmMDkWP
=rwFF
-----END PGP SIGNATURE-----
Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull arm-soc clock driver changes from Olof Johansson:
"The new clock subsystem was merged in linux-3.4 without any users,
this now moves the first three platforms over to it: imx, mxs and
spear.
The series also contains the changes for the clock subsystem itself,
since Mike preferred to have it together with the platforms that
require these changes, in order to avoid interdependencies and
conflicts."
Fix up trivial conflicts in arch/arm/mach-kirkwood/common.c (code
removed in one branch, added OF support in another) and
drivers/dma/imx-sdma.c (independent changes next to each other).
* tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (97 commits)
clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate().
clk: Provide dummy clk_unregister()
SPEAr: Update defconfigs
SPEAr: Add SMI NOR partition info in dts files
SPEAr: Switch to common clock framework
SPEAr: Call clk_prepare() before calling clk_enable
SPEAr: clk: Add General Purpose Timer Synthesizer clock
SPEAr: clk: Add Fractional Synthesizer clock
SPEAr: clk: Add Auxiliary Synthesizer clock
SPEAr: clk: Add VCO-PLL Synthesizer clock
SPEAr: Add DT bindings for SPEAr's timer
ARM i.MX: remove now unused clock files
ARM: i.MX6: implement clocks using common clock framework
ARM i.MX35: implement clocks using common clock framework
ARM i.MX5: implement clocks using common clock framework
ARM: Kirkwood: Replace clock gating
ARM: Orion: Audio: Add clk/clkdev support
ARM: Orion: PCIE: Add support for clk
ARM: Orion: XOR: Add support for clk
ARM: Orion: CESA: Add support for clk
...
2012-05-26 12:42:29 -07:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-05-25 09:31:59 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-24 11:54:29 -07:00
[media] DVB: remove "stats" property bits from ATSC-MH API property additions
2012-05-20 10:06:08 -03:00
Extcon: support generic GPIO extcon driver
2012-04-20 09:22:02 -07:00
HSI: hsi: Rework hsi_event interface
2012-04-23 14:23:32 +03:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-05-24 10:34:29 -07:00
iio: Add dev_to_iio_dev() helper function
2012-05-14 13:34:31 -07:00
Input: matrix-keymap - wire up device tree support
2012-05-10 22:39:43 -07:00
GPIO driver changes for v3.5 merge window
2012-05-24 14:01:46 -07:00
InfiniBand/RDMA changes for the 3.5 merge window:
2012-05-21 17:54:55 -07:00
mmc: dw_mmc: make multiple instances of dw_mci_card_workqueue
2012-05-09 10:14:10 -04:00
UBI: modify ubi_wl_flush function to clear work queue for a lnum
2012-05-21 11:34:41 +03:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-16 22:17:37 -04:00
netfilter: remove ip_queue support
2012-05-08 20:25:42 +02:00
netfilter: ip6_tables: add flags parameter to ipv6_find_hdr()
2012-05-09 12:53:47 +02:00
NFC: HCI based pn544 driver
2012-05-15 17:30:30 -04:00
nfsd: include cld.h in the headers_install target
2012-04-16 15:19:12 -04:00
ux500 GPIO and pinctrl changes for kernel 3.5
2012-05-12 19:57:34 -07:00
hwmon updates for 3.5-rc1
2012-05-23 14:15:09 -07:00
lib/raid6: Add SSSE3 optimized recovery functions
2012-05-22 13:54:18 +10:00
regulator: tps62360: support force PWM mode via regulator mode
2012-05-14 18:03:04 +01:00
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
bcma/ssb: parse new attributes from sprom
2012-05-16 12:45:22 -04:00
USB 3.5-rc1 pull request
2012-05-22 15:50:46 -07:00
alarmtimer: Provide accessor to alarmtimer rtc device
2012-04-20 14:56:36 -07:00
atm: remove the coupling to token ring support
2012-05-15 20:14:35 -04:00
gpio/generic: initialize basic_mmio_gpio shadow variables properly
2012-05-19 12:17:35 -06:00
Fix blkdev.h build errors when BLOCK=n
2012-05-14 08:29:23 +02:00
mm: add a low limit to alloc_large_system_hash
2012-05-24 00:28:21 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-05-23 17:42:39 -07:00
clk: add a fixed factor clock
2012-05-08 14:13:25 -07:00
clk: Provide dummy clk_unregister()
2012-05-15 12:02:39 -07:00
Merge branch 'depends/rmk/clkdev' into next/clock
2012-05-11 17:13:00 +02:00
CLKDEV: provide helpers for common clock framework
2012-05-02 09:30:32 +01:00
sched: Remove stale power aware scheduling remnants and dysfunctional knobs
2012-05-17 13:48:56 +02:00
userns: Convert in_group_p and in_egroup_p to use kgid_t
2012-05-03 03:29:33 -07:00
x86/olpc/xo1/sci: Report RTC wakeup events
2012-05-07 15:02:26 +02:00
vfs: make it possible to access the dentry hash/len as one 64-bit entry
2012-05-10 19:54:35 -07:00
debugfs: Add support to print u32 array in debugfs
2012-04-17 00:18:36 -04:00
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-05-25 09:18:59 -07:00
dlm: fixes for nodir mode
2012-05-02 14:15:27 -05:00
dma-buf: minor documentation fixes.
2012-05-25 12:46:23 +05:30
drivers: add Contiguous Memory Allocator
2012-05-21 15:09:37 +02:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-05-25 09:31:59 -07:00
x86, iommu/vt-d: Clean up interfaces for interrupt remapping
2012-05-07 14:35:00 +02:00
dynamic_debug: use printk(KERN_WARNING..) in stub function
2012-05-01 08:58:06 -04:00
efi: Add new variable attributes
2012-04-30 15:30:18 -07:00
etherdevice: fix comments
2012-05-17 15:36:35 -04:00
linux/ethtool: Added macro ETH_FW_DUMP_DISABLE
2012-05-15 13:13:33 -04:00
epoll: Add a flag, EPOLLWAKEUP, to prevent suspend while epoll events are ready
2012-05-05 21:50:41 +02:00
extcon: Add EXTCON_MECHANICAL cable type for physical presence
2012-05-04 16:25:29 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-05-21 20:27:36 -07:00
IEEE 1394 (FireWire) subsystem updates post v3.4:
2012-05-24 12:57:47 -07:00
[media] Input: move drivers/input/fixp-arith.h to include/linux
2012-05-14 09:47:23 -03:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-05-23 17:42:39 -07:00
fsl/usb: Add controller version based ULPI and UTMI phy support
2012-04-18 13:46:42 -07:00
ftrace/x86: Have x86 ftrace use the ftrace_modify_all_code()
2012-05-16 20:00:27 -04:00
tracing: Do not enable function event with enable
2012-05-10 15:55:43 -04:00
block: fix buffer overflow when printing partition UUIDs
2012-05-15 08:22:04 +02:00
mm: page_isolation: MIGRATE_CMA isolation functions added
2012-05-21 15:09:33 +02:00
ARM: pxa: fix gpio wakeup setting
2012-04-27 10:46:45 +08:00
gpiolib: Implement devm_gpio_request_one()
2012-05-18 16:48:35 -06:00
Merge branch 'upstream' into for-linus
2012-05-22 11:32:31 +02:00
HID: fix return value of hidraw_report_event() when !CONFIG_HIDRAW
2012-04-30 10:39:17 +02:00
mm: add new arch_make_huge_pte() method for tile support
2012-05-25 12:48:26 -04:00
Driver core pull for 3.5-rc1
2012-05-22 16:02:13 -07:00
i2c: Add device tree support to i2c-pnx.c
2012-04-22 11:59:47 +02:00
MCA: delete all remaining traces of microchannel bus support.
2012-05-17 19:06:13 -04:00
if: restore token ring ARP type to header
2012-05-22 17:13:11 -04:00
net/l2tp: add support for L2TP over IPv6 UDP
2012-04-28 22:21:51 -04:00
pppox: Replace __attribute__((packed)) in if_pppox.h
2012-05-01 09:30:55 -04:00
team: allow to enable/disable ports
2012-04-21 16:26:33 -04:00
ipv6: correct the ipv6 option name - Pad0 to Pad1
2012-05-17 15:49:51 -04:00
genirq: Streamline irq_action
2012-04-19 13:56:55 +02:00
resources: add resource_overlaps()
2012-05-07 10:58:57 -06:00
ipvs: always update some of the flags bits in backup
2012-05-08 19:38:31 +02:00
ipx: restore token ring define to include/linux/ipx.h
2012-05-23 13:49:23 -04:00
irq: Remove irq_chip->release()
2012-05-21 21:09:38 +02:00
irqdomain: Kill off duplicate definitions.
2012-05-19 12:41:56 -06:00
jbd: Write journal superblock with WRITE_FUA after checkpointing
2012-05-15 23:34:37 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-24 11:54:29 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
2012-05-24 15:10:28 -07:00
KEYS: Don't check for NULL key pointer in key_validate()
2012-05-16 00:54:33 +10:00
KEYS: Add invalidation support
2012-05-11 10:56:56 +01:00
Revert "driver core: check start node in klist_iter_init_node"
2012-04-19 19:17:30 -07:00
KVM: s390: add capability indicating COW support
2012-05-17 21:06:01 -03:00
KVM: MMU: Don't use RCU for lockless shadow walking
2012-05-16 16:08:28 -03:00
l2tp: introduce L2TPv3 IP encapsulation support for IPv6
2012-05-01 09:30:55 -04:00
libata: add a host flag to ignore detected ATA devices
2012-05-07 15:32:23 -04:00
lockdep: fix oops in processing workqueue
2012-05-15 08:08:31 -07:00
netdev/of/phy: Add MDIO bus multiplexer support.
2012-05-07 22:58:09 -04:00
mei: export mei.h for the user space
2012-05-09 13:58:06 -07:00
phy/micrel: Fix ID of KSZ9021
2012-05-22 15:20:28 -04:00
mISDN: Implement MISDN_CTRL_RX_OFF for more drivers
2012-05-16 15:24:36 -04:00
mISDN: Allow to set a minimum length for transparent data
2012-05-16 15:23:46 -04:00
vm: remove 'nr_accounted' calculations from the unmap_vmas() interfaces
2012-05-06 14:05:17 -07:00
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-05-25 09:18:59 -07:00
HID: Allow bus wildcard matching
2012-05-01 12:54:54 +02:00
params: add 3rd arg to option handler callback signature
2012-04-30 14:05:27 -04:00
ARM: Orion: Eth: Add clk/clkdev support.
2012-05-08 16:33:56 -07:00
net: Add net_ratelimited_function and net_<level>_ratelimited macros
2012-05-15 13:45:02 -04:00
net: napi_frags_skb() is static
2012-05-19 02:51:00 -04:00
net: Delete all remaining instances of ctl_path
2012-04-20 21:22:30 -04:00
set fake_rtable's dst to NULL to avoid kernel Oops
2012-04-24 00:16:24 -04:00
netfilter: remove ip_queue support
2012-05-08 20:25:42 +02:00
NFSv4: Ensure we do not reuse open owner names
2012-04-20 23:14:28 -04:00
nl80211: prevent additions to old station flags API
2012-05-16 13:08:15 -04:00
mac802154: monitor device support
2012-05-16 15:17:08 -04:00
dt: add of_get_child_count helper function
2012-05-02 01:14:40 +02:00
gpio: Adjust of_xlate API to support multiple GPIO chips
2012-05-18 16:48:36 -06:00
of/irq: add empty irq_of_parse_and_map() for non-dt builds
2012-04-17 16:37:22 -06:00
netdev/of/phy: New function: of_mdio_find_bus().
2012-05-07 22:58:09 -04:00
tegra, serial8250: add ->handle_break() uart_port op
2012-04-18 15:07:53 -07:00
mm: page_isolation: MIGRATE_CMA isolation functions added
2012-05-21 15:09:33 +02:00
mm: fixup compilation error due to an asm write through a const pointer
2012-04-23 17:41:18 +01:00
PCI: add host bridge release support
2012-04-30 14:52:43 -06:00
percpu: remove percpu_xxx() functions
2012-05-14 14:15:32 -07:00
Revert "sched, perf: Use a single callback into the scheduler"
2012-05-23 17:40:51 +02:00
netdev/phy: Make get_phy_id() static and quit EXPORTing it.
2012-05-16 00:59:12 -04:00
userns: Convert proc to use kuid/kgid where appropriate
2012-05-15 14:59:28 -07:00
pipes: add a "packetized pipe" mode for writing
2012-04-29 13:12:42 -07:00
fq_codel: Fair Queue Codel AQM
2012-05-12 15:53:42 -04:00
PM / Runtime: Remove device fields related to suspend time, v2
2012-05-01 21:28:38 +02:00
PM / Domains: Make it possible to add devices to inactive domains
2012-05-18 20:45:26 +02:00
PM / Runtime: Remove device fields related to suspend time, v2
2012-05-01 21:28:38 +02:00
PM / Sleep: Add "prevent autosleep time" statistics to wakeup sources
2012-05-01 21:25:49 +02:00
kmsg: export printk records to the /dev/kmsg interface
2012-05-07 17:03:27 -07:00
userns: Convert proc to use kuid/kgid where appropriate
2012-05-15 14:59:28 -07:00
pstore/ram: Add ECC support
2012-05-17 08:51:59 -07:00
userns: Use uid_eq gid_eq helpers when comparing kuids and kgids in the vfs
2012-05-03 03:29:34 -07:00
lib: Change mail address of Oskar Schirmer
2012-05-17 15:18:37 +02:00
rcu: Replace list_first_entry_rcu() with list_first_or_null_rcu()
2012-04-24 20:54:49 -07:00
Merge branches 'barrier.2012.05.09a', 'fixes.2012.04.26a', 'inline.2012.05.02b' and 'srcu.2012.05.07b' into HEAD
2012-05-11 10:14:21 -07:00
rcu: Make exit_rcu() more precise and consolidate
2012-05-02 14:48:27 -07:00
Merge branches 'barrier.2012.05.09a', 'fixes.2012.04.26a', 'inline.2012.05.02b' and 'srcu.2012.05.07b' into HEAD
2012-05-11 10:14:21 -07:00
regmap: add support for non contiguous status to regmap-irq
2012-05-14 17:40:05 +01:00
res_counter: Merge res_counter_charge and res_counter_charge_nofail
2012-04-27 14:36:45 -07:00
ring-buffer: Add per_cpu ring buffer control files
2012-04-23 21:17:51 -04:00
usb/net: rndis: move bus message definition
2012-05-12 15:15:20 -04:00
Merge branch 'perf-uprobes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-05-24 11:39:34 -07:00
seccomp: ignore secure_computing return values
2012-04-18 12:24:50 +10:00
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
2012-05-22 11:21:06 +10:00
seqlock: add 'raw_seqcount_begin()' function
2012-05-04 15:13:54 -07:00
serial: delete the MCA specific 8250 support.
2012-05-17 19:02:14 -04:00
Merge branch 'delete-mca' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2012-05-23 17:12:06 -07:00
Merge 3.4-rc3 into tty-next
2012-04-18 15:57:31 -07:00
sh: intc: Kill off special reservation interface.
2012-05-22 19:07:55 +09:00
userns: Convert tmpfs to use kuid and kgid where appropriate
2012-05-15 14:59:29 -07:00
new helper: sigsuspend()
2012-05-21 23:52:30 -04:00
net: introduce skb_try_coalesce()
2012-05-19 18:34:57 -04:00
smp: Implement kick_all_cpus_sync()
2012-05-08 12:35:06 +02:00
net: sock_diag_handler structs can be const
2012-04-25 20:46:59 -04:00
rcu: Implement per-domain single-threaded call_srcu() state machine
2012-04-30 10:48:25 -07:00
userns: Convert stat to return values mapped from kuids and kgids
2012-05-15 14:08:35 -07:00
stmmac: add mixed burst for DMA
2012-05-14 18:53:19 -04:00
PM / Sleep: Add "prevent autosleep time" statistics to wakeup sources
2012-05-01 21:25:49 +02:00
sysfs: get rid of some lockdep false positives
2012-05-14 12:19:56 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
fork: Move thread info gfp flags to header
2012-05-08 13:55:20 +02:00
ARM: OMAP: WiLink platform data for the PandaBoard
2012-05-09 14:19:13 -07:00
time: remove obsolete declaration
2012-05-21 16:16:58 -07:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-05-22 18:27:32 -07:00
tty_lock: Localise the lock
2012-05-04 16:58:47 -07:00
tty: move global ldisc idle waitqueue to the individual ldisc
2012-05-10 11:24:03 -07:00
userns: Rework the user_namespace adding uid/gid mapping support
2012-04-26 02:01:39 -07:00
USB: Fix core compile with CONFIG_USB_SUSPEND=n
2012-05-21 09:00:03 -07:00
userns: Replace user_ns_map_uid and user_ns_map_gid with from_kuid and from_kgid
2012-05-03 03:28:39 -07:00
uuid: add uuid.h to exported header list
2012-05-09 13:57:30 -07:00
[media] v4l2-dv-timings.h: definitions for CEA-861 and VESA DMT timings
2012-05-20 08:27:44 -03:00
vga_switcheroo: Add the support for audio clients
2012-05-13 11:27:21 +02:00
vgaarb: Provide dummy default device functions
2012-05-03 09:30:55 +01:00
[media] V4L2: Mark the DV Preset API as deprecated
2012-05-20 08:31:52 -03:00
virtio: fix typo in comment
2012-05-22 12:16:16 +09:30
mm: fix up the vmscan stat in vmstat
2012-04-25 21:26:33 -07:00
Staging: VME: move VME drivers out of staging
2012-04-26 12:34:58 -07:00
vt: push the tty_lock down into the map handling
2012-04-24 16:14:14 -07:00
