forked from Minki/linux
aac59e3efc
New and updated SoC support. Among the things new for this release are:
- More support for the AM33xx platforms from TI
- Tegra 124 support, and some updates to older tegra families as well
- imx cleanups and updates across the board
- A rename of Broadcom's Mobile platforms which were introduced as ARCH_BCM,
and turned out to be too broad a name. New name is ARCH_BCM_MOBILE.
- A whole bunch of updates and fixes for integrator, making the platform code
more modern and switches over to DT-only booting.
- Support for two new Renesas shmobile chipsets. Next up for them is more work
on consolidation instead of introduction of new non-multiplatform SoCs, we're
all looking forward to that!
- Misc cleanups for older Samsung platforms, some Allwinner updates, etc.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJSgBrRAAoJEIwa5zzehBx3v+QP/1Z4DOzOckU7sb/IZZMXxVcS
C9G68x1n2lwqQwmMrjDAnFm+qKGDlb2SzHnUNiVy4niaGXdGSDtVzSEzK01LhUuz
BchWRy5Vb+pq0/bVLxtkqUPf0LEH/1as0uQVJNxwmV+SS9OvH+NpJHo2X6motYtX
W0l/NHwD/NYxwkjZTHUgZW9si1a8ZaG41i/h05IOpkww7RNcmtubWmQQIbKwmadc
z2QO3NsrcUvMgnoF9fOEJU2aurIx1s+6jpG6/fD1WWejCMuf0JulyfV7egREFgty
yp8QhnSTDaOvV0Gjrpx+4ERkwpVjvESpZIJoYHXjbScZHTCzkVDBLwwpmgYB1Mrb
KOKTt6+p8RAMFm43Rkf42SW8RXMM8nifed/H5Lwimi8qQT4+PuWM4i524P0Bb0Bj
tANHU2twUbY1VFRycGwWbTwPWtwxD4B0c6xflon84IGsZC31mvcfRcGaqaMtwTH4
J6CN0Bk3Tp0BUOveo0pdTPtrgOWm85MxWrzbjppKY7Lgl4A19iXqvSQjIt1sjJGz
5d8hH7KX26jKT24FiFp0fttOCRVVmg5Ks6sn2BTjX83w9S1pUg4yjZTU9cdbFbyN
zvi0d7YQYWOJTlSQlY5m5xqvRzeByAae4EDA6LKdh6JQsPyQEhHdxvMj7/ZURf8W
4jPMsgi+GxP8AGhpb20/
=WYJl
-----END PGP SIGNATURE-----
Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC platform changes from Olof Johansson:
"New and updated SoC support. Among the things new for this release
are:
- More support for the AM33xx platforms from TI
- Tegra 124 support, and some updates to older tegra families as well
- imx cleanups and updates across the board
- A rename of Broadcom's Mobile platforms which were introduced as
ARCH_BCM, and turned out to be too broad a name. New name is
ARCH_BCM_MOBILE.
- A whole bunch of updates and fixes for integrator, making the
platform code more modern and switches over to DT-only booting.
- Support for two new Renesas shmobile chipsets. Next up for them is
more work on consolidation instead of introduction of new
non-multiplatform SoCs, we're all looking forward to that!
- Misc cleanups for older Samsung platforms, some Allwinner updates,
etc"
* tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (159 commits)
ARM: bcm281xx: Add ARCH_BCM_MOBILE to bcm config
ARM: bcm_defconfig: Run "make savedefconfig"
ARM: bcm281xx: Add ARCH Timers to config
rename ARCH_BCM to ARCH_BCM_MOBILE (mach-bcm)
ARM: vexpress: Enable platform-specific options in defconfig
ARM: vexpress: Make defconfig work again
ARM: sunxi: remove .init_time hooks
ARM: imx: enable suspend for imx6sl
ARM: imx: ensure dsm_request signal is not asserted when setting LPM
ARM: imx6q: call WB and RBC configuration from imx6q_pm_enter()
ARM: imx6q: move low-power code out of clock driver
ARM: imx: drop extern with function prototypes in common.h
ARM: imx: reset core along with enable/disable operation
ARM: imx: do not return from imx_cpu_die() call
ARM: imx_v6_v7_defconfig: Select CONFIG_PROVE_LOCKING
ARM: imx_v6_v7_defconfig: Enable LEDS_GPIO related options
ARM: mxs_defconfig: Turn off CONFIG_DEBUG_GPIO
ARM: imx: replace imx6q_restart() with mxc_restart()
ARM: mach-imx: mm-imx5: Retrieve iomuxc base address from dt
ARM: mach-imx: mm-imx5: Retrieve tzic base address from dt
...
115 lines
2.2 KiB
Plaintext
115 lines
2.2 KiB
Plaintext
/*
|
|
* Device Tree for the ARM Integrator/CP platform
|
|
*/
|
|
|
|
/dts-v1/;
|
|
/include/ "integrator.dtsi"
|
|
|
|
/ {
|
|
model = "ARM Integrator/CP";
|
|
compatible = "arm,integrator-cp";
|
|
|
|
chosen {
|
|
bootargs = "root=/dev/ram0 console=ttyAMA0,38400n8 earlyprintk";
|
|
};
|
|
|
|
syscon {
|
|
compatible = "arm,integrator-cp-syscon";
|
|
reg = <0xcb000000 0x100>;
|
|
};
|
|
|
|
timer0: timer@13000000 {
|
|
/* TIMER0 runs @ 25MHz */
|
|
compatible = "arm,integrator-cp-timer";
|
|
status = "disabled";
|
|
};
|
|
|
|
timer1: timer@13000100 {
|
|
/* TIMER1 runs @ 1MHz */
|
|
compatible = "arm,integrator-cp-timer";
|
|
};
|
|
|
|
timer2: timer@13000200 {
|
|
/* TIMER2 runs @ 1MHz */
|
|
compatible = "arm,integrator-cp-timer";
|
|
};
|
|
|
|
pic: pic@14000000 {
|
|
valid-mask = <0x1fc003ff>;
|
|
};
|
|
|
|
cic: cic@10000040 {
|
|
compatible = "arm,versatile-fpga-irq";
|
|
#interrupt-cells = <1>;
|
|
interrupt-controller;
|
|
reg = <0x10000040 0x100>;
|
|
clear-mask = <0xffffffff>;
|
|
valid-mask = <0x00000007>;
|
|
};
|
|
|
|
sic: sic@ca000000 {
|
|
compatible = "arm,versatile-fpga-irq";
|
|
#interrupt-cells = <1>;
|
|
interrupt-controller;
|
|
reg = <0xca000000 0x100>;
|
|
clear-mask = <0x00000fff>;
|
|
valid-mask = <0x00000fff>;
|
|
};
|
|
|
|
ethernet@c8000000 {
|
|
compatible = "smsc,lan91c111";
|
|
reg = <0xc8000000 0x10>;
|
|
interrupt-parent = <&pic>;
|
|
interrupts = <27>;
|
|
};
|
|
|
|
fpga {
|
|
/*
|
|
* These PrimeCells are at the same location and using
|
|
* the same interrupts in all Integrators, but in the CP
|
|
* slightly newer versions are deployed.
|
|
*/
|
|
rtc@15000000 {
|
|
compatible = "arm,pl031", "arm,primecell";
|
|
};
|
|
|
|
uart@16000000 {
|
|
compatible = "arm,pl011", "arm,primecell";
|
|
};
|
|
|
|
uart@17000000 {
|
|
compatible = "arm,pl011", "arm,primecell";
|
|
};
|
|
|
|
kmi@18000000 {
|
|
compatible = "arm,pl050", "arm,primecell";
|
|
};
|
|
|
|
kmi@19000000 {
|
|
compatible = "arm,pl050", "arm,primecell";
|
|
};
|
|
|
|
/*
|
|
* These PrimeCells are only available on the Integrator/CP
|
|
*/
|
|
mmc@1c000000 {
|
|
compatible = "arm,pl180", "arm,primecell";
|
|
reg = <0x1c000000 0x1000>;
|
|
interrupts = <23 24>;
|
|
max-frequency = <515633>;
|
|
};
|
|
|
|
aaci@1d000000 {
|
|
compatible = "arm,pl041", "arm,primecell";
|
|
reg = <0x1d000000 0x1000>;
|
|
interrupts = <25>;
|
|
};
|
|
|
|
clcd@c0000000 {
|
|
compatible = "arm,pl110", "arm,primecell";
|
|
reg = <0xC0000000 0x1000>;
|
|
interrupts = <22>;
|
|
};
|
|
};
|
|
};
|