Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 97 additions & 0 deletions acpi/ipu6/_cam_common_ar0234.asl
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
/*
* SPDX-License-Identifier: GPL-2.0
* Copyright (c) 2026 Intel Corporation.
*
* CAM-level defines expected by caller:
* DESCH_SER_REF - Path to parent SER (e.g. \_SB.PC00.DESx.CHxx.SERx), used in _DEP
* DESCH_SER_PATH - Path to parent SER (e.g. "\\_SB.PC00.DESx.CHxx.SERx"), used in CSI2Bus and GpioIo
* DESCH_SER_GPIOREF - GPIO controller path for SER (e.g. ^^SERx), used in gpio resources (e.g. reset-gpios)
* CAM_LANES - Number of MIPI data lanes for the camera
*/
Method (_STA, 0, NotSerialized) // _STA: Status
{
Return (0x0F) // bit 0: device is present, bit 1: device is enabled, bit 2: device is shown in UI, bit 3: device is functional
}

Method (_HID, 0, NotSerialized) // _HID: Hardware ID
{
Return ("INTC10C0") // AR0234
}

Name (_DEP, Package (0x01) // _DEP: Dependencies
{
DESCH_SER_REF // Path to parent SER (e.g "\\_SB.PC00.DESx.CHxx.SERx")
})

Name(_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
/*
* mipi-disco-img.c will use the information in CSI2Bus to create fwnode.
* CAMx Local Port -> SERx Remote Port
* CAMx PRT0 -> SERx PRT0
*/
CSI2Bus(
DeviceInitiated, // SlaveMode
1, // PhyType (1 for DPHY)
0, // LocalPort (AR0234 only 1 PHY)
DESCH_SER_PATH, // ResourceSource (Path to parent SERx, e.g. "\\_SB.PC00.DESx.CHxx.SERx")
0, // ResourceSourceIndex (e.g. 0 for SERx PRT0)
, // ResourceUsage
, // DescriptorName
) // VendorData

I2cSerialBusV2 (
0x0010, // SlaveAddress (0x10 based on AR0234 hardware)
ControllerInitiated, // SlaveMode
0x00061A80, // ConnectionSpeed
AddressingMode7Bit, // AddressingMode
DESCH_SER_PATH, // ResourceSource (Path to parent SER, e.g. "\\_SB.PC00.DESx.CHxx.SERx")
0x00, // ResourceSourceIndex
ResourceConsumer, // ResourceUsage
, // DescriptorName
Exclusive, // Shared
) // VendorData
})

Name (_DSD, Package () // _DSD: Device-Specific Data
{
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), // Device Properties for _DSD
Package ()
{
Package () { "mipi-img-clock-frequency", 96000000 }, // 96 MHz

/*
* Sensor specific GPIOs, reset-gpios will be used by ar0234.c
* when devm_gpiod_get_optional is being called with "reset" consumer.
* For details, please refer to ACPI GPIO binding documentation
* https://www.kernel.org/doc/html/latest/firmware-guide/acpi/gpio-properties.html
*
* DESCH_SER_GPIOREF is the GPIO controller from parent SERx
* 0 is the GPIO pin group in parent SERx
* 0 is the index of pin in the GPIO pin group in parent SERx
* 1 is active low for reset
*
*/
Package () { "reset-gpios", Package () { DESCH_SER_GPIOREF, 0, 0, 1 } },
},
ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"), // Hierarchical Data Extension
Package ()
{
/* mipi-img-port here are NOT actual MIPI ports, but is used by mipi-disco-img.c to create fwnode. */
Package () { "mipi-img-port-0", "PRT0" }, // Connected to SERx PRTx (used by CAMx CSI2Bus LocalPort)
},
})

