From: Joel Stanley <joel@jms.id.au>
To: "Cédric Le Goater" <clg@kaod.org>
Cc: OpenBMC Maillist <openbmc@lists.ozlabs.org>
Subject: Re: [PATCH linux dev-4.7] ARM: dts: aspeed: restore labels of the flash modules
Date: Mon, 28 Nov 2016 20:04:44 +1030 [thread overview]
Message-ID: <CACPK8XcZYocQgGaK3x-NPvz6D4cuufomz4mBVQ7z=VpL8+5Ttw@mail.gmail.com> (raw)
In-Reply-To: <1480317582-549-1-git-send-email-clg@kaod.org>
On Mon, Nov 28, 2016 at 5:49 PM, Cédric Le Goater <clg@kaod.org> wrote:
> commit e62c7f111755 ("ARM: dts: aspeed: fix flash module device
> nodes") removed the 'label' property under the flash module device
> nodes because of the lack of support in mainline. This change broke a
> number of OpenBMC user space tools. let's revert the label change.
>
> Signed-off-by: Cédric Le Goater <clg@kaod.org>
> ---
>
> Joel, I will add a proposal patch to extend the 'jedec,spi-nor'
> binding with a 'label' property in the next version of the Aspeed SMC
> controller patchset.
Cool, thanks for sending this. I've applied it to dev-4.7 as of b278d67c.
Ideally we would get upstream to ack it first but given we've been
asked to fix this asap, we can carry it our tree for now. Hopefully
upstream have no issues and we will be all good.
Cheers,
Joel
>
> Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt | 2 ++
> arch/arm/boot/dts/aspeed-ast2500-evb.dts | 3 ++-
> arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts | 3 ++-
> arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts | 3 ++-
> arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi | 1 +
> arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts | 3 ++-
> arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 3 ++-
> arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 4 +++-
> arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 4 +++-
> arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 3 ++-
> arch/arm/boot/dts/aspeed-g5.dtsi | 4 ++--
> 11 files changed, 23 insertions(+), 10 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
> index 2c91c03e7eb0..b7cd02a3ebe8 100644
> --- a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
> +++ b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
> @@ -65,6 +65,7 @@ Optional properties:
> all chips and support for it can not be detected at runtime.
> Refer to your chips' datasheet to check if this is supported
> by your chip.
> +- label : name to assign to mtd. If omitted, the label is the MTD device name.
>
> Example:
>
> @@ -75,4 +76,5 @@ Example:
> reg = <0>;
> spi-max-frequency = <40000000>;
> m25p,fast-read;
> + label = "System-firmware";
> };
> diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
> index fe8fc7a801f6..9d88f3aadbc6 100644
> --- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts
> +++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
> @@ -33,8 +33,9 @@
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_spi1_default>;
>
> - pnor@0 {
> + flash@0 {
> status = "okay";
> + label = "pnor";
> };
> };
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts
> index 802ce9557836..bedff97fb9b9 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts
> @@ -40,9 +40,10 @@
> #address-cells = <1>;
> #size-cells = <0>;
> compatible = "aspeed,ast2400-smc";
> - pnor@0 {
> + flash@0 {
> reg = < 0 >;
> compatible = "jedec,spi-nor" ;
> + label = "pnor";
> };
> };
> };
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
> index 005ff89e0c10..bbe09fc85b1e 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
> @@ -61,9 +61,10 @@
> #address-cells = <1>;
> #size-cells = <0>;
> compatible = "aspeed,ast2400-smc";
> - pnor@0 {
> + flash@0 {
> reg = < 0 >;
> compatible = "jedec,spi-nor" ;
> + label = "pnor";
> };
> };
> };
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
> index 6cfadb42368f..65095a40a203 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
> @@ -1,3 +1,4 @@
> + label = "bmc";
> partitions {
> #address-cells = < 1 >;
> #size-cells = < 1 >;
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts
> index 92b29d1c665b..7737c09aa20e 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts
> @@ -41,9 +41,10 @@
> #address-cells = <1>;
> #size-cells = <0>;
> compatible = "aspeed,ast2400-smc";
> - pnor@0 {
> + flash@0 {
> reg = < 0 >;
> compatible = "jedec,spi-nor" ;
> + label = "pnor";
> /* spi-max-frequency = <>; */
> /* m25p,fast-read; */
> };
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> index ed3c4a9e3d9d..f018074f6bb1 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> @@ -58,9 +58,10 @@
> #address-cells = <1>;
> #size-cells = <0>;
> compatible = "aspeed,ast2400-smc";
> - pnor@0 {
> + flash {
> reg = < 0 >;
> compatible = "jedec,spi-nor" ;
> + label = "pnor";
> };
> };
> };
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
> index 9845e6ca0de9..c23627ec5e84 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
> @@ -29,6 +29,7 @@
> };
> flash@1 {
> status = "okay";
> + label = "alt";
> };
> };
>
> @@ -37,8 +38,9 @@
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_spi1_default>;
>
> - pnor@0 {
> + flash@0 {
> status = "okay";
> + label = "pnor";
> };
> };
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> index 5c463f4112f6..9badf3e94599 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> @@ -29,6 +29,7 @@
> };
> flash@1 {
> status = "okay";
> + label = "alt";
> };
> };
>
> @@ -37,8 +38,9 @@
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_spi1_default>;
>
> - pnor@0 {
> + flash@0 {
> status = "okay";
> + label = "pnor";
> };
> };
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
> index 8ef4ecec17cc..673bab8006e7 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
> @@ -58,8 +58,9 @@
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_spi1_default>;
>
> - pnor@0 {
> + flash@0 {
> status = "okay";
> + label = "pnor";
> };
> };
>
> diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
> index 433461bce607..d6ff41ee6c58 100644
> --- a/arch/arm/boot/dts/aspeed-g5.dtsi
> +++ b/arch/arm/boot/dts/aspeed-g5.dtsi
> @@ -58,12 +58,12 @@
> #size-cells = <0>;
> compatible = "aspeed,ast2500-smc";
> status = "disabled";
> - pnor@0 {
> + flash@0 {
> reg = < 0 >;
> compatible = "jedec,spi-nor";
> status = "disabled";
> };
> - pnor@1 {
> + flash@1 {
> reg = < 1 >;
> compatible = "jedec,spi-nor";
> status = "disabled";
> --
> 2.7.4
>
prev parent reply other threads:[~2016-11-28 9:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-28 7:19 [PATCH linux dev-4.7] ARM: dts: aspeed: restore labels of the flash modules Cédric Le Goater
2016-11-28 9:34 ` Joel Stanley [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CACPK8XcZYocQgGaK3x-NPvz6D4cuufomz4mBVQ7z=VpL8+5Ttw@mail.gmail.com' \
--to=joel@jms.id.au \
--cc=clg@kaod.org \
--cc=openbmc@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.