mmc: zynq_sdhci: Change node_id prototype to u32
In Versal platform power domain node_id is bigger than u8, hence change prototype to u32 to accommodate. Change u8 to u32 in the function prototypes that use node_id and remove casting to u32 from xilinx_pm_request() call parameters. Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@amd.com> Link: https://lore.kernel.org/r/20220930092548.18453-2-ashok.reddy.soma@amd.com Signed-off-by: Michal Simek <michal.simek@amd.com>
This commit is contained in:

committed by
Michal Simek

parent
9a082d2548
commit
cbdee4d5e8
@@ -111,7 +111,7 @@ static const u8 mode2timing[] = {
|
|||||||
[MMC_HS_200] = MMC_TIMING_MMC_HS200,
|
[MMC_HS_200] = MMC_TIMING_MMC_HS200,
|
||||||
};
|
};
|
||||||
|
|
||||||
static inline int arasan_zynqmp_set_in_tapdelay(u8 node_id, u32 itap_delay)
|
static inline int arasan_zynqmp_set_in_tapdelay(u32 node_id, u32 itap_delay)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
@@ -155,7 +155,7 @@ static inline int arasan_zynqmp_set_in_tapdelay(u8 node_id, u32 itap_delay)
|
|||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
} else {
|
} else {
|
||||||
return xilinx_pm_request(PM_IOCTL, (u32)node_id,
|
return xilinx_pm_request(PM_IOCTL, node_id,
|
||||||
IOCTL_SET_SD_TAPDELAY,
|
IOCTL_SET_SD_TAPDELAY,
|
||||||
PM_TAPDELAY_INPUT, itap_delay, NULL);
|
PM_TAPDELAY_INPUT, itap_delay, NULL);
|
||||||
}
|
}
|
||||||
@@ -163,7 +163,7 @@ static inline int arasan_zynqmp_set_in_tapdelay(u8 node_id, u32 itap_delay)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int arasan_zynqmp_set_out_tapdelay(u8 node_id, u32 otap_delay)
|
static inline int arasan_zynqmp_set_out_tapdelay(u32 node_id, u32 otap_delay)
|
||||||
{
|
{
|
||||||
if (IS_ENABLED(CONFIG_SPL_BUILD) || current_el() == 3) {
|
if (IS_ENABLED(CONFIG_SPL_BUILD) || current_el() == 3) {
|
||||||
if (node_id == NODE_SD_0)
|
if (node_id == NODE_SD_0)
|
||||||
@@ -174,13 +174,13 @@ static inline int arasan_zynqmp_set_out_tapdelay(u8 node_id, u32 otap_delay)
|
|||||||
return zynqmp_mmio_write(SD_OTAP_DLY, SD1_OTAPDLYSEL_MASK,
|
return zynqmp_mmio_write(SD_OTAP_DLY, SD1_OTAPDLYSEL_MASK,
|
||||||
(otap_delay << 16));
|
(otap_delay << 16));
|
||||||
} else {
|
} else {
|
||||||
return xilinx_pm_request(PM_IOCTL, (u32)node_id,
|
return xilinx_pm_request(PM_IOCTL, node_id,
|
||||||
IOCTL_SET_SD_TAPDELAY,
|
IOCTL_SET_SD_TAPDELAY,
|
||||||
PM_TAPDELAY_OUTPUT, otap_delay, NULL);
|
PM_TAPDELAY_OUTPUT, otap_delay, NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int zynqmp_dll_reset(u8 node_id, u32 type)
|
static inline int zynqmp_dll_reset(u32 node_id, u32 type)
|
||||||
{
|
{
|
||||||
if (IS_ENABLED(CONFIG_SPL_BUILD) || current_el() == 3) {
|
if (IS_ENABLED(CONFIG_SPL_BUILD) || current_el() == 3) {
|
||||||
if (node_id == NODE_SD_0)
|
if (node_id == NODE_SD_0)
|
||||||
@@ -192,12 +192,12 @@ static inline int zynqmp_dll_reset(u8 node_id, u32 type)
|
|||||||
type == PM_DLL_RESET_ASSERT ?
|
type == PM_DLL_RESET_ASSERT ?
|
||||||
SD1_DLL_RST : 0);
|
SD1_DLL_RST : 0);
|
||||||
} else {
|
} else {
|
||||||
return xilinx_pm_request(PM_IOCTL, (u32)node_id,
|
return xilinx_pm_request(PM_IOCTL, node_id,
|
||||||
IOCTL_SD_DLL_RESET, type, 0, NULL);
|
IOCTL_SD_DLL_RESET, type, 0, NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static int arasan_zynqmp_dll_reset(struct sdhci_host *host, u8 node_id)
|
static int arasan_zynqmp_dll_reset(struct sdhci_host *host, u32 node_id)
|
||||||
{
|
{
|
||||||
struct mmc *mmc = (struct mmc *)host->mmc;
|
struct mmc *mmc = (struct mmc *)host->mmc;
|
||||||
struct udevice *dev = mmc->dev;
|
struct udevice *dev = mmc->dev;
|
||||||
|
Reference in New Issue
Block a user