mirror of
https://github.com/torvalds/linux.git
synced 2024-11-15 00:21:59 +00:00
2dc24b0d06
This is a small follow-up to the larger ARM SoC updates merged last week, almost entirely for the keystone platform. The main change here is to use the new dma-ranges parsing code that came in through Russell's ARM tree. This allows the keystone platform to do cache-coherent DMA and to finally support all the available physical memory when LPAE is enabled. Aside from this, the keystone reset driver has been rewritten, and there is a small bug fix to allow building the orion5x platform again. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAU5harmCrR//JCVInAQJuXhAA2v+IVK4HqkIric4Hj/7monhv/Gxm+7Fj +3GYX9QHncSnILQm0ke+OYKYoLNPDbDVyvsY5JWbewLC3TbvnKZoM25Q4Aj6Fcj5 GAVgggMtc7dkk8VIDfUvjyYZsiiWcvhATvwlQg70oOC0LmRjPwQnBvyP+zvUiBUJ ++xBGiVsfScIRhbjB+cYZl7dhLXA+GKzaCw9sKVCS+ExmlAYBSy4cUkRCkw4AQI6 s4udVuPtFi7++rNTdn2MBeyLyk0pOjQu+jepo/bwmKGaKS88KwZjTCPI1YRtrkrv ZjF4AY0kjUenoJuN9Dj9q6I6Ivc8YFDr411hF/LwiBF7+QUk0EnAEeAhDGan/ZCG 1+xZbY54tQk+TNNgR2V/RzUWilhPmG3rdtq9MnvYrmQnyGeF07MCCAIqoH+B+hDm AvApocOT9sReD4yTNIBHYPKsp04jLXR5XKRZ98QkAOInEQaYTpFOU3LyrdgFLLB3 fIfDf2ZHCc6cmp/wXKk83LVxFQqYbyw0Q93xB/X/8yqb/NyJ8hVaKWgAcofUuj3t M87I+XcljA/dx8FsELM3B+qSZXakdDUgXBkfNePkm7GGlq5NziBTMJnhbXiIVMe+ 4kZIyxRD3OZj0d1K3mHMSvoX/FY/98AJWk2eizwwIx64PskatiKQTkX9XFnYPXLb AtdWv8t3Ozc= =AqkT -----END PGP SIGNATURE----- Merge tag 'soc2-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull part two of ARM SoC updates from Arnd Bergmann: "This is a small follow-up to the larger ARM SoC updates merged last week, almost entirely for the keystone platform. The main change here is to use the new dma-ranges parsing code that came in through Russell's ARM tree. This allows the keystone platform to do cache-coherent DMA and to finally support all the available physical memory when LPAE is enabled. Aside from this, the keystone reset driver has been rewritten, and there is a small bug fix to allow building the orion5x platform again" * tag 'soc2-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: keystone: Drop use of meminfo since its not available anymore ARM: orion5x: fix mvebu_mbus_dt_init call ARM: configs: keystone: enable reset driver support ARM: dts: keystone: update reset node to work with reset driver ARM: keystone: remove redundant reset stuff ARM: keystone: Update the dma offset for non-dt platform devices ARM: keystone: Switch over to coherent memory address space ARM: configs: keystone: add MTD_SPI_NOR (new dependency for M25P80) ARM: configs: keystone: drop CONFIG_COMMON_CLK_DEBUG
271 lines
6.9 KiB
Plaintext
271 lines
6.9 KiB
Plaintext
/*
|
|
* Copyright 2013 Texas Instruments, Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <dt-bindings/interrupt-controller/arm-gic.h>
|
|
#include <dt-bindings/gpio/gpio.h>
|
|
|
|
#include "skeleton.dtsi"
|
|
|
|
/ {
|
|
model = "Texas Instruments Keystone 2 SoC";
|
|
#address-cells = <2>;
|
|
#size-cells = <2>;
|
|
interrupt-parent = <&gic>;
|
|
|
|
aliases {
|
|
serial0 = &uart0;
|
|
};
|
|
|
|
memory {
|
|
reg = <0x00000000 0x80000000 0x00000000 0x40000000>;
|
|
};
|
|
|
|
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)>;
|
|
};
|
|
|
|
timer {
|
|
compatible = "arm,armv7-timer";
|
|
interrupts =
|
|
<GIC_PPI 13
|
|
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
|
|
<GIC_PPI 14
|
|
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
|
|
<GIC_PPI 11
|
|
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
|
|
<GIC_PPI 10
|
|
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
|
|
};
|
|
|
|
pmu {
|
|
compatible = "arm,cortex-a15-pmu";
|
|
interrupts = <GIC_SPI 20 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 21 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 22 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 23 IRQ_TYPE_EDGE_RISING>;
|
|
};
|
|
|
|
soc {
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
compatible = "ti,keystone","simple-bus";
|
|
interrupt-parent = <&gic>;
|
|
ranges = <0x0 0x0 0x0 0xc0000000>;
|
|
dma-ranges = <0x80000000 0x8 0x00000000 0x80000000>;
|
|
|
|
pllctrl: pll-controller@02310000 {
|
|
compatible = "ti,keystone-pllctrl", "syscon";
|
|
reg = <0x02310000 0x200>;
|
|
};
|
|
|
|
devctrl: device-state-control@02620000 {
|
|
compatible = "ti,keystone-devctrl", "syscon";
|
|
reg = <0x02620000 0x1000>;
|
|
};
|
|
|
|
rstctrl: reset-controller {
|
|
compatible = "ti,keystone-reset";
|
|
ti,syscon-pll = <&pllctrl 0xe4>;
|
|
ti,syscon-dev = <&devctrl 0x328>;
|
|
ti,wdt-list = <0>;
|
|
};
|
|
|
|
/include/ "keystone-clocks.dtsi"
|
|
|
|
uart0: serial@02530c00 {
|
|
compatible = "ns16550a";
|
|
current-speed = <115200>;
|
|
reg-shift = <2>;
|
|
reg-io-width = <4>;
|
|
reg = <0x02530c00 0x100>;
|
|
clocks = <&clkuart0>;
|
|
interrupts = <GIC_SPI 277 IRQ_TYPE_EDGE_RISING>;
|
|
};
|
|
|
|
uart1: serial@02531000 {
|
|
compatible = "ns16550a";
|
|
current-speed = <115200>;
|
|
reg-shift = <2>;
|
|
reg-io-width = <4>;
|
|
reg = <0x02531000 0x100>;
|
|
clocks = <&clkuart1>;
|
|
interrupts = <GIC_SPI 280 IRQ_TYPE_EDGE_RISING>;
|
|
};
|
|
|
|
i2c0: i2c@2530000 {
|
|
compatible = "ti,davinci-i2c";
|
|
reg = <0x02530000 0x400>;
|
|
clock-frequency = <100000>;
|
|
clocks = <&clki2c>;
|
|
interrupts = <GIC_SPI 283 IRQ_TYPE_EDGE_RISING>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
};
|
|
|
|
i2c1: i2c@2530400 {
|
|
compatible = "ti,davinci-i2c";
|
|
reg = <0x02530400 0x400>;
|
|
clock-frequency = <100000>;
|
|
clocks = <&clki2c>;
|
|
interrupts = <GIC_SPI 286 IRQ_TYPE_EDGE_RISING>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
};
|
|
|
|
i2c2: i2c@2530800 {
|
|
compatible = "ti,davinci-i2c";
|
|
reg = <0x02530800 0x400>;
|
|
clock-frequency = <100000>;
|
|
clocks = <&clki2c>;
|
|
interrupts = <GIC_SPI 289 IRQ_TYPE_EDGE_RISING>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
};
|
|
|
|
spi0: spi@21000400 {
|
|
compatible = "ti,dm6441-spi";
|
|
reg = <0x21000400 0x200>;
|
|
num-cs = <4>;
|
|
ti,davinci-spi-intr-line = <0>;
|
|
interrupts = <GIC_SPI 292 IRQ_TYPE_EDGE_RISING>;
|
|
clocks = <&clkspi>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
};
|
|
|
|
spi1: spi@21000600 {
|
|
compatible = "ti,dm6441-spi";
|
|
reg = <0x21000600 0x200>;
|
|
num-cs = <4>;
|
|
ti,davinci-spi-intr-line = <0>;
|
|
interrupts = <GIC_SPI 296 IRQ_TYPE_EDGE_RISING>;
|
|
clocks = <&clkspi>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
};
|
|
|
|
spi2: spi@21000800 {
|
|
compatible = "ti,dm6441-spi";
|
|
reg = <0x21000800 0x200>;
|
|
num-cs = <4>;
|
|
ti,davinci-spi-intr-line = <0>;
|
|
interrupts = <GIC_SPI 300 IRQ_TYPE_EDGE_RISING>;
|
|
clocks = <&clkspi>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
};
|
|
|
|
usb_phy: usb_phy@2620738 {
|
|
compatible = "ti,keystone-usbphy";
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
reg = <0x2620738 32>;
|
|
status = "disabled";
|
|
};
|
|
|
|
usb: usb@2680000 {
|
|
compatible = "ti,keystone-dwc3";
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
reg = <0x2680000 0x10000>;
|
|
clocks = <&clkusb>;
|
|
clock-names = "usb";
|
|
interrupts = <GIC_SPI 393 IRQ_TYPE_EDGE_RISING>;
|
|
ranges;
|
|
dma-coherent;
|
|
dma-ranges;
|
|
status = "disabled";
|
|
|
|
dwc3@2690000 {
|
|
compatible = "synopsys,dwc3";
|
|
reg = <0x2690000 0x70000>;
|
|
interrupts = <GIC_SPI 393 IRQ_TYPE_EDGE_RISING>;
|
|
usb-phy = <&usb_phy>, <&usb_phy>;
|
|
};
|
|
};
|
|
|
|
wdt: wdt@022f0080 {
|
|
compatible = "ti,keystone-wdt","ti,davinci-wdt";
|
|
reg = <0x022f0080 0x80>;
|
|
clocks = <&clkwdtimer0>;
|
|
};
|
|
|
|
clock_event: timer@22f0000 {
|
|
compatible = "ti,keystone-timer";
|
|
reg = <0x022f0000 0x80>;
|
|
interrupts = <GIC_SPI 110 IRQ_TYPE_EDGE_RISING>;
|
|
clocks = <&clktimer15>;
|
|
};
|
|
|
|
gpio0: gpio@260bf00 {
|
|
compatible = "ti,keystone-gpio";
|
|
reg = <0x0260bf00 0x100>;
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
/* HW Interrupts mapped to GPIO pins */
|
|
interrupts = <GIC_SPI 120 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 121 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 122 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 123 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 124 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 125 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 126 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 127 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 128 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 129 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 130 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 131 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 132 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 133 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 134 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 135 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 136 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 137 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 138 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 139 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 140 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 141 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 142 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 143 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 144 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 145 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 146 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 147 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 148 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 149 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 150 IRQ_TYPE_EDGE_RISING>,
|
|
<GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
|
|
clocks = <&clkgpio>;
|
|
clock-names = "gpio";
|
|
ti,ngpio = <32>;
|
|
ti,davinci-gpio-unbanked = <32>;
|
|
};
|
|
|
|
aemif: aemif@21000A00 {
|
|
compatible = "ti,keystone-aemif", "ti,davinci-aemif";
|
|
#address-cells = <2>;
|
|
#size-cells = <1>;
|
|
clocks = <&clkaemif>;
|
|
clock-names = "aemif";
|
|
clock-ranges;
|
|
|
|
reg = <0x21000A00 0x00000100>;
|
|
ranges = <0 0 0x30000000 0x10000000
|
|
1 0 0x21000A00 0x00000100>;
|
|
};
|
|
};
|
|
};
|