Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1456301 > unrolled thread

[PATCH v2 00/17] ARM: mvebu: misc Armada 38x/39x DT and v7 defconfig improvements

Started byGrzegorz Jaszczyk <jaz@semihalf.com>
First post2016-08-04 12:20 +0200
Last post2016-08-09 12:10 +0200
Articles 12 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH v2 00/17] ARM: mvebu: misc Armada 38x/39x DT and v7 defconfig improvements Grzegorz Jaszczyk <jaz@semihalf.com> - 2016-08-04 12:20 +0200
    [PATCH v2 17/17] ARM: dts: mvebu: armada-395-gp: add support for the Armada 395 GP Board Grzegorz Jaszczyk <jaz@semihalf.com> - 2016-08-04 12:20 +0200
      Re: [PATCH v2 17/17] ARM: dts: mvebu: armada-395-gp: add support for  the Armada 395 GP Board Rob Herring <robh@kernel.org> - 2016-08-04 20:30 +0200
    [PATCH v2 10/17] ARM: dts: mvebu: armada-39x: add missing nodes describing GPIO's Grzegorz Jaszczyk <jaz@semihalf.com> - 2016-08-04 12:20 +0200
    [PATCH v2 08/17] ARM: dts: mvebu: armada-39x: enable the thermal sensor in Armada-39x SoCs Grzegorz Jaszczyk <jaz@semihalf.com> - 2016-08-04 12:20 +0200
    [PATCH v2 09/17] ARM: dts: mvebu: armada-39x: enable watchdog for all Armada-39x SoCs Grzegorz Jaszczyk <jaz@semihalf.com> - 2016-08-04 12:20 +0200
    [PATCH v2 13/17] ARM: dts: mvebu: armada-395: add support for the Armada 395 SoC family Grzegorz Jaszczyk <jaz@semihalf.com> - 2016-08-04 12:30 +0200
      Re: [PATCH v2 13/17] ARM: dts: mvebu: armada-395: add support for  the Armada 395 SoC family Rob Herring <robh@kernel.org> - 2016-08-04 20:20 +0200
    [PATCH v2 11/17] ARM: dts: mvebu: armada-39x: add missing nodes describing USB2.0 and USB3.0 Grzegorz Jaszczyk <jaz@semihalf.com> - 2016-08-04 12:30 +0200
    [PATCH v2 05/17] ARM: dts: mvebu: armada-390: add missing compatibility string and bracket Grzegorz Jaszczyk <jaz@semihalf.com> - 2016-08-04 12:30 +0200
    Re: [PATCH v2 00/17] ARM: mvebu: misc Armada 38x/39x DT and v7 defconfig improvements Gregory CLEMENT <gregory.clement@free-electrons.com> - 2016-08-08 17:10 +0200
      Re: [PATCH v2 00/17] ARM: mvebu: misc Armada 38x/39x DT and v7  defconfig improvements Grzegorz Jaszczyk <jaz@semihalf.com> - 2016-08-09 12:10 +0200

#1456301 — [PATCH v2 00/17] ARM: mvebu: misc Armada 38x/39x DT and v7 defconfig improvements

FromGrzegorz Jaszczyk <jaz@semihalf.com>
Date2016-08-04 12:20 +0200
Subject[PATCH v2 00/17] ARM: mvebu: misc Armada 38x/39x DT and v7 defconfig improvements
Message-ID<s2nUR-7xS-3@gated-at.bofh.it>
Hello,

This is the second version of patch-set which enables some commonly used
features in mvebu_v7_defconfig and updates old or introduces new dts/dtsi
related to Armada 38x and Armada 39x SoC family. All comments from
v1 are included, more details in a changelog below.

Any comments or remarks would be welcome.

Best regards,
Grzegorz

Changelog:
v1 -> v2

- Add at least one line of commit log entry for those patches, which
contained only commit title.

Suggested by Andrew Lunn and Gregory Clement.

- Drop patch "ARM: mvebu: enable E1000E in mvebu_v7_defconfig", since it
enables PCIe card which is not a part of the SoC.

