mb, soc/intel: Reorganize CNVi device entries in devicetree

This change reorganizes the CNVi device entries in mainboard
devicetree/overridetree and SoC chipset tree to make it consistent
with how other SoC internal PCI devices are represented i.e. without a
chip driver around the SoC controller itself.

Before:
chip drivers/wifi/generic
	register "wake" = "..."
	device pci xx.y on end
end

After:
device pci xx.y on
	chip drivers/wifi/generic
		register "wake" = "..."
		device generic 0 on end
	end
end

Change-Id: I22660047a3afd5994400341de0ca461bbc0634e2
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46865
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>

src/mainboard/clevo/cml-u/variants/l140cu/devicetree.cb

@@ -86,10 +86,12 @@ chip soc/intel/cannonlake
 			register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)"		# Type-A port 3
 		end
 		device pci 14.1 off end # USB xDCI (OTG)
-		chip drivers/wifi/generic # CNVi wifi
+		device pci 14.3 on
+			chip drivers/wifi/generic
 				register "wake" = "GPE0_PME_B0"
-			device pci 14.3 on end
+				device generic 0 on end
 			end
+		end  # CNVi wifi
 		device pci 14.5 off end # SDCard
 		device pci 15.0 on	# I2C #0
 			chip drivers/i2c/hid

src/mainboard/google/dedede/variants/baseboard/devicetree.cb

@@ -302,10 +302,12 @@ chip soc/intel/jasperlake
 		end # USB xHCI
 		device pci 14.1 off end # USB xDCI (OTG)
 		device pci 14.2 off end # PMC SRAM
+		device pci 14.3 on
 			chip drivers/wifi/generic
 				register "wake" = "GPE0_PME_B0"
-			device pci 14.3 on  end # CNVi wifi
+				device generic 0 on end
 			end
+		end # CNVi wifi
 		device pci 14.5 on  end # SDCard
 		device pci 15.0 on  end # I2C 0
 		device pci 15.1 on  end # I2C 1

src/mainboard/google/deltaur/variants/baseboard/devicetree.cb

@@ -242,10 +242,12 @@ chip soc/intel/tigerlake
 		device pci 14.1 off end # USB 3.2 1x1 xDCI HC
 		device pci 14.2 on end # Shared SRAM
 
+		device pci 14.3 on
 			chip drivers/wifi/generic
 				register "wake" = "GPE0_PME_B0"
-			device pci 14.3 on  end # CNVi WiFi
+				device generic 0 on end
 			end
+		end # CNVi WiFi
 
 		device pci 15.0 on  end # I2C #0
 		device pci 15.1 on  end # I2C #1

src/mainboard/google/drallion/variants/drallion/devicetree.cb

@@ -327,10 +327,12 @@ chip soc/intel/cannonlake
 			end
 		end # USB xHCI
 		device pci 14.1 off end # USB xDCI (OTG)
+		device pci 14.3 on
 			chip drivers/wifi/generic
 				register "wake" = "PME_B0_EN_BIT"
-			device pci 14.3 on  end # CNVi wifi
+				device generic 0 on end
 			end
+		end # CNVi wifi
 		device pci 14.5 off end # SDCard
 		device pci 15.0 on
 			chip drivers/i2c/hid

src/mainboard/google/hatch/variants/baseboard/devicetree.cb

@@ -295,10 +295,12 @@ chip soc/intel/cannonlake
 			end
 		end # USB xHCI
 		device pci 14.1 off end # USB xDCI (OTG)
+		device pci 14.3 on
 			chip drivers/wifi/generic
 				register "wake" = "GPE0_PME_B0"
-			device pci 14.3 on  end # CNVi wifi
+				device generic 0 on end
 			end
+		end # CNVi wifi
 		device pci 14.5 on  end # SDCard
 		device pci 15.0 on  end # I2C #0
 		device pci 15.1 on  end # I2C #1

src/mainboard/google/octopus/variants/baseboard/devicetree.cb

@@ -114,10 +114,12 @@ chip soc/intel/apollolake
 		device pci 00.2 off end	# - NPK
 		device pci 02.0 on  end	# - Gen
 		device pci 03.0 on  end # - Gaussian Mixture Model (GMM)
