[PATCH linux dev-4.10] arm: dts: aspeed: Update old style flash nodes
Mykola Kostenok
c_mykolak at mellanox.com
Thu Jun 1 17:48:42 AEST 2017
Acked-by: Mykola Kostenok <c_mykolak at mellanox.com>
Best regards. Mykola Kostenok.
> -----Original Message-----
> From: joel.stan at gmail.com [mailto:joel.stan at gmail.com] On Behalf Of Joel
> Stanley
> Sent: Wednesday, May 31, 2017 4:56 PM
> To: openbmc at lists.ozlabs.org
> Cc: Edward A. James <eajames at us.ibm.com>; Eddie James
> <eajames at linux.vnet.ibm.com>; Cédric Le Goater <clg at kaod.org>; Andrew
> Jeffery <andrew at aj.id.au>; Mykola Kostenok <c_mykolak at mellanox.com>
> Subject: [PATCH linux dev-4.10] arm: dts: aspeed: Update old style flash
> nodes
>
> From: "Edward A. James" <eajames at 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 at 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 at 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 at 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 at 1e620000 {
> - reg = < 0x1e620000 0x94
> - 0x20000000 0x02000000 >;
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "aspeed,ast2400-fmc";
> - flash at 0 {
> - reg = < 0 >;
> - compatible = "jedec,spi-nor" ;
> +&fmc {
> + status = "okay";
> + flash at 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 at 1e620000 {
> - reg = < 0x1e620000 0xc4
> - 0x20000000 0x02000000 >;
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "aspeed,ast2500-fmc";
> - interrupts = <19>;
> - flash at 0 {
> - reg = < 0 >;
> - compatible = "jedec,spi-nor" ;
> +};
> +
> +&fmc {
> + status = "okay";
> + flash at 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 at 1e620000 {
> - reg = < 0x1e620000 0x94
> - 0x20000000 0x02000000 >;
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "aspeed,ast2400-fmc";
> - flash at 0 {
> - reg = < 0 >;
> - compatible = "jedec,spi-nor" ;
> -#include "aspeed-bmc-opp-flash-layout.dtsi"
> - };
> - };
> -
> - host_pnor: spi at 1e630000 {
> - reg = < 0x1e630000 0x18
> - 0x30000000 0x02000000 >;
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "aspeed,ast2400-spi";
> - flash at 0 {
> - reg = < 0 >;
> - compatible = "jedec,spi-nor" ;
> - label = "pnor";
> - };
> - };
> - };
> -
> leds {
> compatible = "gpio-leds";
>
> @@ -76,6 +48,27 @@
> };
> };
>
> +&fmc {
> + status = "okay";
> + flash at 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 at 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 at 1e620000 {
> - reg = < 0x1e620000 0x94
> - 0x20000000 0x02000000 >;
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "aspeed,ast2400-fmc";
> -
> - flash at 0 {
> - reg = < 0 >;
> - compatible = "jedec,spi-nor" ;
> +&fmc {
> + status = "okay";
> + flash at 0 {
> + status = "okay";
> + m25p,fast-read;
> #include "aspeed-bmc-opp-flash-layout.dtsi"
> - };
> - };
> + };
> +};
>
> - spi at 1e630000 {
> - reg = < 0x1e630000 0x18
> - 0x30000000 0x02000000 >;
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "aspeed,ast2400-spi";
> - flash at 0 {
> - reg = < 0 >;
> - compatible = "jedec,spi-nor" ;
> - label = "pnor";
> - };
> - };
> +&spi {
> + status = "okay";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_spi1_default>;
> +
> + flash at 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 at 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 at 0 {
> - reg = < 0 >;
> - compatible = "jedec,spi-nor" ;
> - m25p,fast-read;
> + flash at 0 {
> + status = "okay";
> + m25p,fast-read;
> #include "aspeed-bmc-opp-flash-layout.dtsi"
> - };
> - };
> + };
> +};
>
> - host_pnor: spi at 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 at 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 at 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 at 0 {
> - reg = < 0 >;
> - compatible = "jedec,spi-nor" ;
> - m25p,fast-read;
> -#include "aspeed-bmc-opp-flash-layout.dtsi"
> - };
> - };
> -
> - host_pnor: spi at 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 at 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 at 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 at 1e620000 {
> - reg = < 0x1e620000 0x94
> - 0x20000000 0x02000000 >;
> - #address-cells = <1>;
> - #size-cells = <0>;
> - compatible = "aspeed,ast2400-fmc";
> - aspeed,fmc-has-dma;
> - interrupts = <19>;
> - flash at 0 {
> - reg = < 0 >;
> - compatible = "jedec,spi-nor" ;
> +&fmc {
> + status = "okay";
> + flash at 0 {
> + status = "okay";
> + m25p,fast-read;
> #include "aspeed-bmc-opp-flash-layout.dtsi"
> - };
> - };
> + };
> +};
>
> - host_pnor: spi at 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 at 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 at 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 at 0 {
> + reg = < 0 >;
> + compatible = "jedec,spi-nor" ;
> + status = "disabled";
> + };
> + };
> +
> + spi: spi at 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 at 0 {
> + reg = < 0 >;
> + compatible = "jedec,spi-nor" ;
> + status = "disabled";
> + };
> + };
> +
> vic: interrupt-controller at 1e6c0080 {
> compatible = "aspeed,ast2400-vic";
> interrupt-controller;
> --
> 2.11.0
More information about the openbmc
mailing list