From 6b9c9124bc017aaf58799fee8df386e6801f72d8 Mon Sep 17 00:00:00 2001 From: Zhiwei Gong Date: Tue, 2 Jan 2018 12:45:27 +0800 Subject: [PATCH] dts: fix q201 build error PD#156681: dts: fix q201 build error fix q201 build error Change-Id: Ifca66ee62f30251399bbcda82b24b9e8e033ae7c Signed-off-by: Zhiwei Gong --- arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts | 34 +++++++++++++++------ arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts | 34 +++++++++++++++------ 2 files changed, 50 insertions(+), 18 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts b/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts index 842a79bb938a..8d977ccc744a 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts @@ -167,7 +167,7 @@ sd_emmc_c: emmc@d0074000 { status = "okay"; - compatible = "amlogic, meson-aml-mmc"; + compatible = "amlogic, meson-mmc-gxm"; reg = <0x0 0xd0074000 0x0 0x2000>; interrupts = <0 218 1>; pinctrl-names = "emmc_clk_cmd_pins", "emmc_all_pins"; @@ -214,7 +214,7 @@ sd_emmc_b:sd@d0072000 { status = "okay"; - compatible = "amlogic, meson-aml-mmc"; + compatible = "amlogic, meson-mmc-gxm"; reg = <0x0 0xd0072000 0x0 0x2000>; interrupts = <0 217 1>; pinctrl-names = "sd_all_pins", @@ -278,7 +278,7 @@ sd_emmc_a:sdio@d0070000 { status = "okay"; - compatible = "amlogic, meson-aml-mmc"; + compatible = "amlogic, meson-mmc-gxm"; reg = <0x0 0xd0070000 0x0 0x2000>; interrupts = <0 216 4>; pinctrl-names = "sdio_clk_cmd_pins", "sdio_all_pins"; @@ -676,9 +676,25 @@ }; cvbsout { - compatible = "amlogic, cvbsout"; + compatible = "amlogic, cvbsout-gxm"; dev_name = "cvbsout"; status = "okay"; + clocks = <&clkc CLKID_VCLK2_ENCI + &clkc CLKID_VCLK2_VENCI0 + &clkc CLKID_VCLK2_VENCI1 + &clkc CLKID_DAC_CLK>; + clock-names = "venci_top_gate", + "venci_0_gate", + "venci_1_gate", + "vdac_clk_gate"; + + /* performance: reg_address, reg_value */ + performance = <0x1bf0 0x9 + 0x1b56 0x343 + 0x1b12 0x8080 + 0x1b05 0xfd + 0x1c59 0xf752 + 0xffff 0x0>; /* ending flag */ }; amhdmitx: amhdmitx{ @@ -800,7 +816,7 @@ &clkc CLKID_PDM_GATE >; reset-names = "pdm"; - pinctrl-names = "aml_dmic_pins"; + pinctrl-names = "audio_dmic"; pinctrl-0 = <&aml_dmic_pins>; clocks = <&clkc CLKID_PDM_COMP>, <&clkc CLKID_AMCLK_COMP>; @@ -829,7 +845,7 @@ pcm_dai: PCM { #sound-dai-cells = <0>; compatible = "amlogic, aml-pcm-dai"; - pinctrl-names = "aml_audio_pcm"; + pinctrl-names = "audio_pcm"; pinctrl-0 = <&audio_pcm_pins>; clocks = <&clkc CLKID_MPLL0>, @@ -851,7 +867,7 @@ spdif_codec: spdif_codec{ #sound-dai-cells = <0>; compatible = "amlogic, aml-spdif-codec"; - pinctrl-names = "aml_audio_spdif"; + pinctrl-names = "audio_spdif"; pinctrl-0 = <&audio_spdif_pins>; }; pcm_codec: pcm_codec{ @@ -885,7 +901,7 @@ mute_inv; hp_disable; hp_paraments = <800 300 0 5 1>; - pinctrl-names = "aml_audio_i2s"; + pinctrl-names = "audio_i2s"; pinctrl-0 = <&audio_i2s_pins>; cpu_list = <&cpudai0 &cpudai1 &cpudai2>; codec_list = <&codec0 &codec1 &codec2>; @@ -1172,6 +1188,6 @@ &audio_data{ status = "okay"; }; -&i2c_b { +&i2c1 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts b/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts index 57d5bd6806f4..e843b1cee054 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts @@ -175,7 +175,7 @@ sd_emmc_c: emmc@d0074000 { status = "okay"; - compatible = "amlogic, meson-aml-mmc"; + compatible = "amlogic, meson-mmc-gxm"; reg = <0x0 0xd0074000 0x0 0x2000>; interrupts = <0 218 1>; pinctrl-names = "emmc_clk_cmd_pins", "emmc_all_pins"; @@ -222,7 +222,7 @@ sd_emmc_b:sd@d0072000 { status = "okay"; - compatible = "amlogic, meson-aml-mmc"; + compatible = "amlogic, meson-mmc-gxm"; reg = <0x0 0xd0072000 0x0 0x2000>; interrupts = <0 217 1>; pinctrl-names = "sd_all_pins", @@ -286,7 +286,7 @@ sd_emmc_a:sdio@d0070000 { status = "okay"; - compatible = "amlogic, meson-aml-mmc"; + compatible = "amlogic, meson-mmc-gxm"; reg = <0x0 0xd0070000 0x0 0x2000>; interrupts = <0 216 4>; pinctrl-names = "sdio_clk_cmd_pins", "sdio_all_pins"; @@ -686,9 +686,25 @@ }; cvbsout { - compatible = "amlogic, cvbsout"; + compatible = "amlogic, cvbsout-gxm"; dev_name = "cvbsout"; status = "okay"; + clocks = <&clkc CLKID_VCLK2_ENCI + &clkc CLKID_VCLK2_VENCI0 + &clkc CLKID_VCLK2_VENCI1 + &clkc CLKID_DAC_CLK>; + clock-names = "venci_top_gate", + "venci_0_gate", + "venci_1_gate", + "vdac_clk_gate"; + + /* performance: reg_address, reg_value */ + performance = <0x1bf0 0x9 + 0x1b56 0x343 + 0x1b12 0x8080 + 0x1b05 0xfd + 0x1c59 0xf752 + 0xffff 0x0>; /* ending flag */ }; amhdmitx: amhdmitx{ @@ -810,7 +826,7 @@ &clkc CLKID_PDM_GATE >; reset-names = "pdm"; - pinctrl-names = "aml_dmic_pins"; + pinctrl-names = "audio_dmic"; pinctrl-0 = <&aml_dmic_pins>; clocks = <&clkc CLKID_PDM_COMP>, <&clkc CLKID_AMCLK_COMP>; @@ -839,7 +855,7 @@ pcm_dai: PCM { #sound-dai-cells = <0>; compatible = "amlogic, aml-pcm-dai"; - pinctrl-names = "aml_audio_pcm"; + pinctrl-names = "audio_pcm"; pinctrl-0 = <&audio_pcm_pins>; clocks = <&clkc CLKID_MPLL0>, @@ -861,7 +877,7 @@ spdif_codec: spdif_codec{ #sound-dai-cells = <0>; compatible = "amlogic, aml-spdif-codec"; - pinctrl-names = "aml_audio_spdif"; + pinctrl-names = "audio_spdif"; pinctrl-0 = <&audio_spdif_pins>; }; pcm_codec: pcm_codec{ @@ -895,7 +911,7 @@ mute_inv; hp_disable; hp_paraments = <800 300 0 5 1>; - pinctrl-names = "aml_audio_i2s"; + pinctrl-names = "audio_i2s"; pinctrl-0 = <&audio_i2s_pins>; cpu_list = <&cpudai0 &cpudai1 &cpudai2>; codec_list = <&codec0 &codec1 &codec2>; @@ -1182,6 +1198,6 @@ &audio_data{ status = "okay"; }; -&i2c_b { +&i2c1 { status = "okay"; };