Change in coreboot[master]: mb/intel/adlrvp: Add PMC.MUX.CONx device configuration for adlrvp

[V Sowmya (Code Review)]

V Sowmya has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47289 )

Change subject: mb/intel/adlrvp: Add PMC.MUX.CONx device configuration for adlrvp
......................................................................

mb/intel/adlrvp: Add PMC.MUX.CONx device configuration for adlrvp

This patch adds the PMC MUX and CONx devices for adlrvp. Device
specific method contains the port and orientation details used
to configure the mux.

BUG=:b:170607415
TEST=Built and booted adlrvp. Verified the PMC.MUX CONx objects
in SSDT tables.

Change-Id: I3b5bb73991feb99577c16fea00c381dd0f855769
Signed-off-by: V Sowmya 
---
M src/mainboard/intel/adlrvp/Kconfig
M src/mainboard/intel/adlrvp/variants/adlrvp_p/devicetree.cb
2 files changed, 30 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/89/47289/1

diff --git a/src/mainboard/intel/adlrvp/Kconfig b/src/mainboard/intel/adlrvp/Kconfig
index 97b4bf7..ee021fe 100644
--- a/src/mainboard/intel/adlrvp/Kconfig
+++ b/src/mainboard/intel/adlrvp/Kconfig
@@ -9,6 +9,7 @@
    select DRIVERS_I2C_HID
    select DRIVERS_I2C_GENERIC
    select DRIVERS_INTEL_SOUNDWIRE
+	select DRIVERS_INTEL_PMC
    select DRIVERS_USB_ACPI
    select DRIVERS_SPI_ACPI
    select SOC_INTEL_ALDERLAKE
diff --git a/src/mainboard/intel/adlrvp/variants/adlrvp_p/devicetree.cb b/src/mainboard/intel/adlrvp/variants/adlrvp_p/devicetree.cb
index 44c324b..5e0ded5 100644
--- a/src/mainboard/intel/adlrvp/variants/adlrvp_p/devicetree.cb
+++ b/src/mainboard/intel/adlrvp/variants/adlrvp_p/devicetree.cb
@@ -252,9 +252,36 @@
    	device pci 1e.1 off end # UART1
    	device pci 1e.2 on  end # GSPI0
    	device pci 1e.3 off end # GSPI1
-		device pci 1f.0 on  end # eSPI
+		device pci 1f.0 on
+			chip ec/google/chromeec
+				device pnp 0c09.0 on end
+				use conn0 as mux_conn[0]
+				use conn1 as mux_conn[1]
+			end
+		end # eSPI
    	device pci 1f.1 on  end # P2SB
-		device pci 1f.2 hidden  end # PMC
+		device pci 1f.2 hidden
+			# The pmc_mux chip driver is a placeholder for the
+			# PMC.MUX device in the ACPI hierarchy.
+			chip drivers/intel/pmc_mux
+				device generic 0 on
+					chip drivers/intel/pmc_mux/conn
+						register "usb2_port_number" = "1"
+						register "usb3_port_number" = "1"
+						# SBU is fixed, HSL follows CC
+						register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
+						device generic 0 alias conn0 on end
+					end
+					chip drivers/intel/pmc_mux/conn
+						register "usb2_port_number" = "2"
+						register "usb3_port_number" = "2"
+						# SBU is fixed, HSL follows CC
+						register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
+						device generic 1 alias conn1 on end
+					end
+				end
+			end
+		end # PMC
    	device pci 1f.3 on
    		chip drivers/intel/soundwire
    			device generic 0 on

[V Sowmya (Code Review)]

Hello Subrata Banik, Sooraj Govindan, Aamir Bohra,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/47289

