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

Commit 8be31869 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'keystone_dts_for_4.6_v2' of... 

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

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

ARM: DTS: Add new bindings for K2G and the K2G evm

K2G SoC family is the newest version of the Keystone family of processors.

The technical reference manual for K2G can be found here:
http://www.ti.com/lit/ug/spruhy8/spruhy8.pdf

* tag 'keystone_dts_for_4.6_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: dts: keystone: Add minimum support for K2G evm
  ARM: dts: keystone: Add Initial DT support for TI K2G SoC family
  ARM: keystone: Create new binding for K2G SoC
parents 0314df77 5b7551db

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

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ SoCs: 
   compatible = "ti,k2l", "ti,keystone"

- Keystone 2 Edison

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

- K2G

   compatible = "ti,k2g", "ti,keystone"



Boards:

-  Keystone 2 Hawking/Kepler EVM
@@ -32,3 +34,6 @@ Boards: 


-  Keystone 2 Edison EVM

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



-  K2G EVM

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

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -158,7 +158,8 @@ dtb-$(CONFIG_ARCH_INTEGRATOR) += \ 
dtb-$(CONFIG_ARCH_KEYSTONE) += \

	k2hk-evm.dtb \

	k2l-evm.dtb \

	k2e-evm.dtb

	k2e-evm.dtb \

	keystone-k2g-evm.dtb

dtb-$(CONFIG_MACH_KIRKWOOD) += \

	kirkwood-b3.dtb \

	kirkwood-blackarmor-nas220.dtb \

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

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

 * Device Tree Source for K2G EVM

 *

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed "as is" WITHOUT ANY WARRANTY of any

 * kind, whether express or implied; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */

/dts-v1/;



#include "keystone-k2g.dtsi"



/ {

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

	model = "Texas Instruments K2G General Purpose EVM";



	memory {

		device_type = "memory";

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

	};



};



&uart0 {

	status = "okay";

};

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

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

 * Device Tree Source for K2G SOC

 *

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed "as is" WITHOUT ANY WARRANTY of any

 * kind, whether express or implied; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



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

#include "skeleton.dtsi"



/ {

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

	model = "Texas Instruments K2G SoC";

	#address-cells = <2>;

	#size-cells = <2>;

	interrupt-parent = <&gic>;



	aliases {

		serial0 = &uart0;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu@0 {

			compatible = "arm,cortex-a15";

			device_type = "cpu";

			reg = <0>;

		};

	};



	gic: interrupt-controller@02561000 {

		compatible = "arm,cortex-a15-gic";

		#interrupt-cells = <3>;

		interrupt-controller;

		reg = <0x0 0x02561000 0x0 0x1000>,

		      <0x0 0x02562000 0x0 0x2000>,

		      <0x0 0x02564000 0x0 0x1000>,

		      <0x0 0x02566000 0x0 0x2000>;

		interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) |

				IRQ_TYPE_LEVEL_HIGH)>;

	};



	timer {

		compatible = "arm,armv7-timer";

		interrupts =

			<GIC_PPI 13

				(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,

			<GIC_PPI 14

				(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,

			<GIC_PPI 11

				(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,

			<GIC_PPI 10

				(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;

	};



	pmu {

		compatible = "arm,cortex-a15-pmu";

		interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;

	};



	soc {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "ti,keystone","simple-bus";

		ranges = <0x0 0x0 0x0 0xc0000000>;

		dma-ranges = <0x80000000 0x8 0x00000000 0x80000000>;



		uart0: serial@02530c00 {

			compatible = "ns16550a";

			current-speed = <115200>;

			reg-shift = <2>;

			reg-io-width = <4>;

			reg = <0x02530c00 0x100>;

			interrupts = <GIC_SPI 164 IRQ_TYPE_EDGE_RISING>;

			clock-frequency = <200000000>;

			status = "disabled";

		};

	};

};

arch/arm/mach-keystone/keystone.c

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ static const char *const keystone_match[] __initconst = { 
	"ti,k2hk",

	"ti,k2e",

	"ti,k2l",

	"ti,k2g",

	"ti,keystone",

	NULL,

};