projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'i2c/for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
[linux-2.6-microblaze.git]
/
arch
/
arm
/
mach-imx
/
mach-imx6sx.c
diff --git
a/arch/arm/mach-imx/mach-imx6sx.c
b/arch/arm/mach-imx/mach-imx6sx.c
index
6a0b061
..
7f52d9b
100644
(file)
--- a/
arch/arm/mach-imx/mach-imx6sx.c
+++ b/
arch/arm/mach-imx/mach-imx6sx.c
@@
-72,7
+72,7
@@
static void __init imx6sx_init_machine(void)
if (parent == NULL)
pr_warn("failed to initialize soc device\n");
if (parent == NULL)
pr_warn("failed to initialize soc device\n");
- of_platform_
populate(NULL, of_default_bus_match_table
, NULL, parent);
+ of_platform_
default_populate(NULL
, NULL, parent);
imx6sx_enet_init();
imx_anatop_init();
imx6sx_enet_init();
imx_anatop_init();
@@
-103,6
+103,8
@@
static const char * const imx6sx_dt_compat[] __initconst = {
};
DT_MACHINE_START(IMX6SX, "Freescale i.MX6 SoloX (Device Tree)")
};
DT_MACHINE_START(IMX6SX, "Freescale i.MX6 SoloX (Device Tree)")
+ .l2c_aux_val = 0,
+ .l2c_aux_mask = ~0,
.init_irq = imx6sx_init_irq,
.init_machine = imx6sx_init_machine,
.dt_compat = imx6sx_dt_compat,
.init_irq = imx6sx_init_irq,
.init_machine = imx6sx_init_machine,
.dt_compat = imx6sx_dt_compat,