diff options
Diffstat (limited to 'dts/upstream/src/arm/marvell')
8 files changed, 10 insertions, 10 deletions
diff --git a/dts/upstream/src/arm/marvell/armada-370-db.dts b/dts/upstream/src/arm/marvell/armada-370-db.dts index a7dc4c04d10..a9a05d826f2 100644 --- a/dts/upstream/src/arm/marvell/armada-370-db.dts +++ b/dts/upstream/src/arm/marvell/armada-370-db.dts @@ -119,7 +119,7 @@ "Out Jack", "HPL", "Out Jack", "HPR", "AIN1L", "In Jack", - "AIN1L", "In Jack"; + "AIN1R", "In Jack"; status = "okay"; simple-audio-card,dai-link@0 { diff --git a/dts/upstream/src/arm/marvell/kirkwood-db.dtsi b/dts/upstream/src/arm/marvell/kirkwood-db.dtsi index 6fe2e31534a..8bacaeb4f4b 100644 --- a/dts/upstream/src/arm/marvell/kirkwood-db.dtsi +++ b/dts/upstream/src/arm/marvell/kirkwood-db.dtsi @@ -39,7 +39,7 @@ status = "okay"; }; - ehci@50000 { + usb@50000 { status = "okay"; }; diff --git a/dts/upstream/src/arm/marvell/kirkwood-dir665.dts b/dts/upstream/src/arm/marvell/kirkwood-dir665.dts index 2f6793f794c..36394d1ab3e 100644 --- a/dts/upstream/src/arm/marvell/kirkwood-dir665.dts +++ b/dts/upstream/src/arm/marvell/kirkwood-dir665.dts @@ -129,7 +129,7 @@ status = "okay"; }; - ehci@50000 { + usb@50000 { status = "okay"; }; }; diff --git a/dts/upstream/src/arm/marvell/kirkwood-km_common.dtsi b/dts/upstream/src/arm/marvell/kirkwood-km_common.dtsi index 52baffe45f1..259cb3d5f16 100644 --- a/dts/upstream/src/arm/marvell/kirkwood-km_common.dtsi +++ b/dts/upstream/src/arm/marvell/kirkwood-km_common.dtsi @@ -27,8 +27,8 @@ i2c { compatible = "i2c-gpio"; - gpios = < &gpio0 8 GPIO_ACTIVE_HIGH /* sda */ - &gpio0 9 GPIO_ACTIVE_HIGH>; /* scl */ + sda-gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; + scl-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; i2c-gpio,delay-us = <2>; /* ~100 kHz */ }; }; diff --git a/dts/upstream/src/arm/marvell/kirkwood-mv88f6281gtw-ge.dts b/dts/upstream/src/arm/marvell/kirkwood-mv88f6281gtw-ge.dts index e3b41784c87..051579fc36b 100644 --- a/dts/upstream/src/arm/marvell/kirkwood-mv88f6281gtw-ge.dts +++ b/dts/upstream/src/arm/marvell/kirkwood-mv88f6281gtw-ge.dts @@ -63,7 +63,7 @@ status = "okay"; }; - ehci@50000 { + usb@50000 { status = "okay"; }; }; diff --git a/dts/upstream/src/arm/marvell/kirkwood-openrd-client.dts b/dts/upstream/src/arm/marvell/kirkwood-openrd-client.dts index d4e0b8150a8..cf26e2ceaaa 100644 --- a/dts/upstream/src/arm/marvell/kirkwood-openrd-client.dts +++ b/dts/upstream/src/arm/marvell/kirkwood-openrd-client.dts @@ -38,7 +38,7 @@ simple-audio-card,mclk-fs = <256>; simple-audio-card,cpu { - sound-dai = <&audio0 0>; + sound-dai = <&audio0>; }; simple-audio-card,codec { diff --git a/dts/upstream/src/arm/marvell/kirkwood.dtsi b/dts/upstream/src/arm/marvell/kirkwood.dtsi index 815ef7719d1..8a1338e672b 100644 --- a/dts/upstream/src/arm/marvell/kirkwood.dtsi +++ b/dts/upstream/src/arm/marvell/kirkwood.dtsi @@ -263,7 +263,7 @@ status = "okay"; }; - usb0: ehci@50000 { + usb0: usb@50000 { compatible = "marvell,orion-ehci"; reg = <0x50000 0x1000>; interrupts = <19>; diff --git a/dts/upstream/src/arm/marvell/orion5x.dtsi b/dts/upstream/src/arm/marvell/orion5x.dtsi index 2d41f5c166e..939259c57e0 100644 --- a/dts/upstream/src/arm/marvell/orion5x.dtsi +++ b/dts/upstream/src/arm/marvell/orion5x.dtsi @@ -146,7 +146,7 @@ status = "okay"; }; - ehci0: ehci@50000 { + ehci0: usb@50000 { compatible = "marvell,orion-ehci"; reg = <0x50000 0x1000>; interrupts = <17>; @@ -218,7 +218,7 @@ status = "okay"; }; - ehci1: ehci@a0000 { + ehci1: usb@a0000 { compatible = "marvell,orion-ehci"; reg = <0xa0000 0x1000>; interrupts = <12>; |