aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMugunthan V N2013-07-09 09:49:45 -0500
committerPraneeth Bajjuri2013-08-09 17:04:51 -0500
commitdeff0ef5f52b2d4f2677a3d98d22b957ec14be08 (patch)
tree5229e9292b70e103698f48ab2cd8f693376a97ff
parent8d7479c56596b2728bdc09ead001fdb1b03382a2 (diff)
downloadkernel-audio-deff0ef5f52b2d4f2677a3d98d22b957ec14be08.tar.gz
kernel-audio-deff0ef5f52b2d4f2677a3d98d22b957ec14be08.tar.xz
kernel-audio-deff0ef5f52b2d4f2677a3d98d22b957ec14be08.zip
arm/dts: dra7xx: Add CPSW and MDIO module nodes for dra7xx
Add CPSW and MDIO related device tree data for DRA7XX and made as status disabled. Phy-id, pinmux for active and sleep state needs to be added in board dts files and enable the CPSW device. Change-Id: Ia8c6f8ec8eff0d66e0d05f4a6e1ce174a725b2fd Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> [Resolved merge conflict and rebased to 3.8 kernel] Updated the CPSW and MDIO related device tree data with correct device address offset and also to remove marco defines which caused compilation error seen as below: Error: arch/arm/boot/dts/dra7.dtsi:701.22-23 syntax error FATAL ERROR: Unable to parse input tree Signed-off-by: Praveen Rao <prao@ti.com>
-rw-r--r--arch/arm/boot/dts/dra7.dtsi52
1 files changed, 51 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 1d6c4c56f6b7..685adf2aa8b9 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -647,7 +647,7 @@
647 #size-cells = <0>; 647 #size-cells = <0>;
648 vdda_video-supply = <&ldoln_reg>; 648 vdda_video-supply = <&ldoln_reg>;
649 649
650 dispc { 650 dispc {
651 compatible = "ti,omap4-dispc"; 651 compatible = "ti,omap4-dispc";
652 ti,hwmods = "dss_dispc"; 652 ti,hwmods = "dss_dispc";
653 }; 653 };
@@ -678,6 +678,56 @@
678 }; 678 };
679 }; 679 };
680 680
681 gmac: ethernet@48484000 {
682 compatible = "ti,cpsw";
683 ti,hwmods = "gmac";
684 cpdma_channels = <8>;
685 ale_entries = <1024>;
686 bd_ram_size = <0x2000>;
687 no_bd_ram = <0>;
688 rx_descs = <64>;
689 mac_control = <0x20>;
690 slaves = <2>;
691 active_slave = <0>;
692 cpts_clock_mult = <0x80000000>;
693 cpts_clock_shift = <29>;
694 reg = <0x48484000 0x800
695 0x48485200 0x100>;
696 #address-cells = <1>;
697 #size-cells = <1>;
698 /*
699 * rx_thresh_pend
700 * rx_pend
701 * tx_pend
702 * misc_pend
703 */
704 interrupts = <0 50 0x4>,
705 <0 51 0x4>,
706 <0 52 0x4>,
707 <0 53 0x4>;
708 ranges;
709 status = "disabled";
710
711 davinci_mdio: mdio@48485000 {
712 compatible = "ti,davinci_mdio";
713 #address-cells = <1>;
714 #size-cells = <0>;
715 ti,hwmods = "davinci_mdio";
716 bus_freq = <1000000>;
717 reg = <0x48485000 0x100>;
718 };
719
720 cpsw_emac0: slave@48484200 {
721 /* Filled in by U-Boot */
722 mac-address = [ 00 00 00 00 00 00 ];
723 };
724
725 cpsw_emac1: slave@48484300 {
726 /* Filled in by U-Boot */
727 mac-address = [ 00 00 00 00 00 00 ];
728 };
729 };
730
681 atl: atl@0x4843c000 { 731 atl: atl@0x4843c000 {
682 compatible = "ti,dra7-atl"; 732 compatible = "ti,dra7-atl";
683 reg = <0x4843c000 0x3ff>; 733 reg = <0x4843c000 0x3ff>;