Change in ...coreboot[master]: UPSTREAM: mb/google/atlas: Enable camera module NVM

[JasonX Z Chen (Code Review)]

JasonX Z Chen has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30795

Change subject: UPSTREAM: mb/google/atlas: Enable camera module NVM
......................................................................

UPSTREAM: mb/google/atlas: Enable camera module NVM

Enable at24 EEPROM by adding ASL of nvm

BUG=none
BRANCH=master
TEST=Build and run for basic camera functions

Change-Id: Ifc2060c2ceb7d1a8ef490f36f484deb425a37c95
Signed-off-by: Chen, JasonX Z 
---
M src/mainboard/google/poppy/variants/atlas/include/variant/acpi/cam0.asl
1 file changed, 67 insertions(+), 35 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/30795/1

diff --git a/src/mainboard/google/poppy/variants/atlas/include/variant/acpi/cam0.asl b/src/mainboard/google/poppy/variants/atlas/include/variant/acpi/cam0.asl
index 7c85650..ce459e2 100644
--- a/src/mainboard/google/poppy/variants/atlas/include/variant/acpi/cam0.asl
+++ b/src/mainboard/google/poppy/variants/atlas/include/variant/acpi/cam0.asl
@@ -15,25 +15,23 @@

Scope (_SB.PCI0.I2C3)
 {
-	Device (CAM0)
-	{
-		Name (_HID, "INT3478") /* _HID: Hardware ID */
-		Name (_UID, Zero)  /* _UID: Unique ID */
-		Name (_DDN, "SONY IMX208 Camera")  /* _DDN: DOS Device Name */
-
-		Method (_STA, 0, NotSerialized)  /* _STA: Status */
-		{
-			Return (0x0F)
-		}
-
-		Name (_CRS, ResourceTemplate ()
-		{
-			I2cSerialBus (0x0010, ControllerInitiated, 0x00061A80,
-				AddressingMode7Bit, "\_SB.PCI0.I2C3",
-				0x00, ResourceConsumer, ,)
-		})
-
+	/* Power resource methods for Front Camera */
+	PowerResource (FCPR, 0, 0) {
    	Name (STA, 0)
+		Method (_ON, 0, Serialized) {
+			PMON ()
+		}
+		Method (_OFF, 0, Serialized) {
+			PMOF ()
+		}
+		Method (_STA, 0, Serialized) {
+			If (LGreater(STA,0)) {
+				Return (0x1)
+			}
+			Else {
+				Return (0x0)
+			}
+		}
    	Method (PMON, 0, Serialized) {
    		If (STA == 0) {
    			CTXS (EN_CAM_PMIC_RST_L)
@@ -57,27 +55,28 @@
    			CTXS (EN_PP3300_DX_CAM)
    		}
    	}
+	}
+	Device (CAM0)
+	{
+		Name (_HID, "INT3478") /* _HID: Hardware ID */
+		Name (_UID, Zero)  /* _UID: Unique ID */
+		Name (_DDN, "SONY IMX208 Camera")  /* _DDN: DOS Device Name */
+
+		Method (_STA, 0, NotSerialized)  /* _STA: Status */
+		{
+			Return (0x0F)
+		}
+
+		Name (_CRS, ResourceTemplate ()
+		{
+			I2cSerialBus (0x0010, ControllerInitiated, 0x00061A80,
+				AddressingMode7Bit, "\_SB.PCI0.I2C3",
+				0x00, ResourceConsumer, ,)
+		})

Name (_PR0, Package (0x01) { FCPR })
    	Name (_PR3, Package (0x01) { FCPR })

-		/* Power resource methods for Front Camera */
-		PowerResource (FCPR, 0, 0) {
-			Method (_ON, 0, Serialized) {
-				PMON ()
-			}
-			Method (_OFF, 0, Serialized) {
-				PMOF ()
-			}
-			Method (_STA, 0, Serialized) {
-				If (LGreater(STA,0)) {
-					Return (0x1)
-				}
-				Else {
-					Return (0x0)
-				}
-			}
-		}

/* Port0 of CAM0 is connected to port0 of CIO2 device */
    	Name (_DSD, Package () {
@@ -119,4 +118,37 @@
    		}
    	})
    }
+	Device (NVM0)
+	{
+		Name (_HID, "INT3499") /* _HID: Hardware ID */
+		Name (_UID, Zero)  /* _UID: Unique ID */
+		Name (_DDN, "GT24C16S")  /* _DDN: DOS Device Name */
+
+		Method (_STA, 0, NotSerialized)  /* _STA: Status */
+		{
+			Return (0x0F)
+		}
+
+		Name (_CRS, ResourceTemplate ()
+		{
+			I2cSerialBus (0x0050, ControllerInitiated, 0x00061A80,
+				AddressingMode7Bit, "\_SB.PCI0.I2C3",
+				0x00, ResourceConsumer, ,)
+		})
+
+		Name (_DEP, Package () { CAM0 })
+		Name (_PR0, Package (0x01) { FCPR })
+		Name (_PR3, Package (0x01) { FCPR })
+
+		Name (_DSD, Package ()
+		{
+			ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+			Package () {
+				Package () { "size", 2048 },
+				Package () { "pagesize", 1 },
+				Package () { "read-only", 1 },
+				Package () { "address-width", 16 },
+			}
+		})
+	}
 }

