diff options
author | Arnd Bergmann <arnd@arndb.de> | 2019-02-15 16:02:12 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2019-02-15 16:04:21 +0100 |
commit | e7b984912d111c313027399c6da54dce91031fe1 (patch) | |
tree | af2940b605c98f7e768c9dc95b5a73e9ed7c6dac /arch/arm64/boot/dts/amlogic/meson-axg.dtsi | |
parent | 260bcbb319a8e3fb85fb93edb2d5d320412ac7e1 (diff) | |
parent | d3aa4ce87348b59d7b240ae356559313a8db2f58 (diff) |
Merge tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt
arm64: dts: Amlogic updates for v5.1
- new board: G12a-based x96 max
- G12a: add peripheral clock controller and clock measure support
- s400: fix SD/eMMC max rate issues
- s400: audio: add sp/dif in support
- GX: support simplefb
* tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
arm64: dts: meson: add g12a x96 max board
dt-bindings: arm: amlogic: add amediatech x96-max bindings
arm64: dts: meson: g12a: add peripheral clock controller
arm64: dts: meson: g12a: add clk measure support
arm64: dts: meson: axg: add clk measure support
arm64: dts: meson: fix g12a buses
arm64: dts: meson-axg: add efuse device
arm64: dts: meson: s400: fix emmc maximum rate
arm64: dts: meson: s400: enable sdr104 on sdio
arm64: dts: meson-gx: add support for simplefb
dt-bindings: meson: add specific simplefb bindings
arm64: dts: meson-gx: Add canvas provider node to the vpu
arm64: dts: meson-axg: s400: add spdifin to the sound card
arm64: dts: meson-axg: s400: add spdif-dir codec
arm64: dts: meson-axg: add spdifin
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/boot/dts/amlogic/meson-axg.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index 1b69efabd49a..34704fecf756 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -111,6 +111,14 @@ compatible = "amlogic,meson-gxbb-sm"; }; + efuse: efuse { + compatible = "amlogic,meson-gxbb-efuse"; + clocks = <&clkc CLKID_EFUSE>; + #address-cells = <1>; + #size-cells = <1>; + read-only; + }; + psci { compatible = "arm,psci-1.0"; method = "smc"; @@ -1260,6 +1268,18 @@ status = "disabled"; }; + spdifin: audio-controller@400 { + compatible = "amlogic,axg-spdifin"; + reg = <0x0 0x400 0x0 0x30>; + #sound-dai-cells = <0>; + sound-name-prefix = "SPDIFIN"; + interrupts = <GIC_SPI 87 IRQ_TYPE_EDGE_RISING>; + clocks = <&clkc_audio AUD_CLKID_SPDIFIN>, + <&clkc_audio AUD_CLKID_SPDIFIN_CLK>; + clock-names = "pclk", "refclk"; + status = "disabled"; + }; + spdifout: audio-controller@480 { compatible = "amlogic,axg-spdifout"; reg = <0x0 0x480 0x0 0x50>; @@ -1590,6 +1610,11 @@ status = "disabled"; }; + clk_msr: clock-measure@18000 { + compatible = "amlogic,meson-axg-clk-measure"; + reg = <0x0 0x18000 0x0 0x10>; + }; + i2c3: i2c@1c000 { compatible = "amlogic,meson-axg-i2c"; reg = <0x0 0x1c000 0x0 0x20>; |