[PATCH linux dev-4.10 v2 4/4] ARM: dts: aspeed: quanta-q71l: PDB FRU and mux on the PDB in front of the PSUs.

[Patrick Venture]

Joel;

Thanks!  This was my first patch email series, so I appreciate your
help.  So I ran into something last night while reviewing something
that jumped out at me.  I'll need to send a new patch for the quanta
dts momentarily to address this.  In linux-4.7 the i2c-mux driver
pca9546 had a different compatibility string from 4.10.  Since we
don't own those devices on our BMC image in testing (we're mastering
them from the host via i2c over IPMI),  So, let me submit a patch to
fix that.

Patrick

On Thu, Jun 15, 2017 at 9:51 PM, Joel Stanley <joel at jms.id.au> wrote:
> Hi Patrick,
>
> On Wed, Jun 14, 2017 at 7:40 AM, Patrick Venture <venture at google.com> wrote:
>> Signed-off-by: Patrick Venture <venture at google.com>
>> ---
>>  arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 20 +++++++++++++++++++-
>
> I had some issues with conflicts between the 4 patch series and the
> two patches you'd sent before then. So merged all of your device tree
> changes for the Q71L as one patch.
>
> Next time you're sending changes that may conflict, put them all in
> the same series. It's okay to send a v2 of the series with additional
> patches added.
>
> Also, in the case of your patch #4 where you needed to make a fix,
> it's convention to re-send the entire series. No worries this time
> though, I got it sorted in the end.
>
> I noticed we did not have the dts added to the Makefile, so it was not
> building. I fixed that too. Please take a look a the tree and make
> sure all of the device tree nodes are in there as you expect them to
> be.
>
> Cheers,
>
> Joel
>
>>  1 file changed, 19 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
>> index 4b5047b5d592..2b01c5bcc88b 100644
>> --- a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
>> +++ b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
>> @@ -145,7 +145,7 @@
>>          *    SSD 1,
>>          *    SSD 2
>>          */
>> -       i2cswitch at 77 {
>> +       i2c-switch at 77 {
>>                 compatible = "pca9548";
>>                 #address-cells = <1>;
>>                 #size-cells = <0>;
>> @@ -177,6 +177,24 @@
>>
>>  &i2c7 {
>>         status = "okay";
>> +
>> +       /* 0: PSU4
>> +        *    PSU1
>> +        *    PSU3
>> +        *    PSU2
>> +        */
>> +       i2c-switch at 70 {
>> +               compatible = "pca9546";
>> +               reg = <0x70>;
>> +               #address-cells = <1>;
>> +               #size-cells = <0>;
>> +       };
>> +
>> +       /* PDB FRU */
>> +       eeprom at 52 {
>> +               compatible = "atmel,24c64";
>> +               reg = <0x52>;
>> +       };
>>  };
>>
>>  &i2c8 {
>> --
>> 2.13.1.518.g3df882009-goog
>>