dany/facetimehd
1
0
Fork 0
mirror of https://github.com/patjak/facetimehd.git synced 2026-04-09 19:10:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'patjak/master' into my_fixes

Browse Source
This commit is contained in:
Sven Schnelle
2015-11-28 23:11:00 +01:00
parent 6bbe3712f8 8e83f8fbcd
commit d1ec497e02
10 changed files with 61 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fthd_buffer.c
View File

@@ -1,5 +1,5 @@
/*
* Broadcom PCIe 1570 webcam driver
* FacetimeHD camera driver
*
* Copyright (C) 2015 Sven Schnelle <svens@stackframe.org>
*

2
fthd_ddr.c
View File

@@ -1,5 +1,5 @@
/*
* Broadcom PCIe 1570 webcam driver
* FacetimeHD camera driver
*
* Copyright (C) 2014 Patrik Jakobsson (patrik.r.jakobsson@gmail.com)
*

26
fthd_drv.c
View File

@@ -1,5 +1,5 @@
/*
* Broadcom PCIe 1570 webcam driver
* FacetimeHD camera driver
*
* Copyright (C) 2014 Patrik Jakobsson (patrik.r.jakobsson@gmail.com)
*
@@ -443,7 +443,7 @@ static int fthd_pci_probe(struct pci_dev *pdev,
struct fthd_private *dev_priv;
int ret;
dev_info(&pdev->dev, "Found Broadcom PCIe webcam with device id: %x\n",
dev_info(&pdev->dev, "Found FaceTime HD camera with device id: %x\n",
pdev->device);
dev_priv = kzalloc(sizeof(struct fthd_private), GFP_KERNEL);
@@ -534,26 +534,8 @@ static struct pci_driver fthd_pci_driver = {
#endif
};
static int __init fthd_init(void)
{
int ret = 0;
ret = pci_register_driver(&fthd_pci_driver);
if (ret)
pr_err("Couldn't find any devices (ret=%d)\n", ret);
return ret;
}
static void __exit fthd_exit(void)
{
pci_unregister_driver(&fthd_pci_driver);
}
module_init(fthd_init);
module_exit(fthd_exit);
module_pci_driver(fthd_pci_driver);
MODULE_AUTHOR("Patrik Jakobsson <patrik.r.jakobsson@gmail.com>");
MODULE_DESCRIPTION("Broadcom PCIe 1570 webcam driver");
MODULE_DESCRIPTION("FacetimeHD camera driver");
MODULE_LICENSE("GPL");

11
fthd_drv.h
View File

@@ -36,15 +36,8 @@
#define FTHD_PCI_S2_MEM 2
#define FTHD_PCI_ISP_IO 4
#define MAX(a, b) ((a)>(b)?(a):(b))
#define FTHD_BUFFERS 4
struct fthd_reg {
u32 offset;
u32 value;
};
enum FW_CHAN_TYPE {
FW_CHAN_TYPE_OUT=0,
FW_CHAN_TYPE_IN=1,
@@ -92,9 +85,7 @@ struct fthd_private {
u32 ddr_speed;
u32 vdl_step_size;
/* DDR_PHY saved registers. Offsets need to be initialized somewhere */
u32 ddr_phy_num_regs;
struct fthd_reg ddr_phy_reg_map[DDR_PHY_NUM_REGS];
u32 ddr_phy_regs[DDR_PHY_NUM_REG];
/* Root resource for memory management */
struct resource *mem;

59
fthd_hw.c
View File

