* [PATCH v6] MIPS: NI 169445 board support
@ 2017-07-18 18:29 Nathan Sullivan
2017-07-24 16:06 ` Rob Herring
2017-08-07 15:26 ` Ralf Baechle
0 siblings, 2 replies; 6+ messages in thread
From: Nathan Sullivan @ 2017-07-18 18:29 UTC (permalink / raw)
To: ralf, robh+dt; +Cc: devicetree, linux-mips, linux-kernel, Nathan Sullivan
Support the National Instruments 169445 board.
Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>
---
Changes since v5:
- make device tree addresses on the internal bus relative, and compile with
W=2 to be sure they are in the right format.
Documentation/devicetree/bindings/mips/ni.txt | 7 ++
MAINTAINERS | 8 ++
arch/mips/boot/dts/Makefile | 1 +
arch/mips/boot/dts/ni/169445.dts | 100 ++++++++++++++++++++++++
arch/mips/boot/dts/ni/Makefile | 7 ++
arch/mips/configs/generic/board-ni169445.config | 27 +++++++
arch/mips/generic/Kconfig | 6 ++
arch/mips/generic/vmlinux.its.S | 25 ++++++
8 files changed, 181 insertions(+)
create mode 100644 Documentation/devicetree/bindings/mips/ni.txt
create mode 100644 arch/mips/boot/dts/ni/169445.dts
create mode 100644 arch/mips/boot/dts/ni/Makefile
create mode 100644 arch/mips/configs/generic/board-ni169445.config
diff --git a/Documentation/devicetree/bindings/mips/ni.txt b/Documentation/devicetree/bindings/mips/ni.txt
new file mode 100644
index 0000000..722bf2d
--- /dev/null
+++ b/Documentation/devicetree/bindings/mips/ni.txt
@@ -0,0 +1,7 @@
+National Instruments MIPS platforms
+
+required root node properties:
+ - compatible: must be "ni,169445"
+
+CPU Nodes
+ - compatible: must be "mti,mips14KEc"
diff --git a/MAINTAINERS b/MAINTAINERS
index 7d9bd4a..73fa2e0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9294,6 +9294,14 @@ F: include/linux/sunrpc/
F: include/uapi/linux/nfs*
F: include/uapi/linux/sunrpc/
+NI169445 MIPS ARCHITECTURE
+M: Nathan Sullivan <nathan.sullivan@ni.com>
+L: linux-mips@linux-mips.org
+S: Maintained
+F: arch/mips/boot/dts/ni/
+F: arch/mips/configs/generic/board-ni169445.config
+F: Documentation/devicetree/bindings/mips/ni.txt
+
NILFS2 FILESYSTEM
M: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
L: linux-nilfs@vger.kernel.org
diff --git a/arch/mips/boot/dts/Makefile b/arch/mips/boot/dts/Makefile
index b9db492..27b0f37 100644
--- a/arch/mips/boot/dts/Makefile
+++ b/arch/mips/boot/dts/Makefile
@@ -4,6 +4,7 @@ dts-dirs += img
dts-dirs += ingenic
dts-dirs += lantiq
dts-dirs += mti
+dts-dirs += ni
dts-dirs += netlogic
dts-dirs += pic32
dts-dirs += qca
diff --git a/arch/mips/boot/dts/ni/169445.dts b/arch/mips/boot/dts/ni/169445.dts
new file mode 100644
index 0000000..5389ef4
--- /dev/null
+++ b/arch/mips/boot/dts/ni/169445.dts
@@ -0,0 +1,100 @@
+/dts-v1/;
+
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "ni,169445";
+
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ cpu@0 {
+ device_type = "cpu";
+ compatible = "mti,mips14KEc";
+ clocks = <&baseclk>;
+ reg = <0>;
+ };
+ };
+
+ memory@0 {
+ device_type = "memory";
+ reg = <0x0 0x10000000>;
+ };
+
+ baseclk: baseclock {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <50000000>;
+ };
+
+ cpu_intc: interrupt-controller {
+ #address-cells = <0>;
+ compatible = "mti,cpu-interrupt-controller";
+ interrupt-controller;
+ #interrupt-cells = <1>;
+ };
+
+ ahb@1f300000 {
+ compatible = "simple-bus";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0x0 0x1f300000 0x80FFF>;
+
+ gpio1: gpio@10 {
+ compatible = "ni,169445-nand-gpio";
+ reg = <0x10 0x4>;
+ reg-names = "dat";
+ gpio-controller;
+ #gpio-cells = <2>;
+ };
+
+ gpio2: gpio@14 {
+ compatible = "ni,169445-nand-gpio";
+ reg = <0x14 0x4>;
+ reg-names = "dat";
+ gpio-controller;
+ #gpio-cells = <2>;
+ no-output;
+ };
+
+ nand@0 {
+ compatible = "gpio-control-nand";
+ nand-on-flash-bbt;
+ nand-ecc-mode = "soft_bch";
+ nand-ecc-step-size = <512>;
+ nand-ecc-strength = <4>;
+ reg = <0x0 4>;
+ gpios = <&gpio2 0 0>, /* rdy */
+ <&gpio1 1 0>, /* nce */
+ <&gpio1 2 0>, /* ale */
+ <&gpio1 3 0>, /* cle */
+ <&gpio1 4 0>; /* nwp */
+ };
+
+ serial@80000 {
+ compatible = "ns16550a";
+ reg = <0x80000 0x1000>;
+ interrupt-parent = <&cpu_intc>;
+ interrupts = <6>;
+ clocks = <&baseclk>;
+ reg-shift = <0>;
+ };
+
+ ethernet@40000 {
+ compatible = "snps,dwmac-4.10a";
+ interrupt-parent = <&cpu_intc>;
+ interrupts = <5>;
+ interrupt-names = "macirq";
+ reg = <0x40000 0x2000>;
+ clock-names = "stmmaceth", "pclk";
+ clocks = <&baseclk>, <&baseclk>;
+
+ phy-mode = "rgmii";
+
+ fixed-link {
+ speed = <1000>;
+ full-duplex;
+ };
+ };
+ };
+};
diff --git a/arch/mips/boot/dts/ni/Makefile b/arch/mips/boot/dts/ni/Makefile
new file mode 100644
index 0000000..66cfdff
--- /dev/null
+++ b/arch/mips/boot/dts/ni/Makefile
@@ -0,0 +1,7 @@
+dtb-$(CONFIG_FIT_IMAGE_FDT_NI169445) += 169445.dtb
+
+# Force kbuild to make empty built-in.o if necessary
+obj- += dummy.o
+
+always := $(dtb-y)
+clean-files := *.dtb *.dtb.S
diff --git a/arch/mips/configs/generic/board-ni169445.config b/arch/mips/configs/generic/board-ni169445.config
new file mode 100644
index 0000000..0bae1f8
--- /dev/null
+++ b/arch/mips/configs/generic/board-ni169445.config
@@ -0,0 +1,27 @@
+CONFIG_FIT_IMAGE_FDT_NI169445=y
+
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_OF_PLATFORM=y
+
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_GENERIC_PLATFORM=y
+
+CONFIG_MTD=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CMDLINE_PARTS=y
+
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_BCH=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_GPIO=y
+CONFIG_MTD_NAND_IDS=y
+
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_BLOCK=y
+
+CONFIG_NETDEVICES=y
+CONFIG_STMMAC_ETH=y
+CONFIG_STMMAC_PLATFORM=y
+CONFIG_DWMAC_GENERIC=y
diff --git a/arch/mips/generic/Kconfig b/arch/mips/generic/Kconfig
index a606b3f..fbf0813 100644
--- a/arch/mips/generic/Kconfig
+++ b/arch/mips/generic/Kconfig
@@ -16,4 +16,10 @@ config LEGACY_BOARD_SEAD3
Enable this to include support for booting on MIPS SEAD-3 FPGA-based
development boards, which boot using a legacy boot protocol.
+config FIT_IMAGE_FDT_NI169445
+ bool "Include FDT for NI 169445"
+ help
+ Enable this to include the FDT for the 169445 platform from
+ National Instruments in the FIT kernel image.
+
endif
diff --git a/arch/mips/generic/vmlinux.its.S b/arch/mips/generic/vmlinux.its.S
index f67fbf1..de851f7 100644
--- a/arch/mips/generic/vmlinux.its.S
+++ b/arch/mips/generic/vmlinux.its.S
@@ -29,3 +29,28 @@
};
};
};
+
+#ifdef CONFIG_FIT_IMAGE_FDT_NI169445
+/ {
+ images {
+ fdt@ni169445 {
+ description = "NI 169445 device tree";
+ data = /incbin/("boot/dts/ni/169445.dtb");
+ type = "flat_dt";
+ arch = "mips";
+ compression = "none";
+ hash@0 {
+ algo = "sha1";
+ };
+ };
+ };
+
+ configurations {
+ conf@ni169445 {
+ description = "NI 169445 Linux Kernel";
+ kernel = "kernel@0";
+ fdt = "fdt@ni169445";
+ };
+ };
+};
+#endif
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v6] MIPS: NI 169445 board support
2017-07-18 18:29 [PATCH v6] MIPS: NI 169445 board support Nathan Sullivan
@ 2017-07-24 16:06 ` Rob Herring
2017-08-07 15:26 ` Ralf Baechle
1 sibling, 0 replies; 6+ messages in thread
From: Rob Herring @ 2017-07-24 16:06 UTC (permalink / raw)
To: Nathan Sullivan; +Cc: ralf, devicetree, linux-mips, linux-kernel
On Tue, Jul 18, 2017 at 01:29:09PM -0500, Nathan Sullivan wrote:
> Support the National Instruments 169445 board.
>
> Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>
> ---
> Changes since v5:
>
> - make device tree addresses on the internal bus relative, and compile with
> W=2 to be sure they are in the right format.
>
> Documentation/devicetree/bindings/mips/ni.txt | 7 ++
> MAINTAINERS | 8 ++
> arch/mips/boot/dts/Makefile | 1 +
> arch/mips/boot/dts/ni/169445.dts | 100 ++++++++++++++++++++++++
> arch/mips/boot/dts/ni/Makefile | 7 ++
> arch/mips/configs/generic/board-ni169445.config | 27 +++++++
> arch/mips/generic/Kconfig | 6 ++
> arch/mips/generic/vmlinux.its.S | 25 ++++++
> 8 files changed, 181 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/mips/ni.txt
> create mode 100644 arch/mips/boot/dts/ni/169445.dts
> create mode 100644 arch/mips/boot/dts/ni/Makefile
> create mode 100644 arch/mips/configs/generic/board-ni169445.config
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v6] MIPS: NI 169445 board support
2017-07-18 18:29 [PATCH v6] MIPS: NI 169445 board support Nathan Sullivan
2017-07-24 16:06 ` Rob Herring
@ 2017-08-07 15:26 ` Ralf Baechle
2017-08-07 15:32 ` Nathan Sullivan
2017-08-07 17:24 ` Paul Burton
1 sibling, 2 replies; 6+ messages in thread
From: Ralf Baechle @ 2017-08-07 15:26 UTC (permalink / raw)
To: Nathan Sullivan, Paul Burton
Cc: robh+dt, devicetree, linux-mips, linux-kernel
On Tue, Jul 18, 2017 at 01:29:09PM -0500, Nathan Sullivan wrote:
> Support the National Instruments 169445 board.
Thanks, applied with minor changes:
> --- a/arch/mips/boot/dts/Makefile
> +++ b/arch/mips/boot/dts/Makefile
> @@ -4,6 +4,7 @@ dts-dirs += img
> dts-dirs += ingenic
> dts-dirs += lantiq
> dts-dirs += mti
> +dts-dirs += ni
> dts-dirs += netlogic
> dts-dirs += pic32
> dts-dirs += qca
Keep things in alphabetical order, so ni should go after netlogic.
> diff --git a/arch/mips/generic/vmlinux.its.S b/arch/mips/generic/vmlinux.its.S
> index f67fbf1..de851f7 100644
> --- a/arch/mips/generic/vmlinux.its.S
> +++ b/arch/mips/generic/vmlinux.its.S
> @@ -29,3 +29,28 @@
> };
> };
> };
> +
> +#ifdef CONFIG_FIT_IMAGE_FDT_NI169445
> +/ {
> + images {
[...]
> + };
> +};
> +#endif
There's been a reject on this file because of a Boston #ifdefed section.
I've fixed that up but we need a cleaner solution. Paul, any suggestions?
Ralf
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v6] MIPS: NI 169445 board support
2017-08-07 15:26 ` Ralf Baechle
@ 2017-08-07 15:32 ` Nathan Sullivan
2017-08-07 17:24 ` Paul Burton
1 sibling, 0 replies; 6+ messages in thread
From: Nathan Sullivan @ 2017-08-07 15:32 UTC (permalink / raw)
To: Ralf Baechle; +Cc: Paul Burton, robh+dt, devicetree, linux-mips, linux-kernel
On Mon, Aug 07, 2017 at 05:26:48PM +0200, Ralf Baechle wrote:
> On Tue, Jul 18, 2017 at 01:29:09PM -0500, Nathan Sullivan wrote:
>
> > Support the National Instruments 169445 board.
>
> Thanks, applied with minor changes:
>
> Ralf
Thank you for your patience!
Nathan
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v6] MIPS: NI 169445 board support
2017-08-07 15:26 ` Ralf Baechle
2017-08-07 15:32 ` Nathan Sullivan
@ 2017-08-07 17:24 ` Paul Burton
2017-08-07 21:36 ` Ralf Baechle
1 sibling, 1 reply; 6+ messages in thread
From: Paul Burton @ 2017-08-07 17:24 UTC (permalink / raw)
To: Ralf Baechle
Cc: Nathan Sullivan, robh+dt, devicetree, linux-mips, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1005 bytes --]
Hi Ralf,
On Monday, 7 August 2017 08:26:48 PDT Ralf Baechle wrote:
> On Tue, Jul 18, 2017 at 01:29:09PM -0500, Nathan Sullivan wrote:
> > diff --git a/arch/mips/generic/vmlinux.its.S
> > b/arch/mips/generic/vmlinux.its.S index f67fbf1..de851f7 100644
> > --- a/arch/mips/generic/vmlinux.its.S
> > +++ b/arch/mips/generic/vmlinux.its.S
> > @@ -29,3 +29,28 @@
> >
> > };
> >
> > };
> >
> > };
> >
> > +
> > +#ifdef CONFIG_FIT_IMAGE_FDT_NI169445
> > +/ {
> > + images {
>
> [...]
>
> > + };
> > +};
> > +#endif
>
> There's been a reject on this file because of a Boston #ifdefed section.
> I've fixed that up but we need a cleaner solution. Paul, any suggestions?
>
> Ralf
One possibility would be for us to split the board portions of vmlinux.its.S
out into a file per-board, perhaps board-boston.its.S, board-ni169445.its.S
etc. The build process would then have to concatenate the right files to
generate the full image tree source.
Does that sound good to you?
Thanks,
Paul
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v6] MIPS: NI 169445 board support
2017-08-07 17:24 ` Paul Burton
@ 2017-08-07 21:36 ` Ralf Baechle
0 siblings, 0 replies; 6+ messages in thread
From: Ralf Baechle @ 2017-08-07 21:36 UTC (permalink / raw)
To: Paul Burton
Cc: Nathan Sullivan, robh+dt, devicetree, linux-mips, linux-kernel
On Mon, Aug 07, 2017 at 10:24:05AM -0700, Paul Burton wrote:
> One possibility would be for us to split the board portions of vmlinux.its.S
> out into a file per-board, perhaps board-boston.its.S, board-ni169445.its.S
> etc. The build process would then have to concatenate the right files to
> generate the full image tree source.
>
> Does that sound good to you?
Yes, that sounds good.
Ralf
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-08-07 21:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-18 18:29 [PATCH v6] MIPS: NI 169445 board support Nathan Sullivan
2017-07-24 16:06 ` Rob Herring
2017-08-07 15:26 ` Ralf Baechle
2017-08-07 15:32 ` Nathan Sullivan
2017-08-07 17:24 ` Paul Burton
2017-08-07 21:36 ` Ralf Baechle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).