Re: [U-Boot] [PATCH v2 4/8] x86: quark: Prepare device.h for inclusion by ASL

[Bin Meng]

On Thu, May 26, 2016 at 10:19 AM, Bin Meng  wrote:
> There is a device.h for quark on-chip devices, mainly for definitions
> of internal PCI device numbers, but it's not ready to be included by
> ASL files. Update to use hex numbers for PCI dev and __ASSEMBLY__.
>
> Signed-off-by: Bin Meng 
> Reviewed-by: Simon Glass 
>
> ---
>
> Changes in v2:
> - Use __ASSEMBLY__ in device.h
>
>  arch/x86/include/asm/arch-quark/device.h | 21 +++--
>  1 file changed, 15 insertions(+), 6 deletions(-)
>

applied to u-boot-x86, thanks!
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH v2 4/8] x86: quark: Prepare device.h for inclusion by ASL

[Bin Meng]

There is a device.h for quark on-chip devices, mainly for definitions
of internal PCI device numbers, but it's not ready to be included by
ASL files. Update to use hex numbers for PCI dev and __ASSEMBLY__.

Signed-off-by: Bin Meng 
Reviewed-by: Simon Glass 

---

Changes in v2:
- Use __ASSEMBLY__ in device.h

 arch/x86/include/asm/arch-quark/device.h | 21 +++--
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/arch/x86/include/asm/arch-quark/device.h 
b/arch/x86/include/asm/arch-quark/device.h
index 7882f33..4760aa2 100644
--- a/arch/x86/include/asm/arch-quark/device.h
+++ b/arch/x86/include/asm/arch-quark/device.h
@@ -7,12 +7,17 @@
 #ifndef _QUARK_DEVICE_H_
 #define _QUARK_DEVICE_H_
 
-#include 
+/*
+ * Internal PCI device numbers within the SoC.
+ *
+ * Note it must start with 0x_ prefix, as the device number macro will be
+ * included in the ACPI ASL files (see irq_helper.h and irq_route.h).
+ */
 
-#define QUARK_HOST_BRIDGE_DEV  0
+#define QUARK_HOST_BRIDGE_DEV  0x00
 #define QUARK_HOST_BRIDGE_FUNC 0
 
-#define QUARK_DEV_20   20
+#define QUARK_DEV_20   0x14
 #define QUARK_MMC_SDIO_FUNC0
 #define QUARK_UART0_FUNC   1
 #define QUARK_USB_DEVICE_FUNC  2
@@ -22,18 +27,21 @@
 #define QUARK_EMAC0_FUNC   6
 #define QUARK_EMAC1_FUNC   7
 
-#define QUARK_DEV_21   21
+#define QUARK_DEV_21   0x15
 #define QUARK_SPI0_FUNC0
 #define QUARK_SPI1_FUNC1
 #define QUARK_I2C_GPIO_FUNC2
 
-#define QUARK_DEV_23   23
+#define QUARK_DEV_23   0x17
 #define QUARK_PCIE0_FUNC   0
 #define QUARK_PCIE1_FUNC   1
 
-#define QUARK_LGC_BRIDGE_DEV   31
+#define QUARK_LGC_BRIDGE_DEV   0x1f
 #define QUARK_LGC_BRIDGE_FUNC  0
 
+#ifndef __ASSEMBLY__
+#include 
+
 #define QUARK_HOST_BRIDGE  \
PCI_BDF(0, QUARK_HOST_BRIDGE_DEV, QUARK_HOST_BRIDGE_FUNC)
 #define QUARK_MMC_SDIO \
@@ -64,5 +72,6 @@
PCI_BDF(0, QUARK_DEV_23, QUARK_PCIE1_FUNC)
 #define QUARK_LEGACY_BRIDGE\
PCI_BDF(0, QUARK_LGC_BRIDGE_DEV, QUARK_LGC_BRIDGE_FUNC)
+#endif /* __ASSEMBLY__ */
 
 #endif /* _QUARK_DEVICE_H_ */
-- 
1.8.2.1

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot