diff options
author | Olof Johansson <olof@lixom.net> | 2018-07-21 14:49:25 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2018-07-21 14:49:25 -0700 |
commit | 88657e9012fa907252512cfc8bd289da0ea599eb (patch) | |
tree | 9f91383b83cb51f5260a910d1f5dc4186140d7bb /arch/arm64/boot/dts/amlogic/meson-axg.dtsi | |
parent | 2ec46892382a82c232cc1e3efcd26b5b9dd95306 (diff) | |
parent | 89803e8b26569bdf5798f8745a4c708bf9360ee6 (diff) | |
download | linux-88657e9012fa907252512cfc8bd289da0ea599eb.tar.gz linux-88657e9012fa907252512cfc8bd289da0ea599eb.tar.xz |
Merge tag 'amlogic-dt64-1' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt
Amlogic 64-bit DT updates for v4.19
- new SoC: S805x
- new board: S805x-based P241 board from Amlogic
- AXG: add ADC support w/buttons, add pins for PDM, SPDIF
- AXG: s400 board: preliminary support for audio
- GX: nanopi-k2: add HDMI, CEC, CVBS support
* tag 'amlogic-dt64-1' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
ARM64: dts: meson-axg: add pdm pins
ARM64: dts: meson-axg: add spdif input pins
ARM64: dts: meson-axg: remove spdif out from gpio a7
ARM64: dts: meson-axg: add adc buttons the S400
ARM64: dts: meson-axg: remove vddio_ao18 from SoC dtsi
ARM64: dts: meson-axg: add saradc support
ARM64: dts: add S805X based P241 board
dt-bindings: amlogic: Add support for GXL S805X and the P241 board
ARM64: dts: amlogic: Add missing cooling device properties for CPUs
ARM64: dts: meson-axg: add spdif output pins
ARM64: dts: meson-axg: add s400 speaker amplifier
ARM64: dts: meson-axg: add s400 main 12v supply
ARM64: dts: meson-axg: add s400 microphone card leds
ARM64: dts: meson-gxbb-nanopi-k2: Add HDMI, CEC and CVBS nodes
ARM64: dts: meson-gx-p23x-q20x: move the wifi node to each board's .dts
ARM64: dts: meson: enable the saradc node in meson-gx-p23x-q20x.dtsi
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/boot/dts/amlogic/meson-axg.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 126 |
1 files changed, 126 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index 67d7115e4eff..461be4a35f92 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -477,6 +477,48 @@ }; }; + pdm_dclk_a14_pins: pdm_dclk_a14 { + mux { + groups = "pdm_dclk_a14"; + function = "pdm"; + }; + }; + + pdm_dclk_a19_pins: pdm_dclk_a19 { + mux { + groups = "pdm_dclk_a19"; + function = "pdm"; + }; + }; + + pdm_din0_pins: pdm_din0 { + mux { + groups = "pdm_din0"; + function = "pdm"; + }; + }; + + pdm_din1_pins: pdm_din1 { + mux { + groups = "pdm_din1"; + function = "pdm"; + }; + }; + + pdm_din2_pins: pdm_din2 { + mux { + groups = "pdm_din2"; + function = "pdm"; + }; + }; + + pdm_din3_pins: pdm_din3 { + mux { + groups = "pdm_din3"; + function = "pdm"; + }; + }; + pwm_a_a_pins: pwm_a_a { mux { groups = "pwm_a_a"; @@ -561,6 +603,76 @@ }; }; + spdif_in_z_pins: spdif_in_z { + mux { + groups = "spdif_in_z"; + function = "spdif_in"; + }; + }; + + spdif_in_a1_pins: spdif_in_a1 { + mux { + groups = "spdif_in_a1"; + function = "spdif_in"; + }; + }; + + spdif_in_a7_pins: spdif_in_a7 { + mux { + groups = "spdif_in_a7"; + function = "spdif_in"; + }; + }; + + spdif_in_a19_pins: spdif_in_a19 { + mux { + groups = "spdif_in_a19"; + function = "spdif_in"; + }; + }; + + spdif_in_a20_pins: spdif_in_a20 { + mux { + groups = "spdif_in_a20"; + function = "spdif_in"; + }; + }; + + spdif_out_z_pins: spdif_out_z { + mux { + groups = "spdif_out_z"; + function = "spdif_out"; + }; + }; + + spdif_out_a1_pins: spdif_out_a1 { + mux { + groups = "spdif_out_a1"; + function = "spdif_out"; + }; + }; + + spdif_out_a11_pins: spdif_out_a11 { + mux { + groups = "spdif_out_a11"; + function = "spdif_out"; + }; + }; + + spdif_out_a19_pins: spdif_out_a19 { + mux { + groups = "spdif_out_a19"; + function = "spdif_out"; + }; + }; + + spdif_out_a20_pins: spdif_out_a20 { + mux { + groups = "spdif_out_a20"; + function = "spdif_out"; + }; + }; + spi0_pins: spi0 { mux { groups = "spi0_miso", @@ -1194,6 +1306,20 @@ interrupts = <GIC_SPI 196 IRQ_TYPE_EDGE_RISING>; status = "disabled"; }; + + saradc: adc@9000 { + compatible = "amlogic,meson-axg-saradc", + "amlogic,meson-saradc"; + reg = <0x0 0x9000 0x0 0x38>; + #io-channel-cells = <1>; + interrupts = <GIC_SPI 73 IRQ_TYPE_EDGE_RISING>; + clocks = <&xtal>, + <&clkc_AO CLKID_AO_SAR_ADC>, + <&clkc_AO CLKID_AO_SAR_ADC_CLK>, + <&clkc_AO CLKID_AO_SAR_ADC_SEL>; + clock-names = "clkin", "core", "adc_clk", "adc_sel"; + status = "disabled"; + }; }; }; }; |