aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard/intel/jasperlake_rvp/variants/jslrvp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/intel/jasperlake_rvp/variants/jslrvp')
-rw-r--r--src/mainboard/intel/jasperlake_rvp/variants/jslrvp/devicetree.cb16
-rw-r--r--src/mainboard/intel/jasperlake_rvp/variants/jslrvp/gpio.c17
-rw-r--r--src/mainboard/intel/jasperlake_rvp/variants/jslrvp/include/variant/acpi/camera.asl3
3 files changed, 29 insertions, 7 deletions
diff --git a/src/mainboard/intel/jasperlake_rvp/variants/jslrvp/devicetree.cb b/src/mainboard/intel/jasperlake_rvp/variants/jslrvp/devicetree.cb
index 1e88c7ae62..14ca4a5abd 100644
--- a/src/mainboard/intel/jasperlake_rvp/variants/jslrvp/devicetree.cb
+++ b/src/mainboard/intel/jasperlake_rvp/variants/jslrvp/devicetree.cb
@@ -137,7 +137,7 @@ chip soc/intel/jasperlake
.speed_mhz = 1,
.early_init = 1,
},
- .i2c[0] = {
+ .i2c[0] = {
.speed = I2C_SPEED_FAST,
.speed_config[0] = {
.speed = I2C_SPEED_FAST,
@@ -146,13 +146,17 @@ chip soc/intel/jasperlake
.sda_hold = 36,
}
},
+ .i2c[5] = {
+ .speed = I2C_SPEED_FAST,
+ },
}"
device domain 0 on
device pci 00.0 on end # Host Bridge
device pci 02.0 on end # Integrated Graphics Device
- device pci 04.0 off end # SA Thermal device
- device pci 12.0 off end # Thermal Subsystem
+ device pci 04.0 off end # SA Thermal device
+ device pci 05.0 on end #IPU
+ device pci 12.0 off end # Thermal Subsystem
device pci 12.5 off end # UFS SCS
device pci 12.6 off end # GSPI #2
device pci 14.0 on
@@ -285,8 +289,8 @@ chip soc/intel/jasperlake
device pci 16.4 off end # Management Engine Interface 3
device pci 16.5 off end # Management Engine Interface 4
device pci 17.0 off end # SATA
- device pci 19.0 on end # I2C #4
- device pci 19.1 off end # I2C #5
+ device pci 19.0 off end # I2C #4 Cam 0
+ device pci 19.1 on end # I2C #5 Cam 1 and VCM
device pci 19.2 on end # UART #2
device pci 1a.0 on end # eMMC
device pci 1c.0 on end # PCI Express Port 1
@@ -308,7 +312,7 @@ chip soc/intel/jasperlake
device spi 0 on end
end
end # GSPI #1
- device pci 1f.0 on end # eSPI Interface
+ device pci 1f.0 on end # eSPI Interface
device pci 1f.1 on end # P2SB
device pci 1f.2 on end # Power Management Controller
device pci 1f.3 on end # Intel HDA
diff --git a/src/mainboard/intel/jasperlake_rvp/variants/jslrvp/gpio.c b/src/mainboard/intel/jasperlake_rvp/variants/jslrvp/gpio.c
index 5a127a6ebf..d67f4a44e4 100644
--- a/src/mainboard/intel/jasperlake_rvp/variants/jslrvp/gpio.c
+++ b/src/mainboard/intel/jasperlake_rvp/variants/jslrvp/gpio.c
@@ -64,13 +64,19 @@ static const struct pad_config gpio_table[] = {
/* I2C0_SCL */
PAD_CFG_NF(GPP_C17, UP_2K, DEEP, NF1),
+ /* CAM2_RST_N */
+ PAD_CFG_GPO(GPP_C19, 0, PLTRST),
+
/* WIFI_RF_KILL_N */
PAD_CFG_GPO(GPP_D0, 1, PLTRST),
/* BT_RF_KILL_N */
PAD_CFG_GPO(GPP_D1, 1, PLTRST),
- /* LAN_RST_N */
+ /* CAM2_PWREN */
+ PAD_CFG_GPO(GPP_D4, 0, PLTRST),
+
+ /*LAN_RST_N*/
PAD_CFG_GPO(GPP_D6, 1, PLTRST),
/* AVS_I2S_MCLK */
@@ -85,6 +91,15 @@ static const struct pad_config gpio_table[] = {
/* CNV_PA_BLANKING */
PAD_CFG_NF(GPP_D21, NONE, DEEP, NF1),
+ /* I2C5_SDA */
+ PAD_CFG_NF(GPP_D22, NONE, PLTRST, NF1),
+
+ /* I2C5_SCL */
+ PAD_CFG_NF(GPP_D23, NONE, PLTRST, NF1),
+
+ /* IMGCLKOUT_1 */
+ PAD_CFG_NF(GPP_E2, NONE, PLTRST, NF1),
+
/* WWAN_FCP_OFF_N */
PAD_CFG_GPO(GPP_E3, 1, PLTRST),
diff --git a/src/mainboard/intel/jasperlake_rvp/variants/jslrvp/include/variant/acpi/camera.asl b/src/mainboard/intel/jasperlake_rvp/variants/jslrvp/include/variant/acpi/camera.asl
new file mode 100644
index 0000000000..318b0dea04
--- /dev/null
+++ b/src/mainboard/intel/jasperlake_rvp/variants/jslrvp/include/variant/acpi/camera.asl
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <baseboard/acpi/camera.asl>