lkml.org 
[lkml]   [2015]   [May]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/15] MIPS: malta: basic DT plumbing
    Date
    Build a DT for the Malta platform into the kernel, load it & probe
    devices from it. The DT is essentially empty at this point, devices
    will be added in further patches.

    Signed-off-by: Paul Burton <paul.burton@imgtec.com>
    ---

    arch/mips/Kconfig | 2 ++
    arch/mips/boot/dts/mti/Makefile | 1 +
    arch/mips/boot/dts/mti/malta.dts | 7 +++++++
    arch/mips/mti-malta/Makefile | 2 +-
    arch/mips/mti-malta/malta-dt.c | 34 ++++++++++++++++++++++++++++++++++
    arch/mips/mti-malta/malta-setup.c | 4 ++++
    6 files changed, 49 insertions(+), 1 deletion(-)
    create mode 100644 arch/mips/boot/dts/mti/malta.dts
    create mode 100644 arch/mips/mti-malta/malta-dt.c

    diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
    index f501665..75dd13d 100644
    --- a/arch/mips/Kconfig
    +++ b/arch/mips/Kconfig
    @@ -434,6 +434,8 @@ config MIPS_MALTA
    select SYS_SUPPORTS_MULTITHREADING
    select SYS_SUPPORTS_SMARTMIPS
    select SYS_SUPPORTS_ZBOOT
    + select USE_OF
    + select BUILTIN_DTB
    help
    This enables support for the MIPS Technologies Malta evaluation
    board.
    diff --git a/arch/mips/boot/dts/mti/Makefile b/arch/mips/boot/dts/mti/Makefile
    index ef1f3db..144d776 100644
    --- a/arch/mips/boot/dts/mti/Makefile
    +++ b/arch/mips/boot/dts/mti/Makefile
    @@ -1,3 +1,4 @@
    +dtb-$(CONFIG_MIPS_MALTA) += malta.dtb
    dtb-$(CONFIG_MIPS_SEAD3) += sead3.dtb

    obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
    diff --git a/arch/mips/boot/dts/mti/malta.dts b/arch/mips/boot/dts/mti/malta.dts
    new file mode 100644
    index 0000000..c678115
    --- /dev/null
    +++ b/arch/mips/boot/dts/mti/malta.dts
    @@ -0,0 +1,7 @@
    +/dts-v1/;
    +
    +/ {
    + #address-cells = <1>;
    + #size-cells = <1>;
    + compatible = "mti,malta";
    +};
    diff --git a/arch/mips/mti-malta/Makefile b/arch/mips/mti-malta/Makefile
    index 6510ace..ea35587 100644
    --- a/arch/mips/mti-malta/Makefile
    +++ b/arch/mips/mti-malta/Makefile
    @@ -5,7 +5,7 @@
    # Copyright (C) 2008 Wind River Systems, Inc.
    # written by Ralf Baechle <ralf@linux-mips.org>
    #
    -obj-y := malta-display.o malta-init.o \
    +obj-y := malta-display.o malta-dt.o malta-init.o \
    malta-int.o malta-memory.o malta-platform.o \
    malta-reset.o malta-setup.o malta-time.o

    diff --git a/arch/mips/mti-malta/malta-dt.c b/arch/mips/mti-malta/malta-dt.c
    new file mode 100644
    index 0000000..47a2288
    --- /dev/null
    +++ b/arch/mips/mti-malta/malta-dt.c
    @@ -0,0 +1,34 @@
    +/*
    + * Copyright (C) 2015 Imagination Technologies
    + * Author: Paul Burton <paul.burton@imgtec.com>
    + *
    + * This program is free software; you can redistribute it and/or modify it
    + * under the terms of the GNU General Public License as published by the
    + * Free Software Foundation; either version 2 of the License, or (at your
    + * option) any later version.
    + */
    +
    +#include <linux/clk-provider.h>
    +#include <linux/init.h>
    +#include <linux/of_fdt.h>
    +#include <linux/of_platform.h>
    +
    +void __init device_tree_init(void)
    +{
    + unflatten_and_copy_device_tree();
    +}
    +
    +static const struct of_device_id bus_ids[] __initconst = {
    + { .compatible = "simple-bus", },
    + { .compatible = "isa", },
    + {},
    +};
    +
    +static int __init publish_devices(void)
    +{
    + if (!of_have_populated_dt())
    + return 0;
    +
    + return of_platform_bus_probe(NULL, bus_ids, NULL);
    +}
    +device_initcall(publish_devices);
    diff --git a/arch/mips/mti-malta/malta-setup.c b/arch/mips/mti-malta/malta-setup.c
    index db7c9e5..9d1e7f5 100644
    --- a/arch/mips/mti-malta/malta-setup.c
    +++ b/arch/mips/mti-malta/malta-setup.c
    @@ -21,6 +21,7 @@
    #include <linux/sched.h>
    #include <linux/ioport.h>
    #include <linux/irq.h>
    +#include <linux/of_fdt.h>
    #include <linux/pci.h>
    #include <linux/screen_info.h>
    #include <linux/time.h>
    @@ -31,6 +32,7 @@
    #include <asm/mips-boards/malta.h>
    #include <asm/mips-boards/maltaint.h>
    #include <asm/dma.h>
    +#include <asm/prom.h>
    #include <asm/traps.h>
    #ifdef CONFIG_VT
    #include <linux/console.h>
    @@ -249,6 +251,8 @@ void __init plat_mem_setup(void)
    {
    unsigned int i;

    + __dt_setup_arch(__dtb_start);
    +
    if (config_enabled(CONFIG_EVA))
    /* EVA has already been configured in mach-malta/kernel-init.h */
    pr_info("Enhanced Virtual Addressing (EVA) activated\n");
    --
    2.4.1


    \
     
     \ /
      Last update: 2015-05-22 18:41    [W:5.084 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site