Change in ...coreboot[master]: mb/google/atlas: Enable camera module NVM

[JasonX Z Chen (Code Review)]

JasonX Z Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/30795 )

Change subject: mb/google/atlas: Enable camera module NVM
......................................................................

Patch Set 6: Code-Review+1

Change in ...coreboot[master]: mb/google/atlas: Enable camera module NVM

[JasonX Z Chen (Code Review)]

JasonX Z Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/30795 )

Change subject: mb/google/atlas: Enable camera module NVM
......................................................................

Patch Set 6:

(1 comment)

https://review.coreboot.org/#/c/30795/5/src/mainboard/google/poppy/variants/... 
File src/mainboard/google/poppy/variants/atlas/include/variant/acpi/cam0.asl:

https://review.coreboot.org/#/c/30795/5/src/mainboard/google/poppy/variants/... 
PS5, Line 37: CTXS (EN_CAM_PMIC_RST_L)
            : 				STXS (EN_PP3300_DX_CAM)
            : 				Sleep(3)
            : 				STXS (EN_CAM_PMIC_RST_L)
            : 				STXS (EN_CAM_CLOCK)
            : 				Sleep(2);
> the power resource is common for CAM0 and NVM0, do you need all these steps to just to activate NVM? […]

If remove STXS/CTXS of method(PMON), cpu can't get the nvm data anymore.

Change in ...coreboot[master]: mb/google/atlas: Enable camera module NVM

[Rizwan Qureshi (Code Review)]

Rizwan Qureshi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/30795 )

Change subject: mb/google/atlas: Enable camera module NVM
......................................................................

Patch Set 6: Code-Review+2

Change in ...coreboot[master]: mb/google/atlas: Enable camera module NVM

[Andy Yeh (Code Review)]

Andy Yeh has uploaded a new patch set (#7) to the change originally created by JasonX Z Chen. ( https://review.coreboot.org/c/coreboot/+/30795 )

Change subject: mb/google/atlas: Enable camera module NVM
......................................................................

mb/google/atlas: Enable camera module NVM

Enable at24 EEPROM by adding ASL of nvm

BUG=b:122583978
BRANCH=master
TEST=Build and run for basic camera functions

Change-Id: Ifc2060c2ceb7d1a8ef490f36f484deb425a37c95
Signed-off-by: Chen, JasonX Z 
---
M src/mainboard/google/poppy/variants/atlas/include/variant/acpi/cam0.asl
1 file changed, 69 insertions(+), 35 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/30795/7

Change in ...coreboot[master]: mb/google/atlas: Enable camera module NVM

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/30795 )

Change subject: mb/google/atlas: Enable camera module NVM
......................................................................

mb/google/atlas: Enable camera module NVM

Enable at24 EEPROM by adding ASL of nvm

BUG=b:122583978
BRANCH=master
TEST=Build and run for basic camera functions

Change-Id: Ifc2060c2ceb7d1a8ef490f36f484deb425a37c95
Signed-off-by: Chen, JasonX Z 
Reviewed-on: https://review.coreboot.org/c/30795
Tested-by: build bot (Jenkins) 
Reviewed-by: Rizwan Qureshi 
---
M src/mainboard/google/poppy/variants/atlas/include/variant/acpi/cam0.asl
1 file changed, 69 insertions(+), 35 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Rizwan Qureshi: Looks good to me, approved
  JasonX Z Chen: Looks good to me, but someone else must approve

