Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'staging-3.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging tree fixes from Greg Kroah-Hartman:
"Here are some tiny drivers/staging/ bugfixes. Some build fixes that
were recently reported, as well as one kfree bug that is hitting a
number of users."
* tag 'staging-3.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: ozwpan: Fix bug where kfree is called twice.
staging: octeon-ethernet: fix build errors by including interrupt.h
staging: zcache: fix Kconfig crypto dependency
staging: tidspbridge: remove usage of OMAP2_L4_IO_ADDRESS
+23
-12
+1
drivers/staging/octeon/ethernet-rx.c
+1
drivers/staging/octeon/ethernet-rx.c
+1
drivers/staging/octeon/ethernet-tx.c
+1
drivers/staging/octeon/ethernet-tx.c
+1
drivers/staging/octeon/ethernet.c
+1
drivers/staging/octeon/ethernet.c
-2
drivers/staging/ozwpan/ozpd.c
-2
drivers/staging/ozwpan/ozpd.c
+12
-8
drivers/staging/tidspbridge/core/tiomap3430.c
+12
-8
drivers/staging/tidspbridge/core/tiomap3430.c
···
79
79
#define OMAP343X_CONTROL_IVA2_BOOTADDR (OMAP2_CONTROL_GENERAL + 0x0190)
80
80
#define OMAP343X_CONTROL_IVA2_BOOTMOD (OMAP2_CONTROL_GENERAL + 0x0194)
81
81
82
-
#define OMAP343X_CTRL_REGADDR(reg) \
83
-
OMAP2_L4_IO_ADDRESS(OMAP343X_CTRL_BASE + (reg))
84
-
85
-
86
82
/* Forward Declarations: */
87
83
static int bridge_brd_monitor(struct bridge_dev_context *dev_ctxt);
88
84
static int bridge_brd_read(struct bridge_dev_context *dev_ctxt,
···
414
418
415
419
/* Assert RST1 i.e only the RST only for DSP megacell */
416
420
if (!status) {
421
+
/*
422
+
* XXX: ioremapping MUST be removed once ctrl
423
+
* function is made available.
424
+
*/
425
+
void __iomem *ctrl = ioremap(OMAP343X_CTRL_BASE, SZ_4K);
426
+
if (!ctrl)
427
+
return -ENOMEM;
428
+
417
429
(*pdata->dsp_prm_rmw_bits)(OMAP3430_RST1_IVA2_MASK,
418
430
OMAP3430_RST1_IVA2_MASK, OMAP3430_IVA2_MOD,
419
431
OMAP2_RM_RSTCTRL);
420
432
/* Mask address with 1K for compatibility */
421
433
__raw_writel(dsp_addr & OMAP3_IVA2_BOOTADDR_MASK,
422
-
OMAP343X_CTRL_REGADDR(
423
-
OMAP343X_CONTROL_IVA2_BOOTADDR));
434
+
ctrl + OMAP343X_CONTROL_IVA2_BOOTADDR);
424
435
/*
425
436
* Set bootmode to self loop if dsp_debug flag is true
426
437
*/
427
438
__raw_writel((dsp_debug) ? OMAP3_IVA2_BOOTMOD_IDLE : 0,
428
-
OMAP343X_CTRL_REGADDR(
429
-
OMAP343X_CONTROL_IVA2_BOOTMOD));
439
+
ctrl + OMAP343X_CONTROL_IVA2_BOOTMOD);
440
+
441
+
iounmap(ctrl);
430
442
}
431
443
}
432
444
if (!status) {
+7
-1
drivers/staging/tidspbridge/core/wdt.c
+7
-1
drivers/staging/tidspbridge/core/wdt.c
···
53
53
int ret = 0;
54
54
55
55
dsp_wdt.sm_wdt = NULL;
56
-
dsp_wdt.reg_base = OMAP2_L4_IO_ADDRESS(OMAP34XX_WDT3_BASE);
56
+
dsp_wdt.reg_base = ioremap(OMAP34XX_WDT3_BASE, SZ_4K);
57
+
if (!dsp_wdt.reg_base)
58
+
return -ENOMEM;
59
+
57
60
tasklet_init(&dsp_wdt.wdt3_tasklet, dsp_wdt_dpc, 0);
58
61
59
62
dsp_wdt.fclk = clk_get(NULL, "wdt3_fck");
···
102
99
dsp_wdt.fclk = NULL;
103
100
dsp_wdt.iclk = NULL;
104
101
dsp_wdt.sm_wdt = NULL;
102
+
103
+
if (dsp_wdt.reg_base)
104
+
iounmap(dsp_wdt.reg_base);
105
105
dsp_wdt.reg_base = NULL;
106
106
}
107
107
+1
-1
drivers/staging/zcache/Kconfig
+1
-1
drivers/staging/zcache/Kconfig
···
2
2
bool "Dynamic compression of swap pages and clean pagecache pages"
3
3
# X86 dependency is because zsmalloc uses non-portable pte/tlb
4
4
# functions
5
-
depends on (CLEANCACHE || FRONTSWAP) && CRYPTO && X86
5
+
depends on (CLEANCACHE || FRONTSWAP) && CRYPTO=y && X86
6
6
select ZSMALLOC
7
7
select CRYPTO_LZO
8
8
default n