diff options
| author | Olof Johansson <olof@lixom.net> | 2015-10-26 08:43:38 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-10-26 08:43:38 +0300 |
| commit | 3d2ef3b3962c60e3b25de6a981127d95cb0be98b (patch) | |
| tree | a7efc70a3dccd852d8d68ca53e3faec786c47d16 /arch/arm/boot/dts/sun4i-a10.dtsi | |
| parent | edd2a06d9c06a28f6f636929d586d17de835cd6b (diff) | |
| parent | a5ea06d0bc123cc7f49d042fab60ddd3964764c8 (diff) | |
| download | linux-3d2ef3b3962c60e3b25de6a981127d95cb0be98b.tar.xz | |
Merge tag 'sunxi-dt-for-4.4-3' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt
Allwinner DT changes for 4.4, round 3
A bunch of new boards, but mostly enable the support for the Audio Codec
on the older SoCs (A10, A10s, A13, A20, R8) and enable it on various
boards.
* tag 'sunxi-dt-for-4.4-3' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
ARM: dts: sun6i: Add dts file for MSI Primo81 tablet
ARM: dts: sun6i: Add simplefb node labels to reference at board level
ARM: dts: sun4i: Enable audio codec on Marsboard A10.
ARM: dts: sun4i: Add dts file for the pov protab2-ips9 tablet
ARM: sun4i: Enable cubieboard audio codec
ARM: sun5i: chip: Enable the audio codec
ARM: sun4i: Enable audio-codec on Mele A1000
ARM: sun7i: Enable cubieboard2 audio codec
ARM: sun7i: dt: enable audio codec on Cubietruck
ARM: sun7i: Add sunxi codec device node
ARM: sun5i: Add the Audio codec DT node
ARM: sun4i: Add sunxi codec device node
ARM: sun7i: Add audio codec clock
ARM: sun5i: Add audio codec clock
ARM: sun4i: Add audio codec clock
ARM: sun7i: Add audio PLL
ARM: sun5i: Add audio PLL
ARM: sun4i: Add audio PLL
ARM: dts: sun7i: Enable USB DRC on pcDuino v3 Nano
ARM: dts: sun6i: Add support for Sinlinx A31s SDK board
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/sun4i-a10.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/sun4i-a10.dtsi | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 1f3c51a08113..aa90f319309b 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -45,6 +45,7 @@ #include <dt-bindings/thermal/thermal.h> +#include <dt-bindings/clock/sun4i-a10-pll2.h> #include <dt-bindings/dma/sun4i-a10.h> #include <dt-bindings/pinctrl/sun4i-a10.h> @@ -195,6 +196,15 @@ clock-output-names = "pll1"; }; + pll2: clk@01c20008 { + #clock-cells = <1>; + compatible = "allwinner,sun4i-a10-pll2-clk"; + reg = <0x01c20008 0x8>; + clocks = <&osc24M>; + clock-output-names = "pll2-1x", "pll2-2x", + "pll2-4x", "pll2-8x"; + }; + pll4: clk@01c20018 { #clock-cells = <0>; compatible = "allwinner,sun4i-a10-pll1-clk"; @@ -481,6 +491,14 @@ clocks = <&osc24M>, <&pll6 1>, <&pll5 1>; clock-output-names = "spi3"; }; + + codec_clk: clk@01c20140 { + #clock-cells = <0>; + compatible = "allwinner,sun4i-a10-codec-clk"; + reg = <0x01c20140 0x4>; + clocks = <&pll2 SUN4I_A10_PLL2_1X>; + clock-output-names = "codec"; + }; }; soc@01c00000 { @@ -1004,6 +1022,19 @@ status = "disabled"; }; + codec: codec@01c22c00 { + #sound-dai-cells = <0>; + compatible = "allwinner,sun4i-a10-codec"; + reg = <0x01c22c00 0x40>; + interrupts = <30>; + clocks = <&apb0_gates 0>, <&codec_clk>; + clock-names = "apb", "codec"; + dmas = <&dma SUN4I_DMA_NORMAL 19>, + <&dma SUN4I_DMA_NORMAL 19>; + dma-names = "rx", "tx"; + status = "disabled"; + }; + sid: eeprom@01c23800 { compatible = "allwinner,sun4i-a10-sid"; reg = <0x01c23800 0x10>; |