Suggested by Russell King and Thomas Petazzoni.

- Change dts prefixes in commit title from "ARM: mvebu: <board_name>" to
"ARM: dts: mvebu: <board_name>"

Suggested by Gregory Clement.

- Add nodes describing the eeproms connected to I2C buses in
armada-390-db.dts and armada-395-gp.dts. Also add information about
connectors used and described in mentioned dts's.

Suggested by Gregory Clement.

- Improve devicetree bindings about required property for Marvell Armada 39x
family: Armada 398 based boards should have only "marvell,armada398" and not
"marvell,armada395".

Suggested by Rob Herring.

Grzegorz Jaszczyk (17):
  ARM: mvebu: enable MTD command line partition table in
    mvebu_v7_defconfig
  ARM: mvebu: enable UBI and UBIFS in mvebu_v7_defconfig
  ARM: dts: mvebu: a385-db-ap: enable USB (orion-ehci) port
  ARM: dts: mvebu: a385-db-ap: add default partition description for
    NAND
  ARM: dts: mvebu: armada-390: add missing compatibility string and
    bracket
  ARM: dts: mvebu: armada-39x: update the SDHCI node on Armada 39x
  ARM: dts: mvebu: armada-39x: enable PMU, CA9 SoC Controller and
    Coherency fabric
  ARM: dts: mvebu: armada-39x: enable the thermal sensor in Armada-39x
    SoCs
  ARM: dts: mvebu: armada-39x: enable watchdog for all Armada-39x SoCs
  ARM: dts: mvebu: armada-39x: add missing nodes describing GPIO's
  ARM: dts: mvebu: armada-39x: add missing nodes describing USB2.0 and
    USB3.0
  ARM: dts: mvebu: armada-39x: enable rtc for all Armada-39x SoCs
  ARM: dts: mvebu: armada-395: add support for the Armada 395 SoC family
  ARM: dts: mvebu: armada-398: update the dtsi about missing interfaces
  ARM: dts: mvebu: armada-398-db: enable supported usb interfaces
  ARM: dts: mvebu: armada-390-db: add support for the Armada 390 DB
    board
  ARM: dts: mvebu: armada-395-gp: add support for the Armada 395 GP
    Board

 .../devicetree/bindings/arm/marvell/armada-39x.txt |  15 +-
 arch/arm/boot/dts/armada-385-db-ap.dts             |  30 +++-
 arch/arm/boot/dts/armada-390-db.dts                | 175 +++++++++++++++++++++
 arch/arm/boot/dts/armada-390.dtsi                  |   3 +
 arch/arm/boot/dts/armada-395-gp.dts                | 163 +++++++++++++++++++
 arch/arm/boot/dts/armada-395.dtsi                  |  76 +++++++++
 arch/arm/boot/dts/armada-398-db.dts                |   8 +
 arch/arm/boot/dts/armada-398.dtsi                  |  10 +-
 arch/arm/boot/dts/armada-39x.dtsi                  |  94 ++++++++++-
 arch/arm/configs/mvebu_v7_defconfig                |   3 +
 10 files changed, 570 insertions(+), 7 deletions(-)
 create mode 100644 arch/arm/boot/dts/armada-390-db.dts
 create mode 100644 arch/arm/boot/dts/armada-395-gp.dts
 create mode 100644 arch/arm/boot/dts/armada-395.dtsi

-- 
1.8.3.1

[toc] | [next] | [standalone]


#1456303 — [PATCH v2 17/17] ARM: dts: mvebu: armada-395-gp: add support for the Armada 395 GP Board

FromGrzegorz Jaszczyk <jaz@semihalf.com>
Date2016-08-04 12:20 +0200
Subject[PATCH v2 17/17] ARM: dts: mvebu: armada-395-gp: add support for the Armada 395 GP Board
Message-ID<s2nUS-7xS-33@gated-at.bofh.it>
In reply to#1456301
This commit adds description for the following features for this board:

