ath79: move device specific nodes to DTS files for Devolo 1xxx
qca9558_devolo_dvl1xxx.dtsi contains device specific nodes which are inherited for some DTS files and overwritten for others. This is considered confusing, so move the relevant nodes/properties to the devices and only keep the shared stuff in the DTSI. Signed-off-by: Yanase Yuki <dev@zpc.sakura.ne.jp> [clarify commit title/message, move &gmac_config in DTS] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
		 Yanase Yuki
					Yanase Yuki
				
			
				
					committed by
					
						 Adrian Schmutzler
						Adrian Schmutzler
					
				
			
			
				
	
			
			
			 Adrian Schmutzler
						Adrian Schmutzler
					
				
			
						parent
						
							b0ecae504b
						
					
				
				
					commit
					cba79b1de2
				
			| @@ -34,10 +34,35 @@ | ||||
| 	}; | ||||
| }; | ||||
|  | ||||
| ð0 { | ||||
| 	pll-data = <0xae000000 0x80000101 0x80001313>; | ||||
| 	phy-mode = "rgmii-rxid"; | ||||
| }; | ||||
|  | ||||
| &gmac_config { | ||||
| 	rxdv-delay = <3>; | ||||
| 	rxd-delay = <3>; | ||||
| 	txen-delay = <0>; | ||||
| 	txd-delay = <0>; | ||||
| }; | ||||
|  | ||||
| &mdio1 { | ||||
| 	status = "okay"; | ||||
|  | ||||
| 	phy1: ethernet-phy@1 { | ||||
| 		reg = <1>; | ||||
| 		at803x-override-sgmii-link-check; | ||||
| 	}; | ||||
| }; | ||||
|  | ||||
| ð1 { | ||||
| 	status = "okay"; | ||||
|  | ||||
| 	mtd-mac-address = <&art 0x00>; | ||||
| 	mtd-mac-address-increment = <1>; | ||||
|  | ||||
| 	phy-handle = <&phy1>; | ||||
| 	pll-data = <0x03000101 0x00000101 0x00001313>; | ||||
|  | ||||
| 	qca955x-sgmii-fixup; | ||||
| }; | ||||
|   | ||||
| @@ -44,5 +44,4 @@ | ||||
| 	rxd-delay = <3>; | ||||
| 	txen-delay = <3>; | ||||
| 	txd-delay = <3>; | ||||
| 	rgmii-enabled = <1>; | ||||
| }; | ||||
|   | ||||
| @@ -35,6 +35,7 @@ | ||||
| }; | ||||
|  | ||||
| ð0 { | ||||
| 	pll-data = <0xae000000 0x80000101 0x80001313>; | ||||
| 	phy-mode = "rgmii-id"; | ||||
| }; | ||||
|  | ||||
|   | ||||
| @@ -69,10 +69,35 @@ | ||||
| 	status = "okay"; | ||||
| }; | ||||
|  | ||||
| ð0 { | ||||
| 	pll-data = <0xae000000 0x80000101 0x80001313>; | ||||
| 	phy-mode = "rgmii-rxid"; | ||||
| }; | ||||
|  | ||||
| &gmac_config { | ||||
| 	rxdv-delay = <3>; | ||||
| 	rxd-delay = <3>; | ||||
| 	txen-delay = <0>; | ||||
| 	txd-delay = <0>; | ||||
| }; | ||||
|  | ||||
| &mdio1 { | ||||
| 	status = "okay"; | ||||
|  | ||||
| 	phy1: ethernet-phy@1 { | ||||
| 		reg = <1>; | ||||
| 		at803x-override-sgmii-link-check; | ||||
| 	}; | ||||
| }; | ||||
|  | ||||
| ð1 { | ||||
| 	status = "okay"; | ||||
|  | ||||
| 	mtd-mac-address = <&art 0x00>; | ||||
| 	mtd-mac-address-increment = <1>; | ||||
|  | ||||
| 	phy-handle = <&phy1>; | ||||
| 	pll-data = <0x03000101 0x00000101 0x00001313>; | ||||
|  | ||||
| 	qca955x-sgmii-fixup; | ||||
| }; | ||||
|   | ||||
| @@ -44,5 +44,4 @@ | ||||
| 	rxd-delay = <3>; | ||||
| 	txen-delay = <3>; | ||||
| 	txd-delay = <3>; | ||||
| 	rgmii-enabled = <1>; | ||||
| }; | ||||
|   | ||||
| @@ -45,5 +45,4 @@ | ||||
| 	rxd-delay = <3>; | ||||
| 	txen-delay = <3>; | ||||
| 	txd-delay = <3>; | ||||
| 	rgmii-enabled = <1>; | ||||
| }; | ||||
|   | ||||
| @@ -107,37 +107,14 @@ | ||||
|  | ||||
| 	mtd-mac-address = <&art 0x00>; | ||||
| 	phy-handle = <&phy4>; | ||||
| 	phy-mode = "rgmii-rxid"; | ||||
| 	pll-data = <0xae000000 0x80000101 0x80001313>; | ||||
|  | ||||
| 	gmac_config: gmac-config { | ||||
| 		device = <&gmac>; | ||||
|  | ||||
| 		rxdv-delay = <3>; | ||||
| 		rxd-delay = <3>; | ||||
| 		txen-delay = <0>; | ||||
| 		txd-delay = <0>; | ||||
| 		rgmii-enabled = <1>; | ||||
| 	}; | ||||
| }; | ||||
|  | ||||
| &mdio1 { | ||||
| 	phy1: ethernet-phy@1 { | ||||
| 		reg = <1>; | ||||
| 		at803x-override-sgmii-link-check; | ||||
| 	}; | ||||
| }; | ||||
|  | ||||
| ð1 { | ||||
| 	mtd-mac-address = <&art 0x00>; | ||||
| 	mtd-mac-address-increment = <1>; | ||||
|  | ||||
| 	phy-handle = <&phy1>; | ||||
| 	pll-data = <0x03000101 0x00000101 0x00001313>; | ||||
|  | ||||
| 	qca955x-sgmii-fixup; | ||||
| }; | ||||
|  | ||||
| &wmac { | ||||
| 	status = "okay"; | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user