diff options
author | Arnd Bergmann <arnd@arndb.de> | 2018-03-12 14:59:23 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-12 14:59:23 +0100 |
commit | a3138e20a2dead5c0459af46085504ed64a08c9d (patch) | |
tree | 517b42f7f47d6e7537bfae301cc929d27314093b | |
parent | dce8efa0575c8d9b5f9f9ae41437200c6d3e0bf3 (diff) | |
parent | a83aeb3836b1cd65770b20eafefbef7467972fa2 (diff) |
Merge tag 'mvebu-dt-4.17-1' of git://git.infradead.org/linux-mvebu into next/dt
Pull "mvebu dt for 4.17 (part 1)" from Gregory CLEMENT:
Most of them are small fixes or cleanup.
Only the change on the clearfog will have a noticeable effect allowing
to use the i2c at an higher frequency.
* tag 'mvebu-dt-4.17-1' of git://git.infradead.org/linux-mvebu:
ARM: dts: armada388-clearfog: increase speed of i2c0 to 400kHz
arm: dts: kirkwood: fix error in #sound-dai-cells size
ARM: dts: kirkwood: Fix "debounce-interval" property misspelling
ARM: dts: armada: netgear-rn*: fix rtc node name
-rw-r--r-- | arch/arm/boot/dts/armada-370-netgear-rn102.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-370-netgear-rn104.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-388-clearfog.dtsi | 7 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood.dtsi | 2 |
6 files changed, 7 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts index b1a96e95e921..d2225bd4a76f 100644 --- a/arch/arm/boot/dts/armada-370-netgear-rn102.dts +++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts @@ -103,7 +103,7 @@ status = "okay"; - isl12057: isl12057@68 { + isl12057: rtc@68 { compatible = "isil,isl12057"; reg = <0x68>; wakeup-source; diff --git a/arch/arm/boot/dts/armada-370-netgear-rn104.dts b/arch/arm/boot/dts/armada-370-netgear-rn104.dts index d67e7aa42b54..b73cae836bc1 100644 --- a/arch/arm/boot/dts/armada-370-netgear-rn104.dts +++ b/arch/arm/boot/dts/armada-370-netgear-rn104.dts @@ -105,7 +105,7 @@ status = "okay"; - isl12057: isl12057@68 { + isl12057: rtc@68 { compatible = "isil,isl12057"; reg = <0x68>; wakeup-source; diff --git a/arch/arm/boot/dts/armada-388-clearfog.dtsi b/arch/arm/boot/dts/armada-388-clearfog.dtsi index 68acfc968706..0e3b1f140e6d 100644 --- a/arch/arm/boot/dts/armada-388-clearfog.dtsi +++ b/arch/arm/boot/dts/armada-388-clearfog.dtsi @@ -143,8 +143,7 @@ }; &i2c0 { - /* Is there anything on this? */ - clock-frequency = <100000>; + clock-frequency = <400000>; pinctrl-0 = <&i2c0_pins>; pinctrl-names = "default"; status = "okay"; @@ -239,13 +238,11 @@ }; }; - /* The MCP3021 is 100kHz clock only */ + /* The MCP3021 supports standard and fast modes */ mikrobus_adc: mcp3021@4c { compatible = "microchip,mcp3021"; reg = <0x4c>; }; - - /* Also something at 0x64 */ }; &i2c1 { diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts index 40c6fe21e720..e66fe80cf279 100644 --- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts +++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts @@ -115,7 +115,7 @@ reg = <0x4c>; }; - isl12057: isl12057@68 { + isl12057: rtc@68 { compatible = "isil,isl12057"; reg = <0x68>; wakeup-source; diff --git a/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts b/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts index 5ce220ac9611..5aa4669ae254 100644 --- a/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts +++ b/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts @@ -35,7 +35,7 @@ pinctrl-names = "default"; eject { - debounce_interval = <50>; + debounce-interval = <50>; wakeup-source; linux,code = <KEY_EJECTCD>; label = "Eject Button"; diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi index eb2bf7409655..81c7eda2c442 100644 --- a/arch/arm/boot/dts/kirkwood.dtsi +++ b/arch/arm/boot/dts/kirkwood.dtsi @@ -382,7 +382,7 @@ audio0: audio-controller@a0000 { compatible = "marvell,kirkwood-audio"; - #sound-dai-cells = <1>; + #sound-dai-cells = <0>; reg = <0xa0000 0x2210>; interrupts = <24>; clocks = <&gate_clk 9>; |