- Serial port
- PCIe interfaces
- USB2.0
- USB3.0
- SDIO
- 1024 MiB NAND-FLASH
- SATA
- I2C buses

Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 .../devicetree/bindings/arm/marvell/armada-39x.txt |   4 +
 arch/arm/boot/dts/armada-395-gp.dts                | 163 +++++++++++++++++++++
 2 files changed, 167 insertions(+)
 create mode 100644 arch/arm/boot/dts/armada-395-gp.dts

diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-39x.txt b/Documentation/devicetree/bindings/arm/marvell/armada-39x.txt
index 2d92212..8946866 100644
--- a/Documentation/devicetree/bindings/arm/marvell/armada-39x.txt
+++ b/Documentation/devicetree/bindings/arm/marvell/armada-39x.txt
@@ -15,6 +15,10 @@ Required root node property:
 
 compatible: must contain "marvell,armada395"
 
+Example:
+
+compatible = "marvell,a395-gp", "marvell,armada395", "marvell,armada390";
+
 Boards using the Marvell Armada 398 SoC shall have the following
 property before the common "marvell,armada390" one:
 
diff --git a/arch/arm/boot/dts/armada-395-gp.dts b/arch/arm/boot/dts/armada-395-gp.dts
new file mode 100644
index 0000000..2cdbba8
--- /dev/null
+++ b/arch/arm/boot/dts/armada-395-gp.dts
@@ -0,0 +1,163 @@
+/*
+ * Device Tree file for Marvell Armada 395 GP board
+ *
+ * Copyright (C) 2016 Marvell
+ *
+ * Grzegorz Jaszczyk <jaz@semihalf.com>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is licensed under the terms of the GNU General Public
+ *     License version 2.  This program is licensed "as is" without
+ *     any warranty of any kind, whether express or implied.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+#include "armada-395.dtsi"
+
+/ {
+	model = "Marvell Armada 395 GP Board";
+	compatible = "marvell,a395-gp", "marvell,armada395",
+		     "marvell,armada390";
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x40000000>; /* 1 GB */
+	};
+
+	soc {
+		ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
+			  MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000>;
+
+		internal-regs {
+			i2c@11000 {
+				status = "okay";
+				clock-frequency = <100000>;
+
+				eeprom@57 {
+					compatible = "atmel,24c64";
+					reg = <0x57>;
+				};
+			};
+
+			serial@12000 {
+				/*
+				 * Exported on the micro USB connector CON17
+				 * through an FTDI
+				 */
+				status = "okay";
+			};
+
+			/* CON1 */
+			usb@58000 {
+				status = "okay";
+			};
+
+			/* CON2 */
+			sata@a8000 {
+				status = "okay";
+			};
+
+			flash@d0000 {
+				status = "okay";
+				pinctrl-0 = <&nand_pins>;
+				pinctrl-names = "default";
+				num-cs = <1>;
+				marvell,nand-keep-config;
+				marvell,nand-enable-arbiter;
+				nand-on-flash-bbt;
+				nand-ecc-strength = <4>;
+				nand-ecc-step-size = <512>;
+
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "U-Boot";
+						reg = <0x00000000 0x00600000>;
+						read-only;
+					};
+
+					partition@800000 {
+						label = "uImage";
+						reg = <0x00600000 0x00400000>;
+						read-only;
+					};
+
+					partition@1000000 {
+						label = "Root";
+						reg = <0x00a00000 0x3f600000>;
+					};
+				};
+			};
+
+			/* CON18 */
+			sdhci@d8000 {
+				clock-frequency = <200000000>;
+				broken-cd;
+				wp-inverted;
+				bus-width = <8>;
+				status = "okay";
+				no-1-8-v;
+			};
+
+			/* CON4 */
+			usb3@f0000 {
+				status = "okay";
+			};
+		};
+
+		pcie-controller {
+			status = "okay";
+
+			/*
+			 * The two PCIe units are accessible through
+			 * mini PCIe slot on the board.
+			 */
+
+			/* CON7 */
+			pcie@2,0 {
+				/* Port 1, Lane 0 */
+				status = "okay";
+			};
+
+			/* CON8 */
+			pcie@4,0 {
+				/* Port 3, Lane 0 */
+				status = "okay";
+			};
+		};
+	};
+};
-- 
1.8.3.1