+		device pci 0c.0 on
 			chip drivers/wifi/generic
 				register "wake" = "GPE0A_CNVI_PME_STS"
-			device pci 0c.0 on  end	# - CNVi
+				device generic 0 on end
 			end
+		end	# - CNVi
 		device pci 0d.0 on  end	# - P2SB
 		device pci 0d.1 on  end	# - PMC
 		device pci 0d.2 on  end	# - Fast SPI

src/mainboard/google/sarien/variants/arcada/devicetree.cb

@@ -304,10 +304,12 @@ chip soc/intel/cannonlake
 			end
 		end # USB xHCI
 		device pci 14.1 off end # USB xDCI (OTG)
+		device pci 14.3 on
 			chip drivers/wifi/generic
 				register "wake" = "PME_B0_EN_BIT"
-			device pci 14.3 on  end # CNVi wifi
+				device generic 0 on end
 			end
+		end # CNVi wifi
 		device pci 14.5 off end # SDCard
 		device pci 15.0 on
 			chip drivers/i2c/hid

src/mainboard/google/sarien/variants/sarien/devicetree.cb

@@ -316,10 +316,12 @@ chip soc/intel/cannonlake
 			end
 		end # USB xHCI
 		device pci 14.1 off end # USB xDCI (OTG)
+		device pci 14.3 on
 			chip drivers/wifi/generic
 				register "wake" = "PME_B0_EN_BIT"
-			device pci 14.3 on  end # CNVi wifi
+				device generic 0 on end
 			end
+		end # CNVi wifi
 		device pci 14.5 off end # SDCard
 		device pci 15.0 on
 			chip drivers/i2c/hid

src/mainboard/google/volteer/variants/baseboard/devicetree.cb

@@ -433,9 +433,11 @@ chip soc/intel/tigerlake
 		device ref cnvi_bt on end
 		device ref south_xhci on end
 		device ref shared_ram on end
+		device ref cnvi_wifi on
 			chip drivers/wifi/generic
 				register "wake" = "GPE0_PME_B0"
-			device ref cnvi_wifi on end
+				device generic 0 on end
+			end
 		end
 		device ref heci1 on end
 		device ref sata on end

src/mainboard/intel/adlrvp/variants/adlrvp_p/devicetree.cb

@@ -216,10 +216,12 @@ chip soc/intel/alderlake
 		end # USB3.1 xHCI
 		device pci 14.1 off end # USB3.1 xDCI
 		device pci 14.2 off end # Shared RAM
+		device pci 14.3 on
 			chip drivers/wifi/generic
 				register "wake" = "GPE0_PME_B0"
-			device pci 14.3 on end # CNVi: WiFi
+				device generic 0 on end
 			end
+		end # CNVi: WiFi
 		device pci 15.0 on  end	# I2C0
 		device pci 15.1 on  end # I2C1
 		device pci 15.2 on  end # I2C2

src/mainboard/intel/cannonlake_rvp/variants/cnl_u/devicetree.cb

@@ -91,10 +91,12 @@ chip soc/intel/cannonlake
 		device pci 12.6 off end # GSPI #2
 		device pci 14.0 on  end # USB xHCI
 		device pci 14.1 off end # USB xDCI (OTG)
+		device pci 14.3 on
 			chip drivers/wifi/generic
 				register "wake" = "PME_B0_EN_BIT"
-			device pci 14.3 on  end # CNVi wifi
+				device generic 0 on end
 			end
+		end # CNVi wifi
 		device pci 14.5 on  end # SDCard
 		device pci 15.0 on  end # I2C #0
 		device pci 15.1 on  end # I2C #1

src/mainboard/intel/cannonlake_rvp/variants/cnl_y/devicetree.cb

@@ -72,10 +72,12 @@ chip soc/intel/cannonlake
 		device pci 12.6 off end # GSPI #2
 		device pci 14.0 on  end # USB xHCI
 		device pci 14.1 off end # USB xDCI (OTG)
+		device pci 14.3 on
 			chip drivers/wifi/generic
 				register "wake" = "PME_B0_EN_BIT"
