Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: aspeed: zaius: fixed I2C bus numbers for pcie slots

The change to include ibm-power9-cfam.dtsi resulted in a renumbering
of all of the I2C bus numbers behind the on-board muxes. This breaks
some tools which have hardcoded the bus numbers.

Add device tree aliases for the I2C buses routed through the PCIe slots
so that they return to their former numbers before the cfam change.

Signed-off-by: Robert Lippert <rlippert@google.com>
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>

authored by

Robert Lippert and committed by
Joel Stanley
b2cc26af 66daab24

+40
+40
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
··· 7 7 model = "Zaius BMC"; 8 8 compatible = "ingrasys,zaius-bmc", "aspeed,ast2500"; 9 9 10 + aliases { 11 + i2c15 = &i2cpcie0; 12 + i2c16 = &i2cpcie1; 13 + i2c17 = &i2cpcie2; 14 + i2c19 = &i2cpcie3; 15 + i2c20 = &i2cpcie4; 16 + }; 17 + 10 18 chosen { 11 19 stdout-path = &uart5; 12 20 bootargs = "console=ttyS4,115200 earlyprintk"; ··· 231 223 reg = <0x71>; 232 224 #address-cells = <1>; 233 225 #size-cells = <0>; 226 + 227 + i2cpcie0: i2c@0 { 228 + #address-cells = <1>; 229 + #size-cells = <0>; 230 + reg = <0>; 231 + }; 232 + i2cpcie1: i2c@1 { 233 + #address-cells = <1>; 234 + #size-cells = <0>; 235 + reg = <1>; 236 + }; 237 + i2cpcie2: i2c@2 { 238 + #address-cells = <1>; 239 + #size-cells = <0>; 240 + reg = <2>; 241 + }; 242 + i2ctpm: i2c@3 { 243 + #address-cells = <1>; 244 + #size-cells = <0>; 245 + reg = <3>; 246 + }; 234 247 }; 235 248 236 249 /* MUX1 PCA9546A @71h ··· 282 253 reg = <0x71>; 283 254 #address-cells = <1>; 284 255 #size-cells = <0>; 256 + 257 + i2cpcie3: i2c@0 { 258 + #address-cells = <1>; 259 + #size-cells = <0>; 260 + reg = <0>; 261 + }; 262 + i2cpcie4: i2c@1 { 263 + #address-cells = <1>; 264 + #size-cells = <0>; 265 + reg = <1>; 266 + }; 285 267 }; 286 268 287 269 /* MUX1 PCA9546A @71h