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

Commit 3a1fc4d2 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'keystone_dts_for_4.13' of... 

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

ARM: dts: Keystone K2G ICE EVM support for v4.13

* tag 'keystone_dts_for_4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone

:
  ARM: dts: keystone: Add minimum support for K2G ICE evm
  ARM: keystone: Create new binding for K2G ICE evm
  ARM: dts: k2g-evm: Add unit address to memory node
  ARM: dts: keystone-k2g: Remove skeleton.dtsi

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c3e81b9d 84e00e24

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

+3 −0
Original line number Diff line number Diff line
@@ -37,3 +37,6 @@ Boards: 


-  K2G EVM

   compatible = "ti,k2g-evm", "ti,k2g", "ti-keystone"



-  K2G Industrial Communication Engine EVM

   compatible = "ti,k2g-ice", "ti,k2g", "ti-keystone"

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -204,7 +204,8 @@ dtb-$(CONFIG_ARCH_KEYSTONE) += \ 
	keystone-k2hk-evm.dtb \

	keystone-k2l-evm.dtb \

	keystone-k2e-evm.dtb \

	keystone-k2g-evm.dtb

	keystone-k2g-evm.dtb \

	keystone-k2g-ice.dtb

dtb-$(CONFIG_MACH_KIRKWOOD) += \

	kirkwood-b3.dtb \

	kirkwood-blackarmor-nas220.dtb \

arch/arm/boot/dts/keystone-k2g-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
	compatible =  "ti,k2g-evm", "ti,k2g", "ti,keystone";

	model = "Texas Instruments K2G General Purpose EVM";



	memory {

	memory@800000000 {

		device_type = "memory";

		reg = <0x00000008 0x00000000 0x00000000 0x80000000>;

	};

arch/arm/boot/dts/keystone-k2g-ice.dts

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

 * Device Tree Source for K2G Industrial Communication Engine EVM

 *

 * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/

 *

 * SPDX-License-Identifier: GPL-2.0

 */

/dts-v1/;



#include "keystone-k2g.dtsi"



/ {

	compatible = "ti,k2g-ice", "ti,k2g", "ti,keystone";

	model = "Texas Instruments K2G Industrial Communication EVM";



	memory@800000000 {

		device_type = "memory";

		reg = <0x00000008 0x00000000 0x00000000 0x20000000>;

	};

};



&k2g_pinctrl {

	uart0_pins: pinmux_uart0_pins {

		pinctrl-single,pins = <

			K2G_CORE_IOPAD(0x11cc) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0)	/* uart0_rxd.uart0_rxd */

			K2G_CORE_IOPAD(0x11d0) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE0)	/* uart0_txd.uart0_txd */

		>;

	};

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins>;

	status = "okay";

};

arch/arm/boot/dts/keystone-k2g.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 


#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/pinctrl/keystone.h>

#include "skeleton.dtsi"



/ {

	compatible = "ti,k2g","ti,keystone";
@@ -24,6 +23,8 @@ 
	#size-cells = <2>;

	interrupt-parent = <&gic>;



	chosen { };



	aliases {

		serial0 = &uart0;

	};