Commit 6e4b9bfd authored by Olof Johansson's avatar Olof Johansson
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

Keystone DTS updates for 3.15 from Santosh Shilimkar:

- Add watchdog timer, timer64 and gpio device nodes
- Add LED device nodes
- Fixes for debugss, msmc clock nodes
- Add support for Keystone Lamarr and Edision SOC/EVM support
- Add NAND and AEMIF device nodes

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

:
  ARM: dts: keystone: add AEMIF/NAND device entry
  ARM: dts: keystone: add support for k2 Edison SoC and EVM
  ARM: dts: keystone: add support for K2 Lamarr SoC and EVM
  ARM: dts: keystone: preparatory patch to support K2L and K2E SOCs
  ARM: dts: keystone: update for supporting K2L/K2E EVMs
  ARM: dts: keystone: fix domain id for clkdebugsstrc
  ARM: dts: keystone: drop msmcsram clock node
  ARM: dts: k2hk-evm: rename clock node to clocks
  ARM: dts: k2hk-evm: add leds supports
  ARM: dts: keystone: add gpio device entry
  ARM: dts: keystone: add keystone timer entry
  ARM: dts: keystone: add watchdog entry

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c972aed7 82c04f71

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

+10 −0
Original line number Diff line number Diff line
@@ -8,3 +8,13 @@ Required properties: 
 - compatible: All TI specific devices present in Keystone SOC should be in

   the form "ti,keystone-*". Generic devices like gic, arch_timers, ns16550

   type UART should use the specified compatible for those devices.



Boards:

-  Keystone 2 Hawking/Kepler EVM

   compatible = "ti,k2hk-evm"



-  Keystone 2 Lamarr EVM

   compatible = "ti,k2l-evm"



-  Keystone 2 Edison EVM

   compatible = "ti,k2e-evm"

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

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

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

 */



clocks {

	mainpllclk: mainpllclk@2310110 {

		#clock-cells = <0>;

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

		clocks = <&refclksys>;

		reg = <0x02620350 4>, <0x02310110 4>;

		reg-names = "control", "multiplier";

		fixed-postdiv = <2>;

	};



	papllclk: papllclk@2620358 {

		#clock-cells = <0>;

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

		clocks = <&refclkpass>;

		clock-output-names = "pa-pll-clk";

		reg = <0x02620358 4>;

		reg-names = "control";

	};



	ddr3apllclk: ddr3apllclk@2620360 {

		#clock-cells = <0>;

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

		clocks = <&refclkddr3a>;

		clock-output-names = "ddr-3a-pll-clk";

		reg = <0x02620360 4>;

		reg-names = "control";

	};



	clkusb1: clkusb1 {

		#clock-cells = <0>;

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

		clocks = <&chipclk16>;

		clock-output-names = "usb";

		reg = <0x02350004 0xb00>, <0x02350000 0x400>;

		reg-names = "control", "domain";

		domain-id = <0>;

	};



	clkhyperlink0: clkhyperlink0 {

		#clock-cells = <0>;

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

		clocks = <&chipclk12>;

		clock-output-names = "hyperlink-0";

		reg = <0x02350030 0xb00>, <0x02350014 0x400>;

		reg-names = "control", "domain";

		domain-id = <5>;

	};



	clkpcie1: clkpcie1 {

		#clock-cells = <0>;

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

		clocks = <&chipclk12>;

		clock-output-names = "pcie";

		reg = <0x0235006c 0xb00>, <0x02350000 0x400>;

		reg-names = "control", "domain";

		domain-id = <18>;

	};



	clkxge: clkxge {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "xge";

		reg = <0x023500c8 0xb00>, <0x02350074 0x400>;

		reg-names = "control", "domain";

		domain-id = <29>;

	};

};

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

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

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

 */

/dts-v1/;



#include "keystone.dtsi"

#include "k2e.dtsi"



/ {

	compatible =  "ti,k2e-evm";

	model = "Texas Instruments Keystone 2 Edison EVM";



	soc {



		clocks {

			refclksys: refclksys {

				#clock-cells = <0>;

				compatible = "fixed-clock";

				clock-frequency = <100000000>;

				clock-output-names = "refclk-sys";

			};



			refclkpass: refclkpass {

				#clock-cells = <0>;

				compatible = "fixed-clock";

				clock-frequency = <100000000>;

				clock-output-names = "refclk-pass";

			};



			refclkddr3a: refclkddr3a {

				#clock-cells = <0>;

				compatible = "fixed-clock";

				clock-frequency = <100000000>;

				clock-output-names = "refclk-ddr3a";

			};

		};

	};

};



