diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2017-10-19 17:40:11 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-19 17:40:11 +0200 |
| commit | 840907f94117f7a77846a8cfe3bca6ecabc0abe5 (patch) | |
| tree | 6bc562d4361ce39e9a9e2eb8b96e6fec3ebc9afd /include/linux | |
| parent | Merge tag 'at91-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into fixes (diff) | |
| parent | bus: mbus: fix window size calculation for 4GB windows (diff) | |
| download | linux-dev-840907f94117f7a77846a8cfe3bca6ecabc0abe5.tar.xz linux-dev-840907f94117f7a77846a8cfe3bca6ecabc0abe5.zip | |
Merge tag 'mvebu-fixes-4.14-2' of git://git.infradead.org/linux-mvebu into fixes
Pull "mvebu fixes for 4.14 (part 2)" from Gregory CLEMENT
Two device tree related fixes:
- One on Armada 38x using a other compatible string for I2C in order
to cover an errata.
- One for Armada 7K/8K fixing a typo on interrupt-map property for
PCIe leading to fail PME and AER root port service initialization
And the last one for the mbus fixing the window size calculation when
it exceed 32bits
* tag 'mvebu-fixes-4.14-2' of git://git.infradead.org/linux-mvebu:
bus: mbus: fix window size calculation for 4GB windows
ARM: dts: Fix I2C repeated start issue on Armada-38x
arm64: dts: marvell: fix interrupt-map property for Armada CP110 PCIe controller
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mbus.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mbus.h b/include/linux/mbus.h index 0d3f14fd2621..4773145246ed 100644 --- a/include/linux/mbus.h +++ b/include/linux/mbus.h @@ -31,8 +31,8 @@ struct mbus_dram_target_info struct mbus_dram_window { u8 cs_index; u8 mbus_attr; - u32 base; - u32 size; + u64 base; + u64 size; } cs[4]; }; |