Commit 8a079e88 authored by Ambroise Vincent's avatar Ambroise Vincent
Browse files

rockchip: px30: Fix build error

"result of '1 << 31' requires 33 bits to represent, but 'int' only has
32 bits [-Werror=shift-overflow=]"

This is treated as an error since commit 93c690eb

 ("Enable
-Wshift-overflow=2 to check for undefined shift behavior")

Only the actual errors are being tackled by this patch. It is up to the
platform to choose whether there needs to be further modifications to
the code.

Change-Id: I70860ae5f2a34d7c684bd491b76da50aa04f778e
Signed-off-by: default avatarAmbroise Vincent <ambroise.vincent@arm.com>
parent 8b6394c9
...@@ -626,13 +626,13 @@ static void pvtm_32k_config(void) ...@@ -626,13 +626,13 @@ static void pvtm_32k_config(void)
/* select pvtm as 32k source */ /* select pvtm as 32k source */
mmio_write_32(PMUCRU_BASE + CRU_PMU_CLKSELS_CON(0), mmio_write_32(PMUCRU_BASE + CRU_PMU_CLKSELS_CON(0),
BITS_WITH_WMASK(1, 0x3, 14)); BITS_WITH_WMASK(1, 0x3U, 14));
} }
static void pvtm_32k_config_restore(void) static void pvtm_32k_config_restore(void)
{ {
mmio_write_32(PMUCRU_BASE + CRU_PMU_CLKSELS_CON(0), mmio_write_32(PMUCRU_BASE + CRU_PMU_CLKSELS_CON(0),
ddr_data.pmu_cru_clksel_con0 | BITS_WMSK(0x3, 14)); ddr_data.pmu_cru_clksel_con0 | BITS_WMSK(0x3U, 14));
mmio_write_32(PMUGRF_BASE + PMUGRF_PVTM_CON0, mmio_write_32(PMUGRF_BASE + PMUGRF_PVTM_CON0,
WITH_16BITS_WMSK(ddr_data.pgrf_pvtm_con[0])); WITH_16BITS_WMSK(ddr_data.pgrf_pvtm_con[0]));
...@@ -869,7 +869,7 @@ static inline void pm_pll_wait_lock(uint32_t pll_base, uint32_t pll_id) ...@@ -869,7 +869,7 @@ static inline void pm_pll_wait_lock(uint32_t pll_base, uint32_t pll_id)
static inline void pll_pwr_ctr(uint32_t pll_base, uint32_t pll_id, uint32_t pd) static inline void pll_pwr_ctr(uint32_t pll_base, uint32_t pll_id, uint32_t pd)
{ {
mmio_write_32(pll_base + PLL_CON(1), mmio_write_32(pll_base + PLL_CON(1),
BITS_WITH_WMASK(1, 1, 15)); BITS_WITH_WMASK(1, 1U, 15));
if (pd) if (pd)
mmio_write_32(pll_base + PLL_CON(1), mmio_write_32(pll_base + PLL_CON(1),
BITS_WITH_WMASK(1, 1, 14)); BITS_WITH_WMASK(1, 1, 14));
......
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