ARM Keystone DTS updates:

- Add SOC compatible along with EVMs for future board variations.
 	- Add SPI nodes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWE/13AAoJEHJsHOdBp5c/FmsQAICxZPCOWP6AzUfPanOkbWSZ
 TBgVotIQJU0wMBBkMXgjIci+Y7/ETQXqJJsxHAm9LkTxAYVq0K2+TNSrrVIORT94
 ScVNO2/J9nzOdu34d79KFZpeP1SNRIZlkMCqRz6WGCtxjX3HSoTLsUOOk9cz9xiy
 0Yb8NYVWsLpBx5aHBZtaTgUBL/C4TCi2qc7JXRWx8puoKkEK6wOiswSfHzR0RoCT
 TKmtzzh0sgC7ElpKdJ3GEWlwj7Tx61GDcfoYpJ8Tk8gG0Fq1EvYcg+UVdHOKZrCe
 KfTMKVE8X4hgZI3mKVvZUATICVjPILbPAP423DhWb5Sb45WSHWqDAOJVoyWkRaXf
 OFATBXm7YbD9tMCwJX3LAeweE3P3vGjFc4LYg5qp+WHBhaLNGAGU8nz4qTuGeRKi
 NVE/wW0hSt4B4xenYHJD7lBQwEjarON+BoObeqBNKBij2D5R5EdDD2pV+CQ9AdyM
 qWco6r8HNAUVaR6Qjd2rmRcmrVHtKxrPPb/IGJWsOH40DW+xNPxIGbDgkR4319SN
 nz4Z8+mICyqtaCU3bqFIXg2YfQB0bPP0aFWNp8LL8fJMhXrj7RB0GIqAAuNtDKt5
 c6IkJBuW2IEBFJxe9q27FT4oSfK3tXoXtZCTiHplDu3vMF02X53QMEufdAeK06MB
 FB4V7ek5+ynGvg+ZrWKb
 =2vau
 -----END PGP SIGNATURE-----

Merge tag 'keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt

Merge "ARM Keystone DTS updates" from Santosh Shilimkar:
	- Add SOC compatible along with EVMs for future board variations.
	- Add SPI nodes

* tag 'keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: dts: keystone: Update SoC specific compatible flags
  ARM: keystone: Update compatible to have SoC specific matches
  Documentation: dt: keystone: provide SoC specific compatible flags
  ARM: dts: keystone: Add ti,keystone-spi for SPI
This commit is contained in:
Arnd Bergmann 2015-10-08 17:30:23 +02:00
commit a3e2ed443d
9 changed files with 36 additions and 9 deletions

View File

@ -9,12 +9,26 @@ Required properties:
the form "ti,keystone-*". Generic devices like gic, arch_timers, ns16550
type UART should use the specified compatible for those devices.
SoC families:
- Keystone 2 generic SoC:
compatible = "ti,keystone"
SoCs:
- Keystone 2 Hawking/Kepler
compatible = ti,k2hk", "ti,keystone"
- Keystone 2 Lamarr
compatible = ti,k2l", "ti,keystone"
- Keystone 2 Edison
compatible = ti,k2e", "ti,keystone"
Boards:
- Keystone 2 Hawking/Kepler EVM
compatible = "ti,k2hk-evm","ti,keystone"
compatible = "ti,k2hk-evm", "ti,k2hk", "ti,keystone"
- Keystone 2 Lamarr EVM
compatible = "ti,k2l-evm","ti,keystone"
compatible = "ti,k2l-evm", "ti, k2l", "ti,keystone"
- Keystone 2 Edison EVM
compatible = "ti,k2e-evm","ti,keystone"
compatible = "ti,k2e-evm", "ti,k2e", "ti,keystone"

View File

@ -13,7 +13,7 @@
#include "k2e.dtsi"
/ {
compatible = "ti,k2e-evm","ti,keystone";
compatible = "ti,k2e-evm", "ti,k2e", "ti,keystone";
model = "Texas Instruments Keystone 2 Edison EVM";
soc {

View File

@ -9,6 +9,9 @@
*/
/ {
compatible = "ti,k2e", "ti,keystone";
model = "Texas Instruments Keystone 2 Edison SoC";
cpus {
#address-cells = <1>;
#size-cells = <0>;

View File

@ -13,7 +13,7 @@
#include "k2hk.dtsi"
/ {
compatible = "ti,k2hk-evm","ti,keystone";
compatible = "ti,k2hk-evm", "ti,k2hk", "ti,keystone";
model = "Texas Instruments Keystone 2 Kepler/Hawking EVM";
soc {

View File

@ -9,6 +9,9 @@
*/
/ {
compatible = "ti,k2hk", "ti,keystone";
model = "Texas Instruments Keystone 2 Kepler/Hawking SoC";
cpus {
#address-cells = <1>;
#size-cells = <0>;

View File

@ -13,7 +13,7 @@
#include "k2l.dtsi"
/ {
compatible = "ti,k2l-evm","ti,keystone";
compatible = "ti,k2l-evm", "ti,k2l", "ti,keystone";
model = "Texas Instruments Keystone 2 Lamarr EVM";
soc {

View File

@ -9,6 +9,9 @@
*/
/ {
compatible = "ti,k2l", "ti,keystone";
model = "Texas Instruments Keystone 2 Lamarr SoC";
cpus {
#address-cells = <1>;
#size-cells = <0>;

View File

@ -12,6 +12,7 @@
#include "skeleton.dtsi"
/ {
compatible = "ti,keystone";
model = "Texas Instruments Keystone 2 SoC";
#address-cells = <2>;
#size-cells = <2>;
@ -136,7 +137,7 @@ i2c2: i2c@2530800 {
};
spi0: spi@21000400 {
compatible = "ti,dm6441-spi";
compatible = "ti,keystone-spi", "ti,dm6441-spi";
reg = <0x21000400 0x200>;
num-cs = <4>;
ti,davinci-spi-intr-line = <0>;
@ -147,7 +148,7 @@ spi0: spi@21000400 {
};
spi1: spi@21000600 {
compatible = "ti,dm6441-spi";
compatible = "ti,keystone-spi", "ti,dm6441-spi";
reg = <0x21000600 0x200>;
num-cs = <4>;
ti,davinci-spi-intr-line = <0>;
@ -158,7 +159,7 @@ spi1: spi@21000600 {
};
spi2: spi@21000800 {
compatible = "ti,dm6441-spi";
compatible = "ti,keystone-spi", "ti,dm6441-spi";
reg = <0x21000800 0x200>;
num-cs = <4>;
ti,davinci-spi-intr-line = <0>;

View File

@ -97,6 +97,9 @@ static long long __init keystone_pv_fixup(void)
}
static const char *const keystone_match[] __initconst = {
"ti,k2hk",
"ti,k2e",
"ti,k2l",
"ti,keystone",
NULL,
};