On Wed, 9 Sep 2020 at 20:31, Eddie James <eajames@xxxxxxxxxxxxx> wrote: > > Set I2C bus 7 to multi-master mode and add the panel device that will > register as a slave. > > Signed-off-by: Eddie James <eajames@xxxxxxxxxxxxx> > Reviewed-by: Joel Stanley <joel@xxxxxxxxx> Applied to the aspeed tree for v5.10. Cheers, Joel > --- > arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts > index b94421f6cbd5..50d528444f5d 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts > @@ -4,6 +4,7 @@ > > #include "aspeed-g6.dtsi" > #include <dt-bindings/gpio/aspeed-gpio.h> > +#include <dt-bindings/i2c/i2c.h> > #include <dt-bindings/leds/leds-pca955x.h> > > / { > @@ -698,6 +699,7 @@ eeprom@53 { > }; > > &i2c7 { > + multi-master; > status = "okay"; > > si7021-a20@20 { > @@ -831,6 +833,11 @@ gpio@15 { > }; > }; > > + ibm-panel@62 { > + compatible = "ibm,op-panel"; > + reg = <(0x62 | I2C_OWN_SLAVE_ADDRESS)>; > + }; > + > dps: dps310@76 { > compatible = "infineon,dps310"; > reg = <0x76>; > -- > 2.26.2 >