-			device pci 14.3 on  end # CNVi wifi
+				device generic 0 on end
 			end
+		end # CNVi wifi
 		device pci 14.5 on  end # SDCard
 		device pci 15.0 on
 			chip drivers/i2c/hid

src/mainboard/intel/coffeelake_rvp/variants/cfl_s/overridetree.cb

@@ -92,10 +92,12 @@ chip soc/intel/cannonlake
 	register "PcieClkSrcClkReq[10]" = "10"
 
 	device domain 0 on
+		device pci 14.3 on
 			chip drivers/wifi/generic
 				register "wake" = "PME_B0_EN_BIT"
-			device pci 14.3 on  end # CNVi wifi
+				device generic 0 on end
 			end
+		end # CNVi wifi
 		device pci 15.0 on  end # I2C #0
 		device pci 15.1 on  end # I2C #1
 		device pci 15.2 on  end # I2C #2

src/mainboard/intel/coffeelake_rvp/variants/cfl_u/overridetree.cb

@@ -61,10 +61,12 @@ chip soc/intel/cannonlake
 	}"
 
 	device domain 0 on
+		device pci 14.3 on
 			chip drivers/wifi/generic
 				register "wake" = "PME_B0_EN_BIT"
-			device pci 14.3 on  end # CNVi wifi
+				device generic 0 on end
 			end
+		end # CNVi wifi
 		device pci 15.0 on  end # I2C #0
 		device pci 15.1 on  end # I2C #1
 		device pci 15.2 off end # I2C #2

src/mainboard/intel/coffeelake_rvp/variants/cml_u/overridetree.cb

@@ -80,10 +80,12 @@ chip soc/intel/cannonlake
 	register "sdcard_cd_gpio" = "GPP_G5"
 
 	device domain 0 on
+		device pci 14.3 on
 			chip drivers/wifi/generic
 				register "wake" = "PME_B0_EN_BIT"
-			device pci 14.3 on  end # CNVi wifi
+				device generic 0 on end
 			end
+		end # CNVi wifi
 		device pci 14.5 on  end # SDCard
 		device pci 15.0 on  end # I2C #0
 		device pci 15.1 on  end # I2C #1

src/mainboard/intel/coffeelake_rvp/variants/whl_u/overridetree.cb

@@ -65,10 +65,12 @@ chip soc/intel/cannonlake
 	register "sdcard_cd_gpio" = "GPP_G5"
 
 	device domain 0 on
+		device pci 14.3 on
 			chip drivers/wifi/generic
 				register "wake" = "PME_B0_EN_BIT"
-			device pci 14.3 on  end # CNVi wifi
+				device generic 0 on end
 			end
+		end # CNVi wifi
 		device pci 15.0 on  end # I2C #0
 		device pci 15.1 on  end # I2C #1
 		device pci 15.2 off end # I2C #2

src/mainboard/intel/icelake_rvp/variants/icl_u/devicetree.cb

@@ -277,10 +277,12 @@ chip soc/intel/icelake
 		end # USB xHCI
 		device pci 14.1 off end # USB xDCI (OTG)
 		device pci 14.2 off end # PMC SRAM
+		device pci 14.3 on
 			chip drivers/wifi/generic
 				register "wake" = "GPE0_PME_B0"
-			device pci 14.3 on  end # CNVi wifi
+				device generic 0 on end
 			end
+		end # CNVi wifi
 		device pci 14.5 on  end # SDCard
 		device pci 15.0 on
 			chip drivers/i2c/hid

src/mainboard/intel/icelake_rvp/variants/icl_y/devicetree.cb

@@ -277,10 +277,12 @@ chip soc/intel/icelake
 		end # USB xHCI
 		device pci 14.1 off end # USB xDCI (OTG)
 		device pci 14.2 off end # PMC SRAM
+		device pci 14.3 on
 			chip drivers/wifi/generic
 				register "wake" = "GPE0_PME_B0"
-			device pci 14.3 on  end # CNVi wifi
+				device generic 0 on end
 			end
