mvebu soc changes for v3.15
- mvebu - Makefile cleanup and remove map_io - use of_find_matching_node_and_match -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJTA4tkAAoJEP45WPkGe8ZngvcQAJERb3og6jElo3DPHNd6gcTa liMCSf0PxRrYdrpKcPRcuZhTZ20HrNqbJYcA3At6vj7F4tt1pjAK/uCVdhuOkK8N F4a9adhxqk0jHszB7fXZqwDpuqGyXwAOspkC+qw8PLDiIO9Yq844TgWSJKirwU2Z MPPU0HSrEmfloTI1bcgfB0V08vCFM5OtjGJsI5xRYTPuGnJUmOF/4zostQ1m9H9u Wnc41KrPv2gxW2fPNestCGarYrtsYzMZKBpTEmxlt0pcU7tQs4uv2J0zC29eTgCz 7iej46ZFZI2rIr3t1a4g0C7sWNMoZQ0syltL9ZKpgZy+5nijeJfrQxqX04b+uc9O vu3nJmpwQnKjxGR83Cv7g2uP4PwmTcitqq1G6vQGvGHMHFSzlG3h+HzQUkJO9UuQ wcXG/9o4458WaKQGOR3E3zved6VkNgnofhlhog80xLo1PRUNuEVp9I8u3PrrN+tZ 4hQC9JbTCbGWrzZmLB/C5foGkSyfZ1SkueCNy2v/U/uvyj0ztcvy7imSVbZs3zsB mliOz4ZfiBjkZCE2/HnzU3MI1WVaImyFF0LM6L2M1/PquGckhI4OWJz+1QrYwW72 qQIFGt3hcQyZz8i3qa6PI6i4YZveq88LUo4aB7i7pKRKSAe+Zu5xON4ubProF7yM R3hn3nMIATlrRcc3+2zw =xrGQ -----END PGP SIGNATURE----- Merge tag 'mvebu-soc-3.15' of git://git.infradead.org/linux-mvebu into next/cleanup Merge "mvebu soc changes for v3.15" from Jason Cooper: - mvebu - Makefile cleanup and remove map_io - use of_find_matching_node_and_match * tag 'mvebu-soc-3.15' of git://git.infradead.org/linux-mvebu: ARM: mvebu: remove unneeded ->map_io field for Armada 370/XP ARM: mvebu: make use of of_find_matching_node_and_match ARM: mvebu: Makefile clean-up Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
dd67f8a05d
|
@ -3,8 +3,7 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
|
|||
|
||||
AFLAGS_coherency_ll.o := -Wa,-march=armv7-a
|
||||
|
||||
obj-y += system-controller.o mvebu-soc-id.o
|
||||
obj-y += coherency.o coherency_ll.o pmsu.o system-controller.o mvebu-soc-id.o
|
||||
obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o
|
||||
obj-$(CONFIG_ARCH_MVEBU) += coherency.o coherency_ll.o pmsu.o
|
||||
obj-$(CONFIG_SMP) += platsmp.o headsmp.o
|
||||
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
|
||||
|
|
|
@ -31,11 +31,6 @@
|
|||
#include "coherency.h"
|
||||
#include "mvebu-soc-id.h"
|
||||
|
||||
static void __init armada_370_xp_map_io(void)
|
||||
{
|
||||
debug_ll_io_init();
|
||||
}
|
||||
|
||||
static void __init armada_370_xp_timer_and_clk_init(void)
|
||||
{
|
||||
of_clk_init(NULL);
|
||||
|
@ -90,7 +85,6 @@ static const char * const armada_370_xp_dt_compat[] = {
|
|||
DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)")
|
||||
.smp = smp_ops(armada_xp_smp_ops),
|
||||
.init_machine = armada_370_xp_dt_init,
|
||||
.map_io = armada_370_xp_map_io,
|
||||
.init_time = armada_370_xp_timer_and_clk_init,
|
||||
.restart = mvebu_restart,
|
||||
.dt_compat = armada_370_xp_dt_compat,
|
||||
|
|
|
@ -54,7 +54,7 @@ static const struct mvebu_system_controller orion_system_controller = {
|
|||
.system_soft_reset = 0x1,
|
||||
};
|
||||
|
||||
static struct of_device_id of_system_controller_table[] = {
|
||||
static const struct of_device_id of_system_controller_table[] = {
|
||||
{
|
||||
.compatible = "marvell,orion-system-controller",
|
||||
.data = (void *) &orion_system_controller,
|
||||
|
@ -90,13 +90,12 @@ void mvebu_restart(enum reboot_mode mode, const char *cmd)
|
|||
|
||||
static int __init mvebu_system_controller_init(void)
|
||||
{
|
||||
const struct of_device_id *match;
|
||||
struct device_node *np;
|
||||
|
||||
np = of_find_matching_node(NULL, of_system_controller_table);
|
||||
np = of_find_matching_node_and_match(NULL, of_system_controller_table,
|
||||
&match);
|
||||
if (np) {
|
||||
const struct of_device_id *match =
|
||||
of_match_node(of_system_controller_table, np);
|
||||
BUG_ON(!match);
|
||||
system_controller_base = of_iomap(np, 0);
|
||||
mvebu_sc = (struct mvebu_system_controller *)match->data;
|
||||
of_node_put(np);
|
||||
|
|
Loading…
Reference in New Issue