Skip to content
Snippets Groups Projects
Commit 9137f05f authored by Jaswinder Singh's avatar Jaswinder Singh Committed by David Woodhouse
Browse files

firmware: convert av7110 driver to request_firmware() 


Signed-off-by: default avatarJaswinder Singh <jaswinder@infradead.org>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 4528e429
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
drivers/media/dvb/ttpci/av7110_hw.c
+ 12
− 23
View file @ 9137f05f
......@@ -198,29 +198,10 @@ static int load_dram(struct av7110 *av7110, u32 *data, int len)
/* we cannot write av7110 DRAM directly, so load a bootloader into
* the DPRAM which implements a simple boot protocol */
static u8 bootcode[] = {
0xea, 0x00, 0x00, 0x0e, 0xe1, 0xb0, 0xf0, 0x0e, 0xe2, 0x5e, 0xf0, 0x04,
0xe2, 0x5e, 0xf0, 0x04, 0xe2, 0x5e, 0xf0, 0x08, 0xe2, 0x5e, 0xf0, 0x04,
0xe2, 0x5e, 0xf0, 0x04, 0xe2, 0x5e, 0xf0, 0x04, 0x2c, 0x00, 0x00, 0x24,
0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x34,
0x00, 0x00, 0x00, 0x00, 0xa5, 0xa5, 0x5a, 0x5a, 0x00, 0x1f, 0x15, 0x55,
0x00, 0x00, 0x00, 0x09, 0xe5, 0x9f, 0xd0, 0x7c, 0xe5, 0x9f, 0x40, 0x74,
0xe3, 0xa0, 0x00, 0x00, 0xe5, 0x84, 0x00, 0x00, 0xe5, 0x84, 0x00, 0x04,
0xe5, 0x9f, 0x10, 0x70, 0xe5, 0x9f, 0x20, 0x70, 0xe5, 0x9f, 0x30, 0x64,
0xe8, 0xb1, 0x1f, 0xe0, 0xe8, 0xa3, 0x1f, 0xe0, 0xe1, 0x51, 0x00, 0x02,
0xda, 0xff, 0xff, 0xfb, 0xe5, 0x9f, 0xf0, 0x50, 0xe1, 0xd4, 0x10, 0xb0,
0xe3, 0x51, 0x00, 0x00, 0x0a, 0xff, 0xff, 0xfc, 0xe1, 0xa0, 0x10, 0x0d,
0xe5, 0x94, 0x30, 0x04, 0xe1, 0xd4, 0x20, 0xb2, 0xe2, 0x82, 0x20, 0x3f,
0xe1, 0xb0, 0x23, 0x22, 0x03, 0xa0, 0x00, 0x02, 0xe1, 0xc4, 0x00, 0xb0,
0x0a, 0xff, 0xff, 0xf4, 0xe8, 0xb1, 0x1f, 0xe0, 0xe8, 0xa3, 0x1f, 0xe0,
0xe8, 0xb1, 0x1f, 0xe0, 0xe8, 0xa3, 0x1f, 0xe0, 0xe2, 0x52, 0x20, 0x01,
0x1a, 0xff, 0xff, 0xf9, 0xe2, 0x2d, 0xdb, 0x05, 0xea, 0xff, 0xff, 0xec,
0x2c, 0x00, 0x03, 0xf8, 0x2c, 0x00, 0x04, 0x00, 0x9e, 0x00, 0x08, 0x00,
0x2c, 0x00, 0x00, 0x74, 0x2c, 0x00, 0x00, 0xc0
};
int av7110_bootarm(struct av7110 *av7110)
{
const struct firmware *fw;
const char *fw_name = "av7110/bootcode.bin";
struct saa7146_dev *dev = av7110->dev;
u32 ret;
int i;
......@@ -261,7 +242,15 @@ int av7110_bootarm(struct av7110 *av7110)
//saa7146_setgpio(dev, DEBI_DONE_LINE, SAA7146_GPIO_INPUT);
//saa7146_setgpio(dev, 3, SAA7146_GPIO_INPUT);
mwdebi(av7110, DEBISWAB, DPRAM_BASE, bootcode, sizeof(bootcode));
ret = request_firmware(&fw, fw_name, &dev->pci->dev);
if (ret) {
printk(KERN_ERR "dvb-ttpci: Failed to load firmware \"%s\"\n",
fw_name);
return ret;
}
mwdebi(av7110, DEBISWAB, DPRAM_BASE, fw->data, fw->size);
release_firmware(fw);
iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2);
if (saa7146_wait_for_debi_done(av7110->dev, 1)) {
......@@ -302,7 +291,7 @@ int av7110_bootarm(struct av7110 *av7110)
av7110->arm_ready = 1;
return 0;
}
MODULE_FIRMWARE("av7110/bootcode.bin");
/****************************************************************************
* DEBI command polling
......
drivers/media/dvb/ttpci/av7110_hw.h
+ 2
− 1
View file @ 9137f05f
......@@ -390,7 +390,8 @@ static inline void iwdebi(struct av7110 *av7110, u32 config, int addr, u32 val,
}
/* buffer writes */
static inline void mwdebi(struct av7110 *av7110, u32 config, int addr, u8 *val, int count)
static inline void mwdebi(struct av7110 *av7110, u32 config, int addr,
const u8 *val, int count)
{
memcpy(av7110->debi_virt, val, count);
av7110_debiwrite(av7110, config, addr, 0, count);
......
firmware/Makefile
+ 1
− 0
View file @ 9137f05f
......@@ -37,6 +37,7 @@ fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin
fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
cxgb3/t3c_psram-1.1.0.bin \
cxgb3/t3fw-7.1.0.bin
fw-shipped-$(CONFIG_DVB_AV7110) += av7110/bootcode.bin
fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin
fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \
e100/d102e_ucode.bin
......
firmware/WHENCE
+ 10
− 0
View file @ 9137f05f
......@@ -632,3 +632,13 @@ Licence: Unknown
Found in hex form in kernel source.
--------------------------------------------------------------------------
Driver: DVB AV7110 -- AV7110 cards
File: av7110/bootcode.bin
Licence: GPLv2 or later
ARM assembly source code available at http://www.linuxtv.org/downloads/firmware/Boot.S
--------------------------------------------------------------------------
firmware/av7110/Boot.S 0 → 100644
+ 109
− 0
View file @ 9137f05f
/*
Boot.S: boot loader for Siemens DVB-S card
Copyright (C) 2001 Convergence integrated media GmbH
Written by Ralph Metzler
<rjkm@convergence.de>
Copyright (C) 2006 Matthieu CASTET <castet.mattheiu@free.fr>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/*
check AV711x_3_1.pdf for some hardware infos
build it with :
$ cc -mbig-endian -c Boot.S
$ ld -Ttext 0x2c000000 -EB -o Boot Boot.o
$ objcopy -Obinary Boot
*/
.text
.align
.globl _start
_start:
b reset // reset vector
movs pc, r14 // undefined
subs pc, r14, #4 // SWI
subs pc, r14, #4 // prefetch abort
subs pc, r14, #8 // data abort
subs pc, r14, #4 // reserved
subs pc, r14, #4 // IRQ
subs pc, r14, #4 // FIQ
.word tbl // table needed by firmware ROM
tbl: .word (endtbl - tbl)
.word 0
.word conf
endtbl: .word 0
conf: .word 0xa5a55a5a
.word 0x001f1555
.word 0x00000009
reset: ldr r13, buffer
ldr r4, flag
mov r0, #0
str r0, [r4]
str r0, [r4, #4]
ldr r1, wait_address
ldr r2, flag_address
ldr r3, sram
copycode: // copy the code HW Sram
ldmia r1!, {r5-r12}
stmia r3!, {r5-r12}
cmp r1, r2
ble copycode
ldr pc, sram // jump to the copied code
wait: ldrh r1, [r4] // wait for flag!=0
cmp r1, #0
beq wait
mov r1, r13 // buffer address
ldr r3, [r4,#4] // destaddr
ldrh r2, [r4,#2] // get segment length
add r2, r2, #63 // round length to next 64 bytes
movs r2, r2, lsr #6 // and divide by 64
moveq r0, #2 // if 0, set flag to 2, else signal
strh r0, [r4] // that buffer is accepted by setting to 0
beq wait
copyloop:
ldmia r1!, {r5-r12}
stmia r3!, {r5-r12}
ldmia r1!, {r5-r12}
stmia r3!, {r5-r12}
subs r2, r2, #1
bne copyloop
eor r13, r13, #0x1400 // switch to other buffer
b wait
// flag is stored at 0x2c0003f8, length at 0x2c0003fa,
// destaddr at 0x2c0003fc
flag: .word 0x2c0003f8
// buffer 1 is at 0x2c000400, buffer 2 at 0x2c001000
buffer: .word 0x2c000400
sram: .word 0x9e000800
wait_address: .word wait
flag_address: .word flag
firmware/av7110/bootcode.bin.ihex 0 → 100644
+ 15
− 0
View file @ 9137f05f
:10000000EA00000EE1B0F00EE25EF004E25EF00401
:10001000E25EF008E25EF004E25EF004E25EF0040C
:100020002C0000240000000C000000002C00003414
:1000300000000000A5A55A5A001F15550000000930
:10004000E59FD07CE59F4074E3A00000E5840000BC
:10005000E5840004E59F1070E59F2070E59F306403
:10006000E8B11FE0E8A31FE0E1510002DAFFFFFB67
:10007000E59FF050E1D410B0E35100000AFFFFFC0F
:10008000E1A0100DE5943004E1D420B2E282203FDB
:10009000E1B0232203A00002E1C400B00AFFFFF494
:1000A000E8B11FE0E8A31FE0E8B11FE0E8A31FE00C
:1000B000E25220011AFFFFF9E22DDB05EAFFFFEC17
:1000C0002C0003F82C0004009E0008002C00007493
:0400D0002C0000C040
:00000001FF
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