Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3e2ed44 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'keystone-dts' of... 

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
parents 4a69fcd3 91dca0f0

Documentation/devicetree/bindings/arm/keystone/keystone.txt

+17 −3
Original line number Diff line number Diff line
@@ -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"

arch/arm/boot/dts/k2e-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -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 {

arch/arm/boot/dts/k2e.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ 
 */



/ {

	compatible = "ti,k2e", "ti,keystone";

	model = "Texas Instruments Keystone 2 Edison SoC";



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;

arch/arm/boot/dts/k2hk-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -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 {

arch/arm/boot/dts/k2hk.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ 
 */



/ {

	compatible = "ti,k2hk", "ti,keystone";

	model = "Texas Instruments Keystone 2 Kepler/Hawking SoC";



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;