Rajmohan Mani has uploaded this change for review. ( https://review.coreboot.org/27259
Change subject: mainboard/google/nocturne: Properly name CAM0/1 files ......................................................................
mainboard/google/nocturne: Properly name CAM0/1 files
Camera sensors connected to port 0 and port 1 of the CIO2 device are named as CAM0 and CAM1. CAM0 and CAM1 devices are named in cam0.asl and cam1.asl filel respectively.
BUG=None TEST=None
Change-Id: I0050ec871b7dd755c90b18b4c7aacfce8e2122b1 Signed-off-by: Rajmohan Mani rajmohan.mani@intel.com --- M src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam0.asl M src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam1.asl 2 files changed, 101 insertions(+), 101 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/27259/1
diff --git a/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam0.asl b/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam0.asl index cff6e66..8a2dbdd 100644 --- a/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam0.asl +++ b/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam0.asl @@ -13,14 +13,13 @@ * GNU General Public License for more details. */
-Scope (_SB.PCI0.I2C5) +Scope (_SB.PCI0.I2C3) { - - Device (CAM1) + Device (CAM0) { - Name (_HID, "SONY355A") /* _HID: Hardware ID */ + Name (_HID, "SONY319A") /* _HID: Hardware ID */ Name (_UID, Zero) /* _UID: Unique ID */ - Name (_DDN, "SONY IMX355A Camera") /* _DDN: DOS Device Name */ + Name (_DDN, "Sony IMX319 Camera") /* _DDN: DOS Device Name */
Method (_STA, 0, NotSerialized) /* _STA: Status */ { @@ -29,30 +28,31 @@
Name (_CRS, ResourceTemplate () { - I2cSerialBus (0x001A, ControllerInitiated, 0x00061A80, - AddressingMode7Bit, "\_SB.PCI0.I2C5", - 0x00, ResourceConsumer, , - ) + I2cSerialBus (0x0010, ControllerInitiated, 0x00061A80, + AddressingMode7Bit, "\_SB.PCI0.I2C3", + 0x00, ResourceConsumer, , + ) })
- /* Port0 of CAM1 is connected to port1 of CIO2 device */ + /* Port0 of CAM0 is connected to port0 of CIO2 device */ Name (STA, 0) Method (PMON, 0, Serialized) { If (STA == 0) { - CTXS(GPIO_RCAM_RST_L) - STXS(GPIO_RCAM_PWR_EN) - STXS(GPIO_PCH_RCAM_CLK_EN) + CTXS (GPIO_FCAM_RST_L) + STXS (GPIO_FCAM_PWR_EN) + STXS (GPIO_PCH_FCAM_CLK_EN) Sleep(3) - STXS(GPIO_RCAM_RST_L) + STXS (GPIO_FCAM_RST_L)
/* - * A delay of T7 (minimum of 10 ms) + T8 - * (max 1.4 ms + delay of coarse integration - * time value) is needed to have the sensor - * ready for streaming, as soon as the power - * on sequence completes + * A delay of T7 (minimum of 5 ms) + T8 + * (max 5 ms + delay of coarse integration + * time value + 14 H, time for 14 horizontal + * lines) is needed to have the sensor ready + * for streaming, as soon as the power on + * sequence completes */ - Sleep(12) + Sleep(11); } STA++ } @@ -63,17 +63,17 @@ } STA-- If (STA == 0) { - CTXS(GPIO_PCH_RCAM_CLK_EN) - CTXS(GPIO_RCAM_RST_L) - CTXS(GPIO_RCAM_PWR_EN) + CTXS (GPIO_PCH_FCAM_CLK_EN) + CTXS (GPIO_FCAM_RST_L) + CTXS (GPIO_FCAM_PWR_EN) } }
- Name (_PR0, Package (0x01) { RCPR }) - Name (_PR3, Package (0x01) { RCPR }) + Name (_PR0, Package (0x01) { FCPR }) + Name (_PR3, Package (0x01) { FCPR })
/* Power resource methods for Rear Camera */ - PowerResource (RCPR, 0, 0) { + PowerResource (FCPR, 0, 0) { Method (_ON, 0, Serialized) { PMON () } @@ -98,9 +98,6 @@ ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), Package () { Package () { "clock-frequency", 19200000 }, - Package () { "lens-focus", - Package () { _SB.PCI0.I2C5.VCM0 } - } } })
@@ -127,45 +124,13 @@ Package() { 360000000 } }, Package () { "remote-endpoint", - Package() { _SB.PCI0.CIO2, 1, 0 } + Package() { _SB.PCI0.CIO2, 0, 0 } }, } }) }
- Device (VCM0) - { - Name (_HID, "PRP0001") /* _HID: Hardware ID */ - Name (_UID, Zero) /* _UID: Unique ID */ - Name (_DDN, "AKM AF DAC") /* _DDN: DOS Device Name */ - - Method (_STA, 0, NotSerialized) /* _STA: Status */ - { - Return (0x0F) - } - - Name (_CRS, ResourceTemplate () - { - I2cSerialBus (0x000C, ControllerInitiated, 0x00061A80, - AddressingMode7Bit, "\_SB.PCI0.I2C5", - 0x00, ResourceConsumer, , - ) - }) - - Name (_DEP, Package() { ^^I2C5.CAM1 }) - - Name (_PR0, Package (0x01) { ^^I2C5.CAM1.RCPR }) - Name (_PR3, Package (0x01) { ^^I2C5.CAM1.RCPR }) - - Name (_DSD, Package () { - ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), - Package () { - Package () { "compatible", "asahi-kasei,ak7375" }, - } - }) - } - - Device (NVM1) + Device (NVM0) { Name (_HID, "INT3499") /* _HID: Hardware ID */ Name (_UID, Zero) /* _UID: Unique ID */ @@ -178,15 +143,15 @@
Name (_CRS, ResourceTemplate () { - I2cSerialBus (0x0051, ControllerInitiated, 0x00061A80, - AddressingMode7Bit, "\_SB.PCI0.I2C5", + I2cSerialBus (0x0050, ControllerInitiated, 0x00061A80, + AddressingMode7Bit, "\_SB.PCI0.I2C3", 0x00, ResourceConsumer, ,) })
- Name (_DEP, Package() { ^^I2C5.CAM1 }) + Name (_DEP, Package () { ^^I2C3.CAM0 })
- Name (_PR0, Package (0x01) { ^^I2C5.CAM1.RCPR }) - Name (_PR3, Package (0x01) { ^^I2C5.CAM1.RCPR }) + Name (_PR0, Package (0x01) { ^^I2C3.CAM0.FCPR }) + Name (_PR3, Package (0x01) { ^^I2C3.CAM0.FCPR })
Name (_DSD, Package () { diff --git a/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam1.asl b/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam1.asl index 8a2dbdd..cff6e66 100644 --- a/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam1.asl +++ b/src/mainboard/google/poppy/variants/nocturne/include/variant/acpi/cam1.asl @@ -13,13 +13,14 @@ * GNU General Public License for more details. */
-Scope (_SB.PCI0.I2C3) +Scope (_SB.PCI0.I2C5) { - Device (CAM0) + + Device (CAM1) { - Name (_HID, "SONY319A") /* _HID: Hardware ID */ + Name (_HID, "SONY355A") /* _HID: Hardware ID */ Name (_UID, Zero) /* _UID: Unique ID */ - Name (_DDN, "Sony IMX319 Camera") /* _DDN: DOS Device Name */ + Name (_DDN, "SONY IMX355A Camera") /* _DDN: DOS Device Name */
Method (_STA, 0, NotSerialized) /* _STA: Status */ { @@ -28,31 +29,30 @@
Name (_CRS, ResourceTemplate () { - I2cSerialBus (0x0010, ControllerInitiated, 0x00061A80, - AddressingMode7Bit, "\_SB.PCI0.I2C3", - 0x00, ResourceConsumer, , - ) + I2cSerialBus (0x001A, ControllerInitiated, 0x00061A80, + AddressingMode7Bit, "\_SB.PCI0.I2C5", + 0x00, ResourceConsumer, , + ) })
- /* Port0 of CAM0 is connected to port0 of CIO2 device */ + /* Port0 of CAM1 is connected to port1 of CIO2 device */ Name (STA, 0) Method (PMON, 0, Serialized) { If (STA == 0) { - CTXS (GPIO_FCAM_RST_L) - STXS (GPIO_FCAM_PWR_EN) - STXS (GPIO_PCH_FCAM_CLK_EN) + CTXS(GPIO_RCAM_RST_L) + STXS(GPIO_RCAM_PWR_EN) + STXS(GPIO_PCH_RCAM_CLK_EN) Sleep(3) - STXS (GPIO_FCAM_RST_L) + STXS(GPIO_RCAM_RST_L)
/* - * A delay of T7 (minimum of 5 ms) + T8 - * (max 5 ms + delay of coarse integration - * time value + 14 H, time for 14 horizontal - * lines) is needed to have the sensor ready - * for streaming, as soon as the power on - * sequence completes + * A delay of T7 (minimum of 10 ms) + T8 + * (max 1.4 ms + delay of coarse integration + * time value) is needed to have the sensor + * ready for streaming, as soon as the power + * on sequence completes */ - Sleep(11); + Sleep(12) } STA++ } @@ -63,17 +63,17 @@ } STA-- If (STA == 0) { - CTXS (GPIO_PCH_FCAM_CLK_EN) - CTXS (GPIO_FCAM_RST_L) - CTXS (GPIO_FCAM_PWR_EN) + CTXS(GPIO_PCH_RCAM_CLK_EN) + CTXS(GPIO_RCAM_RST_L) + CTXS(GPIO_RCAM_PWR_EN) } }
- Name (_PR0, Package (0x01) { FCPR }) - Name (_PR3, Package (0x01) { FCPR }) + Name (_PR0, Package (0x01) { RCPR }) + Name (_PR3, Package (0x01) { RCPR })
/* Power resource methods for Rear Camera */ - PowerResource (FCPR, 0, 0) { + PowerResource (RCPR, 0, 0) { Method (_ON, 0, Serialized) { PMON () } @@ -98,6 +98,9 @@ ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), Package () { Package () { "clock-frequency", 19200000 }, + Package () { "lens-focus", + Package () { _SB.PCI0.I2C5.VCM0 } + } } })
@@ -124,13 +127,45 @@ Package() { 360000000 } }, Package () { "remote-endpoint", - Package() { _SB.PCI0.CIO2, 0, 0 } + Package() { _SB.PCI0.CIO2, 1, 0 } }, } }) }
- Device (NVM0) + Device (VCM0) + { + Name (_HID, "PRP0001") /* _HID: Hardware ID */ + Name (_UID, Zero) /* _UID: Unique ID */ + Name (_DDN, "AKM AF DAC") /* _DDN: DOS Device Name */ + + Method (_STA, 0, NotSerialized) /* _STA: Status */ + { + Return (0x0F) + } + + Name (_CRS, ResourceTemplate () + { + I2cSerialBus (0x000C, ControllerInitiated, 0x00061A80, + AddressingMode7Bit, "\_SB.PCI0.I2C5", + 0x00, ResourceConsumer, , + ) + }) + + Name (_DEP, Package() { ^^I2C5.CAM1 }) + + Name (_PR0, Package (0x01) { ^^I2C5.CAM1.RCPR }) + Name (_PR3, Package (0x01) { ^^I2C5.CAM1.RCPR }) + + Name (_DSD, Package () { + ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), + Package () { + Package () { "compatible", "asahi-kasei,ak7375" }, + } + }) + } + + Device (NVM1) { Name (_HID, "INT3499") /* _HID: Hardware ID */ Name (_UID, Zero) /* _UID: Unique ID */ @@ -143,15 +178,15 @@
Name (_CRS, ResourceTemplate () { - I2cSerialBus (0x0050, ControllerInitiated, 0x00061A80, - AddressingMode7Bit, "\_SB.PCI0.I2C3", + I2cSerialBus (0x0051, ControllerInitiated, 0x00061A80, + AddressingMode7Bit, "\_SB.PCI0.I2C5", 0x00, ResourceConsumer, ,) })
- Name (_DEP, Package () { ^^I2C3.CAM0 }) + Name (_DEP, Package() { ^^I2C5.CAM1 })
- Name (_PR0, Package (0x01) { ^^I2C3.CAM0.FCPR }) - Name (_PR3, Package (0x01) { ^^I2C3.CAM0.FCPR }) + Name (_PR0, Package (0x01) { ^^I2C5.CAM1.RCPR }) + Name (_PR3, Package (0x01) { ^^I2C5.CAM1.RCPR })
Name (_DSD, Package () {