* [PATCH 1/5] dt-bindings: Add vendor prefix lx for Linutronix
2020-02-06 11:33 [PATCH 0/5] dts: Add Linutronix Testbox bage
@ 2020-02-06 11:33 ` bage
2020-02-06 21:55 ` Rob Herring
2020-02-10 7:43 ` Maxime Ripard
2020-02-06 11:33 ` [PATCH 2/5] dt-bindings: arm: sunxi: Add Linutronix Testbox bage
` (4 subsequent siblings)
5 siblings, 2 replies; 26+ messages in thread
From: bage @ 2020-02-06 11:33 UTC (permalink / raw)
To: devicetree
Cc: Bastian Germann, Rob Herring, Mark Rutland, Maxime Ripard,
Benedikt Spranger
From: Bastian Germann <bage@linutronix.de>
Add a vendor prefix for lx, known as Linutronix GmbH.
Website: https://linutronix.de/
Co-developed-by: Benedikt Spranger <b.spranger@linutronix.de>
Signed-off-by: Benedikt Spranger <b.spranger@linutronix.de>
Signed-off-by: Bastian Germann <bage@linutronix.de>
---
Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
index 7fcd48adc276..f6fea38b0848 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@ -561,6 +561,8 @@ patternProperties:
description: LSI Corp. (LSI Logic)
"^lwn,.*":
description: Liebherr-Werk Nenzing GmbH
+ "^lx,.*":
+ description: Linutronix GmbH
"^macnica,.*":
description: Macnica Americas
"^mapleboard,.*":
--
2.20.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 1/5] dt-bindings: Add vendor prefix lx for Linutronix
2020-02-06 11:33 ` [PATCH 1/5] dt-bindings: Add vendor prefix lx for Linutronix bage
@ 2020-02-06 21:55 ` Rob Herring
2020-02-10 7:43 ` Maxime Ripard
1 sibling, 0 replies; 26+ messages in thread
From: Rob Herring @ 2020-02-06 21:55 UTC (permalink / raw)
To: bage; +Cc: devicetree, Bastian Germann, Benedikt Spranger
On Thu, 6 Feb 2020 12:33:23 +0100, bage@linutronix.de wrote:
> From: Bastian Germann <bage@linutronix.de>
>
> Add a vendor prefix for lx, known as Linutronix GmbH.
> Website: https://linutronix.de/
>
> Co-developed-by: Benedikt Spranger <b.spranger@linutronix.de>
> Signed-off-by: Benedikt Spranger <b.spranger@linutronix.de>
> Signed-off-by: Bastian Germann <bage@linutronix.de>
> ---
> Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++
> 1 file changed, 2 insertions(+)
>
Applied, thanks.
Rob
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 1/5] dt-bindings: Add vendor prefix lx for Linutronix
2020-02-06 11:33 ` [PATCH 1/5] dt-bindings: Add vendor prefix lx for Linutronix bage
2020-02-06 21:55 ` Rob Herring
@ 2020-02-10 7:43 ` Maxime Ripard
2020-02-11 17:15 ` Rob Herring
2020-02-12 9:39 ` Benedikt Spranger
1 sibling, 2 replies; 26+ messages in thread
From: Maxime Ripard @ 2020-02-10 7:43 UTC (permalink / raw)
To: bage; +Cc: devicetree, Rob Herring, Mark Rutland, Benedikt Spranger
[-- Attachment #1: Type: text/plain, Size: 1116 bytes --]
Hi,
On Thu, Feb 06, 2020 at 12:33:23PM +0100, bage@linutronix.de wrote:
> From: Bastian Germann <bage@linutronix.de>
>
> Add a vendor prefix for lx, known as Linutronix GmbH.
> Website: https://linutronix.de/
>
> Co-developed-by: Benedikt Spranger <b.spranger@linutronix.de>
> Signed-off-by: Benedikt Spranger <b.spranger@linutronix.de>
> Signed-off-by: Bastian Germann <bage@linutronix.de>
> ---
> Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> index 7fcd48adc276..f6fea38b0848 100644
> --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> @@ -561,6 +561,8 @@ patternProperties:
> description: LSI Corp. (LSI Logic)
> "^lwn,.*":
> description: Liebherr-Werk Nenzing GmbH
> + "^lx,.*":
> + description: Linutronix GmbH
Vendor names are usually either the vendor name itself or the stock
name, so you should really use linutronix here
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 1/5] dt-bindings: Add vendor prefix lx for Linutronix
2020-02-10 7:43 ` Maxime Ripard
@ 2020-02-11 17:15 ` Rob Herring
2020-02-12 9:39 ` Benedikt Spranger
1 sibling, 0 replies; 26+ messages in thread
From: Rob Herring @ 2020-02-11 17:15 UTC (permalink / raw)
To: Maxime Ripard, bage; +Cc: devicetree, Mark Rutland, Benedikt Spranger
On Mon, Feb 10, 2020 at 1:43 AM Maxime Ripard <maxime@cerno.tech> wrote:
>
> Hi,
>
> On Thu, Feb 06, 2020 at 12:33:23PM +0100, bage@linutronix.de wrote:
> > From: Bastian Germann <bage@linutronix.de>
> >
> > Add a vendor prefix for lx, known as Linutronix GmbH.
> > Website: https://linutronix.de/
> >
> > Co-developed-by: Benedikt Spranger <b.spranger@linutronix.de>
> > Signed-off-by: Benedikt Spranger <b.spranger@linutronix.de>
> > Signed-off-by: Bastian Germann <bage@linutronix.de>
> > ---
> > Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> > index 7fcd48adc276..f6fea38b0848 100644
> > --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
> > +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> > @@ -561,6 +561,8 @@ patternProperties:
> > description: LSI Corp. (LSI Logic)
> > "^lwn,.*":
> > description: Liebherr-Werk Nenzing GmbH
> > + "^lx,.*":
> > + description: Linutronix GmbH
>
> Vendor names are usually either the vendor name itself or the stock
> name, so you should really use linutronix here
Good point.
I hadn't pushed this out, so I've dropped it until sorted.
Rob
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 1/5] dt-bindings: Add vendor prefix lx for Linutronix
2020-02-10 7:43 ` Maxime Ripard
2020-02-11 17:15 ` Rob Herring
@ 2020-02-12 9:39 ` Benedikt Spranger
2020-02-12 11:56 ` Maxime Ripard
1 sibling, 1 reply; 26+ messages in thread
From: Benedikt Spranger @ 2020-02-12 9:39 UTC (permalink / raw)
To: Maxime Ripard; +Cc: bage, devicetree, Rob Herring, Mark Rutland
[-- Attachment #1: Type: text/plain, Size: 964 bytes --]
On Mon, 10 Feb 2020 08:43:10 +0100
Maxime Ripard <maxime@cerno.tech> wrote:
> Vendor names are usually either the vendor name itself or the stock
> name, so you should really use linutronix here
May you kindly enlighten me why?
"lx" is used internaly and externaly in projects, publications,
contracts, etc. as common abbreviation by the Linutronix GmbH.
Therefore it was self-evident to use this abbreviation in the device
tree.
As I did not found any documented rule in the kernel documentation,
which denote a restriction for the vendor abbreviation in the device
tree bindings the decision for "lx" was clear.
A quick look into
"Documentation/devicetree/bindings/vendor-prefixes.yaml"
assured me in the decision to use "lx".
Here some example not fitting your rule:
"^ad,.*":
"^adi,.*":
"^al,.*":
"^anvo,.*":
...
In summary I would be encouraged if "lx" gets in, as it is *our*
abbreviation.
Regards
Benedikt Spranger
[-- Attachment #2: Digitale Signatur von OpenPGP --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 1/5] dt-bindings: Add vendor prefix lx for Linutronix
2020-02-12 9:39 ` Benedikt Spranger
@ 2020-02-12 11:56 ` Maxime Ripard
0 siblings, 0 replies; 26+ messages in thread
From: Maxime Ripard @ 2020-02-12 11:56 UTC (permalink / raw)
To: Benedikt Spranger; +Cc: bage, devicetree, Rob Herring, Mark Rutland
[-- Attachment #1: Type: text/plain, Size: 1703 bytes --]
On Wed, Feb 12, 2020 at 10:39:42AM +0100, Benedikt Spranger wrote:
> On Mon, 10 Feb 2020 08:43:10 +0100
> Maxime Ripard <maxime@cerno.tech> wrote:
>
> > Vendor names are usually either the vendor name itself or the stock
> > name, so you should really use linutronix here
>
> May you kindly enlighten me why?
>
> "lx" is used internaly and externaly in projects, publications,
> contracts, etc. as common abbreviation by the Linutronix GmbH.
> Therefore it was self-evident to use this abbreviation in the device
> tree.
Googling "linutronix lx" returns approximately 0 meaningful results,
so it's really not "common", at least externally.
"lx linux" doesn't return much either.
> As I did not found any documented rule in the kernel documentation,
> which denote a restriction for the vendor abbreviation in the device
> tree bindings the decision for "lx" was clear.
It's in the devicetree specification:
https://github.com/devicetree-org/devicetree-specification/releases/download/v0.2/devicetree-specification-v0.2.pdf
Section 2.3: Standard Properties
"The recommended format is "manufacturer,model", where manufacturer is
a string describing the name of the manufacturer (such as a stock
ticker symbol)"
> A quick look into
> "Documentation/devicetree/bindings/vendor-prefixes.yaml"
> assured me in the decision to use "lx".
> Here some example not fitting your rule:
> "^ad,.*":
> "^adi,.*":
https://www.nasdaq.com/market-activity/stocks/adi
> "^al,.*":
> "^anvo,.*":
That's the name of the company
> ...
>
> In summary I would be encouraged if "lx" gets in, as it is *our*
> abbreviation.
How using the name of your company that *everybody* knows it by would
be discouraging?
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 2/5] dt-bindings: arm: sunxi: Add Linutronix Testbox
2020-02-06 11:33 [PATCH 0/5] dts: Add Linutronix Testbox bage
2020-02-06 11:33 ` [PATCH 1/5] dt-bindings: Add vendor prefix lx for Linutronix bage
@ 2020-02-06 11:33 ` bage
2020-02-06 21:58 ` Rob Herring
2020-02-06 11:33 ` [PATCH 3/5] ARM: dts: sun7i: lamobo-r1: Use SPDX identifier bage
` (3 subsequent siblings)
5 siblings, 1 reply; 26+ messages in thread
From: bage @ 2020-02-06 11:33 UTC (permalink / raw)
To: devicetree; +Cc: Bastian Germann, Rob Herring, Mark Rutland, Maxime Ripard
From: Bastian Germann <bage@linutronix.de>
Add device tree bindings for the newly added Linutronix Testbox board.
Signed-off-by: Bastian Germann <bage@linutronix.de>
---
Documentation/devicetree/bindings/arm/sunxi.yaml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/sunxi.yaml b/Documentation/devicetree/bindings/arm/sunxi.yaml
index cffe8bb0bad1..5ee10e3f84c8 100644
--- a/Documentation/devicetree/bindings/arm/sunxi.yaml
+++ b/Documentation/devicetree/bindings/arm/sunxi.yaml
@@ -384,6 +384,12 @@ properties:
- const: linksprite,pcduino3-nano
- const: allwinner,sun7i-a20
+ - description: Linutronix Testbox v2
+ items:
+ - const: lx,testbox-v2
+ - const: lamobo,lamobo-r1
+ - const: allwinner,sun7i-a20
+
- description: HAOYU Electronics Marsboard A10
items:
- const: haoyu,a10-marsboard
--
2.20.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 3/5] ARM: dts: sun7i: lamobo-r1: Use SPDX identifier
2020-02-06 11:33 [PATCH 0/5] dts: Add Linutronix Testbox bage
2020-02-06 11:33 ` [PATCH 1/5] dt-bindings: Add vendor prefix lx for Linutronix bage
2020-02-06 11:33 ` [PATCH 2/5] dt-bindings: arm: sunxi: Add Linutronix Testbox bage
@ 2020-02-06 11:33 ` bage
2020-02-06 12:54 ` Thomas Gleixner
2020-02-06 11:33 ` [PATCH 4/5] ARM: dts: sun7i: lamobo-r1: Split out commons bage
` (2 subsequent siblings)
5 siblings, 1 reply; 26+ messages in thread
From: bage @ 2020-02-06 11:33 UTC (permalink / raw)
To: devicetree
Cc: Bastian Germann, Rob Herring, Mark Rutland, Maxime Ripard,
Benedikt Spranger, Jelle de Jong, linux-spdx
From: Bastian Germann <bage@linutronix.de>
Adopt the SPDX license identifier.
The 2nd license text is specified by SPDX as MIT. So the identifier has
to be (GPL-2.0-or-later OR MIT). SPDX's X11 has an additional advertising
clause.
Co-developed-by: Benedikt Spranger <b.spranger@linutronix.de>
Signed-off-by: Benedikt Spranger <b.spranger@linutronix.de>
Signed-off-by: Bastian Germann <bage@linutronix.de>
Cc: Jelle de Jong <jelledejong@powercraft.nl>
Cc: linux-spdx@vger.kernel.org
---
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 39 +----------------------
1 file changed, 1 insertion(+), 38 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
index 17fa8901fc00..37cbd78ea07c 100644
--- a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
+++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
@@ -1,43 +1,6 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
/*
* Copyright 2015 Jelle de Jong <jelledejong@powercraft.nl>
- *
- * 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 "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/;
--
2.20.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 3/5] ARM: dts: sun7i: lamobo-r1: Use SPDX identifier
2020-02-06 11:33 ` [PATCH 3/5] ARM: dts: sun7i: lamobo-r1: Use SPDX identifier bage
@ 2020-02-06 12:54 ` Thomas Gleixner
0 siblings, 0 replies; 26+ messages in thread
From: Thomas Gleixner @ 2020-02-06 12:54 UTC (permalink / raw)
To: bage, devicetree
Cc: Bastian Germann, Rob Herring, Mark Rutland, Maxime Ripard,
Benedikt Spranger, Jelle de Jong, linux-spdx
Bastian,
bage@linutronix.de writes:
> From: Bastian Germann <bage@linutronix.de>
>
> Adopt the SPDX license identifier.
>
> The 2nd license text is specified by SPDX as MIT. So the identifier has
> to be (GPL-2.0-or-later OR MIT). SPDX's X11 has an additional advertising
> clause.
Yes, the license text of the alternative license is plain MIT.
> @@ -1,43 +1,6 @@
> +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
> /*
> * Copyright 2015 Jelle de Jong <jelledejong@powercraft.nl>
> - *
> - * 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.
Jelle, can you please clarify your intention here?
> - * 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 "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.
> */
Thanks,
tglx
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 4/5] ARM: dts: sun7i: lamobo-r1: Split out commons
2020-02-06 11:33 [PATCH 0/5] dts: Add Linutronix Testbox bage
` (2 preceding siblings ...)
2020-02-06 11:33 ` [PATCH 3/5] ARM: dts: sun7i: lamobo-r1: Use SPDX identifier bage
@ 2020-02-06 11:33 ` bage
2020-02-10 7:45 ` Maxime Ripard
2020-02-06 11:33 ` [PATCH 5/5] ARM: dts: sun7i: Add Linutronix Testbox v2 board bage
2020-02-14 11:10 ` [PATCH v2 0/3] dts: Add Linutronix Testbox bage
5 siblings, 1 reply; 26+ messages in thread
From: bage @ 2020-02-06 11:33 UTC (permalink / raw)
To: devicetree
Cc: Bastian Germann, Rob Herring, Mark Rutland, Maxime Ripard,
Benedikt Spranger
From: Bastian Germann <bage@linutronix.de>
Split out common parts of the Lamobo R1 board to enable using them for
Linutronix Testbox board integration.
Co-developed-by: Benedikt Spranger <b.spranger@linutronix.de>
Signed-off-by: Benedikt Spranger <b.spranger@linutronix.de>
Signed-off-by: Bastian Germann <bage@linutronix.de>
---
.../boot/dts/sun7i-a20-lamobo-r1-common.dtsi | 271 ++++++++++++++++++
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 264 +----------------
2 files changed, 272 insertions(+), 263 deletions(-)
create mode 100644 arch/arm/boot/dts/sun7i-a20-lamobo-r1-common.dtsi
diff --git a/arch/arm/boot/dts/sun7i-a20-lamobo-r1-common.dtsi b/arch/arm/boot/dts/sun7i-a20-lamobo-r1-common.dtsi
new file mode 100644
index 000000000000..ff9f7d99f5e0
--- /dev/null
+++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1-common.dtsi
@@ -0,0 +1,271 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
+/*
+ * Copyright 2015 Jelle de Jong <jelledejong@powercraft.nl>
+ */
+
+/dts-v1/;
+#include "sun7i-a20.dtsi"
+#include "sunxi-common-regulators.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+
+/ {
+ aliases {
+ serial0 = &uart0;
+ serial1 = &uart3;
+ serial2 = &uart7;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
+ hdmi-connector {
+ compatible = "hdmi-connector";
+ type = "a";
+
+ port {
+ hdmi_con_in: endpoint {
+ remote-endpoint = <&hdmi_out_con>;
+ };
+ };
+ };
+
+ reg_gmac_3v3: gmac-3v3 {
+ compatible = "regulator-fixed";
+ regulator-name = "gmac-3v3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ startup-delay-us = <100000>;
+ enable-active-high;
+ gpio = <&pio 7 23 GPIO_ACTIVE_HIGH>; /* PH23 */
+ };
+};
+
+&ahci {
+ target-supply = <®_ahci_5v>;
+ status = "okay";
+};
+
+&codec {
+ status = "okay";
+};
+
+&cpu0 {
+ cpu-supply = <®_dcdc2>;
+};
+
+&de {
+ status = "okay";
+};
+
+&ehci0 {
+ status = "okay";
+};
+
+&ehci1 {
+ status = "okay";
+};
+
+&gmac {
+ pinctrl-names = "default";
+ pinctrl-0 = <&gmac_rgmii_pins>;
+ phy-mode = "rgmii";
+ phy-supply = <®_gmac_3v3>;
+ status = "okay";
+
+ fixed-link {
+ speed = <1000>;
+ full-duplex;
+ };
+
+ mdio {
+ compatible = "snps,dwmac-mdio";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ switch: ethernet-switch@1e {
+ compatible = "brcm,bcm53125";
+ reg = <30>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port0: port@0 {
+ reg = <0>;
+ label = "lan2";
+ };
+
+ port1: port@1 {
+ reg = <1>;
+ label = "lan3";
+ };
+
+ port2: port@2 {
+ reg = <2>;
+ label = "lan4";
+ };
+
+ port3: port@3 {
+ reg = <3>;
+ label = "wan";
+ };
+
+ port4: port@4 {
+ reg = <4>;
+ label = "lan1";
+ };
+
+ port8: port@8 {
+ reg = <8>;
+ label = "cpu";
+ ethernet = <&gmac>;
+ phy-mode = "rgmii-txid";
+ fixed-link {
+ speed = <1000>;
+ full-duplex;
+ };
+ };
+ };
+ };
+ };
+};
+
+&hdmi {
+ status = "okay";
+};
+
+&hdmi_out {
+ hdmi_out_con: endpoint {
+ remote-endpoint = <&hdmi_con_in>;
+ };
+};
+
+&i2c0 {
+ status = "okay";
+
+ axp209: pmic@34 {
+ reg = <0x34>;
+ interrupt-parent = <&nmi_intc>;
+ interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+ };
+};
+
+&i2c2 {
+ status = "okay";
+};
+
+&ir0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&ir0_rx_pin>;
+ status = "okay";
+};
+
+&mmc0 {
+ vmmc-supply = <®_vcc3v3>;
+ bus-width = <4>;
+ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
+ status = "okay";
+};
+
+&ohci0 {
+ status = "okay";
+};
+
+&otg_sram {
+ status = "okay";
+};
+
+#include "axp209.dtsi"
+
+&ac_power_supply {
+ status = "okay";
+};
+
+&battery_power_supply {
+ status = "okay";
+};
+
+®_ahci_5v {
+ gpio = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */
+ status = "okay";
+};
+
+®_dcdc2 {
+ regulator-always-on;
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <1400000>;
+ regulator-name = "vdd-cpu";
+};
+
+®_dcdc3 {
+ regulator-always-on;
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <1400000>;
+ regulator-name = "vdd-int-dll";
+};
+
+®_ldo1 {
+ regulator-name = "vdd-rtc";
+};
+
+®_ldo2 {
+ regulator-always-on;
+ regulator-min-microvolt = <3000000>;
+ regulator-max-microvolt = <3000000>;
+ regulator-name = "avcc";
+};
+
+®_usb0_vbus {
+ status = "okay";
+};
+
+®_usb2_vbus {
+ gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>; /* PH12 */
+ status = "okay";
+};
+
+&spi0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&spi0_pi_pins>,
+ <&spi0_cs0_pi_pin>,
+ <&spi0_cs1_pi_pin>;
+ status = "okay";
+};
+
+&uart0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart0_pb_pins>;
+ status = "okay";
+};
+
+&uart3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart3_ph_pins>;
+ status = "okay";
+};
+
+&uart7 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart7_pi_pins>;
+ status = "okay";
+};
+
+&usb_otg {
+ dr_mode = "otg";
+ status = "okay";
+};
+
+&usb_power_supply {
+ status = "okay";
+};
+
+&usbphy {
+ usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
+ usb0_vbus_power-supply = <&usb_power_supply>;
+ usb0_vbus-supply = <®_usb0_vbus>;
+ usb2_vbus-supply = <®_usb2_vbus>;
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
index 37cbd78ea07c..82013c7ddf84 100644
--- a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
+++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
@@ -4,37 +4,12 @@
*/
/dts-v1/;
-#include "sun7i-a20.dtsi"
-#include "sunxi-common-regulators.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/interrupt-controller/irq.h>
+#include "sun7i-a20-lamobo-r1-common.dtsi"
/ {
model = "Lamobo R1";
compatible = "lamobo,lamobo-r1", "allwinner,sun7i-a20";
- aliases {
- serial0 = &uart0;
- serial1 = &uart3;
- serial2 = &uart7;
- };
-
- chosen {
- stdout-path = "serial0:115200n8";
- };
-
- hdmi-connector {
- compatible = "hdmi-connector";
- type = "a";
-
- port {
- hdmi_con_in: endpoint {
- remote-endpoint = <&hdmi_out_con>;
- };
- };
- };
-
leds {
compatible = "gpio-leds";
@@ -43,241 +18,4 @@
gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>;
};
};
-
- reg_gmac_3v3: gmac-3v3 {
- compatible = "regulator-fixed";
- regulator-name = "gmac-3v3";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- startup-delay-us = <100000>;
- enable-active-high;
- gpio = <&pio 7 23 GPIO_ACTIVE_HIGH>; /* PH23 */
- };
-};
-
-&ahci {
- target-supply = <®_ahci_5v>;
- status = "okay";
-};
-
-&codec {
- status = "okay";
-};
-
-&cpu0 {
- cpu-supply = <®_dcdc2>;
-};
-
-&de {
- status = "okay";
-};
-
-&ehci0 {
- status = "okay";
-};
-
-&ehci1 {
- status = "okay";
-};
-
-&gmac {
- pinctrl-names = "default";
- pinctrl-0 = <&gmac_rgmii_pins>;
- phy-mode = "rgmii";
- phy-supply = <®_gmac_3v3>;
- status = "okay";
-
- fixed-link {
- speed = <1000>;
- full-duplex;
- };
-
- mdio {
- compatible = "snps,dwmac-mdio";
- #address-cells = <1>;
- #size-cells = <0>;
-
- switch: ethernet-switch@1e {
- compatible = "brcm,bcm53125";
- reg = <30>;
-
- ports {
- #address-cells = <1>;
- #size-cells = <0>;
-
- port0: port@0 {
- reg = <0>;
- label = "lan2";
- };
-
- port1: port@1 {
- reg = <1>;
- label = "lan3";
- };
-
- port2: port@2 {
- reg = <2>;
- label = "lan4";
- };
-
- port3: port@3 {
- reg = <3>;
- label = "wan";
- };
-
- port4: port@4 {
- reg = <4>;
- label = "lan1";
- };
-
- port8: port@8 {
- reg = <8>;
- label = "cpu";
- ethernet = <&gmac>;
- phy-mode = "rgmii-txid";
- fixed-link {
- speed = <1000>;
- full-duplex;
- };
- };
- };
- };
- };
-};
-
-&hdmi {
- status = "okay";
-};
-
-&hdmi_out {
- hdmi_out_con: endpoint {
- remote-endpoint = <&hdmi_con_in>;
- };
-};
-
-&i2c0 {
- status = "okay";
-
- axp209: pmic@34 {
- reg = <0x34>;
- interrupt-parent = <&nmi_intc>;
- interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
- };
-};
-
-&i2c2 {
- status = "okay";
-};
-
-&ir0 {
- pinctrl-names = "default";
- pinctrl-0 = <&ir0_rx_pin>;
- status = "okay";
-};
-
-&mmc0 {
- vmmc-supply = <®_vcc3v3>;
- bus-width = <4>;
- cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
- status = "okay";
-};
-
-&ohci0 {
- status = "okay";
-};
-
-&otg_sram {
- status = "okay";
-};
-
-#include "axp209.dtsi"
-
-&ac_power_supply {
- status = "okay";
-};
-
-&battery_power_supply {
- status = "okay";
-};
-
-®_ahci_5v {
- gpio = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */
- status = "okay";
-};
-
-®_dcdc2 {
- regulator-always-on;
- regulator-min-microvolt = <1000000>;
- regulator-max-microvolt = <1400000>;
- regulator-name = "vdd-cpu";
-};
-
-®_dcdc3 {
- regulator-always-on;
- regulator-min-microvolt = <1000000>;
- regulator-max-microvolt = <1400000>;
- regulator-name = "vdd-int-dll";
-};
-
-®_ldo1 {
- regulator-name = "vdd-rtc";
-};
-
-®_ldo2 {
- regulator-always-on;
- regulator-min-microvolt = <3000000>;
- regulator-max-microvolt = <3000000>;
- regulator-name = "avcc";
-};
-
-®_usb0_vbus {
- status = "okay";
-};
-
-®_usb2_vbus {
- gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>; /* PH12 */
- status = "okay";
-};
-
-&spi0 {
- pinctrl-names = "default";
- pinctrl-0 = <&spi0_pi_pins>,
- <&spi0_cs0_pi_pin>,
- <&spi0_cs1_pi_pin>;
- status = "okay";
-};
-
-&uart0 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart0_pb_pins>;
- status = "okay";
-};
-
-&uart3 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart3_ph_pins>;
- status = "okay";
-};
-
-&uart7 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart7_pi_pins>;
- status = "okay";
-};
-
-&usb_otg {
- dr_mode = "otg";
- status = "okay";
-};
-
-&usb_power_supply {
- status = "okay";
-};
-
-&usbphy {
- usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
- usb0_vbus_power-supply = <&usb_power_supply>;
- usb0_vbus-supply = <®_usb0_vbus>;
- usb2_vbus-supply = <®_usb2_vbus>;
- status = "okay";
};
--
2.20.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 4/5] ARM: dts: sun7i: lamobo-r1: Split out commons
2020-02-06 11:33 ` [PATCH 4/5] ARM: dts: sun7i: lamobo-r1: Split out commons bage
@ 2020-02-10 7:45 ` Maxime Ripard
2020-02-12 10:01 ` Benedikt Spranger
0 siblings, 1 reply; 26+ messages in thread
From: Maxime Ripard @ 2020-02-10 7:45 UTC (permalink / raw)
To: bage; +Cc: devicetree, Rob Herring, Mark Rutland, Benedikt Spranger
[-- Attachment #1: Type: text/plain, Size: 620 bytes --]
Hi,
On Thu, Feb 06, 2020 at 12:33:26PM +0100, bage@linutronix.de wrote:
> From: Bastian Germann <bage@linutronix.de>
>
> Split out common parts of the Lamobo R1 board to enable using them for
> Linutronix Testbox board integration.
>
> Co-developed-by: Benedikt Spranger <b.spranger@linutronix.de>
> Signed-off-by: Benedikt Spranger <b.spranger@linutronix.de>
> Signed-off-by: Bastian Germann <bage@linutronix.de>
Looking at the board, it looks like it's just a daughter board to the
lamobo-r1?
If so, you can just include its DTS directly, there's no need to
create a DTSI (an overlay is an option as well).
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 4/5] ARM: dts: sun7i: lamobo-r1: Split out commons
2020-02-10 7:45 ` Maxime Ripard
@ 2020-02-12 10:01 ` Benedikt Spranger
2020-02-12 12:26 ` Maxime Ripard
0 siblings, 1 reply; 26+ messages in thread
From: Benedikt Spranger @ 2020-02-12 10:01 UTC (permalink / raw)
To: Maxime Ripard; +Cc: bage, devicetree, Rob Herring, Mark Rutland
[-- Attachment #1: Type: text/plain, Size: 886 bytes --]
On Mon, 10 Feb 2020 08:45:25 +0100
Maxime Ripard <maxime@cerno.tech> wrote:
> Looking at the board, it looks like it's just a daughter board to the
> lamobo-r1?
It is a daughter board.
> If so, you can just include its DTS directly, there's no need to
> create a DTSI (an overlay is an option as well).
Weighing up to include a DTS and overriding nodes versus splitting
out the commons into a DTSI let to the latter:
Overriding DTB nodes is a mess since it makes it unnessesarily complex
to understand what happens and is hard to debug. I spend quite some
time of my life to get a clou, why a DTB of a board is messed up and
why changes got lost. Including DTS files is a matter of taste and none
of my flavors.
Overlay would be an option, if there is a way to load the overlay
without touching the bootloader or during kexec.
Regards
Benedikt Spranger
[-- Attachment #2: Digitale Signatur von OpenPGP --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 4/5] ARM: dts: sun7i: lamobo-r1: Split out commons
2020-02-12 10:01 ` Benedikt Spranger
@ 2020-02-12 12:26 ` Maxime Ripard
0 siblings, 0 replies; 26+ messages in thread
From: Maxime Ripard @ 2020-02-12 12:26 UTC (permalink / raw)
To: Benedikt Spranger; +Cc: bage, devicetree, Rob Herring, Mark Rutland
[-- Attachment #1: Type: text/plain, Size: 1287 bytes --]
On Wed, Feb 12, 2020 at 11:01:50AM +0100, Benedikt Spranger wrote:
> On Mon, 10 Feb 2020 08:45:25 +0100
> Maxime Ripard <maxime@cerno.tech> wrote:
>
> > Looking at the board, it looks like it's just a daughter board to the
> > lamobo-r1?
> It is a daughter board.
>
> > If so, you can just include its DTS directly, there's no need to
> > create a DTSI (an overlay is an option as well).
>
> Weighing up to include a DTS and overriding nodes versus splitting
> out the commons into a DTSI let to the latter:
>
> Overriding DTB nodes is a mess since it makes it unnessesarily complex
> to understand what happens and is hard to debug. I spend quite some
> time of my life to get a clou, why a DTB of a board is messed up and
> why changes got lost. Including DTS files is a matter of taste and none
> of my flavors.
I don't get it. If it's a daughter board, there's nothing to override,
right?
> Overlay would be an option, if there is a way to load the overlay
> without touching the bootloader or during kexec.
I mean, an overlay is strictly equivalent to including the DTS, so why
are you ok with an overlay and not including it directly?
Aside, U-Boot is able to apply overlays to the device tree before
booting the kernel, you just have to change the boot command a bit.
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 5/5] ARM: dts: sun7i: Add Linutronix Testbox v2 board
2020-02-06 11:33 [PATCH 0/5] dts: Add Linutronix Testbox bage
` (3 preceding siblings ...)
2020-02-06 11:33 ` [PATCH 4/5] ARM: dts: sun7i: lamobo-r1: Split out commons bage
@ 2020-02-06 11:33 ` bage
2020-02-10 7:56 ` Maxime Ripard
2020-02-14 11:10 ` [PATCH v2 0/3] dts: Add Linutronix Testbox bage
5 siblings, 1 reply; 26+ messages in thread
From: bage @ 2020-02-06 11:33 UTC (permalink / raw)
To: devicetree
Cc: Bastian Germann, Rob Herring, Mark Rutland, Maxime Ripard,
Benedikt Spranger
From: Bastian Germann <bage@linutronix.de>
The Testbox board is an open hardware enhancement for the Lamobo R1 router
board. The Testbox board is used in the CI-RT project to manage devices
under test (https://ci-rt.linutronix.de).
The hardware project is located at https://github.com/ci-rt/testbox-shield
The Testbox v2 expands the Lamobo R1 router board with
- a power supply,
- a CAN bus PHY,
- a power control,
- a relay,
- a I2C EEPROM,
- a secure key storage (ATECC608a) and
- two RS232 compliant serial ports.
Co-developed-by: Benedikt Spranger <b.spranger@linutronix.de>
Signed-off-by: Benedikt Spranger <b.spranger@linutronix.de>
Signed-off-by: Bastian Germann <bage@linutronix.de>
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/sun7i-a20-lx-testbox-v2.dts | 65 +++++++++++++++++++
2 files changed, 66 insertions(+)
create mode 100644 arch/arm/boot/dts/sun7i-a20-lx-testbox-v2.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 08011dc8c7a6..383541842695 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1069,6 +1069,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \
sun7i-a20-i12-tvbox.dtb \
sun7i-a20-icnova-swac.dtb \
sun7i-a20-lamobo-r1.dtb \
+ sun7i-a20-lx-testbox-v2.dtb \
sun7i-a20-m3.dtb \
sun7i-a20-mk808c.dtb \
sun7i-a20-olimex-som-evb.dtb \
diff --git a/arch/arm/boot/dts/sun7i-a20-lx-testbox-v2.dts b/arch/arm/boot/dts/sun7i-a20-lx-testbox-v2.dts
new file mode 100644
index 000000000000..3b91fb026a92
--- /dev/null
+++ b/arch/arm/boot/dts/sun7i-a20-lx-testbox-v2.dts
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright 2020 Linutronix GmbH
+ * Author: Benedikt Spranger <b.spranger@linutronix.de>
+ */
+
+/dts-v1/;
+#include "sun7i-a20-lamobo-r1-common.dtsi"
+
+/ {
+ model = "Lamobo R1";
+ compatible = "lx,testbox-v2", "lamobo,lamobo-r1", "allwinner,sun7i-a20";
+
+ leds {
+ compatible = "gpio-leds";
+ pinctrl-names = "default";
+ pinctrl-0 = <&led_pins_lamobo_r1>;
+
+ led-green {
+ label = "lamobo_r1:green:usr";
+ gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>;
+ };
+
+ led-opto1 {
+ label = "lamobo_r1:opto:powerswitch";
+ gpios = <&pio 7 3 GPIO_ACTIVE_HIGH>;
+ };
+
+ led-opto2 {
+ label = "lamobo_r1:opto:relay";
+ gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>;
+ };
+ };
+};
+
+&i2c2 {
+ clock-frequency = <100000>;
+ status = "okay";
+
+ eeprom: eeprom@50 {
+ compatible = "atmel,24c08";
+ reg = <0x50>;
+ status = "okay";
+ };
+
+ atecc508a@60 {
+ compatible = "atmel,atecc508a";
+ reg = <0x60>;
+ };
+};
+
+&pio {
+ led_pins_lamobo_r1: led-pins {
+ pins = "PH3", "PH5", "PH24";
+ function = "gpio_out";
+ drive-strength = <40>;
+ bias-disable;
+ };
+};
+
+&can0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&can_ph_pins>;
+ status = "okay";
+};
--
2.20.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 5/5] ARM: dts: sun7i: Add Linutronix Testbox v2 board
2020-02-06 11:33 ` [PATCH 5/5] ARM: dts: sun7i: Add Linutronix Testbox v2 board bage
@ 2020-02-10 7:56 ` Maxime Ripard
2020-02-12 11:20 ` Benedikt Spranger
0 siblings, 1 reply; 26+ messages in thread
From: Maxime Ripard @ 2020-02-10 7:56 UTC (permalink / raw)
To: bage; +Cc: devicetree, Rob Herring, Mark Rutland, Benedikt Spranger
[-- Attachment #1: Type: text/plain, Size: 2396 bytes --]
On Thu, Feb 06, 2020 at 12:33:27PM +0100, bage@linutronix.de wrote:
> From: Bastian Germann <bage@linutronix.de>
>
> The Testbox board is an open hardware enhancement for the Lamobo R1 router
> board. The Testbox board is used in the CI-RT project to manage devices
> under test (https://ci-rt.linutronix.de).
>
> The hardware project is located at https://github.com/ci-rt/testbox-shield
>
> The Testbox v2 expands the Lamobo R1 router board with
> - a power supply,
> - a CAN bus PHY,
> - a power control,
> - a relay,
> - a I2C EEPROM,
> - a secure key storage (ATECC608a) and
> - two RS232 compliant serial ports.
>
> Co-developed-by: Benedikt Spranger <b.spranger@linutronix.de>
> Signed-off-by: Benedikt Spranger <b.spranger@linutronix.de>
> Signed-off-by: Bastian Germann <bage@linutronix.de>
> ---
> arch/arm/boot/dts/Makefile | 1 +
> arch/arm/boot/dts/sun7i-a20-lx-testbox-v2.dts | 65 +++++++++++++++++++
> 2 files changed, 66 insertions(+)
> create mode 100644 arch/arm/boot/dts/sun7i-a20-lx-testbox-v2.dts
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 08011dc8c7a6..383541842695 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -1069,6 +1069,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \
> sun7i-a20-i12-tvbox.dtb \
> sun7i-a20-icnova-swac.dtb \
> sun7i-a20-lamobo-r1.dtb \
> + sun7i-a20-lx-testbox-v2.dtb \
> sun7i-a20-m3.dtb \
> sun7i-a20-mk808c.dtb \
> sun7i-a20-olimex-som-evb.dtb \
> diff --git a/arch/arm/boot/dts/sun7i-a20-lx-testbox-v2.dts b/arch/arm/boot/dts/sun7i-a20-lx-testbox-v2.dts
> new file mode 100644
> index 000000000000..3b91fb026a92
> --- /dev/null
> +++ b/arch/arm/boot/dts/sun7i-a20-lx-testbox-v2.dts
> @@ -0,0 +1,65 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
Using a double license would be great, otherwise other projects
licensed under something else than the GPL might not be able to use
it.
> +/*
> + * Copyright 2020 Linutronix GmbH
> + * Author: Benedikt Spranger <b.spranger@linutronix.de>
> + */
> +
> +/dts-v1/;
> +#include "sun7i-a20-lamobo-r1-common.dtsi"
> +
> +/ {
> + model = "Lamobo R1";
> + compatible = "lx,testbox-v2", "lamobo,lamobo-r1", "allwinner,sun7i-a20";
> +
> + leds {
> + compatible = "gpio-leds";
> + pinctrl-names = "default";
> + pinctrl-0 = <&led_pins_lamobo_r1>;
You don't need the pinctrl nodes at all for GPIOs
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 5/5] ARM: dts: sun7i: Add Linutronix Testbox v2 board
2020-02-10 7:56 ` Maxime Ripard
@ 2020-02-12 11:20 ` Benedikt Spranger
2020-02-12 12:33 ` Maxime Ripard
0 siblings, 1 reply; 26+ messages in thread
From: Benedikt Spranger @ 2020-02-12 11:20 UTC (permalink / raw)
To: Maxime Ripard; +Cc: bage, devicetree, Rob Herring, Mark Rutland
[-- Attachment #1: Type: text/plain, Size: 1220 bytes --]
On Mon, 10 Feb 2020 08:56:28 +0100
Maxime Ripard <maxime@cerno.tech> wrote:
> > +// SPDX-License-Identifier: GPL-2.0-or-later
>
> Using a double license would be great, otherwise other projects
> licensed under something else than the GPL might not be able to use
> it.
I don't get it, why GPL v2 is not adequate here...
> > + leds {
> > + compatible = "gpio-leds";
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&led_pins_lamobo_r1>;
>
> You don't need the pinctrl nodes at all for GPIOs
I did not agree on that:
The pincontrol configuration depend on the bootloader if you omit the
configuration here. That may sufficient in most cases, but can cause
unexpected behaviour after updating the bootloader or using kexec.
The A20 datasheet mentioned:
"For various system configurations, these ports can be easily
configured by software. All these ports can be configured as GPIO if
multiplexed functions not used. 32 external PIO interrupt sources are
supported and interrupt mode can be configured by software."
I cannot simply check, if the pin was used otherwise.
Therefore adding a pincontrl for a defined state of a pin seems
reasonable.
Regards
Benedikt Spranger
[-- Attachment #2: Digitale Signatur von OpenPGP --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 5/5] ARM: dts: sun7i: Add Linutronix Testbox v2 board
2020-02-12 11:20 ` Benedikt Spranger
@ 2020-02-12 12:33 ` Maxime Ripard
0 siblings, 0 replies; 26+ messages in thread
From: Maxime Ripard @ 2020-02-12 12:33 UTC (permalink / raw)
To: Benedikt Spranger; +Cc: bage, devicetree, Rob Herring, Mark Rutland
[-- Attachment #1: Type: text/plain, Size: 1213 bytes --]
On Wed, Feb 12, 2020 at 12:20:01PM +0100, Benedikt Spranger wrote:
> On Mon, 10 Feb 2020 08:56:28 +0100
> Maxime Ripard <maxime@cerno.tech> wrote:
>
> > > +// SPDX-License-Identifier: GPL-2.0-or-later
> >
> > Using a double license would be great, otherwise other projects
> > licensed under something else than the GPL might not be able to use
> > it.
>
> I don't get it, why GPL v2 is not adequate here...
*BSD for example can't include a file under the GPL. It's not that the
GPL is not adequate, it's that the GPL + MIT is better, since more
people would be able to use it.
But then, if you don't care, that's not something that will prevent
the patch from going in either, just something that you should
consider.
> > > + leds {
> > > + compatible = "gpio-leds";
> > > + pinctrl-names = "default";
> > > + pinctrl-0 = <&led_pins_lamobo_r1>;
> >
> > You don't need the pinctrl nodes at all for GPIOs
>
> I did not agree on that:
>
> The pincontrol configuration depend on the bootloader if you omit the
> configuration here. That may sufficient in most cases, but can cause
> unexpected behaviour after updating the bootloader or using kexec.
What configuration do you want to have enforced?
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v2 0/3] dts: Add Linutronix Testbox
2020-02-06 11:33 [PATCH 0/5] dts: Add Linutronix Testbox bage
` (4 preceding siblings ...)
2020-02-06 11:33 ` [PATCH 5/5] ARM: dts: sun7i: Add Linutronix Testbox v2 board bage
@ 2020-02-14 11:10 ` bage
2020-02-14 11:10 ` [PATCH v2 1/3] dt-bindings: Add vendor prefix for Linutronix bage
` (2 more replies)
5 siblings, 3 replies; 26+ messages in thread
From: bage @ 2020-02-14 11:10 UTC (permalink / raw)
To: devicetree; +Cc: Bastian Germann, Rob Herring, Mark Rutland, Maxime Ripard
From: Bastian Germann <bage@linutronix.de>
The Testbox board is an open hardware enhancement for the Lamobo R1 router
board. The Testbox board is used in the CI-RT project to manage devices
under test (https://ci-rt.linutronix.de).
This series adds the device tree for that board and the necessary bindings.
Changelog
v2: - change the lx binding vendor to linutronix
- drop Lamobo R1 dts license header SPDX change
- drop extracting a dtsi from Lamobo R1 dts
- include Lamobo R1's dts instead of dtsi in the new dts
- drop the pinctrl nodes from the leds node in the new dts
Bastian Germann (3):
dt-bindings: Add vendor prefix for Linutronix
dt-bindings: arm: sunxi: Add Linutronix Testbox
ARM: dts: sun7i: Add Linutronix Testbox v2 board
.../devicetree/bindings/arm/sunxi.yaml | 6 ++
.../devicetree/bindings/vendor-prefixes.yaml | 2 +
arch/arm/boot/dts/Makefile | 1 +
.../dts/sun7i-a20-linutronix-testbox-v2.dts | 56 +++++++++++++++++++
4 files changed, 65 insertions(+)
create mode 100644 arch/arm/boot/dts/sun7i-a20-linutronix-testbox-v2.dts
--
2.20.1
^ permalink raw reply [flat|nested] 26+ messages in thread* [PATCH v2 1/3] dt-bindings: Add vendor prefix for Linutronix
2020-02-14 11:10 ` [PATCH v2 0/3] dts: Add Linutronix Testbox bage
@ 2020-02-14 11:10 ` bage
2020-02-14 13:21 ` Maxime Ripard
2020-02-19 20:06 ` Rob Herring
2020-02-14 11:10 ` [PATCH v2 2/3] dt-bindings: arm: sunxi: Add Linutronix Testbox bage
2020-02-14 11:10 ` [PATCH v2 3/3] ARM: dts: sun7i: Add Linutronix Testbox v2 board bage
2 siblings, 2 replies; 26+ messages in thread
From: bage @ 2020-02-14 11:10 UTC (permalink / raw)
To: devicetree
Cc: Bastian Germann, Rob Herring, Mark Rutland, Maxime Ripard,
Benedikt Spranger
From: Bastian Germann <bage@linutronix.de>
Add a vendor prefix for Linutronix GmbH.
Website: https://linutronix.de/
Co-developed-by: Benedikt Spranger <b.spranger@linutronix.de>
Signed-off-by: Benedikt Spranger <b.spranger@linutronix.de>
Signed-off-by: Bastian Germann <bage@linutronix.de>
---
Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
index 9e67944bec9c..8d4462f85a00 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@ -545,6 +545,8 @@ patternProperties:
description: LinkSprite Technologies, Inc.
"^linksys,.*":
description: Belkin International, Inc. (Linksys)
+ "^linutronix,.*":
+ description: Linutronix GmbH
"^linux,.*":
description: Linux-specific binding
"^linx,.*":
--
2.20.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v2 1/3] dt-bindings: Add vendor prefix for Linutronix
2020-02-14 11:10 ` [PATCH v2 1/3] dt-bindings: Add vendor prefix for Linutronix bage
@ 2020-02-14 13:21 ` Maxime Ripard
2020-02-19 20:06 ` Rob Herring
1 sibling, 0 replies; 26+ messages in thread
From: Maxime Ripard @ 2020-02-14 13:21 UTC (permalink / raw)
To: bage; +Cc: devicetree, Rob Herring, Mark Rutland, Benedikt Spranger
[-- Attachment #1: Type: text/plain, Size: 436 bytes --]
On Fri, Feb 14, 2020 at 12:10:01PM +0100, bage@linutronix.de wrote:
> From: Bastian Germann <bage@linutronix.de>
>
> Add a vendor prefix for Linutronix GmbH.
> Website: https://linutronix.de/
>
> Co-developed-by: Benedikt Spranger <b.spranger@linutronix.de>
> Signed-off-by: Benedikt Spranger <b.spranger@linutronix.de>
> Signed-off-by: Bastian Germann <bage@linutronix.de>
Acked-by: Maxime Ripard <mripard@kernel.org>
Thanks!
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v2 1/3] dt-bindings: Add vendor prefix for Linutronix
2020-02-14 11:10 ` [PATCH v2 1/3] dt-bindings: Add vendor prefix for Linutronix bage
2020-02-14 13:21 ` Maxime Ripard
@ 2020-02-19 20:06 ` Rob Herring
1 sibling, 0 replies; 26+ messages in thread
From: Rob Herring @ 2020-02-19 20:06 UTC (permalink / raw)
To: bage; +Cc: devicetree, Bastian Germann, Benedikt Spranger
On Fri, 14 Feb 2020 12:10:01 +0100, bage@linutronix.de wrote:
> From: Bastian Germann <bage@linutronix.de>
>
> Add a vendor prefix for Linutronix GmbH.
> Website: https://linutronix.de/
>
> Co-developed-by: Benedikt Spranger <b.spranger@linutronix.de>
> Signed-off-by: Benedikt Spranger <b.spranger@linutronix.de>
> Signed-off-by: Bastian Germann <bage@linutronix.de>
> ---
> Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++
> 1 file changed, 2 insertions(+)
>
Applied, thanks.
Rob
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v2 2/3] dt-bindings: arm: sunxi: Add Linutronix Testbox
2020-02-14 11:10 ` [PATCH v2 0/3] dts: Add Linutronix Testbox bage
2020-02-14 11:10 ` [PATCH v2 1/3] dt-bindings: Add vendor prefix for Linutronix bage
@ 2020-02-14 11:10 ` bage
2020-02-14 11:10 ` [PATCH v2 3/3] ARM: dts: sun7i: Add Linutronix Testbox v2 board bage
2 siblings, 0 replies; 26+ messages in thread
From: bage @ 2020-02-14 11:10 UTC (permalink / raw)
To: devicetree; +Cc: Bastian Germann, Rob Herring, Mark Rutland, Maxime Ripard
From: Bastian Germann <bage@linutronix.de>
Add device tree bindings for the newly added Linutronix Testbox board.
Signed-off-by: Bastian Germann <bage@linutronix.de>
---
Documentation/devicetree/bindings/arm/sunxi.yaml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/sunxi.yaml b/Documentation/devicetree/bindings/arm/sunxi.yaml
index 327ce6730823..71f0b1ae2805 100644
--- a/Documentation/devicetree/bindings/arm/sunxi.yaml
+++ b/Documentation/devicetree/bindings/arm/sunxi.yaml
@@ -394,6 +394,12 @@ properties:
- const: linksprite,pcduino3-nano
- const: allwinner,sun7i-a20
+ - description: Linutronix Testbox v2
+ items:
+ - const: linutronix,testbox-v2
+ - const: lamobo,lamobo-r1
+ - const: allwinner,sun7i-a20
+
- description: HAOYU Electronics Marsboard A10
items:
- const: haoyu,a10-marsboard
--
2.20.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v2 3/3] ARM: dts: sun7i: Add Linutronix Testbox v2 board
2020-02-14 11:10 ` [PATCH v2 0/3] dts: Add Linutronix Testbox bage
2020-02-14 11:10 ` [PATCH v2 1/3] dt-bindings: Add vendor prefix for Linutronix bage
2020-02-14 11:10 ` [PATCH v2 2/3] dt-bindings: arm: sunxi: Add Linutronix Testbox bage
@ 2020-02-14 11:10 ` bage
2020-02-14 13:26 ` Maxime Ripard
2 siblings, 1 reply; 26+ messages in thread
From: bage @ 2020-02-14 11:10 UTC (permalink / raw)
To: devicetree
Cc: Bastian Germann, Rob Herring, Mark Rutland, Maxime Ripard,
Benedikt Spranger
From: Bastian Germann <bage@linutronix.de>
The Testbox board is an open hardware enhancement for the Lamobo R1 router
board. The Testbox board is used in the CI-RT project to manage devices
under test (https://ci-rt.linutronix.de).
The hardware project is located at https://github.com/ci-rt/testbox-shield
The Testbox v2 expands the Lamobo R1 router board with
- a power supply,
- a CAN bus PHY,
- a power control,
- a relay,
- an I2C EEPROM,
- a secure key storage (ATECC608a) and
- two RS232 compliant serial ports.
Co-developed-by: Benedikt Spranger <b.spranger@linutronix.de>
Signed-off-by: Benedikt Spranger <b.spranger@linutronix.de>
Signed-off-by: Bastian Germann <bage@linutronix.de>
---
arch/arm/boot/dts/Makefile | 1 +
.../dts/sun7i-a20-linutronix-testbox-v2.dts | 56 +++++++++++++++++++
2 files changed, 57 insertions(+)
create mode 100644 arch/arm/boot/dts/sun7i-a20-linutronix-testbox-v2.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index d6546d2676b9..e9ddca2946ce 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1086,6 +1086,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \
sun7i-a20-i12-tvbox.dtb \
sun7i-a20-icnova-swac.dtb \
sun7i-a20-lamobo-r1.dtb \
+ sun7i-a20-linutronix-testbox-v2.dtb \
sun7i-a20-m3.dtb \
sun7i-a20-mk808c.dtb \
sun7i-a20-olimex-som-evb.dtb \
diff --git a/arch/arm/boot/dts/sun7i-a20-linutronix-testbox-v2.dts b/arch/arm/boot/dts/sun7i-a20-linutronix-testbox-v2.dts
new file mode 100644
index 000000000000..685874d44e35
--- /dev/null
+++ b/arch/arm/boot/dts/sun7i-a20-linutronix-testbox-v2.dts
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright 2020 Linutronix GmbH
+ * Author: Benedikt Spranger <b.spranger@linutronix.de>
+ */
+
+/dts-v1/;
+#include "sun7i-a20-lamobo-r1.dts"
+
+/ {
+ model = "Lamobo R1";
+ compatible = "linutronix,testbox-v2", "lamobo,lamobo-r1", "allwinner,sun7i-a20";
+
+ leds {
+ led-opto1 {
+ label = "lamobo_r1:opto:powerswitch";
+ gpios = <&pio 7 3 GPIO_ACTIVE_HIGH>;
+ };
+
+ led-opto2 {
+ label = "lamobo_r1:opto:relay";
+ gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>;
+ };
+ };
+};
+
+&i2c2 {
+ clock-frequency = <100000>;
+ status = "okay";
+
+ eeprom: eeprom@50 {
+ compatible = "atmel,24c08";
+ reg = <0x50>;
+ status = "okay";
+ };
+
+ atecc508a@60 {
+ compatible = "atmel,atecc508a";
+ reg = <0x60>;
+ };
+};
+
+&pio {
+ led_pins_lamobo_r1: led-pins {
+ pins = "PH3", "PH5", "PH24";
+ function = "gpio_out";
+ drive-strength = <40>;
+ bias-disable;
+ };
+};
+
+&can0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&can_ph_pins>;
+ status = "okay";
+};
--
2.20.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v2 3/3] ARM: dts: sun7i: Add Linutronix Testbox v2 board
2020-02-14 11:10 ` [PATCH v2 3/3] ARM: dts: sun7i: Add Linutronix Testbox v2 board bage
@ 2020-02-14 13:26 ` Maxime Ripard
0 siblings, 0 replies; 26+ messages in thread
From: Maxime Ripard @ 2020-02-14 13:26 UTC (permalink / raw)
To: bage; +Cc: devicetree, Rob Herring, Mark Rutland, Benedikt Spranger
[-- Attachment #1: Type: text/plain, Size: 2891 bytes --]
On Fri, Feb 14, 2020 at 12:10:03PM +0100, bage@linutronix.de wrote:
> From: Bastian Germann <bage@linutronix.de>
>
> The Testbox board is an open hardware enhancement for the Lamobo R1 router
> board. The Testbox board is used in the CI-RT project to manage devices
> under test (https://ci-rt.linutronix.de).
>
> The hardware project is located at https://github.com/ci-rt/testbox-shield
>
> The Testbox v2 expands the Lamobo R1 router board with
> - a power supply,
> - a CAN bus PHY,
> - a power control,
> - a relay,
> - an I2C EEPROM,
> - a secure key storage (ATECC608a) and
> - two RS232 compliant serial ports.
>
> Co-developed-by: Benedikt Spranger <b.spranger@linutronix.de>
> Signed-off-by: Benedikt Spranger <b.spranger@linutronix.de>
> Signed-off-by: Bastian Germann <bage@linutronix.de>
> ---
> arch/arm/boot/dts/Makefile | 1 +
> .../dts/sun7i-a20-linutronix-testbox-v2.dts | 56 +++++++++++++++++++
> 2 files changed, 57 insertions(+)
> create mode 100644 arch/arm/boot/dts/sun7i-a20-linutronix-testbox-v2.dts
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index d6546d2676b9..e9ddca2946ce 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -1086,6 +1086,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \
> sun7i-a20-i12-tvbox.dtb \
> sun7i-a20-icnova-swac.dtb \
> sun7i-a20-lamobo-r1.dtb \
> + sun7i-a20-linutronix-testbox-v2.dtb \
> sun7i-a20-m3.dtb \
> sun7i-a20-mk808c.dtb \
> sun7i-a20-olimex-som-evb.dtb \
> diff --git a/arch/arm/boot/dts/sun7i-a20-linutronix-testbox-v2.dts b/arch/arm/boot/dts/sun7i-a20-linutronix-testbox-v2.dts
> new file mode 100644
> index 000000000000..685874d44e35
> --- /dev/null
> +++ b/arch/arm/boot/dts/sun7i-a20-linutronix-testbox-v2.dts
> @@ -0,0 +1,56 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * Copyright 2020 Linutronix GmbH
> + * Author: Benedikt Spranger <b.spranger@linutronix.de>
> + */
> +
> +/dts-v1/;
> +#include "sun7i-a20-lamobo-r1.dts"
> +
> +/ {
> + model = "Lamobo R1";
> + compatible = "linutronix,testbox-v2", "lamobo,lamobo-r1", "allwinner,sun7i-a20";
> +
> + leds {
> + led-opto1 {
> + label = "lamobo_r1:opto:powerswitch";
> + gpios = <&pio 7 3 GPIO_ACTIVE_HIGH>;
> + };
> +
> + led-opto2 {
> + label = "lamobo_r1:opto:relay";
> + gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>;
> + };
> + };
> +};
> +
> +&i2c2 {
> + clock-frequency = <100000>;
> + status = "okay";
> +
> + eeprom: eeprom@50 {
> + compatible = "atmel,24c08";
> + reg = <0x50>;
> + status = "okay";
> + };
> +
> + atecc508a@60 {
> + compatible = "atmel,atecc508a";
> + reg = <0x60>;
> + };
> +};
> +
> +&pio {
> + led_pins_lamobo_r1: led-pins {
> + pins = "PH3", "PH5", "PH24";
> + function = "gpio_out";
> + drive-strength = <40>;
> + bias-disable;
> + };
> +};
That node was unused, so I removed it as well while applying, thanks!
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread