]> git.sur5r.net Git - u-boot/commitdiff
ARM: dts: k2*: Rename the k2* files to keystone-k2* files
authorLokesh Vutla <lokeshvutla@ti.com>
Tue, 31 Jan 2017 04:02:57 +0000 (09:32 +0530)
committerTom Rini <trini@konsulko.com>
Wed, 8 Feb 2017 20:56:30 +0000 (15:56 -0500)
As reported in [1], rename the k2* dts files to keystone-* files
this will force consistency throughout.

Script for the same (and hand modified for Makefile and config
files):
for i in arch/arm/dts/k2*
do
b=`basename $i`;
git mv $i arch/arm/dts/keystone-$b;
sed -i -e "s/$b/keystone-$b/g" arch/arm/dts/*[si]
done

This is similar to linux kernel commit 5edafc29829bc ("ARM: dts: k2*: Rename
the k2* files to keystone-k2* files")

[1] http://marc.info/?l=linux-arm-kernel&m=145637407804754&w=2

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
35 files changed:
arch/arm/dts/Makefile
arch/arm/dts/k2e-clocks.dtsi [deleted file]
arch/arm/dts/k2e-evm.dts [deleted file]
arch/arm/dts/k2e-netcp.dtsi [deleted file]
arch/arm/dts/k2e.dtsi [deleted file]
arch/arm/dts/k2g-evm.dts [deleted file]
arch/arm/dts/k2g-netcp.dtsi [deleted file]
arch/arm/dts/k2g.dtsi [deleted file]
arch/arm/dts/k2hk-clocks.dtsi [deleted file]
arch/arm/dts/k2hk-evm.dts [deleted file]
arch/arm/dts/k2hk-netcp.dtsi [deleted file]
arch/arm/dts/k2hk.dtsi [deleted file]
arch/arm/dts/k2l-clocks.dtsi [deleted file]
arch/arm/dts/k2l-evm.dts [deleted file]
arch/arm/dts/k2l-netcp.dtsi [deleted file]
arch/arm/dts/k2l.dtsi [deleted file]
arch/arm/dts/keystone-k2e-clocks.dtsi [new file with mode: 0644]
arch/arm/dts/keystone-k2e-evm.dts [new file with mode: 0644]
arch/arm/dts/keystone-k2e-netcp.dtsi [new file with mode: 0644]
arch/arm/dts/keystone-k2e.dtsi [new file with mode: 0644]
arch/arm/dts/keystone-k2g-evm.dts [new file with mode: 0644]
arch/arm/dts/keystone-k2g-netcp.dtsi [new file with mode: 0644]
arch/arm/dts/keystone-k2g.dtsi [new file with mode: 0644]
arch/arm/dts/keystone-k2hk-clocks.dtsi [new file with mode: 0644]
arch/arm/dts/keystone-k2hk-evm.dts [new file with mode: 0644]
arch/arm/dts/keystone-k2hk-netcp.dtsi [new file with mode: 0644]
arch/arm/dts/keystone-k2hk.dtsi [new file with mode: 0644]
arch/arm/dts/keystone-k2l-clocks.dtsi [new file with mode: 0644]
arch/arm/dts/keystone-k2l-evm.dts [new file with mode: 0644]
arch/arm/dts/keystone-k2l-netcp.dtsi [new file with mode: 0644]
arch/arm/dts/keystone-k2l.dtsi [new file with mode: 0644]
configs/k2e_evm_defconfig
configs/k2g_evm_defconfig
configs/k2hk_evm_defconfig
configs/k2l_evm_defconfig

index 397a0aec0b77bd8379f7e5c0aa31431108bc2437..2d75f64269343366c43d313cc1c2a1973a4c80cf 100644 (file)
@@ -320,10 +320,10 @@ dtb-$(CONFIG_MX6) += imx6ull-14x14-evk.dtb \
 
 dtb-$(CONFIG_MX7) += imx7-colibri.dtb
 
-dtb-$(CONFIG_SOC_KEYSTONE) += k2hk-evm.dtb \
-       k2l-evm.dtb \
-       k2e-evm.dtb \
-       k2g-evm.dtb
+dtb-$(CONFIG_SOC_KEYSTONE) += keystone-k2hk-evm.dtb \
+       keystone-k2l-evm.dtb \
+       keystone-k2e-evm.dtb \
+       keystone-k2g-evm.dtb
 
 dtb-$(CONFIG_TARGET_SAMA5D2_XPLAINED) += \
        at91-sama5d2_xplained.dtb
diff --git a/arch/arm/dts/k2e-clocks.dtsi b/arch/arm/dts/k2e-clocks.dtsi
deleted file mode 100644 (file)
index d56d68f..0000000
+++ /dev/null
@@ -1,77 +0,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.
- */
-
-clocks {
-       mainpllclk: mainpllclk@2310110 {
-               #clock-cells = <0>;
-               compatible = "ti,keystone,main-pll-clock";
-               clocks = <&refclksys>;
-               reg = <0x02620350 4>, <0x02310110 4>, <0x02310108 4>;
-               reg-names = "control", "multiplier", "post-divider";
-       };
-
-       papllclk: papllclk@2620358 {
-               #clock-cells = <0>;
-               compatible = "ti,keystone,pll-clock";
-               clocks = <&refclkpass>;
-               clock-output-names = "papllclk";
-               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 = "usb1";
-               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 = "pcie1";
-               reg = <0x0235006c 0xb00>, <0x02350048 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>;
-       };
-};
diff --git a/arch/arm/dts/k2e-evm.dts b/arch/arm/dts/k2e-evm.dts
deleted file mode 100644 (file)
index e2c3fb4..0000000
+++ /dev/null
@@ -1,155 +0,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.
- */
-/dts-v1/;
-
-#include "keystone.dtsi"
-#include "k2e.dtsi"
-
-/ {
-       compatible =  "ti,k2e-evm","ti,keystone";
-       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";
-};
-
-&i2c0 {
-       dtt@50 {
-               compatible = "at,24c1024";
-               reg = <0x50>;
-       };
-};
-
-&aemif {
-       cs0 {
-               #address-cells = <2>;
-               #size-cells = <1>;
-               clock-ranges;
-               ranges;
-
-               ti,cs-chipselect = <0>;
-               /* all timings in nanoseconds */
-               ti,cs-min-turnaround-ns = <12>;
-               ti,cs-read-hold-ns = <6>;
-               ti,cs-read-strobe-ns = <23>;
-               ti,cs-read-setup-ns = <9>;
-               ti,cs-write-hold-ns = <8>;
-               ti,cs-write-strobe-ns = <23>;
-               ti,cs-write-setup-ns = <8>;
-
-               nand@0,0 {
-                       compatible = "ti,keystone-nand","ti,davinci-nand";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       reg = <0 0 0x4000000
-                              1 0 0x0000100>;
-
-                       ti,davinci-chipselect = <0>;
-                       ti,davinci-mask-ale = <0x2000>;
-                       ti,davinci-mask-cle = <0x4000>;
-                       ti,davinci-mask-chipsel = <0>;
-                       nand-ecc-mode = "hw";
-                       ti,davinci-ecc-bits = <4>;
-                       nand-on-flash-bbt;
-
-                       partition@0 {
-                               label = "u-boot";
-                               reg = <0x0 0x100000>;
-                               read-only;
-                       };
-
-                       partition@100000 {
-                               label = "params";
-                               reg = <0x100000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@180000 {
-                               label = "ubifs";
-                               reg = <0x180000 0x1FE80000>;
-                       };
-               };
-       };
-};
-
-&spi0 {
-       status = "okay";
-       nor_flash: n25q128a11@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "Micron,n25q128a11", "spi-flash";
-               spi-max-frequency = <54000000>;
-               m25p,fast-read;
-               reg = <0>;
-
-               partition@0 {
-                       label = "u-boot-spl";
-                       reg = <0x0 0x80000>;
-                       read-only;
-               };
-
-               partition@1 {
-                       label = "misc";
-                       reg = <0x80000 0xf80000>;
-               };
-       };
-};
-
-&mdio {
-       status = "ok";
-       ethphy0: ethernet-phy@0 {
-               compatible = "marvell,88E1514", "marvell,88E1510", "ethernet-phy-ieee802.3-c22";
-               reg = <0>;
-       };
-
-       ethphy1: ethernet-phy@1 {
-               compatible = "marvell,88E1514", "marvell,88E1510", "ethernet-phy-ieee802.3-c22";
-               reg = <1>;
-       };
-};
diff --git a/arch/arm/dts/k2e-netcp.dtsi b/arch/arm/dts/k2e-netcp.dtsi
deleted file mode 100644 (file)
index b13b3c9..0000000
+++ /dev/null
@@ -1,206 +0,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.
- */
-
-qmss: qmss@2a40000 {
-       compatible = "ti,keystone-navigator-qmss";
-       dma-coherent;
-       #address-cells = <1>;
-       #size-cells = <1>;
-       clocks = <&chipclk13>;
-       ranges;
-       queue-range     = <0 0x2000>;
-       linkram0        = <0x100000 0x4000>;
-       linkram1        = <0 0x10000>;
-
-       qmgrs {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-               qmgr0 {
-                       managed-queues = <0 0x2000>;
-                       reg = <0x2a40000 0x20000>,
-                             <0x2a06000 0x400>,
-                             <0x2a02000 0x1000>,
-                             <0x2a03000 0x1000>,
-                             <0x23a80000 0x20000>,
-                             <0x2a80000 0x20000>;
-                       reg-names = "peek", "status", "config",
-                                   "region", "push", "pop";
-               };
-       };
-       queue-pools {
-               qpend {
-                       qpend-0 {
-                               qrange = <658 8>;
-                               interrupts =<0 40 0xf04 0 41 0xf04 0 42 0xf04
-                                            0 43 0xf04 0 44 0xf04 0 45 0xf04
-                                            0 46 0xf04 0 47 0xf04>;
-                       };
-                       qpend-1 {
-                               qrange = <528 16>;
-                               interrupts = <0 48 0xf04 0 49 0xf04 0 50 0xf04
-                                             0 51 0xf04 0 52 0xf04 0 53 0xf04
-                                             0 54 0xf04 0 55 0xf04 0 56 0xf04
-                                             0 57 0xf04 0 58 0xf04 0 59 0xf04
-                                             0 60 0xf04 0 61 0xf04 0 62 0xf04
-                                             0 63 0xf04>;
-                               qalloc-by-id;
-                       };
-                       qpend-2 {
-                               qrange = <544 16>;
-                               interrupts = <0 64 0xf04 0 65 0xf04 0 66 0xf04
-                                             0 59 0xf04 0 68 0xf04 0 69 0xf04
-                                             0 70 0xf04 0 71 0xf04 0 72 0xf04
-                                             0 73 0xf04 0 74 0xf04 0 75 0xf04
-                                             0 76 0xf04 0 77 0xf04 0 78 0xf04
-                                             0 79 0xf04>;
-                       };
-               };
-               general-purpose {
-                       gp-0 {
-                               qrange = <4000 64>;
-                       };
-                       netcp-tx {
-                               qrange = <896 128>;
-                               qalloc-by-id;
-                       };
-               };
-       };
-       descriptor-regions {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-               region-12 {
-                       id = <12>;
-                       region-spec = <8192 128>;       /* num_desc desc_size */
-                       link-index = <0x4000>;
-               };
-       };
-}; /* qmss */
-
-knav_dmas: knav_dmas@0 {
-       compatible = "ti,keystone-navigator-dma";
-       clocks = <&papllclk>;
-       #address-cells = <1>;
-       #size-cells = <1>;
-       ranges;
-       ti,navigator-cloud-address = <0x23a80000 0x23a90000
-                                0x23a80000 0x23a90000>;
-
-       dma_gbe: dma_gbe@0 {
-               reg = <0x24186000 0x100>,
-                         <0x24187000 0x2a0>,
-                         <0x24188000 0xb60>,
-                         <0x24186100 0x80>,
-                         <0x24189000 0x1000>;
-               reg-names = "global", "txchan", "rxchan",
-                               "txsched", "rxflow";
-       };
-};
-
-netcp: netcp@24000000 {
-       reg = <0x2620110 0x8>;
-       reg-names = "efuse";
-       compatible = "ti,netcp-1.0";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       /* NetCP address range */
-       ranges = <0 0x24000000 0x1000000>;
-
-       clocks = <&papllclk>, <&clkcpgmac>, <&chipclk12>;
-       dma-coherent;
-
-       ti,navigator-dmas = <&dma_gbe 0>,
-                       <&dma_gbe 8>,
-                       <&dma_gbe 0>;
-       ti,navigator-dma-names = "netrx0", "netrx1", "nettx";
-
-       netcp-devices {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-               gbe@200000 { /* ETHSS */
-                       label = "netcp-gbe";
-                       compatible = "ti,netcp-gbe-9";
-                       reg = <0x200000 0x900>, <0x220000 0x20000>;
-                       /* enable-ale; */
-                       tx-queue = <896>;
-                       tx-channel = "nettx";
-
-                       interfaces {
-                               gbe0: interface-0 {
-                                       slave-port = <0>;
-                                       link-interface  = <1>;
-                                       phy-handle      = <&ethphy0>;
-                               };
-                               gbe1: interface-1 {
-                                       slave-port = <1>;
-                                       link-interface  = <1>;
-                                       phy-handle      = <&ethphy1>;
-                               };
-                       };
-
-                       secondary-slave-ports {
-                               port-2 {
-                                       slave-port = <2>;
-                                       link-interface  = <2>;
-                               };
-                               port-3 {
-                                       slave-port = <3>;
-                                       link-interface  = <2>;
-                               };
-                               port-4 {
-                                       slave-port = <4>;
-                                       link-interface  = <2>;
-                               };
-                               port-5 {
-                                       slave-port = <5>;
-                                       link-interface  = <2>;
-                               };
-                               port-6 {
-                                       slave-port = <6>;
-                                       link-interface  = <2>;
-                               };
-                               port-7 {
-                                       slave-port = <7>;
-                                       link-interface  = <2>;
-                               };
-                       };
-               };
-       };
-
-       netcp-interfaces {
-               interface-0 {
-                       rx-channel = "netrx0";
-                       rx-pool = <1024 12>;
-                       tx-pool = <1024 12>;
-                       rx-queue-depth = <128 128 0 0>;
-                       rx-buffer-size = <1518 4096 0 0>;
-                       rx-queue = <528>;
-                       tx-completion-queue = <530>;
-                       efuse-mac = <1>;
-                       netcp-gbe = <&gbe0>;
-
-               };
-               interface-1 {
-                       rx-channel = "netrx1";
-                       rx-pool = <1024 12>;
-                       tx-pool = <1024 12>;
-                       rx-queue-depth = <128 128 0 0>;
-                       rx-buffer-size = <1518 4096 0 0>;
-                       rx-queue = <529>;
-                       tx-completion-queue = <531>;
-                       efuse-mac = <0>;
-                       local-mac-address = [02 18 31 7e 3e 00];
-                       netcp-gbe = <&gbe1>;
-               };
-       };
-};
diff --git a/arch/arm/dts/k2e.dtsi b/arch/arm/dts/k2e.dtsi
deleted file mode 100644 (file)
index 675fb8e..0000000
+++ /dev/null
@@ -1,147 +0,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.
- */
-
-/ {
-       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;
-                       dma-coherent;
-                       dma-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>;
-                       };
-               };
-
-               dspgpio0: keystone_dsp_gpio@02620240 {
-                       compatible = "ti,keystone-dsp-gpio";
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio,syscon-dev = <&devctrl 0x240>;
-               };
-
-               pcie1: pcie@21020000 {
-                       compatible = "ti,keystone-pcie","snps,dw-pcie";
-                       clocks = <&clkpcie1>;
-                       clock-names = "pcie";
-                       #address-cells = <3>;
-                       #size-cells = <2>;
-                       reg =  <0x21021000 0x2000>, <0x21020000 0x1000>, <0x02620128 4>;
-                       ranges = <0x81000000 0 0 0x23260000 0x4000 0x4000
-                               0x82000000 0 0x60000000 0x60000000 0 0x10000000>;
-
-                       status = "disabled";
-                       device_type = "pci";
-                       num-lanes = <2>;
-
-                       #interrupt-cells = <1>;
-                       interrupt-map-mask = <0 0 0 7>;
-                       interrupt-map = <0 0 0 1 &pcie_intc1 0>, /* INT A */
-                                       <0 0 0 2 &pcie_intc1 1>, /* INT B */
-                                       <0 0 0 3 &pcie_intc1 2>, /* INT C */
-                                       <0 0 0 4 &pcie_intc1 3>; /* INT D */
-
-                       pcie_msi_intc1: msi-interrupt-controller {
-                               interrupt-controller;
-                               #interrupt-cells = <1>;
-                               interrupt-parent = <&gic>;
-                               interrupts = <GIC_SPI 377 IRQ_TYPE_EDGE_RISING>,
-                                       <GIC_SPI 378 IRQ_TYPE_EDGE_RISING>,
-                                       <GIC_SPI 379 IRQ_TYPE_EDGE_RISING>,
-                                       <GIC_SPI 380 IRQ_TYPE_EDGE_RISING>,
-                                       <GIC_SPI 381 IRQ_TYPE_EDGE_RISING>,
-                                       <GIC_SPI 382 IRQ_TYPE_EDGE_RISING>,
-                                       <GIC_SPI 383 IRQ_TYPE_EDGE_RISING>,
-                                       <GIC_SPI 384 IRQ_TYPE_EDGE_RISING>;
-                       };
-
-                       pcie_intc1: legacy-interrupt-controller {
-                               interrupt-controller;
-                               #interrupt-cells = <1>;
-                               interrupt-parent = <&gic>;
-                               interrupts = <GIC_SPI 373 IRQ_TYPE_EDGE_RISING>,
-                                       <GIC_SPI 374 IRQ_TYPE_EDGE_RISING>,
-                                       <GIC_SPI 375 IRQ_TYPE_EDGE_RISING>,
-                                       <GIC_SPI 376 IRQ_TYPE_EDGE_RISING>;
-                       };
-               };
-
-               mdio: mdio@24200f00 {
-                       compatible      = "ti,keystone_mdio", "ti,davinci_mdio";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0x24200f00 0x100>;
-                       status = "disabled";
-                       clocks = <&clkcpgmac>;
-                       clock-names = "fck";
-                       bus_freq        = <2500000>;
-               };
-               /include/ "k2e-netcp.dtsi"
-       };
-};
diff --git a/arch/arm/dts/k2g-evm.dts b/arch/arm/dts/k2g-evm.dts
deleted file mode 100644 (file)
index 61d0d55..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2014 Texas Instruments, Inc.
- *
- * Keystone 2 Galileo 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 "k2g.dtsi"
-
-/ {
-       compatible =  "ti,k2g-evm","ti,keystone";
-       model = "Texas Instruments Keystone 2 Galileo EVM";
-
-       chosen {
-               stdout-path = &uart0;
-       };
-};
-
-&mdio {
-       status = "okay";
-       ethphy0: ethernet-phy@0 {
-               reg = <0>;
-               phy-mode = "rgmii-id";
-       };
-};
-
-&gbe0 {
-       phy-handle = <&ethphy0>;
-};
-
-&spi1 {
-       status = "okay";
-
-       spi_nor: flash@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "spi-flash";
-               spi-max-frequency = <50000000>;
-               m25p,fast-read;
-               reg = <0>;
-
-               partition@0 {
-                       label = "u-boot-spl";
-                       reg = <0x0 0x80000>;
-                       read-only;
-               };
-
-               partition@1 {
-                       label = "misc";
-                       reg = <0x80000 0xf80000>;
-               };
-       };
-};
-
-&qspi {
-       status = "okay";
-
-        flash0: m25p80@0 {
-                compatible = "s25fl512s","spi-flash";
-                reg = <0>;
-                spi-tx-bus-width = <1>;
-                spi-rx-bus-width = <4>;
-                spi-max-frequency = <96000000>;
-                #address-cells = <1>;
-                #size-cells = <1>;
-                tshsl-ns = <392>;
-                tsd2d-ns = <392>;
-                tchsh-ns = <100>;
-                tslch-ns = <100>;
-               block-size = <18>;
-
-
-                partition@0 {
-                        label = "QSPI.u-boot-spl-os";
-                        reg = <0x00000000 0x00100000>;
-                };
-                partition@1 {
-                        label = "QSPI.u-boot-env";
-                        reg = <0x00100000 0x00040000>;
-                };
-                partition@2 {
-                        label = "QSPI.skern";
-                        reg = <0x00140000 0x0040000>;
-                };
-                partition@3 {
-                        label = "QSPI.pmmc-firmware";
-                        reg = <0x00180000 0x0040000>;
-                };
-                partition@4 {
-                        label = "QSPI.kernel";
-                        reg = <0x001C0000 0x0800000>;
-                };
-                partition@5 {
-                        label = "QSPI.file-system";
-                        reg = <0x009C0000 0x3640000>;
-                };
-        };
-};
-
-&mmc0 {
-       status = "okay";
-};
-
-&mmc1 {
-       status = "okay";
-};
diff --git a/arch/arm/dts/k2g-netcp.dtsi b/arch/arm/dts/k2g-netcp.dtsi
deleted file mode 100644 (file)
index 6f0ff86..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Device Tree Source for Keystone 2 Galileo 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.
- */
-
-qmss: qmss@4020000 {
-       compatible = "ti,keystone-navigator-qmss-l";
-       dma-coherent;
-       #address-cells = <1>;
-       #size-cells = <1>;
-       /* power-domains = <&k2g_pds K2G_DEV_NSS0>; */
-       /* clocks = <&k2g_clks K2G_DEV_NSS0 K2G_DEV_NSS_VCLK>; */
-       clock-names = "nss_vclk";
-       ranges;
-       queue-range     = <0 0x80>;
-       linkram0        = <0x4020000 0x7ff>;
-
-       qmgrs {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-               qmgr0 {
-                       managed-queues = <0 0x80>;
-                       reg = <0x4100000 0x800>,
-                             <0x4040000 0x100>,
-                             <0x4080000 0x800>,
-                             <0x40c0000 0x800>;
-                       reg-names = "peek", "config",
-                                   "region", "push";
-               };
-
-       };
-       queue-pools {
-               qpend {
-                       qpend-0 {
-                               qrange = <77 8>;
-                               interrupts =<0 308 0xf04 0 309 0xf04 0 310 0xf04
-                                            0 311 0xf04 0 312 0xf04 0 313 0xf04
-                                            0 314 0xf04 0 315 0xf04>;
-                               qalloc-by-id;
-                       };
-               };
-               general-purpose {
-                       gp-0 {
-                               qrange = <112 8>;
-                       };
-                       netcp-tx {
-                               qrange = <5 8>;
-                               qalloc-by-id;
-                       };
-               };
-       };
-
-       descriptor-regions {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-               region-12 {
-                       id = <12>;
-                       region-spec = <1023 128>; /* num_desc desc_size */
-                       link-index = <0x400>;
-               };
-       };
-}; /* qmss */
-
-knav_dmas: knav_dmas@0 {
-       compatible = "ti,keystone-navigator-dma";
-       #address-cells = <1>;
-       #size-cells = <1>;
-       /* power-domains = <&k2g_pds K2G_DEV_NSS0>; */
-       /* clocks = <&k2g_clks K2G_DEV_NSS0 K2G_DEV_NSS_VCLK>; */
-       clock-names = "nss_vclk";
-       ranges;
-       ti,navigator-cloud-address = <0x40c0000 0x40c0000 0x40c0000 0x40c0000>;
-
-       dma_gbe: dma_gbe@0 {
-               reg = <0x4010000 0x100>,
-                         <0x4011000 0x2a0>, /* 21 Tx channels */
-                         <0x4012000 0x400>, /* 32 Rx channels */
-                         <0x4010100 0x80>,
-                         <0x4013000 0x400>; /* 32 Rx flows */
-               reg-names = "global", "txchan", "rxchan",
-                               "txsched", "rxflow";
-       };
-
-};
-
-gbe_subsys: subsys@4200000 {
-       compatible = "syscon";
-       reg = <0x4200000 0x100>;
-};
-
-netcp: netcp@4000000 {
-       reg = <0x2620110 0x8>;
-       reg-names = "efuse";
-       compatible = "ti,netcp-1.0";
-       #address-cells = <1>;
-       #size-cells = <1>;
-       /* power-domains = <&k2g_pds K2G_DEV_NSS0>; */
-       /* clocks = <&k2g_clks K2G_DEV_NSS0 K2G_DEV_NSS_ESW_CLK>; */
-       clock-names = "ethss_clk";
-
-       /* NetCP address range */
-       ranges = <0 0x4000000 0x1000000>;
-
-       dma-coherent;
-
-       ti,navigator-dmas = <&dma_gbe 0>, <&dma_gbe 5>;
-       ti,navigator-dma-names = "netrx0", "nettx";
-
-       netcp-devices {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-               gbe@200000 {
-                       label = "netcp-gbe";
-                       compatible = "ti,netcp-gbe-2";
-                       syscon-subsys = <&gbe_subsys>;
-                       reg = <0x200100 0xe00>, <0x220000 0x20000>;
-                       /* enable-ale; */
-                       tx-queue = <5>;
-                       tx-channel = "nettx";
-
-                       interfaces {
-                               gbe0: interface-0 {
-                                       slave-port = <0>;
-                                       link-interface  = <5>;
-                               };
-                       };
-               };
-       };
-
-       netcp-interfaces {
-               interface-0 {
-                       rx-channel = "netrx0";
-                       rx-pool = <512 12>;
-                       tx-pool = <511 12>;
-                       rx-queue-depth = <128 128 0 0>;
-                       rx-buffer-size = <1518 4096 0 0>;
-                       rx-queue = <77>;
-                       tx-completion-queue = <78>;
-                       efuse-mac = <1>;
-                       netcp-gbe = <&gbe0>;
-               };
-       };
-};
diff --git a/arch/arm/dts/k2g.dtsi b/arch/arm/dts/k2g.dtsi
deleted file mode 100644 (file)
index add03b7..0000000
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright 2014 Texas Instruments, Inc.
- *
- * Keystone 2 Galileo 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.
- */
-
-#include <dt-bindings/interrupt-controller/arm-gic.h>
-#include "skeleton.dtsi"
-
-/ {
-       model = "Texas Instruments Keystone 2 SoC";
-       #address-cells = <1>;
-       #size-cells = <1>;
-       interrupt-parent = <&gic>;
-
-       aliases {
-               serial0 = &uart0;
-               spi0 = &spi0;
-               spi1 = &spi1;
-               spi2 = &spi2;
-               spi3 = &spi3;
-               spi4 = &qspi;
-       };
-
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x80000000>;
-       };
-
-       cpus {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               interrupt-parent = <&gic>;
-
-               cpu@0 {
-                       compatible = "arm,cortex-a15";
-                       device_type = "cpu";
-                       reg = <0>;
-               };
-       };
-
-       gic: interrupt-controller {
-               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)>;
-       };
-
-       soc {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "ti,keystone","simple-bus";
-               interrupt-parent = <&gic>;
-               ranges;
-
-               uart0: serial@02530c00 {
-                       compatible = "ns16550a";
-                       current-speed = <115200>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       reg = <0x02530c00 0x100>;
-                       clock-names = "uart";
-                       interrupts = <GIC_SPI 164 IRQ_TYPE_EDGE_RISING>;
-               };
-
-               mdio: mdio@4200f00 {
-                       compatible      = "ti,keystone_mdio", "ti,davinci_mdio";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       /* power-domains = <&k2g_pds K2G_DEV_NSS0>; */
-                       /* clocks = <&k2g_clks K2G_DEV_NSS0 K2G_DEV_NSS_ESW_CLK>; */
-                       clock-names = "fck";
-                       reg = <0x04200f00 0x100>;
-                       status = "disabled";
-                       bus_freq = <2500000>;
-               };
-
-               qspi: qspi@2940000 {
-                       compatible =  "cadence,qspi";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0x02940000 0x1000>,
-                             <0x24000000 0x4000000>;
-                       interrupts = <GIC_SPI 198 IRQ_TYPE_EDGE_RISING>;
-                       num-cs = <4>;
-                       fifo-depth = <256>;
-                       sram-size = <256>;
-                       status = "disabled";
-               };
-
-               #include "k2g-netcp.dtsi"
-
-               pmmc: pmmc@2900000 {
-                       compatible = "ti,power-processor";
-                       reg = <0x02900000 0x40000>;
-                       ti,lpsc_module = <1>;
-               };
-
-               spi0: spi@21805400 {
-                       compatible = "ti,keystone-spi", "ti,dm6441-spi";
-                       reg = <0x21805400 0x200>;
-                       num-cs = <4>;
-                       ti,davinci-spi-intr-line = <0>;
-                       interrupts = <GIC_SPI 64 IRQ_TYPE_EDGE_RISING>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       status = "disabled";
-               };
-
-               spi1: spi@21805800 {
-                       compatible = "ti,keystone-spi", "ti,dm6441-spi";
-                       reg = <0x21805800 0x200>;
-                       num-cs = <4>;
-                       ti,davinci-spi-intr-line = <0>;
-                       interrupts = <GIC_SPI 66 IRQ_TYPE_EDGE_RISING>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       status = "disabled";
-               };
-
-               spi2: spi@21805c00 {
-                       compatible = "ti,keystone-spi", "ti,dm6441-spi";
-                       reg = <0x21805C00 0x200>;
-                       num-cs = <4>;
-                       ti,davinci-spi-intr-line = <0>;
-                       interrupts = <GIC_SPI 68 IRQ_TYPE_EDGE_RISING>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       status = "disabled";
-               };
-
-               spi3: spi@21806000 {
-                       compatible = "ti,keystone-spi", "ti,dm6441-spi";
-                       reg = <0x21806000 0x200>;
-                       num-cs = <4>;
-                       ti,davinci-spi-intr-line = <0>;
-                       interrupts = <GIC_SPI 70 IRQ_TYPE_EDGE_RISING>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       status = "disabled";
-               };
-
-               mmc0: mmc@23000000 {
-                       compatible = "ti,omap4-hsmmc";
-                       reg = <0x23000000 0x400>;
-                       interrupts = <GIC_SPI 96 IRQ_TYPE_EDGE_RISING>;
-                       bus-width = <4>;
-                       ti,needs-special-reset;
-                       no-1-8-v;
-                       max-frequency = <96000000>;
-                       status = "disabled";
-               };
-
-               mmc1: mmc@23100000 {
-                       compatible = "ti,omap4-hsmmc";
-                       reg = <0x23100000 0x400>;
-                       interrupts = <GIC_SPI 97 IRQ_TYPE_EDGE_RISING>;
-                       bus-width = <8>;
-                       ti,needs-special-reset;
-                       ti,non-removable;
-                       max-frequency = <96000000>;
-                       status = "disabled";
-                       clock-names = "fck";
-               };
-       };
-};
diff --git a/arch/arm/dts/k2hk-clocks.dtsi b/arch/arm/dts/k2hk-clocks.dtsi
deleted file mode 100644 (file)
index af9b719..0000000
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- * 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>, <0x02310108 4>;
-               reg-names = "control", "multiplier", "post-divider";
-       };
-
-       papllclk: papllclk@2620358 {
-               #clock-cells = <0>;
-               compatible = "ti,keystone,pll-clock";
-               clocks = <&refclkpass>;
-               clock-output-names = "papllclk";
-               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 = <0x02350000 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>, <0x0235004c 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>;
-       };
-};
diff --git a/arch/arm/dts/k2hk-evm.dts b/arch/arm/dts/k2hk-evm.dts
deleted file mode 100644 (file)
index c5cad2c..0000000
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright 2013-2014 Texas Instruments, Inc.
- *
- * Keystone 2 Kepler/Hawking 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 "k2hk.dtsi"
-
-/ {
-       compatible =  "ti,k2hk-evm","ti,keystone";
-       model = "Texas Instruments Keystone 2 Kepler/Hawking EVM";
-
-       soc {
-               clocks {
-                       refclksys: refclksys {
-                               #clock-cells = <0>;
-                               compatible = "fixed-clock";
-                               clock-frequency = <122880000>;
-                               clock-output-names = "refclk-sys";
-                       };
-
-                       refclkpass: refclkpass {
-                               #clock-cells = <0>;
-                               compatible = "fixed-clock";
-                               clock-frequency = <122880000>;
-                               clock-output-names = "refclk-pass";
-                       };
-
-                       refclkarm: refclkarm {
-                               #clock-cells = <0>;
-                               compatible = "fixed-clock";
-                               clock-frequency = <125000000>;
-                               clock-output-names = "refclk-arm";
-                       };
-
-                       refclkddr3a: refclkddr3a {
-                               #clock-cells = <0>;
-                               compatible = "fixed-clock";
-                               clock-frequency = <100000000>;
-                               clock-output-names = "refclk-ddr3a";
-                       };
-
-                       refclkddr3b: refclkddr3b {
-                               #clock-cells = <0>;
-                               compatible = "fixed-clock";
-                               clock-frequency = <100000000>;
-                               clock-output-names = "refclk-ddr3b";
-                       };
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-               debug1_1 {
-                       label = "keystone:green:debug1";
-                       gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; /* 12 */
-               };
-
-               debug1_2 {
-                       label = "keystone:red:debug1";
-                       gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; /* 13 */
-               };
-
-               debug2 {
-                       label = "keystone:blue:debug2";
-                       gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; /* 14 */
-               };
-
-               debug3 {
-                       label = "keystone:blue:debug3";
-                       gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; /* 15 */
-               };
-       };
-};
-
-&usb_phy {
-       status = "okay";
-};
-
-&usb {
-       status = "okay";
-};
-
-&aemif {
-       cs0 {
-               #address-cells = <2>;
-               #size-cells = <1>;
-               clock-ranges;
-               ranges;
-
-               ti,cs-chipselect = <0>;
-               /* all timings in nanoseconds */
-               ti,cs-min-turnaround-ns = <12>;
-               ti,cs-read-hold-ns = <6>;
-               ti,cs-read-strobe-ns = <23>;
-               ti,cs-read-setup-ns = <9>;
-               ti,cs-write-hold-ns = <8>;
-               ti,cs-write-strobe-ns = <23>;
-               ti,cs-write-setup-ns = <8>;
-
-               nand@0,0 {
-                       compatible = "ti,keystone-nand","ti,davinci-nand";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       reg = <0 0 0x4000000
-                              1 0 0x0000100>;
-
-                       ti,davinci-chipselect = <0>;
-                       ti,davinci-mask-ale = <0x2000>;
-                       ti,davinci-mask-cle = <0x4000>;
-                       ti,davinci-mask-chipsel = <0>;
-                       nand-ecc-mode = "hw";
-                       ti,davinci-ecc-bits = <4>;
-                       nand-on-flash-bbt;
-
-                       partition@0 {
-                               label = "u-boot";
-                               reg = <0x0 0x100000>;
-                               read-only;
-                       };
-
-                       partition@100000 {
-                               label = "params";
-                               reg = <0x100000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@180000 {
-                               label = "ubifs";
-                               reg = <0x180000 0x1fe80000>;
-                       };
-               };
-       };
-};
-
-&i2c0 {
-       dtt@50 {
-               compatible = "at,24c1024";
-               reg = <0x50>;
-       };
-};
-
-&spi0 {
-       status = "okay";
-       nor_flash: n25q128a11@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "Micron,n25q128a11", "spi-flash";
-               spi-max-frequency = <54000000>;
-               m25p,fast-read;
-               reg = <0>;
-
-               partition@0 {
-                       label = "u-boot-spl";
-                       reg = <0x0 0x80000>;
-                       read-only;
-               };
-
-               partition@1 {
-                       label = "misc";
-                       reg = <0x80000 0xf80000>;
-               };
-       };
-};
-
-&mdio {
-       status = "ok";
-       ethphy0: ethernet-phy@0 {
-               compatible = "marvell,88E1111", "ethernet-phy-ieee802.3-c22";
-               reg = <0>;
-       };
-
-       ethphy1: ethernet-phy@1 {
-               compatible = "marvell,88E1111", "ethernet-phy-ieee802.3-c22";
-               reg = <1>;
-       };
-};
diff --git a/arch/arm/dts/k2hk-netcp.dtsi b/arch/arm/dts/k2hk-netcp.dtsi
deleted file mode 100644 (file)
index 77a32c3..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Device Tree Source for Keystone 2 Hawking 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.
- */
-
-qmss: qmss@2a40000 {
-       compatible = "ti,keystone-navigator-qmss";
-       dma-coherent;
-       #address-cells = <1>;
-       #size-cells = <1>;
-       clocks = <&chipclk13>;
-       ranges;
-       queue-range     = <0 0x4000>;
-       linkram0        = <0x100000 0x8000>;
-       linkram1        = <0x0 0x10000>;
-
-       qmgrs {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-               qmgr0 {
-                       managed-queues = <0 0x2000>;
-                       reg = <0x2a40000 0x20000>,
-                             <0x2a06000 0x400>,
-                             <0x2a02000 0x1000>,
-                             <0x2a03000 0x1000>,
-                             <0x23a80000 0x20000>,
-                             <0x2a80000 0x20000>;
-                       reg-names = "peek", "status", "config",
-                                   "region", "push", "pop";
-               };
-
-               qmgr1 {
-                       managed-queues = <0x2000 0x2000>;
-                       reg = <0x2a60000 0x20000>,
-                             <0x2a06400 0x400>,
-                             <0x2a04000 0x1000>,
-                             <0x2a05000 0x1000>,
-                             <0x23aa0000 0x20000>,
-                             <0x2aa0000 0x20000>;
-                       reg-names = "peek", "status", "config",
-                                   "region", "push", "pop";
-               };
-       };
-       queue-pools {
-               qpend {
-                       qpend-0 {
-                               qrange = <658 8>;
-                               interrupts =<0 40 0xf04 0 41 0xf04 0 42 0xf04
-                                            0 43 0xf04 0 44 0xf04 0 45 0xf04
-                                            0 46 0xf04 0 47 0xf04>;
-                       };
-                       qpend-1 {
-                               qrange = <8704 16>;
-                               interrupts = <0 48 0xf04 0 49 0xf04 0 50 0xf04
-                                             0 51 0xf04 0 52 0xf04 0 53 0xf04
-                                             0 54 0xf04 0 55 0xf04 0 56 0xf04
-                                             0 57 0xf04 0 58 0xf04 0 59 0xf04
-                                             0 60 0xf04 0 61 0xf04 0 62 0xf04
-                                             0 63 0xf04>;
-                               qalloc-by-id;
-                       };
-                       qpend-2 {
-                               qrange = <8720 16>;
-                               interrupts = <0 64 0xf04 0 65 0xf04 0 66 0xf04
-                                             0 59 0xf04 0 68 0xf04 0 69 0xf04
-                                             0 70 0xf04 0 71 0xf04 0 72 0xf04
-                                             0 73 0xf04 0 74 0xf04 0 75 0xf04
-                                             0 76 0xf04 0 77 0xf04 0 78 0xf04
-                                             0 79 0xf04>;
-                       };
-               };
-               general-purpose {
-                       gp-0 {
-                               qrange = <4000 64>;
-                       };
-                       netcp-tx {
-                               qrange = <640 9>;
-                               qalloc-by-id;
-                       };
-                       netcpx-tx {
-                               qrange = <8752 8>;
-                               qalloc-by-id;
-                       };
-               };
-       };
-       descriptor-regions {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-               region-12 {
-                       id = <12>;
-                       region-spec = <8192 128>;       /* num_desc desc_size */
-                       link-index = <0x4000>;
-               };
-       };
-}; /* qmss */
-
-knav_dmas: knav_dmas@0 {
-       compatible = "ti,keystone-navigator-dma";
-       clocks = <&papllclk>;
-       #address-cells = <1>;
-       #size-cells = <1>;
-       ranges;
-       ti,navigator-cloud-address = <0x23a80000 0x23a90000
-                                  0x23aa0000 0x23ab0000>;
-
-       dma_gbe: dma_gbe@0 {
-               reg = <0x2004000 0x100>,
-                         <0x2004400 0x120>,
-                         <0x2004800 0x300>,
-                         <0x2004c00 0x120>,
-                         <0x2005000 0x400>;
-               reg-names = "global", "txchan", "rxchan",
-                               "txsched", "rxflow";
-       };
-};
-
-netcp: netcp@2000000 {
-       reg = <0x2620110 0x8>;
-       reg-names = "efuse";
-       compatible = "ti,netcp-1.0";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       /* NetCP address range */
-       ranges  = <0 0x2000000 0x100000>;
-
-       clocks = <&papllclk>, <&clkcpgmac>, <&chipclk12>;
-       dma-coherent;
-
-       ti,navigator-dmas = <&dma_gbe 22>,
-                       <&dma_gbe 23>,
-                       <&dma_gbe 8>;
-       ti,navigator-dma-names = "netrx0", "netrx1", "nettx";
-
-       netcp-devices {
-               ranges;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               gbe@90000 { /* ETHSS */
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       label = "netcp-gbe";
-                       compatible = "ti,netcp-gbe";
-                       reg = <0x90000 0x300>, <0x90400 0x400>, <0x90800 0x700>;
-                       /* enable-ale; */
-                       tx-queue = <648>;
-                       tx-channel = "nettx";
-
-                       interfaces {
-                               gbe0: interface-0 {
-                                       slave-port = <0>;
-                                       link-interface = <1>;
-                                       phy-handle = <&ethphy0>;
-                               };
-                               gbe1: interface-1 {
-                                       slave-port = <1>;
-                                       link-interface = <1>;
-                                       phy-handle = <&ethphy1>;
-                               };
-                       };
-
-                       secondary-slave-ports {
-                               port-2 {
-                                       slave-port = <2>;
-                                       link-interface  = <2>;
-                               };
-                               port-3 {
-                                       slave-port = <3>;
-                                       link-interface  = <2>;
-                               };
-                       };
-               };
-       };
-
-       netcp-interfaces {
-               interface-0 {
-                       rx-channel = "netrx0";
-                       rx-pool = <1024 12>;
-                       tx-pool = <1024 12>;
-                       rx-queue-depth = <128 128 0 0>;
-                       rx-buffer-size = <1518 4096 0 0>;
-                       rx-queue = <8704>;
-                       tx-completion-queue = <8706>;
-                       efuse-mac = <1>;
-                       netcp-gbe = <&gbe0>;
-
-               };
-               interface-1 {
-                       rx-channel = "netrx1";
-                       rx-pool = <1024 12>;
-                       tx-pool = <1024 12>;
-                       rx-queue-depth = <128 128 0 0>;
-                       rx-buffer-size = <1518 4096 0 0>;
-                       rx-queue = <8705>;
-                       tx-completion-queue = <8707>;
-                       efuse-mac = <0>;
-                       local-mac-address = [02 18 31 7e 3e 6f];
-                       netcp-gbe = <&gbe1>;
-               };
-       };
-};
diff --git a/arch/arm/dts/k2hk.dtsi b/arch/arm/dts/k2hk.dtsi
deleted file mode 100644 (file)
index d0810a5..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2013-2014 Texas Instruments, Inc.
- *
- * Keystone 2 Kepler/Hawking 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.
- */
-
-/ {
-       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/ "k2hk-clocks.dtsi"
-
-               dspgpio0: keystone_dsp_gpio@02620240 {
-                       compatible = "ti,keystone-dsp-gpio";
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio,syscon-dev = <&devctrl 0x240>;
-               };
-
-               dspgpio1: keystone_dsp_gpio@2620244 {
-                       compatible = "ti,keystone-dsp-gpio";
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio,syscon-dev = <&devctrl 0x244>;
-               };
-
-               dspgpio2: keystone_dsp_gpio@2620248 {
-                       compatible = "ti,keystone-dsp-gpio";
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio,syscon-dev = <&devctrl 0x248>;
-               };
-
-               dspgpio3: keystone_dsp_gpio@262024c {
-                       compatible = "ti,keystone-dsp-gpio";
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio,syscon-dev = <&devctrl 0x24c>;
-               };
-
-               dspgpio4: keystone_dsp_gpio@2620250 {
-                       compatible = "ti,keystone-dsp-gpio";
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio,syscon-dev = <&devctrl 0x250>;
-               };
-
-               dspgpio5: keystone_dsp_gpio@2620254 {
-                       compatible = "ti,keystone-dsp-gpio";
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio,syscon-dev = <&devctrl 0x254>;
-               };
-
-               dspgpio6: keystone_dsp_gpio@2620258 {
-                       compatible = "ti,keystone-dsp-gpio";
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio,syscon-dev = <&devctrl 0x258>;
-               };
-
-               dspgpio7: keystone_dsp_gpio@262025c {
-                       compatible = "ti,keystone-dsp-gpio";
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio,syscon-dev = <&devctrl 0x25c>;
-               };
-
-               mdio: mdio@02090300 {
-                       compatible      = "ti,keystone_mdio", "ti,davinci_mdio";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0x02090300 0x100>;
-                       status = "disabled";
-                       clocks = <&clkcpgmac>;
-                       clock-names = "fck";
-                       bus_freq        = <2500000>;
-               };
-               /include/ "k2hk-netcp.dtsi"
-       };
-};
diff --git a/arch/arm/dts/k2l-clocks.dtsi b/arch/arm/dts/k2l-clocks.dtsi
deleted file mode 100644 (file)
index ef8464b..0000000
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright 2013-2014 Texas Instruments, Inc.
- *
- * Keystone 2 lamarr 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 = <&refclksys>;
-               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>, <0x02310108 4>;
-               reg-names = "control", "multiplier", "post-divider";
-       };
-
-       papllclk: papllclk@2620358 {
-               #clock-cells = <0>;
-               compatible = "ti,keystone,pll-clock";
-               clocks = <&refclksys>;
-               clock-output-names = "papllclk";
-               reg = <0x02620358 4>;
-               reg-names = "control";
-       };
-
-       ddr3apllclk: ddr3apllclk@2620360 {
-               #clock-cells = <0>;
-               compatible = "ti,keystone,pll-clock";
-               clocks = <&refclksys>;
-               clock-output-names = "ddr-3a-pll-clk";
-               reg = <0x02620360 4>;
-               reg-names = "control";
-       };
-
-       clkdfeiqnsys: clkdfeiqnsys {
-               #clock-cells = <0>;
-               compatible = "ti,keystone,psc-clock";
-               clocks = <&chipclk12>;
-               clock-output-names = "dfe";
-               reg-names = "control", "domain";
-               reg = <0x02350004 0xb00>, <0x02350000 0x400>;
-               domain-id = <0>;
-       };
-
-       clkpcie1: clkpcie1 {
-               #clock-cells = <0>;
-               compatible = "ti,keystone,psc-clock";
-               clocks = <&chipclk12>;
-               clock-output-names = "pcie";
-               reg = <0x0235002c 0xb00>, <0x02350000 0x400>;
-               reg-names = "control", "domain";
-               domain-id = <4>;
-       };
-
-       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>;
-       };
-
-       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>;
-       };
-
-       clkrac: clkrac {
-               #clock-cells = <0>;
-               compatible = "ti,keystone,psc-clock";
-               clocks = <&chipclk13>;
-               clock-output-names = "rac";
-               reg = <0x02350068 0xb00>, <0x02350044 0x400>;
-               reg-names = "control", "domain";
-               domain-id = <17>;
-       };
-
-       clkdfepd0: clkdfepd0 {
-               #clock-cells = <0>;
-               compatible = "ti,keystone,psc-clock";
-               clocks = <&chipclk13>;
-               clock-output-names = "dfe-pd0";
-               reg = <0x0235006c 0xb00>, <0x02350044 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>;
-       };
-
-       clkosr: clkosr {
-               #clock-cells = <0>;
-               compatible = "ti,keystone,psc-clock";
-               clocks = <&chipclk13>;
-               clock-output-names = "osr";
-               reg = <0x02350088 0xb00>, <0x0235004c 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 = <0x02350094 0xb00>, <0x02350058 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>;
-       };
-
-       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>;
-       };
-
-       clkdfepd1: clkdfepd1 {
-               #clock-cells = <0>;
-               compatible = "ti,keystone,psc-clock";
-               clocks = <&chipclk13>;
-               clock-output-names = "dfe-pd1";
-               reg = <0x023500c0 0xb00>, <0x02350044 0x400>;
-               reg-names = "control", "domain";
-               domain-id = <27>;
-       };
-
-       clkfftc1: clkfftc1 {
-               #clock-cells = <0>;
-               compatible = "ti,keystone,psc-clock";
-               clocks = <&chipclk13>;
-               clock-output-names = "fftc-1";
-               reg = <0x023500c4 0xb00>, <0x023504c0 0x400>;
-               reg-names = "control", "domain";
-               domain-id = <28>;
-       };
-
-       clkiqnail: clkiqnail {
-               #clock-cells = <0>;
-               compatible = "ti,keystone,psc-clock";
-               clocks = <&chipclk13>;
-               clock-output-names = "iqn-ail";
-               reg = <0x023500c8 0xb00>, <0x0235004c 0x400>;
-               reg-names = "control", "domain";
-               domain-id = <29>;
-       };
-
-       clkuart2: clkuart2 {
-               #clock-cells = <0>;
-               compatible = "ti,keystone,psc-clock";
-               clocks = <&clkmodrst0>;
-               clock-output-names = "uart2";
-               reg = <0x02350000 0xb00>, <0x02350000 0x400>;
-               reg-names = "control", "domain";
-               domain-id = <0>;
-       };
-
-       clkuart3: clkuart3 {
-               #clock-cells = <0>;
-               compatible = "ti,keystone,psc-clock";
-               clocks = <&clkmodrst0>;
-               clock-output-names = "uart3";
-               reg = <0x02350000 0xb00>, <0x02350000 0x400>;
-               reg-names = "control", "domain";
-               domain-id = <0>;
-       };
-};
diff --git a/arch/arm/dts/k2l-evm.dts b/arch/arm/dts/k2l-evm.dts
deleted file mode 100644 (file)
index da0661b..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2014 Texas Instruments, Inc.
- *
- * Keystone 2 Lamarr 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 "k2l.dtsi"
-
-/ {
-       compatible =  "ti,k2l-evm","ti,keystone";
-       model = "Texas Instruments Keystone 2 Lamarr EVM";
-
-       soc {
-               clocks {
-                       refclksys: refclksys {
-                               #clock-cells = <0>;
-                               compatible = "fixed-clock";
-                               clock-frequency = <122880000>;
-                               clock-output-names = "refclk-sys";
-                       };
-               };
-       };
-};
-
-&usb_phy {
-       status = "okay";
-};
-
-&usb {
-       status = "okay";
-};
-
-&i2c0 {
-       dtt@50 {
-               compatible = "at,24c1024";
-               reg = <0x50>;
-       };
-};
-
-&aemif {
-       cs0 {
-               #address-cells = <2>;
-               #size-cells = <1>;
-               clock-ranges;
-               ranges;
-
-               ti,cs-chipselect = <0>;
-               /* all timings in nanoseconds */
-               ti,cs-min-turnaround-ns = <12>;
-               ti,cs-read-hold-ns = <6>;
-               ti,cs-read-strobe-ns = <23>;
-               ti,cs-read-setup-ns = <9>;
-               ti,cs-write-hold-ns = <8>;
-               ti,cs-write-strobe-ns = <23>;
-               ti,cs-write-setup-ns = <8>;
-
-               nand@0,0 {
-                       compatible = "ti,keystone-nand","ti,davinci-nand";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       reg = <0 0 0x4000000
-                              1 0 0x0000100>;
-
-                       ti,davinci-chipselect = <0>;
-                       ti,davinci-mask-ale = <0x2000>;
-                       ti,davinci-mask-cle = <0x4000>;
-                       ti,davinci-mask-chipsel = <0>;
-                       nand-ecc-mode = "hw";
-                       ti,davinci-ecc-bits = <4>;
-                       nand-on-flash-bbt;
-
-                       partition@0 {
-                               label = "u-boot";
-                               reg = <0x0 0x100000>;
-                               read-only;
-                       };
-
-                       partition@100000 {
-                               label = "params";
-                               reg = <0x100000 0x80000>;
-                               read-only;
-                       };
-
-                       partition@180000 {
-                               label = "ubifs";
-                               reg = <0x180000 0x7FE80000>;
-                       };
-               };
-       };
-};
-
-&spi0 {
-       status ="okay";
-       nor_flash: n25q128a11@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "Micron,n25q128a11", "spi-flash";
-               spi-max-frequency = <54000000>;
-               m25p,fast-read;
-               reg = <0>;
-
-               partition@0 {
-                       label = "u-boot-spl";
-                       reg = <0x0 0x80000>;
-                       read-only;
-               };
-
-               partition@1 {
-                       label = "misc";
-                       reg = <0x80000 0xf80000>;
-               };
-       };
-};
-
-&mdio {
-       status = "ok";
-       ethphy0: ethernet-phy@0 {
-               compatible = "marvell,88E1514", "marvell,88E1510", "ethernet-phy-ieee802.3-c22";
-               reg = <0>;
-       };
-
-       ethphy1: ethernet-phy@1 {
-               compatible = "marvell,88E1514", "marvell,88E1510", "ethernet-phy-ieee802.3-c22";
-               reg = <1>;
-       };
-};
diff --git a/arch/arm/dts/k2l-netcp.dtsi b/arch/arm/dts/k2l-netcp.dtsi
deleted file mode 100644 (file)
index 6b95284..0000000
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Device Tree Source for Keystone 2 Lamarr 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.
- */
-
-qmss: qmss@2a40000 {
-       compatible = "ti,keystone-navigator-qmss";
-       dma-coherent;
-       #address-cells = <1>;
-       #size-cells = <1>;
-       clocks = <&chipclk13>;
-       ranges;
-       queue-range     = <0 0x2000>;
-       linkram0        = <0x100000 0x4000>;
-       linkram1        = <0x70000000 0x10000>; /* 1MB OSR mem */
-
-       qmgrs {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-               qmgr0 {
-                       managed-queues = <0 0x2000>;
-                       reg = <0x2a40000 0x20000>,
-                             <0x2a06000 0x400>,
-                             <0x2a02000 0x1000>,
-                             <0x2a03000 0x1000>,
-                             <0x23a80000 0x20000>,
-                             <0x2a80000 0x20000>;
-                       reg-names = "peek", "status", "config",
-                                   "region", "push", "pop";
-               };
-       };
-       queue-pools {
-               qpend {
-                       qpend-0 {
-                               qrange = <658 8>;
-                               interrupts =<0 40 0xf04 0 41 0xf04 0 42 0xf04
-                                            0 43 0xf04 0 44 0xf04 0 45 0xf04
-                                            0 46 0xf04 0 47 0xf04>;
-                       };
-                       qpend-1 {
-                               qrange = <528 16>;
-                               interrupts = <0 48 0xf04 0 49 0xf04 0 50 0xf04
-                                             0 51 0xf04 0 52 0xf04 0 53 0xf04
-                                             0 54 0xf04 0 55 0xf04 0 56 0xf04
-                                             0 57 0xf04 0 58 0xf04 0 59 0xf04
-                                             0 60 0xf04 0 61 0xf04 0 62 0xf04
-                                             0 63 0xf04>;
-                               qalloc-by-id;
-                       };
-                       qpend-2 {
-                               qrange = <544 16>;
-                               interrupts = <0 64 0xf04 0 65 0xf04 0 66 0xf04
-                                             0 59 0xf04 0 68 0xf04 0 69 0xf04
-                                             0 70 0xf04 0 71 0xf04 0 72 0xf04
-                                             0 73 0xf04 0 74 0xf04 0 75 0xf04
-                                             0 76 0xf04 0 77 0xf04 0 78 0xf04
-                                             0 79 0xf04>;
-                       };
-               };
-               general-purpose {
-                       gp-0 {
-                               qrange = <4000 64>;
-                       };
-                       netcp-tx {
-                               qrange = <896 128>;
-                               qalloc-by-id;
-                       };
-               };
-       };
-       descriptor-regions {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-               region-12 {
-                       id = <12>;
-                       region-spec = <8192 128>;       /* num_desc desc_size */
-                       link-index = <0x4000>;
-               };
-       };
-}; /* qmss */
-
-knav_dmas: knav_dmas@0 {
-       compatible = "ti,keystone-navigator-dma";
-       clocks = <&papllclk>;
-       #address-cells = <1>;
-       #size-cells = <1>;
-       ranges;
-       ti,navigator-cloud-address = <0x23a80000 0x23a90000>;
-
-       dma_gbe: dma_gbe@0 {
-               reg = <0x26186000 0x100>,
-                         <0x26187000 0x2a0>,
-                         <0x26188000 0xb60>,
-                         <0x26186100 0x80>,
-                         <0x26189000 0x1000>;
-               reg-names = "global", "txchan", "rxchan",
-                               "txsched", "rxflow";
-       };
-};
-
-netcp: netcp@26000000 {
-       reg = <0x2620110 0x8>;
-       reg-names = "efuse";
-       compatible = "ti,netcp-1.0";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       /* NetCP address range */
-       ranges = <0 0x26000000 0x1000000>;
-
-       clocks = <&papllclk>, <&clkcpgmac>, <&chipclk12>;
-       dma-coherent;
-
-       ti,navigator-dmas = <&dma_gbe 0>,
-                       <&dma_gbe 8>,
-                       <&dma_gbe 0>;
-       ti,navigator-dma-names = "netrx0", "netrx1", "nettx";
-
-       netcp-devices {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-               gbe@200000 { /* ETHSS */
-                       label = "netcp-gbe";
-                       compatible = "ti,netcp-gbe-5";
-                       reg = <0x200000 0x900>, <0x220000 0x20000>;
-                       /* enable-ale; */
-                       tx-queue = <896>;
-                       tx-channel = "nettx";
-
-                       interfaces {
-                               gbe0: interface-0 {
-                                       slave-port = <0>;
-                                       link-interface  = <1>;
-                                       phy-handle      = <&ethphy0>;
-                               };
-                               gbe1: interface-1 {
-                                       slave-port = <1>;
-                                       link-interface  = <1>;
-                                       phy-handle      = <&ethphy1>;
-                               };
-                       };
-
-                       secondary-slave-ports {
-                               port-2 {
-                                       slave-port = <2>;
-                                       link-interface  = <2>;
-                               };
-                               port-3 {
-                                       slave-port = <3>;
-                                       link-interface  = <2>;
-                               };
-                       };
-               };
-       };
-
-       netcp-interfaces {
-               interface-0 {
-                       rx-channel = "netrx0";
-                       rx-pool = <1024 12>;
-                       tx-pool = <1024 12>;
-                       rx-queue-depth = <128 128 0 0>;
-                       rx-buffer-size = <1518 4096 0 0>;
-                       rx-queue = <528>;
-                       tx-completion-queue = <530>;
-                       efuse-mac = <1>;
-                       netcp-gbe = <&gbe0>;
-
-               };
-               interface-1 {
-                       rx-channel = "netrx1";
-                       rx-pool = <1024 12>;
-                       tx-pool = <1024 12>;
-                       rx-queue-depth = <128 128 0 0>;
-                       rx-buffer-size = <1518 4096 0 0>;
-                       rx-queue = <529>;
-                       tx-completion-queue = <531>;
-                       efuse-mac = <0>;
-                       local-mac-address = [02 18 31 7e 3e 7f];
-                       netcp-gbe = <&gbe1>;
-               };
-       };
-};
diff --git a/arch/arm/dts/k2l.dtsi b/arch/arm/dts/k2l.dtsi
deleted file mode 100644 (file)
index 49fd414..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2014 Texas Instruments, Inc.
- *
- * Keystone 2 Lamarr 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.
- */
-
-/ {
-       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>;
-               };
-       };
-
-       soc {
-               /include/ "k2l-clocks.dtsi"
-
-               uart2: serial@02348400 {
-                       compatible = "ns16550a";
-                       current-speed = <115200>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       reg = <0x02348400 0x100>;
-                       clocks  = <&clkuart2>;
-                       interrupts = <GIC_SPI 432 IRQ_TYPE_EDGE_RISING>;
-               };
-
-               uart3:  serial@02348800 {
-                       compatible = "ns16550a";
-                       current-speed = <115200>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       reg = <0x02348800 0x100>;
-                       clocks  = <&clkuart3>;
-                       interrupts = <GIC_SPI 435 IRQ_TYPE_EDGE_RISING>;
-               };
-
-               dspgpio0: keystone_dsp_gpio@02620240 {
-                       compatible = "ti,keystone-dsp-gpio";
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio,syscon-dev = <&devctrl 0x240>;
-               };
-
-               dspgpio1: keystone_dsp_gpio@2620244 {
-                       compatible = "ti,keystone-dsp-gpio";
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio,syscon-dev = <&devctrl 0x244>;
-               };
-
-               dspgpio2: keystone_dsp_gpio@2620248 {
-                       compatible = "ti,keystone-dsp-gpio";
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio,syscon-dev = <&devctrl 0x248>;
-               };
-
-               dspgpio3: keystone_dsp_gpio@262024c {
-                       compatible = "ti,keystone-dsp-gpio";
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio,syscon-dev = <&devctrl 0x24c>;
-               };
-
-               mdio: mdio@26200f00 {
-                       compatible      = "ti,keystone_mdio", "ti,davinci_mdio";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0x26200f00 0x100>;
-                       status = "disabled";
-                       clocks = <&clkcpgmac>;
-                       clock-names = "fck";
-                       bus_freq        = <2500000>;
-               };
-               /include/ "k2l-netcp.dtsi"
-       };
-};
-
-&spi0 {
-       ti,davinci-spi-num-cs = <5>;
-};
-
-&spi1 {
-       ti,davinci-spi-num-cs = <3>;
-};
-
-&spi2 {
-       ti,davinci-spi-num-cs = <5>;
-       /* Pin muxed. Enabled and configured by Bootloader */
-       status = "disabled";
-};
diff --git a/arch/arm/dts/keystone-k2e-clocks.dtsi b/arch/arm/dts/keystone-k2e-clocks.dtsi
new file mode 100644 (file)
index 0000000..d56d68f
--- /dev/null
@@ -0,0 +1,77 @@
+/*
+ * 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>, <0x02310108 4>;
+               reg-names = "control", "multiplier", "post-divider";
+       };
+
+       papllclk: papllclk@2620358 {
+               #clock-cells = <0>;
+               compatible = "ti,keystone,pll-clock";
+               clocks = <&refclkpass>;
+               clock-output-names = "papllclk";
+               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 = "usb1";
+               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 = "pcie1";
+               reg = <0x0235006c 0xb00>, <0x02350048 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>;
+       };
+};
diff --git a/arch/arm/dts/keystone-k2e-evm.dts b/arch/arm/dts/keystone-k2e-evm.dts
new file mode 100644 (file)
index 0000000..3be8b53
--- /dev/null
@@ -0,0 +1,155 @@
+/*
+ * 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 "keystone-k2e.dtsi"
+
+/ {
+       compatible =  "ti,k2e-evm","ti,keystone";
+       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";
+};
+
+&i2c0 {
+       dtt@50 {
+               compatible = "at,24c1024";
+               reg = <0x50>;
+       };
+};
+
+&aemif {
+       cs0 {
+               #address-cells = <2>;
+               #size-cells = <1>;
+               clock-ranges;
+               ranges;
+
+               ti,cs-chipselect = <0>;
+               /* all timings in nanoseconds */
+               ti,cs-min-turnaround-ns = <12>;
+               ti,cs-read-hold-ns = <6>;
+               ti,cs-read-strobe-ns = <23>;
+               ti,cs-read-setup-ns = <9>;
+               ti,cs-write-hold-ns = <8>;
+               ti,cs-write-strobe-ns = <23>;
+               ti,cs-write-setup-ns = <8>;
+
+               nand@0,0 {
+                       compatible = "ti,keystone-nand","ti,davinci-nand";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       reg = <0 0 0x4000000
+                              1 0 0x0000100>;
+
+                       ti,davinci-chipselect = <0>;
+                       ti,davinci-mask-ale = <0x2000>;
+                       ti,davinci-mask-cle = <0x4000>;
+                       ti,davinci-mask-chipsel = <0>;
+                       nand-ecc-mode = "hw";
+                       ti,davinci-ecc-bits = <4>;
+                       nand-on-flash-bbt;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x100000>;
+                               read-only;
+                       };
+
+                       partition@100000 {
+                               label = "params";
+                               reg = <0x100000 0x80000>;
+                               read-only;
+                       };
+
+                       partition@180000 {
+                               label = "ubifs";
+                               reg = <0x180000 0x1FE80000>;
+                       };
+               };
+       };
+};
+
+&spi0 {
+       status = "okay";
+       nor_flash: n25q128a11@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "Micron,n25q128a11", "spi-flash";
+               spi-max-frequency = <54000000>;
+               m25p,fast-read;
+               reg = <0>;
+
+               partition@0 {
+                       label = "u-boot-spl";
+                       reg = <0x0 0x80000>;
+                       read-only;
+               };
+
+               partition@1 {
+                       label = "misc";
+                       reg = <0x80000 0xf80000>;
+               };
+       };
+};
+
+&mdio {
+       status = "ok";
+       ethphy0: ethernet-phy@0 {
+               compatible = "marvell,88E1514", "marvell,88E1510", "ethernet-phy-ieee802.3-c22";
+               reg = <0>;
+       };
+
+       ethphy1: ethernet-phy@1 {
+               compatible = "marvell,88E1514", "marvell,88E1510", "ethernet-phy-ieee802.3-c22";
+               reg = <1>;
+       };
+};
diff --git a/arch/arm/dts/keystone-k2e-netcp.dtsi b/arch/arm/dts/keystone-k2e-netcp.dtsi
new file mode 100644 (file)
index 0000000..b13b3c9
--- /dev/null
@@ -0,0 +1,206 @@
+/*
+ * 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.
+ */
+
+qmss: qmss@2a40000 {
+       compatible = "ti,keystone-navigator-qmss";
+       dma-coherent;
+       #address-cells = <1>;
+       #size-cells = <1>;
+       clocks = <&chipclk13>;
+       ranges;
+       queue-range     = <0 0x2000>;
+       linkram0        = <0x100000 0x4000>;
+       linkram1        = <0 0x10000>;
+
+       qmgrs {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+               qmgr0 {
+                       managed-queues = <0 0x2000>;
+                       reg = <0x2a40000 0x20000>,
+                             <0x2a06000 0x400>,
+                             <0x2a02000 0x1000>,
+                             <0x2a03000 0x1000>,
+                             <0x23a80000 0x20000>,
+                             <0x2a80000 0x20000>;
+                       reg-names = "peek", "status", "config",
+                                   "region", "push", "pop";
+               };
+       };
+       queue-pools {
+               qpend {
+                       qpend-0 {
+                               qrange = <658 8>;
+                               interrupts =<0 40 0xf04 0 41 0xf04 0 42 0xf04
+                                            0 43 0xf04 0 44 0xf04 0 45 0xf04
+                                            0 46 0xf04 0 47 0xf04>;
+                       };
+                       qpend-1 {
+                               qrange = <528 16>;
+                               interrupts = <0 48 0xf04 0 49 0xf04 0 50 0xf04
+                                             0 51 0xf04 0 52 0xf04 0 53 0xf04
+                                             0 54 0xf04 0 55 0xf04 0 56 0xf04
+                                             0 57 0xf04 0 58 0xf04 0 59 0xf04
+                                             0 60 0xf04 0 61 0xf04 0 62 0xf04
+                                             0 63 0xf04>;
+                               qalloc-by-id;
+                       };
+                       qpend-2 {
+                               qrange = <544 16>;
+                               interrupts = <0 64 0xf04 0 65 0xf04 0 66 0xf04
+                                             0 59 0xf04 0 68 0xf04 0 69 0xf04
+                                             0 70 0xf04 0 71 0xf04 0 72 0xf04
+                                             0 73 0xf04 0 74 0xf04 0 75 0xf04
+                                             0 76 0xf04 0 77 0xf04 0 78 0xf04
+                                             0 79 0xf04>;
+                       };
+               };
+               general-purpose {
+                       gp-0 {
+                               qrange = <4000 64>;
+                       };
+                       netcp-tx {
+                               qrange = <896 128>;
+                               qalloc-by-id;
+                       };
+               };
+       };
+       descriptor-regions {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+               region-12 {
+                       id = <12>;
+                       region-spec = <8192 128>;       /* num_desc desc_size */
+                       link-index = <0x4000>;
+               };
+       };
+}; /* qmss */
+
+knav_dmas: knav_dmas@0 {
+       compatible = "ti,keystone-navigator-dma";
+       clocks = <&papllclk>;
+       #address-cells = <1>;
+       #size-cells = <1>;
+       ranges;
+       ti,navigator-cloud-address = <0x23a80000 0x23a90000
+                                0x23a80000 0x23a90000>;
+
+       dma_gbe: dma_gbe@0 {
+               reg = <0x24186000 0x100>,
+                         <0x24187000 0x2a0>,
+                         <0x24188000 0xb60>,
+                         <0x24186100 0x80>,
+                         <0x24189000 0x1000>;
+               reg-names = "global", "txchan", "rxchan",
+                               "txsched", "rxflow";
+       };
+};
+
+netcp: netcp@24000000 {
+       reg = <0x2620110 0x8>;
+       reg-names = "efuse";
+       compatible = "ti,netcp-1.0";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       /* NetCP address range */
+       ranges = <0 0x24000000 0x1000000>;
+
+       clocks = <&papllclk>, <&clkcpgmac>, <&chipclk12>;
+       dma-coherent;
+
+       ti,navigator-dmas = <&dma_gbe 0>,
+                       <&dma_gbe 8>,
+                       <&dma_gbe 0>;
+       ti,navigator-dma-names = "netrx0", "netrx1", "nettx";
+
+       netcp-devices {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+               gbe@200000 { /* ETHSS */
+                       label = "netcp-gbe";
+                       compatible = "ti,netcp-gbe-9";
+                       reg = <0x200000 0x900>, <0x220000 0x20000>;
+                       /* enable-ale; */
+                       tx-queue = <896>;
+                       tx-channel = "nettx";
+
+                       interfaces {
+                               gbe0: interface-0 {
+                                       slave-port = <0>;
+                                       link-interface  = <1>;
+                                       phy-handle      = <&ethphy0>;
+                               };
+                               gbe1: interface-1 {
+                                       slave-port = <1>;
+                                       link-interface  = <1>;
+                                       phy-handle      = <&ethphy1>;
+                               };
+                       };
+
+                       secondary-slave-ports {
+                               port-2 {
+                                       slave-port = <2>;
+                                       link-interface  = <2>;
+                               };
+                               port-3 {
+                                       slave-port = <3>;
+                                       link-interface  = <2>;
+                               };
+                               port-4 {
+                                       slave-port = <4>;
+                                       link-interface  = <2>;
+                               };
+                               port-5 {
+                                       slave-port = <5>;
+                                       link-interface  = <2>;
+                               };
+                               port-6 {
+                                       slave-port = <6>;
+                                       link-interface  = <2>;
+                               };
+                               port-7 {
+                                       slave-port = <7>;
+                                       link-interface  = <2>;
+                               };
+                       };
+               };
+       };
+
+       netcp-interfaces {
+               interface-0 {
+                       rx-channel = "netrx0";
+                       rx-pool = <1024 12>;
+                       tx-pool = <1024 12>;
+                       rx-queue-depth = <128 128 0 0>;
+                       rx-buffer-size = <1518 4096 0 0>;
+                       rx-queue = <528>;
+                       tx-completion-queue = <530>;
+                       efuse-mac = <1>;
+                       netcp-gbe = <&gbe0>;
+
+               };
+               interface-1 {
+                       rx-channel = "netrx1";
+                       rx-pool = <1024 12>;
+                       tx-pool = <1024 12>;
+                       rx-queue-depth = <128 128 0 0>;
+                       rx-buffer-size = <1518 4096 0 0>;
+                       rx-queue = <529>;
+                       tx-completion-queue = <531>;
+                       efuse-mac = <0>;
+                       local-mac-address = [02 18 31 7e 3e 00];
+                       netcp-gbe = <&gbe1>;
+               };
+       };
+};
diff --git a/arch/arm/dts/keystone-k2e.dtsi b/arch/arm/dts/keystone-k2e.dtsi
new file mode 100644 (file)
index 0000000..b5d9061
--- /dev/null
@@ -0,0 +1,147 @@
+/*
+ * 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/ "keystone-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;
+                       dma-coherent;
+                       dma-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>;
+                       };
+               };
+
+               dspgpio0: keystone_dsp_gpio@02620240 {
+                       compatible = "ti,keystone-dsp-gpio";
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio,syscon-dev = <&devctrl 0x240>;
+               };
+
+               pcie1: pcie@21020000 {
+                       compatible = "ti,keystone-pcie","snps,dw-pcie";
+                       clocks = <&clkpcie1>;
+                       clock-names = "pcie";
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+                       reg =  <0x21021000 0x2000>, <0x21020000 0x1000>, <0x02620128 4>;
+                       ranges = <0x81000000 0 0 0x23260000 0x4000 0x4000
+                               0x82000000 0 0x60000000 0x60000000 0 0x10000000>;
+
+                       status = "disabled";
+                       device_type = "pci";
+                       num-lanes = <2>;
+
+                       #interrupt-cells = <1>;
+                       interrupt-map-mask = <0 0 0 7>;
+                       interrupt-map = <0 0 0 1 &pcie_intc1 0>, /* INT A */
+                                       <0 0 0 2 &pcie_intc1 1>, /* INT B */
+                                       <0 0 0 3 &pcie_intc1 2>, /* INT C */
+                                       <0 0 0 4 &pcie_intc1 3>; /* INT D */
+
+                       pcie_msi_intc1: msi-interrupt-controller {
+                               interrupt-controller;
+                               #interrupt-cells = <1>;
+                               interrupt-parent = <&gic>;
+                               interrupts = <GIC_SPI 377 IRQ_TYPE_EDGE_RISING>,
+                                       <GIC_SPI 378 IRQ_TYPE_EDGE_RISING>,
+                                       <GIC_SPI 379 IRQ_TYPE_EDGE_RISING>,
+                                       <GIC_SPI 380 IRQ_TYPE_EDGE_RISING>,
+                                       <GIC_SPI 381 IRQ_TYPE_EDGE_RISING>,
+                                       <GIC_SPI 382 IRQ_TYPE_EDGE_RISING>,
+                                       <GIC_SPI 383 IRQ_TYPE_EDGE_RISING>,
+                                       <GIC_SPI 384 IRQ_TYPE_EDGE_RISING>;
+                       };
+
+                       pcie_intc1: legacy-interrupt-controller {
+                               interrupt-controller;
+                               #interrupt-cells = <1>;
+                               interrupt-parent = <&gic>;
+                               interrupts = <GIC_SPI 373 IRQ_TYPE_EDGE_RISING>,
+                                       <GIC_SPI 374 IRQ_TYPE_EDGE_RISING>,
+                                       <GIC_SPI 375 IRQ_TYPE_EDGE_RISING>,
+                                       <GIC_SPI 376 IRQ_TYPE_EDGE_RISING>;
+                       };
+               };
+
+               mdio: mdio@24200f00 {
+                       compatible      = "ti,keystone_mdio", "ti,davinci_mdio";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x24200f00 0x100>;
+                       status = "disabled";
+                       clocks = <&clkcpgmac>;
+                       clock-names = "fck";
+                       bus_freq        = <2500000>;
+               };
+               /include/ "keystone-k2e-netcp.dtsi"
+       };
+};
diff --git a/arch/arm/dts/keystone-k2g-evm.dts b/arch/arm/dts/keystone-k2g-evm.dts
new file mode 100644 (file)
index 0000000..696a0d7
--- /dev/null
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2014 Texas Instruments, Inc.
+ *
+ * Device Tree Source for K2G EVM
+ *
+ * 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-k2g.dtsi"
+
+/ {
+       compatible =  "ti,k2g-evm","ti,keystone";
+       model = "Texas Instruments K2G General Purpose EVM";
+
+       chosen {
+               stdout-path = &uart0;
+       };
+};
+
+&mdio {
+       status = "okay";
+       ethphy0: ethernet-phy@0 {
+               reg = <0>;
+               phy-mode = "rgmii-id";
+       };
+};
+
+&gbe0 {
+       phy-handle = <&ethphy0>;
+};
+
+&spi1 {
+       status = "okay";
+
+       spi_nor: flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "spi-flash";
+               spi-max-frequency = <50000000>;
+               m25p,fast-read;
+               reg = <0>;
+
+               partition@0 {
+                       label = "u-boot-spl";
+                       reg = <0x0 0x80000>;
+                       read-only;
+               };
+
+               partition@1 {
+                       label = "misc";
+                       reg = <0x80000 0xf80000>;
+               };
+       };
+};
+
+&qspi {
+       status = "okay";
+
+        flash0: m25p80@0 {
+                compatible = "s25fl512s","spi-flash";
+                reg = <0>;
+                spi-tx-bus-width = <1>;
+                spi-rx-bus-width = <4>;
+                spi-max-frequency = <96000000>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+                tshsl-ns = <392>;
+                tsd2d-ns = <392>;
+                tchsh-ns = <100>;
+                tslch-ns = <100>;
+               block-size = <18>;
+
+
+                partition@0 {
+                        label = "QSPI.u-boot-spl-os";
+                        reg = <0x00000000 0x00100000>;
+                };
+                partition@1 {
+                        label = "QSPI.u-boot-env";
+                        reg = <0x00100000 0x00040000>;
+                };
+                partition@2 {
+                        label = "QSPI.skern";
+                        reg = <0x00140000 0x0040000>;
+                };
+                partition@3 {
+                        label = "QSPI.pmmc-firmware";
+                        reg = <0x00180000 0x0040000>;
+                };
+                partition@4 {
+                        label = "QSPI.kernel";
+                        reg = <0x001C0000 0x0800000>;
+                };
+                partition@5 {
+                        label = "QSPI.file-system";
+                        reg = <0x009C0000 0x3640000>;
+                };
+        };
+};
+
+&mmc0 {
+       status = "okay";
+};
+
+&mmc1 {
+       status = "okay";
+};
diff --git a/arch/arm/dts/keystone-k2g-netcp.dtsi b/arch/arm/dts/keystone-k2g-netcp.dtsi
new file mode 100644 (file)
index 0000000..a9b26c3
--- /dev/null
@@ -0,0 +1,151 @@
+/*
+ * Device Tree Source for K2G 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.
+ */
+
+qmss: qmss@4020000 {
+       compatible = "ti,keystone-navigator-qmss-l";
+       dma-coherent;
+       #address-cells = <1>;
+       #size-cells = <1>;
+       /* power-domains = <&k2g_pds K2G_DEV_NSS0>; */
+       /* clocks = <&k2g_clks K2G_DEV_NSS0 K2G_DEV_NSS_VCLK>; */
+       clock-names = "nss_vclk";
+       ranges;
+       queue-range     = <0 0x80>;
+       linkram0        = <0x4020000 0x7ff>;
+
+       qmgrs {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+               qmgr0 {
+                       managed-queues = <0 0x80>;
+                       reg = <0x4100000 0x800>,
+                             <0x4040000 0x100>,
+                             <0x4080000 0x800>,
+                             <0x40c0000 0x800>;
+                       reg-names = "peek", "config",
+                                   "region", "push";
+               };
+
+       };
+       queue-pools {
+               qpend {
+                       qpend-0 {
+                               qrange = <77 8>;
+                               interrupts =<0 308 0xf04 0 309 0xf04 0 310 0xf04
+                                            0 311 0xf04 0 312 0xf04 0 313 0xf04
+                                            0 314 0xf04 0 315 0xf04>;
+                               qalloc-by-id;
+                       };
+               };
+               general-purpose {
+                       gp-0 {
+                               qrange = <112 8>;
+                       };
+                       netcp-tx {
+                               qrange = <5 8>;
+                               qalloc-by-id;
+                       };
+               };
+       };
+
+       descriptor-regions {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+               region-12 {
+                       id = <12>;
+                       region-spec = <1023 128>; /* num_desc desc_size */
+                       link-index = <0x400>;
+               };
+       };
+}; /* qmss */
+
+knav_dmas: knav_dmas@0 {
+       compatible = "ti,keystone-navigator-dma";
+       #address-cells = <1>;
+       #size-cells = <1>;
+       /* power-domains = <&k2g_pds K2G_DEV_NSS0>; */
+       /* clocks = <&k2g_clks K2G_DEV_NSS0 K2G_DEV_NSS_VCLK>; */
+       clock-names = "nss_vclk";
+       ranges;
+       ti,navigator-cloud-address = <0x40c0000 0x40c0000 0x40c0000 0x40c0000>;
+
+       dma_gbe: dma_gbe@0 {
+               reg = <0x4010000 0x100>,
+                         <0x4011000 0x2a0>, /* 21 Tx channels */
+                         <0x4012000 0x400>, /* 32 Rx channels */
+                         <0x4010100 0x80>,
+                         <0x4013000 0x400>; /* 32 Rx flows */
+               reg-names = "global", "txchan", "rxchan",
+                               "txsched", "rxflow";
+       };
+
+};
+
+gbe_subsys: subsys@4200000 {
+       compatible = "syscon";
+       reg = <0x4200000 0x100>;
+};
+
+netcp: netcp@4000000 {
+       reg = <0x2620110 0x8>;
+       reg-names = "efuse";
+       compatible = "ti,netcp-1.0";
+       #address-cells = <1>;
+       #size-cells = <1>;
+       /* power-domains = <&k2g_pds K2G_DEV_NSS0>; */
+       /* clocks = <&k2g_clks K2G_DEV_NSS0 K2G_DEV_NSS_ESW_CLK>; */
+       clock-names = "ethss_clk";
+
+       /* NetCP address range */
+       ranges = <0 0x4000000 0x1000000>;
+
+       dma-coherent;
+
+       ti,navigator-dmas = <&dma_gbe 0>, <&dma_gbe 5>;
+       ti,navigator-dma-names = "netrx0", "nettx";
+
+       netcp-devices {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+               gbe@200000 {
+                       label = "netcp-gbe";
+                       compatible = "ti,netcp-gbe-2";
+                       syscon-subsys = <&gbe_subsys>;
+                       reg = <0x200100 0xe00>, <0x220000 0x20000>;
+                       /* enable-ale; */
+                       tx-queue = <5>;
+                       tx-channel = "nettx";
+
+                       interfaces {
+                               gbe0: interface-0 {
+                                       slave-port = <0>;
+                                       link-interface  = <5>;
+                               };
+                       };
+               };
+       };
+
+       netcp-interfaces {
+               interface-0 {
+                       rx-channel = "netrx0";
+                       rx-pool = <512 12>;
+                       tx-pool = <511 12>;
+                       rx-queue-depth = <128 128 0 0>;
+                       rx-buffer-size = <1518 4096 0 0>;
+                       rx-queue = <77>;
+                       tx-completion-queue = <78>;
+                       efuse-mac = <1>;
+                       netcp-gbe = <&gbe0>;
+               };
+       };
+};
diff --git a/arch/arm/dts/keystone-k2g.dtsi b/arch/arm/dts/keystone-k2g.dtsi
new file mode 100644 (file)
index 0000000..2193f9f
--- /dev/null
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2014 Texas Instruments, Inc.
+ *
+ * Device Tree Source for K2G SOC
+ *
+ * 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.
+ */
+
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include "skeleton.dtsi"
+
+/ {
+       model = "Texas Instruments K2G SoC";
+       #address-cells = <1>;
+       #size-cells = <1>;
+       interrupt-parent = <&gic>;
+
+       aliases {
+               serial0 = &uart0;
+               spi0 = &spi0;
+               spi1 = &spi1;
+               spi2 = &spi2;
+               spi3 = &spi3;
+               spi4 = &qspi;
+       };
+
+       memory {
+               device_type = "memory";
+               reg = <0x80000000 0x80000000>;
+       };
+
+       cpus {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               interrupt-parent = <&gic>;
+
+               cpu@0 {
+                       compatible = "arm,cortex-a15";
+                       device_type = "cpu";
+                       reg = <0>;
+               };
+       };
+
+       gic: interrupt-controller {
+               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)>;
+       };
+
+       soc {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "ti,keystone","simple-bus";
+               interrupt-parent = <&gic>;
+               ranges;
+
+               uart0: serial@02530c00 {
+                       compatible = "ns16550a";
+                       current-speed = <115200>;
+                       reg-shift = <2>;
+                       reg-io-width = <4>;
+                       reg = <0x02530c00 0x100>;
+                       clock-names = "uart";
+                       interrupts = <GIC_SPI 164 IRQ_TYPE_EDGE_RISING>;
+               };
+
+               mdio: mdio@4200f00 {
+                       compatible      = "ti,keystone_mdio", "ti,davinci_mdio";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       /* power-domains = <&k2g_pds K2G_DEV_NSS0>; */
+                       /* clocks = <&k2g_clks K2G_DEV_NSS0 K2G_DEV_NSS_ESW_CLK>; */
+                       clock-names = "fck";
+                       reg = <0x04200f00 0x100>;
+                       status = "disabled";
+                       bus_freq = <2500000>;
+               };
+
+               qspi: qspi@2940000 {
+                       compatible =  "cadence,qspi";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x02940000 0x1000>,
+                             <0x24000000 0x4000000>;
+                       interrupts = <GIC_SPI 198 IRQ_TYPE_EDGE_RISING>;
+                       num-cs = <4>;
+                       fifo-depth = <256>;
+                       sram-size = <256>;
+                       status = "disabled";
+               };
+
+               #include "keystone-k2g-netcp.dtsi"
+
+               pmmc: pmmc@2900000 {
+                       compatible = "ti,power-processor";
+                       reg = <0x02900000 0x40000>;
+                       ti,lpsc_module = <1>;
+               };
+
+               spi0: spi@21805400 {
+                       compatible = "ti,keystone-spi", "ti,dm6441-spi";
+                       reg = <0x21805400 0x200>;
+                       num-cs = <4>;
+                       ti,davinci-spi-intr-line = <0>;
+                       interrupts = <GIC_SPI 64 IRQ_TYPE_EDGE_RISING>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
+
+               spi1: spi@21805800 {
+                       compatible = "ti,keystone-spi", "ti,dm6441-spi";
+                       reg = <0x21805800 0x200>;
+                       num-cs = <4>;
+                       ti,davinci-spi-intr-line = <0>;
+                       interrupts = <GIC_SPI 66 IRQ_TYPE_EDGE_RISING>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
+
+               spi2: spi@21805c00 {
+                       compatible = "ti,keystone-spi", "ti,dm6441-spi";
+                       reg = <0x21805C00 0x200>;
+                       num-cs = <4>;
+                       ti,davinci-spi-intr-line = <0>;
+                       interrupts = <GIC_SPI 68 IRQ_TYPE_EDGE_RISING>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
+
+               spi3: spi@21806000 {
+                       compatible = "ti,keystone-spi", "ti,dm6441-spi";
+                       reg = <0x21806000 0x200>;
+                       num-cs = <4>;
+                       ti,davinci-spi-intr-line = <0>;
+                       interrupts = <GIC_SPI 70 IRQ_TYPE_EDGE_RISING>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
+
+               mmc0: mmc@23000000 {
+                       compatible = "ti,omap4-hsmmc";
+                       reg = <0x23000000 0x400>;
+                       interrupts = <GIC_SPI 96 IRQ_TYPE_EDGE_RISING>;
+                       bus-width = <4>;
+                       ti,needs-special-reset;
+                       no-1-8-v;
+                       max-frequency = <96000000>;
+                       status = "disabled";
+               };
+
+               mmc1: mmc@23100000 {
+                       compatible = "ti,omap4-hsmmc";
+                       reg = <0x23100000 0x400>;
+                       interrupts = <GIC_SPI 97 IRQ_TYPE_EDGE_RISING>;
+                       bus-width = <8>;
+                       ti,needs-special-reset;
+                       ti,non-removable;
+                       max-frequency = <96000000>;
+                       status = "disabled";
+                       clock-names = "fck";
+               };
+       };
+};
diff --git a/arch/arm/dts/keystone-k2hk-clocks.dtsi b/arch/arm/dts/keystone-k2hk-clocks.dtsi
new file mode 100644 (file)
index 0000000..af9b719
--- /dev/null
@@ -0,0 +1,425 @@
+/*
+ * 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>, <0x02310108 4>;
+               reg-names = "control", "multiplier", "post-divider";
+       };
+
+       papllclk: papllclk@2620358 {
+               #clock-cells = <0>;
+               compatible = "ti,keystone,pll-clock";
+               clocks = <&refclkpass>;
+               clock-output-names = "papllclk";
+               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 = <0x02350000 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>, <0x0235004c 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>;
+       };
+};
diff --git a/arch/arm/dts/keystone-k2hk-evm.dts b/arch/arm/dts/keystone-k2hk-evm.dts
new file mode 100644 (file)
index 0000000..76a675f
--- /dev/null
@@ -0,0 +1,183 @@
+/*
+ * Copyright 2013-2014 Texas Instruments, Inc.
+ *
+ * Keystone 2 Kepler/Hawking 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 "keystone-k2hk.dtsi"
+
+/ {
+       compatible =  "ti,k2hk-evm","ti,keystone";
+       model = "Texas Instruments Keystone 2 Kepler/Hawking EVM";
+
+       soc {
+               clocks {
+                       refclksys: refclksys {
+                               #clock-cells = <0>;
+                               compatible = "fixed-clock";
+                               clock-frequency = <122880000>;
+                               clock-output-names = "refclk-sys";
+                       };
+
+                       refclkpass: refclkpass {
+                               #clock-cells = <0>;
+                               compatible = "fixed-clock";
+                               clock-frequency = <122880000>;
+                               clock-output-names = "refclk-pass";
+                       };
+
+                       refclkarm: refclkarm {
+                               #clock-cells = <0>;
+                               compatible = "fixed-clock";
+                               clock-frequency = <125000000>;
+                               clock-output-names = "refclk-arm";
+                       };
+
+                       refclkddr3a: refclkddr3a {
+                               #clock-cells = <0>;
+                               compatible = "fixed-clock";
+                               clock-frequency = <100000000>;
+                               clock-output-names = "refclk-ddr3a";
+                       };
+
+                       refclkddr3b: refclkddr3b {
+                               #clock-cells = <0>;
+                               compatible = "fixed-clock";
+                               clock-frequency = <100000000>;
+                               clock-output-names = "refclk-ddr3b";
+                       };
+               };
+       };
+
+       leds {
+               compatible = "gpio-leds";
+               debug1_1 {
+                       label = "keystone:green:debug1";
+                       gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; /* 12 */
+               };
+
+               debug1_2 {
+                       label = "keystone:red:debug1";
+                       gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; /* 13 */
+               };
+
+               debug2 {
+                       label = "keystone:blue:debug2";
+                       gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; /* 14 */
+               };
+
+               debug3 {
+                       label = "keystone:blue:debug3";
+                       gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; /* 15 */
+               };
+       };
+};
+
+&usb_phy {
+       status = "okay";
+};
+
+&usb {
+       status = "okay";
+};
+
+&aemif {
+       cs0 {
+               #address-cells = <2>;
+               #size-cells = <1>;
+               clock-ranges;
+               ranges;
+
+               ti,cs-chipselect = <0>;
+               /* all timings in nanoseconds */
+               ti,cs-min-turnaround-ns = <12>;
+               ti,cs-read-hold-ns = <6>;
+               ti,cs-read-strobe-ns = <23>;
+               ti,cs-read-setup-ns = <9>;
+               ti,cs-write-hold-ns = <8>;
+               ti,cs-write-strobe-ns = <23>;
+               ti,cs-write-setup-ns = <8>;
+
+               nand@0,0 {
+                       compatible = "ti,keystone-nand","ti,davinci-nand";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       reg = <0 0 0x4000000
+                              1 0 0x0000100>;
+
+                       ti,davinci-chipselect = <0>;
+                       ti,davinci-mask-ale = <0x2000>;
+                       ti,davinci-mask-cle = <0x4000>;
+                       ti,davinci-mask-chipsel = <0>;
+                       nand-ecc-mode = "hw";
+                       ti,davinci-ecc-bits = <4>;
+                       nand-on-flash-bbt;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x100000>;
+                               read-only;
+                       };
+
+                       partition@100000 {
+                               label = "params";
+                               reg = <0x100000 0x80000>;
+                               read-only;
+                       };
+
+                       partition@180000 {
+                               label = "ubifs";
+                               reg = <0x180000 0x1fe80000>;
+                       };
+               };
+       };
+};
+
+&i2c0 {
+       dtt@50 {
+               compatible = "at,24c1024";
+               reg = <0x50>;
+       };
+};
+
+&spi0 {
+       status = "okay";
+       nor_flash: n25q128a11@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "Micron,n25q128a11", "spi-flash";
+               spi-max-frequency = <54000000>;
+               m25p,fast-read;
+               reg = <0>;
+
+               partition@0 {
+                       label = "u-boot-spl";
+                       reg = <0x0 0x80000>;
+                       read-only;
+               };
+
+               partition@1 {
+                       label = "misc";
+                       reg = <0x80000 0xf80000>;
+               };
+       };
+};
+
+&mdio {
+       status = "ok";
+       ethphy0: ethernet-phy@0 {
+               compatible = "marvell,88E1111", "ethernet-phy-ieee802.3-c22";
+               reg = <0>;
+       };
+
+       ethphy1: ethernet-phy@1 {
+               compatible = "marvell,88E1111", "ethernet-phy-ieee802.3-c22";
+               reg = <1>;
+       };
+};
diff --git a/arch/arm/dts/keystone-k2hk-netcp.dtsi b/arch/arm/dts/keystone-k2hk-netcp.dtsi
new file mode 100644 (file)
index 0000000..77a32c3
--- /dev/null
@@ -0,0 +1,208 @@
+/*
+ * Device Tree Source for Keystone 2 Hawking 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.
+ */
+
+qmss: qmss@2a40000 {
+       compatible = "ti,keystone-navigator-qmss";
+       dma-coherent;
+       #address-cells = <1>;
+       #size-cells = <1>;
+       clocks = <&chipclk13>;
+       ranges;
+       queue-range     = <0 0x4000>;
+       linkram0        = <0x100000 0x8000>;
+       linkram1        = <0x0 0x10000>;
+
+       qmgrs {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+               qmgr0 {
+                       managed-queues = <0 0x2000>;
+                       reg = <0x2a40000 0x20000>,
+                             <0x2a06000 0x400>,
+                             <0x2a02000 0x1000>,
+                             <0x2a03000 0x1000>,
+                             <0x23a80000 0x20000>,
+                             <0x2a80000 0x20000>;
+                       reg-names = "peek", "status", "config",
+                                   "region", "push", "pop";
+               };
+
+               qmgr1 {
+                       managed-queues = <0x2000 0x2000>;
+                       reg = <0x2a60000 0x20000>,
+                             <0x2a06400 0x400>,
+                             <0x2a04000 0x1000>,
+                             <0x2a05000 0x1000>,
+                             <0x23aa0000 0x20000>,
+                             <0x2aa0000 0x20000>;
+                       reg-names = "peek", "status", "config",
+                                   "region", "push", "pop";
+               };
+       };
+       queue-pools {
+               qpend {
+                       qpend-0 {
+                               qrange = <658 8>;
+                               interrupts =<0 40 0xf04 0 41 0xf04 0 42 0xf04
+                                            0 43 0xf04 0 44 0xf04 0 45 0xf04
+                                            0 46 0xf04 0 47 0xf04>;
+                       };
+                       qpend-1 {
+                               qrange = <8704 16>;
+                               interrupts = <0 48 0xf04 0 49 0xf04 0 50 0xf04
+                                             0 51 0xf04 0 52 0xf04 0 53 0xf04
+                                             0 54 0xf04 0 55 0xf04 0 56 0xf04
+                                             0 57 0xf04 0 58 0xf04 0 59 0xf04
+                                             0 60 0xf04 0 61 0xf04 0 62 0xf04
+                                             0 63 0xf04>;
+                               qalloc-by-id;
+                       };
+                       qpend-2 {
+                               qrange = <8720 16>;
+                               interrupts = <0 64 0xf04 0 65 0xf04 0 66 0xf04
+                                             0 59 0xf04 0 68 0xf04 0 69 0xf04
+                                             0 70 0xf04 0 71 0xf04 0 72 0xf04
+                                             0 73 0xf04 0 74 0xf04 0 75 0xf04
+                                             0 76 0xf04 0 77 0xf04 0 78 0xf04
+                                             0 79 0xf04>;
+                       };
+               };
+               general-purpose {
+                       gp-0 {
+                               qrange = <4000 64>;
+                       };
+                       netcp-tx {
+                               qrange = <640 9>;
+                               qalloc-by-id;
+                       };
+                       netcpx-tx {
+                               qrange = <8752 8>;
+                               qalloc-by-id;
+                       };
+               };
+       };
+       descriptor-regions {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+               region-12 {
+                       id = <12>;
+                       region-spec = <8192 128>;       /* num_desc desc_size */
+                       link-index = <0x4000>;
+               };
+       };
+}; /* qmss */
+
+knav_dmas: knav_dmas@0 {
+       compatible = "ti,keystone-navigator-dma";
+       clocks = <&papllclk>;
+       #address-cells = <1>;
+       #size-cells = <1>;
+       ranges;
+       ti,navigator-cloud-address = <0x23a80000 0x23a90000
+                                  0x23aa0000 0x23ab0000>;
+
+       dma_gbe: dma_gbe@0 {
+               reg = <0x2004000 0x100>,
+                         <0x2004400 0x120>,
+                         <0x2004800 0x300>,
+                         <0x2004c00 0x120>,
+                         <0x2005000 0x400>;
+               reg-names = "global", "txchan", "rxchan",
+                               "txsched", "rxflow";
+       };
+};
+
+netcp: netcp@2000000 {
+       reg = <0x2620110 0x8>;
+       reg-names = "efuse";
+       compatible = "ti,netcp-1.0";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       /* NetCP address range */
+       ranges  = <0 0x2000000 0x100000>;
+
+       clocks = <&papllclk>, <&clkcpgmac>, <&chipclk12>;
+       dma-coherent;
+
+       ti,navigator-dmas = <&dma_gbe 22>,
+                       <&dma_gbe 23>,
+                       <&dma_gbe 8>;
+       ti,navigator-dma-names = "netrx0", "netrx1", "nettx";
+
+       netcp-devices {
+               ranges;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               gbe@90000 { /* ETHSS */
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       label = "netcp-gbe";
+                       compatible = "ti,netcp-gbe";
+                       reg = <0x90000 0x300>, <0x90400 0x400>, <0x90800 0x700>;
+                       /* enable-ale; */
+                       tx-queue = <648>;
+                       tx-channel = "nettx";
+
+                       interfaces {
+                               gbe0: interface-0 {
+                                       slave-port = <0>;
+                                       link-interface = <1>;
+                                       phy-handle = <&ethphy0>;
+                               };
+                               gbe1: interface-1 {
+                                       slave-port = <1>;
+                                       link-interface = <1>;
+                                       phy-handle = <&ethphy1>;
+                               };
+                       };
+
+                       secondary-slave-ports {
+                               port-2 {
+                                       slave-port = <2>;
+                                       link-interface  = <2>;
+                               };
+                               port-3 {
+                                       slave-port = <3>;
+                                       link-interface  = <2>;
+                               };
+                       };
+               };
+       };
+
+       netcp-interfaces {
+               interface-0 {
+                       rx-channel = "netrx0";
+                       rx-pool = <1024 12>;
+                       tx-pool = <1024 12>;
+                       rx-queue-depth = <128 128 0 0>;
+                       rx-buffer-size = <1518 4096 0 0>;
+                       rx-queue = <8704>;
+                       tx-completion-queue = <8706>;
+                       efuse-mac = <1>;
+                       netcp-gbe = <&gbe0>;
+
+               };
+               interface-1 {
+                       rx-channel = "netrx1";
+                       rx-pool = <1024 12>;
+                       tx-pool = <1024 12>;
+                       rx-queue-depth = <128 128 0 0>;
+                       rx-buffer-size = <1518 4096 0 0>;
+                       rx-queue = <8705>;
+                       tx-completion-queue = <8707>;
+                       efuse-mac = <0>;
+                       local-mac-address = [02 18 31 7e 3e 6f];
+                       netcp-gbe = <&gbe1>;
+               };
+       };
+};
diff --git a/arch/arm/dts/keystone-k2hk.dtsi b/arch/arm/dts/keystone-k2hk.dtsi
new file mode 100644 (file)
index 0000000..fc78696
--- /dev/null
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2013-2014 Texas Instruments, Inc.
+ *
+ * Keystone 2 Kepler/Hawking 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.
+ */
+
+/ {
+       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/ "keystone-k2hk-clocks.dtsi"
+
+               dspgpio0: keystone_dsp_gpio@02620240 {
+                       compatible = "ti,keystone-dsp-gpio";
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio,syscon-dev = <&devctrl 0x240>;
+               };
+
+               dspgpio1: keystone_dsp_gpio@2620244 {
+                       compatible = "ti,keystone-dsp-gpio";
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio,syscon-dev = <&devctrl 0x244>;
+               };
+
+               dspgpio2: keystone_dsp_gpio@2620248 {
+                       compatible = "ti,keystone-dsp-gpio";
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio,syscon-dev = <&devctrl 0x248>;
+               };
+
+               dspgpio3: keystone_dsp_gpio@262024c {
+                       compatible = "ti,keystone-dsp-gpio";
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio,syscon-dev = <&devctrl 0x24c>;
+               };
+
+               dspgpio4: keystone_dsp_gpio@2620250 {
+                       compatible = "ti,keystone-dsp-gpio";
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio,syscon-dev = <&devctrl 0x250>;
+               };
+
+               dspgpio5: keystone_dsp_gpio@2620254 {
+                       compatible = "ti,keystone-dsp-gpio";
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio,syscon-dev = <&devctrl 0x254>;
+               };
+
+               dspgpio6: keystone_dsp_gpio@2620258 {
+                       compatible = "ti,keystone-dsp-gpio";
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio,syscon-dev = <&devctrl 0x258>;
+               };
+
+               dspgpio7: keystone_dsp_gpio@262025c {
+                       compatible = "ti,keystone-dsp-gpio";
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio,syscon-dev = <&devctrl 0x25c>;
+               };
+
+               mdio: mdio@02090300 {
+                       compatible      = "ti,keystone_mdio", "ti,davinci_mdio";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x02090300 0x100>;
+                       status = "disabled";
+                       clocks = <&clkcpgmac>;
+                       clock-names = "fck";
+                       bus_freq        = <2500000>;
+               };
+               /include/ "keystone-k2hk-netcp.dtsi"
+       };
+};
diff --git a/arch/arm/dts/keystone-k2l-clocks.dtsi b/arch/arm/dts/keystone-k2l-clocks.dtsi
new file mode 100644 (file)
index 0000000..ef8464b
--- /dev/null
@@ -0,0 +1,266 @@
+/*
+ * Copyright 2013-2014 Texas Instruments, Inc.
+ *
+ * Keystone 2 lamarr 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 = <&refclksys>;
+               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>, <0x02310108 4>;
+               reg-names = "control", "multiplier", "post-divider";
+       };
+
+       papllclk: papllclk@2620358 {
+               #clock-cells = <0>;
+               compatible = "ti,keystone,pll-clock";
+               clocks = <&refclksys>;
+               clock-output-names = "papllclk";
+               reg = <0x02620358 4>;
+               reg-names = "control";
+       };
+
+       ddr3apllclk: ddr3apllclk@2620360 {
+               #clock-cells = <0>;
+               compatible = "ti,keystone,pll-clock";
+               clocks = <&refclksys>;
+               clock-output-names = "ddr-3a-pll-clk";
+               reg = <0x02620360 4>;
+               reg-names = "control";
+       };
+
+       clkdfeiqnsys: clkdfeiqnsys {
+               #clock-cells = <0>;
+               compatible = "ti,keystone,psc-clock";
+               clocks = <&chipclk12>;
+               clock-output-names = "dfe";
+               reg-names = "control", "domain";
+               reg = <0x02350004 0xb00>, <0x02350000 0x400>;
+               domain-id = <0>;
+       };
+
+       clkpcie1: clkpcie1 {
+               #clock-cells = <0>;
+               compatible = "ti,keystone,psc-clock";
+               clocks = <&chipclk12>;
+               clock-output-names = "pcie";
+               reg = <0x0235002c 0xb00>, <0x02350000 0x400>;
+               reg-names = "control", "domain";
+               domain-id = <4>;
+       };
+
+       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>;
+       };
+
+       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>;
+       };
+
+       clkrac: clkrac {
+               #clock-cells = <0>;
+               compatible = "ti,keystone,psc-clock";
+               clocks = <&chipclk13>;
+               clock-output-names = "rac";
+               reg = <0x02350068 0xb00>, <0x02350044 0x400>;
+               reg-names = "control", "domain";
+               domain-id = <17>;
+       };
+
+       clkdfepd0: clkdfepd0 {
+               #clock-cells = <0>;
+               compatible = "ti,keystone,psc-clock";
+               clocks = <&chipclk13>;
+               clock-output-names = "dfe-pd0";
+               reg = <0x0235006c 0xb00>, <0x02350044 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>;
+       };
+
+       clkosr: clkosr {
+               #clock-cells = <0>;
+               compatible = "ti,keystone,psc-clock";
+               clocks = <&chipclk13>;
+               clock-output-names = "osr";
+               reg = <0x02350088 0xb00>, <0x0235004c 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 = <0x02350094 0xb00>, <0x02350058 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>;
+       };
+
+       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>;
+       };
+
+       clkdfepd1: clkdfepd1 {
+               #clock-cells = <0>;
+               compatible = "ti,keystone,psc-clock";
+               clocks = <&chipclk13>;
+               clock-output-names = "dfe-pd1";
+               reg = <0x023500c0 0xb00>, <0x02350044 0x400>;
+               reg-names = "control", "domain";
+               domain-id = <27>;
+       };
+
+       clkfftc1: clkfftc1 {
+               #clock-cells = <0>;
+               compatible = "ti,keystone,psc-clock";
+               clocks = <&chipclk13>;
+               clock-output-names = "fftc-1";
+               reg = <0x023500c4 0xb00>, <0x023504c0 0x400>;
+               reg-names = "control", "domain";
+               domain-id = <28>;
+       };
+
+       clkiqnail: clkiqnail {
+               #clock-cells = <0>;
+               compatible = "ti,keystone,psc-clock";
+               clocks = <&chipclk13>;
+               clock-output-names = "iqn-ail";
+               reg = <0x023500c8 0xb00>, <0x0235004c 0x400>;
+               reg-names = "control", "domain";
+               domain-id = <29>;
+       };
+
+       clkuart2: clkuart2 {
+               #clock-cells = <0>;
+               compatible = "ti,keystone,psc-clock";
+               clocks = <&clkmodrst0>;
+               clock-output-names = "uart2";
+               reg = <0x02350000 0xb00>, <0x02350000 0x400>;
+               reg-names = "control", "domain";
+               domain-id = <0>;
+       };
+
+       clkuart3: clkuart3 {
+               #clock-cells = <0>;
+               compatible = "ti,keystone,psc-clock";
+               clocks = <&clkmodrst0>;
+               clock-output-names = "uart3";
+               reg = <0x02350000 0xb00>, <0x02350000 0x400>;
+               reg-names = "control", "domain";
+               domain-id = <0>;
+       };
+};
diff --git a/arch/arm/dts/keystone-k2l-evm.dts b/arch/arm/dts/keystone-k2l-evm.dts
new file mode 100644 (file)
index 0000000..b5c5617
--- /dev/null
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2014 Texas Instruments, Inc.
+ *
+ * Keystone 2 Lamarr 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 "keystone-k2l.dtsi"
+
+/ {
+       compatible =  "ti,k2l-evm","ti,keystone";
+       model = "Texas Instruments Keystone 2 Lamarr EVM";
+
+       soc {
+               clocks {
+                       refclksys: refclksys {
+                               #clock-cells = <0>;
+                               compatible = "fixed-clock";
+                               clock-frequency = <122880000>;
+                               clock-output-names = "refclk-sys";
+                       };
+               };
+       };
+};
+
+&usb_phy {
+       status = "okay";
+};
+
+&usb {
+       status = "okay";
+};
+
+&i2c0 {
+       dtt@50 {
+               compatible = "at,24c1024";
+               reg = <0x50>;
+       };
+};
+
+&aemif {
+       cs0 {
+               #address-cells = <2>;
+               #size-cells = <1>;
+               clock-ranges;
+               ranges;
+
+               ti,cs-chipselect = <0>;
+               /* all timings in nanoseconds */
+               ti,cs-min-turnaround-ns = <12>;
+               ti,cs-read-hold-ns = <6>;
+               ti,cs-read-strobe-ns = <23>;
+               ti,cs-read-setup-ns = <9>;
+               ti,cs-write-hold-ns = <8>;
+               ti,cs-write-strobe-ns = <23>;
+               ti,cs-write-setup-ns = <8>;
+
+               nand@0,0 {
+                       compatible = "ti,keystone-nand","ti,davinci-nand";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       reg = <0 0 0x4000000
+                              1 0 0x0000100>;
+
+                       ti,davinci-chipselect = <0>;
+                       ti,davinci-mask-ale = <0x2000>;
+                       ti,davinci-mask-cle = <0x4000>;
+                       ti,davinci-mask-chipsel = <0>;
+                       nand-ecc-mode = "hw";
+                       ti,davinci-ecc-bits = <4>;
+                       nand-on-flash-bbt;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x100000>;
+                               read-only;
+                       };
+
+                       partition@100000 {
+                               label = "params";
+                               reg = <0x100000 0x80000>;
+                               read-only;
+                       };
+
+                       partition@180000 {
+                               label = "ubifs";
+                               reg = <0x180000 0x7FE80000>;
+                       };
+               };
+       };
+};
+
+&spi0 {
+       status ="okay";
+       nor_flash: n25q128a11@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "Micron,n25q128a11", "spi-flash";
+               spi-max-frequency = <54000000>;
+               m25p,fast-read;
+               reg = <0>;
+
+               partition@0 {
+                       label = "u-boot-spl";
+                       reg = <0x0 0x80000>;
+                       read-only;
+               };
+
+               partition@1 {
+                       label = "misc";
+                       reg = <0x80000 0xf80000>;
+               };
+       };
+};
+
+&mdio {
+       status = "ok";
+       ethphy0: ethernet-phy@0 {
+               compatible = "marvell,88E1514", "marvell,88E1510", "ethernet-phy-ieee802.3-c22";
+               reg = <0>;
+       };
+
+       ethphy1: ethernet-phy@1 {
+               compatible = "marvell,88E1514", "marvell,88E1510", "ethernet-phy-ieee802.3-c22";
+               reg = <1>;
+       };
+};
diff --git a/arch/arm/dts/keystone-k2l-netcp.dtsi b/arch/arm/dts/keystone-k2l-netcp.dtsi
new file mode 100644 (file)
index 0000000..6b95284
--- /dev/null
@@ -0,0 +1,189 @@
+/*
+ * Device Tree Source for Keystone 2 Lamarr 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.
+ */
+
+qmss: qmss@2a40000 {
+       compatible = "ti,keystone-navigator-qmss";
+       dma-coherent;
+       #address-cells = <1>;
+       #size-cells = <1>;
+       clocks = <&chipclk13>;
+       ranges;
+       queue-range     = <0 0x2000>;
+       linkram0        = <0x100000 0x4000>;
+       linkram1        = <0x70000000 0x10000>; /* 1MB OSR mem */
+
+       qmgrs {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+               qmgr0 {
+                       managed-queues = <0 0x2000>;
+                       reg = <0x2a40000 0x20000>,
+                             <0x2a06000 0x400>,
+                             <0x2a02000 0x1000>,
+                             <0x2a03000 0x1000>,
+                             <0x23a80000 0x20000>,
+                             <0x2a80000 0x20000>;
+                       reg-names = "peek", "status", "config",
+                                   "region", "push", "pop";
+               };
+       };
+       queue-pools {
+               qpend {
+                       qpend-0 {
+                               qrange = <658 8>;
+                               interrupts =<0 40 0xf04 0 41 0xf04 0 42 0xf04
+                                            0 43 0xf04 0 44 0xf04 0 45 0xf04
+                                            0 46 0xf04 0 47 0xf04>;
+                       };
+                       qpend-1 {
+                               qrange = <528 16>;
+                               interrupts = <0 48 0xf04 0 49 0xf04 0 50 0xf04
+                                             0 51 0xf04 0 52 0xf04 0 53 0xf04
+                                             0 54 0xf04 0 55 0xf04 0 56 0xf04
+                                             0 57 0xf04 0 58 0xf04 0 59 0xf04
+                                             0 60 0xf04 0 61 0xf04 0 62 0xf04
+                                             0 63 0xf04>;
+                               qalloc-by-id;
+                       };
+                       qpend-2 {
+                               qrange = <544 16>;
+                               interrupts = <0 64 0xf04 0 65 0xf04 0 66 0xf04
+                                             0 59 0xf04 0 68 0xf04 0 69 0xf04
+                                             0 70 0xf04 0 71 0xf04 0 72 0xf04
+                                             0 73 0xf04 0 74 0xf04 0 75 0xf04
+                                             0 76 0xf04 0 77 0xf04 0 78 0xf04
+                                             0 79 0xf04>;
+                       };
+               };
+               general-purpose {
+                       gp-0 {
+                               qrange = <4000 64>;
+                       };
+                       netcp-tx {
+                               qrange = <896 128>;
+                               qalloc-by-id;
+                       };
+               };
+       };
+       descriptor-regions {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+               region-12 {
+                       id = <12>;
+                       region-spec = <8192 128>;       /* num_desc desc_size */
+                       link-index = <0x4000>;
+               };
+       };
+}; /* qmss */
+
+knav_dmas: knav_dmas@0 {
+       compatible = "ti,keystone-navigator-dma";
+       clocks = <&papllclk>;
+       #address-cells = <1>;
+       #size-cells = <1>;
+       ranges;
+       ti,navigator-cloud-address = <0x23a80000 0x23a90000>;
+
+       dma_gbe: dma_gbe@0 {
+               reg = <0x26186000 0x100>,
+                         <0x26187000 0x2a0>,
+                         <0x26188000 0xb60>,
+                         <0x26186100 0x80>,
+                         <0x26189000 0x1000>;
+               reg-names = "global", "txchan", "rxchan",
+                               "txsched", "rxflow";
+       };
+};
+
+netcp: netcp@26000000 {
+       reg = <0x2620110 0x8>;
+       reg-names = "efuse";
+       compatible = "ti,netcp-1.0";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       /* NetCP address range */
+       ranges = <0 0x26000000 0x1000000>;
+
+       clocks = <&papllclk>, <&clkcpgmac>, <&chipclk12>;
+       dma-coherent;
+
+       ti,navigator-dmas = <&dma_gbe 0>,
+                       <&dma_gbe 8>,
+                       <&dma_gbe 0>;
+       ti,navigator-dma-names = "netrx0", "netrx1", "nettx";
+
+       netcp-devices {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+               gbe@200000 { /* ETHSS */
+                       label = "netcp-gbe";
+                       compatible = "ti,netcp-gbe-5";
+                       reg = <0x200000 0x900>, <0x220000 0x20000>;
+                       /* enable-ale; */
+                       tx-queue = <896>;
+                       tx-channel = "nettx";
+
+                       interfaces {
+                               gbe0: interface-0 {
+                                       slave-port = <0>;
+                                       link-interface  = <1>;
+                                       phy-handle      = <&ethphy0>;
+                               };
+                               gbe1: interface-1 {
+                                       slave-port = <1>;
+                                       link-interface  = <1>;
+                                       phy-handle      = <&ethphy1>;
+                               };
+                       };
+
+                       secondary-slave-ports {
+                               port-2 {
+                                       slave-port = <2>;
+                                       link-interface  = <2>;
+                               };
+                               port-3 {
+                                       slave-port = <3>;
+                                       link-interface  = <2>;
+                               };
+                       };
+               };
+       };
+
+       netcp-interfaces {
+               interface-0 {
+                       rx-channel = "netrx0";
+                       rx-pool = <1024 12>;
+                       tx-pool = <1024 12>;
+                       rx-queue-depth = <128 128 0 0>;
+                       rx-buffer-size = <1518 4096 0 0>;
+                       rx-queue = <528>;
+                       tx-completion-queue = <530>;
+                       efuse-mac = <1>;
+                       netcp-gbe = <&gbe0>;
+
+               };
+               interface-1 {
+                       rx-channel = "netrx1";
+                       rx-pool = <1024 12>;
+                       tx-pool = <1024 12>;
+                       rx-queue-depth = <128 128 0 0>;
+                       rx-buffer-size = <1518 4096 0 0>;
+                       rx-queue = <529>;
+                       tx-completion-queue = <531>;
+                       efuse-mac = <0>;
+                       local-mac-address = [02 18 31 7e 3e 7f];
+                       netcp-gbe = <&gbe1>;
+               };
+       };
+};
diff --git a/arch/arm/dts/keystone-k2l.dtsi b/arch/arm/dts/keystone-k2l.dtsi
new file mode 100644 (file)
index 0000000..d681cab
--- /dev/null
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2014 Texas Instruments, Inc.
+ *
+ * Keystone 2 Lamarr 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.
+ */
+
+/ {
+       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>;
+               };
+       };
+
+       soc {
+               /include/ "keystone-k2l-clocks.dtsi"
+
+               uart2: serial@02348400 {
+                       compatible = "ns16550a";
+                       current-speed = <115200>;
+                       reg-shift = <2>;
+                       reg-io-width = <4>;
+                       reg = <0x02348400 0x100>;
+                       clocks  = <&clkuart2>;
+                       interrupts = <GIC_SPI 432 IRQ_TYPE_EDGE_RISING>;
+               };
+
+               uart3:  serial@02348800 {
+                       compatible = "ns16550a";
+                       current-speed = <115200>;
+                       reg-shift = <2>;
+                       reg-io-width = <4>;
+                       reg = <0x02348800 0x100>;
+                       clocks  = <&clkuart3>;
+                       interrupts = <GIC_SPI 435 IRQ_TYPE_EDGE_RISING>;
+               };
+
+               dspgpio0: keystone_dsp_gpio@02620240 {
+                       compatible = "ti,keystone-dsp-gpio";
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio,syscon-dev = <&devctrl 0x240>;
+               };
+
+               dspgpio1: keystone_dsp_gpio@2620244 {
+                       compatible = "ti,keystone-dsp-gpio";
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio,syscon-dev = <&devctrl 0x244>;
+               };
+
+               dspgpio2: keystone_dsp_gpio@2620248 {
+                       compatible = "ti,keystone-dsp-gpio";
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio,syscon-dev = <&devctrl 0x248>;
+               };
+
+               dspgpio3: keystone_dsp_gpio@262024c {
+                       compatible = "ti,keystone-dsp-gpio";
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio,syscon-dev = <&devctrl 0x24c>;
+               };
+
+               mdio: mdio@26200f00 {
+                       compatible      = "ti,keystone_mdio", "ti,davinci_mdio";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x26200f00 0x100>;
+                       status = "disabled";
+                       clocks = <&clkcpgmac>;
+                       clock-names = "fck";
+                       bus_freq        = <2500000>;
+               };
+               /include/ "keystone-k2l-netcp.dtsi"
+       };
+};
+
+&spi0 {
+       ti,davinci-spi-num-cs = <5>;
+};
+
+&spi1 {
+       ti,davinci-spi-num-cs = <3>;
+};
+
+&spi2 {
+       ti,davinci-spi-num-cs = <5>;
+       /* Pin muxed. Enabled and configured by Bootloader */
+       status = "disabled";
+};
index 8f0d3fa22b428486efce39ab13f27a8622ee1e95..a42a485e2bbb12905d44d828aa640f4f68bcedbd 100644 (file)
@@ -8,7 +8,7 @@ CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_DEFAULT_DEVICE_TREE="k2e-evm"
+CONFIG_DEFAULT_DEVICE_TREE="keystone-k2e-evm"
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
index 17a5e670456c7fffe92e06c464d3c755600dcf37..f3ee01afb1d6094d54f8c3453f9d4d72af926df9 100644 (file)
@@ -8,7 +8,7 @@ CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_DEFAULT_DEVICE_TREE="k2g-evm"
+CONFIG_DEFAULT_DEVICE_TREE="keystone-k2g-evm"
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
index 6791d56335673e9ffc6abf924f3b6b6262f701ae..d924796627fce03a4f477743fc2748f96ed6ce6b 100644 (file)
@@ -8,7 +8,7 @@ CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_DEFAULT_DEVICE_TREE="k2hk-evm"
+CONFIG_DEFAULT_DEVICE_TREE="keystone-k2hk-evm"
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
index 4a70e1ad39cc9fab39b93905bec08d06fe3ff2a0..c81758571caf63ff83aa2e3ae2989ee3a52f739b 100644 (file)
@@ -8,7 +8,7 @@ CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_DEFAULT_DEVICE_TREE="k2l-evm"
+CONFIG_DEFAULT_DEVICE_TREE="keystone-k2l-evm"
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y