-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…
…t/paulus/powerpc * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (77 commits) [POWERPC] Abolish powerpc_flash_init() [POWERPC] Early serial debug support for PPC44x [POWERPC] Support for the Ebony 440GP reference board in arch/powerpc [POWERPC] Add device tree for Ebony [POWERPC] Add powerpc/platforms/44x, disable platforms/4xx for now [POWERPC] MPIC U3/U4 MSI backend [POWERPC] MPIC MSI allocator [POWERPC] Enable MSI mappings for MPIC [POWERPC] Tell Phyp we support MSI [POWERPC] RTAS MSI implementation [POWERPC] PowerPC MSI infrastructure [POWERPC] Rip out the existing powerpc msi stubs [POWERPC] Remove use of 4level-fixup.h for ppc32 [POWERPC] Add powerpc PCI-E reset API implementation [POWERPC] Holly bootwrapper [POWERPC] Holly DTS [POWERPC] Holly defconfig [POWERPC] Add support for 750CL Holly board [POWERPC] Generalize tsi108 PCI setup [POWERPC] Generalize tsi108 PHY types ... Fixed conflict in include/asm-powerpc/kdebug.h manually Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
- Loading branch information
Showing
217 changed files
with
8,175 additions
and
2,119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /* | ||
| * Copyright 2007 David Gibson, IBM Corporation. | ||
| * | ||
| * Based on earlier code: | ||
| * Matt Porter <mporter@kernel.crashing.org> | ||
| * Copyright 2002-2005 MontaVista Software Inc. | ||
| * | ||
| * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net> | ||
| * Copyright (c) 2003, 2004 Zultys Technologies | ||
| * | ||
| * 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. | ||
| */ | ||
| #include <stddef.h> | ||
| #include "types.h" | ||
| #include "string.h" | ||
| #include "stdio.h" | ||
| #include "ops.h" | ||
| #include "reg.h" | ||
| #include "dcr.h" | ||
|
|
||
| /* Read the 44x memory controller to get size of system memory. */ | ||
| void ibm44x_fixup_memsize(void) | ||
| { | ||
| int i; | ||
| unsigned long memsize, bank_config; | ||
|
|
||
| memsize = 0; | ||
| for (i = 0; i < ARRAY_SIZE(sdram_bxcr); i++) { | ||
| mtdcr(DCRN_SDRAM0_CFGADDR, sdram_bxcr[i]); | ||
| bank_config = mfdcr(DCRN_SDRAM0_CFGDATA); | ||
|
|
||
| if (bank_config & SDRAM_CONFIG_BANK_ENABLE) | ||
| memsize += SDRAM_CONFIG_BANK_SIZE(bank_config); | ||
| } | ||
|
|
||
| dt_fixup_memory(0, memsize); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| /* | ||
| * PowerPC 44x related functions | ||
| * | ||
| * Copyright 2007 David Gibson, IBM Corporation. | ||
| * | ||
| * This file is licensed under the terms of the GNU General Public | ||
| * License version 2. This program is licensed "as is" without any | ||
| * warranty of any kind, whether express or implied. | ||
| */ | ||
| #ifndef _PPC_BOOT_44X_H_ | ||
| #define _PPC_BOOT_44X_H_ | ||
|
|
||
| void ibm44x_fixup_memsize(void); | ||
| void ebony_init(void *mac0, void *mac1); | ||
|
|
||
| #endif /* _PPC_BOOT_44X_H_ */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /* | ||
| * Old U-boot compatibility for Ebony | ||
| * | ||
| * Author: David Gibson <david@gibson.dropbear.id.au> | ||
| * | ||
| * Copyright 2007 David Gibson, IBM Corporatio. | ||
| * Based on cuboot-83xx.c, which is: | ||
| * Copyright (c) 2007 Freescale Semiconductor, Inc. | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 as published | ||
| * by the Free Software Foundation. | ||
| */ | ||
|
|
||
| #include "ops.h" | ||
| #include "stdio.h" | ||
| #include "44x.h" | ||
|
|
||
| #define TARGET_44x | ||
| #include "ppcboot.h" | ||
|
|
||
| static bd_t bd; | ||
| extern char _end[]; | ||
|
|
||
| BSS_STACK(4096); | ||
|
|
||
| void platform_init(unsigned long r3, unsigned long r4, unsigned long r5, | ||
| unsigned long r6, unsigned long r7) | ||
| { | ||
| unsigned long end_of_ram = bd.bi_memstart + bd.bi_memsize; | ||
| unsigned long avail_ram = end_of_ram - (unsigned long)_end; | ||
|
|
||
| memcpy(&bd, (bd_t *)r3, sizeof(bd)); | ||
| loader_info.initrd_addr = r4; | ||
| loader_info.initrd_size = r4 ? r5 : 0; | ||
| loader_info.cmdline = (char *)r6; | ||
| loader_info.cmdline_len = r7 - r6; | ||
|
|
||
| simple_alloc_init(_end, avail_ram, 32, 64); | ||
|
|
||
| ebony_init(&bd.bi_enetaddr, &bd.bi_enet1addr); | ||
| } |
Oops, something went wrong.