mirror of
https://github.com/torvalds/linux.git
synced 2024-12-29 14:21:47 +00:00
1bf25e78af
These are cleanups and smaller changes that either depend on earlier
feature branches or came in late during the development cycle.
We normally try to get all cleanups early, so these are the exceptions:
- A follow-up on the clocksource reworks, hopefully the last time
we need to merge clocksource subsystem changes through arm-soc.
A first set of patches was part of the original 3.10 arm-soc cleanup
series because of interdependencies with timer drivers now moved out
of arch/arm.
- Migrating the SPEAr13xx platform away from using auxdata for DMA
channel descriptions towards using information in device tree,
based on the earlier SPEAr multiplatform series
- A few follow-ups on the Atmel SAMA5 support and other changes
for Atmel at91 based on the larger at91 reworks.
- Moving the armada irqchip implementation to drivers/irqchip
- Several OMAP cleanups following up on the larger series already
merged in 3.10.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIVAwUAUYj5U2CrR//JCVInAQLNIRAAvsCtYOmXTxkRBxdtNEUUbkEjx71Se7q0
h9PR8vqlkbYwONkJ8a6j8pKq/WJDmLpHQWg/moBsvlGc6uEVBPBFhCWHs1+yGUzX
GhnJOaIKh3+651hIoXccS+/YZ16e1EAzdCM7+1QegPTldsRGkTOiwXgmR51kmPrz
6cZ8P5MFqMrWIy4XqWhOBbMDCY/An05IHMpniGIamUg2/uB921Z0wNFvDrnsg97u
DsVEwimyCJ0j7aO4TH+fkvsjoGWnIhxPtpaIm8iff6TPRI49deRb3zYpnIONm+oG
/cQrRf3BNW+aiTuRCTEjdBNGtcrYgN6CLWWjzgMhv1itSlX8swBcOhuNJRCGNQRI
v3wL4aEBxUpPGGL8erc2GIW7pe29YC2UEYI2z1X/5MEzYO589zkkG2k+/3HQVUwp
dnYpQxhjRMvh4mcodBJFRjzH1Z7agKUwtoKalAHRRH7r5gJDkpL3zLoMhYPTG5IZ
OwU+aYf+dDxh2kKW0zs8a/qL97UTHjlTRUC9LPoumvJ7LlKeDfzEn7DHUm2gggiu
dO9ye/NF/xEXoDXTl0Qp2wJ6/sbPSLyCYCIMdP/gJjWUiDDqqZ0VRaKL7vE/JWrd
NJ7k5yunX8/kRgfqgRFLDdFnPj1JeYHlmexsq4l9TPbPstoIcbw8u1v9sr8aZF+Z
agh9u4e7QU8=
=HWfp
-----END PGP SIGNATURE-----
Merge tag 'cleanup-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC late cleanups from Arnd Bergmann:
"These are cleanups and smaller changes that either depend on earlier
feature branches or came in late during the development cycle. We
normally try to get all cleanups early, so these are the exceptions:
- A follow-up on the clocksource reworks, hopefully the last time we
need to merge clocksource subsystem changes through arm-soc.
A first set of patches was part of the original 3.10 arm-soc
cleanup series because of interdependencies with timer drivers now
moved out of arch/arm.
- Migrating the SPEAr13xx platform away from using auxdata for DMA
channel descriptions towards using information in device tree,
based on the earlier SPEAr multiplatform series
- A few follow-ups on the Atmel SAMA5 support and other changes for
Atmel at91 based on the larger at91 reworks.
- Moving the armada irqchip implementation to drivers/irqchip
- Several OMAP cleanups following up on the larger series already
merged in 3.10."
* tag 'cleanup-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (50 commits)
ARM: OMAP4: change the device names in usb_bind_phy
ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a
ARM: SPEAr: conditionalize SMP code
ARM: arch_timer: Silence debug preempt warnings
ARM: OMAP: remove unused variable
serial: amba-pl011: fix !CONFIG_DMA_ENGINE case
ata: arasan: remove the need for platform_data
ARM: at91/sama5d34ek.dts: remove not needed compatibility string
ARM: at91: dts: add MCI DMA support
ARM: at91: dts: add i2c dma support
ARM: at91: dts: set #dma-cells to the correct value
ARM: at91: suspend both memory controllers on at91sam9263
irqchip: armada-370-xp: slightly cleanup irq controller driver
irqchip: armada-370-xp: move IRQ handler to avoid forward declaration
irqchip: move IRQ driver for Armada 370/XP
ARM: mvebu: move L2 cache initialization in init_early()
devtree: add binding documentation for sp804
ARM: integrator-cp: convert use CLKSRC_OF for timer init
ARM: versatile: use OF init for sp804 timer
ARM: versatile: add versatile dtbs to dtbs target
...
147 lines
3.2 KiB
Plaintext
147 lines
3.2 KiB
Plaintext
/*
|
|
* DTS file for all SPEAr1340 SoCs
|
|
*
|
|
* Copyright 2012 Viresh Kumar <viresh.linux@gmail.com>
|
|
*
|
|
* The code contained herein is licensed under the GNU General Public
|
|
* License. You may obtain a copy of the GNU General Public License
|
|
* Version 2 or later at the following locations:
|
|
*
|
|
* http://www.opensource.org/licenses/gpl-license.html
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
*/
|
|
|
|
/include/ "spear13xx.dtsi"
|
|
|
|
/ {
|
|
compatible = "st,spear1340";
|
|
|
|
ahb {
|
|
|
|
spics: spics@e0700000{
|
|
compatible = "st,spear-spics-gpio";
|
|
reg = <0xe0700000 0x1000>;
|
|
st-spics,peripcfg-reg = <0x42c>;
|
|
st-spics,sw-enable-bit = <21>;
|
|
st-spics,cs-value-bit = <20>;
|
|
st-spics,cs-enable-mask = <3>;
|
|
st-spics,cs-enable-shift = <18>;
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
status = "disabled";
|
|
};
|
|
|
|
ahci@b1000000 {
|
|
compatible = "snps,spear-ahci";
|
|
reg = <0xb1000000 0x10000>;
|
|
interrupts = <0 72 0x4>;
|
|
status = "disabled";
|
|
};
|
|
|
|
i2s-play@b2400000 {
|
|
compatible = "snps,designware-i2s";
|
|
reg = <0xb2400000 0x10000>;
|
|
interrupt-names = "play_irq";
|
|
interrupts = <0 98 0x4
|
|
0 99 0x4>;
|
|
play;
|
|
channel = <8>;
|
|
status = "disabled";
|
|
};
|
|
|
|
i2s-rec@b2000000 {
|
|
compatible = "snps,designware-i2s";
|
|
reg = <0xb2000000 0x10000>;
|
|
interrupt-names = "record_irq";
|
|
interrupts = <0 100 0x4
|
|
0 101 0x4>;
|
|
record;
|
|
channel = <8>;
|
|
status = "disabled";
|
|
};
|
|
|
|
pinmux: pinmux@e0700000 {
|
|
compatible = "st,spear1340-pinmux";
|
|
reg = <0xe0700000 0x1000>;
|
|
#gpio-range-cells = <3>;
|
|
};
|
|
|
|
pwm: pwm@e0180000 {
|
|
compatible ="st,spear13xx-pwm";
|
|
reg = <0xe0180000 0x1000>;
|
|
#pwm-cells = <2>;
|
|
status = "disabled";
|
|
};
|
|
|
|
spdif-in@d0100000 {
|
|
compatible = "st,spdif-in";
|
|
reg = < 0xd0100000 0x20000
|
|
0xd0110000 0x10000 >;
|
|
interrupts = <0 84 0x4>;
|
|
status = "disabled";
|
|
};
|
|
|
|
spdif-out@d0000000 {
|
|
compatible = "st,spdif-out";
|
|
reg = <0xd0000000 0x20000>;
|
|
interrupts = <0 85 0x4>;
|
|
status = "disabled";
|
|
};
|
|
|
|
spi1: spi@5d400000 {
|
|
compatible = "arm,pl022", "arm,primecell";
|
|
reg = <0x5d400000 0x1000>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
interrupts = <0 99 0x4>;
|
|
status = "disabled";
|
|
};
|
|
|
|
apb {
|
|
i2c1: i2c@b4000000 {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
compatible = "snps,designware-i2c";
|
|
reg = <0xb4000000 0x1000>;
|
|
interrupts = <0 104 0x4>;
|
|
write-16bit;
|
|
status = "disabled";
|
|
};
|
|
|
|
serial@b4100000 {
|
|
compatible = "arm,pl011", "arm,primecell";
|
|
reg = <0xb4100000 0x1000>;
|
|
interrupts = <0 105 0x4>;
|
|
status = "disabled";
|
|
dmas = <&dwdma0 0x600 0 0 1>, /* 0xC << 11 */
|
|
<&dwdma0 0x680 0 1 0>; /* 0xD << 7 */
|
|
dma-names = "tx", "rx";
|
|
};
|
|
|
|
thermal@e07008c4 {
|
|
st,thermal-flags = <0x2a00>;
|
|
};
|
|
|
|
gpiopinctrl: gpio@e2800000 {
|
|
compatible = "st,spear-plgpio";
|
|
reg = <0xe2800000 0x1000>;
|
|
interrupts = <0 107 0x4>;
|
|
#interrupt-cells = <1>;
|
|
interrupt-controller;
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
gpio-ranges = <&pinmux 0 0 252>;
|
|
status = "disabled";
|
|
|
|
st-plgpio,ngpio = <250>;
|
|
st-plgpio,wdata-reg = <0x40>;
|
|
st-plgpio,dir-reg = <0x00>;
|
|
st-plgpio,ie-reg = <0x80>;
|
|
st-plgpio,rdata-reg = <0x20>;
|
|
st-plgpio,mis-reg = <0xa0>;
|
|
st-plgpio,eit-reg = <0x60>;
|
|
};
|
|
};
|
|
};
|
|
};
|