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
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
ARM: SoC fixes for 3.4-rc2
2012-04-05 22:13:39 -07:00
parisc: move definition of PAGE0 to asm/page.h
2012-05-10 15:12:08 -07:00
video: support DP controller driver
2012-02-13 03:02:30 +00:00
module_param: make bool parameters really bool (drivers/video/i810)
2012-01-12 23:28:59 +00:00
fbdev fixes for 3.3
2012-02-07 15:54:02 -08:00
kyrofb: fix on x86_64
2012-04-08 14:27:08 +00:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
fbdev: matroxfb: Fix compilation after fb_var_screeninfo change
2011-12-21 02:26:11 +00:00
video: Add module.h to drivers/video files who really use it.
2011-10-31 19:31:33 -04:00
video: convert mbxfb to use module_platform_driver()
2011-12-19 20:21:43 +00:00
video: msm: Fix section mismatches in mddi.c
2012-04-13 10:23:17 -07:00
drivers/video/nvidia/nvidia.c: fix warning
2012-01-12 20:13:03 -08:00
ARM: board specific updates
2012-03-27 16:27:28 -07:00
OMAPDSS: DSI: implement generic DSI pin config
2012-05-09 10:53:05 +03:00
video: pnx4008: convert drivers/video/pnx4008/* to use module_platform_driver()
2011-12-19 20:21:43 +00:00
riva/fbdev: fix several -Wuninitialized
2012-02-13 02:59:14 +00:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
sisfb: use display information in info not in var for panning
2011-08-19 10:34:52 +02:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 into fbdev-next
2012-03-13 23:19:58 +00:00
68328fb: use display information in info not in var for panning
2011-08-19 10:28:58 +02:00
acornfb: use display information in info not in var for panning
2011-08-19 10:29:34 +02:00
fbdev: amba: Enable module alias autogeneration for AMBA drivers
2011-11-22 10:58:33 +00:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
arkfb: use display information in info not in var for panning
2011-08-19 10:29:44 +02:00
atmel_lcdfb: support 16bit BGR:565 mode, remove unsupported 15bit modes
2012-01-28 19:54:10 +00: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
fb: fix au1100fb bitrot.
2011-10-03 15:52:38 +00:00
fbdev: fix au1*fb builds
2012-04-08 14:27:09 +00:00
video: use gpio_request_one
2012-01-28 20:50:11 +00:00
video: use gpio_request_one
2012-01-28 20:50:11 +00:00
blackfin: fix compile error in bfin-lq035q1-fb.c
2012-04-26 14:46:51 -04:00
treewide: Fix comment and string typo 'bufer'
2011-12-06 09:53:40 +01:00
fbdev: bfin_adv7393fb: Drop needless include
2012-03-21 10:27:37 +00:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
video: Add module.h to drivers/video files who really use it.
2011-10-31 19:31:33 -04:00
Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6
2012-01-14 15:11:19 -08:00
ARM: clps711x: Using a single definition for the PHYS and VIRT registers offset
2012-05-11 16:18:01 +02:00
video: Add module.h to drivers/video files who really use it.
2011-10-31 19:31:33 -04:00
Drivers: video: controlfb: fixed a brace coding style issue
2011-11-22 01:00:16 +00:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
fbdev: da8xx: add support for SP10Q010 display
2012-03-19 22:59:47 +00:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
vga: fix build when fbdev is a module
2012-04-24 09:50:21 +01:00
ep93xx: Use ioremap for backlight driver
2012-03-14 11:41:10 +11:00
fbdev: unicore32: use display information in info not in var for panning
2011-08-19 10:31:01 +02:00
video: Add module.h to drivers/video files who really use it.
2011-10-31 19:31:33 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x into fbdev-next
2011-08-29 09:14:30 +00:00
video: Add export.h for THIS_MODULE/EXPORT_SYMBOL to drivers/video
2011-10-31 19:31:33 -04:00
udlfb: remove sysfs framebuffer device with USB .disconnect()
2012-03-15 13:35:22 +00:00
fbdev: fix parsing of standard timings
2011-09-01 00:31:05 +00:00
fb: avoid possible deadlock caused by fb_set_suspend
2011-09-02 17:58:29 +00:00
drivers/video: compile fixes for fsl-diu-fb.c
2012-01-28 19:35:24 +00:00
g364fb: use display information in info not in var for panning
2011-08-19 10:31:09 +02:00
grvga: fix section mismatch warnings
2012-01-03 16:02:55 +00:00
gxt4500: use display information in info not in var for panning
2011-08-19 10:31:17 +02:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
Resurrect Intel740 driver: i740fb
2012-02-15 04:31:21 +00:00
i740fb: fix compile error when CONFIG_MTRR is not selected
2012-02-19 19:11:51 +00:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
imsttfb: use display information in info not in var for panning
2011-08-19 10:31:39 +02:00
video imxfb: do not depend on grouped clocks
2012-04-25 17:03:37 +02:00
ARM: global cleanups
2012-03-27 16:03:32 -07:00
macfb: fix black and white modes
2012-01-22 14:50:02 +01:00
Resurrect Intel740 driver: i740fb
2012-02-15 04:31:21 +00:00
fbdev: fix indentation in modedb.c
2011-09-14 16:40:52 +00:00
dmaengine/dma_slave: introduce inline wrappers
2012-03-21 19:20:22 +05:30
video: mxsfb: adopt pinctrl support
2012-05-12 09:43:19 +08:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
offb: Fix setting of the pseudo-palette for >8bpp
2012-01-03 12:09:25 +11:00
video: platinumfb: Add __devexit_p at necessary place
2011-10-15 00:19:58 +00:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
video: irq: Remove IRQF_DISABLED
2011-10-03 15:52:22 +00:00
drivers/video/pvr2fb.c: ensure arguments to request_irq and free_irq are compatible
2012-03-13 23:17:31 +00:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
drivers/video/pxa168fb.c: use devm_ functions
2012-02-24 00:49:59 +00:00
video: pxafb: add clk_prepare/clk_unprepare calls
2012-03-21 10:29:01 +00:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
video: s3c-fb: Add support EXYNOS5 FIMD
2012-03-06 11:57:14 +00:00
video: s3c2410: fix checkpatch error and warnings
2011-12-03 22:10:43 +00:00
s3fb: fix Virge/VX
2011-12-21 02:25:21 +00:00
FB: sa11x0: convert to use platform resource and ioremap()
2012-02-24 09:39:59 +00:00
FB: sa11x0: convert to use platform resource and ioremap()
2012-02-24 09:39:59 +00:00
Drivers: video: sbuslib: fixed a brace coding style issue
2011-11-22 01:00:24 +00:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
fbdev: sh_mipi_dsi: add extra phyctrl for sh_mipi_dsi_info
2012-03-21 07:24:01 +00:00
fbdev: sh_mobile_hdmi: Don't access LCDC fb_info
2012-03-12 22:40:54 +01:00
fbdev: sh_mobile_lcdc: Don't confuse line size with pitch
2012-05-21 20:59:32 -07:00
fbdev: sh_mobile_lcdc: Don't confuse line size with pitch
2012-05-21 20:59:32 -07:00
fbdev: sh_mobile_meram: Implement system suspend/resume
2012-03-12 22:41:14 +01:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
video: irq: Remove IRQF_DISABLED
2011-10-03 15:52:22 +00:00
tridentfb: use display information in info not in var for panning
2011-08-19 10:35:18 +02:00
USB: udlfb.c: remove err() usage
2012-04-25 12:37:49 -07:00
connector/userns: replace netlink uses of cap_raised() with capable()
2012-05-10 23:21:39 -04:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
vga16fb: use display information in info not in var for panning
2011-08-19 10:35:34 +02:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
vt8623fb: use display information in info not in var for panning
2011-08-19 10:36:20 +02:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
drivers/video/xen-fbfront.c: add missing cleanup code
2012-05-07 06:41:56 -04:00
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
2795343705