[toc] | [prev] | [next] | [standalone]


#1456624 — Re: [PATCH v2 17/17] ARM: dts: mvebu: armada-395-gp: add support for the Armada 395 GP Board

FromRob Herring <robh@kernel.org>
Date2016-08-04 20:30 +0200
SubjectRe: [PATCH v2 17/17] ARM: dts: mvebu: armada-395-gp: add support for the Armada 395 GP Board
Message-ID<s2vz3-4Ek-11@gated-at.bofh.it>
In reply to#1456303
On Thu, Aug 04, 2016 at 12:14:20PM +0200, Grzegorz Jaszczyk wrote:
> This commit adds description for the following features for this board:
> 
> - Serial port
> - PCIe interfaces
> - USB2.0
> - USB3.0
> - SDIO
> - 1024 MiB NAND-FLASH
> - SATA
> - I2C buses
> 
> Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com>
> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> ---
>  .../devicetree/bindings/arm/marvell/armada-39x.txt |   4 +
>  arch/arm/boot/dts/armada-395-gp.dts                | 163 +++++++++++++++++++++
>  2 files changed, 167 insertions(+)
>  create mode 100644 arch/arm/boot/dts/armada-395-gp.dts

Acked-by: Rob Herring <robh@kernel.org>

[toc] | [prev] | [next] | [standalone]


#1456304 — [PATCH v2 10/17] ARM: dts: mvebu: armada-39x: add missing nodes describing GPIO's

FromGrzegorz Jaszczyk <jaz@semihalf.com>
Date2016-08-04 12:20 +0200
Subject[PATCH v2 10/17] ARM: dts: mvebu: armada-39x: add missing nodes describing GPIO's
Message-ID<s2nUS-7xS-41@gated-at.bofh.it>
In reply to#1456301
The whole Armada 39x SoC family of processors has GPIO's which all can be
supported with existing driver.

Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 arch/arm/boot/dts/armada-39x.dtsi | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi
index 5e01438..0749878 100644
--- a/arch/arm/boot/dts/armada-39x.dtsi
+++ b/arch/arm/boot/dts/armada-39x.dtsi
@@ -55,6 +55,8 @@
 	compatible = "marvell,armada390";
 
 	aliases {
+		gpio0 = &gpio0;
+		gpio1 = &gpio1;
 		serial0 = &uart0;
 		serial1 = &uart1;
 		serial2 = &uart2;
@@ -274,6 +276,34 @@
 				};
 			};
 
+			gpio0: gpio@18100 {
+				compatible = "marvell,orion-gpio";
+				reg = <0x18100 0x40>;
+				ngpios = <32>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,
+					     <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
+					     <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>,
+					     <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
+			};
+
+			gpio1: gpio@18140 {
+				compatible = "marvell,orion-gpio";
+				reg = <0x18140 0x40>;
+				ngpios = <28>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>,
+					     <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>,
+					     <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>,
+					     <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
+			};
+
 			system-controller@18200 {
 				compatible = "marvell,armada-390-system-controller",
 					     "marvell,armada-370-xp-system-controller";
-- 
1.8.3.1

[toc] | [prev] | [next] | [standalone]


#1456305 — [PATCH v2 08/17] ARM: dts: mvebu: armada-39x: enable the thermal sensor in Armada-39x SoCs

FromGrzegorz Jaszczyk <jaz@semihalf.com>
Date2016-08-04 12:20 +0200
Subject[PATCH v2 08/17] ARM: dts: mvebu: armada-39x: enable the thermal sensor in Armada-39x SoCs
Message-ID<s2nUS-7xS-43@gated-at.bofh.it>
In reply to#1456301
The whole Armada 39x SoC family of processors has thermal sensor which can
be supported with existing driver.

Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 arch/arm/boot/dts/armada-39x.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi
index 8a22c02..03dc0ec 100644
--- a/arch/arm/boot/dts/armada-39x.dtsi
+++ b/arch/arm/boot/dts/armada-39x.dtsi
@@ -413,6 +413,12 @@
 				clocks = <&mainpll>;
 				clock-output-names = "nand";
 			};