to look at the new patch set (#2).

Change subject: mb/intel/adlrvp: Add PMC.MUX.CONx device configuration for adlrvp
......................................................................

mb/intel/adlrvp: Add PMC.MUX.CONx device configuration for adlrvp

This patch adds the PMC MUX and CONx devices for adlrvp. Device
specific method contains the port and orientation details used
to configure the mux.

BUG=b:170607415
TEST=Built and booted adlrvp. Verified the PMC.MUX CONx objects
in SSDT tables.

Change-Id: I3b5bb73991feb99577c16fea00c381dd0f855769
Signed-off-by: V Sowmya 
---
M src/mainboard/intel/adlrvp/Kconfig
M src/mainboard/intel/adlrvp/variants/adlrvp_p/devicetree.cb
2 files changed, 30 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/89/47289/2

[Subrata Banik (Code Review)]

Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47289 )

Change subject: mb/intel/adlrvp: Add PMC.MUX.CONx device configuration for adlrvp
......................................................................

Patch Set 2: Code-Review+2

[Subrata Banik (Code Review)]

Subrata Banik has uploaded a new patch set (#4) to the change originally created by V Sowmya. ( https://review.coreboot.org/c/coreboot/+/47289 )

Change subject: mb/intel/adlrvp: Add PMC.MUX.CONx device configuration for adlrvp
......................................................................

mb/intel/adlrvp: Add PMC.MUX.CONx device configuration for adlrvp

This patch adds the PMC MUX and CONx devices for adlrvp. Device
specific method contains the port and orientation details used
to configure the mux.

BUG=b:170607415
TEST=Built and booted adlrvp. Verified the PMC.MUX CONx objects
in SSDT tables.

Change-Id: I3b5bb73991feb99577c16fea00c381dd0f855769
Signed-off-by: V Sowmya 
---
M src/mainboard/intel/adlrvp/Kconfig
M src/mainboard/intel/adlrvp/variants/adlrvp_p/devicetree.cb
2 files changed, 32 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/89/47289/4

[V Sowmya (Code Review)]

Hello build bot (Jenkins), Subrata Banik, Sooraj Govindan, Aamir Bohra,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/47289

to look at the new patch set (#5).

Change subject: mb/intel/adlrvp: Add PMC.MUX.CONx device configuration for adlrvp
......................................................................

mb/intel/adlrvp: Add PMC.MUX.CONx device configuration for adlrvp

This patch adds the PMC MUX and CONx devices for adlrvp. Device
specific method contains the port and orientation details used
to configure the mux.

BUG=b:170607415
TEST=Built and booted adlrvp. Verified the PMC.MUX CONx objects
in SSDT tables.

Change-Id: I3b5bb73991feb99577c16fea00c381dd0f855769
Signed-off-by: V Sowmya 
---
M src/mainboard/intel/adlrvp/Kconfig
M src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
2 files changed, 32 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/89/47289/5

[Subrata Banik (Code Review)]

Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47289 )

Change subject: mb/intel/adlrvp: Add PMC.MUX.CONx device configuration for adlrvp
......................................................................

Patch Set 5: Code-Review+2

(1 comment)

https://review.coreboot.org/c/coreboot/+/47289/5/src/mainboard/intel/adlrvp/... 
File src/mainboard/intel/adlrvp/Kconfig:

https://review.coreboot.org/c/coreboot/+/47289/5/src/mainboard/intel/adlrvp/... 
PS5, Line 12: 	select DRIVERS_INTEL_PMC
do we need to only select this for BOARD_INTEL_ADLRVP_P_EXT_EC?

[V Sowmya (Code Review)]

Hello build bot (Jenkins), Subrata Banik, Sooraj Govindan, Aamir Bohra,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/47289

to look at the new patch set (#6).

Change subject: mb/intel/adlrvp: Add PMC.MUX.CONx device configuration for adlrvp
......................................................................

mb/intel/adlrvp: Add PMC.MUX.CONx device configuration for adlrvp

This patch adds the PMC MUX and CONx devices for adlrvp. Device
specific method contains the port and orientation details used
to configure the mux.

BUG=b:170607415
TEST=Built and booted adlrvp. Verified the PMC.MUX CONx objects
in SSDT tables.

Change-Id: I3b5bb73991feb99577c16fea00c381dd0f855769
Signed-off-by: V Sowmya 
---
M src/mainboard/intel/adlrvp/Kconfig
M src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
2 files changed, 32 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/89/47289/6

[V Sowmya (Code Review)]

V Sowmya has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47289 )

Change subject: mb/intel/adlrvp: Add PMC.MUX.CONx device configuration for adlrvp
......................................................................

Patch Set 6:

(1 comment)

https://review.coreboot.org/c/coreboot/+/47289/5/src/mainboard/intel/adlrvp/... 
File src/mainboard/intel/adlrvp/Kconfig:

https://review.coreboot.org/c/coreboot/+/47289/5/src/mainboard/intel/adlrvp/... 
PS5, Line 12: 	select DRIVERS_INTEL_PMC
> do we need to only select this for BOARD_INTEL_ADLRVP_P_EXT_EC?

Done.

[Subrata Banik (Code Review)]

Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47289 )

