Skip to content

Commit ed0d9d3

Browse files
eilnjannau
eiln
authored and
jannau
committed
media: apple: isp: s/asc/coproc/
Signed-off-by: Eileen Yoon <eyn@gmx.com>
1 parent 983d606 commit ed0d9d3

4 files changed

Lines changed: 43 additions & 43 deletions

File tree

‎drivers/media/platform/apple/isp/isp-drv.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@ static int apple_isp_probe(struct platform_device *pdev)
155155
return err;
156156
}
157157

158-
isp->asc = devm_platform_ioremap_resource_byname(pdev, "asc");
159-
if (IS_ERR(isp->asc)) {
160-
err = PTR_ERR(isp->asc);
158+
isp->coproc = devm_platform_ioremap_resource_byname(pdev, "coproc");
159+
if (IS_ERR(isp->coproc)) {
160+
err = PTR_ERR(isp->coproc);
161161
goto detach_genpd;
162162
}
163163

‎drivers/media/platform/apple/isp/isp-drv.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ struct apple_isp {
180180

181181
int irq;
182182

183-
void __iomem *asc;
183+
void __iomem *coproc;
184184
void __iomem *mbox;
185185
void __iomem *gpio;
186186

‎drivers/media/platform/apple/isp/isp-fw.c‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@
99
#include "isp-ipc.h"
1010
#include "isp-regs.h"
1111

12-
#define ISP_FIRMWARE_MDELAY 1
13-
#define ISP_FIRMWARE_MAX_TRIES 1000
12+
#define ISP_FIRMWARE_MDELAY 1
13+
#define ISP_FIRMWARE_MAX_TRIES 1000
1414

15-
#define ISP_FIRMWARE_IPC_SIZE 0x1c000
16-
#define ISP_FIRMWARE_DATA_SIZE 0x28000
15+
#define ISP_FIRMWARE_IPC_SIZE 0x1c000
16+
#define ISP_FIRMWARE_DATA_SIZE 0x28000
1717

18-
static inline u32 isp_asc_read32(struct apple_isp *isp, u32 reg)
18+
static inline u32 isp_coproc_read32(struct apple_isp *isp, u32 reg)
1919
{
20-
return readl(isp->asc + reg);
20+
return readl(isp->coproc + reg);
2121
}
2222

23-
static inline void isp_asc_write32(struct apple_isp *isp, u32 reg, u32 val)
23+
static inline void isp_coproc_write32(struct apple_isp *isp, u32 reg, u32 val)
2424
{
25-
writel(val, isp->asc + reg);
25+
writel(val, isp->coproc + reg);
2626
}
2727

2828
static inline u32 isp_gpio_read32(struct apple_isp *isp, u32 reg)
@@ -129,22 +129,22 @@ static int isp_coproc_ready(struct apple_isp *isp)
129129
int retries;
130130
u32 status;
131131

132-
isp_asc_write32(isp, ISP_ASC_EDPRCR, 0x2);
132+
isp_coproc_write32(isp, ISP_COPROC_EDPRCR, 0x2);
133133

134-
isp_asc_write32(isp, ISP_ASC_PMGR_0, 0xff00ff);
135-
isp_asc_write32(isp, ISP_ASC_PMGR_1, 0xff00ff);
136-
isp_asc_write32(isp, ISP_ASC_PMGR_2, 0xff00ff);
137-
isp_asc_write32(isp, ISP_ASC_PMGR_3, 0xff00ff);
134+
isp_coproc_write32(isp, ISP_COPROC_PMGR_0, 0xff00ff);
135+
isp_coproc_write32(isp, ISP_COPROC_PMGR_1, 0xff00ff);
136+
isp_coproc_write32(isp, ISP_COPROC_PMGR_2, 0xff00ff);
137+
isp_coproc_write32(isp, ISP_COPROC_PMGR_3, 0xff00ff);
138138

139-
isp_asc_write32(isp, ISP_ASC_IRQ_MASK_0, 0xffffffff);
140-
isp_asc_write32(isp, ISP_ASC_IRQ_MASK_1, 0xffffffff);
141-
isp_asc_write32(isp, ISP_ASC_IRQ_MASK_2, 0xffffffff);
142-
isp_asc_write32(isp, ISP_ASC_IRQ_MASK_3, 0xffffffff);
143-
isp_asc_write32(isp, ISP_ASC_IRQ_MASK_4, 0xffffffff);
144-
isp_asc_write32(isp, ISP_ASC_IRQ_MASK_5, 0xffffffff);
139+
isp_coproc_write32(isp, ISP_COPROC_IRQ_MASK_0, 0xffffffff);
140+
isp_coproc_write32(isp, ISP_COPROC_IRQ_MASK_1, 0xffffffff);
141+
isp_coproc_write32(isp, ISP_COPROC_IRQ_MASK_2, 0xffffffff);
142+
isp_coproc_write32(isp, ISP_COPROC_IRQ_MASK_3, 0xffffffff);
143+
isp_coproc_write32(isp, ISP_COPROC_IRQ_MASK_4, 0xffffffff);
144+
isp_coproc_write32(isp, ISP_COPROC_IRQ_MASK_5, 0xffffffff);
145145

146146
for (retries = 0; retries < ISP_FIRMWARE_MAX_TRIES; retries++) {
147-
status = isp_asc_read32(isp, ISP_ASC_STATUS);
147+
status = isp_coproc_read32(isp, ISP_COPROC_STATUS);
148148
if (!((status & 0x3) == 0)) {
149149
isp_dbg(isp, "%d: coproc in WFI (status: 0x%x)\n",
150150
retries, status);
@@ -162,7 +162,7 @@ static int isp_coproc_ready(struct apple_isp *isp)
162162

163163
static void isp_firmware_shutdown_stage1(struct apple_isp *isp)
164164
{
165-
isp_asc_write32(isp, ISP_ASC_CONTROL, 0x0);
165+
isp_coproc_write32(isp, ISP_COPROC_CONTROL, 0x0);
166166
}
167167

168168
static int isp_firmware_boot_stage1(struct apple_isp *isp)
@@ -186,8 +186,8 @@ static int isp_firmware_boot_stage1(struct apple_isp *isp)
186186

187187
isp_mbox_write32(isp, ISP_MBOX_IRQ_ENABLE, 0x0);
188188

189-
isp_asc_write32(isp, ISP_ASC_CONTROL, 0x0);
190-
isp_asc_write32(isp, ISP_ASC_CONTROL, 0x10);
189+
isp_coproc_write32(isp, ISP_COPROC_CONTROL, 0x0);
190+
isp_coproc_write32(isp, ISP_COPROC_CONTROL, 0x10);
191191

192192
/* Wait for ISP_GPIO_7 to 0x0 -> 0x8042006 */
193193
isp_gpio_write32(isp, ISP_GPIO_7, 0x0);

‎drivers/media/platform/apple/isp/isp-regs.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66

77
#include "isp-drv.h"
88

9-
#define ISP_ASC_PMGR_0 0x738
10-
#define ISP_ASC_PMGR_1 0x798
11-
#define ISP_ASC_PMGR_2 0x7f8
12-
#define ISP_ASC_PMGR_3 0x858
13-
14-
#define ISP_ASC_RVBAR 0x1050000
15-
#define ISP_ASC_EDPRCR 0x1010310
16-
#define ISP_ASC_CONTROL 0x1400044
17-
#define ISP_ASC_STATUS 0x1400048
18-
19-
#define ISP_ASC_IRQ_MASK_0 0x1400a00
20-
#define ISP_ASC_IRQ_MASK_1 0x1400a04
21-
#define ISP_ASC_IRQ_MASK_2 0x1400a08
22-
#define ISP_ASC_IRQ_MASK_3 0x1400a0c
23-
#define ISP_ASC_IRQ_MASK_4 0x1400a10
24-
#define ISP_ASC_IRQ_MASK_5 0x1400a14
9+
#define ISP_COPROC_PMGR_0 0x738
10+
#define ISP_COPROC_PMGR_1 0x798
11+
#define ISP_COPROC_PMGR_2 0x7f8
12+
#define ISP_COPROC_PMGR_3 0x858
13+
14+
#define ISP_COPROC_RVBAR 0x1050000
15+
#define ISP_COPROC_EDPRCR 0x1010310
16+
#define ISP_COPROC_CONTROL 0x1400044
17+
#define ISP_COPROC_STATUS 0x1400048
18+
19+
#define ISP_COPROC_IRQ_MASK_0 0x1400a00
20+
#define ISP_COPROC_IRQ_MASK_1 0x1400a04
21+
#define ISP_COPROC_IRQ_MASK_2 0x1400a08
22+
#define ISP_COPROC_IRQ_MASK_3 0x1400a0c
23+
#define ISP_COPROC_IRQ_MASK_4 0x1400a10
24+
#define ISP_COPROC_IRQ_MASK_5 0x1400a14
2525

2626
#define ISP_MBOX_IRQ_INTERRUPT 0x000
2727
#define ISP_MBOX_IRQ_ENABLE 0x004

0 commit comments

Comments
 (0)