ath79: convert Atheros DB120 WiFis to nvmem-cells
Pull the calibration data from the nvmem subsystem. This allows us to move userspace caldata extraction into the device-tree definition. Signed-off-by: Nick Hainke <vincent@systemli.org> (merged art-node back into partition-node) Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
This commit is contained in:
		 Nick Hainke
					Nick Hainke
				
			
				
					committed by
					
						 Christian Lamparter
						Christian Lamparter
					
				
			
			
				
	
			
			
			 Christian Lamparter
						Christian Lamparter
					
				
			
						parent
						
							1b125aabf4
						
					
				
				
					commit
					21495c92dc
				
			| @@ -135,10 +135,30 @@ | |||||||
| 				reg = <0x7e0000 0x010000>; | 				reg = <0x7e0000 0x010000>; | ||||||
| 			}; | 			}; | ||||||
|  |  | ||||||
| 			art: partition@7f0000 { | 			partition@7f0000 { | ||||||
| 				label = "art"; | 				label = "art"; | ||||||
| 				reg = <0x7f0000 0x010000>; | 				reg = <0x7f0000 0x010000>; | ||||||
| 				read-only; | 				read-only; | ||||||
|  |  | ||||||
|  | 				compatible = "nvmem-cells"; | ||||||
|  | 				#address-cells = <1>; | ||||||
|  | 				#size-cells = <1>; | ||||||
|  |  | ||||||
|  | 				macaddr_art_0: macaddr@0 { | ||||||
|  | 					reg = <0x0 0x6>; | ||||||
|  | 				}; | ||||||
|  |  | ||||||
|  | 				macaddr_art_6: macaddr@6 { | ||||||
|  | 					reg = <0x6 0x6>; | ||||||
|  | 				}; | ||||||
|  |  | ||||||
|  | 				calibration_art_1000: calibration@1000 { | ||||||
|  | 					reg = <0x1000 0x440>; | ||||||
|  | 				}; | ||||||
|  |  | ||||||
|  | 				calibration_art_5000: calibration@5000 { | ||||||
|  | 					reg = <0x5000 0x440>; | ||||||
|  | 				}; | ||||||
| 			}; | 			}; | ||||||
| 		}; | 		}; | ||||||
| 	}; | 	}; | ||||||
| @@ -204,7 +224,8 @@ | |||||||
| 	ath9k: wifi@0,0 { | 	ath9k: wifi@0,0 { | ||||||
| 		compatible = "pci168c,0030"; | 		compatible = "pci168c,0030"; | ||||||
| 		reg = <0x0000 0 0 0 0>; | 		reg = <0x0000 0 0 0 0>; | ||||||
| 		qca,no-eeprom; | 		nvmem-cells = <&calibration_art_5000>; | ||||||
|  | 		nvmem-cell-names = "calibration"; | ||||||
| 		ieee80211-freq-limit = <4900000 5990000>; | 		ieee80211-freq-limit = <4900000 5990000>; | ||||||
| 		#gpio-cells = <2>; | 		#gpio-cells = <2>; | ||||||
| 		gpio-controller; | 		gpio-controller; | ||||||
| @@ -214,7 +235,8 @@ | |||||||
| &wmac { | &wmac { | ||||||
| 	status = "okay"; | 	status = "okay"; | ||||||
|  |  | ||||||
| 	mtd-cal-data = <&art 0x1000>; | 	nvmem-cells = <&calibration_art_1000>; | ||||||
|  | 	nvmem-cell-names = "calibration"; | ||||||
| }; | }; | ||||||
|  |  | ||||||
| &usb { | &usb { | ||||||
| @@ -224,17 +246,3 @@ | |||||||
| &usb_phy { | &usb_phy { | ||||||
| 	status = "okay"; | 	status = "okay"; | ||||||
| }; | }; | ||||||
|  |  | ||||||
| &art { |  | ||||||
| 	compatible = "nvmem-cells"; |  | ||||||
| 	#address-cells = <1>; |  | ||||||
| 	#size-cells = <1>; |  | ||||||
|  |  | ||||||
| 	macaddr_art_0: macaddr@0 { |  | ||||||
| 		reg = <0x0 0x6>; |  | ||||||
| 	}; |  | ||||||
|  |  | ||||||
| 	macaddr_art_6: macaddr@6 { |  | ||||||
| 		reg = <0x6 0x6>; |  | ||||||
| 	}; |  | ||||||
| }; |  | ||||||
|   | |||||||
| @@ -83,7 +83,6 @@ case "$FIRMWARE" in | |||||||
| 	;; | 	;; | ||||||
| "ath9k-eeprom-pci-0000:00:00.0.bin") | "ath9k-eeprom-pci-0000:00:00.0.bin") | ||||||
| 	case $board in | 	case $board in | ||||||
| 	atheros,db120|\ |  | ||||||
| 	engenius,eap600|\ | 	engenius,eap600|\ | ||||||
| 	engenius,ecb600|\ | 	engenius,ecb600|\ | ||||||
| 	mercury,mw4530r-v1|\ | 	mercury,mw4530r-v1|\ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user