]> git.sur5r.net Git - u-boot/commitdiff
arm64: zynqmp: Convert board to use zynqmp-clk driver
authorMichal Simek <michal.simek@xilinx.com>
Fri, 8 Dec 2017 13:50:42 +0000 (14:50 +0100)
committerMichal Simek <michal.simek@xilinx.com>
Fri, 23 Mar 2018 08:30:44 +0000 (09:30 +0100)
Use zynqmp clock driver instead of fixed clocks.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
13 files changed:
arch/arm/dts/zynqmp-clk-ccf.dtsi [new file with mode: 0644]
arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts
arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts
arch/arm/dts/zynqmp-zcu102-revA.dts
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
configs/xilinx_zynqmp_zcu102_revA_defconfig
configs/xilinx_zynqmp_zcu102_revB_defconfig

diff --git a/arch/arm/dts/zynqmp-clk-ccf.dtsi b/arch/arm/dts/zynqmp-clk-ccf.dtsi
new file mode 100644 (file)
index 0000000..4449d5b
--- /dev/null
@@ -0,0 +1,290 @@
+/*
+ * Clock specification for Xilinx ZynqMP
+ *
+ * (C) Copyright 2017, Xilinx, Inc.
+ *
+ * Michal Simek <michal.simek@xilinx.com>
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+/ {
+       fclk0: fclk0 {
+               status = "disabled";
+               compatible = "xlnx,fclk";
+               clocks = <&clkc 71>;
+       };
+
+       fclk1: fclk1 {
+               status = "disabled";
+               compatible = "xlnx,fclk";
+               clocks = <&clkc 72>;
+       };
+
+       fclk2: fclk2 {
+               status = "disabled";
+               compatible = "xlnx,fclk";
+               clocks = <&clkc 73>;
+       };
+
+       fclk3: fclk3 {
+               status = "disabled";
+               compatible = "xlnx,fclk";
+               clocks = <&clkc 74>;
+       };
+
+       pss_ref_clk: pss_ref_clk {
+               u-boot,dm-pre-reloc;
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <33333333>;
+       };
+
+       video_clk: video_clk {
+               u-boot,dm-pre-reloc;
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <27000000>;
+       };
+
+       pss_alt_ref_clk: pss_alt_ref_clk {
+               u-boot,dm-pre-reloc;
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <0>;
+       };
+
+       gt_crx_ref_clk: gt_crx_ref_clk {
+               u-boot,dm-pre-reloc;
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <108000000>;
+       };
+
+       aux_ref_clk: aux_ref_clk {
+               u-boot,dm-pre-reloc;
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <27000000>;
+       };
+
+       clkc: clkc {
+               u-boot,dm-pre-reloc;
+               #clock-cells = <1>;
+               compatible = "xlnx,zynqmp-clkc";
+               clocks = <&pss_ref_clk>, <&video_clk>, <&pss_alt_ref_clk>, <&aux_ref_clk>, <&gt_crx_ref_clk>;
+               clock-names = "pss_ref_clk", "video_clk", "pss_alt_ref_clk", "aux_ref_clk", "gt_crx_ref_clk";
+               clock-output-names = "iopll", "rpll", "apll", "dpll",
+                               "vpll", "iopll_to_fpd", "rpll_to_fpd",
+                               "apll_to_lpd", "dpll_to_lpd", "vpll_to_lpd",
+                               "acpu", "acpu_half", "dbf_fpd", "dbf_lpd",
+                               "dbg_trace", "dbg_tstmp", "dp_video_ref",
+                               "dp_audio_ref", "dp_stc_ref", "gdma_ref",
+                               "dpdma_ref", "ddr_ref", "sata_ref", "pcie_ref",
+                               "gpu_ref", "gpu_pp0_ref", "gpu_pp1_ref",
+                               "topsw_main", "topsw_lsbus", "gtgref0_ref",
+                               "lpd_switch", "lpd_lsbus", "usb0_bus_ref",
+                               "usb1_bus_ref", "usb3_dual_ref", "usb0",
+                               "usb1", "cpu_r5", "cpu_r5_core", "csu_spb",
+                               "csu_pll", "pcap", "iou_switch", "gem_tsu_ref",
+                               "gem_tsu", "gem0_ref", "gem1_ref", "gem2_ref",
+                               "gem3_ref", "gem0_tx", "gem1_tx", "gem2_tx",
+                               "gem3_tx", "qspi_ref", "sdio0_ref", "sdio1_ref",
+                               "uart0_ref", "uart1_ref", "spi0_ref",
+                               "spi1_ref", "nand_ref", "i2c0_ref", "i2c1_ref",
+                               "can0_ref", "can1_ref", "can0", "can1",
+                               "dll_ref", "adma_ref", "timestamp_ref",
+                               "ams_ref", "pl0", "pl1", "pl2", "pl3", "wdt";
+       };
+
+       dp_aclk: dp_aclk {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <100000000>;
+               clock-accuracy = <100>;
+       };
+};
+
+&can0 {
+       clocks = <&clkc 63>, <&clkc 31>;
+};
+
+&can1 {
+       clocks = <&clkc 64>, <&clkc 31>;
+};
+
+&cpu0 {
+       clocks = <&clkc 10>;
+};
+
+&fpd_dma_chan1 {
+       clocks = <&clkc 19>, <&clkc 31>;
+};
+
+&fpd_dma_chan2 {
+       clocks = <&clkc 19>, <&clkc 31>;
+};
+
+&fpd_dma_chan3 {
+       clocks = <&clkc 19>, <&clkc 31>;
+};
+
+&fpd_dma_chan4 {
+       clocks = <&clkc 19>, <&clkc 31>;
+};
+
+&fpd_dma_chan5 {
+       clocks = <&clkc 19>, <&clkc 31>;
+};
+
+&fpd_dma_chan6 {
+       clocks = <&clkc 19>, <&clkc 31>;
+};
+
+&fpd_dma_chan7 {
+       clocks = <&clkc 19>, <&clkc 31>;
+};
+
+&fpd_dma_chan8 {
+       clocks = <&clkc 19>, <&clkc 31>;
+};
+
+&gpu {
+       clocks = <&clkc 24>, <&clkc 25>, <&clkc 26>;
+};
+
+&lpd_dma_chan1 {
+       clocks = <&clkc 68>, <&clkc 31>;
+};
+
+&lpd_dma_chan2 {
+       clocks = <&clkc 68>, <&clkc 31>;
+};
+
+&lpd_dma_chan3 {
+       clocks = <&clkc 68>, <&clkc 31>;
+};
+
+&lpd_dma_chan4 {
+       clocks = <&clkc 68>, <&clkc 31>;
+};
+
+&lpd_dma_chan5 {
+       clocks = <&clkc 68>, <&clkc 31>;
+};
+
+&lpd_dma_chan6 {
+       clocks = <&clkc 68>, <&clkc 31>;
+};
+
+&lpd_dma_chan7 {
+       clocks = <&clkc 68>, <&clkc 31>;
+};
+
+&lpd_dma_chan8 {
+       clocks = <&clkc 68>, <&clkc 31>;
+};
+
+&nand0 {
+       clocks = <&clkc 60>, <&clkc 31>;
+};
+
+&gem0 {
+       clocks = <&clkc 31>, <&clkc 49>, <&clkc 45>, <&clkc 49>, <&clkc 44>;
+       clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";
+};
+
+&gem1 {
+       clocks = <&clkc 31>, <&clkc 50>, <&clkc 46>, <&clkc 50>, <&clkc 44>;
+       clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";
+};
+
+&gem2 {
+       clocks = <&clkc 31>, <&clkc 51>, <&clkc 47>, <&clkc 51>, <&clkc 44>;
+       clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";
+};
+
+&gem3 {
+       clocks = <&clkc 31>, <&clkc 52>, <&clkc 48>, <&clkc 52>, <&clkc 44>;
+       clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";
+};
+
+&gpio {
+       clocks = <&clkc 31>;
+};
+
+&i2c0 {
+       clocks = <&clkc 61>;
+};
+
+&i2c1 {
+       clocks = <&clkc 62>;
+};
+
+&pcie {
+       clocks = <&clkc 23>;
+};
+
+&qspi {
+       clocks = <&clkc 53>, <&clkc 31>;
+};
+
+&sata {
+       clocks = <&clkc 22>;
+};
+
+&sdhci0 {
+       clocks = <&clkc 54>, <&clkc 31>;
+};
+
+&sdhci1 {
+       clocks = <&clkc 55>, <&clkc 31>;
+};
+
+&spi0 {
+       clocks = <&clkc 58>, <&clkc 31>;
+};
+
+&spi1 {
+       clocks = <&clkc 59>, <&clkc 31>;
+};
+
+&uart0 {
+       clocks = <&clkc 56>,  <&clkc 31>;
+};
+
+&uart1 {
+       clocks = <&clkc 57>,  <&clkc 31>;
+};
+
+&usb0 {
+       clocks = <&clkc 32>,  <&clkc 34>;
+};
+
+&usb1 {
+       clocks = <&clkc 33>,  <&clkc 34>;
+};
+
+&watchdog0 {
+       clocks = <&clkc 75>;
+};
+
+&xilinx_ams {
+       clocks = <&clkc 70>;
+};
+
+&xilinx_drm {
+       clocks = <&clkc 16>;
+};
+
+&xlnx_dp {
+       clocks = <&dp_aclk>, <&clkc 17>;
+};
+
+&xlnx_dpdma {
+       clocks = <&clkc 20>;
+};
+
+&xlnx_dp_snd_codec0 {
+       clocks = <&clkc 17>;
+};
index 04d82c4d2ec96160548a01824153d6f3d822d5a4..9062ffe919e155ffeae14c7ca8246d7fcf9b4750 100644 (file)
@@ -11,7 +11,7 @@
 /dts-v1/;
 
 #include "zynqmp.dtsi"
-#include "zynqmp-clk.dtsi"
+#include "zynqmp-clk-ccf.dtsi"
 
 / {
        model = "ZynqMP zc1751-xm015-dc1 RevA";
index 7dfe960135a5d0d54590f04bb05b18ff098537c6..bf43bf8748855601f62fb11b82ce95de353ea31f 100644 (file)
@@ -11,7 +11,7 @@
 /dts-v1/;
 
 #include "zynqmp.dtsi"
-#include "zynqmp-clk.dtsi"
+#include "zynqmp-clk-ccf.dtsi"
 
 / {
        model = "ZynqMP zc1751-xm016-dc2 RevA";
index 648e3ba79939540b37120d4ed6b068d3917eb70b..39c82c592f73d60fe7746deade475126c8922389 100644 (file)
@@ -11,7 +11,7 @@
 /dts-v1/;
 
 #include "zynqmp.dtsi"
-#include "zynqmp-clk.dtsi"
+#include "zynqmp-clk-ccf.dtsi"
 
 / {
        model = "ZynqMP zc1751-xm018-dc4";
index f3020a57600a26ea6e398157f479827e56b8b872..c774b866fb146730929f75ef637839e0d603541d 100644 (file)
@@ -12,7 +12,7 @@
 /dts-v1/;
 
 #include "zynqmp.dtsi"
-#include "zynqmp-clk.dtsi"
+#include "zynqmp-clk-ccf.dtsi"
 / {
        model = "ZynqMP zc1751-xm019-dc5 RevA";
        compatible = "xlnx,zynqmp-zc1751", "xlnx,zynqmp";
index 64a883b96e3a182fa028052dac737024b09ef5a9..2be6eb0eb5ebacc06d91617155b5f2dbd66814bf 100644 (file)
@@ -11,7 +11,7 @@
 /dts-v1/;
 
 #include "zynqmp.dtsi"
-#include "zynqmp-clk.dtsi"
+#include "zynqmp-clk-ccf.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/pinctrl-zynqmp.h>
 #include <dt-bindings/phy/phy.h>
index 7da0ca8789be01bba27dde87744c81d728c49ac2..9addd427e7c52e52d6656a94fdb7df097ebfa2e2 100644 (file)
@@ -45,6 +45,7 @@ CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_CLK_ZYNQMP=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
index 3e531661eb63ac99906a478fd9f632b5a1d19574..4f4d670477fa77375bb7b8e3049a14002d684273 100644 (file)
@@ -44,6 +44,7 @@ CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_CLK_ZYNQMP=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
index 9bc0b77c2c8afe2cdb45cc4988fe57f6c0b2ce1c..409ec35b6d140310020a01c5c564d3a6acc6738e 100644 (file)
@@ -34,6 +34,7 @@ CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_CLK_ZYNQMP=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
 CONFIG_DM_GPIO=y
index ac565ecf8f9cde7547e7e807cc2f34d25e3a4a1c..34d74cbdfea200cc4cedf09833b1759c1bdf7f20 100644 (file)
@@ -34,6 +34,7 @@ CONFIG_OF_EMBED=y
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_CLK_ZYNQMP=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
 CONFIG_DM_GPIO=y
index 1df5b0b5c6f98510431f931c37fd51bdd9958c52..867d8337f6571b5d6daf57551a7fe2af649d9f8e 100644 (file)
@@ -48,6 +48,7 @@ CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SCSI_AHCI=y
 CONFIG_SATA_CEVA=y
+CONFIG_CLK_ZYNQMP=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
index c8a8362148d535d2e6a62474b34731790fc0bf53..db46d013ede8243a9503b251bd56c4f2e4650984 100644 (file)
@@ -48,6 +48,7 @@ CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SCSI_AHCI=y
 CONFIG_SATA_CEVA=y
+CONFIG_CLK_ZYNQMP=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
index 8f85b5f6758e5a4e3e62f9e7c01bac536eff6604..e551e44f2ea6eb6ea8e6f319676ea688f0a9022f 100644 (file)
@@ -48,6 +48,7 @@ CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SCSI_AHCI=y
 CONFIG_SATA_CEVA=y
+CONFIG_CLK_ZYNQMP=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y