Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1433764 > unrolled thread
| Started by | Yoshinori Sato <ysato@users.sourceforge.jp> |
|---|---|
| First post | 2016-06-29 16:00 +0200 |
| Last post | 2016-06-29 16:10 +0200 |
| Articles | 9 on this page of 29 — 5 participants |
Back to article view | Back to linux.kernel
[PATCH v4 00/22] sh: LANDISK and R2Dplus convert to device tree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:00 +0200
[PATCH v4 15/22] sh: Move common PCI stuff to arch/sh/kernel Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
[PATCH v4 04/22] sh: Use P1SEGADDR Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
[PATCH v4 13/22] sh: irqchip: SH7751 IRQCHIP Driver Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
[PATCH v4 12/22] sh: Add PCI host bridge driver for SH7751 Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
Re: [PATCH v4 12/22] sh: Add PCI host bridge driver for SH7751 Arnd Bergmann <arnd@arndb.de> - 2016-06-29 17:00 +0200
Re: [PATCH v4 12/22] sh: Add PCI host bridge driver for SH7751 Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-30 17:00 +0200
Re: [PATCH v4 12/22] sh: Add PCI host bridge driver for SH7751 Rob Herring <robh@kernel.org> - 2016-07-01 03:50 +0200
[PATCH v4 07/22] sh: Passing FDT address on zImage Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
[PATCH v4 18/22] sh: Add separate DTB build rule Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
[PATCH v4 09/22] sh: Use GENERIC_IOMAP on device tree mode Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
[PATCH v4 20/22] sh: IO-DATA HDL-U (a,k.a landisk) DeviceTree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
[PATCH v4 22/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) DeviceTree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
Re: [PATCH v4 22/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) DeviceTree Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-06-29 16:20 +0200
Re: [PATCH v4 22/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) DeviceTree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-30 16:50 +0200
[PATCH v4 17/22] pci: PCI_HOST_GENERIC enable for SH Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
[PATCH v4 05/22] sh: command line passing chosen/bootargs in devicetree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
[PATCH v4 16/22] pci: pci_config_window move to linux/pci.h Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
[PATCH v4 08/22] sh: Disable board specific code on device tree mode Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
[PATCH v4 14/22] sh: SH7751 core dtsi Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
Re: [PATCH v4 14/22] sh: SH7751 core dtsi Geert Uytterhoeven <geert@linux-m68k.org> - 2016-07-01 11:00 +0200
Re: [PATCH v4 14/22] sh: SH7751 core dtsi Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-07-03 13:40 +0200
Re: [PATCH v4 14/22] sh: SH7751 core dtsi Geert Uytterhoeven <geert@linux-m68k.org> - 2016-07-04 09:20 +0200
Re: [PATCH v4 14/22] sh: SH7751 core dtsi Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-07-04 18:20 +0200
[PATCH v4 03/22] sh: set preset_lpj Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
[PATCH v4 21/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) IRQCHIP Driver Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
Re: [PATCH v4 21/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) IRQCHIP Driver Rob Herring <robh@kernel.org> - 2016-07-01 04:10 +0200
Re: [PATCH v4 21/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) IRQCHIP Driver Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-07-03 13:40 +0200
[PATCH v4 02/22] sh: More early unflatten device tree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
Page 2 of 2 — ← Prev page 1 [2]
| From | Geert Uytterhoeven <geert@linux-m68k.org> |
|---|---|
| Date | 2016-07-01 11:00 +0200 |
| Subject | Re: [PATCH v4 14/22] sh: SH7751 core dtsi |
| Message-ID | <rQ2sN-4sz-13@gated-at.bofh.it> |
| In reply to | #1433783 |
Hi Sato-san,
On Wed, Jun 29, 2016 at 3:40 PM, Yoshinori Sato
<ysato@users.sourceforge.jp> wrote:
> SH7751 core and internal peripheral define.
Thanks for your patch!
> Changes v4
> - remove unneeded #address-cells and #size-cells
> - add missing dt-binding link
Please move changelog information below the three dashes...
>
> Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
> ---
... i.e. here.
> --- /dev/null
> +++ b/arch/sh/boot/dts/include/dt-bindings
> @@ -0,0 +1 @@
> +../../../../../include/dt-bindings
> \ No newline at end of file
Missing newline.
> --- /dev/null
> +++ b/arch/sh/boot/dts/sh7751.dtsi
> + oclk: oscillator {
> + #clock-cells = <0>;
> + compatible = "fixed-clock";
> + clock-frequency = <0>;
> + };
> + cpg: cpg@ffc00000 {
clock-controller@ffc00000
> \ No newline at end of file
Missing newline.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
[toc] | [prev] | [next] | [standalone]
| From | Yoshinori Sato <ysato@users.sourceforge.jp> |
|---|---|
| Date | 2016-07-03 13:40 +0200 |
| Subject | Re: [PATCH v4 14/22] sh: SH7751 core dtsi |
| Message-ID | <rQNUJ-880-17@gated-at.bofh.it> |
| In reply to | #1435171 |
On Fri, 01 Jul 2016 17:57:00 +0900,
Geert Uytterhoeven wrote:
>
> Hi Sato-san,
>
> On Wed, Jun 29, 2016 at 3:40 PM, Yoshinori Sato
> <ysato@users.sourceforge.jp> wrote:
> > SH7751 core and internal peripheral define.
>
> Thanks for your patch!
>
> > Changes v4
> > - remove unneeded #address-cells and #size-cells
> > - add missing dt-binding link
>
> Please move changelog information below the three dashes...
>
> >
> > Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
> > ---
>
> ... i.e. here.
OK.
> > --- /dev/null
> > +++ b/arch/sh/boot/dts/include/dt-bindings
> > @@ -0,0 +1 @@
> > +../../../../../include/dt-bindings
> > \ No newline at end of file
>
> Missing newline.
This file is symbolic link.
I think not need newline.
> > --- /dev/null
> > +++ b/arch/sh/boot/dts/sh7751.dtsi
>
> > + oclk: oscillator {
> > + #clock-cells = <0>;
> > + compatible = "fixed-clock";
> > + clock-frequency = <0>;
> > + };
> > + cpg: cpg@ffc00000 {
>
> clock-controller@ffc00000
OK.
> > \ No newline at end of file
>
> Missing newline.
OK.
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
>
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> -- Linus Torvalds
--
Yoshinori Sato
<ysato@users.sourceforge.jp>
[toc] | [prev] | [next] | [standalone]
| From | Geert Uytterhoeven <geert@linux-m68k.org> |
|---|---|
| Date | 2016-07-04 09:20 +0200 |
| Subject | Re: [PATCH v4 14/22] sh: SH7751 core dtsi |
| Message-ID | <rR6kF-2FB-5@gated-at.bofh.it> |
| In reply to | #1433783 |
Hi Sato-san,
On Wed, Jun 29, 2016 at 3:40 PM, Yoshinori Sato
<ysato@users.sourceforge.jp> wrote:
> --- /dev/null
> +++ b/include/dt-bindings/clock/renesas-sh7750.h
> @@ -0,0 +1,26 @@
> +/*
> + * Copyright (C) 2016 Yoshinori Sato
> + *
> + * 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.
> + */
> +#ifndef __DT_BINDINGS_CLOCK_RENESAS_SH7750_H__
> +#define __DT_BINDINGS_CLOCK_RENESAS_SH7750_H__
> +
> +#define SH7750_CLK_SCI 0
> +#define SH7750_CLK_RTC 1
> +#define SH7750_CLK_TMU0 2
> +#define SH7750_CLK_TMU1 3
> +#define SH7750_CLK_TMU2 4
> +#define SH7750_CLK_SCIF 5
> +#define SH7750_CLK_DMAC 6
> +#define SH7750_CLK_UBC 7
> +#define SH7750_CLK_SQ 8
> +#define SH7750_CLK_INTC 9
> +#define SH7750_CLK_TMU3 10
> +#define SH7750_CLK_TMU4 11
> +#define SH7750_CLK_PCIC 12
Looking at the table in drivers/clk/sh/clk-sh7750cpg.c, SH7750_CLK_CORE seems
to be missing?
> +
> +#endif /* __DT_BINDINGS_CLOCK_RENESAS_CPG_MSSR_H__ */
Relic from the Renesas CPG/MSSR driver.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
[toc] | [prev] | [next] | [standalone]
| From | Yoshinori Sato <ysato@users.sourceforge.jp> |
|---|---|
| Date | 2016-07-04 18:20 +0200 |
| Subject | Re: [PATCH v4 14/22] sh: SH7751 core dtsi |
| Message-ID | <rReLf-7Pb-25@gated-at.bofh.it> |
| In reply to | #1436174 |
On Mon, 04 Jul 2016 16:15:31 +0900,
Geert Uytterhoeven wrote:
>
> Hi Sato-san,
>
> On Wed, Jun 29, 2016 at 3:40 PM, Yoshinori Sato
> <ysato@users.sourceforge.jp> wrote:
> > --- /dev/null
> > +++ b/include/dt-bindings/clock/renesas-sh7750.h
> > @@ -0,0 +1,26 @@
> > +/*
> > + * Copyright (C) 2016 Yoshinori Sato
> > + *
> > + * 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.
> > + */
> > +#ifndef __DT_BINDINGS_CLOCK_RENESAS_SH7750_H__
> > +#define __DT_BINDINGS_CLOCK_RENESAS_SH7750_H__
> > +
> > +#define SH7750_CLK_SCI 0
> > +#define SH7750_CLK_RTC 1
> > +#define SH7750_CLK_TMU0 2
> > +#define SH7750_CLK_TMU1 3
> > +#define SH7750_CLK_TMU2 4
> > +#define SH7750_CLK_SCIF 5
> > +#define SH7750_CLK_DMAC 6
> > +#define SH7750_CLK_UBC 7
> > +#define SH7750_CLK_SQ 8
> > +#define SH7750_CLK_INTC 9
> > +#define SH7750_CLK_TMU3 10
> > +#define SH7750_CLK_TMU4 11
> > +#define SH7750_CLK_PCIC 12
>
> Looking at the table in drivers/clk/sh/clk-sh7750cpg.c, SH7750_CLK_CORE seems
> to be missing?
Yes.
I forgot it.
> > +
> > +#endif /* __DT_BINDINGS_CLOCK_RENESAS_CPG_MSSR_H__ */
>
> Relic from the Renesas CPG/MSSR driver.
OK.
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
>
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> -- Linus Torvalds
--
Yoshinori Sato
<ysato@users.sourceforge.jp>
[toc] | [prev] | [next] | [standalone]
| From | Yoshinori Sato <ysato@users.sourceforge.jp> |
|---|---|
| Date | 2016-06-29 16:10 +0200 |
| Subject | [PATCH v4 03/22] sh: set preset_lpj |
| Message-ID | <rPolJ-5aS-55@gated-at.bofh.it> |
| In reply to | #1433764 |
Generic callibrate delay required this value.
Changes v4
none
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
arch/sh/boards/of-generic.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/sh/boards/of-generic.c b/arch/sh/boards/of-generic.c
index 3db4294..2d3cda3 100644
--- a/arch/sh/boards/of-generic.c
+++ b/arch/sh/boards/of-generic.c
@@ -128,6 +128,8 @@ static void __init sh_of_time_init(void)
static void __init sh_of_setup(char **cmdline_p)
{
struct device_node *root;
+ struct device_node *cpu;
+ u32 freq;
board_time_init = sh_of_time_init;
@@ -139,6 +141,10 @@ static void __init sh_of_setup(char **cmdline_p)
}
sh_of_smp_probe();
+
+ cpu = of_find_node_by_name(NULL, "cpu");
+ if (!of_property_read_u32(cpu, "clock-frequency", &freq))
+ preset_lpj = freq / CONFIG_HZ / 2;
}
static int sh_of_irq_demux(int irq)
--
2.7.0
[toc] | [prev] | [next] | [standalone]
| From | Yoshinori Sato <ysato@users.sourceforge.jp> |
|---|---|
| Date | 2016-06-29 16:10 +0200 |
| Subject | [PATCH v4 21/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) IRQCHIP Driver |
| Message-ID | <rPolJ-5aS-57@gated-at.bofh.it> |
| In reply to | #1433764 |
Changes v4
- split patch.
- remove unneeded #address
- update example
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
.../interrupt-controller/renesas-r2dplus.txt | 38 ++++++++++
drivers/irqchip/Makefile | 2 +-
drivers/irqchip/irq-renesas-r2dplus.c | 88 ++++++++++++++++++++++
3 files changed, 127 insertions(+), 1 deletion(-)
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas-r2dplus.txt
create mode 100644 drivers/irqchip/irq-renesas-r2dplus.c
diff --git a/Documentation/devicetree/bindings/interrupt-controller/renesas-r2dplus.txt b/Documentation/devicetree/bindings/interrupt-controller/renesas-r2dplus.txt
new file mode 100644
index 0000000..5b74da4
--- /dev/null
+++ b/Documentation/devicetree/bindings/interrupt-controller/renesas-r2dplus.txt
@@ -0,0 +1,38 @@
+DT bindings for the Renesas R0P751RLC0011RL (R2Dplus) interrupt controller
+
+Required properties:
+
+ - compatible: has to be "renesas,r2dplus-intc".
+
+ - reg: Base address and length of interrupt controller register.
+
+ - interrupt-controller: Identifies the node as an interrupt controller.
+
+ - #interrupt-cells: has to be <1>: an interrupt index.
+
+ - interrupt-map: Interrupt mapping on parent controller.
+
+Example
+-------
+
+ fpgaintc: fpga@a4000000 {
+ compatible = "renesas,r2dplus-intc";
+ #interrupt-cells = <1>;
+ interrupt-controller;
+ reg = <0xa4000000 0x40>;
+ interrupt-map=<0 &shintc evt2irq(0x200)>,
+ <1 &shintc evt2irq(0x220)>,
+ <2 &shintc evt2irq(0x240)>,
+ <3 &shintc evt2irq(0x260)>,
+ <4 &shintc evt2irq(0x280)>,
+ <5 &shintc evt2irq(0x2a0)>,
+ <6 &shintc evt2irq(0x2c0)>,
+ <7 &shintc evt2irq(0x2e0)>,
+ <8 &shintc evt2irq(0x300)>,
+ <9 &shintc evt2irq(0x320)>,
+ <10 &shintc evt2irq(0x340)>,
+ <11 &shintc evt2irq(0x360)>,
+ <12 &shintc evt2irq(0x380)>,
+ <13 &shintc evt2irq(0x3a0)>,
+ <14 &shintc evt2irq(0x3c0)>,
+ };
diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
index 5e225cf..1e0f1c3 100644
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@ -69,4 +69,4 @@ obj-$(CONFIG_PIC32_EVIC) += irq-pic32-evic.o
obj-$(CONFIG_MVEBU_ODMI) += irq-mvebu-odmi.o
obj-$(CONFIG_LS_SCFG_MSI) += irq-ls-scfg-msi.o
obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o
-obj-$(CONFIG_RENESAS_SH_INTC) += irq-renesas-sh7751.o irq-io-landisk.o
+obj-$(CONFIG_RENESAS_SH_INTC) += irq-renesas-sh7751.o irq-io-landisk.o irq-renesas-r2dplus.o
diff --git a/drivers/irqchip/irq-renesas-r2dplus.c b/drivers/irqchip/irq-renesas-r2dplus.c
new file mode 100644
index 0000000..3f80775
--- /dev/null
+++ b/drivers/irqchip/irq-renesas-r2dplus.c
@@ -0,0 +1,88 @@
+/*
+ * Renesas RTS7751R2D+ FPGA IRQ driver
+ *
+ * Copyright 2016 Yoshinori Sato <ysato@users.sourceforge.jp>
+ */
+
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <linux/irqchip.h>
+#include <linux/irqdomain.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/io.h>
+
+static const u16 mask_bit[] = {
+ BIT(11),
+ BIT(9),
+ BIT(8),
+ BIT(12),
+ BIT(10),
+ BIT(6),
+ BIT(5),
+ BIT(4),
+ BIT(7),
+ BIT(14),
+ BIT(13),
+ BIT(0),
+ BIT(15),
+};
+
+static void r2dplus_mask_irq(struct irq_data *data)
+{
+ u16 mask = __raw_readw(data->chip_data);
+
+ mask &= ~mask_bit[data->irq];
+ __raw_writew(mask, data->chip_data);
+}
+
+static void r2dplus_unmask_irq(struct irq_data *data)
+{
+ u16 mask = __raw_readw(data->chip_data);
+
+ mask |= mask_bit[data->irq];
+ __raw_writew(mask, data->chip_data);
+}
+
+static struct irq_chip fpga_irq_chip = {
+ .name = "R2DPLUS-FPGA",
+ .irq_unmask = r2dplus_unmask_irq,
+ .irq_mask = r2dplus_mask_irq,
+};
+
+static int fpga_map(struct irq_domain *d, unsigned int virq,
+ irq_hw_number_t hw_irq_num)
+{
+ irq_set_chip_and_handler(virq, &fpga_irq_chip,
+ handle_simple_irq);
+ irq_set_chip_data(virq, d->host_data);
+
+ return 0;
+}
+
+static struct irq_domain_ops irq_ops = {
+ .xlate = irq_domain_xlate_onecell,
+ .map = fpga_map,
+};
+
+static int __init r2dplus_intc_of_init(struct device_node *intc,
+ struct device_node *parent)
+{
+ struct irq_domain *domain, *pdomain;
+ int num_irqpin;
+ void *baseaddr;
+
+ baseaddr = of_iomap(intc, 0);
+ pdomain = irq_find_host(parent);
+ of_get_property(intc, "interrupt-map", &num_irqpin);
+ num_irqpin /= sizeof(u32) * 3;
+ domain = irq_domain_create_hierarchy(pdomain, 0, num_irqpin,
+ of_node_to_fwnode(intc),
+ &irq_ops, baseaddr);
+ if (!domain)
+ panic("%s: unable to create IRQ domain\n", intc->full_name);
+ irq_domain_associate_many(domain, 0, 0, 16);
+ return 0;
+}
+
+IRQCHIP_DECLARE(cpld_intc, "renesas,r2dplus-intc", r2dplus_intc_of_init);
--
2.7.0
[toc] | [prev] | [next] | [standalone]
| From | Rob Herring <robh@kernel.org> |
|---|---|
| Date | 2016-07-01 04:10 +0200 |
| Subject | Re: [PATCH v4 21/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) IRQCHIP Driver |
| Message-ID | <rPW41-Ex-7@gated-at.bofh.it> |
| In reply to | #1433785 |
On Wed, Jun 29, 2016 at 10:41:06PM +0900, Yoshinori Sato wrote: > Changes v4 > - split patch. > - remove unneeded #address Actually, I think #address-cells is supposed to be set for interrupt-map. It defines the size of the first field. Rob
[toc] | [prev] | [next] | [standalone]
| From | Yoshinori Sato <ysato@users.sourceforge.jp> |
|---|---|
| Date | 2016-07-03 13:40 +0200 |
| Subject | Re: [PATCH v4 21/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) IRQCHIP Driver |
| Message-ID | <rQNUJ-880-13@gated-at.bofh.it> |
| In reply to | #1434960 |
On Fri, 01 Jul 2016 10:53:13 +0900, Rob Herring wrote: > > On Wed, Jun 29, 2016 at 10:41:06PM +0900, Yoshinori Sato wrote: > > Changes v4 > > - split patch. > > - remove unneeded #address > > Actually, I think #address-cells is supposed to be set for > interrupt-map. It defines the size of the first field. OK. reverted it. Thanks. > Rob -- Yoshinori Sato <ysato@users.sourceforge.jp>
[toc] | [prev] | [next] | [standalone]
| From | Yoshinori Sato <ysato@users.sourceforge.jp> |
|---|---|
| Date | 2016-06-29 16:10 +0200 |
| Subject | [PATCH v4 02/22] sh: More early unflatten device tree |
| Message-ID | <rPolJ-5aS-59@gated-at.bofh.it> |
| In reply to | #1433764 |
unflatten required MMU disabled.
Changes v4
none
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
arch/sh/boards/of-generic.c | 6 ------
arch/sh/kernel/setup.c | 7 +++++++
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/arch/sh/boards/of-generic.c b/arch/sh/boards/of-generic.c
index 8dbf978..3db4294 100644
--- a/arch/sh/boards/of-generic.c
+++ b/arch/sh/boards/of-generic.c
@@ -129,12 +129,6 @@ static void __init sh_of_setup(char **cmdline_p)
{
struct device_node *root;
-#ifdef CONFIG_USE_BUILTIN_DTB
- unflatten_and_copy_device_tree();
-#else
- unflatten_device_tree();
-#endif
-
board_time_init = sh_of_time_init;
sh_mv.mv_name = "Unknown SH model";
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 5b9eb70..86f2792 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -271,6 +271,13 @@ void __ref sh_fdt_init(phys_addr_t dt_phys)
void __init setup_arch(char **cmdline_p)
{
+#ifdef CONFIG_OF
+#ifdef CONFIG_USE_BUILTIN_DTB
+ unflatten_and_copy_device_tree();
+#else
+ unflatten_device_tree();
+#endif
+#endif
enable_mmu();
ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
--
2.7.0
[toc] | [prev] | [standalone]
Page 2 of 2 — ← Prev page 1 [2]
Back to top | Article view | linux.kernel
csiph-web