Merge tag 'dm-pull-28jun22' of https://source.denx.de/u-boot/custodians/u-boot-dm...

[platform/kernel/u-boot.git] / include / p2sb.h

diff --git a/include/p2sb.h b/include/p2sb.h
index 93e1155..00acc8d 100644 (file)
--- a/include/p2sb.h
+++ b/include/p2sb.h
@@ -10,12 +10,18 @@
 /* Port Id lives in bits 23:16 and register offset lives in 15:0 of address */
 #define PCR_PORTID_SHIFT       16
 
+#if !defined(__ACPI__)
+
+/* These registers contain IOAPIC and HPET devfn */
+#define PCH_P2SB_IBDF          0x6c
+#define PCH_P2SB_HBDF          0x70
+
 /**
- * struct p2sb_child_platdata - Information about each child of a p2sb device
+ * struct p2sb_child_plat - Information about each child of a p2sb device
  *
  * @pid: Port ID for this child
  */
-struct p2sb_child_platdata {
+struct p2sb_child_plat {
        uint pid;
 };
 
@@ -57,7 +63,7 @@ struct p2sb_ops {
  *
  * @dev: P2SB device
  * @hide: true to hide the device, false to show it
- * @return 0 if OK, -ve on error
+ * Return: 0 if OK, -ve on error
  */
 int p2sb_set_hide(struct udevice *dev, bool hide);
 
@@ -68,7 +74,7 @@ int p2sb_set_hide(struct udevice *dev, bool hide);
  *
  * @dev: Device to read from
  * @offset: Offset within device to read
- * @return value read
+ * Return: value read
  */
 uint pcr_read32(struct udevice *dev, uint offset);
 uint pcr_read16(struct udevice *dev, uint offset);
@@ -143,7 +149,7 @@ static inline void pcr_clrbits8(struct udevice *dev, uint offset, uint clr)
  *
  * @dev: Child device (whose parent is UCLASS_P2SB)
  * @portid: Port ID of child device
- * @return 0 if OK, -ENODEV is the p2sb device could not be found
+ * Return: 0 if OK, -ENODEV is the p2sb device could not be found
  */
 int p2sb_set_port_id(struct udevice *dev, int portid);
 
@@ -151,7 +157,7 @@ int p2sb_set_port_id(struct udevice *dev, int portid);
  * p2sb_get_port_id() - Get the port ID for a p2sb child device
  *
  * @dev: Child device (whose parent is UCLASS_P2SB)
- * @return Port ID of that child
+ * Return: Port ID of that child
  */
 int p2sb_get_port_id(struct udevice *dev);
 
@@ -160,8 +166,10 @@ int p2sb_get_port_id(struct udevice *dev);
  *
  * @dev: Child device (whose parent is UCLASS_P2SB)
  * @offset: Offset within that child's address space
- * @return pointer to that offset within the child's address space
+ * Return: pointer to that offset within the child's address space
  */
 void *pcr_reg_address(struct udevice *dev, uint offset);
 
+#endif /* !__ACPI__ */
+
 #endif