diff --git a/base/include/platform/arndale/drivers/board_base.h b/base/include/platform/arndale/drivers/board_base.h index 3ed8784f3..f25ed1fa3 100644 --- a/base/include/platform/arndale/drivers/board_base.h +++ b/base/include/platform/arndale/drivers/board_base.h @@ -56,6 +56,19 @@ namespace Genode MCT_CLOCK = 24000000, MCT_IRQ_L0 = 152, + /* USB */ + USB_HOST20_IRQ = 103, + USB_DRD30_IRQ = 104, + + /* SATA/AHCI */ + SATA_IRQ = 147, + + /* I2C */ + I2C_HDMI_IRQ = 96, + + /* SD card */ + SDMMC0_IRQ = 107, + /* CPU cache */ CACHE_LINE_SIZE_LOG2 = 6, diff --git a/dde_linux/src/lib/usb/arm/platform_arndale/platform.cc b/dde_linux/src/lib/usb/arm/platform_arndale/platform.cc index 53655875a..eb31001c3 100644 --- a/dde_linux/src/lib/usb/arm/platform_arndale/platform.cc +++ b/dde_linux/src/lib/usb/arm/platform_arndale/platform.cc @@ -12,6 +12,7 @@ */ /* Genode */ +#include #include #include #include @@ -35,8 +36,8 @@ enum { DWC3_BASE = 0x12000000, DWC3_PHY_BASE = 0x12100000, GPIO_BASE = 0x11400000, - EHCI_IRQ = 103, - DWC3_IRQ = 104, + EHCI_IRQ = Board_base::USB_HOST20_IRQ, + DWC3_IRQ = Board_base::USB_DRD30_IRQ, }; static resource _ehci[] = diff --git a/os/src/drivers/ahci/exynos5/ahci_driver.cc b/os/src/drivers/ahci/exynos5/ahci_driver.cc index 7806af319..faf3e7fa6 100644 --- a/os/src/drivers/ahci/exynos5/ahci_driver.cc +++ b/os/src/drivers/ahci/exynos5/ahci_driver.cc @@ -23,6 +23,7 @@ #include #include #include +#include using namespace Genode; @@ -920,7 +921,7 @@ struct Sata_ahci : Attached_mmio dbc_trials(50), dbc_stable_trials(5), p0_speed(SATA_3_MAX_SPEED), - p0_irq(147) + p0_irq(Genode::Board_base::SATA_IRQ) { } /** diff --git a/os/src/drivers/framebuffer/exynos5/driver.cc b/os/src/drivers/framebuffer/exynos5/driver.cc index 4e72d508b..f431e0aa5 100644 --- a/os/src/drivers/framebuffer/exynos5/driver.cc +++ b/os/src/drivers/framebuffer/exynos5/driver.cc @@ -19,6 +19,7 @@ #include #include #include +#include using namespace Genode; @@ -557,7 +558,8 @@ class I2c_hdmi : public I2c_interface /** * Constructor */ - I2c_hdmi() : I2c_interface(0x12ce0000, 96) { } + I2c_hdmi() + : I2c_interface(0x12ce0000, Genode::Board_base::I2C_HDMI_IRQ) { } /** * Stop HDMI PHY from operating diff --git a/os/src/drivers/sd_card/exynos5/dwmmc.h b/os/src/drivers/sd_card/exynos5/dwmmc.h index 907b7fd69..cf94df5f7 100644 --- a/os/src/drivers/sd_card/exynos5/dwmmc.h +++ b/os/src/drivers/sd_card/exynos5/dwmmc.h @@ -14,6 +14,7 @@ #ifndef _DWMMC_H_ #define _DWMMC_H_ +#include #include #include #include @@ -492,7 +493,7 @@ struct Exynos5_msh_controller : private Dwmmc, Sd_card::Host_controller public: - enum { IRQ_NUMBER = 107 }; + enum { IRQ_NUMBER = Genode::Board_base::SDMMC0_IRQ }; Exynos5_msh_controller(Genode::addr_t const mmio_base, Delayer &delayer, bool use_dma)