diff options
| author | Tom Rini | 2024-07-20 11:15:22 -0600 |
|---|---|---|
| committer | Tom Rini | 2024-07-20 11:15:22 -0600 |
| commit | 5024a96db8ea6ff2e814f4599af9e5faf09296b7 (patch) | |
| tree | bc0d02e7022f796932c5d24c9d6b61b166488efa /dts/upstream/src/arm64/marvell/cn9131-db.dtsi | |
| parent | d353e30ef3610c01b031dc9ada53701b13d473d4 (diff) | |
| parent | 762f85bb2e36762ee4d7395002b8181905aec690 (diff) | |
[1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/
Diffstat (limited to 'dts/upstream/src/arm64/marvell/cn9131-db.dtsi')
| -rw-r--r-- | dts/upstream/src/arm64/marvell/cn9131-db.dtsi | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/dts/upstream/src/arm64/marvell/cn9131-db.dtsi b/dts/upstream/src/arm64/marvell/cn9131-db.dtsi index ff8422fae31..ad7360c8304 100644 --- a/dts/upstream/src/arm64/marvell/cn9131-db.dtsi +++ b/dts/upstream/src/arm64/marvell/cn9131-db.dtsi @@ -18,7 +18,7 @@ ethernet4 = &cp1_eth1; }; - cp1_reg_usb3_vbus0: cp1_usb3_vbus@0 { + cp1_reg_usb3_vbus0: regulator-6 { compatible = "regulator-fixed"; pinctrl-names = "default"; pinctrl-0 = <&cp1_xhci0_vbus_pins>; @@ -29,12 +29,12 @@ gpio = <&cp1_gpio1 3 GPIO_ACTIVE_HIGH>; }; - cp1_usb3_0_phy0: cp1_usb3_phy0 { + cp1_usb3_0_phy0: usb-phy-3 { compatible = "usb-nop-xceiv"; vcc-supply = <&cp1_reg_usb3_vbus0>; }; - cp1_sfp_eth1: sfp-eth1 { + cp1_sfp_eth1: sfp-eth-2 { compatible = "sff,sfp"; i2c-bus = <&cp1_i2c0>; los-gpios = <&cp1_gpio1 11 GPIO_ACTIVE_HIGH>; @@ -138,8 +138,6 @@ reg = <0x700680 0x50>; flash@0 { - #address-cells = <0x1>; - #size-cells = <0x1>; compatible = "jedec,spi-nor"; reg = <0x0>; /* On-board MUX does not allow higher frequencies */ |