| Message ID | 20200909203059.23427-5-eajames@linux.ibm.com |
|---|---|
| State | Accepted |
| Commit | 7505340245ff6dfcb184ab7ef64270cc8d4f69a8 |
| Headers | show |
| Series | None | expand |
On Wed, 9 Sep 2020 at 20:31, Eddie James <eajames@linux.ibm.com> wrote: > > Set I2C bus 0 to multi-master mode and add the panel device that will > register as a slave. > > Signed-off-by: Eddie James <eajames@linux.ibm.com> > Reviewed-by: Joel Stanley <joel@jms.id.au> Applied to the aspeed tree for v5.10. Cheers, Joel > --- > arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts > index 5f4ee67ac787..4d070d6ba09f 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.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> > > / { > @@ -438,7 +439,13 @@ aliases { > }; > > &i2c0 { > + multi-master; > status = "okay"; > + > + ibm-panel@62 { > + compatible = "ibm,op-panel"; > + reg = <(0x62 | I2C_OWN_SLAVE_ADDRESS)>; > + }; > }; > > &i2c1 { > -- > 2.26.2 >
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts index 5f4ee67ac787..4d070d6ba09f 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.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> / { @@ -438,7 +439,13 @@ aliases { }; &i2c0 { + multi-master; status = "okay"; + + ibm-panel@62 { + compatible = "ibm,op-panel"; + reg = <(0x62 | I2C_OWN_SLAVE_ADDRESS)>; + }; }; &i2c1 {