+
+			thermal@e8078 {
+				compatible = "marvell,armada380-thermal";
+				reg = <0xe4078 0x4>, <0xe4074 0x4>;
+				status = "okay";
+			};
 		};
 
 		pcie-controller {
-- 
1.8.3.1

[toc] | [prev] | [next] | [standalone]


#1456306 — [PATCH v2 09/17] ARM: dts: mvebu: armada-39x: enable watchdog for all Armada-39x SoCs

FromGrzegorz Jaszczyk <jaz@semihalf.com>
Date2016-08-04 12:20 +0200
Subject[PATCH v2 09/17] ARM: dts: mvebu: armada-39x: enable watchdog for all Armada-39x SoCs
Message-ID<s2nUT-7xS-47@gated-at.bofh.it>
In reply to#1456301
The whole Armada 39x SoC family of processors has watchdog which can be
supported with existing driver.

Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com>
Reviewed-by: Lior Amsalem <alior@marvell.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 arch/arm/boot/dts/armada-39x.dtsi | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi
index 03dc0ec..5e01438 100644
--- a/arch/arm/boot/dts/armada-39x.dtsi
+++ b/arch/arm/boot/dts/armada-39x.dtsi
@@ -322,6 +322,14 @@
 				clock-names = "nbclk", "fixed";
 			};
 
+			watchdog@20300 {
+				compatible = "marvell,armada-380-wdt";
+				reg = <0x20300 0x34>, <0x20704 0x4>,
+				      <0x18260 0x4>;
+				clocks = <&coreclk 2>, <&refclk>;
+				clock-names = "nbclk", "fixed";
+			};
+
 			cpurst@20800 {
 				compatible = "marvell,armada-370-cpu-reset";
 				reg = <0x20800 0x10>;
@@ -534,5 +542,12 @@
 			#clock-cells = <0>;
 			clock-frequency = <1000000000>;
 		};
+
+		/* 25 MHz reference crystal */
+		refclk: oscillator {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <25000000>;
+		};
 	};
 };
-- 
1.8.3.1

[toc] | [prev] | [next] | [standalone]


#1456308 — [PATCH v2 13/17] ARM: dts: mvebu: armada-395: add support for the Armada 395 SoC family

FromGrzegorz Jaszczyk <jaz@semihalf.com>
Date2016-08-04 12:30 +0200
Subject[PATCH v2 13/17] ARM: dts: mvebu: armada-395: add support for the Armada 395 SoC family
Message-ID<s2o4y-7BP-11@gated-at.bofh.it>
In reply to#1456301
Beside interfaces described in the armada-39x.dtsi, the Armada 395 SoC
family supports: 2 x SATA3 (2 ports in one unit) and the USB3.0

Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com>
---
 .../devicetree/bindings/arm/marvell/armada-39x.txt | 11 +++-
 arch/arm/boot/dts/armada-395.dtsi                  | 76 ++++++++++++++++++++++
 2 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/boot/dts/armada-395.dtsi

diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-39x.txt b/Documentation/devicetree/bindings/arm/marvell/armada-39x.txt
index 53d4ff9..2d92212 100644
--- a/Documentation/devicetree/bindings/arm/marvell/armada-39x.txt
+++ b/Documentation/devicetree/bindings/arm/marvell/armada-39x.txt
@@ -8,8 +8,15 @@ Required root node property:
 
  - compatible: must contain "marvell,armada390"
 
-In addition, boards using the Marvell Armada 398 SoC shall have the
-following property before the previous one:
+In addition, boards using the Marvell Armada 395 SoC shall have the
+following property before the common "marvell,armada390" one:
+
+Required root node property:
+
+compatible: must contain "marvell,armada395"
+
+Boards using the Marvell Armada 398 SoC shall have the following
+property before the common "marvell,armada390" one:
 
 Required root node property:
 
