diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-30 14:32:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-30 14:32:01 -0400 |
commit | f64d6e2aaa79f0ad588fd7ad595a0a8eb8f04645 (patch) | |
tree | 3ee28acc12e4f58320bfabd146d86755be6236fd /arch/metag | |
parent | 1056c9bd2702ea1bb79abf9bd1e78c578589d247 (diff) | |
parent | 099c0cbd2025192f098e6da7f3c8118f6833dfe9 (diff) |
Merge tag 'devicetree-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull DeviceTree updates from Rob Herring:
- remove most of_platform_populate() calls in arch code. Now the DT
core code calls it in the default case and platforms only need to
call it if they have special needs
- use pr_fmt on all the DT core print statements
- CoreSight binding doc improvements to block name descriptions
- add dt_to_config script which can parse dts files and list
corresponding kernel config options
- fix memory leak hit with a PowerMac DT
- correct a bunch of STMicro compatible strings to use the correct
vendor prefix
- fix DA9052 PMIC binding doc to match what is actually used in dts
files
* tag 'devicetree-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (35 commits)
documentation: da9052: Update regulator bindings names to match DA9052/53 DTS expectations
xtensa: Partially Revert "xtensa: Remove unnecessary of_platform_populate with default match table"
xtensa: Fix build error due to missing include file
MIPS: ath79: Add missing include file
Fix spelling errors in Documentation/devicetree
ARM: dts: fix STMicroelectronics compatible strings
powerpc/dts: fix STMicroelectronics compatible strings
Documentation: dt: i2c: use correct STMicroelectronics vendor prefix
scripts/dtc: dt_to_config - kernel config options for a devicetree
of: fdt: mark unflattened tree as detached
of: overlay: add resolver error prints
coresight: document binding acronyms
Documentation/devicetree: document cavium-pip rx-delay/tx-delay properties
of: use pr_fmt prefix for all console printing
of/irq: Mark initialised interrupt controllers as populated
of: fix memory leak related to safe_name()
Revert "of/platform: export of_default_bus_match_table"
of: unittest: use of_platform_default_populate() to populate default bus
memory: omap-gpmc: use of_platform_default_populate() to populate default bus
bus: uniphier-system-bus: use of_platform_default_populate() to populate default bus
...
Diffstat (limited to 'arch/metag')
-rw-r--r-- | arch/metag/kernel/setup.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/metag/kernel/setup.c b/arch/metag/kernel/setup.c index 31cf53d0eba2..1166f1fbfd63 100644 --- a/arch/metag/kernel/setup.c +++ b/arch/metag/kernel/setup.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <linux/memblock.h> | 20 | #include <linux/memblock.h> |
21 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
22 | #include <linux/of_fdt.h> | 22 | #include <linux/of_fdt.h> |
23 | #include <linux/of_platform.h> | ||
24 | #include <linux/pfn.h> | 23 | #include <linux/pfn.h> |
25 | #include <linux/root_dev.h> | 24 | #include <linux/root_dev.h> |
26 | #include <linux/sched.h> | 25 | #include <linux/sched.h> |
@@ -414,9 +413,7 @@ static int __init customize_machine(void) | |||
414 | /* customizes platform devices, or adds new ones */ | 413 | /* customizes platform devices, or adds new ones */ |
415 | if (machine_desc->init_machine) | 414 | if (machine_desc->init_machine) |
416 | machine_desc->init_machine(); | 415 | machine_desc->init_machine(); |
417 | else | 416 | |
418 | of_platform_populate(NULL, of_default_bus_match_table, NULL, | ||
419 | NULL); | ||
420 | return 0; | 417 | return 0; |
421 | } | 418 | } |
422 | arch_initcall(customize_machine); | 419 | arch_initcall(customize_machine); |