diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-12-15 14:14:36 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-12-15 14:14:36 -0800 |
| commit | 62d6ead3eea571f6b1fb426448be4262c7c30188 (patch) | |
| tree | b4f4642b754c220dc24c34e8e1ff3604479c9aa8 | |
| parent | 50748869446c8cfebd8aa318772f2dda9abd8d96 (diff) | |
| parent | 3b6fb95da831c78e8d94865fa386de68c892d815 (diff) | |
Merge "ARM: dts: msm: blsp and sdhci switch to virtual clock on msm8996 vplatform"
| -rw-r--r-- | arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-blsp.dtsi | 16 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi | 9 |
2 files changed, 15 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-blsp.dtsi b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-blsp.dtsi index a672b04cbb35..eb78cfd8b133 100644 --- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-blsp.dtsi +++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-blsp.dtsi @@ -36,8 +36,8 @@ pinctrl-0 = <&spi_9_active>; pinctrl-1 = <&spi_9_sleep>; clock-names = "iface_clk", "core_clk"; - clocks = <&clock_gcc clk_gcc_blsp2_ahb_clk>, - <&clock_gcc clk_gcc_blsp2_qup3_spi_apps_clk>; + clocks = <&clock_virt clk_gcc_blsp2_ahb_clk>, + <&clock_virt clk_gcc_blsp2_qup3_spi_apps_clk>; status = "disabled"; }; @@ -54,8 +54,8 @@ qcom,clk-freq-out = <400000>; qcom,clk-freq-in = <19200000>; clock-names = "iface_clk", "core_clk"; - clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>, - <&clock_gcc clk_gcc_blsp1_qup6_i2c_apps_clk>; + clocks = <&clock_virt clk_gcc_blsp1_ahb_clk>, + <&clock_virt clk_gcc_blsp1_qup6_i2c_apps_clk>; pinctrl-names = "i2c_active", "i2c_sleep"; pinctrl-0 = <&i2c_6_active>; pinctrl-1 = <&i2c_6_sleep>; @@ -75,8 +75,8 @@ qcom,clk-freq-out = <400000>; qcom,clk-freq-in = <19200000>; clock-names = "iface_clk", "core_clk"; - clocks = <&clock_gcc clk_gcc_blsp2_ahb_clk>, - <&clock_gcc clk_gcc_blsp2_qup2_i2c_apps_clk>; + clocks = <&clock_virt clk_gcc_blsp2_ahb_clk>, + <&clock_virt clk_gcc_blsp2_qup2_i2c_apps_clk>; pinctrl-names = "i2c_active", "i2c_sleep"; pinctrl-0 = <&i2c_8_active>; pinctrl-1 = <&i2c_8_sleep>; @@ -99,8 +99,8 @@ qcom,bam-rx-ep-pipe-index = <3>; qcom,master-id = <86>; clock-names = "core_clk", "iface_clk"; - clocks = <&clock_gcc clk_gcc_blsp1_uart2_apps_clk>, - <&clock_gcc clk_gcc_blsp1_ahb_clk>; + clocks = <&clock_virt clk_gcc_blsp1_uart2_apps_clk>, + <&clock_virt clk_gcc_blsp1_ahb_clk>; pinctrl-names = "sleep", "default"; pinctrl-0 = <&blsp1_uart2_sleep>; pinctrl-1 = <&blsp1_uart2_active>; diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi index 2a9aaf575fb2..5ec05c8011d2 100644 --- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi +++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi @@ -96,8 +96,8 @@ interrupt-names = "hc_irq", "pwr_irq"; clock-names = "iface_clk", "core_clk"; - clocks = <&clock_gcc clk_gcc_sdcc2_ahb_clk>, - <&clock_gcc clk_gcc_sdcc2_apps_clk>; + clocks = <&clock_virt clk_gcc_sdcc2_ahb_clk>, + <&clock_virt clk_gcc_sdcc2_apps_clk>; qcom,large-address-bus; qcom,bus-width = <4>; @@ -696,6 +696,11 @@ qcom,pipe-attr-ee; }; + clock_virt: qcom,virtclk-frontend@0 { + compatible = "qcom,virtclk-frontend-8996"; + #clock-cells = <1>; + }; + clock_gcc: qcom,gcc@300000 { compatible = "qcom,dummycc"; #clock-cells = <1>; |