From: Joel Stanley <joel@jms.id.au>
To: Eddie James <eajames@linux.ibm.com>
Cc: OpenBMC Maillist <openbmc@lists.ozlabs.org>
Subject: Re: [PATCH linux dev-5.10 05/35] ARM: dts: aspeed: rainier: Add additional processor CFAMs
Date: Fri, 12 Mar 2021 00:07:54 +0000 [thread overview]
Message-ID: <CACPK8Xc-Vg=CL5W+RrUTfz76g5nJ6AuSKfSqGLoiEXbpnLHPXQ@mail.gmail.com> (raw)
In-Reply-To: <20210308225419.46530-6-eajames@linux.ibm.com>
On Mon, 8 Mar 2021 at 22:54, Eddie James <eajames@linux.ibm.com> wrote:
>
> Rainier has two dual-chip modules and therefore four CFAMs with their
> associated engines. Add these to the devicetree with the i2c busses
> that have devices on them.
>
> Signed-off-by: Eddie James <eajames@linux.ibm.com>
> Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Joel Stanley <joel@jms.id.au>
> ---
> arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 281 ++++++++++++++++++-
> 1 file changed, 279 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> index e147ff549517..6684485a2db0 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> @@ -12,6 +12,39 @@ / {
> compatible = "ibm,rainier-bmc", "aspeed,ast2600";
>
> aliases {
> + i2c100 = &cfam0_i2c0;
> + i2c101 = &cfam0_i2c1;
> + i2c110 = &cfam0_i2c10;
> + i2c111 = &cfam0_i2c11;
> + i2c112 = &cfam0_i2c12;
> + i2c113 = &cfam0_i2c13;
> + i2c114 = &cfam0_i2c14;
> + i2c115 = &cfam0_i2c15;
> + i2c202 = &cfam1_i2c2;
> + i2c203 = &cfam1_i2c3;
> + i2c210 = &cfam1_i2c10;
> + i2c211 = &cfam1_i2c11;
> + i2c214 = &cfam1_i2c14;
> + i2c215 = &cfam1_i2c15;
> + i2c216 = &cfam1_i2c16;
> + i2c217 = &cfam1_i2c17;
> + i2c300 = &cfam2_i2c0;
> + i2c301 = &cfam2_i2c1;
> + i2c310 = &cfam2_i2c10;
> + i2c311 = &cfam2_i2c11;
> + i2c312 = &cfam2_i2c12;
> + i2c313 = &cfam2_i2c13;
> + i2c314 = &cfam2_i2c14;
> + i2c315 = &cfam2_i2c15;
> + i2c402 = &cfam3_i2c2;
> + i2c403 = &cfam3_i2c3;
> + i2c410 = &cfam3_i2c10;
> + i2c411 = &cfam3_i2c11;
> + i2c414 = &cfam3_i2c14;
> + i2c415 = &cfam3_i2c15;
> + i2c416 = &cfam3_i2c16;
> + i2c417 = &cfam3_i2c17;
> +
> serial4 = &uart5;
> i2c16 = &i2c2mux0;
> i2c17 = &i2c2mux1;
> @@ -30,6 +63,10 @@ aliases {
> spi31 = &cfam2_spi1;
> spi32 = &cfam2_spi2;
> spi33 = &cfam2_spi3;
> + spi40 = &cfam3_spi0;
> + spi41 = &cfam3_spi1;
> + spi42 = &cfam3_spi2;
> + spi43 = &cfam3_spi3;
> };
>
> chosen {
> @@ -320,6 +357,38 @@ i2c@1800 {
> reg = <0x1800 0x400>;
> #address-cells = <1>;
> #size-cells = <0>;
> +
> + cfam0_i2c0: i2c-bus@0 {
> + reg = <0>; /* OMI01 */
> + };
> +
> + cfam0_i2c1: i2c-bus@1 {
> + reg = <1>; /* OMI23 */
> + };
> +
> + cfam0_i2c10: i2c-bus@a {
> + reg = <10>; /* OP3A */
> + };
> +
> + cfam0_i2c11: i2c-bus@b {
> + reg = <11>; /* OP3B */
> + };
> +
> + cfam0_i2c12: i2c-bus@c {
> + reg = <12>; /* OP4A */
> + };
> +
> + cfam0_i2c13: i2c-bus@d {
> + reg = <13>; /* OP4B */
> + };
> +
> + cfam0_i2c14: i2c-bus@e {
> + reg = <14>; /* OP5A */
> + };
> +
> + cfam0_i2c15: i2c-bus@f {
> + reg = <15>; /* OP5B */
> + };
> };
>
> fsi2spi@1c00 {
> @@ -411,8 +480,6 @@ fsi_hub0: hub@3400 {
> reg = <0x3400 0x400>;
> #address-cells = <2>;
> #size-cells = <0>;
> -
> - no-scan-on-init;
> };
> };
> };
> @@ -434,6 +501,38 @@ i2c@1800 {
> reg = <0x1800 0x400>;
> #address-cells = <1>;
> #size-cells = <0>;
> +
> + cfam1_i2c2: i2c-bus@2 {
> + reg = <2>; /* OMI45 */
> + };
> +
> + cfam1_i2c3: i2c-bus@3 {
> + reg = <3>; /* OMI67 */
> + };
> +
> + cfam1_i2c10: i2c-bus@a {
> + reg = <10>; /* OP3A */
> + };
> +
> + cfam1_i2c11: i2c-bus@b {
> + reg = <11>; /* OP3B */
> + };
> +
> + cfam1_i2c14: i2c-bus@e {
> + reg = <14>; /* OP5A */
> + };
> +
> + cfam1_i2c15: i2c-bus@f {
> + reg = <15>; /* OP5B */
> + };
> +
> + cfam1_i2c16: i2c-bus@10 {
> + reg = <16>; /* OP6A */
> + };
> +
> + cfam1_i2c17: i2c-bus@11 {
> + reg = <17>; /* OP6B */
> + };
> };
>
> fsi2spi@1c00 {
> @@ -546,6 +645,38 @@ i2c@1800 {
> reg = <0x1800 0x400>;
> #address-cells = <1>;
> #size-cells = <0>;
> +
> + cfam2_i2c0: i2c-bus@0 {
> + reg = <0>; /* OM01 */
> + };
> +
> + cfam2_i2c1: i2c-bus@1 {
> + reg = <1>; /* OM23 */
> + };
> +
> + cfam2_i2c10: i2c-bus@a {
> + reg = <10>; /* OP3A */
> + };
> +
> + cfam2_i2c11: i2c-bus@b {
> + reg = <11>; /* OP3B */
> + };
> +
> + cfam2_i2c12: i2c-bus@c {
> + reg = <12>; /* OP4A */
> + };
> +
> + cfam2_i2c13: i2c-bus@d {
> + reg = <13>; /* OP4B */
> + };
> +
> + cfam2_i2c14: i2c-bus@e {
> + reg = <14>; /* OP5A */
> + };
> +
> + cfam2_i2c15: i2c-bus@f {
> + reg = <15>; /* OP5B */
> + };
> };
>
> fsi2spi@1c00 {
> @@ -641,6 +772,148 @@ fsi_hub2: hub@3400 {
> no-scan-on-init;
> };
> };
> +
> + cfam@3,0 {
> + reg = <3 0>;
> + #address-cells = <1>;
> + #size-cells = <1>;
> + chip-id = <3>;
> +
> + scom@1000 {
> + compatible = "ibm,fsi2pib";
> + reg = <0x1000 0x400>;
> + };
> +
> + i2c@1800 {
> + compatible = "ibm,fsi-i2c-master";
> + reg = <0x1800 0x400>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + cfam3_i2c2: i2c-bus@2 {
> + reg = <2>; /* OM45 */
> + };
> +
> + cfam3_i2c3: i2c-bus@3 {
> + reg = <3>; /* OM67 */
> + };
> +
> + cfam3_i2c10: i2c-bus@a {
> + reg = <10>; /* OP3A */
> + };
> +
> + cfam3_i2c11: i2c-bus@b {
> + reg = <11>; /* OP3B */
> + };
> +
> + cfam3_i2c14: i2c-bus@e {
> + reg = <14>; /* OP5A */
> + };
> +
> + cfam3_i2c15: i2c-bus@f {
> + reg = <15>; /* OP5B */
> + };
> +
> + cfam3_i2c16: i2c-bus@10 {
> + reg = <16>; /* OP6A */
> + };
> +
> + cfam3_i2c17: i2c-bus@11 {
> + reg = <17>; /* OP6B */
> + };
> + };
> +
> + fsi2spi@1c00 {
> + compatible = "ibm,fsi2spi";
> + reg = <0x1c00 0x400>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + cfam3_spi0: spi@0 {
> + reg = <0x0>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + eeprom@0 {
> + at25,byte-len = <0x80000>;
> + at25,addr-mode = <4>;
> + at25,page-size = <256>;
> +
> + compatible = "atmel,at25";
> + reg = <0>;
> + spi-max-frequency = <1000000>;
> + };
> + };
> +
> + cfam3_spi1: spi@20 {
> + reg = <0x20>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + eeprom@0 {
> + at25,byte-len = <0x80000>;
> + at25,addr-mode = <4>;
> + at25,page-size = <256>;
> +
> + compatible = "atmel,at25";
> + reg = <0>;
> + spi-max-frequency = <1000000>;
> + };
> + };
> +
> + cfam3_spi2: spi@40 {
> + reg = <0x40>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + eeprom@0 {
> + at25,byte-len = <0x80000>;
> + at25,addr-mode = <4>;
> + at25,page-size = <256>;
> +
> + compatible = "atmel,at25";
> + reg = <0>;
> + spi-max-frequency = <1000000>;
> + };
> + };
> +
> + cfam3_spi3: spi@60 {
> + reg = <0x60>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + eeprom@0 {
> + at25,byte-len = <0x80000>;
> + at25,addr-mode = <4>;
> + at25,page-size = <256>;
> +
> + compatible = "atmel,at25";
> + reg = <0>;
> + spi-max-frequency = <1000000>;
> + };
> + };
> + };
> +
> + sbefifo@2400 {
> + compatible = "ibm,p9-sbefifo";
> + reg = <0x2400 0x400>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + fsi_occ3: occ {
> + compatible = "ibm,p10-occ";
> + };
> + };
> +
> + fsi_hub3: hub@3400 {
> + compatible = "fsi-master-hub";
> + reg = <0x3400 0x400>;
> + #address-cells = <2>;
> + #size-cells = <0>;
> +
> + no-scan-on-init;
> + };
> + };
> };
>
> /* Legacy OCC numbering (to get rid of when userspace is fixed) */
> @@ -656,6 +929,10 @@ &fsi_occ2 {
> reg = <3>;
> };
>
> +&fsi_occ3 {
> + reg = <4>;
> +};
> +
> &ibt {
> status = "okay";
> };
> --
> 2.27.0
>
next prev parent reply other threads:[~2021-03-12 0:08 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-08 22:53 [PATCH linux dev-5.10 00/35] Rainier and Everest system updates Eddie James
2021-03-08 22:53 ` [PATCH linux dev-5.10 01/35] ARM: dts: aspeed: rainier: Add Operator Panel LEDs Eddie James
2021-03-12 0:05 ` Joel Stanley
2021-03-08 22:53 ` [PATCH linux dev-5.10 02/35] ARM: dts: aspeed: rainier: Add directly controlled LEDs Eddie James
2021-03-12 0:04 ` Joel Stanley
2021-03-08 22:53 ` [PATCH linux dev-5.10 03/35] ARM: dts: aspeed: rainier: Add gpio-keys-polled for fans Eddie James
2021-03-12 0:06 ` Joel Stanley
2021-03-08 22:53 ` [PATCH linux dev-5.10 04/35] ARM: dts: aspeed: rainier: Set MAX31785 config Eddie James
2021-03-12 0:07 ` Joel Stanley
2021-03-08 22:53 ` [PATCH linux dev-5.10 05/35] ARM: dts: aspeed: rainier: Add additional processor CFAMs Eddie James
2021-03-12 0:07 ` Joel Stanley [this message]
2021-03-08 22:53 ` [PATCH linux dev-5.10 06/35] ARM: dts: aspeed: rainier: Add leds that are off PCA9552 Eddie James
2021-03-12 0:09 ` Joel Stanley
2021-03-12 0:21 ` Milton Miller II
2021-03-12 0:30 ` Joel Stanley
[not found] ` <6ACEC474-8CFD-4BA9-B8FF-CCD41007AA67@linux.vnet.ibm.com>
2021-03-24 23:43 ` Joel Stanley
2021-04-26 5:59 ` vishwanatha subbanna
2021-04-27 21:22 ` Jacek Anaszewski
2021-03-08 22:53 ` [PATCH linux dev-5.10 07/35] ARM: dts: aspeed: rainier: Add leds that are off pic16f882 Eddie James
2021-03-12 0:10 ` Joel Stanley
2021-03-08 22:53 ` [PATCH linux dev-5.10 08/35] ARM: dts: aspeed: rainier: Add leds on optional DASD cards Eddie James
2021-03-12 0:10 ` Joel Stanley
2021-03-08 22:53 ` [PATCH linux dev-5.10 09/35] ARM: dts: aspeed: rainier: Add leds that are on optional PCI cable cards Eddie James
2021-03-12 0:11 ` Joel Stanley
2021-03-08 22:53 ` [PATCH linux dev-5.10 10/35] ARM: dts: aspeed: rainier: Add presence GPIOs Eddie James
2021-03-12 0:14 ` Joel Stanley
2021-03-08 22:53 ` [PATCH linux dev-5.10 11/35] ARM: dts: aspeed: rainier: Mark controllers as restricted Eddie James
2021-03-12 0:15 ` Joel Stanley
2021-03-08 22:53 ` [PATCH linux dev-5.10 12/35] ARM: dts: aspeed: rainier 4U: Fix fan configuration Eddie James
2021-03-12 0:17 ` Joel Stanley
2021-03-08 22:53 ` [PATCH linux dev-5.10 13/35] dt: bindings: mmc: Add phase control properties for the Aspeed SDHCI Eddie James
2021-03-12 0:19 ` Joel Stanley
2021-04-12 3:21 ` Andrew Jeffery
2021-03-08 22:53 ` [PATCH linux dev-5.10 14/35] mmc: sdhci: aspeed: Expose data sample phase delay tuning Eddie James
2021-03-08 22:53 ` [PATCH linux dev-5.10 15/35] ARM: dts: aspeed: tacoma: Add data sample phase delay for eMMC Eddie James
2021-03-08 22:54 ` [PATCH linux dev-5.10 16/35] ARM: dts: aspeed: tacoma: Remove CFAM reset GPIO Eddie James
2021-03-08 22:54 ` [PATCH linux dev-5.10 17/35] ARM: dts: aspeed: Everest: Add I2C components Eddie James
2021-03-08 22:54 ` [PATCH linux dev-5.10 18/35] ARM: dts: Aspeed: Everest: Add max31785 fan controller device Eddie James
2021-03-08 22:54 ` [PATCH linux dev-5.10 19/35] ARM: dts: Aspeed: Everest: Add FSI CFAMs and re-number engines Eddie James
2021-03-08 22:54 ` [PATCH linux dev-5.10 20/35] ARM: dts: Aspeed: Everest: Add pca9552 fan presence Eddie James
2021-03-08 22:54 ` [PATCH linux dev-5.10 21/35] ARM: dts: aspeed: everest: Add power supply i2c devices Eddie James
2021-03-08 22:54 ` [PATCH linux dev-5.10 22/35] ARM: dts: aspeed: everest: Add UCD90320 power sequencer Eddie James
2021-03-08 22:54 ` [PATCH linux dev-5.10 23/35] ARM: dts: aspeed: everest: GPIOs support Eddie James
2021-03-08 22:54 ` [PATCH linux dev-5.10 24/35] ARM: dts: Aspeed: Everest: Add RTC Eddie James
2021-03-08 22:54 ` [PATCH linux dev-5.10 25/35] ARM: dts: aspeed: rainier: Support pass 2 planar Eddie James
2021-03-08 22:54 ` [PATCH linux dev-5.10 26/35] fsi: scom: Handle FSI2PIB timeout Eddie James
2021-03-12 0:20 ` Joel Stanley
2021-03-08 22:54 ` [PATCH linux dev-5.10 27/35] net/ncsi: Avoid channel_monitor hrtimer deadlock Eddie James
2021-03-12 0:35 ` Joel Stanley
2021-03-08 22:54 ` [PATCH linux dev-5.10 28/35] ftgmac100: Restart MAC HW once Eddie James
2021-03-08 22:54 ` [PATCH linux dev-5.10 29/35] hwmon: (pmbus) Add a PMBUS_NO_CAPABILITY platform data flag Eddie James
2021-03-08 22:54 ` [PATCH linux dev-5.10 30/35] hwmon: (pmbus/ibm-cffps) Set the PMBUS_NO_CAPABILITY flag Eddie James
2021-03-12 0:23 ` Joel Stanley
2021-03-08 22:54 ` [PATCH linux dev-5.10 31/35] i2c: Allow throttling of transfers to client devices Eddie James
2021-03-08 22:54 ` [PATCH linux dev-5.10 32/35] pmbus: (ucd9000) Throttle SMBus transfers to avoid poor behaviour Eddie James
2021-03-08 22:54 ` [PATCH linux dev-5.10 33/35] pmbus: (core) Add a one-shot retry in pmbus_set_page() Eddie James
2021-03-09 20:21 ` Andrei Kartashev
2021-03-12 0:35 ` Joel Stanley
2021-03-08 22:54 ` [PATCH linux dev-5.10 34/35] pmbus: (max31785) Add a local pmbus_set_page() implementation Eddie James
2021-03-08 22:54 ` [PATCH linux dev-5.10 35/35] pmbus: (max31785) Retry enabling fans after writing MFR_FAN_CONFIG Eddie James
2021-03-12 0:37 ` [PATCH linux dev-5.10 00/35] Rainier and Everest system updates Joel Stanley
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='CACPK8Xc-Vg=CL5W+RrUTfz76g5nJ6AuSKfSqGLoiEXbpnLHPXQ@mail.gmail.com' \
--to=joel@jms.id.au \
--cc=eajames@linux.ibm.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).