Name (PRT0, Package()
{
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), // Device Properties
Package ()
{
Package () { "mipi-img-clock-lanes", 0 },
#if CAM_LANES == 4
Package () { "mipi-img-data-lanes", Package() { 1, 2, 3, 4 } },
#else
Package () { "mipi-img-data-lanes", Package() { 1, 2 } },
#endif
},
})
2 changes: 1 addition & 1 deletion acpi/ipu6/_cam_common_d457.asl
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Name (PRT0, Package()
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), // Device Properties
Package ()
{
Package () { "mipi-img-clock-lanes", 0 },
Package () { "mipi-img-clock-lane", 0 },
#if CAM_LANES == 4
Package () { "mipi-img-data-lanes", Package() { 1, 2, 3, 4 } },
#elif CAM_LANES == 2
Expand Down
2 changes: 1 addition & 1 deletion acpi/ipu6/_cam_common_isx031.asl
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Name (PRT0, Package()
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), // Device Properties
Package ()
{
Package () { "mipi-img-clock-lanes", 0 },
Package () { "mipi-img-clock-lane", 0 },
#if CAM_LANES == 4
Package () { "mipi-img-data-lanes", Package() { 1, 2, 3, 4 } },
#elif CAM_LANES == 2
Expand Down
55 changes: 55 additions & 0 deletions acpi/ipu6/_des_ch_common_ar0234.asl
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/*
* SPDX-License-Identifier: GPL-2.0
* Copyright (c) 2026 Intel Corporation.
*
* Description: Common template for each AR0234 GMSL camera under each deserializer link,
* where each link is represented as an ATR channel device.
*
* DES-level defines expected by caller:
* DES_PATH - DESx ACPI path string (e.g., "\\_SB.PC00.DES0")
* DES_REF - DESx ACPI namespace reference (e.g., \_SB.PC00.DES0)
*
* Channel-level defines expected by caller:
* DESCH_CH - Channel device name (e.g., CH00)
* DESCH_SER - Serializer device name (e.g., SER0)
* DESCH_CAM - Camera device name (e.g., CAM0)
* DESCH_CH_PATH - CHxx ACPI path string (e.g., "\\_SB.PC00.DES0.CH00")
* DESCH_SER_PATH - SERx ACPI path string (e.g., "\\_SB.PC00.DES0.CH00.SER0")
* DESCH_SER_REF - SERx ACPI namespace reference (e.g., \_SB.PC00.DES0.CH00.SER0)
* DESCH_SER_I2C - SERx I2C address (e.g., 0x40)
* DESCH_LINK_NUM - Channel/link number (0, 1, 2, 3) - used for _ADR, reg, and SER remote port
* DESCH_SER_GPIOREF - SERx GPIO controller reference (e.g., ^^SER0, ^^SER1, etc.)
* CAM_LANES - CAMx Number of MIPI data lanes for the camera (e.g., 2, 4)
* Optional defines:
* DESCH_SER_EXTRA_GPIO_PIN - SERx Additional GPIO pin number (e.g., 7 for MFP7 in MAX9295A)
* DESCH_SER_X/Y/Z/U_VC - SERx VC filter for Pipe X/Y/Z/U, specifically for MAX96717 driver
*/

Device (DESCH_CH) // New CHxx Device under parent DESx device for each DES channel/link
{
/*
* Channel is the naming convention used by i2c-mux or i2c-atr in ACPI namespace
* In GMSL context, it can directly be translated as Link 0/1/2/3 of the Deserializer
*/

Name (_ADR, DESCH_LINK_NUM) // _ADR: Address for the channel (e.g. 0 for Link 0, 1 for Link 1)

Name (_DSD, Package () // _DSD: Device Specific Data
{
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), // Device Properties
Package ()
{
Package () { "reg", DESCH_LINK_NUM }, // used by i2c-atr driver. Represents the channel / link number
}
})

Device (DESCH_SER) // SERx device under parent DESx.CHxx
{
#include "_ser_common_max9295.asl"

Device (DESCH_CAM) // CAMx device under parent DESx.CHxx.SERx
{
#include "_cam_common_ar0234.asl"
}
}
}
8 changes: 4 additions & 4 deletions acpi/ipu6/_des_common_max9296.asl
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Name (PRT0, Package()
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), // Device Properties
Package ()
{
Package () { "mipi-img-clock-lanes", 0 },
Package () { "mipi-img-clock-lane", 0 },
Package () { "mipi-img-data-lanes", Package () { 1, 2, 3, 4} },
},
})
Expand All @@ -95,7 +95,7 @@ Name (PRT1, Package()
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), // Device Properties
Package ()
{
Package () { "mipi-img-clock-lanes", 0 },
Package () { "mipi-img-clock-lane", 0 },
Package () { "mipi-img-data-lanes", Package() { 1, 2, 3, 4 } },
},
})
Expand All @@ -105,7 +105,7 @@ Name (PRT2, Package()
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), // Device Properties
Package ()
{
Package () { "mipi-img-clock-lanes", 0 },
Package () { "mipi-img-clock-lane", 0 },
#if DES_LANES == 2
Package () { "mipi-img-data-lanes", Package() { 1, 2 } },
#else
Expand All @@ -120,7 +120,7 @@ Name (PRT3, Package()
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), // Device Properties
Package ()
{
Package () { "mipi-img-clock-lanes", 0 },
Package () { "mipi-img-clock-lane", 0 },
#if DES_LANES == 2
Package () { "mipi-img-data-lanes", Package() { 1, 2 } },
#else
Expand Down
20 changes: 13 additions & 7 deletions acpi/ipu6/_des_common_max96724.asl
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Name (PRT0, Package()
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), // Device Properties
Package ()
{
Package () { "mipi-img-clock-lanes", 0 },
Package () { "mipi-img-clock-lane", 0 },
Package () { "mipi-img-data-lanes", Package () { 1, 2, 3, 4} },
},
})
Expand All @@ -110,7 +110,7 @@ Name (PRT1, Package()
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), // Device Properties
Package ()
{
Package () { "mipi-img-clock-lanes", 0 },
Package () { "mipi-img-clock-lane", 0 },
Package () { "mipi-img-data-lanes", Package() { 1, 2, 3, 4 } },
},

