memory: pl353: Updated the clock names as per the arm pl353 trm

Updated the clock names as per the arm pl353 trm

Signed-off-by: Punnaiah Choudary Kalluri <punnaia@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/boot/dts/zynq-afx-nand.dts b/arch/arm/boot/dts/zynq-afx-nand.dts
index 01c7596f83edb7359bbbfe01e466446da887793e..6ec7f049e225da9ffeef4385cfc5819cb48711fd 100644 (file)
--- a/arch/arm/boot/dts/zynq-afx-nand.dts
+++ b/arch/arm/boot/dts/zynq-afx-nand.dts
@@ -201,7 +201,7 @@
                        arm,nor-chip-sel1 = <0x0>;
                        arm,sram-chip-sel0 = <0x0>;
                        arm,sram-chip-sel1 = <0x0>;
-                       clock-names = "ref_clk", "aper_clk";
+                       clock-names = "memclk", "aclk";
                        clocks = <&clkc 11>, <&clkc 44>;
                        compatible = "arm,pl353-smc-r2p1";
                        interrupt-parent = <&ps7_scugic_0>;

diff --git a/arch/arm/boot/dts/zynq-afx-nor.dts b/arch/arm/boot/dts/zynq-afx-nor.dts
index 94c422d2dacb46b7bcc7de868c6f0bcaa7e3a584..e40f76d2c026cf1d0d21d91ada5bb1fefde8e3fc 100644 (file)
--- a/arch/arm/boot/dts/zynq-afx-nor.dts
+++ b/arch/arm/boot/dts/zynq-afx-nor.dts
@@ -189,7 +189,7 @@
                        arm,nor-chip-sel1 = <0x0>;
                        arm,sram-chip-sel0 = <0x0>;
                        arm,sram-chip-sel1 = <0x0>;
-                       clock-names = "ref_clk", "aper_clk";
+                       clock-names = "memclk", "aclk";
                        clocks = <&clkc 11>, <&clkc 44>;
                        compatible = "arm,pl353-smc-r2p1";
                        interrupt-parent = <&ps7_scugic_0>;

diff --git a/arch/arm/boot/dts/zynq-zc770-xm011.dts b/arch/arm/boot/dts/zynq-zc770-xm011.dts
index 1e86e35895b86ffb652a5173c6338a266b87baee..340ab4472b409e42e37ff1205456bad65f6630c4 100644 (file)
--- a/arch/arm/boot/dts/zynq-zc770-xm011.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm011.dts
@@ -227,7 +227,7 @@
                        arm,nor-chip-sel1 = <0x0>;
                        arm,sram-chip-sel0 = <0x0>;
                        arm,sram-chip-sel1 = <0x0>;
-                       clock-names = "ref_clk", "aper_clk";
+                       clock-names = "memclk", "aclk";
                        clocks = <&clkc 11>, <&clkc 44>;
                        compatible = "arm,pl353-smc-r2p1";
                        interrupt-parent = <&ps7_scugic_0>;

diff --git a/arch/arm/boot/dts/zynq-zc770-xm012.dts b/arch/arm/boot/dts/zynq-zc770-xm012.dts
index 63943cdafe6e4e09cb9bcb6eb54664068f7707aa..ae4dabcaffa84de5c34d5b215533e8447555b2d2 100644 (file)
--- a/arch/arm/boot/dts/zynq-zc770-xm012.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm012.dts
@@ -244,7 +244,7 @@
                        arm,nor-chip-sel1 = <0x0>;
                        arm,sram-chip-sel0 = <0x0>;
                        arm,sram-chip-sel1 = <0x0>;
-                       clock-names = "ref_clk", "aper_clk";
+                       clock-names = "memclk", "aclk";
                        clocks = <&clkc 11>, <&clkc 44>;
                        compatible = "arm,pl353-smc-r2p1";
                        interrupt-parent = <&ps7_scugic_0>;

diff --git a/drivers/memory/pl353-smc.c b/drivers/memory/pl353-smc.c
index f850b3d184d667262392e3f9279f0fde44441362..2d07e435e9190b0234179d40d0185fc010553237 100644 (file)
--- a/drivers/memory/pl353-smc.c
+++ b/drivers/memory/pl353-smc.c
@@ -91,8 +91,8 @@
  * @aperclk:           Pointer to the APER clock
  */
 struct pl353_smc_data {
-       struct clk              *devclk;
-       struct clk              *aperclk;
+       struct clk              *memclk;
+       struct clk              *aclk;
 };
 
 /* SMC virtual register base */
