aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/setup.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-07-30 14:32:01 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-07-30 14:32:01 -0400
commitf64d6e2aaa79f0ad588fd7ad595a0a8eb8f04645 (patch)
tree3ee28acc12e4f58320bfabd146d86755be6236fd /arch/arm64/kernel/setup.c
parent1056c9bd2702ea1bb79abf9bd1e78c578589d247 (diff)
parent099c0cbd2025192f098e6da7f3c8118f6833dfe9 (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/arm64/kernel/setup.c')
-rw-r--r--arch/arm64/kernel/setup.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 2981f1bdd073..536dce22fe76 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -39,9 +39,7 @@
39#include <linux/fs.h> 39#include <linux/fs.h>
40#include <linux/proc_fs.h> 40#include <linux/proc_fs.h>
41#include <linux/memblock.h> 41#include <linux/memblock.h>
42#include <linux/of_iommu.h>
43#include <linux/of_fdt.h> 42#include <linux/of_fdt.h>
44#include <linux/of_platform.h>
45#include <linux/efi.h> 43#include <linux/efi.h>
46#include <linux/psci.h> 44#include <linux/psci.h>
47 45
@@ -303,19 +301,6 @@ void __init setup_arch(char **cmdline_p)
303 } 301 }
304} 302}
305 303
306static int __init arm64_device_init(void)
307{
308 if (of_have_populated_dt()) {
309 of_iommu_init();
310 of_platform_populate(NULL, of_default_bus_match_table,
311 NULL, NULL);
312 } else if (acpi_disabled) {
313 pr_crit("Device tree not populated\n");
314 }
315 return 0;
316}
317arch_initcall_sync(arm64_device_init);
318
319static int __init topology_init(void) 304static int __init topology_init(void)
320{ 305{
321 int i; 306 int i;