mirror of
https://github.com/torvalds/linux.git
synced 2024-12-22 10:56:40 +00:00
2795343705
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 ...
94 lines
2.5 KiB
C
94 lines
2.5 KiB
C
/*
|
|
* arch/arm/mach-kirkwood/common.h
|
|
*
|
|
* Core functions for Marvell Kirkwood SoCs
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*/
|
|
|
|
#ifndef __ARCH_KIRKWOOD_COMMON_H
|
|
#define __ARCH_KIRKWOOD_COMMON_H
|
|
|
|
struct dsa_platform_data;
|
|
struct mv643xx_eth_platform_data;
|
|
struct mv_sata_platform_data;
|
|
struct mvsdio_platform_data;
|
|
struct mtd_partition;
|
|
struct mtd_info;
|
|
struct kirkwood_asoc_platform_data;
|
|
|
|
#define KW_PCIE0 (1 << 0)
|
|
#define KW_PCIE1 (1 << 1)
|
|
|
|
/*
|
|
* Basic Kirkwood init functions used early by machine-setup.
|
|
*/
|
|
void kirkwood_map_io(void);
|
|
void kirkwood_init(void);
|
|
void kirkwood_init_early(void);
|
|
void kirkwood_init_irq(void);
|
|
|
|
void kirkwood_setup_cpu_mbus(void);
|
|
|
|
void kirkwood_enable_pcie(void);
|
|
void kirkwood_pcie_id(u32 *dev, u32 *rev);
|
|
|
|
void kirkwood_ehci_init(void);
|
|
void kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data);
|
|
void kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data);
|
|
void kirkwood_ge00_switch_init(struct dsa_platform_data *d, int irq);
|
|
void kirkwood_pcie_init(unsigned int portmask);
|
|
void kirkwood_sata_init(struct mv_sata_platform_data *sata_data);
|
|
void kirkwood_sdio_init(struct mvsdio_platform_data *mvsdio_data);
|
|
void kirkwood_spi_init(void);
|
|
void kirkwood_i2c_init(void);
|
|
void kirkwood_uart0_init(void);
|
|
void kirkwood_uart1_init(void);
|
|
void kirkwood_nand_init(struct mtd_partition *parts, int nr_parts, int delay);
|
|
void kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts, int (*dev_ready)(struct mtd_info *));
|
|
void kirkwood_audio_init(void);
|
|
void kirkwood_restart(char, const char *);
|
|
void kirkwood_clk_init(void);
|
|
|
|
/* board init functions for boards not fully converted to fdt */
|
|
#ifdef CONFIG_MACH_DREAMPLUG_DT
|
|
void dreamplug_init(void);
|
|
#else
|
|
static inline void dreamplug_init(void) {};
|
|
#endif
|
|
|
|
#ifdef CONFIG_MACH_DLINK_KIRKWOOD_DT
|
|
void dnskw_init(void);
|
|
#else
|
|
static inline void dnskw_init(void) {};
|
|
#endif
|
|
|
|
#ifdef CONFIG_MACH_ICONNECT_DT
|
|
void iconnect_init(void);
|
|
#else
|
|
static inline void iconnect_init(void) {};
|
|
#endif
|
|
|
|
#ifdef CONFIG_MACH_IB62X0_DT
|
|
void ib62x0_init(void);
|
|
#else
|
|
static inline void ib62x0_init(void) {};
|
|
#endif
|
|
|
|
/* early init functions not converted to fdt yet */
|
|
char *kirkwood_id(void);
|
|
void kirkwood_l2_init(void);
|
|
void kirkwood_wdt_init(void);
|
|
void kirkwood_xor0_init(void);
|
|
void kirkwood_xor1_init(void);
|
|
void kirkwood_crypto_init(void);
|
|
|
|
extern int kirkwood_tclk;
|
|
extern struct sys_timer kirkwood_timer;
|
|
|
|
#define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x)
|
|
|
|
#endif
|