diff options
| author | Olof Johansson <olof@lixom.net> | 2019-11-10 21:29:02 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-11-10 21:29:06 -0800 |
| commit | 5588aa81d2128ff51228514237713d8eafd944c8 (patch) | |
| tree | 191ddb2a7fb11fdebefe6dbe617f35b59385a269 /arch/arm64/boot/dts/amlogic/meson-gx.dtsi | |
| parent | 077f46db63652fb16e60bcd0d623acc2ef282065 (diff) | |
| parent | 87297878b5b7c2fc4cecd66fc96b3061d04b6b3b (diff) | |
| download | linux-5588aa81d2128ff51228514237713d8eafd944c8.tar.bz2 | |
Merge tag 'amlogic-dt64' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt
arm64: dts: Amlogic updates for v5.5
Hightlights
- new board; ugoos am6, based on G12B SoC
- g12: add thermal driver and cooling properties
- sm1: enable audio on SEI610 board
- IR: add several keymaps
- sdio: add keep-power-in-suspend property for multiple boards
- pcie: add support for G12A
- multiple fixes, cleanups
* tag 'amlogic-dt64' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: (62 commits)
arm64: dts: meson-gx: fix i2c compatible
arm64: dts: meson-gx: cec node should be disabled by default
arm64: dts: meson-g12b-odroid-n2: add missing amlogic, s922x compatible
arm64: dts: meson-gxm: fix gpu irq order
arm64: dts: meson-g12a: fix gpu irq order
ARM64: dts: amlogic: adds crypto hardware node
arm64: dts: meson-gxbb-vega-s95: set rc-vega-s9x ir keymap
arm64: dts: meson-gxm-vega-s96: set rc-vega-s9x ir keymap
arm64: dts: meson: g12b: add cooling properties
arm64: dts: meson: g12a: add cooling properties
arm64: dts: meson: g12: Add minimal thermal zone
arm64: dts: meson: g12: add temperature sensor
arm64: dts: meson: sei610: enable audio
arm64: dts: meson: sm1: add audio devices
dt-bindings: clock: meson: add sm1 resets to the axg-audio controller
dt-bindings: clk: axg-audio: add sm1 bindings
arm64: dts: meson-g12: add support for simplefb
arm64: dts: meson: g12a: add audio devices resets
arm64: dts: meson: odroid-c2: Add missing regulator linked to HDMI supply
arm64: dts: meson: odroid-c2: Add missing regulator linked to VDDIO_AO3V3 regulator
...
Link: https://lore.kernel.org/r/7hd0dzs0m1.fsf@baylibre.com
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/boot/dts/amlogic/meson-gx.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index 6733050d735f..40db06e28b66 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -161,6 +161,7 @@ #address-cells = <1>; #size-cells = <1>; read-only; + secure-monitor = <&sm>; sn: sn@14 { reg = <0x14 0x10>; @@ -240,7 +241,7 @@ }; i2c_A: i2c@8500 { - compatible = "amlogic,meson-gx-i2c", "amlogic,meson-gxbb-i2c"; + compatible = "amlogic,meson-gxbb-i2c"; reg = <0x0 0x08500 0x0 0x20>; interrupts = <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>; #address-cells = <1>; @@ -290,7 +291,7 @@ }; i2c_B: i2c@87c0 { - compatible = "amlogic,meson-gx-i2c", "amlogic,meson-gxbb-i2c"; + compatible = "amlogic,meson-gxbb-i2c"; reg = <0x0 0x087c0 0x0 0x20>; interrupts = <GIC_SPI 214 IRQ_TYPE_EDGE_RISING>; #address-cells = <1>; @@ -299,7 +300,7 @@ }; i2c_C: i2c@87e0 { - compatible = "amlogic,meson-gx-i2c", "amlogic,meson-gxbb-i2c"; + compatible = "amlogic,meson-gxbb-i2c"; reg = <0x0 0x087e0 0x0 0x20>; interrupts = <GIC_SPI 215 IRQ_TYPE_EDGE_RISING>; #address-cells = <1>; @@ -391,6 +392,7 @@ compatible = "amlogic,meson-gx-ao-cec"; reg = <0x0 0x00100 0x0 0x14>; interrupts = <GIC_SPI 199 IRQ_TYPE_EDGE_RISING>; + status = "disabled"; }; sec_AO: ao-secure@140 { @@ -414,7 +416,7 @@ }; i2c_AO: i2c@500 { - compatible = "amlogic,meson-gx-i2c", "amlogic,meson-gxbb-i2c"; + compatible = "amlogic,meson-gxbb-i2c"; reg = <0x0 0x500 0x0 0x20>; interrupts = <GIC_SPI 195 IRQ_TYPE_EDGE_RISING>; #address-cells = <1>; |