diff --git a/src/mainboard/google/poppy/variants/atlas/include/variant/acpi/cam0.asl b/src/mainboard/google/poppy/variants/atlas/include/variant/acpi/cam0.asl
index 7c85650..0a703d4 100644
--- a/src/mainboard/google/poppy/variants/atlas/include/variant/acpi/cam0.asl
+++ b/src/mainboard/google/poppy/variants/atlas/include/variant/acpi/cam0.asl
@@ -15,25 +15,23 @@

Scope (_SB.PCI0.I2C3)
 {
-	Device (CAM0)
-	{
-		Name (_HID, "INT3478") /* _HID: Hardware ID */
-		Name (_UID, Zero)  /* _UID: Unique ID */
-		Name (_DDN, "SONY IMX208 Camera")  /* _DDN: DOS Device Name */
-
-		Method (_STA, 0, NotSerialized)  /* _STA: Status */
-		{
-			Return (0x0F)
-		}
-
-		Name (_CRS, ResourceTemplate ()
-		{
-			I2cSerialBus (0x0010, ControllerInitiated, 0x00061A80,
-				AddressingMode7Bit, "\_SB.PCI0.I2C3",
-				0x00, ResourceConsumer, ,)
-		})
-
+	/* Power resource methods for Front Camera */
+	PowerResource (FCPR, 0, 0) {
    	Name (STA, 0)
+		Method (_ON, 0, Serialized) {
+			PMON ()
+		}
+		Method (_OFF, 0, Serialized) {
+			PMOF ()
+		}
+		Method (_STA, 0, Serialized) {
+			If (LGreater(STA,0)) {
+				Return (0x1)
+			}
+			Else {
+				Return (0x0)
+			}
+		}
    	Method (PMON, 0, Serialized) {
    		If (STA == 0) {
    			CTXS (EN_CAM_PMIC_RST_L)
@@ -57,27 +55,29 @@
    			CTXS (EN_PP3300_DX_CAM)
    		}
    	}
+	}
+
+	Device (CAM0)
+	{
+		Name (_HID, "INT3478") /* _HID: Hardware ID */
+		Name (_UID, Zero)  /* _UID: Unique ID */
+		Name (_DDN, "SONY IMX208 Camera")  /* _DDN: DOS Device Name */
+
+		Method (_STA, 0, NotSerialized)  /* _STA: Status */
+		{
+			Return (0x0F)
+		}
+
+		Name (_CRS, ResourceTemplate ()
+		{
+			I2cSerialBus (0x0010, ControllerInitiated, 0x00061A80,
+				AddressingMode7Bit, "\_SB.PCI0.I2C3",
+				0x00, ResourceConsumer, ,)
+		})

Name (_PR0, Package (0x01) { FCPR })
    	Name (_PR3, Package (0x01) { FCPR })

-		/* Power resource methods for Front Camera */
-		PowerResource (FCPR, 0, 0) {
-			Method (_ON, 0, Serialized) {
-				PMON ()
-			}
-			Method (_OFF, 0, Serialized) {
-				PMOF ()
-			}
-			Method (_STA, 0, Serialized) {
-				If (LGreater(STA,0)) {
-					Return (0x1)
-				}
-				Else {
-					Return (0x0)
-				}
-			}
-		}

/* Port0 of CAM0 is connected to port0 of CIO2 device */
    	Name (_DSD, Package () {
@@ -119,4 +119,38 @@
    		}
    	})
    }
+
+	Device (NVM0)
+	{
+		Name (_HID, "INT3499") /* _HID: Hardware ID */
+		Name (_UID, Zero)  /* _UID: Unique ID */
+		Name (_DDN, "GT24C16S")  /* _DDN: DOS Device Name */
+
+		Method (_STA, 0, NotSerialized)  /* _STA: Status */
+		{
+			Return (0x0F)
+		}
+
+		Name (_CRS, ResourceTemplate ()
+		{
+			I2cSerialBus (0x0050, ControllerInitiated, 0x00061A80,
+				AddressingMode7Bit, "\_SB.PCI0.I2C3",
+				0x00, ResourceConsumer, ,)
+		})
+
+		Name (_DEP, Package () { CAM0 })
+		Name (_PR0, Package (0x01) { FCPR })
+		Name (_PR3, Package (0x01) { FCPR })
+
+		Name (_DSD, Package ()
+		{
+			ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+			Package () {
+				Package () { "size", 2048 },
+				Package () { "pagesize", 1 },
+				Package () { "read-only", 1 },
+				Package () { "address-width", 8 },
+			}
+		})
+	}
 }