summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-10-19 17:40:11 +0200
committerArnd Bergmann <arnd@arndb.de>2017-10-19 17:40:11 +0200
commit840907f94117f7a77846a8cfe3bca6ecabc0abe5 (patch)
tree6bc562d4361ce39e9a9e2eb8b96e6fec3ebc9afd /include
parentca7325a2b1fb6bba48e13afe4dce070e29467cc5 (diff)
parent2bbbd96357ce76cc45ec722c00f654aa7b189112 (diff)
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')
-rw-r--r--include/linux/mbus.h4
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];
};