diff --git a/arch/arm/boot/dts/armada-395.dtsi b/arch/arm/boot/dts/armada-395.dtsi
new file mode 100644
index 0000000..ab5dc49
--- /dev/null
+++ b/arch/arm/boot/dts/armada-395.dtsi
@@ -0,0 +1,76 @@
+/*
+ * Device Tree Include file for Marvell Armada 395 SoC.
+ *
+ * Copyright (C) 2016 Marvell
+ *
+ * Grzegorz Jaszczyk <jaz@semihalf.com>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file 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.
+ *
+ *     This file is distributed in the hope that it will be useful
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "armada-39x.dtsi"
+
+/ {
+	compatible = "marvell,armada395", "marvell,armada390";
+
+	soc {
+		internal-regs {
+			pinctrl@18000 {
+				compatible = "marvell,mv88f6925-pinctrl";
+				reg = <0x18000 0x20>;
+			};
+
+			sata@a8000 {
+				compatible = "marvell,armada-380-ahci";
+				reg = <0xa8000 0x2000>;
+				interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&gateclk 15>;
+				status = "disabled";
+			};
+
+			usb3@f0000 {
+				compatible = "marvell,armada-380-xhci";
+				reg = <0xf0000 0x4000>,<0xf4000 0x4000>;
+				interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&gateclk 9>;
+				status = "disabled";
+			};
+		};
+	};
+};
-- 
1.8.3.1

[toc] | [prev] | [next] | [standalone]


#1456621 — Re: [PATCH v2 13/17] ARM: dts: mvebu: armada-395: add support for the Armada 395 SoC family

FromRob Herring <robh@kernel.org>
Date2016-08-04 20:20 +0200
SubjectRe: [PATCH v2 13/17] ARM: dts: mvebu: armada-395: add support for the Armada 395 SoC family
Message-ID<s2vpn-4Aq-9@gated-at.bofh.it>
In reply to#1456308
On Thu, Aug 04, 2016 at 12:14:16PM +0200, Grzegorz Jaszczyk wrote:
> Beside interfaces described in the armada-39x.dtsi, the Armada 395 SoC
> family supports: 2 x SATA3 (2 ports in one unit) and the USB3.0
> 
> Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com>
> ---
>  .../devicetree/bindings/arm/marvell/armada-39x.txt | 11 +++-
>  arch/arm/boot/dts/armada-395.dtsi                  | 76 ++++++++++++++++++++++
>  2 files changed, 85 insertions(+), 2 deletions(-)
>  create mode 100644 arch/arm/boot/dts/armada-395.dtsi

Acked-by: Rob Herring <robh@kernel.org>

[toc] | [prev] | [next] | [standalone]


#1456309 — [PATCH v2 11/17] ARM: dts: mvebu: armada-39x: add missing nodes describing USB2.0 and USB3.0

FromGrzegorz Jaszczyk <jaz@semihalf.com>
Date2016-08-04 12:30 +0200
Subject[PATCH v2 11/17] ARM: dts: mvebu: armada-39x: add missing nodes describing USB2.0 and USB3.0
Message-ID<s2o4y-7BP-19@gated-at.bofh.it>
In reply to#1456301
The whole Armada 39x SoC family of processors has one USB2.0 and one
USB3.0 which all can be supported with existing drivers.

Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 arch/arm/boot/dts/armada-39x.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi
index 0749878..1225cd8 100644
--- a/arch/arm/boot/dts/armada-39x.dtsi
+++ b/arch/arm/boot/dts/armada-39x.dtsi
@@ -381,6 +381,14 @@
 				reg = <0x22000 0x1000>;
 			};
 
+			usb@58000 {
+				compatible = "marvell,orion-ehci";
+				reg = <0x58000 0x500>;
+				interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&gateclk 18>;
+				status = "disabled";
+			};
+
 			xor@60800 {
 				compatible = "marvell,armada-380-xor", "marvell,orion-xor";
 				reg = <0x60800 0x100
@@ -457,6 +465,14 @@
 				reg = <0xe4078 0x4>, <0xe4074 0x4>;
 				status = "okay";
 			};
+
+			usb3@f8000 {
+				compatible = "marvell,armada-380-xhci";
+				reg = <0xf8000 0x4000>,<0xfc000 0x4000>;
+				interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&gateclk 10>;
+				status = "disabled";
+			};
 		};
 
 		pcie-controller {
-- 
1.8.3.1

[toc] | [prev] | [next] | [standalone]


#1456312 — [PATCH v2 05/17] ARM: dts: mvebu: armada-390: add missing compatibility string and bracket

FromGrzegorz Jaszczyk <jaz@semihalf.com>
Date2016-08-04 12:30 +0200
Subject[PATCH v2 05/17] ARM: dts: mvebu: armada-390: add missing compatibility string and bracket
Message-ID<s2o4y-7BP-29@gated-at.bofh.it>
In reply to#1456301
The armada-390.dtsi was broken since the first patch which adds Device Tree
files for Armada 39x SoC was introduced.

Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Cc: <stable@vger.kernel.org> # 4.0+
Fixes 538da83 ("ARM: mvebu: add Device Tree files for Armada 39x SoC and board")
---
 arch/arm/boot/dts/armada-390.dtsi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/boot/dts/armada-390.dtsi b/arch/arm/boot/dts/armada-390.dtsi
index 094e39c..6cd18d8 100644
--- a/arch/arm/boot/dts/armada-390.dtsi
+++ b/arch/arm/boot/dts/armada-390.dtsi
@@ -47,6 +47,8 @@
 #include "armada-39x.dtsi"
 
 / {
+	compatible = "marvell,armada390";
+
 	soc {
 		internal-regs {
 			pinctrl@18000 {
@@ -54,4 +56,5 @@
 				reg = <0x18000 0x20>;
 			};
 		};
+	};
 };
-- 
1.8.3.1

[toc] | [prev] | [next] | [standalone]


#1457856

FromGregory CLEMENT <gregory.clement@free-electrons.com>
Date2016-08-08 17:10 +0200
Message-ID<s3UlH-2YB-3@gated-at.bofh.it>
In reply to#1456301
Hi Grzegorz,
 
 On Thu, Aug 04 2016, Grzegorz Jaszczyk <jaz@semihalf.com> wrote:

> Hello,
>
> This is the second version of patch-set which enables some commonly used
> features in mvebu_v7_defconfig and updates old or introduces new dts/dtsi
> related to Armada 38x and Armada 39x SoC family. All comments from
> v1 are included, more details in a changelog below.
>
> Any comments or remarks would be welcome.

All the patches are applied on the mvbeu branches:
The first 2 on mvebu/defconfig and all the other on mvebu/dt

Thanks,

Gregory


>
> Best regards,
> Grzegorz
>
> Changelog:
> v1 -> v2
>
> - Add at least one line of commit log entry for those patches, which
> contained only commit title.
>
> Suggested by Andrew Lunn and Gregory Clement.
>
> - Drop patch "ARM: mvebu: enable E1000E in mvebu_v7_defconfig", since it
> enables PCIe card which is not a part of the SoC.
>
> Suggested by Russell King and Thomas Petazzoni.
>
> - Change dts prefixes in commit title from "ARM: mvebu: <board_name>" to
> "ARM: dts: mvebu: <board_name>"
>
> Suggested by Gregory Clement.
>
> - Add nodes describing the eeproms connected to I2C buses in
> armada-390-db.dts and armada-395-gp.dts. Also add information about
> connectors used and described in mentioned dts's.
>
> Suggested by Gregory Clement.
>
> - Improve devicetree bindings about required property for Marvell Armada 39x
> family: Armada 398 based boards should have only "marvell,armada398" and not
> "marvell,armada395".
>
> Suggested by Rob Herring.
>
> Grzegorz Jaszczyk (17):
>   ARM: mvebu: enable MTD command line partition table in
>     mvebu_v7_defconfig
>   ARM: mvebu: enable UBI and UBIFS in mvebu_v7_defconfig
>   ARM: dts: mvebu: a385-db-ap: enable USB (orion-ehci) port
>   ARM: dts: mvebu: a385-db-ap: add default partition description for
>     NAND
>   ARM: dts: mvebu: armada-390: add missing compatibility string and
>     bracket
>   ARM: dts: mvebu: armada-39x: update the SDHCI node on Armada 39x
>   ARM: dts: mvebu: armada-39x: enable PMU, CA9 SoC Controller and
>     Coherency fabric
>   ARM: dts: mvebu: armada-39x: enable the thermal sensor in Armada-39x
>     SoCs
>   ARM: dts: mvebu: armada-39x: enable watchdog for all Armada-39x SoCs
>   ARM: dts: mvebu: armada-39x: add missing nodes describing GPIO's
>   ARM: dts: mvebu: armada-39x: add missing nodes describing USB2.0 and
>     USB3.0
>   ARM: dts: mvebu: armada-39x: enable rtc for all Armada-39x SoCs
>   ARM: dts: mvebu: armada-395: add support for the Armada 395 SoC family
>   ARM: dts: mvebu: armada-398: update the dtsi about missing interfaces
>   ARM: dts: mvebu: armada-398-db: enable supported usb interfaces
>   ARM: dts: mvebu: armada-390-db: add support for the Armada 390 DB
>     board
>   ARM: dts: mvebu: armada-395-gp: add support for the Armada 395 GP
>     Board
>
>  .../devicetree/bindings/arm/marvell/armada-39x.txt |  15 +-
>  arch/arm/boot/dts/armada-385-db-ap.dts             |  30 +++-
>  arch/arm/boot/dts/armada-390-db.dts                | 175 +++++++++++++++++++++
>  arch/arm/boot/dts/armada-390.dtsi                  |   3 +
>  arch/arm/boot/dts/armada-395-gp.dts                | 163 +++++++++++++++++++
>  arch/arm/boot/dts/armada-395.dtsi                  |  76 +++++++++
>  arch/arm/boot/dts/armada-398-db.dts                |   8 +
>  arch/arm/boot/dts/armada-398.dtsi                  |  10 +-
>  arch/arm/boot/dts/armada-39x.dtsi                  |  94 ++++++++++-
>  arch/arm/configs/mvebu_v7_defconfig                |   3 +
>  10 files changed, 570 insertions(+), 7 deletions(-)
>  create mode 100644 arch/arm/boot/dts/armada-390-db.dts
>  create mode 100644 arch/arm/boot/dts/armada-395-gp.dts
>  create mode 100644 arch/arm/boot/dts/armada-395.dtsi
>
> -- 
> 1.8.3.1
>

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[toc] | [prev] | [next] | [standalone]


#1458567 — Re: [PATCH v2 00/17] ARM: mvebu: misc Armada 38x/39x DT and v7 defconfig improvements

FromGrzegorz Jaszczyk <jaz@semihalf.com>
Date2016-08-09 12:10 +0200
SubjectRe: [PATCH v2 00/17] ARM: mvebu: misc Armada 38x/39x DT and v7 defconfig improvements
Message-ID<s4c8V-6b7-19@gated-at.bofh.it>
In reply to#1457856
Hi Gregory

2016-08-08 17:03 GMT+02:00 Gregory CLEMENT <gregory.clement@free-electrons.com>:
> Hi Grzegorz,
>
>  On Thu, Aug 04 2016, Grzegorz Jaszczyk <jaz@semihalf.com> wrote:
>
>> Hello,
>>
>> This is the second version of patch-set which enables some commonly used
>> features in mvebu_v7_defconfig and updates old or introduces new dts/dtsi
>> related to Armada 38x and Armada 39x SoC family. All comments from
>> v1 are included, more details in a changelog below.
>>
>> Any comments or remarks would be welcome.
>
> All the patches are applied on the mvbeu branches:
> The first 2 on mvebu/defconfig and all the other on mvebu/dt
>

Good news - thank you,
Grzegorz

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web