projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[deliverable/linux.git]
/
arch
/
mips
/
ath79
/
setup.c
diff --git
a/arch/mips/ath79/setup.c
b/arch/mips/ath79/setup.c
index 7adab180e0ca61e32f6e4e811d09f041ddd1a4ee..f206dafbb0a35f57ccd64bfbefd24bbe112ff4f7 100644
(file)
--- a/
arch/mips/ath79/setup.c
+++ b/
arch/mips/ath79/setup.c
@@
-18,7
+18,6
@@
#include <linux/err.h>
#include <linux/clk.h>
#include <linux/clk-provider.h>
#include <linux/err.h>
#include <linux/clk.h>
#include <linux/clk-provider.h>
-#include <linux/of_platform.h>
#include <linux/of_fdt.h>
#include <asm/bootinfo.h>
#include <linux/of_fdt.h>
#include <asm/bootinfo.h>
@@
-204,8
+203,8
@@
void __init plat_mem_setup(void)
fdt_start = fw_getenvl("fdt_start");
if (fdt_start)
__dt_setup_arch((void *)KSEG0ADDR(fdt_start));
fdt_start = fw_getenvl("fdt_start");
if (fdt_start)
__dt_setup_arch((void *)KSEG0ADDR(fdt_start));
- else if (fw_
arg0 == -2
)
- __dt_setup_arch((void *)KSEG0ADDR(fw_
arg1
));
+ else if (fw_
passed_dtb
)
+ __dt_setup_arch((void *)KSEG0ADDR(fw_
passed_dtb
));
if (mips_machtype != ATH79_MACH_GENERIC_OF) {
ath79_reset_base = ioremap_nocache(AR71XX_RESET_BASE,
if (mips_machtype != ATH79_MACH_GENERIC_OF) {
ath79_reset_base = ioremap_nocache(AR71XX_RESET_BASE,
@@
-285,7
+284,6
@@
void __init plat_time_init(void)
static int __init ath79_setup(void)
{
static int __init ath79_setup(void)
{
- of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
if (mips_machtype == ATH79_MACH_GENERIC_OF)
return 0;
if (mips_machtype == ATH79_MACH_GENERIC_OF)
return 0;
This page took
0.029326 seconds
and
5
git commands to generate.