From e3fcce2faf48db1ac050ff512b6ad4cea58f4356 Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Mon, 13 Oct 2014 18:07:37 +0900 Subject: [PATCH] config:ODROIDC: Kernel porting to ODROIDC board (rev 1.0) Below hardware/components are deprecated PMU (AML1618) NAND Audio Codec Change-Id: Ica61b729b1fc8abc8df9bb60d84279c3f0269d85 Signed-off-by: Dongjin Kim --- arch/arm/boot/dts/amlogic/meson8b_odroidc.dtd | 214 ------------------ arch/arm/configs/odroidc_defconfig | 30 +-- 2 files changed, 7 insertions(+), 237 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/meson8b_odroidc.dtd b/arch/arm/boot/dts/amlogic/meson8b_odroidc.dtd index 7ec06edbcc97..216948a1f35c 100644 --- a/arch/arm/boot/dts/amlogic/meson8b_odroidc.dtd +++ b/arch/arm/boot/dts/amlogic/meson8b_odroidc.dtd @@ -627,26 +627,6 @@ void root_func(){ /// *************************************************************************************** /// - I2C -//$$ MODULE="I2C" -//$$ DEVICE="I2C_AO" -//$$ L2 PROP_STR = "status" -//$$ L3 PROP_U32 2 ="reg" -//$$ L3 PROP_STR = "pinctrl-names" -//$$ L2 PROP_CHOICE "I2C_AO_pin_match" = "pinctrl-0" - i2c@c8100500{ /*I2C-AO*/ - compatible = "amlogic,aml_i2c"; - dev_name = "i2c-AO"; - status = "ok"; - reg = <0xc8100500 0x1d>; - #address-cells = <1>; - #size-cells = <0>; - device_id = <0>; - pinctrl-names="default"; - pinctrl-0=<&ao_i2c_master>; - use_pio = <0>; - master_i2c_speed = <100000>; - }; - //$$ DEVICE = "I2C_A" //$$ L2 PROP_STR = "status" //$$ L3 PROP_U32 2 ="reg" @@ -931,157 +911,6 @@ void root_func(){ }; }; - - - -/// *************************************************************************************** -/// - Audio -//$$ MODULE="Audio" -//$$ DEVICE="audio_i2s" -//$$ L2 PROP_STR = "status" - audio_platform{ - compatible = "amlogic,aml-i2s"; - dev_name = "aml-i2s.0"; - status = "okay"; - }; - -//$$ DEVICE="audio_i2s_dai" -//$$ L2 PROP_STR = "status" - audio_dai{ - compatible = "amlogic,aml-i2s-dai"; - dev_name = "aml-i2s-dai.0"; - status = "okay"; - }; - audio_spdif_dai{ - compatible = "amlogic,aml-spdif-dai"; - dev_name = "aml-spdif-dai.0"; - status = "okay"; - }; - - audio_spdif_codec{ - compatible = "amlogic,aml-spdif-codec"; - dev_name = "spdif-dit.0"; - pinctrl-names = "aml_audio_spdif"; - pinctrl-0 = <&audio_spdif_pins>; - status = "okay"; - }; - -//$$ DEVICE="audio_pcm2BT_codec" -//$$ L2 PROP_STR = "status" - audio_pcm2BT_codec{ - compatible = "amlogic,pcm2BT-codec"; - dev_name = "pcm2bt.0"; - status = "okay"; - }; - -//$$ DEVICE="audio_pcm_dai" -//$$ L2 PROP_STR = "status" - audio_pcm_dai{ - compatible = "amlogic,aml-pcm-dai"; - dev_name = "aml-pcm-dai.0"; - status = "okay"; - }; - -//$$ DEVICE="audio_pcm" -//$$ L2 PROP_STR = "status" - audio_pcm{ - compatible = "amlogic,aml-pcm"; - dev_name = "aml-pcm.0"; - status = "okay"; - }; - -//$$ DEVICE="audio_m8_audio" -//$$ L2 PROP_STR = "status" - audio_m8_audio{ - compatible = "amlogic,m8_audio_codec"; - dev_name = "aml_m8_codec.0"; - status = "disable"; - }; - audio_pmu3_audio{ - compatible = "amlogic,aml_pmu3_codec"; - dev_name = "aml_pmu3_codec.0"; - status = "okay"; - }; - - aml_audio_codec{ - compatible = "amlogic,audio_codec"; - rt5616:rt5616{ - codec_name = "rt5616"; - i2c_addr = <0x1B>; - i2c_bus = "i2c_bus_d"; - id_reg = <0x00>; - id_val = <0x21>; - capless = <0>; - status = "disable"; - }; - rt5631:rt5631{ - codec_name = "rt5631"; - i2c_addr = <0x1A>; - i2c_bus = "i2c_bus_b"; - id_reg = <0x00>; - id_val = <0x01>; - capless = <0>; - status = "disable"; - }; - wm8960:wm8960{ - codec_name = "wm8960"; - i2c_addr = <0x1A>; - i2c_bus = "i2c_bus_b"; - capless = <1>; - status = "disable"; - }; - pmu3:pmu3{ - codec_name = "amlpmu3"; - status = "okay"; - }; - }; - -//$$ DEVICE="aml_m8_sound_card" -//$$ L2 PROP_STR = "aml,sound_card" -//$$ L2 PROP_STR = "aml,codec_dai" -//$$ L2 PROP_STR 6*2 = "aml,audio-routing" -//$$ L2 PROP_STR = "mute_gpio" -//$$ L2 PROP_U32 5 = "hp_paraments" -//$$ L2 PROP_STR = "pinctrl-names" -//$$ L2 PROP_CHOICE "Audio_pin_0_match" = "pinctrl-0" -//$$ L2 PROP_STR = "status" - aml_m8_sound_card{ - compatible = "sound_card, aml_snd_m8"; - aml,sound_card = "AML-M8AUDIO"; - aml,codec_dai = "AML-M8","rt5616-aif1","rt5631-hifi","wm8960-hifi","pmu3-hifi"; - //aml,codec_name = "aml_m8_codec.0","rt5616.4-001b"; - //aml,audio-codec = <&rt5616>; - aml,audio-routing-rt5616 = - "Ext Spk","LOUTL", - "Ext Spk","LOUTR", - "HP","HPOL", - "HP","HPOR", - "micbias1","MAIN MIC", - "IN2P","micbias1"; - aml,audio-routing-amlm8 = - "Ext Spk","LINEOUTL", - "Ext Spk","LINEOUTR", - "HP","HP_L", - "HP","HP_R", - "MICBIAS","MAIN MIC", - "LINPUT1","MICBIAS"; - aml,audio-routing-amlpmu3 = - "Ext Spk","LINEOUTL1", - "Ext Spk","LINEOUTR1", - "HP","HP_L", - "HP","HP_R", - "Mic Bias1","MAIN MIC", - "LINEINLP","Mic Bias1"; - sleep_time = <130>; - mute_gpio = "GPIO_BSD_EN"; - //mute_inv; - hp_paraments = <800 300 0 5 1>; - pinctrl-names = "aml_snd_m8"; - pinctrl-0 = <&audio_pins>; - status = "okay"; - - }; - /// *************************************************************************************** /// - Input //$$ MODULE="Input" @@ -1189,39 +1018,6 @@ void root_func(){ }; }; -/// *************************************************************************************** -/// - Nand -//$$ MODULE="Nand" -//$$ DEVICE="aml_nand" -//$$ L2 PROP_STR = "status" -//$$ L3 PROP_U32 2 ="reg" -//$$ L2 PROP_STR 2 = "pinctrl-names" -//$$ L2 PROP_CHOICE 3 "Nand_pin_0_match" = "pinctrl-0" -//$$ L2 PROP_CHOICE 3 "Nand_pin_1_match" = "pinctrl-1" -//$$ L3 PROP_STR ="plat-names" -//$$ L2 PROP_U32 = "plat-num" -//$$ L2 PROP_CHOICE "plat-part-0_match" = "plat-part-0" - nand{ - compatible = "amlogic,aml_nand"; - dev_name = "nand"; - status = "ok"; - reg = <0xd0048600 0x24>; - pinctrl-names = "nand_rb_mod","nand_norb_mod"; - pinctrl-0 = <&nand_input_state &conf_nand_state &nand_base>; - pinctrl-1 = <&nand_input_state &conf_nand_state &nand_base>; - device_id = <0>; - plat-names = "nandnormal"; - plat-num = <1>; - plat-part-0 = <&normal>; - -//$$ MATCH "plat-part-0_match" = <&normal> -//$$ L2 PROP_STR 4 = "enable_pad" -//$$ L2 PROP_STR = "busy_pad" - normal: normal{ - enable_pad ="ce0","ce1","ce2","ce3"; - busy_pad = "rb0"; - }; - }; /// *************************************************************************************** /// - Efuse @@ -1847,16 +1643,6 @@ void root_func(){ amlogic,pins="GPIOAO_7"; }; -//$$ MATCH "Audio_pin_0_match" = "&audio_pins" -//$$ L2 PROP_U32 4 = "amlogic,setmask" -//$$ L2 PROP_U32 10 = "amlogic,clrmask" -//$$ L2 PROP_STR 6 = "amlogic,pins" - audio_pins:audio_pin{ - amlogic,setmask=<10 0x78000000//>; - 1 0x2000>; /*I2s_in*/ - amlogic,clrmask=<10 0x18000>; - amlogic,pins = "GPIOAO_8","GPIOAO_9","GPIOAO_10","GPIOAO_11","GPIOAO_6"; - }; //$$ MATCH "Audio_pin_0_match" = "&audio_spdif_pins" //$$ L2 PROP_U32 2 = "amlogic,setmask" //$$ L2 PROP_U32 2 = "amlogic,clrmask" diff --git a/arch/arm/configs/odroidc_defconfig b/arch/arm/configs/odroidc_defconfig index 85a9eb2bdf6f..09509aa5f459 100755 --- a/arch/arm/configs/odroidc_defconfig +++ b/arch/arm/configs/odroidc_defconfig @@ -1076,22 +1076,10 @@ CONFIG_PINCTRL_AMLOGIC=y # # Power Management Support # -CONFIG_AMLOGIC_BOARD_HAS_PMU=y -CONFIG_AMLOGIC_PMU_OF=y -# CONFIG_CW2015 is not set -# CONFIG_SMBA10XX_BATTERY is not set -# CONFIG_BQ27x00_BATTERY is not set -# CONFIG_UBOOT_BATTERY_PARAMETERS is not set -CONFIG_AML_PMU_ALGORITHM_SUPPORT=m +# CONFIG_AMLOGIC_BOARD_HAS_PMU is not set +# CONFIG_AML_PMU_ALGORITHM_SUPPORT is not set CONFIG_AML_DVFS=y -# CONFIG_AW_AXP is not set CONFIG_MESON_CS_DCDC_REGULATOR=y -CONFIG_AML_PMU=y -# CONFIG_AML1212 is not set -CONFIG_AML1216=y -CONFIG_AML1218=y -CONFIG_RICOH_PMU=y -CONFIG_RN5T618=y # # Security key Support @@ -1144,22 +1132,19 @@ CONFIG_MMC_AML=y # # SPI NOR Flash support # -CONFIG_AMLOGIC_SPI_NOR=y +# CONFIG_AMLOGIC_SPI_NOR is not set # # Meson NAND Device Support(For NEXT GEN NAND DRIV) # -CONFIG_AML_NEXT_GEN_NAND=y -CONFIG_AML_NFTL_NEW=m -CONFIG_AML_NAND_KEY=y -# CONFIG_SECURE_NAND is not set +# CONFIG_AML_NEXT_GEN_NAND is not set +# CONFIG_AML_NFTL_NEW is not set # # Meson NAND Device Support # # CONFIG_AM_NAND is not set -CONFIG_NAND_KEY_BLOCK_NUM=8 -CONFIG_AML_NEXT_NAND=y +# CONFIG_AML_NEXT_NAND is not set # # Network devices @@ -1220,7 +1205,7 @@ CONFIG_BT_DEVICE=y # # Audio Interface # -CONFIG_AMAUDIO=y +# CONFIG_AMAUDIO is not set # # Amlogic Audio Interface V2 @@ -2793,7 +2778,6 @@ CONFIG_SND_SOC_RT5616=y CONFIG_SND_SOC_RT5631=y CONFIG_SND_SOC_WM8960=y CONFIG_SND_SOC_AML_M8_CODEC=y -CONFIG_SND_SOC_AMLPMU3=y CONFIG_SND_SOC_DUMMY_CODEC=y # CONFIG_SND_SIMPLE_CARD is not set # CONFIG_SOUND_PRIME is not set