Commit 88e1d0b1 authored by Manish Narani's avatar Manish Narani Committed by Ulf Hansson

mmc: sdhci-of-arasan: fix timings allocation code

The initial code that was adding delays was doing a cast over undefined
memory. This meant that the delays would be all gibberish.

This change, allocates all delays on the stack, and assigns them from the
ZynqMP & Versal macros/phase-list. And then finally copies them over the
common iclk_phase & oclk_phase variables.
Signed-off-by: default avatarManish Narani <manish.narani@xilinx.com>
Link: https://lore.kernel.org/r/1594753953-62980-1-git-send-email-manish.narani@xilinx.comSigned-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 907be2a6
...@@ -1025,7 +1025,6 @@ static void arasan_dt_read_clk_phase(struct device *dev, ...@@ -1025,7 +1025,6 @@ static void arasan_dt_read_clk_phase(struct device *dev,
static void arasan_dt_parse_clk_phases(struct device *dev, static void arasan_dt_parse_clk_phases(struct device *dev,
struct sdhci_arasan_clk_data *clk_data) struct sdhci_arasan_clk_data *clk_data)
{ {
int *iclk_phase, *oclk_phase;
u32 mio_bank = 0; u32 mio_bank = 0;
int i; int i;
...@@ -1037,28 +1036,32 @@ static void arasan_dt_parse_clk_phases(struct device *dev, ...@@ -1037,28 +1036,32 @@ static void arasan_dt_parse_clk_phases(struct device *dev,
clk_data->set_clk_delays = sdhci_arasan_set_clk_delays; clk_data->set_clk_delays = sdhci_arasan_set_clk_delays;
if (of_device_is_compatible(dev->of_node, "xlnx,zynqmp-8.9a")) { if (of_device_is_compatible(dev->of_node, "xlnx,zynqmp-8.9a")) {
iclk_phase = (int [MMC_TIMING_MMC_HS400 + 1]) ZYNQMP_ICLK_PHASE; u32 zynqmp_iclk_phase[MMC_TIMING_MMC_HS400 + 1] =
oclk_phase = (int [MMC_TIMING_MMC_HS400 + 1]) ZYNQMP_OCLK_PHASE; ZYNQMP_ICLK_PHASE;
u32 zynqmp_oclk_phase[MMC_TIMING_MMC_HS400 + 1] =
ZYNQMP_OCLK_PHASE;
of_property_read_u32(dev->of_node, "xlnx,mio-bank", &mio_bank); of_property_read_u32(dev->of_node, "xlnx,mio-bank", &mio_bank);
if (mio_bank == 2) { if (mio_bank == 2) {
oclk_phase[MMC_TIMING_UHS_SDR104] = 90; zynqmp_oclk_phase[MMC_TIMING_UHS_SDR104] = 90;
oclk_phase[MMC_TIMING_MMC_HS200] = 90; zynqmp_oclk_phase[MMC_TIMING_MMC_HS200] = 90;
} }
for (i = 0; i <= MMC_TIMING_MMC_HS400; i++) { for (i = 0; i <= MMC_TIMING_MMC_HS400; i++) {
clk_data->clk_phase_in[i] = iclk_phase[i]; clk_data->clk_phase_in[i] = zynqmp_iclk_phase[i];
clk_data->clk_phase_out[i] = oclk_phase[i]; clk_data->clk_phase_out[i] = zynqmp_oclk_phase[i];
} }
} }
if (of_device_is_compatible(dev->of_node, "xlnx,versal-8.9a")) { if (of_device_is_compatible(dev->of_node, "xlnx,versal-8.9a")) {
iclk_phase = (int [MMC_TIMING_MMC_HS400 + 1]) VERSAL_ICLK_PHASE; u32 versal_iclk_phase[MMC_TIMING_MMC_HS400 + 1] =
oclk_phase = (int [MMC_TIMING_MMC_HS400 + 1]) VERSAL_OCLK_PHASE; VERSAL_ICLK_PHASE;
u32 versal_oclk_phase[MMC_TIMING_MMC_HS400 + 1] =
VERSAL_OCLK_PHASE;
for (i = 0; i <= MMC_TIMING_MMC_HS400; i++) { for (i = 0; i <= MMC_TIMING_MMC_HS400; i++) {
clk_data->clk_phase_in[i] = iclk_phase[i]; clk_data->clk_phase_in[i] = versal_iclk_phase[i];
clk_data->clk_phase_out[i] = oclk_phase[i]; clk_data->clk_phase_out[i] = versal_oclk_phase[i];
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment