Skip to content

Commit 5f55dd5

Browse files
andy-shevmchehab
authored andcommitted
media: atomisp: move CCK endpoint address to generic header
IOSF MBI header contains a lot of definitions, such as end point addresses of IPs. Move CCK address from AtomISP driver to generic header. While here, drop unused one. Signed-off-by: Andy Shevchenko <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent e651cc3 commit 5f55dd5

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

arch/x86/include/asm/iosf_mbi.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#define BT_MBI_UNIT_PMC 0x04
4040
#define BT_MBI_UNIT_GFX 0x06
4141
#define BT_MBI_UNIT_SMI 0x0C
42+
#define BT_MBI_UNIT_CCK 0x14
4243
#define BT_MBI_UNIT_USB 0x43
4344
#define BT_MBI_UNIT_SATA 0xA3
4445
#define BT_MBI_UNIT_PCIE 0xA6

drivers/staging/media/atomisp/pci/atomisp-regs.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
#define ATOMISP_REGS_H
2121

2222
/* common register definitions */
23-
#define PUNIT_PORT 0x04
24-
#define CCK_PORT 0x14
25-
2623
#define PCICMDSTS 0x01
2724
#define INTR 0x0f
2825
#define MSI_CAPID 0x24

drivers/staging/media/atomisp/pci/atomisp_v4l2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1687,7 +1687,7 @@ static int atomisp_pci_probe(struct pci_dev *dev,
16871687
isp->dfs = &dfs_config_cht;
16881688
isp->pdev->d3cold_delay = 0;
16891689

1690-
iosf_mbi_read(CCK_PORT, MBI_REG_READ, CCK_FUSE_REG_0, &val);
1690+
iosf_mbi_read(BT_MBI_UNIT_CCK, MBI_REG_READ, CCK_FUSE_REG_0, &val);
16911691
switch (val & CCK_FUSE_HPLL_FREQ_MASK) {
16921692
case 0x00:
16931693
isp->hpll_freq = HPLL_FREQ_800MHZ;

0 commit comments

Comments
 (0)