From: Mykola Kostenok <c_mykolak@mellanox.com>
To: Joel Stanley <joel@jms.id.au>,
"openbmc@lists.ozlabs.org" <openbmc@lists.ozlabs.org>
Cc: "Edward A. James" <eajames@us.ibm.com>,
"Eddie James" <eajames@linux.vnet.ibm.com>,
"Cédric Le Goater" <clg@kaod.org>,
"Andrew Jeffery" <andrew@aj.id.au>
Subject: RE: [PATCH linux dev-4.10] arm: dts: aspeed: Update old style flash nodes
Date: Thu, 1 Jun 2017 07:48:42 +0000 [thread overview]
Message-ID: <VI1PR05MB32475FDC198B13939F25802BEFF60@VI1PR05MB3247.eurprd05.prod.outlook.com> (raw)
In-Reply-To: <20170531135614.7170-1-joel@jms.id.au>
Acked-by: Mykola Kostenok <c_mykolak@mellanox.com>
Best regards. Mykola Kostenok.
> -----Original Message-----
> From: joel.stan@gmail.com [mailto:joel.stan@gmail.com] On Behalf Of Joel
> Stanley
> Sent: Wednesday, May 31, 2017 4:56 PM
> To: openbmc@lists.ozlabs.org
> Cc: Edward A. James <eajames@us.ibm.com>; Eddie James
> <eajames@linux.vnet.ibm.com>; Cédric Le Goater <clg@kaod.org>; Andrew
> Jeffery <andrew@aj.id.au>; Mykola Kostenok <c_mykolak@mellanox.com>
> Subject: [PATCH linux dev-4.10] arm: dts: aspeed: Update old style flash
> nodes
>
> From: "Edward A. James" <eajames@us.ibm.com>
>
> Reorganize flash controllers into the ast2400 device tree to match what is
> used upstream. This moves the nodes from the machine dts to the common
> dtsi.
>
> This also affected the newly added Mellanox MSN device tree, which is also
> updated in this series.
>
> Barreleye wasn't booting with the new aspeed-smc driver.
>
> Signed-off-by: Edward A. James <eajames@us.ibm.com>
> [joel:
> - rework commit message
> - add missing m25p,fast-read properties
> - add pinmux for pnor
> - use upstream node names
> * bmc_pnor becomes fmc
> * host_pnor becomes spi
> - fix the facebook machine
> ]
> Signed-off-by: Joel Stanley <joel@jms.id.au>
> ---
> Eddie, I reworked your patch for you. Please check it looks okay.
>
> Cedric, can you please double check I didn't stuff anything up?
>
> Andrew, can you reivew for pinmux correctness?
>
> Mykola, please reply with "Acked-by: Mykola Kostenok
> <c_mykolak@mellanox.com>"
> if the changes to the Mellanox device tree look okay to you. They should be
> functionally the same as before.
>
> arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts | 19 ++++-----
> arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts | 20 ++++-----
> arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts | 49 ++++++++++---------
> --- arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts | 42 ++++++++--------
> --- arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts | 51 ++++++++---------
> ------ arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 57 ++++++++++--
> --------------
> arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 43 ++++++++-----------
> arch/arm/boot/dts/aspeed-g4.dtsi | 34 +++++++++++++++
> 8 files changed, 142 insertions(+), 173 deletions(-)
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts
> b/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts
> index 8df116ea8594..ff5058ee8834 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts
> @@ -18,21 +18,16 @@
> memory {
> reg = <0x80000000 0x3f000000>;
> };
> +};
>
> - ahb {
> - bmc_pnor: fmc@1e620000 {
> - reg = < 0x1e620000 0x94
> - 0x20000000 0x02000000 >;
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "aspeed,ast2400-fmc";
> - flash@0 {
> - reg = < 0 >;
> - compatible = "jedec,spi-nor" ;
> +&fmc {
> + status = "okay";
> + flash@0 {
> + status = "okay";
> + m25p,fast-read;
> #include "aspeed-bmc-facebook-cmm-flash-layout.dtsi"
> - };
> - };
> };
> +
> };
>
> &uart1 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts
> b/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts
> index 649964a3726a..c71a6dbe1410 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts
> @@ -22,20 +22,14 @@
> reg = <0x80000000 0x20000000>;
> };
>
> - ahb {
> - bmc_pnor: fmc@1e620000 {
> - reg = < 0x1e620000 0xc4
> - 0x20000000 0x02000000 >;
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "aspeed,ast2500-fmc";
> - interrupts = <19>;
> - flash@0 {
> - reg = < 0 >;
> - compatible = "jedec,spi-nor" ;
> +};
> +
> +&fmc {
> + status = "okay";
> + flash@0 {
> + status = "okay";
> + m25p,fast-read;
> #include "aspeed-bmc-mellanox-msn-flash-layout.dtsi"
> - };
> - };
> };
> };
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts
> b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts
> index be1f2d120fee..9f7098876ecb 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts
> @@ -31,34 +31,6 @@
> };
> };
>
> - ahb {
> - bmc_pnor: fmc@1e620000 {
> - reg = < 0x1e620000 0x94
> - 0x20000000 0x02000000 >;
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "aspeed,ast2400-fmc";
> - flash@0 {
> - reg = < 0 >;
> - compatible = "jedec,spi-nor" ;
> -#include "aspeed-bmc-opp-flash-layout.dtsi"
> - };
> - };
> -
> - host_pnor: spi@1e630000 {
> - reg = < 0x1e630000 0x18
> - 0x30000000 0x02000000 >;
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "aspeed,ast2400-spi";
> - flash@0 {
> - reg = < 0 >;
> - compatible = "jedec,spi-nor" ;
> - label = "pnor";
> - };
> - };
> - };
> -
> leds {
> compatible = "gpio-leds";
>
> @@ -76,6 +48,27 @@
> };
> };
>
> +&fmc {
> + status = "okay";
> + flash@0 {
> + status = "okay";
> + m25p,fast-read;
> +#include "aspeed-bmc-opp-flash-layout.dtsi"
> + };
> +};
> +
> +&spi {
> + status = "okay";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_spi1_default>;
> +
> + flash@0 {
> + m25p,fast-read;
> + status = "okay";
> + label = "pnor";
> + };
> +};
> +
> &pinctrl {
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_flbusy_default &pinctrl_flwp_default diff --git
> a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
> b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
> index fe63621365fd..430622c86ef7 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
> @@ -50,34 +50,26 @@
> gpios = <&gpio ASPEED_GPIO(A, 2)
> GPIO_ACTIVE_LOW>;
> };
> };
> +};
>
> - ahb {
> - fmc@1e620000 {
> - reg = < 0x1e620000 0x94
> - 0x20000000 0x02000000 >;
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "aspeed,ast2400-fmc";
> -
> - flash@0 {
> - reg = < 0 >;
> - compatible = "jedec,spi-nor" ;
> +&fmc {
> + status = "okay";
> + flash@0 {
> + status = "okay";
> + m25p,fast-read;
> #include "aspeed-bmc-opp-flash-layout.dtsi"
> - };
> - };
> + };
> +};
>
> - spi@1e630000 {
> - reg = < 0x1e630000 0x18
> - 0x30000000 0x02000000 >;
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "aspeed,ast2400-spi";
> - flash@0 {
> - reg = < 0 >;
> - compatible = "jedec,spi-nor" ;
> - label = "pnor";
> - };
> - };
> +&spi {
> + status = "okay";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_spi1_default>;
> +
> + flash@0 {
> + status = "okay";
> + m25p,fast-read;
> + label = "pnor";
> };
> };
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts
> b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts
> index 121612a8776e..b64edad3e050 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts
> @@ -30,42 +30,27 @@
> reg = <0x5f000000 0x01000000>; /* 16MB */
> };
> };
> +};
> +
> +&fmc {
> + status = "okay";
>
> - ahb {
> -
> - bmc_pnor: fmc@1e620000 {
> - reg = < 0x1e620000 0x94
> - 0x20000000 0x02000000 >;
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "aspeed,ast2400-fmc";
> - aspeed,fmc-has-dma;
> - interrupts = <19>;
> - clocks = <&clk_ahb>;
> - clock-names = "ahb";
> - flash@0 {
> - reg = < 0 >;
> - compatible = "jedec,spi-nor" ;
> - m25p,fast-read;
> + flash@0 {
> + status = "okay";
> + m25p,fast-read;
> #include "aspeed-bmc-opp-flash-layout.dtsi"
> - };
> - };
> + };
> +};
>
> - host_pnor: spi@1e630000 {
> - reg = < 0x1e630000 0x18
> - 0x30000000 0x02000000 >;
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "aspeed,ast2400-spi";
> - clocks = <&clk_ahb>;
> - clock-names = "ahb";
> - flash {
> - reg = < 0 >;
> - compatible = "jedec,spi-nor" ;
> - label = "pnor";
> - m25p,fast-read;
> - };
> - };
> +&spi {
> + status = "okay";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_spi1_default>;
> +
> + flash@0 {
> + status = "okay";
> + m25p,fast-read;
> + label = "pnor";
> };
> };
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> index b4faa1d79460..60792f6ff7ec 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> @@ -47,42 +47,6 @@
> };
> };
>
> - ahb {
> - bmc_pnor: fmc@1e620000 {
> - reg = < 0x1e620000 0x94
> - 0x20000000 0x02000000 >;
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "aspeed,ast2400-fmc";
> - aspeed,fmc-has-dma;
> - interrupts = <19>;
> - clocks = <&clk_ahb>;
> - clock-names = "ahb";
> - flash@0 {
> - reg = < 0 >;
> - compatible = "jedec,spi-nor" ;
> - m25p,fast-read;
> -#include "aspeed-bmc-opp-flash-layout.dtsi"
> - };
> - };
> -
> - host_pnor: spi@1e630000 {
> - reg = < 0x1e630000 0x18
> - 0x30000000 0x02000000 >;
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "aspeed,ast2400-spi";
> - clocks = <&clk_ahb>;
> - clock-names = "ahb";
> - flash {
> - reg = < 0 >;
> - compatible = "jedec,spi-nor" ;
> - label = "pnor";
> - m25p,fast-read;
> - };
> - };
> - };
> -
> gpio-fsi {
> compatible = "fsi-master-gpio", "fsi-master";
>
> @@ -94,6 +58,27 @@
> };
> };
>
> +&fmc {
> + status = "okay";
> + flash@0 {
> + status = "okay";
> + m25p,fast-read;
> +#include "aspeed-bmc-opp-flash-layout.dtsi"
> + };
> +};
> +
> +&spi {
> + status = "okay";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_spi1_default>;
> +
> + flash@0 {
> + status = "okay";
> + label = "pnor";
> + m25p,fast-read;
> + };
> +};
> +
> &pinctrl {
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_flbusy_default &pinctrl_flwp_default diff --git
> a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
> b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
> index 713246090906..50be8dd921cf 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
> @@ -30,35 +30,26 @@
> reg = <0x47800000 0x00800000>; /* 8MB */
> };
> };
> +};
>
> - ahb {
> - bmc_pnor: fmc@1e620000 {
> - reg = < 0x1e620000 0x94
> - 0x20000000 0x02000000 >;
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "aspeed,ast2400-fmc";
> - aspeed,fmc-has-dma;
> - interrupts = <19>;
> - flash@0 {
> - reg = < 0 >;
> - compatible = "jedec,spi-nor" ;
> +&fmc {
> + status = "okay";
> + flash@0 {
> + status = "okay";
> + m25p,fast-read;
> #include "aspeed-bmc-opp-flash-layout.dtsi"
> - };
> - };
> + };
> +};
>
> - host_pnor: spi@1e630000 {
> - reg = < 0x1e630000 0x18
> - 0x30000000 0x01000000 >;
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "aspeed,ast2400-smc";
> - flash {
> - reg = < 0 >;
> - compatible = "jedec,spi-nor" ;
> - label = "pnor";
> - };
> - };
> +&spi {
> + status = "okay";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_spi1_default>;
> +
> + flash@0 {
> + status = "okay";
> + m25p,fast-read;
> + label = "pnor";
> };
> };
>
> diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-
> g4.dtsi
> index d8827d522dfe..9a329cee72bf 100644
> --- a/arch/arm/boot/dts/aspeed-g4.dtsi
> +++ b/arch/arm/boot/dts/aspeed-g4.dtsi
> @@ -44,6 +44,40 @@
> #size-cells = <1>;
> ranges;
>
> + fmc: fmc@1e620000 {
> + reg = < 0x1e620000 0x94
> + 0x20000000 0x02000000 >;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + compatible = "aspeed,ast2400-fmc";
> + status = "disabled";
> + aspeed,fmc-has-dma;
> + interrupts = <19>;
> + clocks = <&clk_ahb>;
> + clock-names = "ahb";
> + flash@0 {
> + reg = < 0 >;
> + compatible = "jedec,spi-nor" ;
> + status = "disabled";
> + };
> + };
> +
> + spi: spi@1e630000 {
> + reg = < 0x1e630000 0x18
> + 0x30000000 0x02000000 >;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + compatible = "aspeed,ast2400-spi";
> + status = "disabled";
> + clocks = <&clk_ahb>;
> + clock-names = "ahb";
> + flash@0 {
> + reg = < 0 >;
> + compatible = "jedec,spi-nor" ;
> + status = "disabled";
> + };
> + };
> +
> vic: interrupt-controller@1e6c0080 {
> compatible = "aspeed,ast2400-vic";
> interrupt-controller;
> --
> 2.11.0
prev parent reply other threads:[~2017-06-01 7:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-31 13:56 [PATCH linux dev-4.10] arm: dts: aspeed: Update old style flash nodes Joel Stanley
2017-05-31 16:49 ` Cédric Le Goater
2017-05-31 17:15 ` Eddie James
2017-06-01 6:40 ` Joel Stanley
2017-06-01 6:45 ` Cédric Le Goater
2017-06-01 7:49 ` Joel Stanley
2017-06-01 7:48 ` Mykola Kostenok [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=VI1PR05MB32475FDC198B13939F25802BEFF60@VI1PR05MB3247.eurprd05.prod.outlook.com \
--to=c_mykolak@mellanox.com \
--cc=andrew@aj.id.au \
--cc=clg@kaod.org \
--cc=eajames@linux.vnet.ibm.com \
--cc=eajames@us.ibm.com \
--cc=joel@jms.id.au \
--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.