Expand All @@ -121,7 +121,7 @@ Name (PRT2, Package()
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), // Device Properties
Package ()
{
Package () { "mipi-img-clock-lanes", 0 },
Package () { "mipi-img-clock-lane", 0 },
Package () { "mipi-img-data-lanes", Package () { 1, 2, 3, 4 } },
},
})
Expand All @@ -131,7 +131,7 @@ Name (PRT3, Package()
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), // Device Properties
Package ()
{
Package () { "mipi-img-clock-lanes", 0 },
Package () { "mipi-img-clock-lane", 0 },
Package () { "mipi-img-data-lanes", Package() { 1, 2, 3, 4 } },
},

Expand All @@ -142,7 +142,7 @@ Name (PRT4, Package()
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), // Device Properties
Package ()
{
Package () { "mipi-img-clock-lanes", 0 },
Package () { "mipi-img-clock-lane", 0},
#if DES_LANES == 4
Package () { "mipi-img-data-lanes", Package() { 1, 2, 3, 4 } }, // 4 lanes for DPHY on Intel MIPI CRD
#else
Expand All @@ -159,8 +159,14 @@ Name (PRT5, Package()
{
Package () { "mipi-img-clock-lanes", 0 },
#if DES_LANES == 4
#if DES_PHY_TYPE == 1
Package () { "mipi-img-clock-lane", 5 }, // DPHY uses alternate CKCP PHY0 clock lane
#else
Package () { "mipi-img-clock-lane", 0 },
#endif
Package () { "mipi-img-data-lanes", Package() { 1, 2, 3, 4 } }, // 4 lanes for DPHY on Intel MIPI CRD
#else
Package () { "mipi-img-clock-lane", 0 },
Package () { "mipi-img-data-lanes", Package() { 1, 2 } }, // 2 lanes for CPHY/DPHY on Intel MIPI CRD
#endif
Package () { "mipi-img-link-frequencies", Package() { 1000000000 } }, // 1 GHz to be used by Intel IPU driver as link frequency
Expand All @@ -172,7 +178,7 @@ Name (PRT6, Package()
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), // Device Properties
Package ()
{
Package () { "mipi-img-clock-lanes", 0 },
Package () { "mipi-img-clock-lane", 0},
#if DES_LANES == 4
Package () { "mipi-img-data-lanes", Package() { 1, 2, 3, 4 } }, // 4 lanes for DPHY on Intel MIPI CRD
#else
Expand All @@ -187,7 +193,7 @@ Name (PRT7, Package()
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), // Device Properties
Package ()
{
Package () { "mipi-img-clock-lanes", 0 },
Package () { "mipi-img-clock-lane", 0 },
#if DES_LANES == 4
Package () { "mipi-img-data-lanes", Package() { 1, 2, 3, 4 } }, // 4 lanes for DPHY on Intel MIPI CRD
#else
Expand Down
4 changes: 2 additions & 2 deletions acpi/ipu6/_ser_common_max9295.asl
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Name (PRT0, Package()
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), // Device Properties
Package ()
{
Package () { "mipi-img-clock-lanes", 0 },
Package () { "mipi-img-clock-lane", 0 },
#if CAM_LANES == 4
Package () { "mipi-img-data-lanes", Package() { 1, 2, 3, 4 } }, // 4 data lanes
#elif CAM_LANES == 2
Expand All @@ -121,7 +121,7 @@ Name (PRT1, Package()
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), // Device Properties
Package ()
{
Package () { "mipi-img-clock-lanes", 0 },
Package () { "mipi-img-clock-lane", 0 },
Package () { "mipi-img-data-lanes", Package() { 1, 2, 3, 4 } },
},
})
Expand Down
Loading
Loading