* [PATCH 01/14] dt-bindings: pinctrl: aspeed: Add reg property as a hint
2019-12-03 12:04 [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings Andrew Jeffery
@ 2019-12-03 12:04 ` Andrew Jeffery
2019-12-03 12:04 ` [PATCH 02/14] dt-bindings: misc: Document reg for aspeed, p2a-ctrl nodes Andrew Jeffery
` (13 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Andrew Jeffery @ 2019-12-03 12:04 UTC (permalink / raw)
To: linux-aspeed
Cc: mark.rutland, devicetree, Linus Walleij, linux-kernel,
linux-gpio, robh+dt, joel, linux-arm-kernel
The pinctrl node sits under a syscon device, and can assume offsets from
the base of the syscon based on the compatible. However, for devicetree
correctness allow a reg property to be specified, which an associated
driver may choose to use to discover associated resources.
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-gpio@vger.kernel.org
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
---
Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 3 +++
Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 3 +++
2 files changed, 6 insertions(+)
diff --git a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml
index 39ad8657d018..bb690e20c368 100644
--- a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml
+++ b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml
@@ -22,6 +22,9 @@ description: |+
properties:
compatible:
const: aspeed,ast2400-pinctrl
+ reg:
+ description: |
+ A hint for the memory regions associated with the pin-controller
patternProperties:
'^.*$':
diff --git a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml
index 3c6405be07ed..f7f5d57f2c9a 100644
--- a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml
+++ b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml
@@ -23,6 +23,9 @@ description: |+
properties:
compatible:
const: aspeed,ast2500-pinctrl
+ reg:
+ description: |
+ A hint for the memory regions associated with the pin-controller
aspeed,external-nodes:
minItems: 2
maxItems: 2
--
git-series 0.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 02/14] dt-bindings: misc: Document reg for aspeed, p2a-ctrl nodes
2019-12-03 12:04 [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings Andrew Jeffery
2019-12-03 12:04 ` [PATCH 01/14] dt-bindings: pinctrl: aspeed: Add reg property as a hint Andrew Jeffery
@ 2019-12-03 12:04 ` Andrew Jeffery
2019-12-03 12:04 ` [PATCH 03/14] ARM: dts: aspeed-g5: Move EDAC node to APB Andrew Jeffery
` (12 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Andrew Jeffery @ 2019-12-03 12:04 UTC (permalink / raw)
To: linux-aspeed
Cc: mark.rutland, devicetree, Patrick Venture, linux-kernel, robh+dt,
joel, Greg Kroah-Hartman, linux-arm-kernel
The P2A controller node sits under a syscon device, and can assume
offsets from the base of the syscon based on the compatible. However,
for devicetree correctness allow a reg property to be specified, which
an associated driver may choose to use to discover associated resources.
Cc: Patrick Venture <venture@google.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Joel Stanley <joel@jms.id.au>
---
Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt b/Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt
index 0e1fa5bc6a30..f2e2e28b317c 100644
--- a/Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt
+++ b/Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt
@@ -18,6 +18,7 @@ Required properties:
Optional properties:
===================
+- reg: A hint for the memory regions associated with the P2A controller
- memory-region: A phandle to a reserved_memory region to be used for the PCI
to AHB mapping
--
git-series 0.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 03/14] ARM: dts: aspeed-g5: Move EDAC node to APB
2019-12-03 12:04 [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings Andrew Jeffery
2019-12-03 12:04 ` [PATCH 01/14] dt-bindings: pinctrl: aspeed: Add reg property as a hint Andrew Jeffery
2019-12-03 12:04 ` [PATCH 02/14] dt-bindings: misc: Document reg for aspeed, p2a-ctrl nodes Andrew Jeffery
@ 2019-12-03 12:04 ` Andrew Jeffery
2019-12-03 12:04 ` [PATCH 04/14] ARM: dts: aspeed-g5: Use recommended generic node name for SDMC Andrew Jeffery
` (11 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Andrew Jeffery @ 2019-12-03 12:04 UTC (permalink / raw)
To: linux-aspeed
Cc: mark.rutland, devicetree, linux-kernel, robh+dt, joel,
Stefan M Schaeckeler, linux-arm-kernel
Previously the register interface was not attached to any internal bus,
which is not correct - it lives on the APB.
Cc: Stefan M Schaeckeler <sschaeck@cisco.com>
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Stefan Schaeckeler <sschaeck@cisco.com>
---
arch/arm/boot/dts/aspeed-g5.dtsi | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index a8ce59a3c88d..edad1fd78925 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -47,13 +47,6 @@
reg = <0x80000000 0>;
};
- edac: sdram@1e6e0000 {
- compatible = "aspeed,ast2500-sdram-edac";
- reg = <0x1e6e0000 0x174>;
- interrupts = <0>;
- status = "disabled";
- };
-
ahb {
compatible = "simple-bus";
#address-cells = <1>;
@@ -213,6 +206,13 @@
#size-cells = <1>;
ranges;
+ edac: sdram@1e6e0000 {
+ compatible = "aspeed,ast2500-sdram-edac";
+ reg = <0x1e6e0000 0x174>;
+ interrupts = <0>;
+ status = "disabled";
+ };
+
syscon: syscon@1e6e2000 {
compatible = "aspeed,ast2500-scu", "syscon", "simple-mfd";
reg = <0x1e6e2000 0x1a8>;
--
git-series 0.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 04/14] ARM: dts: aspeed-g5: Use recommended generic node name for SDMC
2019-12-03 12:04 [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings Andrew Jeffery
` (2 preceding siblings ...)
2019-12-03 12:04 ` [PATCH 03/14] ARM: dts: aspeed-g5: Move EDAC node to APB Andrew Jeffery
@ 2019-12-03 12:04 ` Andrew Jeffery
2019-12-03 12:04 ` [PATCH 05/14] ARM: dts: aspeed-g5: Fix aspeed, external-nodes description Andrew Jeffery
` (10 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Andrew Jeffery @ 2019-12-03 12:04 UTC (permalink / raw)
To: linux-aspeed
Cc: mark.rutland, devicetree, linux-kernel, robh+dt, joel,
Stefan M Schaeckeler, linux-arm-kernel
The EDAC is a sub-function of the SDRAM Memory Controller. Rename the
node to the appropriate generic node name.
Cc: Stefan M Schaeckeler <sschaeck@cisco.com>
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Stefan Schaeckeler <sschaeck@cisco.com>
---
arch/arm/boot/dts/aspeed-g5.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index edad1fd78925..d8d358e23d78 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -206,7 +206,7 @@
#size-cells = <1>;
ranges;
- edac: sdram@1e6e0000 {
+ edac: memory-controller@1e6e0000 {
compatible = "aspeed,ast2500-sdram-edac";
reg = <0x1e6e0000 0x174>;
interrupts = <0>;
--
git-series 0.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 05/14] ARM: dts: aspeed-g5: Fix aspeed, external-nodes description
2019-12-03 12:04 [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings Andrew Jeffery
` (3 preceding siblings ...)
2019-12-03 12:04 ` [PATCH 04/14] ARM: dts: aspeed-g5: Use recommended generic node name for SDMC Andrew Jeffery
@ 2019-12-03 12:04 ` Andrew Jeffery
2019-12-03 14:43 ` Rob Herring
2019-12-03 12:04 ` [PATCH 06/14] ARM: dts: vesnin: Add unit address for memory node Andrew Jeffery
` (9 subsequent siblings)
14 siblings, 1 reply; 19+ messages in thread
From: Andrew Jeffery @ 2019-12-03 12:04 UTC (permalink / raw)
To: linux-aspeed
Cc: mark.rutland, devicetree, Xo Wang, Ken Chen, Tao Ren,
Adriana Kobylak, linux-kernel, Yuan Yao, robh+dt, Brian Yang,
joel, linux-arm-kernel, John Wang
The existing approach lead to an error from the dtbs_check:
pinctrl: aspeed,external-nodes: [[8, 9]] is too short
Cc: Adriana Kobylak <anoo@us.ibm.com>
Cc: Brian Yang <yang.brianc.w@inventec.com>
Cc: Joel Stanley <joel@jms.id.au>
Cc: John Wang <wangzqbj@inspur.com>
Cc: Ken Chen <chen.kenyy@inventec.com>
Cc: Tao Ren <taoren@fb.com>
Cc: Xo Wang <xow@google.com>
Cc: Yuan Yao <yao.yuan@linaro.org>
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Joel Stanley <joel@jms.id.au>
---
arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts | 4 +----
arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts | 4 +----
arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 9 +++++++--
arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 4 +----
arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 4 +----
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 4 +----
arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 4 +----
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 4 +----
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 2 +--
arch/arm/boot/dts/aspeed-g5.dtsi | 3 +--
10 files changed, 8 insertions(+), 34 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
index c2ece0b91885..de9612e49c69 100644
--- a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
@@ -211,10 +211,6 @@
status = "okay";
};
-&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-};
-
&gpio {
pin_gpio_c7 {
gpio-hog;
diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts b/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts
index 2c29ac037d32..022d0744d786 100644
--- a/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts
@@ -200,10 +200,6 @@
status = "okay";
};
-&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-};
-
&gpio {
pin_gpio_c7 {
gpio-hog;
diff --git a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
index c17bb7fce7ff..d69da58476fe 100644
--- a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
@@ -782,8 +782,13 @@
memory-region = <&gfx_memory>;
};
-&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
+&gpio {
+ pin_gpio_b7 {
+ gpio-hog;
+ gpios = <ASPEED_GPIO(B,7) GPIO_ACTIVE_LOW>;
+ output-high;
+ line-name = "BMC_INIT_OK";
+ };
};
&wdt1 {
diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts b/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
index 1deb30ec912c..8a9782b7e1af 100644
--- a/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
@@ -118,10 +118,6 @@
status = "okay";
};
-&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-};
-
&pwm_tacho {
status = "okay";
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
index 42b37a204241..a875e873bd47 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
@@ -263,10 +263,6 @@
status = "okay";
};
-&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-};
-
&gpio {
pin_gpio_b0 {
gpio-hog;
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
index edfa44fe1f75..270184cb0577 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
@@ -260,10 +260,6 @@
memory-region = <&gfx_memory>;
};
-&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-};
-
&pwm_tacho {
status = "okay";
pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts b/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
index b8fdd2a8a2c9..0831bc1f5a4c 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
@@ -940,10 +940,6 @@
memory-region = <&gfx_memory>;
};
-&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-};
-
&wdt1 {
aspeed,reset-type = "none";
aspeed,external-signal;
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
index 569dad93e162..39ba4d5a787e 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
@@ -623,10 +623,6 @@
memory-region = <&gfx_memory>;
};
-&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-};
-
&wdt1 {
aspeed,reset-type = "none";
aspeed,external-signal;
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
index bc60ec291681..7795248ba188 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
@@ -466,8 +466,6 @@
};
&pinctrl {
- aspeed,external-nodes = <&gfx &lhc>;
-
pinctrl_gpioh_unbiased: gpioi_unbiased {
pins = "A8", "C7", "B7", "A7", "D7", "B6", "A6", "E7";
bias-disable;
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index d8d358e23d78..5757d3f0e947 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -223,8 +223,7 @@
pinctrl: pinctrl {
compatible = "aspeed,ast2500-pinctrl";
- aspeed,external-nodes = <&gfx &lhc>;
-
+ aspeed,external-nodes = <&gfx>, <&lhc>;
};
p2a: p2a-control {
--
git-series 0.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 05/14] ARM: dts: aspeed-g5: Fix aspeed, external-nodes description
2019-12-03 12:04 ` [PATCH 05/14] ARM: dts: aspeed-g5: Fix aspeed, external-nodes description Andrew Jeffery
@ 2019-12-03 14:43 ` Rob Herring
2019-12-05 5:06 ` Andrew Jeffery
0 siblings, 1 reply; 19+ messages in thread
From: Rob Herring @ 2019-12-03 14:43 UTC (permalink / raw)
To: Andrew Jeffery
Cc: Mark Rutland, devicetree, Xo Wang, linux-aspeed, Ken Chen,
Tao Ren, Adriana Kobylak, linux-kernel, Yuan Yao, Brian Yang,
Joel Stanley,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE,
John Wang
On Tue, Dec 3, 2019 at 6:03 AM Andrew Jeffery <andrew@aj.id.au> wrote:
>
> The existing approach lead to an error from the dtbs_check:
>
> pinctrl: aspeed,external-nodes: [[8, 9]] is too short
This one where we have list of phandles is fixed in dtc. I need to
update the kernel's copy.
> Cc: Adriana Kobylak <anoo@us.ibm.com>
> Cc: Brian Yang <yang.brianc.w@inventec.com>
> Cc: Joel Stanley <joel@jms.id.au>
> Cc: John Wang <wangzqbj@inspur.com>
> Cc: Ken Chen <chen.kenyy@inventec.com>
> Cc: Tao Ren <taoren@fb.com>
> Cc: Xo Wang <xow@google.com>
> Cc: Yuan Yao <yao.yuan@linaro.org>
> Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
> Reviewed-by: Joel Stanley <joel@jms.id.au>
> ---
> arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts | 4 +----
> arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts | 4 +----
> arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 9 +++++++--
> arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 4 +----
> arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 4 +----
> arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 4 +----
> arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 4 +----
> arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 4 +----
> arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 2 +--
> arch/arm/boot/dts/aspeed-g5.dtsi | 3 +--
> 10 files changed, 8 insertions(+), 34 deletions(-)
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
> index c2ece0b91885..de9612e49c69 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
> @@ -211,10 +211,6 @@
> status = "okay";
> };
>
> -&pinctrl {
> - aspeed,external-nodes = <&gfx &lhc>;
> -};
> -
> &gpio {
> pin_gpio_c7 {
> gpio-hog;
> diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts b/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts
> index 2c29ac037d32..022d0744d786 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts
> @@ -200,10 +200,6 @@
> status = "okay";
> };
>
> -&pinctrl {
> - aspeed,external-nodes = <&gfx &lhc>;
> -};
> -
> &gpio {
> pin_gpio_c7 {
> gpio-hog;
> diff --git a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
> index c17bb7fce7ff..d69da58476fe 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
> @@ -782,8 +782,13 @@
> memory-region = <&gfx_memory>;
> };
>
> -&pinctrl {
> - aspeed,external-nodes = <&gfx &lhc>;
> +&gpio {
> + pin_gpio_b7 {
> + gpio-hog;
> + gpios = <ASPEED_GPIO(B,7) GPIO_ACTIVE_LOW>;
> + output-high;
> + line-name = "BMC_INIT_OK";
> + };
Seems like an unrelated change?
Rob
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 05/14] ARM: dts: aspeed-g5: Fix aspeed, external-nodes description
2019-12-03 14:43 ` Rob Herring
@ 2019-12-05 5:06 ` Andrew Jeffery
0 siblings, 0 replies; 19+ messages in thread
From: Andrew Jeffery @ 2019-12-05 5:06 UTC (permalink / raw)
To: Rob Herring
Cc: Mark Rutland, devicetree, Xo Wang, linux-aspeed, Ken Chen,
Tao Ren, Adriana Kobylak, linux-kernel, (Exiting) Yao Yuan,
YangBrianC.W 楊嘉偉 TAO, Joel Stanley,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE,
John Wang
On Wed, 4 Dec 2019, at 01:13, Rob Herring wrote:
> On Tue, Dec 3, 2019 at 6:03 AM Andrew Jeffery <andrew@aj.id.au> wrote:
> >
> > The existing approach lead to an error from the dtbs_check:
> >
> > pinctrl: aspeed,external-nodes: [[8, 9]] is too short
>
> This one where we have list of phandles is fixed in dtc. I need to
> update the kernel's copy.
Ah, cool.
>
> > Cc: Adriana Kobylak <anoo@us.ibm.com>
> > Cc: Brian Yang <yang.brianc.w@inventec.com>
> > Cc: Joel Stanley <joel@jms.id.au>
> > Cc: John Wang <wangzqbj@inspur.com>
> > Cc: Ken Chen <chen.kenyy@inventec.com>
> > Cc: Tao Ren <taoren@fb.com>
> > Cc: Xo Wang <xow@google.com>
> > Cc: Yuan Yao <yao.yuan@linaro.org>
> > Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
> > Reviewed-by: Joel Stanley <joel@jms.id.au>
> > ---
> > arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts | 4 +----
> > arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts | 4 +----
> > arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 9 +++++++--
> > arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 4 +----
> > arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 4 +----
> > arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 4 +----
> > arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 4 +----
> > arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 4 +----
> > arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 2 +--
> > arch/arm/boot/dts/aspeed-g5.dtsi | 3 +--
> > 10 files changed, 8 insertions(+), 34 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
> > index c2ece0b91885..de9612e49c69 100644
> > --- a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
> > +++ b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
> > @@ -211,10 +211,6 @@
> > status = "okay";
> > };
> >
> > -&pinctrl {
> > - aspeed,external-nodes = <&gfx &lhc>;
> > -};
> > -
> > &gpio {
> > pin_gpio_c7 {
> > gpio-hog;
> > diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts b/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts
> > index 2c29ac037d32..022d0744d786 100644
> > --- a/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts
> > +++ b/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts
> > @@ -200,10 +200,6 @@
> > status = "okay";
> > };
> >
> > -&pinctrl {
> > - aspeed,external-nodes = <&gfx &lhc>;
> > -};
> > -
> > &gpio {
> > pin_gpio_c7 {
> > gpio-hog;
> > diff --git a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
> > index c17bb7fce7ff..d69da58476fe 100644
> > --- a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
> > +++ b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
> > @@ -782,8 +782,13 @@
> > memory-region = <&gfx_memory>;
> > };
> >
> > -&pinctrl {
> > - aspeed,external-nodes = <&gfx &lhc>;
> > +&gpio {
> > + pin_gpio_b7 {
> > + gpio-hog;
> > + gpios = <ASPEED_GPIO(B,7) GPIO_ACTIVE_LOW>;
> > + output-high;
> > + line-name = "BMC_INIT_OK";
> > + };
>
> Seems like an unrelated change?
Yeah, that seems to be a bad rebase conflict resolution.
Thanks,
Andrew
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 06/14] ARM: dts: vesnin: Add unit address for memory node
2019-12-03 12:04 [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings Andrew Jeffery
` (4 preceding siblings ...)
2019-12-03 12:04 ` [PATCH 05/14] ARM: dts: aspeed-g5: Fix aspeed, external-nodes description Andrew Jeffery
@ 2019-12-03 12:04 ` Andrew Jeffery
2019-12-03 12:04 ` [PATCH 07/14] ARM: dts: fp5280g2: Cleanup gpio-keys-polled properties Andrew Jeffery
` (8 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Andrew Jeffery @ 2019-12-03 12:04 UTC (permalink / raw)
To: linux-aspeed
Cc: mark.rutland, devicetree, linux-kernel, Alexander Filippov,
robh+dt, joel, linux-arm-kernel
Fixes the following warnings:
arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dt.yaml: /: memory: False schema does not allow {'reg': [[1073741824, 536870912]]}
arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dt.yaml: memory: 'device_type' is a required property
Cc: Alexander Filippov <a.filippov@yadro.com>
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Tested-by: Alexander Filippov <a.filippov@yadro.com>
---
arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts b/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts
index affd2c8743b1..c46aec4baec9 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts
@@ -14,7 +14,7 @@
bootargs = "console=ttyS4,115200 earlyprintk";
};
- memory {
+ memory@40000000 {
reg = <0x40000000 0x20000000>;
};
--
git-series 0.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 07/14] ARM: dts: fp5280g2: Cleanup gpio-keys-polled properties
2019-12-03 12:04 [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings Andrew Jeffery
` (5 preceding siblings ...)
2019-12-03 12:04 ` [PATCH 06/14] ARM: dts: vesnin: Add unit address for memory node Andrew Jeffery
@ 2019-12-03 12:04 ` Andrew Jeffery
2019-12-03 12:04 ` [PATCH 08/14] ARM: dts: swift: " Andrew Jeffery
` (7 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Andrew Jeffery @ 2019-12-03 12:04 UTC (permalink / raw)
To: linux-aspeed
Cc: mark.rutland, devicetree, Adriana Kobylak, linux-kernel, robh+dt,
joel, linux-arm-kernel, John Wang
dtbs_check gave the following warning:
Warning (avoid_unnecessary_addr_size): /gpio-keys-polled: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
Cc: John Wang <wangzqbj@inspur.com>
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Adriana Kobylak <anoo@us.ibm.com>
Tested-by: Adriana Kobylak <anoo@us.ibm.com>
---
arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
index d69da58476fe..d6bb0c91d2d3 100644
--- a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
@@ -94,8 +94,6 @@
gpio-keys-polled {
compatible = "gpio-keys-polled";
- #address-cells = <1>;
- #size-cells = <0>;
poll-interval = <1000>;
fan0-presence {
--
git-series 0.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 08/14] ARM: dts: swift: Cleanup gpio-keys-polled properties
2019-12-03 12:04 [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings Andrew Jeffery
` (6 preceding siblings ...)
2019-12-03 12:04 ` [PATCH 07/14] ARM: dts: fp5280g2: Cleanup gpio-keys-polled properties Andrew Jeffery
@ 2019-12-03 12:04 ` Andrew Jeffery
2019-12-04 22:29 ` Adriana Kobylak
2019-12-03 12:04 ` [PATCH 09/14] ARM: dts: witherspoon: " Andrew Jeffery
` (6 subsequent siblings)
14 siblings, 1 reply; 19+ messages in thread
From: Andrew Jeffery @ 2019-12-03 12:04 UTC (permalink / raw)
To: linux-aspeed
Cc: mark.rutland, devicetree, Adriana Kobylak, linux-kernel, robh+dt,
joel, linux-arm-kernel
dtbs_check gave the following warning:
Warning (avoid_unnecessary_addr_size): /gpio-keys-polled: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
Cc: Adriana Kobylak <anoo@us.ibm.com>
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Joel Stanley <joel@jms.id.au>
---
arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts b/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
index 0831bc1f5a4c..555d79405884 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
@@ -82,8 +82,6 @@
gpio-keys-polled {
compatible = "gpio-keys-polled";
- #address-cells = <1>;
- #size-cells = <0>;
poll-interval = <1000>;
scm0-presence {
--
git-series 0.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 08/14] ARM: dts: swift: Cleanup gpio-keys-polled properties
2019-12-03 12:04 ` [PATCH 08/14] ARM: dts: swift: " Andrew Jeffery
@ 2019-12-04 22:29 ` Adriana Kobylak
0 siblings, 0 replies; 19+ messages in thread
From: Adriana Kobylak @ 2019-12-04 22:29 UTC (permalink / raw)
To: Andrew Jeffery
Cc: mark.rutland, devicetree, linux-aspeed, Adriana Kobylak,
linux-kernel, robh+dt, Linux-aspeed, linux-arm-kernel
On 2019-12-03 06:04, Andrew Jeffery wrote:
> dtbs_check gave the following warning:
>
> Warning (avoid_unnecessary_addr_size): /gpio-keys-polled:
> unnecessary #address-cells/#size-cells without "ranges" or child "reg"
> property
>
> Cc: Adriana Kobylak <anoo@us.ibm.com>
> Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
> Reviewed-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Adriana Kobylak <anoo@us.ibm.com>
Tested-by: Adriana Kobylak <anoo@us.ibm.com>
> ---
> arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
> b/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
> index 0831bc1f5a4c..555d79405884 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
> @@ -82,8 +82,6 @@
>
> gpio-keys-polled {
> compatible = "gpio-keys-polled";
> - #address-cells = <1>;
> - #size-cells = <0>;
> poll-interval = <1000>;
>
> scm0-presence {
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 09/14] ARM: dts: witherspoon: Cleanup gpio-keys-polled properties
2019-12-03 12:04 [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings Andrew Jeffery
` (7 preceding siblings ...)
2019-12-03 12:04 ` [PATCH 08/14] ARM: dts: swift: " Andrew Jeffery
@ 2019-12-03 12:04 ` Andrew Jeffery
2019-12-03 12:04 ` [PATCH 10/14] ARM: dts: aspeed: Cleanup lpc-ctrl and snoop regs Andrew Jeffery
` (5 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Andrew Jeffery @ 2019-12-03 12:04 UTC (permalink / raw)
To: linux-aspeed
Cc: mark.rutland, devicetree, linux-kernel, robh+dt, joel, linux-arm-kernel
dtbs_check gave the following warning:
Warning (avoid_unnecessary_addr_size): /gpio-keys-polled: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
Cc: Joel Stanley <joel@jms.id.au>
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Joel Stanley <joel@jms.id.au>
---
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
index 39ba4d5a787e..dbcd3dd8b405 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
@@ -77,8 +77,6 @@
gpio-keys-polled {
compatible = "gpio-keys-polled";
- #address-cells = <1>;
- #size-cells = <0>;
poll-interval = <1000>;
fan0-presence {
--
git-series 0.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 10/14] ARM: dts: aspeed: Cleanup lpc-ctrl and snoop regs
2019-12-03 12:04 [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings Andrew Jeffery
` (8 preceding siblings ...)
2019-12-03 12:04 ` [PATCH 09/14] ARM: dts: witherspoon: " Andrew Jeffery
@ 2019-12-03 12:04 ` Andrew Jeffery
2019-12-03 12:04 ` [PATCH 11/14] ARM: dts: aspeed: Add reg hints to syscon children Andrew Jeffery
` (4 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Andrew Jeffery @ 2019-12-03 12:04 UTC (permalink / raw)
To: linux-aspeed
Cc: mark.rutland, devicetree, linux-kernel, robh+dt, joel, linux-arm-kernel
Fix the following warning:
arch/arm/boot/dts/aspeed-g5.dtsi:409.27-414.8: Warning (unique_unit_address): /ahb/apb/lpc@1e789000/lpc-host@80/lpc-ctrl@0: duplicate unit-address (also used in node /ahb/apb/lpc@1e789000/lpc-host@80/lpc-snoop@0)
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Joel Stanley <joel@jms.id.au>
---
arch/arm/boot/dts/aspeed-g4.dtsi | 6 +++---
arch/arm/boot/dts/aspeed-g5.dtsi | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index 46c0891aac5a..e1d4af06c217 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -346,14 +346,14 @@
lpc_ctrl: lpc-ctrl@0 {
compatible = "aspeed,ast2400-lpc-ctrl";
- reg = <0x0 0x80>;
+ reg = <0x0 0x10>;
clocks = <&syscon ASPEED_CLK_GATE_LCLK>;
status = "disabled";
};
- lpc_snoop: lpc-snoop@0 {
+ lpc_snoop: lpc-snoop@10 {
compatible = "aspeed,ast2400-lpc-snoop";
- reg = <0x0 0x80>;
+ reg = <0x10 0x8>;
interrupts = <8>;
status = "disabled";
};
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 5757d3f0e947..013d1f98ecf1 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -458,14 +458,14 @@
lpc_ctrl: lpc-ctrl@0 {
compatible = "aspeed,ast2500-lpc-ctrl";
- reg = <0x0 0x80>;
+ reg = <0x0 0x10>;
clocks = <&syscon ASPEED_CLK_GATE_LCLK>;
status = "disabled";
};
- lpc_snoop: lpc-snoop@0 {
+ lpc_snoop: lpc-snoop@10 {
compatible = "aspeed,ast2500-lpc-snoop";
- reg = <0x0 0x80>;
+ reg = <0x10 0x8>;
interrupts = <8>;
status = "disabled";
};
--
git-series 0.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 11/14] ARM: dts: aspeed: Add reg hints to syscon children
2019-12-03 12:04 [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings Andrew Jeffery
` (9 preceding siblings ...)
2019-12-03 12:04 ` [PATCH 10/14] ARM: dts: aspeed: Cleanup lpc-ctrl and snoop regs Andrew Jeffery
@ 2019-12-03 12:04 ` Andrew Jeffery
2019-12-03 12:04 ` [PATCH 12/14] ARM: dts: aspeed-g5: Sort LPC child nodes by unit address Andrew Jeffery
` (3 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Andrew Jeffery @ 2019-12-03 12:04 UTC (permalink / raw)
To: linux-aspeed
Cc: mark.rutland, devicetree, linux-kernel, robh+dt, joel, linux-arm-kernel
Fixes the following warnings:
arch/arm/boot/dts/aspeed-g5.dtsi:209.28-226.6: Warning (avoid_unnecessary_addr_size): /ahb/apb/syscon@1e6e2000: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
arch/arm/boot/dts/aspeed-g4.dtsi:156.28-172.6: Warning (avoid_unnecessary_addr_size): /ahb/apb/syscon@1e6e2000: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Joel Stanley <joel@jms.id.au>
---
arch/arm/boot/dts/aspeed-g4.dtsi | 15 +++++++++------
arch/arm/boot/dts/aspeed-g5.dtsi | 17 ++++++++++-------
2 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index e1d4af06c217..807a0fc20670 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -179,18 +179,21 @@
compatible = "aspeed,ast2400-scu", "syscon", "simple-mfd";
reg = <0x1e6e2000 0x1a8>;
#address-cells = <1>;
- #size-cells = <0>;
+ #size-cells = <1>;
+ ranges = <0 0x1e6e2000 0x1000>;
#clock-cells = <1>;
#reset-cells = <1>;
- pinctrl: pinctrl {
- compatible = "aspeed,ast2400-pinctrl";
- };
-
- p2a: p2a-control {
+ p2a: p2a-control@2c {
+ reg = <0x2c 0x4>;
compatible = "aspeed,ast2400-p2a-ctrl";
status = "disabled";
};
+
+ pinctrl: pinctrl@80 {
+ reg = <0x80 0x18>, <0xa0 0x10>;
+ compatible = "aspeed,ast2400-pinctrl";
+ };
};
rng: hwrng@1e6e2078 {
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 013d1f98ecf1..57c9e45c9e16 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -217,19 +217,22 @@
compatible = "aspeed,ast2500-scu", "syscon", "simple-mfd";
reg = <0x1e6e2000 0x1a8>;
#address-cells = <1>;
- #size-cells = <0>;
+ #size-cells = <1>;
+ ranges = <0 0x1e6e2000 0x1000>;
#clock-cells = <1>;
#reset-cells = <1>;
- pinctrl: pinctrl {
- compatible = "aspeed,ast2500-pinctrl";
- aspeed,external-nodes = <&gfx>, <&lhc>;
- };
-
- p2a: p2a-control {
+ p2a: p2a-control@2c {
compatible = "aspeed,ast2500-p2a-ctrl";
+ reg = <0x2c 0x4>;
status = "disabled";
};
+
+ pinctrl: pinctrl@80 {
+ compatible = "aspeed,ast2500-pinctrl";
+ reg = <0x80 0x18>, <0xa0 0x10>;
+ aspeed,external-nodes = <&gfx>, <&lhc>;
+ };
};
rng: hwrng@1e6e2078 {
--
git-series 0.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 12/14] ARM: dts: aspeed-g5: Sort LPC child nodes by unit address
2019-12-03 12:04 [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings Andrew Jeffery
` (10 preceding siblings ...)
2019-12-03 12:04 ` [PATCH 11/14] ARM: dts: aspeed: Add reg hints to syscon children Andrew Jeffery
@ 2019-12-03 12:04 ` Andrew Jeffery
2019-12-03 12:04 ` [PATCH 13/14] ARM: dts: aspeed-g6: Cleanup watchdog " Andrew Jeffery
` (2 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Andrew Jeffery @ 2019-12-03 12:04 UTC (permalink / raw)
To: linux-aspeed
Cc: mark.rutland, devicetree, linux-kernel, robh+dt, joel, linux-arm-kernel
Lets try to maintain some sort of sanity.
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Joel Stanley <joel@jms.id.au>
---
arch/arm/boot/dts/aspeed-g5.dtsi | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 57c9e45c9e16..954781b82fe3 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -473,17 +473,18 @@
status = "disabled";
};
- lhc: lhc@20 {
- compatible = "aspeed,ast2500-lhc";
- reg = <0x20 0x24 0x48 0x8>;
- };
-
lpc_reset: reset-controller@18 {
compatible = "aspeed,ast2500-lpc-reset";
reg = <0x18 0x4>;
#reset-cells = <1>;
};
+ lhc: lhc@20 {
+ compatible = "aspeed,ast2500-lhc";
+ reg = <0x20 0x24 0x48 0x8>;
+ };
+
+
ibt: ibt@c0 {
compatible = "aspeed,ast2500-ibt-bmc";
reg = <0xc0 0x18>;
--
git-series 0.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 13/14] ARM: dts: aspeed-g6: Cleanup watchdog unit address
2019-12-03 12:04 [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings Andrew Jeffery
` (11 preceding siblings ...)
2019-12-03 12:04 ` [PATCH 12/14] ARM: dts: aspeed-g5: Sort LPC child nodes by unit address Andrew Jeffery
@ 2019-12-03 12:04 ` Andrew Jeffery
2019-12-03 12:04 ` [PATCH 14/14] ARM: dts: ibm-power9-dual: Add a unit address for OCC nodes Andrew Jeffery
2019-12-03 14:47 ` [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings Rob Herring
14 siblings, 0 replies; 19+ messages in thread
From: Andrew Jeffery @ 2019-12-03 12:04 UTC (permalink / raw)
To: linux-aspeed
Cc: mark.rutland, devicetree, linux-kernel, robh+dt, joel, linux-arm-kernel
arch/arm/boot/dts/aspeed-g6.dtsi:204.28-208.6: Warning (simple_bus_reg): /ahb/apb/watchdog@1e7850C0: simple-bus unit address format error, expected "1e7850c0"
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
---
arch/arm/boot/dts/aspeed-g6.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi
index 5f6142d99eeb..ffe0d76c5ac0 100644
--- a/arch/arm/boot/dts/aspeed-g6.dtsi
+++ b/arch/arm/boot/dts/aspeed-g6.dtsi
@@ -385,7 +385,7 @@
status = "disabled";
};
- wdt4: watchdog@1e7850C0 {
+ wdt4: watchdog@1e7850c0 {
compatible = "aspeed,ast2600-wdt";
reg = <0x1e7850C0 0x40>;
status = "disabled";
--
git-series 0.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 14/14] ARM: dts: ibm-power9-dual: Add a unit address for OCC nodes
2019-12-03 12:04 [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings Andrew Jeffery
` (12 preceding siblings ...)
2019-12-03 12:04 ` [PATCH 13/14] ARM: dts: aspeed-g6: Cleanup watchdog " Andrew Jeffery
@ 2019-12-03 12:04 ` Andrew Jeffery
2019-12-03 14:47 ` [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings Rob Herring
14 siblings, 0 replies; 19+ messages in thread
From: Andrew Jeffery @ 2019-12-03 12:04 UTC (permalink / raw)
To: linux-aspeed
Cc: mark.rutland, devicetree, linux-kernel, robh+dt, joel, linux-arm-kernel
These temporarily have a unit address until userspace is fixed up as
noted in comments elsewhere in the dtsi.
Fixes the following warning:
arch/arm/boot/dts/ibm-power9-dual.dtsi:89.18-91.6: Warning (unit_address_vs_reg): /gpio-fsi/cfam@0,0/sbefifo@2400/occ: node has a reg or ranges property, but no unit name
arch/arm/boot/dts/ibm-power9-dual.dtsi:190.18-192.6: Warning (unit_address_vs_reg): /gpio-fsi/cfam@0,0/hub@3400/cfam@1,0/sbefifo@2400/occ: node has a reg or ranges property, but no unit name
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
---
arch/arm/boot/dts/ibm-power9-dual.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/ibm-power9-dual.dtsi b/arch/arm/boot/dts/ibm-power9-dual.dtsi
index 2abc42eda7b0..a0fa65b44b0f 100644
--- a/arch/arm/boot/dts/ibm-power9-dual.dtsi
+++ b/arch/arm/boot/dts/ibm-power9-dual.dtsi
@@ -86,7 +86,7 @@
#address-cells = <1>;
#size-cells = <0>;
- fsi_occ0: occ {
+ fsi_occ0: occ@1 {
compatible = "ibm,p9-occ";
};
};
@@ -187,7 +187,7 @@
#address-cells = <1>;
#size-cells = <0>;
- fsi_occ1: occ {
+ fsi_occ1: occ@2 {
compatible = "ibm,p9-occ";
};
};
--
git-series 0.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings
2019-12-03 12:04 [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings Andrew Jeffery
` (13 preceding siblings ...)
2019-12-03 12:04 ` [PATCH 14/14] ARM: dts: ibm-power9-dual: Add a unit address for OCC nodes Andrew Jeffery
@ 2019-12-03 14:47 ` Rob Herring
14 siblings, 0 replies; 19+ messages in thread
From: Rob Herring @ 2019-12-03 14:47 UTC (permalink / raw)
To: Andrew Jeffery
Cc: Mark Rutland, devicetree, Xo Wang, linux-aspeed, Ken Chen,
Greg Kroah-Hartman, Linus Walleij, anoo, linux-kernel, yao.yuan,
a.filippov, Patrick Venture,
BrianC.W 楊嘉偉 TAO Yang, Joel Stanley, taoren,
Stefan M Schaeckeler,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE,
John Wang
On Tue, Dec 3, 2019 at 6:02 AM Andrew Jeffery <andrew@aj.id.au> wrote:
>
> Hello,
>
> This series is based on an RFC-ish series I sent quite some time ago to which I
> have only just been able to circle back. The previous discussion can be found
> here:
>
> https://lore.kernel.org/lkml/20190726053959.2003-1-andrew@aj.id.au/
>
> I've split, shuffled and rebased the series a little, with at least one extra
> cleanup for the g6 dtsi. This series is just the devicetree changes, the IPMI
> KCS changes will be posted separately shortly.
>
> Combined with the KCS changes we achieve similar stats to the RFC series,
> reducing 264 warnings to 6.
>
> I've added each patches' tags from last time, but please glance over them
> again.
>
> Cheers,
>
> Andrew
>
> Andrew Jeffery (14):
> dt-bindings: pinctrl: aspeed: Add reg property as a hint
> dt-bindings: misc: Document reg for aspeed,p2a-ctrl nodes
> ARM: dts: aspeed-g5: Move EDAC node to APB
> ARM: dts: aspeed-g5: Use recommended generic node name for SDMC
> ARM: dts: aspeed-g5: Fix aspeed,external-nodes description
> ARM: dts: vesnin: Add unit address for memory node
> ARM: dts: fp5280g2: Cleanup gpio-keys-polled properties
> ARM: dts: swift: Cleanup gpio-keys-polled properties
> ARM: dts: witherspoon: Cleanup gpio-keys-polled properties
> ARM: dts: aspeed: Cleanup lpc-ctrl and snoop regs
> ARM: dts: aspeed: Add reg hints to syscon children
> ARM: dts: aspeed-g5: Sort LPC child nodes by unit address
> ARM: dts: aspeed-g6: Cleanup watchdog unit address
> ARM: dts: ibm-power9-dual: Add a unit address for OCC nodes
>
> Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt | 1 +
> Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 3 +++
> Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 3 +++
> arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts | 4 ----
> arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts | 4 ----
> arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 11 +++++++----
> arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 4 ----
> arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 4 ----
> arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 4 ----
> arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 6 ------
> arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 6 ------
> arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 2 --
> arch/arm/boot/dts/aspeed-g4.dtsi | 21 ++++++++++++---------
> arch/arm/boot/dts/aspeed-g5.dtsi | 49 ++++++++++++++++++++++++++-----------------------
> arch/arm/boot/dts/aspeed-g6.dtsi | 2 +-
> arch/arm/boot/dts/ibm-power9-dual.dtsi | 4 ++--
> 17 files changed, 56 insertions(+), 74 deletions(-)
Other than patch 5, for the series:
Reviewed-by: Rob Herring <robh@kernel.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 19+ messages in thread