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

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

Merge tag 'keystone_dts_for_4.7' of... 

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

Merge "ARM: Keystone DTS for 4.7" from Santosh Shilimkar:

- Remainder k2-* rename to keystone-*
- PSCI node info
- SPI alias nodes for bootloaders

* tag 'keystone_dts_for_4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: keystone: dts: add psci command definition
  ARM: dts: keystone: Add aliases for SPI nodes
  ARM: dts: k2*: Rename the k2* files to keystone-k2* files
parents f598f176 14de48a4

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1260,7 +1260,7 @@ M: Santosh Shilimkar <ssantosh@kernel.org> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-keystone/

F:	arch/arm/boot/dts/k2*

F:	arch/arm/boot/dts/keystone-*

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git



ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK

arch/arm/boot/dts/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -159,9 +159,9 @@ dtb-$(CONFIG_ARCH_INTEGRATOR) += \ 
	integratorap.dtb \

	integratorcp.dtb

dtb-$(CONFIG_ARCH_KEYSTONE) += \

	k2hk-evm.dtb \

	k2l-evm.dtb \

	k2e-evm.dtb \

	keystone-k2hk-evm.dtb \

	keystone-k2l-evm.dtb \

	keystone-k2e-evm.dtb \

	keystone-k2g-evm.dtb

dtb-$(CONFIG_MACH_KIRKWOOD) += \

	kirkwood-b3.dtb \

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

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
/dts-v1/;



#include "keystone.dtsi"

#include "k2e.dtsi"

#include "keystone-k2e.dtsi"



/ {

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