Commit 0e9288e0 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'keystone_dts_for_4.16' of... 

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

ARM: Keystone DTS update for 4.16

 - Enable GPIO bank2 for K2L
 - Enable QSPI for K2G & K2G-EVM
 - Enable UART1/2 for K2G & K2G-EVM
 - Enable peripherals for K2G-ICE
 - Fix C1 and C2 DTS warnings

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

:
  ARM: dts: keystone-k2l-clocks: Add missing unit name to clock nodes that have regs
  ARM: dts: keystone-k2e-clocks: Add missing unit name to clock nodes that have regs
  ARM: dts: keystone-hk-clocks: Add missing unit name to clock nodes that have regs
  ARM: dts: keystone-clocks: Add missing unit name to clock nodes that have regs
  ARM: dts: keystone: Add missing unit name to interrupt controller
  ARM: dts: keystone: Get rid of usage of skeleton.dtsi
  ARM: dts: keystone*: Use a single soc0 instance
  ARM: dts: keystone*: Standardize license with SPDX tag
  ARM: dts: k2g-evm: Enable UART 2
  ARM: dts: k2g: Add UART 1 and 2 instances
  ARM: dts: keystone: Add generic compatible string for I2C EEPROM
  ARM: dts: keystone-k2g-ice: Add DT nodes for few peripherals
  ARM: dts: keystone-k2g-evm: Add QSPI DT node.
  ARM: dts: keystone-k2g: Move ti,non-removable property to board dts
  ARM: dts: keystone-k2g-evm: Fix botched up merge
  ARM: dts: keystone-k2g: Add QSPI DT entry
  ARM: dts: keystone-k2l: Add the second gpio bank node

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 38b45e51 4fe85b0c

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

+28 −31
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Device Tree Source for Keystone 2 clock tree

 *

 * Copyright (C) 2013 Texas Instruments, Inc.

 *

 * 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.

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

 */



