[PATCH linux dev-4.10 v4 1/1] ARM: dts: Add S2600WF BMC Machine
Joel Stanley
joel at jms.id.au
Mon Dec 11 16:38:49 AEDT 2017
On Sat, Dec 9, 2017 at 5:30 AM, James Feist <james.feist at linux.intel.com> wrote:
> S2600WF is a Intel platform family with an Aspeed ast2500 BMC.
Thanks! I can search for that term and see what it is; that's much clearer.
I've been doing a bunch of work upstreaming device trees, and after
taking a closer look I've seen some other nits in your patch. Please
fix them up and we can get this merged.
>
> Signed-off-by: James Feist <james.feist at linux.intel.com>
> ---
> changes since v3:
> - use full product family name
>
> arch/arm/boot/dts/Makefile | 1 +
> arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 128 +++++++++++++++++++++++++
> 2 files changed, 129 insertions(+)
> create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 6d6c9eb..7c54fc8 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -992,6 +992,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += aspeed-bmc-opp-palmetto.dtb \
> aspeed-bmc-opp-lanyang.dtb \
> aspeed-bmc-mellanox-msn.dtb \
> aspeed-bmc-quanta-q71l.dtb \
> + aspeed-bmc-intel-s2600wf.dtb \
> aspeed-ast2500-evb.dtb
> endif
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts b/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
> new file mode 100644
> index 0000000..ef0ba3c
> --- /dev/null
> +++ b/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
> @@ -0,0 +1,128 @@
Add a copyright header. The new way of doing this in kernel land is
with the SPDX tag on the first line of your source file:
// SPDX-License-Identifier: GPL-2.0+
> +/dts-v1/;
> +
> +#include "aspeed-g5.dtsi"
> +
> +/ {
> + model = "S2600WF BMC";
> + compatible = "intel,s2600wf-bmc", "aspeed,ast2500";
> +
> + aliases {
> + serial4 = &uart5;
> + };
Drop this; all of the aliases are in aspeed-g5.dtsi.
> +
> + chosen {
> + stdout-path = &uart5;
> + bootargs = "earlyprintk";
> + };
> +
> + memory {
> + reg = <0x80000000 0x20000000>;
> + };
> +
> + reserved-memory {
> + #address-cells = <1>;
> + #size-cells = <1>;
> + ranges;
> +
> + vga_memory: framebuffer at 7f000000 {
> + no-map;
> + reg = <0x7f000000 0x01000000>;
> + };
> + };
> +
> + iio-hwmon {
> + compatible = "iio-hwmon";
> + io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>,
> + <&adc 4>, <&adc 5>, <&adc 6>, <&adc 7>,
> + <&adc 8>, <&adc 9>, <&adc 10>, <&adc 11>,
> + <&adc 12>, <&adc 13>, <&adc 14>, <&adc 15>;
> + };
> +
> +};
> +
> +&fmc {
> + status = "okay";
> + flash at 0 {
> + status = "okay";
Most of the flash chips we are using support the fast-read property.
Have you tried this with your system(s)?
m25p,fast-read
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts#n39
> +#include "openbmc-flash-layout.dtsi"
> + };
> +};
> +
> +&spi1 {
> + status = "okay";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_spi1_default>;
> +
> + flash at 0 {
> + status = "okay";
> + label = "pnor";
Same here.
> + };
> +};
> +
More information about the openbmc
mailing list