diff options
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/db8500-prcmu.c | 4 | ||||
-rw-r--r-- | drivers/mfd/rts5227.c | 2 | ||||
-rw-r--r-- | drivers/mfd/syscon.c | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index f7460383d4be..53f371dcbb6e 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c | |||
@@ -3094,6 +3094,10 @@ static struct mfd_cell db8500_prcmu_devs[] = { | |||
3094 | .pdata_size = sizeof(db8500_cpufreq_table), | 3094 | .pdata_size = sizeof(db8500_cpufreq_table), |
3095 | }, | 3095 | }, |
3096 | { | 3096 | { |
3097 | .name = "cpuidle-dbx500", | ||
3098 | .of_compatible = "stericsson,cpuidle-dbx500", | ||
3099 | }, | ||
3100 | { | ||
3097 | .name = "db8500-thermal", | 3101 | .name = "db8500-thermal", |
3098 | .num_resources = ARRAY_SIZE(db8500_thsens_resources), | 3102 | .num_resources = ARRAY_SIZE(db8500_thsens_resources), |
3099 | .resources = db8500_thsens_resources, | 3103 | .resources = db8500_thsens_resources, |
diff --git a/drivers/mfd/rts5227.c b/drivers/mfd/rts5227.c index c001151378b2..9c8eec80ceed 100644 --- a/drivers/mfd/rts5227.c +++ b/drivers/mfd/rts5227.c | |||
@@ -110,7 +110,7 @@ static int rts5227_extra_init_hw(struct rtsx_pcr *pcr) | |||
110 | rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, OLT_LED_CTL, 0x0F, 0x02); | 110 | rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, OLT_LED_CTL, 0x0F, 0x02); |
111 | /* Configure LTR */ | 111 | /* Configure LTR */ |
112 | pcie_capability_read_word(pcr->pci, PCI_EXP_DEVCTL2, &cap); | 112 | pcie_capability_read_word(pcr->pci, PCI_EXP_DEVCTL2, &cap); |
113 | if (cap & PCI_EXP_LTR_EN) | 113 | if (cap & PCI_EXP_DEVCTL2_LTR_EN) |
114 | rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, LTR_CTL, 0xFF, 0xA3); | 114 | rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, LTR_CTL, 0xFF, 0xA3); |
115 | /* Configure OBFF */ | 115 | /* Configure OBFF */ |
116 | rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, OBFF_CFG, 0x03, 0x03); | 116 | rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, OBFF_CFG, 0x03, 0x03); |
diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c index 27db1f92bb26..71841f9181bd 100644 --- a/drivers/mfd/syscon.c +++ b/drivers/mfd/syscon.c | |||
@@ -159,9 +159,6 @@ static int syscon_probe(struct platform_device *pdev) | |||
159 | 159 | ||
160 | static const struct platform_device_id syscon_ids[] = { | 160 | static const struct platform_device_id syscon_ids[] = { |
161 | { "syscon", }, | 161 | { "syscon", }, |
162 | #ifdef CONFIG_ARCH_CLPS711X | ||
163 | { "clps711x-syscon", }, | ||
164 | #endif | ||
165 | { } | 162 | { } |
166 | }; | 163 | }; |
167 | 164 | ||