Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
mmc: dw_mmc: Remove bus_hz from struct dw_mci_board
struct dw_mci already keeps one, reuse it. Now, as dw_mmc-pci still
provide struct dw_mci_board, so host->bus_hz will not be overwritten.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
authored by
Shawn Lin
and committed by
Ulf Hansson
ec6d8bb3
d3fcd636
+5
-9
+1
-1
drivers/mmc/host/dw_mmc-pci.c
+1
-1
drivers/mmc/host/dw_mmc-pci.c
···
26
26
27
27
static struct dw_mci_board pci_board_data = {
28
28
.caps = DW_MCI_CAPABILITIES,
29
-
.bus_hz = 33 * 1000 * 1000,
30
29
};
31
30
32
31
static int dw_mci_pci_probe(struct pci_dev *pdev,
···
47
48
host->pdata = &pci_board_data;
48
49
host->fifo_depth = 32;
49
50
host->detect_delay_ms = 200;
51
+
host->bus_hz = 33 * 1000 * 1000;
50
52
51
53
ret = pcim_iomap_regions(pdev, 1 << PCI_BAR_NO, pci_name(pdev));
52
54
if (ret)
+4
-6
drivers/mmc/host/dw_mmc.c
+4
-6
drivers/mmc/host/dw_mmc.c
···
3183
3183
host->wm_aligned = true;
3184
3184
3185
3185
if (!device_property_read_u32(dev, "clock-frequency", &clock_frequency))
3186
-
pdata->bus_hz = clock_frequency;
3186
+
host->bus_hz = clock_frequency;
3187
3187
3188
3188
if (drv_data && drv_data->parse_dt) {
3189
3189
ret = drv_data->parse_dt(host);
···
3273
3273
ret = PTR_ERR(host->ciu_clk);
3274
3274
if (ret == -EPROBE_DEFER)
3275
3275
goto err_clk_biu;
3276
-
3277
-
host->bus_hz = host->pdata->bus_hz;
3278
3276
} else {
3279
3277
ret = clk_prepare_enable(host->ciu_clk);
3280
3278
if (ret) {
···
3280
3282
goto err_clk_biu;
3281
3283
}
3282
3284
3283
-
if (host->pdata->bus_hz) {
3284
-
ret = clk_set_rate(host->ciu_clk, host->pdata->bus_hz);
3285
+
if (host->bus_hz) {
3286
+
ret = clk_set_rate(host->ciu_clk, host->bus_hz);
3285
3287
if (ret)
3286
3288
dev_warn(host->dev,
3287
3289
"Unable to set bus rate to %uHz\n",
3288
-
host->pdata->bus_hz);
3290
+
host->bus_hz);
3289
3291
}
3290
3292
host->bus_hz = clk_get_rate(host->ciu_clk);
3291
3293
}