lantiq: xrx200: convert FritzBox 7360v2's wifi to nvmem
this was thoroughly tested (warm and cold boots). on a real 7360v2. This is because there have been documented hick-ups with other lantiq devices that need the owl-loader too. It's likely that the 7360(sl) could be converted in the same way as well. However the 7362sl uses a reversed caldata format, so the "qca,no-eeprom" stays in place. The patch also moves the urloader nvmem partition definition into the partition section. Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
This commit is contained in:
		| @@ -42,6 +42,18 @@ | ||||
| 				label = "urlader"; | ||||
| 				reg = <0x00000 0x20000>; | ||||
| 				read-only; | ||||
|  | ||||
| 				compatible = "nvmem-cells"; | ||||
| 				#address-cells = <1>; | ||||
| 				#size-cells = <1>; | ||||
|  | ||||
| 				cal_urlader_985: cal@985 { | ||||
| 					reg = <0x985 0x440>; | ||||
| 				}; | ||||
|  | ||||
| 				macaddr_urlader_a91: macaddr@a91 { | ||||
| 					reg = <0xa91 0x6>; | ||||
| 				}; | ||||
| 			}; | ||||
|  | ||||
| 			partition@20000 { | ||||
| @@ -78,12 +90,8 @@ | ||||
| 	reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>; | ||||
| }; | ||||
|  | ||||
| &urlader { | ||||
| 	compatible = "nvmem-cells"; | ||||
| 	#address-cells = <1>; | ||||
| 	#size-cells = <1>; | ||||
|  | ||||
| 	macaddr_urlader_a91: macaddr@a91 { | ||||
| 		reg = <0xa91 0x6>; | ||||
| 	}; | ||||
| &wifi { | ||||
| 	/delete-property/ qca,no-eeprom; | ||||
| 	nvmem-cells = <&cal_urlader_985>; | ||||
| 	nvmem-cell-names = "calibration"; | ||||
| }; | ||||
|   | ||||
| @@ -151,7 +151,7 @@ | ||||
| 		#address-cells = <2>; | ||||
| 		device_type = "pci"; | ||||
|  | ||||
| 		wifi@168c,002e { | ||||
| 		wifi: wifi@168c,002e { | ||||
| 			compatible = "pci168c,002e"; | ||||
| 			reg = <0 0 0 0 0>; | ||||
| 			qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:01:00.0.bin */ | ||||
|   | ||||
| @@ -19,8 +19,7 @@ case "$FIRMWARE" in | ||||
| 			avm,fritz3390) | ||||
| 				caldata_extract_reverse "urlader" 0x2546 0x440 | ||||
| 				;; | ||||
| 			avm,fritz7360sl|\ | ||||
| 			avm,fritz7360-v2) | ||||
| 			avm,fritz7360sl) | ||||
| 				caldata_extract "urlader" 0x985 0x1000 | ||||
| 				;; | ||||
| 			avm,fritz7412|\ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Christian Lamparter
					Christian Lamparter