clocks {
@@ -51,7 +48,7 @@ clocks { 
		clock-output-names = "gemtraceclk";

	};



	chipstmxptclk: chipstmxptclk {

	chipstmxptclk: chipstmxptclk@2310164 {

		#clock-cells = <0>;

		compatible = "ti,keystone,pll-divider-clock";

		clocks = <&mainmuxclk>;
@@ -160,7 +157,7 @@ clocks { 
		clock-output-names = "chipclk1rstiso112";

	};



	clkmodrst0: clkmodrst0 {

	clkmodrst0: clkmodrst0@2350000 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&chipclk16>;
@@ -171,7 +168,7 @@ clocks { 
	};





	clkusb: clkusb {

	clkusb: clkusb@2350008 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&chipclk16>;
@@ -181,7 +178,7 @@ clocks { 
		domain-id = <0>;

	};



	clkaemifspi: clkaemifspi {

	clkaemifspi: clkaemifspi@235000c {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&chipclk16>;
@@ -192,7 +189,7 @@ clocks { 
	};





	clkdebugsstrc: clkdebugsstrc {

	clkdebugsstrc: clkdebugsstrc@2350014 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&chipclk13>;
@@ -202,7 +199,7 @@ clocks { 
		domain-id = <1>;

	};



	clktetbtrc: clktetbtrc {

	clktetbtrc: clktetbtrc@2350018 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&chipclk13>;
@@ -212,7 +209,7 @@ clocks { 
		domain-id = <1>;

	};



	clkpa: clkpa {

	clkpa: clkpa@235001c {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&paclk13>;
@@ -222,7 +219,7 @@ clocks { 
		domain-id = <2>;

	};



	clkcpgmac: clkcpgmac {

	clkcpgmac: clkcpgmac@2350020 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&clkpa>;
@@ -232,7 +229,7 @@ clocks { 
		domain-id = <2>;

	};



	clksa: clksa {

	clksa: clksa@2350024 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&clkpa>;
@@ -242,7 +239,7 @@ clocks { 
		domain-id = <2>;

	};



	clkpcie: clkpcie {

	clkpcie: clkpcie@2350028 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&chipclk12>;
@@ -252,7 +249,7 @@ clocks { 
		domain-id = <3>;

	};



	clksr: clksr {

	clksr: clksr@2350034 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&chipclk1rstiso112>;
@@ -262,7 +259,7 @@ clocks { 
		domain-id = <6>;

	};



	clkgem0: clkgem0 {

	clkgem0: clkgem0@235003c {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&chipclk1>;
@@ -272,7 +269,7 @@ clocks { 
		domain-id = <8>;

	};



	clkddr30: clkddr30 {

	clkddr30: clkddr30@235005c {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&chipclk12>;
@@ -282,7 +279,7 @@ clocks { 
		domain-id = <16>;

	};



	clkwdtimer0: clkwdtimer0 {

	clkwdtimer0: clkwdtimer0@2350000 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&clkmodrst0>;
@@ -292,7 +289,7 @@ clocks { 
		domain-id = <0>;

	};



	clkwdtimer1: clkwdtimer1 {

	clkwdtimer1: clkwdtimer1@2350000 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&clkmodrst0>;
@@ -302,7 +299,7 @@ clocks { 
		domain-id = <0>;

	};



	clkwdtimer2: clkwdtimer2 {

	clkwdtimer2: clkwdtimer2@2350000 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&clkmodrst0>;
@@ -312,7 +309,7 @@ clocks { 
		domain-id = <0>;

	};



	clkwdtimer3: clkwdtimer3 {

	clkwdtimer3: clkwdtimer3@2350000 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&clkmodrst0>;
@@ -322,7 +319,7 @@ clocks { 
		domain-id = <0>;

	};



	clktimer15: clktimer15 {

	clktimer15: clktimer15@2350000 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&clkmodrst0>;
@@ -332,7 +329,7 @@ clocks { 
		domain-id = <0>;

	};



	clkuart0: clkuart0 {

	clkuart0: clkuart0@2350000 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&clkmodrst0>;
@@ -342,7 +339,7 @@ clocks { 
		domain-id = <0>;

	};



	clkuart1: clkuart1 {

	clkuart1: clkuart1@2350000 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&clkmodrst0>;
@@ -352,7 +349,7 @@ clocks { 
		domain-id = <0>;

	};



	clkaemif: clkaemif {

	clkaemif: clkaemif@2350000 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&clkaemifspi>;
@@ -362,7 +359,7 @@ clocks { 
		domain-id = <0>;

	};



	clkusim: clkusim {

	clkusim: clkusim@2350000 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&clkmodrst0>;
@@ -372,7 +369,7 @@ clocks { 
		domain-id = <0>;

	};



	clki2c: clki2c {

	clki2c: clki2c@2350000 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&clkmodrst0>;
@@ -382,7 +379,7 @@ clocks { 
		domain-id = <0>;

	};



	clkspi: clkspi {

	clkspi: clkspi@2350000 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&clkaemifspi>;
@@ -392,7 +389,7 @@ clocks { 
		domain-id = <0>;

	};



	clkgpio: clkgpio {

	clkgpio: clkgpio@2350000 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&clkmodrst0>;
@@ -402,7 +399,7 @@ clocks { 
		domain-id = <0>;

	};



	clkkeymgr: clkkeymgr {

	clkkeymgr: clkkeymgr@2350000 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&clkmodrst0>;

arch/arm/boot/dts/keystone-k2e-clocks.dtsi

+6 −9
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright 2014 Texas Instruments, Inc.

 *

 * Keystone 2 Edison SoC specific device tree

 *

 * 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.

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

 */



clocks {
@@ -35,7 +32,7 @@ clocks { 
		reg-names = "control";

	};



	clkusb1: clkusb1 {

	clkusb1: clkusb1@2350004 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&chipclk16>;
@@ -45,7 +42,7 @@ clocks { 
		domain-id = <0>;

	};



	clkhyperlink0: clkhyperlink0 {

	clkhyperlink0: clkhyperlink02350030 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&chipclk12>;
@@ -55,7 +52,7 @@ clocks { 
		domain-id = <5>;

	};



	clkpcie1: clkpcie1 {

	clkpcie1: clkpcie1@235006c {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&chipclk12>;
@@ -65,7 +62,7 @@ clocks { 
		domain-id = <18>;

	};



	clkxge: clkxge {

	clkxge: clkxge@23500c8 {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&chipclk13>;

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

+5 −8
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright 2013-2014 Texas Instruments, Inc.

 *

 * Keystone 2 Edison EVM device tree

 *

 * 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.

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

 */

/dts-v1/;
@@ -28,8 +25,9 @@ 
			status = "okay";

		};

	};

};



	soc {

&soc0 {



		clocks {

			refclksys: refclksys {
@@ -54,7 +52,6 @@ 
			};

		};

};

};



&usb_phy {

	status = "okay";
@@ -82,7 +79,7 @@ 


&i2c0 {

	dtt@50 {

		compatible = "at,24c1024";

		compatible = "atmel,24c1024";

		reg = <0x50>;

	};

};

arch/arm/boot/dts/keystone-k2e-netcp.dtsi

+2 −5
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Device Tree Source for Keystone 2 Edison Netcp driver

 *

 * Copyright 2015 Texas Instruments, Inc.

 *

 * 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.

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

 */



qmss: qmss@2a40000 {

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

+4 −7
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright 2013-2014 Texas Instruments, Inc.

 *

 * Keystone 2 Edison soc device tree

 *

 * 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.

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

 */



#include <dt-bindings/reset/ti-syscon.h>
@@ -48,8 +45,9 @@ 
	aliases {

		rproc0 = &dsp0;

	};

};



	soc {

&soc0 {

		/include/ "keystone-k2e-clocks.dtsi"



		usb: usb@2680000 {
@@ -195,4 +193,3 @@ 
		};

		/include/ "keystone-k2e-netcp.dtsi"

};
 
};

CRA Git | Maintained and supported by SUSTech CRA and CCSE