arm64: dts: exynos5433: Remove legacy memory-bus frequency

This patch removes the legacy memory-bus frequency
in order to apply the generic bus frequency driver
for Exynos SoC.

Change-Id: I861f312529f042b4b93359fa04a405ec78377708
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/arch/arm64/boot/dts/exynos/exynos5433-memory-bus.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-memory-bus.dtsi
deleted file mode 100644 (file)
index db4297f..0000000
--- a/arch/arm64/boot/dts/exynos/exynos5433-memory-bus.dtsi
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Samsung's Exynos5433 SoC memory buses
- *
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com
- *
- * Samsung's Exynos5433 SoC memory buses are listed as device tree nodes
- * are listed in this file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-&memory_bus_mif {
-       blocks {
-               mif_400_block: memory_bus_block0 {
-                       clocks = <&cmu_mif CLK_DIV_ACLK_MIF_400>;
-                       clock-names = "memory-bus";
-                       frequency = <
-                               413000
-                               275000
-                               275000
-                               207000
-                               207000
-                               207000
-                               165000
-                                165000
-                                138000
-                                138000>;
-               };
-
-               mif_266_block: memory_bus_block1 {
-                       clocks = <&cmu_mif CLK_DIV_ACLK_MIF_266>;
-                       clock-names = "memory-bus";
-                       frequency = <
-                               267000
-                               200000
-                               200000
-                               160000
-                               134000
-                               134000
-                               100000
-                                100000
-                                100000
-                                100000>;
-               };
-
-               mif_200_block: memory_bus_block2 {
-                       clocks = <&cmu_mif CLK_DIV_ACLK_MIF_200>;
-                       clock-names = "memory-bus";
-                       frequency = <
-                               207000
-                               138000
-                               138000
-                               104000
-                               104000
-                               104000
-                               83000
-                                83000
-                                69000
-                                69000>;
-               };
-
-               mif_pre_block: memory_bus_block3 {
-                       clocks = <&cmu_mif CLK_DIV_MIF_PRE>;
-                       clock-names = "memory-bus";
-                       frequency = <
-                               400000
-                               400000
-                               400000
-                               400000
-                               400000
-                               400000
-                               400000
-                               400000
-                                400000
-                                400000>;
-               };
-
-               mifnm_200_block: memory_bus_block4 {
-                       clocks = <&cmu_mif CLK_DIV_ACLK_MIFNM_200>;
-                       clock-names = "memory-bus";
-                       frequency = <
-                               200000
-                               200000
-                               200000
-                               200000
-                               200000
-                               200000
-                               100000
-                               100000
-                                100000
-                                100000>;
-               };
-
-               mifnd_133_block: memory_bus_block5 {
-                       clocks = <&cmu_mif CLK_DIV_ACLK_MIFND_133>;
-                       clock-names = "memory-bus";
-                       frequency = <
-                               80000
-                               80000
-                               80000
-                               67000
-                               67000
-                               67000
-                               67000
-                               67000
-                                67000
-                                67000>;
-               };
-
-               mif_133_block: memory_bus_block6 {
-                       clocks = <&cmu_mif CLK_DIV_ACLK_MIF_133>;
-                       clock-names = "memory-bus";
-                       frequency = <
-                               80000
-                               67000
-                               67000
-                               67000
-                               67000
-                               50000
-                               50000
-                               50000
-                                50000
-                                50000>;
-               };
-
-               cpif_200_block: memory_bus_block7 {
-                       clocks = <&cmu_mif CLK_DIV_ACLK_CPIF_200>;
-                       clock-names = "memory-bus";
-                       frequency = <
-                               100000
-                               100000
-                               100000
-                               100000
-                               100000
-                               100000
-                               100000
-                               100000
-                                100000
-                                100000>;
-               };
-
-               hpm_mif_block: memory_bus_block8 {
-                       clocks = <&cmu_mif CLK_SCLK_HPM_MIF>;
-                       clock-names = "memory-bus";
-                       frequency = <
-                               207000
-                               167000
-                               136000
-                               104000
-                               69000
-                               56000
-                               42000
-                               35000
-                                27000
-                                19000>;
-               };
-       };
-};
-
-&memory_bus_int {
-       blocks {
-               bus0_block: memory_bus_block0 {
-                       clocks = <&cmu_top CLK_ACLK_BUS0_400>;
-                       clock-names = "memory-bus";
-                       frequency = <
-                               400000
-                               267000
-                               267000
-                               200000
-                               160000
-                               134000
-                               100000>;
-               };
-
-               bus1_block: memory_bus_block1 {
-                       clocks = <&cmu_top CLK_ACLK_BUS1_400>;
-                       clock-names = "memory-bus";
-                       frequency = <
-                               400000
-                               267000
-                               267000
-                               200000
-                               160000
-                               134000
-                               100000>;
-               };
-
-               bus2_block: memory_bus_block2 {
-                       clocks = <&cmu_mif CLK_ACLK_BUS2_400>;
-                       clock-names = "memory-bus";
-                       frequency = <
-                               400000
-                               200000
-                               200000
-                               200000
-                               200000
-                               134000
-                               100000>;
-               };
-
-               g2d_400_block: memory_bus_block3 {
-                       clocks = <&cmu_top CLK_ACLK_G2D_400>;
-                       clock-names = "memory-bus";
-                       frequency = <
-                               400000
-                               334000
-                               267000
-                               200000
-                               160000
-                               134000
-                               100000>;
-               };
-
-               g2d_266_block: memory_bus_block4 {
-                       clocks = <&cmu_top CLK_ACLK_G2D_266>;
-                       clock-names = "memory-bus";
-                       frequency = <
-                               267000
-                               267000
-                               200000
-                               160000
-                               134000
-                               100000
-                               100000>;
-               };
-
-
-               gscl_block: memory_bus_block5 {
-                       clocks = <&cmu_top CLK_ACLK_GSCL_333>;
-                       clock-names = "memory-bus";
-                       frequency = <
-                               334000
-                               334000
-                               334000
-                               222000
-                               222000
-                               167000
-                               167000>;
-               };
-
-               mscl_block: memory_bus_block6 {
-                       clocks = <&cmu_top CLK_ACLK_MSCL_400>;
-                       clock-names = "memory-bus";
-                       frequency = <
-                               400000
-                               334000
-                               267000
-                               200000
-                               160000
-                               134000
-                               100000>;
-               };
-
-               jpeg_block: memory_bus_block7 {
-                       clocks = <&cmu_top CLK_SCLK_JPEG_MSCL>;
-                       clock-names = "memory-bus";
-                       frequency = <
-                               400000
-                               334000
-                               267000
-                               200000
-                               160000
-                               134000
-                               100000>;
-               };
-
-               mfc_block: memory_bus_block8 {
-                       clocks = <&cmu_top CLK_ACLK_MFC_400>;
-                       clock-names = "memory-bus";
-                       frequency = <
-                               400000
-                               334000
-                               267000
-                               200000
-                               200000
-                               160000
-                               100000>;
-               };
-
-               hevc_block: memory_bus_block9 {
-                       clocks = <&cmu_top CLK_ACLK_HEVC_400>;
-                       clock-names = "memory-bus";
-                       frequency = <
-                               400000
-                               267000
-                               267000
-                               200000
-                               160000
-                               134000
-                               100000>;
-               };
-       };
-};

diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts b/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts
index 17e67f4a6262fe670800d8cea528b31b0119e84c..e1947a6909733d6748c1483ea2b7491755e075f7 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts
+++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts
@@ -1195,22 +1195,6 @@
        };
 };
 
-&memory_bus_int {
-       devfreq-events = <&ppmu_d0_general_0>,
-                        <&ppmu_d1_general_0>;
-       vdd-mem-supply = <&buck4_reg>;
-       exynos,saturation-ratio = <10>;
-       status = "okay";
-};
-
-&memory_bus_mif {
-       devfreq-events = <&ppmu_d0_cpu_3>,
-                        <&ppmu_d1_cpu_3>;
-       vdd-mem-supply = <&buck1_reg>;
-       exynos,saturation-ratio = <10>;
-       status = "okay";
-};
-
 &xxti {
        clock-frequency = <24000000>;
 };

diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts b/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts
index 8ec87d9a12d9ae126db310aa0fa4450a4f1700a8..2c252a4dffd57802dbe2f700b46a05f27dbc00a8 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts
+++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts
@@ -1181,22 +1181,6 @@
        };
 };
 
-&memory_bus_int {
-       devfreq-events = <&ppmu_d0_general_0>,
-                        <&ppmu_d1_general_0>;
-       vdd-mem-supply = <&buck4_reg>;
-       exynos,saturation-ratio = <10>;
-       status = "okay";
-};
-
-&memory_bus_mif {
-       devfreq-events = <&ppmu_d0_cpu_3>,
-                        <&ppmu_d1_cpu_3>;
-       vdd-mem-supply = <&buck1_reg>;
-       exynos,saturation-ratio = <10>;
-       status = "okay";
-};
-
 &xxti {
        clock-frequency = <24000000>;
 };

diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
index 309d0b802dbd7bb910d5259c0efbc39debd272c9..0fc9182790e9b2e454790ae0768f4aab4b7983b8 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos5433.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
@@ -190,35 +190,6 @@
                        #clock-cells = <0>;
                };
 
-               memory_bus_int: memory_bus@0 {
-                       compatible = "samsung,exynos-memory-bus";
-                       operating-points = <
-                               400000 1075000
-                               334000 1025000
-                               267000 1000000
-                               200000 975000
-                               160000 962500
-                               133000 950000
-                               100000 937500>;
-                       status = "disabled";
-               };
-
-               memory_bus_mif: memory_bus@1 {
-                       compatible = "samsung,exynos-memory-bus";
-                       operating-points = <
-                               825000 1050000
-                               667000 1000000
-                               543000 975000
-                               413000 950000
-                               272000 950000
-                               222000 950000
-                               167000 925000
-                               136000 900000
-                               109000 875000
-                               78000  875000>;
-                       status = "disabled";
-               };
-
                cmu_top: clock-controller@10030000 {
                        compatible = "samsung,exynos5433-cmu-top";
                        reg = <0x10030000 0x1000>;
@@ -2710,4 +2681,3 @@
 
 #include "exynos5433-pinctrl.dtsi"
 #include "exynos5433-tmu.dtsi"
-#include "exynos5433-memory-bus.dtsi"