diff options
| -rw-r--r-- | arch/arm/mach-omap2/clockdomains44xx_data.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/prcm_mpu44xx.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/clockdomains44xx_data.c b/arch/arm/mach-omap2/clockdomains44xx_data.c index 10622c914abc..3d1c06b1676c 100644 --- a/arch/arm/mach-omap2/clockdomains44xx_data.c +++ b/arch/arm/mach-omap2/clockdomains44xx_data.c | |||
| @@ -150,7 +150,7 @@ static struct clockdomain mpu0_44xx_clkdm = { | |||
| 150 | .pwrdm = { .name = "cpu0_pwrdm" }, | 150 | .pwrdm = { .name = "cpu0_pwrdm" }, |
| 151 | .prcm_partition = OMAP4430_PRCM_MPU_PARTITION, | 151 | .prcm_partition = OMAP4430_PRCM_MPU_PARTITION, |
| 152 | .cm_inst = OMAP4430_PRCM_MPU_CPU0_INST, | 152 | .cm_inst = OMAP4430_PRCM_MPU_CPU0_INST, |
| 153 | .clkdm_offs = OMAP4430_PRCM_MPU_CPU0_MPU_CDOFFS, | 153 | .clkdm_offs = OMAP4430_PRCM_MPU_CPU0_CPU0_CDOFFS, |
| 154 | .flags = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP, | 154 | .flags = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP, |
| 155 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), | 155 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), |
| 156 | }; | 156 | }; |
| @@ -160,7 +160,7 @@ static struct clockdomain mpu1_44xx_clkdm = { | |||
| 160 | .pwrdm = { .name = "cpu1_pwrdm" }, | 160 | .pwrdm = { .name = "cpu1_pwrdm" }, |
| 161 | .prcm_partition = OMAP4430_PRCM_MPU_PARTITION, | 161 | .prcm_partition = OMAP4430_PRCM_MPU_PARTITION, |
| 162 | .cm_inst = OMAP4430_PRCM_MPU_CPU1_INST, | 162 | .cm_inst = OMAP4430_PRCM_MPU_CPU1_INST, |
| 163 | .clkdm_offs = OMAP4430_PRCM_MPU_CPU1_MPU_CDOFFS, | 163 | .clkdm_offs = OMAP4430_PRCM_MPU_CPU1_CPU1_CDOFFS, |
| 164 | .flags = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP, | 164 | .flags = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP, |
| 165 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), | 165 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), |
| 166 | }; | 166 | }; |
diff --git a/arch/arm/mach-omap2/prcm_mpu44xx.h b/arch/arm/mach-omap2/prcm_mpu44xx.h index 3300ff6e3cfe..d22d1b43bccd 100644 --- a/arch/arm/mach-omap2/prcm_mpu44xx.h +++ b/arch/arm/mach-omap2/prcm_mpu44xx.h | |||
| @@ -38,8 +38,8 @@ | |||
| 38 | #define OMAP4430_PRCM_MPU_CPU1_INST 0x0800 | 38 | #define OMAP4430_PRCM_MPU_CPU1_INST 0x0800 |
| 39 | 39 | ||
| 40 | /* PRCM_MPU clockdomain register offsets (from instance start) */ | 40 | /* PRCM_MPU clockdomain register offsets (from instance start) */ |
| 41 | #define OMAP4430_PRCM_MPU_CPU0_MPU_CDOFFS 0x0018 | 41 | #define OMAP4430_PRCM_MPU_CPU0_CPU0_CDOFFS 0x0018 |
| 42 | #define OMAP4430_PRCM_MPU_CPU1_MPU_CDOFFS 0x0018 | 42 | #define OMAP4430_PRCM_MPU_CPU1_CPU1_CDOFFS 0x0018 |
| 43 | 43 | ||
| 44 | 44 | ||
| 45 | /* | 45 | /* |