+		end # CNVi wifi
 		device pci 14.5 on  end # SDCard
 		device pci 15.0 on
 			chip drivers/i2c/hid

src/mainboard/intel/jasperlake_rvp/variants/jslrvp/devicetree.cb

@@ -296,10 +296,12 @@ chip soc/intel/jasperlake
 		end # USB xHCI
 		device pci 14.1 off end # USB xDCI (OTG)
 		device pci 14.2 off end # PMC SRAM
+		device pci 14.3 on
 			chip drivers/wifi/generic
 				register "wake" = "GPE0_PME_B0"
-			device pci 14.3 on  end # CNVi wifi
+				device generic 0 on end
 			end
+		end # CNVi wifi
 		device pci 14.5 on  end # SDCard
 		device pci 15.0 on
 			chip drivers/i2c/max98373

src/mainboard/intel/tglrvp/variants/tglrvp_up3/devicetree.cb

@@ -227,10 +227,12 @@ chip soc/intel/tigerlake
 		device pci 14.0 on  end # USB3.1 xHCI		0xA0ED
 		device pci 14.1 on  end # USB3.1 xDCI		0xA0EE
 		device pci 14.2 on  end # Shared RAM		0xA0EF
+		device pci 14.3 on
 			chip drivers/wifi/generic
 				register "wake" = "GPE0_PME_B0"
-			device pci 14.3 on end # CNVi: WiFi		0xA0F0 - A0F3
+				device generic 0 on end
 			end
+		end # CNVi: WiFi		0xA0F0 - A0F3
 
 		device pci 15.0 on	# I2C0			0xA0E8
 			chip drivers/i2c/generic

src/mainboard/intel/tglrvp/variants/tglrvp_up4/devicetree.cb

@@ -231,10 +231,12 @@ chip soc/intel/tigerlake
 		device pci 14.0 on  end # USB3.1 xHCI		0xA0ED
 		device pci 14.1 on  end # USB3.1 xDCI		0xA0EE
 		device pci 14.2 on  end # Shared RAM		0xA0EF
+		device pci 14.3 on
 			chip drivers/wifi/generic
 				register "wake" = "GPE0_PME_B0"
-			device pci 14.3 on end # CNVi: WiFi		0xA0F0 - A0F3
+				device generic 0 on end
 			end
+		end # CNVi: WiFi		0xA0F0 - A0F3
 
 		device pci 15.0 on	# I2C0			0xA0E8
 			chip drivers/i2c/generic

src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb

@@ -164,10 +164,12 @@ chip soc/intel/cannonlake
 		device pci 02.0 on      # Integrated Graphics Device
 			register "InternalGfx" = "1"
 		end
+		device pci 14.3 on
 			chip drivers/wifi/generic
 				register "wake" = "PME_B0_EN_BIT"
-			device pci 14.3 on  end # CNVi wifi
+				device generic 0 on end
 			end
+		end  # CNVi wifi
 
 		# This device does not have any function on CNP-H, but it needs
 		# to be here so that the resource allocator is aware of UART 2.

src/mainboard/system76/lemp9/devicetree.cb

@@ -86,10 +86,12 @@ chip soc/intel/cannonlake
 			register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)"		# Type-A port 3
 		end
 		device pci 14.1 off end # USB xDCI (OTG)
-		chip drivers/wifi/generic # CNVi wifi
+		device pci 14.3 on
+			chip drivers/wifi/generic
 				register "wake" = "GPE0_PME_B0"
-			device pci 14.3 on end
+				device generic 0 on end
 			end
+		end # CNVi wifi
 		device pci 14.5 off end # SDCard
 		device pci 15.0 on
 			chip drivers/i2c/hid

src/soc/intel/tigerlake/chipset.cb

@@ -112,9 +112,7 @@ chip soc/intel/tigerlake
 		end
 		device pci 14.1 alias south_xdci off end
 		device pci 14.2 alias shared_ram off end
-		chip drivers/wifi/generic
 		device pci 14.3 alias cnvi_wifi off end
-		end
 		device pci 15.0 alias i2c0 off end
 		device pci 15.1 alias i2c1 off end
 		device pci 15.2 alias i2c2 off end