forked from Minki/linux
bac6dd36e3
- Add and fix a bunch of clocks in the DTS corresponding to the new clock support merged into the clk tree. - Move the CLCD display configuration from boardfile to device tree using the new CLCD support merged into the fbdev tree. - Cut some auxdata. - Cut some static remappings. - Move the sched_clock() counter to use syscon+regmap. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJXxogwAAoJEEEQszewGV1z2WoQAIpNj8akj2qHWfaZKUa5HTVH YN2ukEkhpY8qXDw8ZjQVGMQ2VrHUCFWkwcYat8RPe7yfeZcEEkFMTgfTkq9h3P3g 15a+a4PuX2Prli/gzH3gq9VayHBOrUe+YAiy6qRbtVM6K7qwd9fBDWGYUBgC4i9p 7Y8lsyNTXXthtOnajlYVAxfFGTq67F2kZjHiCEagsWB6aLfT5Ixi/ZmCTs/GTfEf Lon7XG8RQFo/3xatM/k4kjv/Bd8GzIW8UR/iZ5qnEOBIbcFSBWey9N0saiagZ8M1 vMmYjClMlunvX8L22EoC8ZOHcfF+YFeKpqbKehDmobY5qdi40yTse0CoVcFPaX7o JZWZThOirsEb6q0iFH/Imno8dGWnWRG++h3ONx4KYbyJ8dOxJOwjbGtM23iT+SbF JnceDpQ/oo5D84UEZhdonY0bemhkKhd9TADHlg0IHPo94dtD2VCsZalfLk7RyDyx 9fOZFBZv5y8khh9nX5BhBkDexw0LXXmSyzrkjVOKsuImsBaLFueZe8kTDHFHbRCm MjYwLGRdmQIBCubdbjj1lxWk+xVDtvSonrT57a/A3+luAJutGbOdAeCUGtF3IzIY uSgGVaExxD+ax/E9dWP6N1kPvBAtB7+jqQXOsX6kO39irFxoUBE6OhdyT4RsrSEN J1FRkiDG5EH1rXiVpD8h =kkO1 -----END PGP SIGNATURE----- Merge tag 'integrator-armsoc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/late Pull "This is a bunch of Integrator changes for v4.9" Linus Walleij: - Add and fix a bunch of clocks in the DTS corresponding to the new clock support merged into the clk tree. - Move the CLCD display configuration from boardfile to device tree using the new CLCD support merged into the fbdev tree. - Cut some auxdata. - Cut some static remappings. - Move the sched_clock() counter to use syscon+regmap. * tag 'integrator-armsoc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator: ARM: integrator: read counter using syscon/regmap ARM: integrator: cut down on static maps ARM: integrator: delete some auxdata ARM: integrator: move CP CLCD display to DTS ARM: dts: add the core module clocks to Integrator/CP ARM: dts: Add the core module clocks to Integrator/AP ARM: dts: add the Integrator/AP baseboard clocks ARM: dts: set the 24MHz xtal as parent of the UART clock
203 lines
5.3 KiB
Plaintext
203 lines
5.3 KiB
Plaintext
/*
|
|
* Device Tree for the ARM Integrator/AP platform
|
|
*/
|
|
|
|
/dts-v1/;
|
|
/include/ "integrator.dtsi"
|
|
|
|
/ {
|
|
model = "ARM Integrator/AP";
|
|
compatible = "arm,integrator-ap";
|
|
dma-ranges = <0x80000000 0x0 0x80000000>;
|
|
|
|
aliases {
|
|
arm,timer-primary = &timer2;
|
|
arm,timer-secondary = &timer1;
|
|
};
|
|
|
|
chosen {
|
|
bootargs = "root=/dev/ram0 console=ttyAM0,38400n8 earlyprintk";
|
|
};
|
|
|
|
/* 24 MHz chrystal on the Integrator/AP development board */
|
|
xtal24mhz: xtal24mhz@24M {
|
|
#clock-cells = <0>;
|
|
compatible = "fixed-clock";
|
|
clock-frequency = <24000000>;
|
|
};
|
|
|
|
pclk: pclk@0 {
|
|
#clock-cells = <0>;
|
|
compatible = "fixed-factor-clock";
|
|
clock-div = <1>;
|
|
clock-mult = <1>;
|
|
clocks = <&xtal24mhz>;
|
|
};
|
|
|
|
/* The UART clock is 14.74 MHz divided by an ICS525 */
|
|
uartclk: uartclk@14.74M {
|
|
#clock-cells = <0>;
|
|
compatible = "fixed-clock";
|
|
clock-frequency = <14745600>;
|
|
clocks = <&xtal24mhz>;
|
|
};
|
|
|
|
core-module@10000000 {
|
|
/* 24 MHz chrystal on the core module */
|
|
cm24mhz: cm24mhz@24M {
|
|
#clock-cells = <0>;
|
|
compatible = "fixed-clock";
|
|
clock-frequency = <24000000>;
|
|
};
|
|
|
|
/* Oscillator on the core module, clocks the CPU core */
|
|
cmosc: cmosc@24M {
|
|
compatible = "arm,syscon-icst525-integratorap-cm";
|
|
#clock-cells = <0>;
|
|
lock-offset = <0x14>;
|
|
vco-offset = <0x08>;
|
|
clocks = <&cm24mhz>;
|
|
};
|
|
|
|
/* Auxilary oscillator on the core module, 32.369MHz at boot */
|
|
auxosc: auxosc@24M {
|
|
compatible = "arm,syscon-icst525";
|
|
#clock-cells = <0>;
|
|
lock-offset = <0x14>;
|
|
vco-offset = <0x1c>;
|
|
clocks = <&cm24mhz>;
|
|
};
|
|
};
|
|
|
|
syscon {
|
|
compatible = "arm,integrator-ap-syscon", "syscon";
|
|
reg = <0x11000000 0x100>;
|
|
interrupt-parent = <&pic>;
|
|
/* These are the logical module IRQs */
|
|
interrupts = <9>, <10>, <11>, <12>;
|
|
|
|
/*
|
|
* SYSCLK clocks PCIv3 bridge, system controller and the
|
|
* logic modules.
|
|
*/
|
|
sysclk: apsys@24M {
|
|
compatible = "arm,syscon-icst525-integratorap-sys";
|
|
#clock-cells = <0>;
|
|
lock-offset = <0x1c>;
|
|
vco-offset = <0x04>;
|
|
clocks = <&xtal24mhz>;
|
|
};
|
|
|
|
/* One-bit control for the PCI bus clock (33 or 25 MHz) */
|
|
pciclk: pciclk@24M {
|
|
compatible = "arm,syscon-icst525-integratorap-pci";
|
|
#clock-cells = <0>;
|
|
lock-offset = <0x1c>;
|
|
vco-offset = <0x04>;
|
|
clocks = <&xtal24mhz>;
|
|
};
|
|
};
|
|
|
|
timer0: timer@13000000 {
|
|
compatible = "arm,integrator-timer";
|
|
clocks = <&xtal24mhz>;
|
|
};
|
|
|
|
timer1: timer@13000100 {
|
|
compatible = "arm,integrator-timer";
|
|
clocks = <&xtal24mhz>;
|
|
};
|
|
|
|
timer2: timer@13000200 {
|
|
compatible = "arm,integrator-timer";
|
|
clocks = <&xtal24mhz>;
|
|
};
|
|
|
|
pic: pic@14000000 {
|
|
valid-mask = <0x003fffff>;
|
|
};
|
|
|
|
pci: pciv3@62000000 {
|
|
compatible = "v3,v360epc-pci";
|
|
#interrupt-cells = <1>;
|
|
#size-cells = <2>;
|
|
#address-cells = <3>;
|
|
reg = <0x62000000 0x10000>;
|
|
interrupt-parent = <&pic>;
|
|
interrupts = <17>; /* Bus error IRQ */
|
|
ranges = <0x00000000 0 0x61000000 /* config space */
|
|
0x61000000 0 0x00100000 /* 16 MiB @ 61000000 */
|
|
0x01000000 0 0x0 /* I/O space */
|
|
0x60000000 0 0x00100000 /* 16 MiB @ 60000000 */
|
|
0x02000000 0 0x00000000 /* non-prefectable memory */
|
|
0x40000000 0 0x10000000 /* 256 MiB @ 40000000 */
|
|
0x42000000 0 0x10000000 /* prefetchable memory */
|
|
0x50000000 0 0x10000000>; /* 256 MiB @ 50000000 */
|
|
interrupt-map-mask = <0xf800 0 0 0x7>;
|
|
interrupt-map = <
|
|
/* IDSEL 9 */
|
|
0x4800 0 0 1 &pic 13 /* INT A on slot 9 is irq 13 */
|
|
0x4800 0 0 2 &pic 14 /* INT B on slot 9 is irq 14 */
|
|
0x4800 0 0 3 &pic 15 /* INT C on slot 9 is irq 15 */
|
|
0x4800 0 0 4 &pic 16 /* INT D on slot 9 is irq 16 */
|
|
/* IDSEL 10 */
|
|
0x5000 0 0 1 &pic 14 /* INT A on slot 10 is irq 14 */
|
|
0x5000 0 0 2 &pic 15 /* INT B on slot 10 is irq 15 */
|
|
0x5000 0 0 3 &pic 16 /* INT C on slot 10 is irq 16 */
|
|
0x5000 0 0 4 &pic 13 /* INT D on slot 10 is irq 13 */
|
|
/* IDSEL 11 */
|
|
0x5800 0 0 1 &pic 15 /* INT A on slot 11 is irq 15 */
|
|
0x5800 0 0 2 &pic 16 /* INT B on slot 11 is irq 16 */
|
|
0x5800 0 0 3 &pic 13 /* INT C on slot 11 is irq 13 */
|
|
0x5800 0 0 4 &pic 14 /* INT D on slot 11 is irq 14 */
|
|
/* IDSEL 12 */
|
|
0x6000 0 0 1 &pic 16 /* INT A on slot 12 is irq 16 */
|
|
0x6000 0 0 2 &pic 13 /* INT B on slot 12 is irq 13 */
|
|
0x6000 0 0 3 &pic 14 /* INT C on slot 12 is irq 14 */
|
|
0x6000 0 0 4 &pic 15 /* INT D on slot 12 is irq 15 */
|
|
>;
|
|
};
|
|
|
|
fpga {
|
|
/*
|
|
* The Integator/AP predates the idea to have magic numbers
|
|
* identifying the PrimeCell in hardware, thus we have to
|
|
* supply these from the device tree.
|
|
*/
|
|
rtc: rtc@15000000 {
|
|
compatible = "arm,pl030", "arm,primecell";
|
|
arm,primecell-periphid = <0x00041030>;
|
|
clocks = <&pclk>;
|
|
clock-names = "apb_pclk";
|
|
};
|
|
|
|
uart0: uart@16000000 {
|
|
compatible = "arm,pl010", "arm,primecell";
|
|
arm,primecell-periphid = <0x00041010>;
|
|
clocks = <&uartclk>, <&pclk>;
|
|
clock-names = "uartclk", "apb_pclk";
|
|
};
|
|
|
|
uart1: uart@17000000 {
|
|
compatible = "arm,pl010", "arm,primecell";
|
|
arm,primecell-periphid = <0x00041010>;
|
|
clocks = <&uartclk>, <&pclk>;
|
|
clock-names = "uartclk", "apb_pclk";
|
|
};
|
|
|
|
kmi0: kmi@18000000 {
|
|
compatible = "arm,pl050", "arm,primecell";
|
|
arm,primecell-periphid = <0x00041050>;
|
|
clocks = <&xtal24mhz>, <&pclk>;
|
|
clock-names = "KMIREFCLK", "apb_pclk";
|
|
};
|
|
|
|
kmi1: kmi@19000000 {
|
|
compatible = "arm,pl050", "arm,primecell";
|
|
arm,primecell-periphid = <0x00041050>;
|
|
clocks = <&xtal24mhz>, <&pclk>;
|
|
clock-names = "KMIREFCLK", "apb_pclk";
|
|
};
|
|
};
|
|
};
|