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

ARM: dts: aspeed: wedge100: Use common dtsi

Simplify the Wedge100 device tree by using the common dtsi.

In addition this enables the second firmware flash, and turns on the
"i2c-mux-idle-disconnect" flag for I2C switch 7-0070.

Signed-off-by: Tao Ren <rentao.bupt@gmail.com>
Reviewed-by: Patrick Williams <patrick@stwcx.xyz>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Link: https://lore.kernel.org/r/20201111232330.30843-4-rentao.bupt@gmail.com
Signed-off-by: Joel Stanley <joel@jms.id.au>

authored by

Tao Ren and committed by
Joel Stanley
41376fb9 e4c16333

+15 -105
+15 -105
arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts
··· 2 2 // Copyright (c) 2018 Facebook Inc. 3 3 /dts-v1/; 4 4 5 - #include "aspeed-g4.dtsi" 5 + #include "ast2400-facebook-netbmc-common.dtsi" 6 6 7 7 / { 8 8 model = "Facebook Wedge 100 BMC"; 9 9 compatible = "facebook,wedge100-bmc", "aspeed,ast2400"; 10 10 11 - aliases { 12 - /* 13 - * Override the default uart aliases to avoid breaking 14 - * the legacy applications. 15 - */ 16 - serial0 = &uart5; 17 - serial1 = &uart1; 18 - serial2 = &uart3; 19 - serial3 = &uart4; 20 - }; 21 - 22 11 chosen { 23 12 stdout-path = &uart3; 24 13 bootargs = "console=ttyS2,9600n8 root=/dev/ram rw"; 25 14 }; 26 - 27 - memory@40000000 { 28 - reg = <0x40000000 0x20000000>; 29 - }; 30 - }; 31 - 32 - &wdt1 { 33 - status = "okay"; 34 - aspeed,reset-type = "system"; 35 15 }; 36 16 37 17 &wdt2 { ··· 20 40 }; 21 41 22 42 &fmc { 23 - status = "okay"; 24 - flash@0 { 43 + flash@1 { 25 44 status = "okay"; 26 45 m25p,fast-read; 27 - label = "fmc0"; 28 - #include "facebook-bmc-flash-layout.dtsi" 46 + label = "spi0.1"; 47 + 48 + partitions { 49 + compatible = "fixed-partitions"; 50 + #address-cells = <1>; 51 + #size-cells = <1>; 52 + 53 + flash1@0 { 54 + reg = <0x0 0x2000000>; 55 + label = "flash1"; 56 + }; 57 + }; 29 58 }; 30 59 }; 31 60 32 - &uart1 { 33 - status = "okay"; 34 - pinctrl-names = "default"; 35 - pinctrl-0 = <&pinctrl_txd1_default 36 - &pinctrl_rxd1_default>; 37 - }; 38 - 39 - &uart3 { 40 - status = "okay"; 41 - pinctrl-names = "default"; 42 - pinctrl-0 = <&pinctrl_txd3_default 43 - &pinctrl_rxd3_default>; 44 - }; 45 - 46 - &uart4 { 47 - status = "okay"; 48 - pinctrl-names = "default"; 49 - pinctrl-0 = <&pinctrl_txd4_default 50 - &pinctrl_rxd4_default>; 51 - }; 52 - 53 - &uart5 { 54 - status = "okay"; 55 - }; 56 - 57 - &mac1 { 58 - status = "okay"; 59 - pinctrl-names = "default"; 60 - pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>; 61 - }; 62 - 63 - &i2c0 { 64 - status = "okay"; 65 - }; 66 - 67 - &i2c1 { 68 - status = "okay"; 69 - }; 70 - 71 - &i2c2 { 72 - status = "okay"; 73 - }; 74 - 75 - &i2c3 { 76 - status = "okay"; 77 - }; 78 - 79 - &i2c4 { 80 - status = "okay"; 81 - }; 82 - 83 - &i2c5 { 84 - status = "okay"; 85 - }; 86 - 87 - &i2c6 { 88 - status = "okay"; 89 - }; 90 - 91 61 &i2c7 { 92 - status = "okay"; 93 - 94 62 i2c-switch@70 { 95 63 compatible = "nxp,pca9548"; 96 64 #address-cells = <1>; 97 65 #size-cells = <0>; 98 66 reg = <0x70>; 67 + i2c-mux-idle-disconnect; 99 68 }; 100 - }; 101 - 102 - &i2c8 { 103 - status = "okay"; 104 69 }; 105 70 106 71 &i2c9 { 107 72 status = "okay"; 108 73 }; 109 74 110 - &i2c10 { 111 - status = "okay"; 112 - }; 113 - 114 - &i2c11 { 115 - status = "okay"; 116 - }; 117 - 118 - &i2c12 { 119 - status = "okay"; 120 - }; 121 - 122 - &i2c13 { 123 - status = "okay"; 124 - }; 125 75 126 76 &vhub { 127 77 status = "okay";