X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Famazon%2Ffiles%2Finclude%2Fasm-mips%2Famazon%2Famazon.h;h=28af7f59d2d2a15e27a9c02b7155d29259cbb9d1;hb=90a8f2c1e49b84df6f95bad4cb25bea9962742dd;hp=d28bb418f1095441fb2b7f087c3f1c1d68fefce8;hpb=17c7b6c3fdc48301e50d22cc6138ede16bd1be24;p=openwrt.git diff --git a/target/linux/amazon/files/include/asm-mips/amazon/amazon.h b/target/linux/amazon/files/include/asm-mips/amazon/amazon.h index d28bb418f1..28af7f59d2 100644 --- a/target/linux/amazon/files/include/asm-mips/amazon/amazon.h +++ b/target/linux/amazon/files/include/asm-mips/amazon/amazon.h @@ -25,9 +25,16 @@ other party has been advised of the possibility of such damages. ******************************************************************************/ -#define amazon_readl(a) readl(((u32*)(a))) -#define amazon_writel(a,b) writel(a, ((u32*)(b))) -#define amazon_writel_masked(a,b,c) writel((readl(((u32*)(a))) & ~b) | (c & b), ((u32*)(a))) +#define amazon_readl(a) __raw_readl(((u32*)(a))) +#define amazon_writel(a,b) __raw_writel(a, ((u32*)(b))) +#define amazon_writel_masked(a,b,c) __raw_writel((__raw_readl(((u32*)(a))) & ~b) | (c & b), ((u32*)(a))) + +unsigned int amazon_get_fpi_hz(void); + +#define IOPORT_RESOURCE_START 0x10000000 +#define IOPORT_RESOURCE_END 0xffffffff +#define IOMEM_RESOURCE_START 0x10000000 +#define IOMEM_RESOURCE_END 0xffffffff /* check ADSL link status */ #define AMAZON_CHECK_LINK @@ -999,10 +1006,10 @@ If set and clear bit are written concurrently with 1, the associated bit is not #define AMAZON_DMA_H_MASK 0x00000fff /***External Interrupt Control Register***/ -#define AMAZON_ICU_EXTINTCR (AMAZON_ICU + 0x0000) -#define AMAZON_ICU_IRNICR (AMAZON_ICU + 0x0004) -#define AMAZON_ICU_IRNCR (AMAZON_ICU + 0x0008) -#define AMAZON_ICU_IRNEN (AMAZON_ICU + 0x000c) +#define AMAZON_ICU_EXTINTCR ((volatile u32*)(AMAZON_ICU + 0x0000)) +#define AMAZON_ICU_IRNICR ((volatile u32*)(AMAZON_ICU + 0x0004)) +#define AMAZON_ICU_IRNCR ((volatile u32*)(AMAZON_ICU + 0x0008)) +#define AMAZON_ICU_IRNEN ((volatile u32*)(AMAZON_ICU + 0x000c)) /***********************************************************************/ /* Module : PCI/Card-BUS/PC-Card register address and bits */