Change subject: mb/intel/adlrvp: Add PMC.MUX.CONx device configuration for adlrvp
......................................................................

Patch Set 6: Code-Review+2

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/47289 )

Change subject: mb/intel/adlrvp: Add PMC.MUX.CONx device configuration for adlrvp
......................................................................

mb/intel/adlrvp: Add PMC.MUX.CONx device configuration for adlrvp

This patch adds the PMC MUX and CONx devices for adlrvp. Device
specific method contains the port and orientation details used
to configure the mux.

BUG=b:170607415
TEST=Built and booted adlrvp. Verified the PMC.MUX CONx objects
in SSDT tables.

Change-Id: I3b5bb73991feb99577c16fea00c381dd0f855769
Signed-off-by: V Sowmya 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47289
Tested-by: build bot (Jenkins) 
Reviewed-by: Subrata Banik 
---
M src/mainboard/intel/adlrvp/Kconfig
M src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
2 files changed, 32 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Subrata Banik: Looks good to me, approved

diff --git a/src/mainboard/intel/adlrvp/Kconfig b/src/mainboard/intel/adlrvp/Kconfig
index a41c186..57b0524 100644
--- a/src/mainboard/intel/adlrvp/Kconfig
+++ b/src/mainboard/intel/adlrvp/Kconfig
@@ -9,6 +9,7 @@
    select DRIVERS_I2C_HID
    select DRIVERS_I2C_GENERIC
    select DRIVERS_INTEL_SOUNDWIRE
+	select DRIVERS_INTEL_PMC if BOARD_INTEL_ADLRVP_P_EXT_EC
    select DRIVERS_USB_ACPI
    select DRIVERS_SPI_ACPI
    select SOC_INTEL_ALDERLAKE
diff --git a/src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb b/src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
index e58e9fb..8033d3d 100644
--- a/src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
+++ b/src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
@@ -1,4 +1,34 @@
 chip soc/intel/alderlake

-	device domain 0 on end
+	device domain 0 on
+		device pci 1f.0 on
+			chip ec/google/chromeec
+				device pnp 0c09.0 on end
+				use conn0 as mux_conn[0]
+				use conn1 as mux_conn[1]
+			end
+		end # eSPI
+		device pci 1f.2 hidden
+			# The pmc_mux chip driver is a placeholder for the
+			# PMC.MUX device in the ACPI hierarchy.
+			chip drivers/intel/pmc_mux
+				device generic 0 on
+					chip drivers/intel/pmc_mux/conn
+						register "usb2_port_number" = "1"
+						register "usb3_port_number" = "1"
+						# SBU is fixed, HSL follows CC
+						register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
+						device generic 0 alias conn0 on end
+					end
+					chip drivers/intel/pmc_mux/conn
+						register "usb2_port_number" = "2"
+						register "usb3_port_number" = "2"
+						# SBU is fixed, HSL follows CC
+						register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
+						device generic 1 alias conn1 on end
+					end
+				end
+			end
+		end # PMC
+	end
 end