Skip to content

Commit 24d3075

Browse files
committed
hal_nxp: Revert i.mx943 clock driver to old version
The i.mx943 clock driver requires the SDK SCMI driver, but Zephyr has its own SCMI implementation. Further discussion may be needed. Temporarily rollback this driver version. Signed-off-by: Zhaoxiang Jin <Zhaoxiang.Jin_1@nxp.com>
1 parent 0f55657 commit 24d3075

File tree

2 files changed

+435
-435
lines changed

2 files changed

+435
-435
lines changed

mcux/mcux-sdk-ng/devices/i.MX/i.MX943/MIMX94398/drivers/fsl_clock.c

Lines changed: 0 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@
44
* SPDX-License-Identifier: BSD-3-Clause
55
*/
66
#include "fsl_clock.h"
7-
#ifdef CONFIG_DIRECT
87
#include "fsl_fract_pll.h"
98
#include "fsl_fro.h"
109
#include "fsl_ccm.h"
1110
#include "fsl_power.h"
1211
#include "fsl_src.h"
13-
#endif
1412

1513
/*******************************************************************************
1614
* Definitions
@@ -784,7 +782,6 @@ const ccm_cgc_attr_t g_clockCgcAttr[CLOCK_NUM_CGC] =
784782
}
785783
};
786784

787-
#ifdef CONFIG_DIRECT
788785
uint64_t CLOCK_GetSourceFreq(uint32_t sourceIdx);
789786

790787
uint64_t CLOCK_GetIpFreq(clock_root_t name)
@@ -1568,118 +1565,4 @@ bool CLOCK_SourceSetEnable(uint32_t sourceIdx, bool enable)
15681565
return updateEnable;
15691566
}
15701567

1571-
#else
1572-
status_t CLOCK_EnableClock(clock_ip_name_t clkId)
1573-
{
1574-
uint32_t channel = SCMI_A2P;
1575-
uint32_t clockId = (uint32_t)clkId;
1576-
uint32_t attributes = SCMI_CLOCK_CONFIG_SET_ENABLE(SCMI_CLOCK_STATE_ENABLE);
1577-
uint32_t oemConfigVal = 0U;
1578-
int32_t result = SCMI_ERR_SUCCESS;
1579-
status_t status = kStatus_Success;
1580-
1581-
if (clkId == kCLOCK_IpInvalid)
1582-
{
1583-
return kStatus_InvalidArgument;
1584-
}
1585-
result = SCMI_ClockConfigSet(channel, clockId, attributes, oemConfigVal);
1586-
if (result != SCMI_ERR_SUCCESS)
1587-
{
1588-
status = kStatus_Fail;
1589-
}
1590-
1591-
return status;
1592-
}
1593-
1594-
status_t CLOCK_DisableClock(clock_ip_name_t clkId)
1595-
{
1596-
uint32_t channel = SCMI_A2P;
1597-
uint32_t clockId = (uint32_t)clkId;
1598-
uint32_t attributes = SCMI_CLOCK_CONFIG_SET_ENABLE(SCMI_CLOCK_STATE_DISABLE);
1599-
uint32_t oemConfigVal = 0U;
1600-
int32_t result = SCMI_ERR_SUCCESS;
1601-
status_t status = kStatus_Success;
1602-
1603-
if (clkId == kCLOCK_IpInvalid)
1604-
{
1605-
return kStatus_InvalidArgument;
1606-
}
1607-
result = SCMI_ClockConfigSet(channel, clockId, attributes, oemConfigVal);
1608-
if (result != SCMI_ERR_SUCCESS)
1609-
{
1610-
status = kStatus_Fail;
1611-
}
1612-
1613-
return status;
1614-
}
1615-
1616-
status_t CLOCK_SetRate(clk_t *clk)
1617-
{
1618-
uint32_t channel = SCMI_A2P;
1619-
uint32_t clockId = (uint32_t)clk->clkId;
1620-
uint32_t flags = SCMI_CLOCK_RATE_FLAGS_ROUND(clk->clkRoundOpt);
1621-
scmi_clock_rate_t rate = {0, 0};
1622-
int32_t result = SCMI_ERR_SUCCESS;
1623-
status_t status = kStatus_Success;
1624-
1625-
if (clk->clkId == kCLOCK_IpInvalid)
1626-
{
1627-
return kStatus_InvalidArgument;
1628-
}
1629-
rate.lower = clk->rate & 0xFFFFFFFF;
1630-
rate.upper = (clk->rate >> 32U) & 0xFFFFFFFF;
1631-
1632-
result = SCMI_ClockRateSet(channel, clockId, flags, rate);
1633-
if (result != SCMI_ERR_SUCCESS)
1634-
{
1635-
status = kStatus_Fail;
1636-
}
1637-
1638-
return status;
1639-
}
1640-
1641-
uint64_t CLOCK_GetRate(clock_ip_name_t clkId)
1642-
{
1643-
scmi_clock_rate_t rate = {0, 0};
1644-
uint32_t channel = SCMI_A2P;
1645-
uint32_t clockId = (uint32_t)clkId;
1646-
int32_t result = SCMI_ERR_SUCCESS;
1647-
1648-
if (clkId == kCLOCK_IpInvalid)
1649-
{
1650-
return 0ULL;
1651-
}
1652-
1653-
result = SCMI_ClockRateGet(channel, clockId, &rate);
1654-
if (result != SCMI_ERR_SUCCESS)
1655-
{
1656-
return 0ULL;
1657-
}
1658-
1659-
return rate.lower | ((uint64_t)(rate.upper) << 32U);
1660-
}
1661-
1662-
status_t CLOCK_SetParent(clk_t *clk)
1663-
{
1664-
uint32_t channel = SCMI_A2P;
1665-
uint32_t clockId = (uint32_t)clk->clkId;
1666-
uint32_t parentId = (uint32_t)clk->pclkId;
1667-
int32_t result = SCMI_ERR_SUCCESS;
1668-
status_t status = kStatus_Success;
1669-
1670-
if (clk->clkId == kCLOCK_IpInvalid || clk->pclkId == kCLOCK_IpInvalid)
1671-
{
1672-
return kStatus_InvalidArgument;
1673-
}
1674-
1675-
result = SCMI_ClockParentSet(channel, clockId, parentId);
1676-
if (result != SCMI_ERR_SUCCESS)
1677-
{
1678-
status = kStatus_Fail;
1679-
}
1680-
1681-
return status;
1682-
}
1683-
1684-
#endif
16851568

0 commit comments

Comments
 (0)