diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2010-11-10 12:11:35 -0600 |
|---|---|---|
| committer | Omar Ramirez Luna <omar.ramirez@ti.com> | 2010-11-10 18:34:43 -0600 |
| commit | 58c1ceb156df5a005f7fc9afc75064a2c1df4b65 (patch) | |
| tree | 0637065ff695440b7087c0d0139cd32b0d181775 /drivers/staging/tidspbridge/core | |
| parent | f5bd96bbe320b9fe1c8132a1633e8582cd9d6245 (diff) | |
| download | kernel_samsung_smdk4412-58c1ceb156df5a005f7fc9afc75064a2c1df4b65.zip kernel_samsung_smdk4412-58c1ceb156df5a005f7fc9afc75064a2c1df4b65.tar.gz kernel_samsung_smdk4412-58c1ceb156df5a005f7fc9afc75064a2c1df4b65.tar.bz2 | |
Revert "staging: tidspbridge - remove hw directory"
This reverts commit 053fdb85f56e84bff64a65601be7f72608f016da.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
Diffstat (limited to 'drivers/staging/tidspbridge/core')
| -rw-r--r-- | drivers/staging/tidspbridge/core/_tiomap.h | 1 | ||||
| -rw-r--r-- | drivers/staging/tidspbridge/core/io_sm.c | 4 | ||||
| -rw-r--r-- | drivers/staging/tidspbridge/core/tiomap3430.c | 4 | ||||
| -rw-r--r-- | drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 4 | ||||
| -rw-r--r-- | drivers/staging/tidspbridge/core/tiomap_io.c | 2 |
5 files changed, 14 insertions, 1 deletions
diff --git a/drivers/staging/tidspbridge/core/_tiomap.h b/drivers/staging/tidspbridge/core/_tiomap.h index cd7ff88..394a64a 100644 --- a/drivers/staging/tidspbridge/core/_tiomap.h +++ b/drivers/staging/tidspbridge/core/_tiomap.h @@ -26,6 +26,7 @@ #include <plat/iommu.h> #include <plat/iovmm.h> #include <dspbridge/devdefs.h> +#include <hw_defs.h> #include <dspbridge/dspioctl.h> /* for bridge_ioctl_extproc defn */ #include <dspbridge/sync.h> #include <dspbridge/clk.h> diff --git a/drivers/staging/tidspbridge/core/io_sm.c b/drivers/staging/tidspbridge/core/io_sm.c index 194bada..56856ad 100644 --- a/drivers/staging/tidspbridge/core/io_sm.c +++ b/drivers/staging/tidspbridge/core/io_sm.c @@ -39,6 +39,10 @@ #include <dspbridge/ntfy.h> #include <dspbridge/sync.h> +/* Hardware Abstraction Layer */ +#include <hw_defs.h> +#include <hw_mmu.h> + /* Bridge Driver */ #include <dspbridge/dspdeh.h> #include <dspbridge/dspio.h> diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c index 984a35a..b68050a 100644 --- a/drivers/staging/tidspbridge/core/tiomap3430.c +++ b/drivers/staging/tidspbridge/core/tiomap3430.c @@ -34,6 +34,10 @@ #include <dspbridge/drv.h> #include <dspbridge/sync.h> +/* ------------------------------------ Hardware Abstraction Layer */ +#include <hw_defs.h> +#include <hw_mmu.h> + /* ----------------------------------- Link Driver */ #include <dspbridge/dspdefs.h> #include <dspbridge/dspchnl.h> diff --git a/drivers/staging/tidspbridge/core/tiomap3430_pwr.c b/drivers/staging/tidspbridge/core/tiomap3430_pwr.c index b57a9fd..fb9026e 100644 --- a/drivers/staging/tidspbridge/core/tiomap3430_pwr.c +++ b/drivers/staging/tidspbridge/core/tiomap3430_pwr.c @@ -31,6 +31,10 @@ #include <dspbridge/dev.h> #include <dspbridge/iodefs.h> +/* ------------------------------------ Hardware Abstraction Layer */ +#include <hw_defs.h> +#include <hw_mmu.h> + #include <dspbridge/pwr_sh.h> /* ----------------------------------- Bridge Driver */ diff --git a/drivers/staging/tidspbridge/core/tiomap_io.c b/drivers/staging/tidspbridge/core/tiomap_io.c index b526532..5ba6795 100644 --- a/drivers/staging/tidspbridge/core/tiomap_io.c +++ b/drivers/staging/tidspbridge/core/tiomap_io.c @@ -143,7 +143,7 @@ int read_ext_dsp_data(struct bridge_dev_context *dev_ctxt, ul_shm_base_virt - ul_tlb_base_virt; ul_shm_offset_virt += PG_ALIGN_HIGH(ul_ext_end - ul_dyn_ext_base + - 1, PAGE_SIZE * 16); + 1, HW_PAGE_SIZE64KB); dw_ext_prog_virt_mem -= ul_shm_offset_virt; dw_ext_prog_virt_mem += (ul_ext_base - ul_dyn_ext_base); |