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 'for-next/dwc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
2011-12-12 15:19:53 -08:00
MIPS: Alchemy: Au1300 SoC support
2011-12-07 22:02:05 +00:00
usb/bcma: Add missing #include <linux/slab.h>
2012-04-23 13:22:00 -07:00
USB: ehci-atmel: add needed of.h header file
2012-04-04 18:35:43 +02:00
usb: Remove ehci_reset call from ehci_run
2011-12-08 09:38:53 -08:00
treewide: Convert uses of struct resource to resource_size(ptr)
2011-06-10 14:55:36 +02:00
EHCI: maintain the ehci->command value properly
2012-04-23 12:05:44 -07:00
USB: ehci-fsl: Use usb_put_transceiver instead of put_device
2012-05-14 08:49:50 -07:00
fsl/usb: Add controller version based ULPI and UTMI phy support
2012-04-18 13:46:42 -07:00
treewide: Convert uses of struct resource to resource_size(ptr)
2011-06-10 14:55:36 +02:00
Revert "USB: EHCI: work around bug in the Philips ISP1562 controller"
2012-05-21 08:54:43 -07:00
EHCI: maintain the ehci->command value properly
2012-04-23 12:05:44 -07:00
treewide: Convert uses of struct resource to resource_size(ptr)
2011-06-10 14:55:36 +02:00
USB: Mark EHCI LPM functions as __maybe_unused
2011-02-17 10:47:55 -08:00
USB: Add EHCI bus glue for Loongson1x SoCs (UPDATED)
2012-01-24 15:28:02 -08:00
usb: otg: Convert all users to pass struct usb_otg for OTG functions
2012-02-27 15:41:52 +02:00
usb: otg: Convert all users to pass struct usb_otg for OTG functions
2012-02-27 15:41:52 +02:00
USB ehci mxc: sanitize clock handling
2012-04-25 17:03:41 +02:00
usb: Remove ehci_reset call from ehci_run
2011-12-08 09:38:53 -08:00
ARM: OMAP: USB: fix warning on EHCI PHY reset path
2012-05-09 15:20:12 -07:00
ARM: Orion: EHCI: Add support for enabling clocks
2012-05-08 16:33:59 -07:00
Revert "USB: EHCI: work around bug in the Philips ISP1562 controller"
2012-05-21 08:54:43 -07:00
USB: ehci-platform: remove update_device
2012-05-18 16:37:55 -07:00
treewide: Convert uses of struct resource to resource_size(ptr)
2011-06-10 14:55:36 +02:00
treewide: Convert uses of struct resource to resource_size(ptr)
2011-06-10 14:55:36 +02:00
usb: PS3 EHCI HC reset work-around
2011-12-08 09:38:53 -08:00
USB: ehci-q.c: remove dbg() usage
2012-05-01 21:33:35 -07:00
USB: ehci-s5p: add clock gating to suspend/resume
2012-04-18 13:52:36 -07:00
USB: EHCI: improve full-speed isochronous scheduling routine
2012-05-14 12:50:22 -07:00
usb: host: mips: sead3: Fix for big endian.
2012-05-11 15:17:30 -07:00
usb: ehci-sh: Add PHY init function with platform data
2012-04-18 13:52:35 -07:00
USB: ehci: ohci: Add clk_{un}prepare() support
2012-04-18 14:33:43 -07:00
USB: EHCI: Allow users to override 80% max periodic bandwidth
2011-07-08 14:51:33 -07:00
arm-soc: driver specific updates
2012-05-26 12:22:27 -07:00
usb: Remove ehci_reset call from ehci_run
2011-12-08 09:38:53 -08:00
usb: Remove ehci_reset call from ehci_run
2011-12-08 09:38:53 -08:00
USB: EHCI: Don't use NO_IRQ in xilinx ehci driver
2012-01-16 08:23:15 +01:00
Merge 3.2-rc3 into usb-linus
2011-11-26 19:46:48 -08:00
Revert "USB: EHCI: work around bug in the Philips ISP1562 controller"
2012-05-21 08:54:43 -07:00
usb: convert drivers/usb/* to use module_platform_driver()
2011-11-28 06:48:32 +09:00
QE/FHCI: fixed the CONTROL bug
2011-10-18 13:51:34 -07:00
usb: Fix various typo within usb
2012-04-18 13:57:26 -07:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
fsl/usb: Add controller version based ULPI and UTMI phy support
2012-04-18 13:46:42 -07:00
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
2012-01-09 12:09:47 -08:00
usb: Fix typo in imx21-dbg.c
2012-02-13 14:32:34 -08:00
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
2012-01-09 12:09:47 -08:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
isp1760-hcd: fix possible memory leak if urb could not be enqueued
2012-04-18 13:51:19 -07:00
usb/isp1760: Allow to optionally trigger low-level chip reset via GPIOLIB.
2011-10-19 13:29:06 -07:00
isp1760-if: make module unloads correctly
2012-04-18 13:50:44 -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
USB: Add driver for the ssb bus
2012-04-18 13:43:30 -07:00
usb: Configure octeon2 glue logic for proper uSOF cycle period.
2011-05-03 10:09:32 -07:00
USB: ohci-at91: add a reset function to fix race condition
2012-05-09 15:22:27 -07:00
usb: [MIPS] fix unresolved err() reference in host/ohci-au1xxx.c
2012-05-01 18:36:09 -04:00
USB: ohci-cns3xxx.c: remove err() usage
2012-04-27 11:24:40 -07:00
ohci-da8xx: set MODULE_ALIAS to allow autoloading
2012-05-08 09:26:10 -07:00
USB: ohci-dbg.c: remove dbg() usage
2012-05-01 21:33:37 -07:00
USB: ohci-ep93xx.c: remove dbg() usage
2012-05-01 21:33:38 -07:00
USB: ohci-exynos.c: remove err() usage
2012-04-27 11:24:41 -07:00
USB: OHCI: remove old SSB OHCI driver
2012-04-18 13:43:30 -07:00
OHCI: remove uses of hcd->state
2011-11-18 10:51:00 -08:00
USB: ohci-nxp: Use isp1301 driver
2012-05-01 13:36:18 -04:00
USB: irq: Remove IRQF_DISABLED
2011-09-18 01:39:36 -07:00
USB 3.5-rc1 pull request
2012-05-22 15:50:46 -07:00
ARM: OMAP: USBHOST: Replace usbhs core driver APIs by Runtime pm APIs
2011-12-16 04:29:57 -07:00
usb: add support for STA2X11 host driver
2012-01-24 14:15:37 -08:00
usb: Fix various typo within usb
2012-04-18 13:57:26 -07:00
usb: [MIPS] fix unresolved err() reference in host/ohci-pnx8550.c
2012-05-01 18:36:09 -04:00
USB: ohci-ppc-of.c: remove err() usage
2012-04-27 11:24:42 -07:00
USB: ohci-ppc-soc.c: remove err() usage
2012-04-27 11:24:42 -07:00
USB: ohci-ps3.c: remove err() usage
2012-04-27 11:24:43 -07:00
usb: [ARM] fix unresolved err() reference in host/ohci-pxa27x.c
2012-05-01 18:36:09 -04:00
OHCI: remove uses of hcd->state
2011-11-18 10:51:00 -08:00
USB: ohci-s3c2410.c: remove err() usage
2012-04-27 11:24:43 -07:00
USB: ohci-sa1111.c: remove dbg() usage
2012-05-01 21:33:39 -07:00
USB: ohci-sh.c: remove err() usage
2012-04-27 11:24:44 -07:00
OHCI: remove uses of hcd->state
2011-11-18 10:51:00 -08:00
USB: ehci: ohci: Add clk_{un}prepare() support
2012-04-18 14:33:43 -07:00
USB: ohci-tmio.c: remove err() usage
2012-04-27 11:24:44 -07:00
USB: ohci-xls.c: remove err() usage
2012-04-27 11:24:45 -07:00
usb: otg: Rename otg_transceiver to usb_phy
2012-02-13 13:34:36 +02:00
USB: oxu210hp-hcd.c: remove dbg() usage
2012-05-01 21:33:43 -07:00
xhci: Add Lynx Point to list of Intel switchable hosts.
2012-05-03 13:18:40 -07:00
Intel xhci: Support EHCI/xHCI port switching.
2011-05-27 12:07:36 -07:00
Revert "usb: move struct usb_device->children to struct usb_hub_port->child"
2012-05-14 09:20:37 -07:00
usb: r8a66597-hcd: add function for external controller
2011-07-08 14:57:11 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
pcmcia: Convert pcmcia_device_id declarations to const
2011-05-06 07:46:22 +02:00
usb/ssb: Add missing #include <linux/slab.h>
2012-04-23 13:22:00 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
USB: UHCI: Add support for big endian descriptors
2011-05-19 16:43:20 -07:00
treewide: Convert uses of struct resource to resource_size(ptr)
2011-06-10 14:55:36 +02:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
USB: UHCI: Add support for big endian descriptors
2011-05-19 16:43:20 -07:00
UHCI: hub_status_data should indicate if ports are resuming
2012-04-09 15:43:21 -07:00
USB: UHCI: Move PCI specific functions to uhci-pci.c
2011-05-06 18:24:00 -07:00
usb: fix number of mapped SG DMA entries
2011-12-09 16:18:19 -08:00
xHCI: correct to print the true HSEE of USBCMD
2012-04-10 15:21:52 -07:00
xHCI: Correct the #define XHCI_LEGACY_DISABLE_SMI
2012-04-11 08:31:06 -07:00
xhci: Add roothub code to set U1/U2 timeouts.
2012-05-18 15:41:52 -07:00
xhci: Reserve one command for USB3 LPM disable.
2012-05-18 15:42:01 -07:00
xhci: Add Intel U1/U2 timeout policy.
2012-05-18 15:42:04 -07:00
usb: host: xhci: add platform driver support
2012-03-13 10:30:59 -07:00
xhci: Some Evaluate Context commands must succeed.
2012-05-18 15:42:00 -07:00
xhci: Fix DIV_ROUND_UP compile error.
2012-05-21 09:00:43 -07:00
xhci: Add Intel U1/U2 timeout policy.
2012-05-18 15:42:04 -07:00
2795343705