Merge "msm: iomap: Update base address mapping for Copper devices" into msm-3.0
diff --git a/arch/arm/boot/dts/msmcopper.dts b/arch/arm/boot/dts/msmcopper.dts
index e72f4dc..327cce5 100644
--- a/arch/arm/boot/dts/msmcopper.dts
+++ b/arch/arm/boot/dts/msmcopper.dts
@@ -15,15 +15,15 @@
<0xF9002000 0x1000>;
};
- serial@F9684000 {
+ serial@F991F000 {
compatible = "qcom,msm-lsuart-v14";
- reg = <0xF9684000 0x1000>;
+ reg = <0xF991F000 0x1000>;
interrupts = <109>;
};
- usb@F9690000 {
+ usb@F9A55000 {
compatible = "qcom,hsusb-otg";
- reg = <0xF9690000 0x400>;
+ reg = <0xF9A55000 0x400>;
interrupts = <134>;
qcom,hsusb-otg-phy-type = <2>;
@@ -31,10 +31,10 @@
qcom,hsusb-otg-otg-control = <1>;
};
- qcom,sdcc@F9600000 {
+ qcom,sdcc@F980B000 {
cell-index = <1>;
compatible = "qcom,msm-sdcc";
- reg = <0xF9600000 0x1000>;
+ reg = <0xF980B000 0x1000>;
interrupts = <123>;
qcom,sdcc-clk-rates = <400000 24000000 48000000>;
@@ -44,10 +44,10 @@
qcom,sdcc-disable_cmd23;
};
- qcom,sdcc@F9620000 {
+ qcom,sdcc@F984B000 {
cell-index = <3>;
compatible = "qcom,msm-sdcc";
- reg = <0xF9620000 0x1000>;
+ reg = <0xF984B000 0x1000>;
interrupts = <127>;
qcom,sdcc-clk-rates = <400000 24000000 48000000>;
diff --git a/arch/arm/mach-msm/board-copper.c b/arch/arm/mach-msm/board-copper.c
index a2ddeb4..1cc9d7f 100644
--- a/arch/arm/mach-msm/board-copper.c
+++ b/arch/arm/mach-msm/board-copper.c
@@ -91,7 +91,7 @@
};
static struct of_dev_auxdata msm_copper_auxdata_lookup[] __initdata = {
- OF_DEV_AUXDATA("qcom,msm-lsuart-v14", 0xF9684000, \
+ OF_DEV_AUXDATA("qcom,msm-lsuart-v14", 0xF991F000, \
"msm_serial_hsl.0", NULL),
{}
};
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-copper.h b/arch/arm/mach-msm/include/mach/msm_iomap-copper.h
index 57758c3..b62b8cf 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-copper.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-copper.h
@@ -29,7 +29,7 @@
#define COPPER_QGIC_CPU_PHYS 0xF9002000
#define COPPER_QGIC_CPU_SIZE SZ_4K
-#define COPPER_TLMM_PHYS 0xFC4A0000
+#define COPPER_TLMM_PHYS 0xFD400000
#define COPPER_TLMM_SIZE SZ_16K
#define COPPER_TMR_PHYS 0xF900A000
@@ -39,8 +39,8 @@
#define COPPER_TMR0_SIZE SZ_4K
#ifdef CONFIG_DEBUG_MSMCOPPER_UART
-#define MSM_DEBUG_UART_BASE IOMEM(0xFA782000)
-#define MSM_DEBUG_UART_PHYS 0xF9682000
+#define MSM_DEBUG_UART_BASE IOMEM(0xFA71E000)
+#define MSM_DEBUG_UART_PHYS 0xF991E000
#endif
#endif