| Message ID | 20170116202120.17855-1-mspinler@linux.vnet.ibm.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Tue, Jan 17, 2017 at 7:21 AM, Matt Spinler <mspinler@linux.vnet.ibm.com> wrote: > From: Matt Spinler <spinler@us.ibm.com> > > Add more I2C devices and the rear LEDs. > > Signed-off-by: Matt Spinler <spinler@us.ibm.com> Thanks, merged into dev-4.7. Cheers, Joel > --- > arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 41 +++++++++++++++++++++--- > 1 file changed, 37 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts > index 9badf3e94599..da5ec5ee3746 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts > @@ -1,7 +1,7 @@ > /dts-v1/; > > #include "aspeed-g5.dtsi" > -#include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/gpio/aspeed-gpio.h> > > / { > model = "Witherspoon BMC"; > @@ -19,6 +19,22 @@ > memory { > reg = <0x80000000 0x40000000>; > }; > + > + leds { > + compatible = "gpio-leds"; > + > + rear-fault { > + gpios = <&gpio ASPEED_GPIO(N, 2) GPIO_ACTIVE_LOW>; > + }; > + > + rear-id { > + gpios = <&gpio ASPEED_GPIO(N, 4) GPIO_ACTIVE_LOW>; > + }; > + > + rear-power { > + gpios = <&gpio ASPEED_GPIO(N, 3) GPIO_ACTIVE_LOW>; > + }; > + }; > }; > > &fmc { > @@ -115,25 +131,38 @@ > compatible = "bosch,bmp180"; > reg = <0x77>; > }; > + > + max31785@52 { > + compatible = "maxim,max31785"; > + reg = <0x52>; > + }; > }; > > &i2c4 { > status = "okay"; > > - /* CP1 TMP423A */ > /* CP1 VDN & VDDR */ > /* CP1 VDD & VCS */ > /* CP1 VIO */ > + > + tmp423a@4c { > + compatible = "ti,tmp423"; > + reg = <0x4c>; > + }; > }; > > > &i2c5 { > status = "okay"; > > - /* CP1 TMP423A */ > /* CP1 VDN & VDDR */ > /* CP1 VDD & VCS */ > /* CP1 VIO */ > + > + tmp423a@4c { > + compatible = "ti,tmp423"; > + reg = <0x4c>; > + }; > }; > > &i2c6 { > @@ -152,13 +181,17 @@ > &i2c9 { > status = "okay"; > > - /* Tmp275 */ > > /* MUX > * -> PCIe Slot 3 > * -> PCIe Slot 4 > * -> PCA9517 -> PEX8725 > */ > + > + tmp275@4a { > + compatible = "ti,tmp275"; > + reg = <0x4a>; > + }; > }; > > &i2c10 { > -- > 2.11.0 > > _______________________________________________ > openbmc mailing list > openbmc@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/openbmc
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts index 9badf3e94599..da5ec5ee3746 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts @@ -1,7 +1,7 @@ /dts-v1/; #include "aspeed-g5.dtsi" -#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/gpio/aspeed-gpio.h> / { model = "Witherspoon BMC"; @@ -19,6 +19,22 @@ memory { reg = <0x80000000 0x40000000>; }; + + leds { + compatible = "gpio-leds"; + + rear-fault { + gpios = <&gpio ASPEED_GPIO(N, 2) GPIO_ACTIVE_LOW>; + }; + + rear-id { + gpios = <&gpio ASPEED_GPIO(N, 4) GPIO_ACTIVE_LOW>; + }; + + rear-power { + gpios = <&gpio ASPEED_GPIO(N, 3) GPIO_ACTIVE_LOW>; + }; + }; }; &fmc { @@ -115,25 +131,38 @@ compatible = "bosch,bmp180"; reg = <0x77>; }; + + max31785@52 { + compatible = "maxim,max31785"; + reg = <0x52>; + }; }; &i2c4 { status = "okay"; - /* CP1 TMP423A */ /* CP1 VDN & VDDR */ /* CP1 VDD & VCS */ /* CP1 VIO */ + + tmp423a@4c { + compatible = "ti,tmp423"; + reg = <0x4c>; + }; }; &i2c5 { status = "okay"; - /* CP1 TMP423A */ /* CP1 VDN & VDDR */ /* CP1 VDD & VCS */ /* CP1 VIO */ + + tmp423a@4c { + compatible = "ti,tmp423"; + reg = <0x4c>; + }; }; &i2c6 { @@ -152,13 +181,17 @@ &i2c9 { status = "okay"; - /* Tmp275 */ /* MUX * -> PCIe Slot 3 * -> PCIe Slot 4 * -> PCA9517 -> PEX8725 */ + + tmp275@4a { + compatible = "ti,tmp275"; + reg = <0x4a>; + }; }; &i2c10 {