mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-18 21:25:11 +00:00
Merge branches 'sh-fixes-for-linus' and 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: intc: Fix up build failure introduced by radix tree changes. MAINTAINERS: update the sh git tree entry. sh: clkfwk: fix up compiler warnings. sh: intc: Fix up initializers for gcc 4.5. rtc: rtc-sh - fix a memory leak * 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: ARM: mach-shmobile: ap4evb: add fsib 44100Hz rate MAINTAINERS: update the ARM SH-Mobile git tree entry. ARM: mach-shmobile: ap4evb: Mark NOR boot loader partitions read-only. ARM: mach-shmobile: intc-sh7372: fix interrupt number
This commit is contained in:
commit
58e89c274f
7 changed files with 15 additions and 9 deletions
|
@ -945,7 +945,7 @@ M: Magnus Damm <magnus.damm@gmail.com>
|
||||||
L: linux-sh@vger.kernel.org
|
L: linux-sh@vger.kernel.org
|
||||||
W: http://oss.renesas.com
|
W: http://oss.renesas.com
|
||||||
Q: http://patchwork.kernel.org/project/linux-sh/list/
|
Q: http://patchwork.kernel.org/project/linux-sh/list/
|
||||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git
|
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git rmobile-latest
|
||||||
S: Supported
|
S: Supported
|
||||||
F: arch/arm/mach-shmobile/
|
F: arch/arm/mach-shmobile/
|
||||||
F: drivers/sh/
|
F: drivers/sh/
|
||||||
|
@ -5705,7 +5705,7 @@ M: Paul Mundt <lethal@linux-sh.org>
|
||||||
L: linux-sh@vger.kernel.org
|
L: linux-sh@vger.kernel.org
|
||||||
W: http://www.linux-sh.org
|
W: http://www.linux-sh.org
|
||||||
Q: http://patchwork.kernel.org/project/linux-sh/list/
|
Q: http://patchwork.kernel.org/project/linux-sh/list/
|
||||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git
|
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git sh-latest
|
||||||
S: Supported
|
S: Supported
|
||||||
F: Documentation/sh/
|
F: Documentation/sh/
|
||||||
F: arch/sh/
|
F: arch/sh/
|
||||||
|
|
|
@ -163,11 +163,13 @@ static struct mtd_partition nor_flash_partitions[] = {
|
||||||
.name = "loader",
|
.name = "loader",
|
||||||
.offset = 0x00000000,
|
.offset = 0x00000000,
|
||||||
.size = 512 * 1024,
|
.size = 512 * 1024,
|
||||||
|
.mask_flags = MTD_WRITEABLE,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.name = "bootenv",
|
.name = "bootenv",
|
||||||
.offset = MTDPART_OFS_APPEND,
|
.offset = MTDPART_OFS_APPEND,
|
||||||
.size = 512 * 1024,
|
.size = 512 * 1024,
|
||||||
|
.mask_flags = MTD_WRITEABLE,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.name = "kernel_ro",
|
.name = "kernel_ro",
|
||||||
|
@ -581,6 +583,10 @@ static int fsi_set_rate(int is_porta, int rate)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
switch (rate) {
|
switch (rate) {
|
||||||
|
case 44100:
|
||||||
|
clk_set_rate(fsib_clk, clk_round_rate(fsib_clk, 11283000));
|
||||||
|
ret = SH_FSI_ACKMD_256 | SH_FSI_BPFMD_64;
|
||||||
|
break;
|
||||||
case 48000:
|
case 48000:
|
||||||
clk_set_rate(fsib_clk, clk_round_rate(fsib_clk, 85428000));
|
clk_set_rate(fsib_clk, clk_round_rate(fsib_clk, 85428000));
|
||||||
clk_set_rate(fdiv_clk, clk_round_rate(fdiv_clk, 12204000));
|
clk_set_rate(fdiv_clk, clk_round_rate(fdiv_clk, 12204000));
|
||||||
|
|
|
@ -98,7 +98,7 @@ static struct intc_vect intca_vectors[] __initdata = {
|
||||||
INTC_VECT(IRQ14A, 0x03c0), INTC_VECT(IRQ15A, 0x03e0),
|
INTC_VECT(IRQ14A, 0x03c0), INTC_VECT(IRQ15A, 0x03e0),
|
||||||
INTC_VECT(IRQ16A, 0x3200), INTC_VECT(IRQ17A, 0x3220),
|
INTC_VECT(IRQ16A, 0x3200), INTC_VECT(IRQ17A, 0x3220),
|
||||||
INTC_VECT(IRQ18A, 0x3240), INTC_VECT(IRQ19A, 0x3260),
|
INTC_VECT(IRQ18A, 0x3240), INTC_VECT(IRQ19A, 0x3260),
|
||||||
INTC_VECT(IRQ20A, 0x3280), INTC_VECT(IRQ31A, 0x32a0),
|
INTC_VECT(IRQ20A, 0x3280), INTC_VECT(IRQ21A, 0x32a0),
|
||||||
INTC_VECT(IRQ22A, 0x32c0), INTC_VECT(IRQ23A, 0x32e0),
|
INTC_VECT(IRQ22A, 0x32c0), INTC_VECT(IRQ23A, 0x32e0),
|
||||||
INTC_VECT(IRQ24A, 0x3300), INTC_VECT(IRQ25A, 0x3320),
|
INTC_VECT(IRQ24A, 0x3300), INTC_VECT(IRQ25A, 0x3320),
|
||||||
INTC_VECT(IRQ26A, 0x3340), INTC_VECT(IRQ27A, 0x3360),
|
INTC_VECT(IRQ26A, 0x3340), INTC_VECT(IRQ27A, 0x3360),
|
||||||
|
|
|
@ -761,7 +761,7 @@ err_unmap:
|
||||||
clk_put(rtc->clk);
|
clk_put(rtc->clk);
|
||||||
iounmap(rtc->regbase);
|
iounmap(rtc->regbase);
|
||||||
err_badmap:
|
err_badmap:
|
||||||
release_resource(rtc->res);
|
release_mem_region(rtc->res->start, rtc->regsize);
|
||||||
err_badres:
|
err_badres:
|
||||||
kfree(rtc);
|
kfree(rtc);
|
||||||
|
|
||||||
|
@ -786,7 +786,7 @@ static int __exit sh_rtc_remove(struct platform_device *pdev)
|
||||||
}
|
}
|
||||||
|
|
||||||
iounmap(rtc->regbase);
|
iounmap(rtc->regbase);
|
||||||
release_resource(rtc->res);
|
release_mem_region(rtc->res->start, rtc->regsize);
|
||||||
|
|
||||||
clk_disable(rtc->clk);
|
clk_disable(rtc->clk);
|
||||||
clk_put(rtc->clk);
|
clk_put(rtc->clk);
|
||||||
|
|
|
@ -571,7 +571,7 @@ long clk_round_parent(struct clk *clk, unsigned long target,
|
||||||
*best_freq = freq_max;
|
*best_freq = freq_max;
|
||||||
}
|
}
|
||||||
|
|
||||||
pr_debug("too low freq %lu, error %lu\n", freq->frequency,
|
pr_debug("too low freq %u, error %lu\n", freq->frequency,
|
||||||
target - freq_max);
|
target - freq_max);
|
||||||
|
|
||||||
if (!error)
|
if (!error)
|
||||||
|
@ -591,7 +591,7 @@ long clk_round_parent(struct clk *clk, unsigned long target,
|
||||||
*best_freq = freq_min;
|
*best_freq = freq_min;
|
||||||
}
|
}
|
||||||
|
|
||||||
pr_debug("too high freq %lu, error %lu\n", freq->frequency,
|
pr_debug("too high freq %u, error %lu\n", freq->frequency,
|
||||||
freq_min - target);
|
freq_min - target);
|
||||||
|
|
||||||
if (!error)
|
if (!error)
|
||||||
|
|
|
@ -215,7 +215,7 @@ restart:
|
||||||
entry = radix_tree_deref_slot((void **)entries[i]);
|
entry = radix_tree_deref_slot((void **)entries[i]);
|
||||||
if (unlikely(!entry))
|
if (unlikely(!entry))
|
||||||
continue;
|
continue;
|
||||||
if (unlikely(entry == RADIX_TREE_RETRY))
|
if (radix_tree_deref_retry(entry))
|
||||||
goto restart;
|
goto restart;
|
||||||
|
|
||||||
irq = create_irq();
|
irq = create_irq();
|
||||||
|
|
|
@ -79,7 +79,7 @@ struct intc_hw_desc {
|
||||||
unsigned int nr_subgroups;
|
unsigned int nr_subgroups;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define _INTC_ARRAY(a) a, a == NULL ? 0 : sizeof(a)/sizeof(*a)
|
#define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a)
|
||||||
|
|
||||||
#define INTC_HW_DESC(vectors, groups, mask_regs, \
|
#define INTC_HW_DESC(vectors, groups, mask_regs, \
|
||||||
prio_regs, sense_regs, ack_regs) \
|
prio_regs, sense_regs, ack_regs) \
|
||||||
|
|
Loading…
Add table
Reference in a new issue