ath79: convert OpenMesh OM5P-AN 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. Merge art into partition node. Signed-off-by: Nick Hainke <vincent@systemli.org>
This commit is contained in:
		 Nick Hainke
					Nick Hainke
				
			
				
					committed by
					
						 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
			
				
	
			
			
			 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
						parent
						
							46077860c2
						
					
				
				
					commit
					f6ca84bf02
				
			| @@ -148,10 +148,26 @@ | |||||||
| 				reg = <0x850000 0x7a0000>; | 				reg = <0x850000 0x7a0000>; | ||||||
| 			}; | 			}; | ||||||
|  |  | ||||||
| 			art: partition@ff0000 { | 			partition@ff0000 { | ||||||
| 				label = "ART"; | 				label = "ART"; | ||||||
| 				reg = <0xff0000 0x010000>; | 				reg = <0xff0000 0x010000>; | ||||||
| 				read-only; | 				read-only; | ||||||
|  |  | ||||||
|  | 				compatible = "nvmem-cells"; | ||||||
|  | 				#address-cells = <1>; | ||||||
|  | 				#size-cells = <1>; | ||||||
|  |  | ||||||
|  | 				macaddr_art_0: macaddr@0 { | ||||||
|  | 					reg = <0x0 0x6>; | ||||||
|  | 				}; | ||||||
|  |  | ||||||
|  | 				calibration_art_1000: calibration@1000 { | ||||||
|  | 					reg = <0x1000 0x440>; | ||||||
|  | 				}; | ||||||
|  |  | ||||||
|  | 				calibration_art_5000: calibration@5000 { | ||||||
|  | 					reg = <0x5000 0x440>; | ||||||
|  | 				}; | ||||||
| 			}; | 			}; | ||||||
| 		}; | 		}; | ||||||
| 	}; | 	}; | ||||||
| @@ -198,9 +214,8 @@ | |||||||
| &wmac { | &wmac { | ||||||
| 	status = "okay"; | 	status = "okay"; | ||||||
|  |  | ||||||
| 	mtd-cal-data = <&art 0x1000>; | 	nvmem-cells = <&macaddr_art_0>, <&calibration_art_1000>; | ||||||
| 	nvmem-cells = <&macaddr_art_0>; | 	nvmem-cell-names = "mac-address", "calibration"; | ||||||
| 	nvmem-cell-names = "mac-address"; |  | ||||||
| 	mac-address-increment = <2>; | 	mac-address-increment = <2>; | ||||||
| }; | }; | ||||||
|  |  | ||||||
| @@ -210,19 +225,8 @@ | |||||||
| 	wifi@0,0 { | 	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 = <&macaddr_art_0>, <&calibration_art_5000>; | ||||||
| 		nvmem-cells = <&macaddr_art_0>; | 		nvmem-cell-names = "mac-address", "calibration"; | ||||||
| 		nvmem-cell-names = "mac-address"; |  | ||||||
| 		mac-address-increment = <16>; | 		mac-address-increment = <16>; | ||||||
| 	}; | 	}; | ||||||
| }; | }; | ||||||
|  |  | ||||||
| &art { |  | ||||||
| 	compatible = "nvmem-cells"; |  | ||||||
| 	#address-cells = <1>; |  | ||||||
| 	#size-cells = <1>; |  | ||||||
|  |  | ||||||
| 	macaddr_art_0: macaddr@0 { |  | ||||||
| 		reg = <0x0 0x6>; |  | ||||||
| 	}; |  | ||||||
| }; |  | ||||||
|   | |||||||
| @@ -112,9 +112,6 @@ case "$FIRMWARE" in | |||||||
| 	tplink,tl-wr842n-v1) | 	tplink,tl-wr842n-v1) | ||||||
| 		caldata_extract "art" 0x1000 0x1000 | 		caldata_extract "art" 0x1000 0x1000 | ||||||
| 		;; | 		;; | ||||||
| 	openmesh,om5p-an) |  | ||||||
| 		caldata_extract "ART" 0x5000 0x440 |  | ||||||
| 		;; |  | ||||||
| 	openmesh,om2p-v1) | 	openmesh,om2p-v1) | ||||||
| 		caldata_extract "ART" 0x1000 0x440 | 		caldata_extract "ART" 0x1000 0x440 | ||||||
| 		;; | 		;; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user