rockchip: px30: Fix build error
authorAmbroise Vincent <ambroise.vincent@arm.com>
Thu, 25 Jul 2019 15:06:50 +0000 (16:06 +0100)
committerAmbroise Vincent <ambroise.vincent@arm.com>
Thu, 25 Jul 2019 15:14:40 +0000 (16:14 +0100)
"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 93c690eba8ca ("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: Ambroise Vincent <ambroise.vincent@arm.com>
plat/rockchip/px30/drivers/pmu/pmu.c

index a5ed7664e9cafe357c289c2239757ce28a68fb13..0a2515d12836decd87963f9f640e2beeb54b866b 100644 (file)
@@ -626,13 +626,13 @@ static void pvtm_32k_config(void)
 
        /* select pvtm as 32k source */
        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)
 {
        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,
                      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)
 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),
-                     BITS_WITH_WMASK(1, 1, 15));
+                     BITS_WITH_WMASK(1, 1U, 15));
        if (pd)
                mmio_write_32(pll_base + PLL_CON(1),
                              BITS_WITH_WMASK(1, 1, 14));