| Message ID | 1507774637-13084-1-git-send-email-mine260309@gmail.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [linux,dev-4.10] ARM: dts: aspeed: firstone: Fix occ and i2c | expand |
On Thu, Oct 12, 2017 at 10:17 AM, Lei YU <mine260309@gmail.com> wrote: > 1. Use updated p8 occ driver; > 2. Enable i2c buses that are used. > > Signed-off-by: Lei YU <mine260309@gmail.com> Acked-by: Joel Stanley <joel@jms.id.au>
On Thu, 2017-10-12 at 10:17 +0800, Lei YU wrote: > 1. Use updated p8 occ driver; > 2. Enable i2c buses that are used. > > Signed-off-by: Lei YU <mine260309@gmail.com> Applied to dev-4.10 with a typo fix for 'firstone' in the subject Cheers, Andrew > --- > arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts > b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts > index d52b528..93ad3ea 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts > @@ -117,6 +117,7 @@ > > &i2c2 { > // i2c mux > + status = "okay"; > }; > > &i2c3 { > @@ -217,8 +218,8 @@ > status = "okay"; > > // turismo > - occ@50 { > - compatible = "ibm,occ-i2c"; > + occ-hwmon@50 { > + compatible = "ibm,p8-occ-hwmon"; > reg = <0x50>; > }; > > @@ -232,9 +233,9 @@ > status = "okay"; > > // turismo > - occ@50 { > - compatible = "ibm,occ-i2c"; > - reg = <0x50>; > + occ-hwmon@51 { > + compatible = "ibm,p8-occ-hwmon"; > + reg = <0x51>; > }; > > tmp423@4c { > @@ -260,10 +261,12 @@ > > &i2c9 { > // 4 way mux > + status = "okay"; > }; > > &i2c10 { > // 4 way mux > + status = "okay"; > }; > > &i2c11 { > @@ -304,10 +307,12 @@ > > &i2c12 { > // i2c hub PCA9516A > + status = "okay"; > }; > > &i2c13 { > // i2c hub PCA9516A > + status = "okay"; > }; > > &gpio {
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts index d52b528..93ad3ea 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts @@ -117,6 +117,7 @@ &i2c2 { // i2c mux + status = "okay"; }; &i2c3 { @@ -217,8 +218,8 @@ status = "okay"; // turismo - occ@50 { - compatible = "ibm,occ-i2c"; + occ-hwmon@50 { + compatible = "ibm,p8-occ-hwmon"; reg = <0x50>; }; @@ -232,9 +233,9 @@ status = "okay"; // turismo - occ@50 { - compatible = "ibm,occ-i2c"; - reg = <0x50>; + occ-hwmon@51 { + compatible = "ibm,p8-occ-hwmon"; + reg = <0x51>; }; tmp423@4c { @@ -260,10 +261,12 @@ &i2c9 { // 4 way mux + status = "okay"; }; &i2c10 { // 4 way mux + status = "okay"; }; &i2c11 { @@ -304,10 +307,12 @@ &i2c12 { // i2c hub PCA9516A + status = "okay"; }; &i2c13 { // i2c hub PCA9516A + status = "okay"; }; &gpio {
1. Use updated p8 occ driver; 2. Enable i2c buses that are used. Signed-off-by: Lei YU <mine260309@gmail.com> --- arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)