&usb_phy {

	status = "okay";

};



&usb {

	status = "okay";

};



&usb1_phy {

	status = "okay";

};



&usb1 {

	status = "okay";

};

arch/arm/boot/dts/k2e.dtsi

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

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

 */



/ {

	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		interrupt-parent = <&gic>;



		cpu@0 {

			compatible = "arm,cortex-a15";

			device_type = "cpu";

			reg = <0>;

		};



		cpu@1 {

			compatible = "arm,cortex-a15";

			device_type = "cpu";

			reg = <1>;

		};



		cpu@2 {

			compatible = "arm,cortex-a15";

			device_type = "cpu";

			reg = <2>;

		};



		cpu@3 {

			compatible = "arm,cortex-a15";

			device_type = "cpu";

			reg = <3>;

		};

	};



	soc {

		/include/ "k2e-clocks.dtsi"



		usb: usb@2680000 {

			interrupts = <GIC_SPI 152 IRQ_TYPE_EDGE_RISING>;

			dwc3@2690000 {

				interrupts = <GIC_SPI 152 IRQ_TYPE_EDGE_RISING>;

			};

		};



		usb1_phy: usb_phy@2620750 {

			compatible = "ti,keystone-usbphy";

			#address-cells = <1>;

			#size-cells = <1>;

			reg = <0x2620750 24>;

			status = "disabled";

		};



		usb1: usb@25000000 {

			compatible = "ti,keystone-dwc3";

			#address-cells = <1>;

			#size-cells = <1>;

			reg = <0x25000000 0x10000>;

			clocks = <&clkusb1>;

			clock-names = "usb";

			interrupts = <GIC_SPI 414 IRQ_TYPE_EDGE_RISING>;

			ranges;

			status = "disabled";



			dwc3@25010000 {

				compatible = "synopsys,dwc3";

				reg = <0x25010000 0x70000>;

				interrupts = <GIC_SPI 414 IRQ_TYPE_EDGE_RISING>;

				usb-phy = <&usb1_phy>, <&usb1_phy>;

			};

		};

	};

};

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

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

 * Copyright 2013-2014 Texas Instruments, Inc.

 *

 * Keystone 2 Kepler/Hawking SoC clock nodes

 *

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

 */



