From: Tao Ren <taoren@fb.com> To: Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Joel Stanley <joel@jms.id.au>, Andrew Jeffery <andrew@aj.id.au>, <devicetree@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linux-aspeed@lists.ozlabs.org>, <linux-kernel@vger.kernel.org>, <openbmc@lists.ozlabs.org> Cc: Tao Ren <taoren@fb.com> Subject: [PATCH 3/4] ARM: dts: aspeed: minipack: include dtsi for common network BMC devices Date: Mon, 21 Oct 2019 12:48:19 -0700 [thread overview] Message-ID: <20191021194820.293556-4-taoren@fb.com> (raw) In-Reply-To: <20191021194820.293556-1-taoren@fb.com> The patch simplifies Minipack device tree by including dtsi to define devices which are common to Facebook AST2500 Network BMC platforms. Below is the summary of changes comparing with previous dts version: - enabling the second firmware flash. - updating firmware flashes' size from 32MB to 64MB. - enabling the emmc device in slot #1. Signed-off-by: Tao Ren <taoren@fb.com> --- .../boot/dts/aspeed-bmc-facebook-minipack.dts | 59 ++++++------------- 1 file changed, 19 insertions(+), 40 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts index c05478296446..ed1a77c76ce9 100644 --- a/arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts +++ b/arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts @@ -2,7 +2,7 @@ // Copyright (c) 2018 Facebook Inc. /dts-v1/; -#include "aspeed-g5.dtsi" +#include "facebook-netbmc-ast2500-common.dtsi" / { model = "Facebook Minipack 100 BMC"; @@ -76,35 +76,36 @@ stdout-path = &uart1; bootargs = "debug console=ttyS1,9600n8 root=/dev/ram rw"; }; - - memory@80000000 { - reg = <0x80000000 0x20000000>; - }; }; -&wdt1 { +&wdt2 { status = "okay"; aspeed,reset-type = "system"; }; -&wdt2 { - status = "okay"; - aspeed,reset-type = "system"; +/* + * Both firmware flashes are 64MB on Minipack BMC. + */ +&fmc_flash0 { + partitions { + data0@1c00000 { + reg = <0x1c00000 0x2400000>; + }; + flash0@0 { + reg = <0x0 0x4000000>; + }; + }; }; -&fmc { - status = "okay"; - flash@0 { - status = "okay"; - m25p,fast-read; - label = "bmc"; -#include "facebook-bmc-flash-layout.dtsi" +&fmc_flash1 { + partitions { + flash1@0 { + reg = <0x0 0x4000000>; + }; }; }; &uart1 { - status = "okay"; - pinctrl-names = "default"; pinctrl-0 = <&pinctrl_txd1_default &pinctrl_rxd1_default &pinctrl_ncts1_default @@ -120,13 +121,6 @@ &pinctrl_rxd2_default>; }; -&uart3 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_txd3_default - &pinctrl_rxd3_default>; -}; - &uart4 { status = "okay"; pinctrl-names = "default"; @@ -134,17 +128,6 @@ &pinctrl_rxd4_default>; }; -&uart5 { - status = "okay"; -}; - -&mac1 { - status = "okay"; - no-hw-checksum; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>; -}; - &i2c0 { status = "okay"; bus-frequency = <400000>; @@ -423,7 +406,3 @@ &i2c13 { status = "okay"; }; - -&vhub { - status = "okay"; -}; -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Tao Ren <taoren@fb.com> To: Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Joel Stanley <joel@jms.id.au>, Andrew Jeffery <andrew@aj.id.au>, <devicetree@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linux-aspeed@lists.ozlabs.org>, <linux-kernel@vger.kernel.org>, <openbmc@lists.ozlabs.org> Cc: Tao Ren <taoren@fb.com> Subject: [PATCH 3/4] ARM: dts: aspeed: minipack: include dtsi for common network BMC devices Date: Mon, 21 Oct 2019 12:48:19 -0700 [thread overview] Message-ID: <20191021194820.293556-4-taoren@fb.com> (raw) In-Reply-To: <20191021194820.293556-1-taoren@fb.com> The patch simplifies Minipack device tree by including dtsi to define devices which are common to Facebook AST2500 Network BMC platforms. Below is the summary of changes comparing with previous dts version: - enabling the second firmware flash. - updating firmware flashes' size from 32MB to 64MB. - enabling the emmc device in slot #1. Signed-off-by: Tao Ren <taoren@fb.com> --- .../boot/dts/aspeed-bmc-facebook-minipack.dts | 59 ++++++------------- 1 file changed, 19 insertions(+), 40 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts index c05478296446..ed1a77c76ce9 100644 --- a/arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts +++ b/arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts @@ -2,7 +2,7 @@ // Copyright (c) 2018 Facebook Inc. /dts-v1/; -#include "aspeed-g5.dtsi" +#include "facebook-netbmc-ast2500-common.dtsi" / { model = "Facebook Minipack 100 BMC"; @@ -76,35 +76,36 @@ stdout-path = &uart1; bootargs = "debug console=ttyS1,9600n8 root=/dev/ram rw"; }; - - memory@80000000 { - reg = <0x80000000 0x20000000>; - }; }; -&wdt1 { +&wdt2 { status = "okay"; aspeed,reset-type = "system"; }; -&wdt2 { - status = "okay"; - aspeed,reset-type = "system"; +/* + * Both firmware flashes are 64MB on Minipack BMC. + */ +&fmc_flash0 { + partitions { + data0@1c00000 { + reg = <0x1c00000 0x2400000>; + }; + flash0@0 { + reg = <0x0 0x4000000>; + }; + }; }; -&fmc { - status = "okay"; - flash@0 { - status = "okay"; - m25p,fast-read; - label = "bmc"; -#include "facebook-bmc-flash-layout.dtsi" +&fmc_flash1 { + partitions { + flash1@0 { + reg = <0x0 0x4000000>; + }; }; }; &uart1 { - status = "okay"; - pinctrl-names = "default"; pinctrl-0 = <&pinctrl_txd1_default &pinctrl_rxd1_default &pinctrl_ncts1_default @@ -120,13 +121,6 @@ &pinctrl_rxd2_default>; }; -&uart3 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_txd3_default - &pinctrl_rxd3_default>; -}; - &uart4 { status = "okay"; pinctrl-names = "default"; @@ -134,17 +128,6 @@ &pinctrl_rxd4_default>; }; -&uart5 { - status = "okay"; -}; - -&mac1 { - status = "okay"; - no-hw-checksum; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>; -}; - &i2c0 { status = "okay"; bus-frequency = <400000>; @@ -423,7 +406,3 @@ &i2c13 { status = "okay"; }; - -&vhub { - status = "okay"; -}; -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-10-21 19:49 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-21 19:48 [PATCH 0/4] ARM: dts: aspeed: add dtsi for Facebook AST2500 Network BMCs Tao Ren 2019-10-21 19:48 ` Tao Ren 2019-10-21 19:48 ` [PATCH 1/4] " Tao Ren 2019-10-21 19:48 ` Tao Ren 2019-11-01 10:12 ` Joel Stanley 2019-11-01 10:12 ` Joel Stanley 2019-11-01 10:12 ` Joel Stanley 2019-11-01 17:42 ` Tao Ren 2019-11-01 17:42 ` Tao Ren 2019-10-21 19:48 ` [PATCH 2/4] ARM: dts: aspeed: cmm: include dtsi for common network BMC devices Tao Ren 2019-10-21 19:48 ` Tao Ren 2019-10-21 19:48 ` Tao Ren [this message] 2019-10-21 19:48 ` [PATCH 3/4] ARM: dts: aspeed: minipack: " Tao Ren 2019-10-21 19:48 ` [PATCH 4/4] ARM: dts: aspeed: yamp: " Tao Ren 2019-10-21 19:48 ` Tao Ren 2019-11-01 10:08 ` [PATCH 0/4] ARM: dts: aspeed: add dtsi for Facebook AST2500 Network BMCs Joel Stanley 2019-11-01 10:08 ` Joel Stanley 2019-11-01 10:08 ` Joel Stanley 2019-11-01 17:40 ` Tao Ren 2019-11-01 17:40 ` Tao Ren
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=20191021194820.293556-4-taoren@fb.com \ --to=taoren@fb.com \ --cc=andrew@aj.id.au \ --cc=devicetree@vger.kernel.org \ --cc=joel@jms.id.au \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-aspeed@lists.ozlabs.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=openbmc@lists.ozlabs.org \ --cc=robh+dt@kernel.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: linkBe 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.