mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 13:11:45 +00:00
ae36e95cf8
window: Group changes to the device tree. In preparation for adding device tree overlay support, OF_DYNAMIC is reworked so that a set of device tree changes can be prepared and applied to the tree all at once. OF_RECONFIG notifiers see the most significant change here so that users always get a consistent view of the tree. Notifiers generation is moved from before a change to after it, and notifiers for a group of changes are emitted after the entire block of changes have been applied Automatic console selection from DT. Console drivers can now use of_console_check() to see if the device node is specified as a console device. If so then it gets added as a preferred console. UART devices get this support automatically when uart_add_one_port() is called. DT unit tests no longer depend on pre-loaded data in the device tree. Data is loaded dynamically at the start of unit tests, and then unloaded again when the tests have completed. Also contains a few bugfixes for reserved regions and early memory setup. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJT6M7XAAoJEMWQL496c2LNTTgP/2rXyrTTGZpK/qrLKHWKYHvr XL7tcTkhA0OLU64E37fB+xtDXyBYnLsharuwUFSd1LlL1Wnc1cZN5ORRlMJbmjUR Wvwl0A8/mkhGl4tzzKgJ4z4rMJXvlZfJRpnVoRB5FOn90LI7k/jsf5rIwF/6S90B 6D6II0r4RG9ku1m7g70cToxcIFCzp0V+eu2tym9GnhsyGKlunPT9iNiTpwfVhPAj QUvMPKIQXReOv6xDU5q6E07839IMf7SdAvciBTHGnCDD7sGziHvnBIShj/2vTDAF 27sGRKrWUnnuxRUMOoIudiYyeHXIdt1WXp6FsS/ztVI37Ijh9YPShJwWGhQDppnp 4tcoSdefqw9IRUajAVWsB0RUW/tCL4a7tggWofylOA6itDi+HZnw6YafE1G1YzxF q8OFo9uqLcmFQfHDJpk+sdtXoMZzOgrxlEscsGsQ8kd2Uoe8+chgR9EY1sqPkWVF Zw0FJCTB6spBlsnXeboBGrnvpbPkacwhvesIFO0IANy4j4R55xlEeTcs1fe3ubUf UhNyyFdnCAUA7e5CAabcAQYsdbEKG6v0Il3H6xts36c8lXCSFXVgNcw5mdCpFCcQ DZ3/1FGSVzkYNXX8hlzIn1W0dqvwn4x0ZbnpXUJrGUBpSmjt9qkXx0XbdeFwartU 7X4tNGS1jfNYhOdP87jF =8IFz -----END PGP SIGNATURE----- Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux Pull device tree updates from Grant Likely: "The branch contains the following device tree changes the v3.17 merge window: Group changes to the device tree. In preparation for adding device tree overlay support, OF_DYNAMIC is reworked so that a set of device tree changes can be prepared and applied to the tree all at once. OF_RECONFIG notifiers see the most significant change here so that users always get a consistent view of the tree. Notifiers generation is moved from before a change to after it, and notifiers for a group of changes are emitted after the entire block of changes have been applied Automatic console selection from DT. Console drivers can now use of_console_check() to see if the device node is specified as a console device. If so then it gets added as a preferred console. UART devices get this support automatically when uart_add_one_port() is called. DT unit tests no longer depend on pre-loaded data in the device tree. Data is loaded dynamically at the start of unit tests, and then unloaded again when the tests have completed. Also contains a few bugfixes for reserved regions and early memory setup" * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux: (21 commits) of: Fixing OF Selftest build error drivers: of: add automated assignment of reserved regions to client devices of: Use proper types for checking memory overflow of: typo fix in __of_prop_dup() Adding selftest testdata dynamically into live tree of: Add todo tasklist for Devicetree of: Transactional DT support. of: Reorder device tree changes and notifiers of: Move dynamic node fixups out of powerpc and into common code of: Make sure attached nodes don't carry along extra children of: Make devicetree sysfs update functions consistent. of: Create unlocked versions of node and property add/remove functions OF: Utility helper functions for dynamic nodes of: Move CONFIG_OF_DYNAMIC code into a separate file of: rename of_aliases_mutex to just of_mutex of/platform: Fix of_platform_device_destroy iteration of devices of: Migrate of_find_node_by_name() users to for_each_node_by_name() tty: Update hypervisor tty drivers to use core stdout parsing code. arm/versatile: Add the uart as the stdout device. of: Enable console on serial ports specified by /chosen/stdout-path ...
288 lines
6.1 KiB
Plaintext
288 lines
6.1 KiB
Plaintext
/dts-v1/;
|
|
/include/ "skeleton.dtsi"
|
|
|
|
/ {
|
|
model = "ARM Versatile AB";
|
|
compatible = "arm,versatile-ab";
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
interrupt-parent = <&vic>;
|
|
|
|
aliases {
|
|
serial0 = &uart0;
|
|
serial1 = &uart1;
|
|
serial2 = &uart2;
|
|
i2c0 = &i2c0;
|
|
};
|
|
|
|
chosen {
|
|
stdout-path = &uart0;
|
|
};
|
|
|
|
memory {
|
|
reg = <0x0 0x08000000>;
|
|
};
|
|
|
|
xtal24mhz: xtal24mhz@24M {
|
|
#clock-cells = <0>;
|
|
compatible = "fixed-clock";
|
|
clock-frequency = <24000000>;
|
|
};
|
|
|
|
core-module@10000000 {
|
|
compatible = "arm,core-module-versatile", "syscon";
|
|
reg = <0x10000000 0x200>;
|
|
|
|
/* OSC1 on AB, OSC4 on PB */
|
|
osc1: cm_aux_osc@24M {
|
|
#clock-cells = <0>;
|
|
compatible = "arm,versatile-cm-auxosc";
|
|
clocks = <&xtal24mhz>;
|
|
};
|
|
|
|
/* The timer clock is the 24 MHz oscillator divided to 1MHz */
|
|
timclk: timclk@1M {
|
|
#clock-cells = <0>;
|
|
compatible = "fixed-factor-clock";
|
|
clock-div = <24>;
|
|
clock-mult = <1>;
|
|
clocks = <&xtal24mhz>;
|
|
};
|
|
|
|
pclk: pclk@24M {
|
|
#clock-cells = <0>;
|
|
compatible = "fixed-factor-clock";
|
|
clock-div = <1>;
|
|
clock-mult = <1>;
|
|
clocks = <&xtal24mhz>;
|
|
};
|
|
};
|
|
|
|
flash@34000000 {
|
|
compatible = "arm,versatile-flash";
|
|
reg = <0x34000000 0x4000000>;
|
|
bank-width = <4>;
|
|
};
|
|
|
|
i2c0: i2c@10002000 {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
compatible = "arm,versatile-i2c";
|
|
reg = <0x10002000 0x1000>;
|
|
|
|
rtc@68 {
|
|
compatible = "dallas,ds1338";
|
|
reg = <0x68>;
|
|
};
|
|
};
|
|
|
|
net@10010000 {
|
|
compatible = "smsc,lan91c111";
|
|
reg = <0x10010000 0x10000>;
|
|
interrupts = <25>;
|
|
};
|
|
|
|
lcd@10008000 {
|
|
compatible = "arm,versatile-lcd";
|
|
reg = <0x10008000 0x1000>;
|
|
};
|
|
|
|
amba {
|
|
compatible = "arm,amba-bus";
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
ranges;
|
|
|
|
vic: intc@10140000 {
|
|
compatible = "arm,versatile-vic";
|
|
interrupt-controller;
|
|
#interrupt-cells = <1>;
|
|
reg = <0x10140000 0x1000>;
|
|
clear-mask = <0xffffffff>;
|
|
valid-mask = <0xffffffff>;
|
|
};
|
|
|
|
sic: intc@10003000 {
|
|
compatible = "arm,versatile-sic";
|
|
interrupt-controller;
|
|
#interrupt-cells = <1>;
|
|
reg = <0x10003000 0x1000>;
|
|
interrupt-parent = <&vic>;
|
|
interrupts = <31>; /* Cascaded to vic */
|
|
clear-mask = <0xffffffff>;
|
|
valid-mask = <0xffc203f8>;
|
|
};
|
|
|
|
dma@10130000 {
|
|
compatible = "arm,pl081", "arm,primecell";
|
|
reg = <0x10130000 0x1000>;
|
|
interrupts = <17>;
|
|
clocks = <&pclk>;
|
|
clock-names = "apb_pclk";
|
|
};
|
|
|
|
uart0: uart@101f1000 {
|
|
compatible = "arm,pl011", "arm,primecell";
|
|
reg = <0x101f1000 0x1000>;
|
|
interrupts = <12>;
|
|
clocks = <&xtal24mhz>, <&pclk>;
|
|
clock-names = "uartclk", "apb_pclk";
|
|
};
|
|
|
|
uart1: uart@101f2000 {
|
|
compatible = "arm,pl011", "arm,primecell";
|
|
reg = <0x101f2000 0x1000>;
|
|
interrupts = <13>;
|
|
clocks = <&xtal24mhz>, <&pclk>;
|
|
clock-names = "uartclk", "apb_pclk";
|
|
};
|
|
|
|
uart2: uart@101f3000 {
|
|
compatible = "arm,pl011", "arm,primecell";
|
|
reg = <0x101f3000 0x1000>;
|
|
interrupts = <14>;
|
|
clocks = <&xtal24mhz>, <&pclk>;
|
|
clock-names = "uartclk", "apb_pclk";
|
|
};
|
|
|
|
smc@10100000 {
|
|
compatible = "arm,primecell";
|
|
reg = <0x10100000 0x1000>;
|
|
clocks = <&pclk>;
|
|
clock-names = "apb_pclk";
|
|
};
|
|
|
|
mpmc@10110000 {
|
|
compatible = "arm,primecell";
|
|
reg = <0x10110000 0x1000>;
|
|
clocks = <&pclk>;
|
|
clock-names = "apb_pclk";
|
|
};
|
|
|
|
display@10120000 {
|
|
compatible = "arm,pl110", "arm,primecell";
|
|
reg = <0x10120000 0x1000>;
|
|
interrupts = <16>;
|
|
clocks = <&osc1>, <&pclk>;
|
|
clock-names = "clcd", "apb_pclk";
|
|
};
|
|
|
|
sctl@101e0000 {
|
|
compatible = "arm,primecell";
|
|
reg = <0x101e0000 0x1000>;
|
|
clocks = <&pclk>;
|
|
clock-names = "apb_pclk";
|
|
};
|
|
|
|
watchdog@101e1000 {
|
|
compatible = "arm,primecell";
|
|
reg = <0x101e1000 0x1000>;
|
|
interrupts = <0>;
|
|
clocks = <&pclk>;
|
|
clock-names = "apb_pclk";
|
|
};
|
|
|
|
timer@101e2000 {
|
|
compatible = "arm,sp804", "arm,primecell";
|
|
reg = <0x101e2000 0x1000>;
|
|
interrupts = <4>;
|
|
clocks = <&timclk>, <&timclk>, <&pclk>;
|
|
clock-names = "timer0", "timer1", "apb_pclk";
|
|
};
|
|
|
|
timer@101e3000 {
|
|
compatible = "arm,sp804", "arm,primecell";
|
|
reg = <0x101e3000 0x1000>;
|
|
interrupts = <5>;
|
|
clocks = <&timclk>, <&timclk>, <&pclk>;
|
|
clock-names = "timer0", "timer1", "apb_pclk";
|
|
};
|
|
|
|
gpio0: gpio@101e4000 {
|
|
compatible = "arm,pl061", "arm,primecell";
|
|
reg = <0x101e4000 0x1000>;
|
|
gpio-controller;
|
|
interrupts = <6>;
|
|
#gpio-cells = <2>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
clocks = <&pclk>;
|
|
clock-names = "apb_pclk";
|
|
};
|
|
|
|
gpio1: gpio@101e5000 {
|
|
compatible = "arm,pl061", "arm,primecell";
|
|
reg = <0x101e5000 0x1000>;
|
|
interrupts = <7>;
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
clocks = <&pclk>;
|
|
clock-names = "apb_pclk";
|
|
};
|
|
|
|
rtc@101e8000 {
|
|
compatible = "arm,pl030", "arm,primecell";
|
|
reg = <0x101e8000 0x1000>;
|
|
interrupts = <10>;
|
|
clocks = <&pclk>;
|
|
clock-names = "apb_pclk";
|
|
};
|
|
|
|
sci@101f0000 {
|
|
compatible = "arm,primecell";
|
|
reg = <0x101f0000 0x1000>;
|
|
interrupts = <15>;
|
|
clocks = <&pclk>;
|
|
clock-names = "apb_pclk";
|
|
};
|
|
|
|
ssp@101f4000 {
|
|
compatible = "arm,pl022", "arm,primecell";
|
|
reg = <0x101f4000 0x1000>;
|
|
interrupts = <11>;
|
|
clocks = <&xtal24mhz>, <&pclk>;
|
|
clock-names = "SSPCLK", "apb_pclk";
|
|
};
|
|
|
|
fpga {
|
|
compatible = "arm,versatile-fpga", "simple-bus";
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
ranges = <0 0x10000000 0x10000>;
|
|
|
|
aaci@4000 {
|
|
compatible = "arm,primecell";
|
|
reg = <0x4000 0x1000>;
|
|
interrupts = <24>;
|
|
clocks = <&pclk>;
|
|
clock-names = "apb_pclk";
|
|
};
|
|
mmc@5000 {
|
|
compatible = "arm,pl180", "arm,primecell";
|
|
reg = < 0x5000 0x1000>;
|
|
interrupts-extended = <&vic 22 &sic 2>;
|
|
clocks = <&xtal24mhz>, <&pclk>;
|
|
clock-names = "mclk", "apb_pclk";
|
|
};
|
|
kmi@6000 {
|
|
compatible = "arm,pl050", "arm,primecell";
|
|
reg = <0x6000 0x1000>;
|
|
interrupt-parent = <&sic>;
|
|
interrupts = <3>;
|
|
clocks = <&xtal24mhz>, <&pclk>;
|
|
clock-names = "KMIREFCLK", "apb_pclk";
|
|
};
|
|
kmi@7000 {
|
|
compatible = "arm,pl050", "arm,primecell";
|
|
reg = <0x7000 0x1000>;
|
|
interrupt-parent = <&sic>;
|
|
interrupts = <4>;
|
|
clocks = <&xtal24mhz>, <&pclk>;
|
|
clock-names = "KMIREFCLK", "apb_pclk";
|
|
};
|
|
};
|
|
};
|
|
};
|