diff --git a/arch/arm/mach-msm/devices-8960.c b/arch/arm/mach-msm/devices-8960.c index cc1264da955..ffe273e32a4 100644 --- a/arch/arm/mach-msm/devices-8960.c +++ b/arch/arm/mach-msm/devices-8960.c @@ -1780,7 +1780,7 @@ static struct msm_bus_vectors grp3d_low_vectors[] = { .src = MSM_BUS_MASTER_GRAPHICS_3D, .dst = MSM_BUS_SLAVE_EBI_CH0, .ab = 0, - .ib = 1200000000U, + .ib = KGSL_CONVERT_TO_MBPS(1200), }, }; @@ -1789,7 +1789,7 @@ static struct msm_bus_vectors grp3d_nominal_low_vectors[] = { .src = MSM_BUS_MASTER_GRAPHICS_3D, .dst = MSM_BUS_SLAVE_EBI_CH0, .ab = 0, - .ib = 2048000000U, + .ib = KGSL_CONVERT_TO_MBPS(2048), }, }; @@ -1798,7 +1798,7 @@ static struct msm_bus_vectors grp3d_nominal_high_vectors[] = { .src = MSM_BUS_MASTER_GRAPHICS_3D, .dst = MSM_BUS_SLAVE_EBI_CH0, .ab = 0, - .ib = 2656000000U, + .ib = KGSL_CONVERT_TO_MBPS(2656), }, }; @@ -1807,7 +1807,7 @@ static struct msm_bus_vectors grp3d_max_vectors[] = { .src = MSM_BUS_MASTER_GRAPHICS_3D, .dst = MSM_BUS_SLAVE_EBI_CH0, .ab = 0, - .ib = 3968000000U, + .ib = KGSL_CONVERT_TO_MBPS(3968), }, }; @@ -1854,7 +1854,7 @@ static struct msm_bus_vectors grp2d0_max_vectors[] = { .src = MSM_BUS_MASTER_GRAPHICS_2D_CORE0, .dst = MSM_BUS_SLAVE_EBI_CH0, .ab = 0, - .ib = 204800000U, + .ib = KGSL_CONVERT_TO_MBPS(204.8), }, }; @@ -1889,7 +1889,7 @@ static struct msm_bus_vectors grp2d1_max_vectors[] = { .src = MSM_BUS_MASTER_GRAPHICS_2D_CORE1, .dst = MSM_BUS_SLAVE_EBI_CH0, .ab = 0, - .ib = 204800000U, + .ib = KGSL_CONVERT_TO_MBPS(204.8), }, }; diff --git a/arch/arm/mach-msm/devices-msm8x60.c b/arch/arm/mach-msm/devices-msm8x60.c index 8280aa07c68..2b15967731b 100644 --- a/arch/arm/mach-msm/devices-msm8x60.c +++ b/arch/arm/mach-msm/devices-msm8x60.c @@ -489,7 +489,7 @@ static struct msm_bus_vectors grp3d_low_vectors[] = { .src = MSM_BUS_MASTER_GRAPHICS_3D, .dst = MSM_BUS_SLAVE_EBI_CH0, .ab = 0, - .ib = 990000000U, + .ib = KGSL_CONVERT_TO_MBPS(990), }, }; @@ -498,7 +498,7 @@ static struct msm_bus_vectors grp3d_nominal_low_vectors[] = { .src = MSM_BUS_MASTER_GRAPHICS_3D, .dst = MSM_BUS_SLAVE_EBI_CH0, .ab = 0, - .ib = 1300000000U, + .ib = KGSL_CONVERT_TO_MBPS(1300), }, }; @@ -507,7 +507,7 @@ static struct msm_bus_vectors grp3d_nominal_high_vectors[] = { .src = MSM_BUS_MASTER_GRAPHICS_3D, .dst = MSM_BUS_SLAVE_EBI_CH0, .ab = 0, - .ib = 2008000000U, + .ib = KGSL_CONVERT_TO_MBPS(2008), }, }; @@ -516,7 +516,7 @@ static struct msm_bus_vectors grp3d_max_vectors[] = { .src = MSM_BUS_MASTER_GRAPHICS_3D, .dst = MSM_BUS_SLAVE_EBI_CH0, .ab = 0, - .ib = 2484000000U, + .ib = KGSL_CONVERT_TO_MBPS(2484), }, }; @@ -563,7 +563,7 @@ static struct msm_bus_vectors grp2d0_max_vectors[] = { .src = MSM_BUS_MASTER_GRAPHICS_2D_CORE0, .dst = MSM_BUS_SLAVE_EBI_CH0, .ab = 0, - .ib = 990000000U, + .ib = KGSL_CONVERT_TO_MBPS(990), }, }; @@ -598,7 +598,7 @@ static struct msm_bus_vectors grp2d1_max_vectors[] = { .src = MSM_BUS_MASTER_GRAPHICS_2D_CORE1, .dst = MSM_BUS_SLAVE_EBI_CH0, .ab = 0, - .ib = 990000000U, + .ib = KGSL_CONVERT_TO_MBPS(990), }, }; diff --git a/include/linux/msm_kgsl.h b/include/linux/msm_kgsl.h index ae26f2700b3..b55cfe18f43 100644 --- a/include/linux/msm_kgsl.h +++ b/include/linux/msm_kgsl.h @@ -27,6 +27,9 @@ #define KGSL_MAX_PWRLEVELS 5 +#define KGSL_CONVERT_TO_MBPS(val) \ + (val*1000*1000U) + /* device id */ enum kgsl_deviceid { KGSL_DEVICE_3D0 = 0x00000000,