Merge branches 'pm-cpufreq', 'pm-sleep' and 'pm-em'

[linux-2.6-microblaze.git] / arch / arm / boot / dts / meson8b.dtsi

diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi
index c02b03c..b49b7cb 100644 (file)
--- a/arch/arm/boot/dts/meson8b.dtsi
+++ b/arch/arm/boot/dts/meson8b.dtsi
@@ -279,6 +279,29 @@
        };
 }; /* end of / */
 
+&aiu {
+       compatible = "amlogic,aiu-meson8b", "amlogic,aiu";
+       clocks = <&clkc CLKID_AIU_GLUE>,
+                <&clkc CLKID_I2S_OUT>,
+                <&clkc CLKID_AOCLK_GATE>,
+                <&clkc CLKID_CTS_AMCLK>,
+                <&clkc CLKID_MIXER_IFACE>,
+                <&clkc CLKID_IEC958>,
+                <&clkc CLKID_IEC958_GATE>,
+                <&clkc CLKID_CTS_MCLK_I958>,
+                <&clkc CLKID_CTS_I958>;
+       clock-names = "pclk",
+                     "i2s_pclk",
+                     "i2s_aoclk",
+                     "i2s_mclk",
+                     "i2s_mixer",
+                     "spdif_pclk",
+                     "spdif_aoclk",
+                     "spdif_mclk",
+                     "spdif_mclk_sel";
+       resets = <&reset RESET_AIU>;
+};
+
 &aobus {
        pmu: pmu@e0 {
                compatible = "amlogic,meson8b-pmu", "syscon";
@@ -302,6 +325,46 @@
                        gpio-ranges = <&pinctrl_aobus 0 0 16>;
                };
 
+               i2s_am_clk_pins: i2s-am-clk-out {
+                       mux {
+                               groups = "i2s_am_clk_out";
+                               function = "i2s";
+                               bias-disable;
+                       };
+               };
+
+               i2s_out_ao_clk_pins: i2s-ao-clk-out {
+                       mux {
+                               groups = "i2s_ao_clk_out";
+                               function = "i2s";
+                               bias-disable;
+                       };
+               };
+
+               i2s_out_lr_clk_pins: i2s-lr-clk-out {
+                       mux {
+                               groups = "i2s_lr_clk_out";
+                               function = "i2s";
+                               bias-disable;
+                       };
+               };
+
+               i2s_out_ch01_ao_pins: i2s-out-ch01 {
+                       mux {
+                               groups = "i2s_out_01";
+                               function = "i2s";
+                               bias-disable;
+                       };
+               };
+
+               spdif_out_1_pins: spdif-out-1 {
+                       mux {
+                               groups = "spdif_out_1";
+                               function = "spdif_1";
+                               bias-disable;
+                       };
+               };
+
                uart_ao_a_pins: uart_ao_a {
                        mux {
                                groups = "uart_tx_ao_a", "uart_rx_ao_a";