diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 14:34:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 14:34:32 -0400 |
| commit | 10c8e0562057b5d64ea170feab148e1550420030 (patch) | |
| tree | cfd387208c85e893c93d24e324d147eb6e9abfc9 /arch/arm/mach-at91/at91sam9g45.c | |
| parent | d4e1f5a14e17d4f0e8034c0967511884bcb12fba (diff) | |
| parent | 3e528cb7bae00ba0d73def6645d0f2fa906ee3e8 (diff) | |
Merge tag 'drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC driver changes from Olof Johansson:
"A handful of driver-related changes. We've had a bunch of them going
in through other branches as well, so it's only a part of what we
really have this release.
Larger pieces are:
- Removal of a now unused PWM driver for atmel
[ This includes AVR32 changes that have been appropriately acked ]
- Performance counter support for the arm CCN interconnect
- OMAP mailbox driver cleanups and consolidation
- PCI and SATA PHY drivers for SPEAr 13xx platforms
- Redefinition (with backwards compatibility!) of PCI DT bindings for
Tegra to better model regulators/power"
Note: this merge also fixes up the semantic conflict with the new
calling convention for devm_phy_create(), see commit f0ed817638b5 ("phy:
core: Let node ptr of PHY point to PHY and not of PHY provider") that
came in through Greg's USB tree.
Semantic merge patch by Stephen Rothwell <sfr@canb.auug.org.au> through
the next tree.
* tag 'drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (38 commits)
bus: arm-ccn: Fix error handling at event allocation
mailbox/omap: add a parent structure for every IP instance
mailbox/omap: remove the private mailbox structure
mailbox/omap: consolidate OMAP mailbox driver
mailbox/omap: simplify the fifo assignment by using macros
mailbox/omap: remove omap_mbox_type_t from mailbox ops
mailbox/omap: remove OMAP1 mailbox driver
mailbox/omap: use devm_* interfaces
bus: ARM CCN: add PERF_EVENTS dependency
bus: ARM CCN PMU driver
PCI: spear: Remove spear13xx_pcie_remove()
PCI: spear: Fix Section mismatch compilation warning for probe()
ARM: tegra: Remove legacy PCIe power supply properties
PCI: tegra: Remove deprecated power supply properties
PCI: tegra: Implement accurate power supply scheme
ARM: SPEAr13xx: Update defconfigs
ARM: SPEAr13xx: Add pcie and miphy DT nodes
ARM: SPEAr13xx: Add bindings and dt node for misc block
ARM: SPEAr13xx: Fix static mapping table
phy: Add drivers for PCIe and SATA phy on SPEAr13xx
...
Diffstat (limited to 'arch/arm/mach-at91/at91sam9g45.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9g45.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c index 0d5d85797cd6..9d45496e4932 100644 --- a/arch/arm/mach-at91/at91sam9g45.c +++ b/arch/arm/mach-at91/at91sam9g45.c | |||
| @@ -252,6 +252,7 @@ static struct clk_lookup periph_clocks_lookups[] = { | |||
| 252 | CLKDEV_CON_DEV_ID(NULL, "atmel_sha", &aestdessha_clk), | 252 | CLKDEV_CON_DEV_ID(NULL, "atmel_sha", &aestdessha_clk), |
| 253 | CLKDEV_CON_DEV_ID(NULL, "atmel_tdes", &aestdessha_clk), | 253 | CLKDEV_CON_DEV_ID(NULL, "atmel_tdes", &aestdessha_clk), |
| 254 | CLKDEV_CON_DEV_ID(NULL, "atmel_aes", &aestdessha_clk), | 254 | CLKDEV_CON_DEV_ID(NULL, "atmel_aes", &aestdessha_clk), |
| 255 | CLKDEV_CON_DEV_ID(NULL, "at91sam9rl-pwm", &pwm_clk), | ||
| 255 | /* more usart lookup table for DT entries */ | 256 | /* more usart lookup table for DT entries */ |
| 256 | CLKDEV_CON_DEV_ID("usart", "ffffee00.serial", &mck), | 257 | CLKDEV_CON_DEV_ID("usart", "ffffee00.serial", &mck), |
| 257 | CLKDEV_CON_DEV_ID("usart", "fff8c000.serial", &usart0_clk), | 258 | CLKDEV_CON_DEV_ID("usart", "fff8c000.serial", &usart0_clk), |