@@ -1,5 +1,5 @@
/*
* Broadcom PCIe 1570 webcam driver
* FacetimeHD camera driver
*
* Copyright (C) 2014 Patrik Jakobsson (patrik.r.jakobsson@gmail.com)
*
@@ -23,26 +23,6 @@
#include "fthd_ddr.h"
#include "fthd_isp.h"
/* FIXME: Double check these */
static u32 ddr_phy_reg_map[] = {
0x0000, 0x0004, 0x0010, 0x0014, 0x0018, 0x001c, 0x0020, 0x0030,
0x0034, 0x0038, 0x003c, 0x0040, 0x0044, 0x0048, 0x004c, 0x0050,
0x0054, 0x0058, 0x005c, 0x0060, 0x0064, 0x0068, 0x006c, 0x0070,
0x0074, 0x0078, 0x007c, 0x0080, 0x0084, 0x0090, 0x0094, 0x0098,
0x009c, 0x00a0, 0x00a4, 0x00b0, 0x00b4, 0x00b8, 0x00bc, 0x00c0,
0x0200, 0x0204, 0x0208, 0x020c, 0x0210, 0x0214, 0x0218, 0x021c,
0x0220, 0x0224, 0x0228, 0x022c, 0x0230, 0x0234, 0x0238, 0x023c,
0x0240, 0x0244, 0x0248, 0x024c, 0x0250, 0x0254, 0x0258, 0x025c,
0x0260, 0x0264, 0x0268, 0x026c, 0x0270, 0x0274, 0x02a4, 0x02a8,
0x02ac, 0x02b0, 0x02b4, 0x02b8, 0x02bc, 0x02c0, 0x02c4, 0x02c8,
0x02cc, 0x02d0, 0x02d4, 0x02d8, 0x02dc, 0x02e0, 0x02e4, 0x02e8,
0x02ec, 0x02f0, 0x02f4, 0x02f8, 0x02fc, 0x0300, 0x0304, 0x0308,
0x030c, 0x0310, 0x0314, 0x0328, 0x032c, 0x0330, 0x0334, 0x0338,
0x033c, 0x0348, 0x034c, 0x0350, 0x0354, 0x0358, 0x035c, 0x0360,
0x0364, 0x0370, 0x0374, 0x0378, 0x037c, 0x0380, 0x0384, 0x0388,
0x038c, 0x0390, 0x0394, 0x03a0, 0x03a4, 0x03a8, 0x03ac,
};
static int fthd_hw_s2_pll_reset(struct fthd_private *dev_priv)
{
FTHD_S2_REG_WRITE(0x40, S2_PLL_CTRL_2C);
@@ -636,21 +616,28 @@ static int fthd_hw_s2_init_ddr_controller_soc(struct fthd_private *dev_priv)
return 0;
}
static int fthd_hw_ddr_phy_save_regs(struct fthd_private *dev_priv)
void fthd_ddr_phy_save_regs(struct fthd_private *dev_priv)
{
u32 reg, offset;
u32 offset;
int i;
if (dev_priv->ddr_phy_num_regs == 0)
return -ENOENT;
for (i = 0; i < dev_priv->ddr_phy_num_regs; i++) {
offset = dev_priv->ddr_phy_reg_map[i].offset;
reg = FTHD_ISP_REG_READ(offset + DDR_PHY_REG_BASE);
dev_priv->ddr_phy_reg_map[i].value = reg;
for (i = 0; i < DDR_PHY_NUM_REG; i++) {
offset = fthd_ddr_phy_reg_map[i];
dev_priv->ddr_phy_regs[i] =
FTHD_ISP_REG_READ(DDR_PHY_REG_BASE + offset);
}
}
return 0;
void fthd_ddr_phy_restore_regs(struct fthd_private *dev_priv)
{
u32 offset;
int i;
for (i = 0; i < DDR_PHY_NUM_REG; i++) {
offset = fthd_ddr_phy_reg_map[i];
FTHD_S2_REG_WRITE(dev_priv->ddr_phy_regs[i],
DDR_PHY_REG_BASE + offset);
}
}
static int fthd_hw_irq_enable(struct fthd_private *dev_priv)
@@ -670,7 +657,7 @@ static int fthd_hw_irq_disable(struct fthd_private *dev_priv)
int fthd_hw_init(struct fthd_private *dev_priv)
{
int ret, i;
int ret;
ret = fthd_hw_s2_init_pcie_link(dev_priv);
if (ret)
@@ -679,10 +666,6 @@ int fthd_hw_init(struct fthd_private *dev_priv)
fthd_hw_s2_preinit_ddr_controller_soc(dev_priv);
fthd_hw_s2_init_ddr_controller_soc(dev_priv);
/* Initialize the reg map */
for (i = 0; i < DDR_PHY_NUM_REGS; i++)
dev_priv->ddr_phy_reg_map[i].offset = ddr_phy_reg_map[i];
/*
dev_info(&dev_priv->pdev->dev,
"Dumping DDR PHY reg map before shmoo\n");
@@ -697,7 +680,7 @@ int fthd_hw_init(struct fthd_private *dev_priv)
}
*/
ret = fthd_ddr_verify_mem(dev_priv, 0, MEM_VERIFY_NUM_FULL);
ret = fthd_ddr_verify_mem(dev_priv, 0, MEM_VERIFY_NUM);
if (ret) {
dev_err(&dev_priv->pdev->dev,
"Full memory verification failed! (%d)\n", ret);
@@ -713,7 +696,7 @@ int fthd_hw_init(struct fthd_private *dev_priv)
}
/* Save our working configuration */
fthd_hw_ddr_phy_save_regs(dev_priv);
fthd_ddr_phy_save_regs(dev_priv);
FTHD_S2_REG_WRITE(0x8, S2_D108);
FTHD_S2_REG_WRITE(0xc, S2_D104);

2
fthd_hw.h
View File

@@ -131,4 +131,6 @@ static inline void _FTHD_ISP_REG_WRITE(struct fthd_private *dev_priv, u32 val,
extern int fthd_hw_init(struct fthd_private *dev_priv);
extern void fthd_hw_deinit(struct fthd_private *priv);
extern void fthd_ddr_phy_save_regs(struct fthd_private *dev_priv);
extern void fthd_ddr_phy_restore_regs(struct fthd_private *dev_priv);
#endif

5
fthd_isp.c
View File

@@ -1,5 +1,5 @@
/*
* Broadcom PCIe 1570 webcam driver
* FacetimeHD camera driver
*
* Copyright (C) 2014 Patrik Jakobsson (patrik.r.jakobsson@gmail.com)
*
@@ -17,6 +17,7 @@
*
*/
#include <linux/kernel.h>
#include <linux/delay.h>
#include <linux/acpi.h>
#include <linux/firmware.h>
@@ -274,7 +275,7 @@ static int fthd_isp_cmd(struct fthd_private *dev_priv, enum fthd_isp_cmds comman
memset(&cmd, 0, sizeof(cmd));
if (response_len) {
len = MAX(request_len, *response_len);
len = max(request_len, *response_len);
} else {
len = request_len;
}

28
fthd_reg.h
View File

@@ -20,6 +20,8 @@
#ifndef _FTHD_REG_H
#define _FTHD_REG_H
#include <linux/kernel.h>
/* PCIE link regs */
#define S2_PCIE_LINK_D000 0xd000
#define S2_PCIE_LINK_D120 0xd120
@@ -86,11 +88,33 @@
#define S2_DDR_PLL_STATUS_2444 0x2444
#define S2_DDR_PLL_STATUS_2444_LOCKED (1 << 13)
/*
* These registers must be saved and restored across suspend/resume
* FIXME: Double check these
*/
static const u32 fthd_ddr_phy_reg_map[] = {
0x0000, 0x0004, 0x0010, 0x0014, 0x0018, 0x001c, 0x0020, 0x0030,
0x0034, 0x0038, 0x003c, 0x0040, 0x0044, 0x0048, 0x004c, 0x0050,
0x0054, 0x0058, 0x005c, 0x0060, 0x0064, 0x0068, 0x006c, 0x0070,
0x0074, 0x0078, 0x007c, 0x0080, 0x0084, 0x0090, 0x0094, 0x0098,
0x009c, 0x00a0, 0x00a4, 0x00b0, 0x00b4, 0x00b8, 0x00bc, 0x00c0,
0x0200, 0x0204, 0x0208, 0x020c, 0x0210, 0x0214, 0x0218, 0x021c,
0x0220, 0x0224, 0x0228, 0x022c, 0x0230, 0x0234, 0x0238, 0x023c,
0x0240, 0x0244, 0x0248, 0x024c, 0x0250, 0x0254, 0x0258, 0x025c,
0x0260, 0x0264, 0x0268, 0x026c, 0x0270, 0x0274, 0x02a4, 0x02a8,
0x02ac, 0x02b0, 0x02b4, 0x02b8, 0x02bc, 0x02c0, 0x02c4, 0x02c8,
0x02cc, 0x02d0, 0x02d4, 0x02d8, 0x02dc, 0x02e0, 0x02e4, 0x02e8,
0x02ec, 0x02f0, 0x02f4, 0x02f8, 0x02fc, 0x0300, 0x0304, 0x0308,
0x030c, 0x0310, 0x0314, 0x0328, 0x032c, 0x0330, 0x0334, 0x0338,
0x033c, 0x0348, 0x034c, 0x0350, 0x0354, 0x0358, 0x035c, 0x0360,
0x0364, 0x0370, 0x0374, 0x0378, 0x037c, 0x0380, 0x0384, 0x0388,
0x038c, 0x0390, 0x0394, 0x03a0, 0x03a4, 0x03a8, 0x03ac,
};
#define DDR_PHY_NUM_REG ARRAY_SIZE(fthd_ddr_phy_reg_map)
#define DDR_PHY_REG_BASE 0x2800
#define DDR_PHY_NUM_REGS 127 /* Found in AppleCamIn::Start() */
/* DDR40 */
#define S2_DDR40_PHY_BASE 0x2800
#define S2_DDR40_PHY_PLL_STATUS 0x2810
#define S2_DDR40_PHY_PLL_STATUS_LOCKED (1 << 0)
#define S2_DDR40_PHY_PLL_CFG 0x2814

2
fthd_ringbuf.c
View File

@@ -1,5 +1,5 @@
/*
* Broadcom PCIe 1570 webcam driver
* FacetimeHD camera driver
*
* Copyright (C) 2015 Sven Schnelle <svens@stackframe.org>
*

2
fthd_v4l2.c
View File

@@ -1,5 +1,5 @@
/*
* Broadcom PCIe 1570 webcam driver
* FacetimeHD camera driver
*
* Copyright (C) 2015 Sven Schnelle <svens@stackframe.org>
*