@@ -291,8 +291,8 @@ static int __maybe_unused pl353_smc_suspend(struct device *dev)
 {
        struct pl353_smc_data *pl353_smc = dev_get_drvdata(dev);
 
-       clk_disable(pl353_smc->devclk);
-       clk_disable(pl353_smc->aperclk);
+       clk_disable(pl353_smc->memclk);
+       clk_disable(pl353_smc->aclk);
 
        return 0;
 }
@@ -302,16 +302,16 @@ static int __maybe_unused pl353_smc_resume(struct device *dev)
        int ret;
        struct pl353_smc_data *pl353_smc = dev_get_drvdata(dev);
 
-       ret = clk_enable(pl353_smc->aperclk);
+       ret = clk_enable(pl353_smc->aclk);
        if (ret) {
-               dev_err(dev, "Cannot enable APER clock.\n");
+               dev_err(dev, "Cannot enable axi domain clock.\n");
                return ret;
        }
 
-       ret = clk_enable(pl353_smc->devclk);
+       ret = clk_enable(pl353_smc->memclk);
        if (ret) {
-               dev_err(dev, "Cannot enable device clock.\n");
-               clk_disable(pl353_smc->aperclk);
+               dev_err(dev, "Cannot enable memory clock.\n");
+               clk_disable(pl353_smc->aclk);
                return ret;
        }
        return ret;
@@ -451,27 +451,27 @@ static int pl353_smc_probe(struct platform_device *pdev)
        if (IS_ERR(pl353_smc_base))
                return PTR_ERR(pl353_smc_base);
 
-       pl353_smc->aperclk = devm_clk_get(&pdev->dev, "aper_clk");
-       if (IS_ERR(pl353_smc->aperclk)) {
-               dev_err(&pdev->dev, "aper_clk clock not found.\n");
-               return PTR_ERR(pl353_smc->aperclk);
+       pl353_smc->aclk = devm_clk_get(&pdev->dev, "aclk");
+       if (IS_ERR(pl353_smc->aclk)) {
+               dev_err(&pdev->dev, "aclk clock not found.\n");
+               return PTR_ERR(pl353_smc->aclk);
        }
 
-       pl353_smc->devclk = devm_clk_get(&pdev->dev, "ref_clk");
-       if (IS_ERR(pl353_smc->devclk)) {
-               dev_err(&pdev->dev, "ref_clk clock not found.\n");
-               return PTR_ERR(pl353_smc->devclk);
+       pl353_smc->memclk = devm_clk_get(&pdev->dev, "memclk");
+       if (IS_ERR(pl353_smc->memclk)) {
+               dev_err(&pdev->dev, "memclk clock not found.\n");
+               return PTR_ERR(pl353_smc->memclk);
        }
 
-       err = clk_prepare_enable(pl353_smc->aperclk);
+       err = clk_prepare_enable(pl353_smc->aclk);
        if (err) {
-               dev_err(&pdev->dev, "Unable to enable APER clock.\n");
+               dev_err(&pdev->dev, "Unable to enable AXI clock.\n");
                return err;
        }
 
-       err = clk_prepare_enable(pl353_smc->devclk);
+       err = clk_prepare_enable(pl353_smc->memclk);
        if (err) {
-               dev_err(&pdev->dev, "Unable to enable device clock.\n");
+               dev_err(&pdev->dev, "Unable to enable memory clock.\n");
                goto out_clk_dis_aper;
        }
 
@@ -515,9 +515,9 @@ static int pl353_smc_probe(struct platform_device *pdev)
        return 0;
 
 out_clk_disable:
-       clk_disable_unprepare(pl353_smc->devclk);
+       clk_disable_unprepare(pl353_smc->memclk);
 out_clk_dis_aper:
-       clk_disable_unprepare(pl353_smc->aperclk);
+       clk_disable_unprepare(pl353_smc->aclk);
 
        return err;
 }
@@ -526,8 +526,8 @@ static int pl353_smc_remove(struct platform_device *pdev)
 {
        struct pl353_smc_data *pl353_smc = platform_get_drvdata(pdev);
 
-       clk_disable_unprepare(pl353_smc->devclk);
-       clk_disable_unprepare(pl353_smc->aperclk);
+       clk_disable_unprepare(pl353_smc->memclk);
+       clk_disable_unprepare(pl353_smc->aclk);
 
        return 0;
 }