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

Merge tag 'mvebu-dt-4.17-2' of git://git.infradead.org/linux-mvebu into next/dt

Pull "mvebu dt for 4.17 (part 2)" from Gregory CLEMENT:

- add SFP module support on the clearfog (Armada 388 based board)

- disable internal RTC node for Linksys boards (Armada 38x based
boards)

* tag 'mvebu-dt-4.17-2' of git://git.infradead.org/linux-mvebu:
ARM: dts: armada388-clearfog: add SFP module support
ARM: dts: armada-385-linksys: Disable internal RTC

+17 -33
+5
arch/arm/boot/dts/armada-385-linksys.dtsi
··· 282 282 status = "okay"; 283 283 usb-phy = <&usb3_1_phy>; 284 284 }; 285 + 286 + &rtc { 287 + /* No crystal connected to the internal RTC */ 288 + status = "disabled"; 289 + };
+12 -33
arch/arm/boot/dts/armada-388-clearfog.dtsi
··· 117 117 }; 118 118 }; 119 119 }; 120 + 121 + sfp: sfp { 122 + compatible = "sff,sfp"; 123 + i2c-bus = <&i2c1>; 124 + los-gpio = <&expander0 12 GPIO_ACTIVE_HIGH>; 125 + mod-def0-gpio = <&expander0 15 GPIO_ACTIVE_LOW>; 126 + tx-disable-gpio = <&expander0 14 GPIO_ACTIVE_HIGH>; 127 + tx-fault-gpio = <&expander0 13 GPIO_ACTIVE_HIGH>; 128 + maximum-power-milliwatt = <2000>; 129 + }; 120 130 }; 121 131 122 132 &eth1 { ··· 143 133 bm,pool-long = <3>; 144 134 bm,pool-short = <1>; 145 135 buffer-manager = <&bm>; 136 + managed = "in-band-status"; 146 137 phy-mode = "sgmii"; 138 + sfp = <&sfp>; 147 139 status = "okay"; 148 - 149 - fixed-link { 150 - speed = <1000>; 151 - full-duplex; 152 - }; 153 140 }; 154 141 155 142 &i2c0 { ··· 214 207 gpios = <11 GPIO_ACTIVE_HIGH>; 215 208 output-low; 216 209 line-name = "m.2 devslp"; 217 - }; 218 - sfp_los { 219 - /* SFP loss of signal */ 220 - gpio-hog; 221 - gpios = <12 GPIO_ACTIVE_HIGH>; 222 - input; 223 - line-name = "sfp-los"; 224 - }; 225 - sfp_tx_fault { 226 - /* SFP laser fault */ 227 - gpio-hog; 228 - gpios = <13 GPIO_ACTIVE_HIGH>; 229 - input; 230 - line-name = "sfp-tx-fault"; 231 - }; 232 - sfp_tx_disable { 233 - /* SFP transmit disable */ 234 - gpio-hog; 235 - gpios = <14 GPIO_ACTIVE_HIGH>; 236 - output-low; 237 - line-name = "sfp-tx-disable"; 238 - }; 239 - sfp_mod_def0 { 240 - /* SFP module present */ 241 - gpio-hog; 242 - gpios = <15 GPIO_ACTIVE_LOW>; 243 - input; 244 - line-name = "sfp-mod-def0"; 245 210 }; 246 211 }; 247 212