mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (151 commits) powerpc: Fix usage of 64-bit instruction in 32-bit altivec code MAINTAINERS: Add PowerPC patterns powerpc/pseries: Track previous CPPR values to correctly EOI interrupts powerpc/pseries: Correct pseries/dlpar.c build break without CONFIG_SMP powerpc: Make "intspec" pointers in irq_host->xlate() const powerpc/8xx: DTLB Miss cleanup powerpc/8xx: Remove DIRTY pte handling in DTLB Error. powerpc/8xx: Start using dcbX instructions in various copy routines powerpc/8xx: Restore _PAGE_WRITETHRU powerpc/8xx: Add missing Guarded setting in DTLB Error. powerpc/8xx: Fixup DAR from buggy dcbX instructions. powerpc/8xx: Tag DAR with 0x00f0 to catch buggy instructions. powerpc/8xx: Update TLB asm so it behaves as linux mm expects. powerpc/8xx: Invalidate non present TLBs powerpc/pseries: Serialize cpu hotplug operations during deactivate Vs deallocate pseries/pseries: Add code to online/offline CPUs of a DLPAR node powerpc: stop_this_cpu: remove the cpu from the online map. powerpc/pseries: Add kernel based CPU DLPAR handling sysfs/cpu: Add probe/release files powerpc/pseries: Kernel DLPAR Infrastructure ...
This commit is contained in:
commit
09cea96caa
234 changed files with 13126 additions and 2713 deletions
|
|
@ -282,8 +282,17 @@ static int offb_set_par(struct fb_info *info)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void offb_destroy(struct fb_info *info)
|
||||
{
|
||||
if (info->screen_base)
|
||||
iounmap(info->screen_base);
|
||||
release_mem_region(info->aperture_base, info->aperture_size);
|
||||
framebuffer_release(info);
|
||||
}
|
||||
|
||||
static struct fb_ops offb_ops = {
|
||||
.owner = THIS_MODULE,
|
||||
.fb_destroy = offb_destroy,
|
||||
.fb_setcolreg = offb_setcolreg,
|
||||
.fb_set_par = offb_set_par,
|
||||
.fb_blank = offb_blank,
|
||||
|
|
@ -482,10 +491,14 @@ static void __init offb_init_fb(const char *name, const char *full_name,
|
|||
var->sync = 0;
|
||||
var->vmode = FB_VMODE_NONINTERLACED;
|
||||
|
||||
/* set offb aperture size for generic probing */
|
||||
info->aperture_base = address;
|
||||
info->aperture_size = fix->smem_len;
|
||||
|
||||
info->fbops = &offb_ops;
|
||||
info->screen_base = ioremap(address, fix->smem_len);
|
||||
info->pseudo_palette = (void *) (info + 1);
|
||||
info->flags = FBINFO_DEFAULT | foreign_endian;
|
||||
info->flags = FBINFO_DEFAULT | FBINFO_MISC_FIRMWARE | foreign_endian;
|
||||
|
||||
fb_alloc_cmap(&info->cmap, 256, 0);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue