diff options
-rw-r--r-- | drivers/misc/pch_phub.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/misc/pch_phub.c b/drivers/misc/pch_phub.c index 0fd7e77bee29..61ece53f2f41 100644 --- a/drivers/misc/pch_phub.c +++ b/drivers/misc/pch_phub.c | |||
@@ -90,6 +90,7 @@ | |||
90 | #define PCH_PHUB_INTPIN_REG_WPERMIT_REG3 0x002C | 90 | #define PCH_PHUB_INTPIN_REG_WPERMIT_REG3 0x002C |
91 | #define PCH_PHUB_INT_REDUCE_CONTROL_REG_BASE 0x0040 | 91 | #define PCH_PHUB_INT_REDUCE_CONTROL_REG_BASE 0x0040 |
92 | #define CLKCFG_REG_OFFSET 0x500 | 92 | #define CLKCFG_REG_OFFSET 0x500 |
93 | #define FUNCSEL_REG_OFFSET 0x508 | ||
93 | 94 | ||
94 | #define PCH_PHUB_OROM_SIZE 15360 | 95 | #define PCH_PHUB_OROM_SIZE 15360 |
95 | 96 | ||
@@ -108,6 +109,7 @@ | |||
108 | * @intpin_reg_wpermit_reg3: INTPIN_REG_WPERMIT register 3 val | 109 | * @intpin_reg_wpermit_reg3: INTPIN_REG_WPERMIT register 3 val |
109 | * @int_reduce_control_reg: INT_REDUCE_CONTROL registers val | 110 | * @int_reduce_control_reg: INT_REDUCE_CONTROL registers val |
110 | * @clkcfg_reg: CLK CFG register val | 111 | * @clkcfg_reg: CLK CFG register val |
112 | * @funcsel_reg: Function select register value | ||
111 | * @pch_phub_base_address: Register base address | 113 | * @pch_phub_base_address: Register base address |
112 | * @pch_phub_extrom_base_address: external rom base address | 114 | * @pch_phub_extrom_base_address: external rom base address |
113 | * @pch_mac_start_address: MAC address area start address | 115 | * @pch_mac_start_address: MAC address area start address |
@@ -128,6 +130,7 @@ struct pch_phub_reg { | |||
128 | u32 intpin_reg_wpermit_reg3; | 130 | u32 intpin_reg_wpermit_reg3; |
129 | u32 int_reduce_control_reg[MAX_NUM_INT_REDUCE_CONTROL_REG]; | 131 | u32 int_reduce_control_reg[MAX_NUM_INT_REDUCE_CONTROL_REG]; |
130 | u32 clkcfg_reg; | 132 | u32 clkcfg_reg; |
133 | u32 funcsel_reg; | ||
131 | void __iomem *pch_phub_base_address; | 134 | void __iomem *pch_phub_base_address; |
132 | void __iomem *pch_phub_extrom_base_address; | 135 | void __iomem *pch_phub_extrom_base_address; |
133 | u32 pch_mac_start_address; | 136 | u32 pch_mac_start_address; |
@@ -211,6 +214,8 @@ static void pch_phub_save_reg_conf(struct pci_dev *pdev) | |||
211 | __func__, i, chip->int_reduce_control_reg[i]); | 214 | __func__, i, chip->int_reduce_control_reg[i]); |
212 | } | 215 | } |
213 | chip->clkcfg_reg = ioread32(p + CLKCFG_REG_OFFSET); | 216 | chip->clkcfg_reg = ioread32(p + CLKCFG_REG_OFFSET); |
217 | if ((chip->ioh_type == 2) || (chip->ioh_type == 4)) | ||
218 | chip->funcsel_reg = ioread32(p + FUNCSEL_REG_OFFSET); | ||
214 | } | 219 | } |
215 | 220 | ||
216 | /* pch_phub_restore_reg_conf - restore register configuration */ | 221 | /* pch_phub_restore_reg_conf - restore register configuration */ |
@@ -271,6 +276,8 @@ static void pch_phub_restore_reg_conf(struct pci_dev *pdev) | |||
271 | } | 276 | } |
272 | 277 | ||
273 | iowrite32(chip->clkcfg_reg, p + CLKCFG_REG_OFFSET); | 278 | iowrite32(chip->clkcfg_reg, p + CLKCFG_REG_OFFSET); |
279 | if ((chip->ioh_type == 2) || (chip->ioh_type == 4)) | ||
280 | iowrite32(chip->funcsel_reg, p + FUNCSEL_REG_OFFSET); | ||
274 | } | 281 | } |
275 | 282 | ||
276 | /** | 283 | /** |