Skip to content

L
linux
Commit ba2dfe24 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds
Browse files
Options

[PATCH] kyro iomem annotations 

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b1be8f75
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
drivers/video/kyro/STG4000InitDevice.c
View file @ ba2dfe24
...@@ -79,7 +79,7 @@ volatile u32 i,count=0; \ ...@@ -79,7 +79,7 @@ volatile u32 i,count=0; \
for(i=0;i<X;i++) count++; \ for(i=0;i<X;i++) count++; \
} }
u32 InitSDRAMRegisters(volatile STG4000REG * pSTGReg, u32 dwSubSysID, u32 InitSDRAMRegisters(volatile STG4000REG __iomem *pSTGReg, u32 dwSubSysID,
u32 dwRevID) u32 dwRevID)
{ {
u32 adwSDRAMArgCfg0[] = { 0xa0, 0x80, 0xa0, 0xa0, 0xa0 }; u32 adwSDRAMArgCfg0[] = { 0xa0, 0x80, 0xa0, 0xa0, 0xa0 };
...@@ -239,7 +239,7 @@ u32 ProgramClock(u32 refClock, ...@@ -239,7 +239,7 @@ u32 ProgramClock(u32 refClock,
return (ulBestClk); return (ulBestClk);
} }
int SetCoreClockPLL(volatile STG4000REG * pSTGReg, struct pci_dev *pDev) int SetCoreClockPLL(volatile STG4000REG __iomem *pSTGReg, struct pci_dev *pDev)
{ {
u32 F, R, P; u32 F, R, P;
u16 core_pll = 0, sub; u16 core_pll = 0, sub;
......
drivers/video/kyro/STG4000Interface.h
View file @ ba2dfe24
...@@ -16,45 +16,45 @@ struct pci_dev; ...@@ -16,45 +16,45 @@ struct pci_dev;
/* /*
* Ramdac Setup * Ramdac Setup
*/ */
extern int InitialiseRamdac(volatile STG4000REG *pSTGReg, u32 displayDepth, extern int InitialiseRamdac(volatile STG4000REG __iomem *pSTGReg, u32 displayDepth,
u32 displayWidth, u32 displayHeight, u32 displayWidth, u32 displayHeight,
s32 HSyncPolarity, s32 VSyncPolarity, s32 HSyncPolarity, s32 VSyncPolarity,
u32 *pixelClock); u32 *pixelClock);
extern void DisableRamdacOutput(volatile STG4000REG * pSTGReg); extern void DisableRamdacOutput(volatile STG4000REG __iomem *pSTGReg);
extern void EnableRamdacOutput(volatile STG4000REG * pSTGReg); extern void EnableRamdacOutput(volatile STG4000REG __iomem *pSTGReg);
/* /*
* Timing generator setup * Timing generator setup
*/ */
extern void DisableVGA(volatile STG4000REG * pSTGReg); extern void DisableVGA(volatile STG4000REG __iomem *pSTGReg);
extern void StopVTG(volatile STG4000REG * pSTGReg); extern void StopVTG(volatile STG4000REG __iomem *pSTGReg);
extern void StartVTG(volatile STG4000REG * pSTGReg); extern void StartVTG(volatile STG4000REG __iomem *pSTGReg);
extern void SetupVTG(volatile STG4000REG * pSTGReg, extern void SetupVTG(volatile STG4000REG __iomem *pSTGReg,
const struct kyrofb_info * pTiming); const struct kyrofb_info * pTiming);
extern u32 ProgramClock(u32 refClock, u32 coreClock, u32 *FOut, u32 *ROut, u32 *POut); extern u32 ProgramClock(u32 refClock, u32 coreClock, u32 *FOut, u32 *ROut, u32 *POut);
extern int SetCoreClockPLL(volatile STG4000REG * pSTGReg, struct pci_dev *pDev); extern int SetCoreClockPLL(volatile STG4000REG __iomem *pSTGReg, struct pci_dev *pDev);
/* /*
* Overlay setup * Overlay setup
*/ */
extern void ResetOverlayRegisters(volatile STG4000REG * pSTGReg); extern void ResetOverlayRegisters(volatile STG4000REG __iomem *pSTGReg);
extern int CreateOverlaySurface(volatile STG4000REG * pSTGReg, extern int CreateOverlaySurface(volatile STG4000REG __iomem *pSTGReg,
u32 ulWidth, u32 ulHeight, u32 ulWidth, u32 ulHeight,
int bLinear, int bLinear,
u32 ulOverlayOffset, u32 ulOverlayOffset,
u32 * retStride, u32 * retUVStride); u32 * retStride, u32 * retUVStride);
extern int SetOverlayBlendMode(volatile STG4000REG * pSTGReg, extern int SetOverlayBlendMode(volatile STG4000REG __iomem *pSTGReg,
OVRL_BLEND_MODE mode, OVRL_BLEND_MODE mode,
u32 ulAlpha, u32 ulColorKey); u32 ulAlpha, u32 ulColorKey);
extern int SetOverlayViewPort(volatile STG4000REG * pSTGReg, extern int SetOverlayViewPort(volatile STG4000REG __iomem *pSTGReg,
u32 left, u32 top, u32 left, u32 top,
u32 right, u32 bottom); u32 right, u32 bottom);
extern void EnableOverlayPlane(volatile STG4000REG * pSTGReg); extern void EnableOverlayPlane(volatile STG4000REG __iomem *pSTGReg);
#endif /* _STG4000INTERFACE_H */ #endif /* _STG4000INTERFACE_H */
drivers/video/kyro/STG4000OverlayDevice.c
View file @ ba2dfe24
...@@ -75,7 +75,7 @@ typedef struct _OVRL_SRC_DEST { ...@@ -75,7 +75,7 @@ typedef struct _OVRL_SRC_DEST {
static u32 ovlWidth, ovlHeight, ovlStride; static u32 ovlWidth, ovlHeight, ovlStride;
static int ovlLinear; static int ovlLinear;
void ResetOverlayRegisters(volatile STG4000REG * pSTGReg) void ResetOverlayRegisters(volatile STG4000REG __iomem *pSTGReg)
{ {
u32 tmp; u32 tmp;
...@@ -136,7 +136,7 @@ void ResetOverlayRegisters(volatile STG4000REG * pSTGReg) ...@@ -136,7 +136,7 @@ void ResetOverlayRegisters(volatile STG4000REG * pSTGReg)
} }
int CreateOverlaySurface(volatile STG4000REG * pSTGReg, int CreateOverlaySurface(volatile STG4000REG __iomem *pSTGReg,
u32 inWidth, u32 inWidth,
u32 inHeight, u32 inHeight,
int bLinear, int bLinear,
...@@ -238,7 +238,7 @@ int CreateOverlaySurface(volatile STG4000REG * pSTGReg, ...@@ -238,7 +238,7 @@ int CreateOverlaySurface(volatile STG4000REG * pSTGReg,
return 0; return 0;
} }
int SetOverlayBlendMode(volatile STG4000REG * pSTGReg, int SetOverlayBlendMode(volatile STG4000REG __iomem *pSTGReg,
OVRL_BLEND_MODE mode, OVRL_BLEND_MODE mode,
u32 ulAlpha, u32 ulColorKey) u32 ulAlpha, u32 ulColorKey)
{ {
...@@ -284,7 +284,7 @@ int SetOverlayBlendMode(volatile STG4000REG * pSTGReg, ...@@ -284,7 +284,7 @@ int SetOverlayBlendMode(volatile STG4000REG * pSTGReg,
return 0; return 0;
} }
void EnableOverlayPlane(volatile STG4000REG * pSTGReg) void EnableOverlayPlane(volatile STG4000REG __iomem *pSTGReg)
{ {
u32 tmp; u32 tmp;
/* Enable Overlay */ /* Enable Overlay */
...@@ -313,7 +313,7 @@ static u32 Overlap(u32 ulBits, u32 ulPattern) ...@@ -313,7 +313,7 @@ static u32 Overlap(u32 ulBits, u32 ulPattern)
} }
int SetOverlayViewPort(volatile STG4000REG * pSTGReg, int SetOverlayViewPort(volatile STG4000REG __iomem *pSTGReg,
u32 left, u32 top, u32 left, u32 top,
u32 right, u32 bottom) u32 right, u32 bottom)
{ {
......
drivers/video/kyro/STG4000Ramdac.c
View file @ ba2dfe24
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
static u32 STG_PIXEL_BUS_WIDTH = 128; /* 128 bit bus width */ static u32 STG_PIXEL_BUS_WIDTH = 128; /* 128 bit bus width */
static u32 REF_CLOCK = 14318; static u32 REF_CLOCK = 14318;
STG4000REG *pSTGReg; STG4000REG __iomem *pSTGReg;
int InitialiseRamdac(volatile STG4000REG * pSTGReg, int InitialiseRamdac(volatile STG4000REG __iomem * pSTGReg,
u32 displayDepth, u32 displayDepth,
u32 displayWidth, u32 displayWidth,
u32 displayHeight, u32 displayHeight,
...@@ -145,7 +145,7 @@ int InitialiseRamdac(volatile STG4000REG * pSTGReg, ...@@ -145,7 +145,7 @@ int InitialiseRamdac(volatile STG4000REG * pSTGReg,
} }
/* Ramdac control, turning output to the screen on and off */ /* Ramdac control, turning output to the screen on and off */
void DisableRamdacOutput(volatile STG4000REG * pSTGReg) void DisableRamdacOutput(volatile STG4000REG __iomem * pSTGReg)
{ {
u32 tmp; u32 tmp;
...@@ -154,7 +154,7 @@ void DisableRamdacOutput(volatile STG4000REG * pSTGReg) ...@@ -154,7 +154,7 @@ void DisableRamdacOutput(volatile STG4000REG * pSTGReg)
STG_WRITE_REG(DACStreamCtrl, tmp); STG_WRITE_REG(DACStreamCtrl, tmp);
} }
void EnableRamdacOutput(volatile STG4000REG * pSTGReg) void EnableRamdacOutput(volatile STG4000REG __iomem * pSTGReg)
{ {
u32 tmp; u32 tmp;
......
drivers/video/kyro/STG4000Reg.h
View file @ ba2dfe24
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#if defined(__KERNEL__) #if defined(__KERNEL__)
#include <asm/page.h> #include <asm/page.h>
#include <asm/io.h> #include <asm/io.h>
#define STG_WRITE_REG(reg,data) (writel(data,(unsigned long)&pSTGReg->reg)) #define STG_WRITE_REG(reg,data) (writel(data,&pSTGReg->reg))
#define STG_READ_REG(reg) (readl((unsigned long)&pSTGReg->reg)) #define STG_READ_REG(reg) (readl(&pSTGReg->reg))
#else #else
#define STG_WRITE_REG(reg,data) (pSTGReg->reg = data) #define STG_WRITE_REG(reg,data) (pSTGReg->reg = data)
#define STG_READ_REG(reg) (pSTGReg->reg) #define STG_READ_REG(reg) (pSTGReg->reg)
......
drivers/video/kyro/STG4000VTG.c
View file @ ba2dfe24
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include "STG4000Reg.h" #include "STG4000Reg.h"
#include "STG4000Interface.h" #include "STG4000Interface.h"
void DisableVGA(volatile STG4000REG * pSTGReg) void DisableVGA(volatile STG4000REG __iomem *pSTGReg)
{ {
u32 tmp; u32 tmp;
volatile u32 count, i; volatile u32 count, i;
...@@ -35,7 +35,7 @@ void DisableVGA(volatile STG4000REG * pSTGReg) ...@@ -35,7 +35,7 @@ void DisableVGA(volatile STG4000REG * pSTGReg)
STG_WRITE_REG(SoftwareReset, tmp); STG_WRITE_REG(SoftwareReset, tmp);
} }
void StopVTG(volatile STG4000REG * pSTGReg) void StopVTG(volatile STG4000REG __iomem *pSTGReg)
{ {
u32 tmp = 0; u32 tmp = 0;
...@@ -45,7 +45,7 @@ void StopVTG(volatile STG4000REG * pSTGReg) ...@@ -45,7 +45,7 @@ void StopVTG(volatile STG4000REG * pSTGReg)
STG_WRITE_REG(DACSyncCtrl, tmp); STG_WRITE_REG(DACSyncCtrl, tmp);
} }
void StartVTG(volatile STG4000REG * pSTGReg) void StartVTG(volatile STG4000REG __iomem *pSTGReg)
{ {
u32 tmp = 0; u32 tmp = 0;
...@@ -56,7 +56,7 @@ void StartVTG(volatile STG4000REG * pSTGReg) ...@@ -56,7 +56,7 @@ void StartVTG(volatile STG4000REG * pSTGReg)
STG_WRITE_REG(DACSyncCtrl, tmp); STG_WRITE_REG(DACSyncCtrl, tmp);
} }
void SetupVTG(volatile STG4000REG * pSTGReg, void SetupVTG(volatile STG4000REG __iomem *pSTGReg,
const struct kyrofb_info * pTiming) const struct kyrofb_info * pTiming)
{ {
u32 tmp = 0; u32 tmp = 0;
......
drivers/video/kyro/fbdev.c
View file @ ba2dfe24
...@@ -76,7 +76,7 @@ static struct fb_var_screeninfo kyro_var __initdata = { ...@@ -76,7 +76,7 @@ static struct fb_var_screeninfo kyro_var __initdata = {
static struct kyrofb_info *currentpar; static struct kyrofb_info *currentpar;
typedef struct { typedef struct {
STG4000REG *pSTGReg; /* Virtual address of PCI register region */ STG4000REG __iomem *pSTGReg; /* Virtual address of PCI register region */
u32 ulNextFreeVidMem; /* Offset from start of vid mem to next free region */ u32 ulNextFreeVidMem; /* Offset from start of vid mem to next free region */
u32 ulOverlayOffset; /* Offset from start of vid mem to overlay */ u32 ulOverlayOffset; /* Offset from start of vid mem to overlay */
u32 ulOverlayStride; /* Interleaved YUV and 422 mode Y stride */ u32 ulOverlayStride; /* Interleaved YUV and 422 mode Y stride */
......
include/video/kyro.h
View file @ ba2dfe24
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#define _KYRO_H #define _KYRO_H
struct kyrofb_info { struct kyrofb_info {
void *regbase; void __iomem *regbase;
u32 HTot; /* Hor Total Time */ u32 HTot; /* Hor Total Time */
u32 HFP; /* Hor Front Porch */ u32 HFP; /* Hor Front Porch */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7