From 11843e5356ed5d612570cc1144cafbc5aedd2576 Mon Sep 17 00:00:00 2001 From: smj Date: Thu, 16 Oct 2014 17:23:24 +0800 Subject: [PATCH] rk3036 : - Audio : spdif: add spdif card or not according dts define. - Other : enable gpio_poweroff driver. --- arch/arm/boot/dts/rk3036-sdk.dts | 31 +++++++++++++------------------ arch/arm/configs/rk3036_defconfig | 3 +++ 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/arch/arm/boot/dts/rk3036-sdk.dts b/arch/arm/boot/dts/rk3036-sdk.dts index 14fe69eb2aa6..4e2328893005 100755 --- a/arch/arm/boot/dts/rk3036-sdk.dts +++ b/arch/arm/boot/dts/rk3036-sdk.dts @@ -36,6 +36,11 @@ }; }; + gpio_poweroff { + compatible = "gpio-poweroff"; + gpios = <&gpio1 GPIO_A2 GPIO_ACTIVE_LOW>; + }; + wireless-wlan { compatible = "wlan-platdata"; @@ -71,32 +76,22 @@ compatible = "rockchip,key"; }; - codec_hdmi_i2s: codec-hdmi-i2s { - compatible = "hdmi-i2s"; + codec_hdmi_spdif: codec-hdmi-spdif { + compatible = "hdmi-spdif"; }; - rockchip-hdmi-i2s { - compatible = "rockchip-hdmi-i2s"; + rockchip-hdmi-spdif { + compatible = "rockchip-hdmi-spdif"; dais { dai0 { - audio-codec = <&codec_hdmi_i2s>; - i2s-controller = <&i2s>; - format = "i2s"; - //continuous-clock; - //bitclock-inversion; - //frame-inversion; - //bitclock-master; - //frame-master; + audio-codec = <&codec_hdmi_spdif>; + i2s-controller = <&spdif>; }; }; }; - codec_hdmi_spdif: codec-hdmi-spdif { - compatible = "hdmi-spdif"; - }; - - rockchip-hdmi-spdif { - compatible = "rockchip-hdmi-spdif"; + rockchip-spdif-card { + compatible = "rockchip-spdif-card"; dais { dai0 { audio-codec = <&codec_hdmi_spdif>; diff --git a/arch/arm/configs/rk3036_defconfig b/arch/arm/configs/rk3036_defconfig index b9344c872e1b..a53fcf8d8e70 100644 --- a/arch/arm/configs/rk3036_defconfig +++ b/arch/arm/configs/rk3036_defconfig @@ -224,6 +224,8 @@ CONFIG_SPI_ROCKCHIP_DMA=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y CONFIG_POWER_SUPPLY=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_GPIO=y CONFIG_SENSORS_ROCKCHIP_TSADC=y CONFIG_MFD_RK808=y CONFIG_REGULATOR=y @@ -259,6 +261,7 @@ CONFIG_SND=y CONFIG_SND_SOC=y CONFIG_SND_RK_SOC=y CONFIG_SND_RK_SOC_HDMI_I2S=y +CONFIG_SND_RK_SOC_SPDIF_CARD=y CONFIG_SND_RK_SOC_RK3036=y CONFIG_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -- 2.34.1