Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

authored by

Andy Shevchenko and committed by
Mauro Carvalho Chehab
5f55dd54 e651cc38

+2 -4
+1
arch/x86/include/asm/iosf_mbi.h
··· 39 39 #define BT_MBI_UNIT_PMC 0x04 40 40 #define BT_MBI_UNIT_GFX 0x06 41 41 #define BT_MBI_UNIT_SMI 0x0C 42 + #define BT_MBI_UNIT_CCK 0x14 42 43 #define BT_MBI_UNIT_USB 0x43 43 44 #define BT_MBI_UNIT_SATA 0xA3 44 45 #define BT_MBI_UNIT_PCIE 0xA6
-3
drivers/staging/media/atomisp/pci/atomisp-regs.h
··· 20 20 #define ATOMISP_REGS_H 21 21 22 22 /* common register definitions */ 23 - #define PUNIT_PORT 0x04 24 - #define CCK_PORT 0x14 25 - 26 23 #define PCICMDSTS 0x01 27 24 #define INTR 0x0f 28 25 #define MSI_CAPID 0x24
+1 -1
drivers/staging/media/atomisp/pci/atomisp_v4l2.c
··· 1687 1687 isp->dfs = &dfs_config_cht; 1688 1688 isp->pdev->d3cold_delay = 0; 1689 1689 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); 1691 1691 switch (val & CCK_FUSE_HPLL_FREQ_MASK) { 1692 1692 case 0x00: 1693 1693 isp->hpll_freq = HPLL_FREQ_800MHZ;