Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc: Update example SOC node in booting-without-of.txt.

Convert to DTS version 1, eliminate some obsolete practices, and
correct some errors (compared to the actual 8540 device tree).

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

authored by

Scott Wood and committed by
Kumar Gala
7e72063c 2dff4177

+33 -54
+33 -54
Documentation/powerpc/booting-without-of.txt
··· 2507 2507 Appendix A - Sample SOC node for MPC8540 2508 2508 ======================================== 2509 2509 2510 - Note that the #address-cells and #size-cells for the SoC node 2511 - in this example have been explicitly listed; these are likely 2512 - not necessary as they are usually the same as the root node. 2513 - 2514 - soc8540@e0000000 { 2510 + soc@e0000000 { 2515 2511 #address-cells = <1>; 2516 2512 #size-cells = <1>; 2517 - #interrupt-cells = <2>; 2513 + compatible = "fsl,mpc8540-ccsr", "simple-bus"; 2518 2514 device_type = "soc"; 2519 - ranges = <00000000 e0000000 00100000> 2520 - reg = <e0000000 00003000>; 2515 + ranges = <0x00000000 0xe0000000 0x00100000> 2521 2516 bus-frequency = <0>; 2517 + interrupt-parent = <&pic>; 2522 2518 2523 2519 ethernet@24000 { 2524 2520 #address-cells = <1>; ··· 2522 2526 device_type = "network"; 2523 2527 model = "TSEC"; 2524 2528 compatible = "gianfar", "simple-bus"; 2525 - reg = <24000 1000>; 2526 - mac-address = [ 00 E0 0C 00 73 00 ]; 2527 - interrupts = <d 3 e 3 12 3>; 2528 - interrupt-parent = <40000>; 2529 - phy-handle = <2452000>; 2529 + reg = <0x24000 0x1000>; 2530 + local-mac-address = [ 00 E0 0C 00 73 00 ]; 2531 + interrupts = <29 2 30 2 34 2>; 2532 + phy-handle = <&phy0>; 2530 2533 sleep = <&pmc 00000080>; 2531 2534 ranges; 2532 2535 2533 2536 mdio@24520 { 2534 - reg = <24520 20>; 2537 + reg = <0x24520 0x20>; 2535 2538 compatible = "fsl,gianfar-mdio"; 2536 2539 2537 - ethernet-phy@0 { 2538 - linux,phandle = <2452000> 2539 - interrupt-parent = <40000>; 2540 - interrupts = <35 1>; 2540 + phy0: ethernet-phy@0 { 2541 + interrupts = <5 1>; 2541 2542 reg = <0>; 2542 2543 device_type = "ethernet-phy"; 2543 2544 }; 2544 2545 2545 - ethernet-phy@1 { 2546 - linux,phandle = <2452001> 2547 - interrupt-parent = <40000>; 2548 - interrupts = <35 1>; 2546 + phy1: ethernet-phy@1 { 2547 + interrupts = <5 1>; 2549 2548 reg = <1>; 2550 2549 device_type = "ethernet-phy"; 2551 2550 }; 2552 2551 2553 - ethernet-phy@3 { 2554 - linux,phandle = <2452002> 2555 - interrupt-parent = <40000>; 2556 - interrupts = <35 1>; 2552 + phy3: ethernet-phy@3 { 2553 + interrupts = <7 1>; 2557 2554 reg = <3>; 2558 2555 device_type = "ethernet-phy"; 2559 2556 }; ··· 2554 2565 }; 2555 2566 2556 2567 ethernet@25000 { 2557 - #address-cells = <1>; 2558 - #size-cells = <0>; 2559 2568 device_type = "network"; 2560 2569 model = "TSEC"; 2561 2570 compatible = "gianfar"; 2562 - reg = <25000 1000>; 2563 - mac-address = [ 00 E0 0C 00 73 01 ]; 2564 - interrupts = <13 3 14 3 18 3>; 2565 - interrupt-parent = <40000>; 2566 - phy-handle = <2452001>; 2571 + reg = <0x25000 0x1000>; 2572 + local-mac-address = [ 00 E0 0C 00 73 01 ]; 2573 + interrupts = <13 2 14 2 18 2>; 2574 + phy-handle = <&phy1>; 2567 2575 sleep = <&pmc 00000040>; 2568 2576 }; 2569 2577 2570 2578 ethernet@26000 { 2571 - #address-cells = <1>; 2572 - #size-cells = <0>; 2573 2579 device_type = "network"; 2574 2580 model = "FEC"; 2575 2581 compatible = "gianfar"; 2576 - reg = <26000 1000>; 2577 - mac-address = [ 00 E0 0C 00 73 02 ]; 2578 - interrupts = <19 3>; 2579 - interrupt-parent = <40000>; 2580 - phy-handle = <2452002>; 2582 + reg = <0x26000 0x1000>; 2583 + local-mac-address = [ 00 E0 0C 00 73 02 ]; 2584 + interrupts = <41 2>; 2585 + phy-handle = <&phy3>; 2581 2586 sleep = <&pmc 00000020>; 2582 2587 }; 2583 2588 ··· 2585 2602 serial@4500 { 2586 2603 device_type = "serial"; 2587 2604 compatible = "ns16550"; 2588 - reg = <4500 100>; 2605 + reg = <0x4500 0x100>; 2589 2606 clock-frequency = <0>; 2590 - interrupts = <1a 3>; 2591 - interrupt-parent = <40000>; 2607 + interrupts = <42 2>; 2592 2608 }; 2593 2609 2594 2610 serial@4600 { 2595 2611 device_type = "serial"; 2596 2612 compatible = "ns16550"; 2597 - reg = <4600 100>; 2613 + reg = <0x4600 0x100>; 2598 2614 clock-frequency = <0>; 2599 - interrupts = <1a 3>; 2600 - interrupt-parent = <40000>; 2615 + interrupts = <42 2>; 2601 2616 }; 2602 2617 }; 2603 2618 2604 - pic@40000 { 2605 - linux,phandle = <40000>; 2619 + pic: pic@40000 { 2606 2620 interrupt-controller; 2607 2621 #address-cells = <0>; 2608 - reg = <40000 40000>; 2622 + #interrupt-cells = <2>; 2623 + reg = <0x40000 0x40000>; 2609 2624 compatible = "chrp,open-pic"; 2610 2625 device_type = "open-pic"; 2611 2626 }; 2612 2627 2613 2628 i2c@3000 { 2614 - interrupt-parent = <40000>; 2615 - interrupts = <1b 3>; 2616 - reg = <3000 18>; 2617 - device_type = "i2c"; 2629 + interrupts = <43 2>; 2630 + reg = <0x3000 0x100>; 2618 2631 compatible = "fsl-i2c"; 2619 2632 dfsrr; 2620 2633 sleep = <&pmc 00000004>; ··· 2618 2639 2619 2640 pmc: power@e0070 { 2620 2641 compatible = "fsl,mpc8540-pmc", "fsl,mpc8548-pmc"; 2621 - reg = <e0070 20>; 2642 + reg = <0xe0070 0x20>; 2622 2643 }; 2623 2644 };