ath79: convert Buffalo WZR-HP-G302H A1A0 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:
		
				
					committed by
					
						
						Hauke Mehrtens
					
				
			
			
				
	
			
			
			
						parent
						
							d4ec4f9d0b
						
					
				
				
					commit
					b7ad3c5c5d
				
			@@ -133,10 +133,22 @@
 | 
				
			|||||||
				label = "u-boot-env";
 | 
									label = "u-boot-env";
 | 
				
			||||||
			};
 | 
								};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			art: partition@50000 {
 | 
								partition@50000 {
 | 
				
			||||||
				reg = <0x50000 0x10000>;
 | 
									reg = <0x50000 0x10000>;
 | 
				
			||||||
				label = "art";
 | 
									label = "art";
 | 
				
			||||||
				read-only;
 | 
									read-only;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
									compatible = "nvmem-cells";
 | 
				
			||||||
 | 
									#address-cells = <1>;
 | 
				
			||||||
 | 
									#size-cells = <1>;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
									macaddr_art_120c: macaddr@120c {
 | 
				
			||||||
 | 
										reg = <0x120c 0x6>;
 | 
				
			||||||
 | 
									};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
									calibration_art_1000: calibration@1000 {
 | 
				
			||||||
 | 
										reg = <0x1000 0xeb8>;
 | 
				
			||||||
 | 
									};
 | 
				
			||||||
			};
 | 
								};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			partition@60000 {
 | 
								partition@60000 {
 | 
				
			||||||
@@ -197,9 +209,8 @@
 | 
				
			|||||||
	ath9k: wifi@0,0 {
 | 
						ath9k: wifi@0,0 {
 | 
				
			||||||
		compatible = "pci168c,002a";
 | 
							compatible = "pci168c,002a";
 | 
				
			||||||
		reg = <0x0000 0 0 0 0>;
 | 
							reg = <0x0000 0 0 0 0>;
 | 
				
			||||||
		nvmem-cells = <&macaddr_art_120c>;
 | 
							nvmem-cells = <&macaddr_art_120c>, <&calibration_art_1000>;
 | 
				
			||||||
		nvmem-cell-names = "mac-address";
 | 
							nvmem-cell-names = "mac-address", "calibration";
 | 
				
			||||||
		qca,no-eeprom;
 | 
					 | 
				
			||||||
		#gpio-cells = <2>;
 | 
							#gpio-cells = <2>;
 | 
				
			||||||
		gpio-controller;
 | 
							gpio-controller;
 | 
				
			||||||
	};
 | 
						};
 | 
				
			||||||
@@ -212,13 +223,3 @@
 | 
				
			|||||||
&usb {
 | 
					&usb {
 | 
				
			||||||
	status = "okay";
 | 
						status = "okay";
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					 | 
				
			||||||
&art {
 | 
					 | 
				
			||||||
	compatible = "nvmem-cells";
 | 
					 | 
				
			||||||
	#address-cells = <1>;
 | 
					 | 
				
			||||||
	#size-cells = <1>;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	macaddr_art_120c: macaddr@120c {
 | 
					 | 
				
			||||||
		reg = <0x120c 0x6>;
 | 
					 | 
				
			||||||
	};
 | 
					 | 
				
			||||||
};
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -86,7 +86,6 @@ case "$FIRMWARE" in
 | 
				
			|||||||
	avm,fritz300e)
 | 
						avm,fritz300e)
 | 
				
			||||||
		caldata_extract_reverse "urloader" 0x1541 0x440
 | 
							caldata_extract_reverse "urloader" 0x1541 0x440
 | 
				
			||||||
		;;
 | 
							;;
 | 
				
			||||||
	buffalo,wzr-hp-g302h-a1a0|\
 | 
					 | 
				
			||||||
	ubnt,unifi-ap-outdoor-plus)
 | 
						ubnt,unifi-ap-outdoor-plus)
 | 
				
			||||||
		caldata_extract "art" 0x1000 0xeb8
 | 
							caldata_extract "art" 0x1000 0xeb8
 | 
				
			||||||
		;;
 | 
							;;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user