clocks {

	armpllclk: armpllclk@2620370 {

		#clock-cells = <0>;

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

		clocks = <&refclkarm>;

		clock-output-names = "arm-pll-clk";

		reg = <0x02620370 4>;

		reg-names = "control";

	};



	mainpllclk: mainpllclk@2310110 {

		#clock-cells = <0>;

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

		clocks = <&refclksys>;

		reg = <0x02620350 4>, <0x02310110 4>;

		reg-names = "control", "multiplier";

		fixed-postdiv = <2>;

	};



	papllclk: papllclk@2620358 {

		#clock-cells = <0>;

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

		clocks = <&refclkpass>;

		clock-output-names = "pa-pll-clk";

		reg = <0x02620358 4>;

		reg-names = "control";

	};



	ddr3apllclk: ddr3apllclk@2620360 {

		#clock-cells = <0>;

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

		clocks = <&refclkddr3a>;

		clock-output-names = "ddr-3a-pll-clk";

		reg = <0x02620360 4>;

		reg-names = "control";

	};



	ddr3bpllclk: ddr3bpllclk@2620368 {

		#clock-cells = <0>;

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

		clocks = <&refclkddr3b>;

		clock-output-names = "ddr-3b-pll-clk";

		reg = <0x02620368 4>;

		reg-names = "control";

	};



	clktsip: clktsip {

		#clock-cells = <0>;

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

		clocks = <&chipclk16>;

		clock-output-names = "tsip";

		reg = <0x0235000c 0xb00>, <0x02350000 0x400>;

		reg-names = "control", "domain";

		domain-id = <0>;

	};



	clksrio: clksrio {

		#clock-cells = <0>;

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

		clocks = <&chipclk1rstiso13>;

		clock-output-names = "srio";

		reg = <0x0235002c 0xb00>, <0x02350010 0x400>;

		reg-names = "control", "domain";

		domain-id = <4>;

	};



	clkhyperlink0: clkhyperlink0 {

		#clock-cells = <0>;

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

		clocks = <&chipclk12>;

		clock-output-names = "hyperlink-0";

		reg = <0x02350030 0xb00>, <0x02350014 0x400>;

		reg-names = "control", "domain";

		domain-id = <5>;

	};



	clkgem1: clkgem1 {

		#clock-cells = <0>;

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

		clocks = <&chipclk1>;

		clock-output-names = "gem1";

		reg = <0x02350040 0xb00>, <0x02350024 0x400>;

		reg-names = "control", "domain";

		domain-id = <9>;

	};



	clkgem2: clkgem2 {

		#clock-cells = <0>;

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

		clocks = <&chipclk1>;

		clock-output-names = "gem2";

		reg = <0x02350044 0xb00>, <0x02350028 0x400>;

		reg-names = "control", "domain";

		domain-id = <10>;

	};



	clkgem3: clkgem3 {

		#clock-cells = <0>;

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

		clocks = <&chipclk1>;

		clock-output-names = "gem3";

		reg = <0x02350048 0xb00>, <0x0235002c 0x400>;

		reg-names = "control", "domain";

		domain-id = <11>;

	};



	clkgem4: clkgem4 {

		#clock-cells = <0>;

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

		clocks = <&chipclk1>;

		clock-output-names = "gem4";

		reg = <0x0235004c 0xb00>, <0x02350030 0x400>;

		reg-names = "control", "domain";

		domain-id = <12>;

	};



	clkgem5: clkgem5 {

		#clock-cells = <0>;

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

		clocks = <&chipclk1>;

		clock-output-names = "gem5";

		reg = <0x02350050 0xb00>, <0x02350034 0x400>;

		reg-names = "control", "domain";

		domain-id = <13>;

	};



	clkgem6: clkgem6 {

		#clock-cells = <0>;

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

		clocks = <&chipclk1>;

		clock-output-names = "gem6";

		reg = <0x02350054 0xb00>, <0x02350038 0x400>;

		reg-names = "control", "domain";

		domain-id = <14>;

	};



	clkgem7: clkgem7 {

		#clock-cells = <0>;

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

		clocks = <&chipclk1>;

		clock-output-names = "gem7";

		reg = <0x02350058 0xb00>, <0x0235003c 0x400>;

		reg-names = "control", "domain";

		domain-id = <15>;

	};



	clkddr31: clkddr31 {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "ddr3-1";

		reg = <0x02350060 0xb00>, <0x02350040 0x400>;

		reg-names = "control", "domain";

		domain-id = <16>;

	};



	clktac: clktac {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "tac";

		reg = <0x02350064 0xb00>, <0x02350044 0x400>;

		reg-names = "control", "domain";

		domain-id = <17>;

	};



	clkrac01: clkrac01 {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "rac-01";

		reg = <0x02350068 0xb00>, <0x02350044 0x400>;

		reg-names = "control", "domain";

		domain-id = <17>;

	};



	clkrac23: clkrac23 {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "rac-23";

		reg = <0x0235006c 0xb00>, <0x02350048 0x400>;

		reg-names = "control", "domain";

		domain-id = <18>;

	};



	clkfftc0: clkfftc0 {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "fftc-0";

		reg = <0x02350070 0xb00>, <0x0235004c 0x400>;

		reg-names = "control", "domain";

		domain-id = <19>;

	};



	clkfftc1: clkfftc1 {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "fftc-1";

		reg = <0x02350074 0xb00>, <0x023504c0 0x400>;

		reg-names = "control", "domain";

		domain-id = <19>;

	};



	clkfftc2: clkfftc2 {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "fftc-2";

		reg = <0x02350078 0xb00>, <0x02350050 0x400>;

		reg-names = "control", "domain";

		domain-id = <20>;

	};



	clkfftc3: clkfftc3 {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "fftc-3";

		reg = <0x0235007c 0xb00>, <0x02350050 0x400>;

		reg-names = "control", "domain";

		domain-id = <20>;

	};



	clkfftc4: clkfftc4 {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "fftc-4";

		reg = <0x02350080 0xb00>, <0x02350050 0x400>;

		reg-names = "control", "domain";

		domain-id = <20>;

	};



	clkfftc5: clkfftc5 {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "fftc-5";

		reg = <0x02350084 0xb00>, <0x02350050 0x400>;

		reg-names = "control", "domain";

		domain-id = <20>;

	};



	clkaif: clkaif {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "aif";

		reg = <0x02350088 0xb00>, <0x02350054 0x400>;

		reg-names = "control", "domain";

		domain-id = <21>;

	};



	clktcp3d0: clktcp3d0 {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "tcp3d-0";

		reg = <0x0235008c 0xb00>, <0x02350058 0x400>;

		reg-names = "control", "domain";

		domain-id = <22>;

	};



	clktcp3d1: clktcp3d1 {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "tcp3d-1";

		reg = <0x02350090 0xb00>, <0x02350058 0x400>;

		reg-names = "control", "domain";

		domain-id = <22>;

	};



	clktcp3d2: clktcp3d2 {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "tcp3d-2";

		reg = <0x02350094 0xb00>, <0x0235005c 0x400>;

		reg-names = "control", "domain";

		domain-id = <23>;

	};



	clktcp3d3: clktcp3d3 {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "tcp3d-3";

		reg = <0x02350098 0xb00>, <0x0235005c 0x400>;

		reg-names = "control", "domain";

		domain-id = <23>;

	};



	clkvcp0: clkvcp0 {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "vcp-0";

		reg = <0x0235009c 0xb00>, <0x02350060 0x400>;

		reg-names = "control", "domain";

		domain-id = <24>;

	};



	clkvcp1: clkvcp1 {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "vcp-1";

		reg = <0x023500a0 0xb00>, <0x02350060 0x400>;

		reg-names = "control", "domain";

		domain-id = <24>;

	};



	clkvcp2: clkvcp2 {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "vcp-2";

		reg = <0x023500a4 0xb00>, <0x02350060 0x400>;

		reg-names = "control", "domain";

		domain-id = <24>;

	};



	clkvcp3: clkvcp3 {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "vcp-3";

		reg = <0x023500a8 0xb00>, <0x02350060 0x400>;

		reg-names = "control", "domain";

		domain-id = <24>;

	};



	clkvcp4: clkvcp4 {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "vcp-4";

		reg = <0x023500ac 0xb00>, <0x02350064 0x400>;

		reg-names = "control", "domain";

		domain-id = <25>;

	};



	clkvcp5: clkvcp5 {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "vcp-5";

		reg = <0x023500b0 0xb00>, <0x02350064 0x400>;

		reg-names = "control", "domain";

		domain-id = <25>;

	};



	clkvcp6: clkvcp6 {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "vcp-6";

		reg = <0x023500b4 0xb00>, <0x02350064 0x400>;

		reg-names = "control", "domain";

		domain-id = <25>;

	};



	clkvcp7: clkvcp7 {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "vcp-7";

		reg = <0x023500b8 0xb00>, <0x02350064 0x400>;

		reg-names = "control", "domain";

		domain-id = <25>;

	};



	clkbcp: clkbcp {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "bcp";

		reg = <0x023500bc 0xb00>, <0x02350068 0x400>;

		reg-names = "control", "domain";

		domain-id = <26>;

	};



	clkdxb: clkdxb {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "dxb";

		reg = <0x023500c0 0xb00>, <0x0235006c 0x400>;

		reg-names = "control", "domain";

		domain-id = <27>;

	};



	clkhyperlink1: clkhyperlink1 {

		#clock-cells = <0>;

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

		clocks = <&chipclk12>;

		clock-output-names = "hyperlink-1";

		reg = <0x023500c4 0xb00>, <0x02350070 0x400>;

		reg-names = "control", "domain";

		domain-id = <28>;

	};



	clkxge: clkxge {

		#clock-cells = <0>;

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

		clocks = <&chipclk13>;

		clock-output-names = "xge";

		reg = <0x023500c8 0xb00>, <0x02350074 0x400>;

		reg-names = "control", "domain";

		domain-id = <29>;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE