Re: [PATCH 6/8] mmc: use the new

[David Brown]

On Fri, Nov 23, 2012 at 04:08:28PM +0100, Davide Ciminaghi wrote:
> From: Alessandro Rubini 
> 
> Signed-off-by: Alessandro Rubini 
> Acked-by: Giancarlo Asnaghi 
> ---
>  drivers/mmc/host/msm_sdcc.c |    2 +-

Acked-by: David Brown 

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 01/24] MAINTAINERS: remove drivers/platform/msm/

[David Brown]

On Fri, Nov 23, 2012 at 10:26:25PM -0200, Cesar Eduardo Barros wrote:
> Added by commit 8a5700c (add drivers/platform/msm to MSM subsystem) in
> 2011, but I could not find any trace of that directory being ever added
> to the repository.
> 
> Cc: Kenneth Heitke 
> Cc: David Brown 
> Cc: Daniel Walker 
> Cc: Bryan Huntsman 
> Cc: linux-arm-...@vger.kernel.org
> Signed-off-by: Cesar Eduardo Barros 
> ---
>  MAINTAINERS | 1 -

The directory was proposed at one point as a location for platform
data.  The ARM community has since come up with different ways of
doing this.  So, it's fine to remove this.

Acked-by: David Brown 

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 09/10] USB: EHCI: make ehci-msm a separate driver

[David Brown]

manjunath.gou...@linaro.org writes:

> +MODULE_DESCRIPTION(DRIVER_DESC);
> +MODULE_ALIAS("platform:omap-msm");
> +MODULE_LICENSE("GPL");

omap-msm?  I think you mean msm-ehci.

I don't have any hardware to test this on, so hopefully someone can
chime in after testing it.

David

-- 
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 03/19] ARM: msm: proc_comm_boot_wait should not be __init

[David Brown]

Arnd Bergmann  writes:

> msm_smd_probe is a driver probe function and may get
> called after the __init time, so it must not call
> any __init function, as the link-time warning reports.
> Take away the __init annotation on proc_comm_boot_wait
> to fix this.
>
> Without this patch, building msm_defconfig results in:
>
> WARNING: vmlinux.o(.text+0xb048): Section mismatch in reference from the 
> function msm_smd_probe() to the function .init.text:proc_comm_boot_wait()
> The function msm_smd_probe() references
> the function __init proc_comm_boot_wait().
> This is often because msm_smd_probe lacks a __init
> annotation or the annotation of proc_comm_boot_wait is wrong.
>
> Signed-off-by: Arnd Bergmann 
> Cc: David Brown 
> Cc: Bryan Huntsman 
> Cc: Daniel Walker 
> Cc: linux-arm-...@vger.kernel.org
> ---
>  arch/arm/mach-msm/proc_comm.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Arnd, you're welcome to pull this into your tree:
Acked-by: David Brown 

I don't forsee any conflicts with upcoming patches.

David

-- 
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v2 04/11] ssbi: Allow compilation as a module

[David Brown]

The ssbi driver's read/write entry points are protected with wrappers
in the case when the driver isn't enabled.  These wrappers don't make
any sense, since a client of the SSBI bus won't work without it.  Make
these just regular functions, so that the SSBI driver can be built as
a module.

Signed-off-by: David Brown 
---
 drivers/ssbi/Kconfig |  2 +-
 include/linux/msm_ssbi.h | 11 ---
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/drivers/ssbi/Kconfig b/drivers/ssbi/Kconfig
index b57c41b..c7bc534 100644
--- a/drivers/ssbi/Kconfig
+++ b/drivers/ssbi/Kconfig
@@ -5,7 +5,7 @@
 menu "Qualcomm MSM SSBI bus support"
 
 config MSM_SSBI
-   bool "Qualcomm Single-wire Serial Bus Interface (SSBI)"
+   tristate "Qualcomm Single-wire Serial Bus Interface (SSBI)"
help
  If you say yes to this option, support will be included for the
  built-in SSBI interface on Qualcomm MSM family processors.
diff --git a/include/linux/msm_ssbi.h b/include/linux/msm_ssbi.h
index cfa47df..0fe245b 100644
--- a/include/linux/msm_ssbi.h
+++ b/include/linux/msm_ssbi.h
@@ -33,17 +33,6 @@ struct msm_ssbi_platform_data {
enum msm_ssbi_controller_type controller_type;
 };
 
-#ifdef CONFIG_MSM_SSBI
 int msm_ssbi_write(struct device *dev, u16 addr, u8 *buf, int len);
 int msm_ssbi_read(struct device *dev, u16 addr, u8 *buf, int len);
-#else
-static inline int msm_ssbi_write(struct device *dev, u16 addr, u8 *buf, int 
len)
-{
-   return -ENXIO;
-}
-static inline int msm_ssbi_read(struct device *dev, u16 addr, u8 *buf, int len)
-{
-   return -ENXIO;
-}
-#endif
 #endif
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v2 03/11] ssbi: Fix exit mismatch in remove function

[David Brown]

msm_ssbi_remove is referenced with __exit_p, but not declared with
__exit.  This causes a warning when the driver is not built as a
module:

drivers/ssbi/ssbi.c:341:23: warning: 'msm_ssbi_remove' defined but not used 
[-Wunused-function]

The remove is needed for unbinding to work, even if not compiled as a
module, so just remove it.

Signed-off-by: David Brown 
---
 drivers/ssbi/ssbi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/ssbi/ssbi.c b/drivers/ssbi/ssbi.c
index c08a7b8..da086d4 100644
--- a/drivers/ssbi/ssbi.c
+++ b/drivers/ssbi/ssbi.c
@@ -372,7 +372,7 @@ static int msm_ssbi_remove(struct platform_device *pdev)
 
 static struct platform_driver msm_ssbi_driver = {
.probe  = msm_ssbi_probe,
-   .remove = __exit_p(msm_ssbi_remove),
+   .remove = msm_ssbi_remove,
.driver = {
.name   = "msm_ssbi",
.owner  = THIS_MODULE,
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v2 07/11] ssbi: Use regular init level

[David Brown]

With device tree, and deferred probe, it is no longer necessary to
make sure that the ssbi bus driver is initialized very early.  Restore
to a regular module_init().

Signed-off-by: David Brown 
---
 drivers/ssbi/ssbi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/ssbi/ssbi.c b/drivers/ssbi/ssbi.c
index 7ae8925..6878e55 100644
--- a/drivers/ssbi/ssbi.c
+++ b/drivers/ssbi/ssbi.c
@@ -379,7 +379,7 @@ static int __init msm_ssbi_init(void)
 {
return platform_driver_register(&msm_ssbi_driver);
 }
-postcore_initcall(msm_ssbi_init);
+module_init(msm_ssbi_init);
 
 static void __exit msm_ssbi_exit(void)
 {
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v2 08/11] ssbi: Remove extraneous logging

[David Brown]

Remove some unhelpful error logs.  This also removes the necessity of
having a pointer back to the struct device within the ssbi-specific
structure

Signed-off-by: David Brown 
---
 drivers/ssbi/ssbi.c | 16 +---
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/drivers/ssbi/ssbi.c b/drivers/ssbi/ssbi.c
index 6878e55..b056a07 100644
--- a/drivers/ssbi/ssbi.c
+++ b/drivers/ssbi/ssbi.c
@@ -66,7 +66,6 @@
 #define SSBI_TIMEOUT_US100
 
 struct msm_ssbi {
-   struct device   *dev;
struct device   *slave;
void __iomem*base;
spinlock_t  lock;
@@ -108,8 +107,6 @@ static int ssbi_wait_mask(struct msm_ssbi *ssbi, u32 
set_mask, u32 clr_mask)
udelay(1);
}
 
-   dev_err(ssbi->dev, "%s: timeout (status %x set_mask %x clr_mask %x)\n",
-   __func__, ssbi_readl(ssbi, SSBI2_STATUS), set_mask, clr_mask);
return -ETIMEDOUT;
 }
 
@@ -185,11 +182,8 @@ msm_ssbi_pa_transfer(struct msm_ssbi *ssbi, u32 cmd, u8 
*data)
while (timeout--) {
rd_status = ssbi_readl(ssbi, SSBI_PA_RD_STATUS);
 
-   if (rd_status & SSBI_PA_RD_STATUS_TRANS_DENIED) {
-   dev_err(ssbi->dev, "%s: transaction denied (0x%x)\n",
-   __func__, rd_status);
+   if (rd_status & SSBI_PA_RD_STATUS_TRANS_DENIED)
return -EPERM;
-   }
 
if (rd_status & SSBI_PA_RD_STATUS_TRANS_DONE) {
if (data)
@@ -199,7 +193,6 @@ msm_ssbi_pa_transfer(struct msm_ssbi *ssbi, u32 cmd, u8 
*data)
udelay(1);
}
 
-   dev_err(ssbi->dev, "%s: timeout, status 0x%x\n", __func__, rd_status);
return -ETIMEDOUT;
 }
 
@@ -248,9 +241,6 @@ int msm_ssbi_read(struct device *dev, u16 addr, u8 *buf, 
int len)
unsigned long flags;
int ret;
 
-   if (ssbi->dev != dev)
-   return -ENXIO;
-
spin_lock_irqsave(&ssbi->lock, flags);
ret = ssbi->read(ssbi, addr, buf, len);
spin_unlock_irqrestore(&ssbi->lock, flags);
@@ -265,9 +255,6 @@ int msm_ssbi_write(struct device *dev, u16 addr, u8 *buf, 
int len)
unsigned long flags;
int ret;
 
-   if (ssbi->dev != dev)
-   return -ENXIO;
-
spin_lock_irqsave(&ssbi->lock, flags);
ret = ssbi->write(ssbi, addr, buf, len);
spin_unlock_irqrestore(&ssbi->lock, flags);
@@ -303,7 +290,6 @@ static int msm_ssbi_probe(struct platform_device *pdev)
ret = -EINVAL;
goto err_ioremap;
}
-   ssbi->dev = &pdev->dev;
platform_set_drvdata(pdev, ssbi);
 
type = of_get_property(np, "qcom,controller-type", NULL);
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v2 01/11] platform-drivers: msm: add single-wire serial bus interface (SSBI) driver

[David Brown]

From: Kenneth Heitke 

SSBI is the Qualcomm single-wire serial bus interface used to connect
the MSM devices to the PMIC and other devices.

Since SSBI only supports a single slave, the driver gets the name of the
slave device passed in from the board file through the master device's
platform data.

SSBI registers pretty early (postcore), so that the PMIC can come up
before the board init. This is useful if the board init requires the
use of gpios that are connected through the PMIC.

Based on a patch by Dima Zavin  that can be found at:
http://android.git.kernel.org/?p=kernel/msm.git;a=commitdiff;h=eb060bac4

This patch adds PMIC Arbiter support for the MSM8660. The PMIC Arbiter
is a hardware wrapper around the SSBI 2.0 controller that is designed to
overcome concurrency issues and security limitations.  A controller_type
field is added to the platform data to specify the type of the SSBI
controller (1.0, 2.0, or PMIC Arbiter).

[dav...@codeaurora.org:
 I've moved this driver into drivers/ssbi/ and added an include for
 linux/module.h so that it will compile]

Signed-off-by: Kenneth Heitke 
Signed-off-by: David Brown 
---
 drivers/Kconfig  |   2 +
 drivers/Makefile |   1 +
 drivers/ssbi/Kconfig |  16 ++
 drivers/ssbi/Makefile|   1 +
 drivers/ssbi/ssbi.c  | 397 +++
 include/linux/msm_ssbi.h |  49 ++
 6 files changed, 466 insertions(+)
 create mode 100644 drivers/ssbi/Kconfig
 create mode 100644 drivers/ssbi/Makefile
 create mode 100644 drivers/ssbi/ssbi.c
 create mode 100644 include/linux/msm_ssbi.h

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 202fa6d..78a956e 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -52,6 +52,8 @@ source "drivers/i2c/Kconfig"
 
 source "drivers/spi/Kconfig"
 
+source "drivers/ssbi/Kconfig"
+
 source "drivers/hsi/Kconfig"
 
 source "drivers/pps/Kconfig"
diff --git a/drivers/Makefile b/drivers/Makefile
index dce39a9..778821b 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -114,6 +114,7 @@ obj-y   += firmware/
 obj-$(CONFIG_CRYPTO)   += crypto/
 obj-$(CONFIG_SUPERH)   += sh/
 obj-$(CONFIG_ARCH_SHMOBILE)+= sh/
+obj-$(CONFIG_MSM_SSBI) += ssbi/
 ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
 obj-y  += clocksource/
 endif
diff --git a/drivers/ssbi/Kconfig b/drivers/ssbi/Kconfig
new file mode 100644
index 000..b57c41b
--- /dev/null
+++ b/drivers/ssbi/Kconfig
@@ -0,0 +1,16 @@
+#
+# MSM SSBI bus support
+#
+
+menu "Qualcomm MSM SSBI bus support"
+
+config MSM_SSBI
+   bool "Qualcomm Single-wire Serial Bus Interface (SSBI)"
+   help
+ If you say yes to this option, support will be included for the
+ built-in SSBI interface on Qualcomm MSM family processors.
+
+ This is required for communicating with Qualcomm PMICs and
+ other devices that have the SSBI interface.
+
+endmenu
diff --git a/drivers/ssbi/Makefile b/drivers/ssbi/Makefile
new file mode 100644
index 000..22e408f
--- /dev/null
+++ b/drivers/ssbi/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_MSM_SSBI) += ssbi.o
diff --git a/drivers/ssbi/ssbi.c b/drivers/ssbi/ssbi.c
new file mode 100644
index 000..8b0b10d
--- /dev/null
+++ b/drivers/ssbi/ssbi.c
@@ -0,0 +1,397 @@
+/* Copyright (c) 2009-2011, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2010, Google Inc.
+ *
+ * Original authors: Code Aurora Forum
+ *
+ * Author: Dima Zavin 
+ *  - Largely rewritten from original to not be an i2c driver.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#define pr_fmt(fmt) "%s: " fmt, __func__
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+/* SSBI 2.0 controller registers */
+#define SSBI2_CMD  0x0008
+#define SSBI2_RD   0x0010
+#define SSBI2_STATUS   0x0014
+#define SSBI2_MODE20x001C
+
+/* SSBI_CMD fields */
+#define SSBI_CMD_RDWRN (1 << 24)
+
+/* SSBI_STATUS fields */
+#define SSBI_STATUS_RD_READY   (1 << 2)
+#define SSBI_STATUS_READY  (1 << 1)
+#define SSBI_STATUS_MCHN_BUSY  (1 << 0)
+
+/* SSBI_MODE2 fields */
+#define SSBI_MODE2_REG_ADDR_15_8_SHFT  0x04
+#define SSBI_MODE2_REG_ADDR_15_8_MASK  (0x7f << SSBI_MODE2_REG_ADDR_15_8_SHFT)
+
+#define SET_SSBI_MODE2_REG_ADDR_15_8(MD, AD) \
+   (((MD) & 0x0F) | AD) &

[PATCH v2 09/11] SSBI: Remove MSM_ prefix from SSBI drivers

[David Brown]

Although the SSBI sub is currently only used on MSM SoCs, it is still
a bus in its own right.  Remove this msm_ prefix from the driver and
it's symbols.  Clients can now refer directly to ssbi_write() and
ssbi_read().

Signed-off-by: David Brown 
---
 drivers/Makefile |  2 +-
 drivers/mfd/Kconfig  |  2 +-
 drivers/mfd/pm8921-core.c| 14 +++---
 drivers/ssbi/Kconfig |  4 +-
 drivers/ssbi/Makefile|  2 +-
 drivers/ssbi/ssbi.c  | 86 ++--
 include/linux/{msm_ssbi.h => ssbi.h} | 18 
 7 files changed, 64 insertions(+), 64 deletions(-)
 rename include/linux/{msm_ssbi.h => ssbi.h} (67%)

diff --git a/drivers/Makefile b/drivers/Makefile
index 778821b..4865ed2 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -114,7 +114,7 @@ obj-y   += firmware/
 obj-$(CONFIG_CRYPTO)   += crypto/
 obj-$(CONFIG_SUPERH)   += sh/
 obj-$(CONFIG_ARCH_SHMOBILE)+= sh/
-obj-$(CONFIG_MSM_SSBI) += ssbi/
+obj-$(CONFIG_SSBI) += ssbi/
 ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
 obj-y  += clocksource/
 endif
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 671f5b1..5bfa7bb 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -990,7 +990,7 @@ config MFD_PM8XXX
 
 config MFD_PM8921_CORE
tristate "Qualcomm PM8921 PMIC chip"
-   depends on MSM_SSBI
+   depends on SSBI
select MFD_CORE
select MFD_PM8XXX
help
diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c
index d4b297c..ecc137f 100644
--- a/drivers/mfd/pm8921-core.c
+++ b/drivers/mfd/pm8921-core.c
@@ -17,7 +17,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -35,7 +35,7 @@ static int pm8921_readb(const struct device *dev, u16 addr, 
u8 *val)
const struct pm8xxx_drvdata *pm8921_drvdata = dev_get_drvdata(dev);
const struct pm8921 *pmic = pm8921_drvdata->pm_chip_data;
 
-   return msm_ssbi_read(pmic->dev->parent, addr, val, 1);
+   return ssbi_read(pmic->dev->parent, addr, val, 1);
 }
 
 static int pm8921_writeb(const struct device *dev, u16 addr, u8 val)
@@ -43,7 +43,7 @@ static int pm8921_writeb(const struct device *dev, u16 addr, 
u8 val)
const struct pm8xxx_drvdata *pm8921_drvdata = dev_get_drvdata(dev);
const struct pm8921 *pmic = pm8921_drvdata->pm_chip_data;
 
-   return msm_ssbi_write(pmic->dev->parent, addr, &val, 1);
+   return ssbi_write(pmic->dev->parent, addr, &val, 1);
 }
 
 static int pm8921_read_buf(const struct device *dev, u16 addr, u8 *buf,
@@ -52,7 +52,7 @@ static int pm8921_read_buf(const struct device *dev, u16 
addr, u8 *buf,
const struct pm8xxx_drvdata *pm8921_drvdata = dev_get_drvdata(dev);
const struct pm8921 *pmic = pm8921_drvdata->pm_chip_data;
 
-   return msm_ssbi_read(pmic->dev->parent, addr, buf, cnt);
+   return ssbi_read(pmic->dev->parent, addr, buf, cnt);
 }
 
 static int pm8921_write_buf(const struct device *dev, u16 addr, u8 *buf,
@@ -61,7 +61,7 @@ static int pm8921_write_buf(const struct device *dev, u16 
addr, u8 *buf,
const struct pm8xxx_drvdata *pm8921_drvdata = dev_get_drvdata(dev);
const struct pm8921 *pmic = pm8921_drvdata->pm_chip_data;
 
-   return msm_ssbi_write(pmic->dev->parent, addr, buf, cnt);
+   return ssbi_write(pmic->dev->parent, addr, buf, cnt);
 }
 
 static int pm8921_read_irq_stat(const struct device *dev, int irq)
@@ -124,7 +124,7 @@ static int pm8921_probe(struct platform_device *pdev)
}
 
/* Read PMIC chip revision */
-   rc = msm_ssbi_read(pdev->dev.parent, REG_HWREV, &val, sizeof(val));
+   rc = ssbi_read(pdev->dev.parent, REG_HWREV, &val, sizeof(val));
if (rc) {
pr_err("Failed to read hw rev reg %d:rc=%d\n", REG_HWREV, rc);
goto err_read_rev;
@@ -133,7 +133,7 @@ static int pm8921_probe(struct platform_device *pdev)
rev = val;
 
/* Read PMIC chip revision 2 */
-   rc = msm_ssbi_read(pdev->dev.parent, REG_HWREV_2, &val, sizeof(val));
+   rc = ssbi_read(pdev->dev.parent, REG_HWREV_2, &val, sizeof(val));
if (rc) {
pr_err("Failed to read hw rev 2 reg %d:rc=%d\n",
REG_HWREV_2, rc);
diff --git a/drivers/ssbi/Kconfig b/drivers/ssbi/Kconfig
index c7bc534..1ae4040 100644
--- a/drivers/ssbi/Kconfig
+++ b/drivers/ssbi/Kconfig
@@ -1,10 +1,10 @@
 #
-# MSM SSBI bus support
+# SSBI bus support
 #
 
 menu "Qualcomm MSM SSBI bus support"
 
-config MSM_SSBI
+config SSBI
tristate "Qualcomm Single-wire Serial Bus Interface (SSBI)"
help
  If you say yes to this option, support will be included for the
diff

[PATCH v2 10/11] MAINTAINERS: add ssbi

[David Brown]

The ssbi device is specific to the Qualcomm MSM SoCs.

Signed-off-by: David Brown 
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 9561658..f8fdec5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1031,6 +1031,7 @@ F:drivers/mmc/host/msm_sdcc.h
 F: drivers/tty/serial/msm_serial.h
 F: drivers/tty/serial/msm_serial.c
 F: drivers/*/pm8???-*
+F: drivers/ssbi/
 F: include/linux/mfd/pm8xxx/
 T: git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git
 S: Maintained
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v2 05/11] SSBI: Convert SSBI to device tree

[David Brown]

The SSBI bus is exclusive to the Qualcomm MSM targets, and all SoCs
using it will be using device tree.  Convert this driver to indentify
with device tree.

This makes the bus probing a good bit simpler, since the attaching of
child nodes can be represented directly in the devicetree, rather than
having to be inferred by name.

Signed-off-by: David Brown 
---
 Documentation/devicetree/bindings/arm/msm/ssbi.txt | 18 +
 arch/arm/boot/dts/msm8660-surf.dts |  6 ++
 arch/arm/boot/dts/msm8960-cdp.dts  |  6 ++
 drivers/ssbi/ssbi.c| 81 +-
 4 files changed, 62 insertions(+), 49 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/msm/ssbi.txt

diff --git a/Documentation/devicetree/bindings/arm/msm/ssbi.txt 
b/Documentation/devicetree/bindings/arm/msm/ssbi.txt
new file mode 100644
index 000..54fd5ce
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/msm/ssbi.txt
@@ -0,0 +1,18 @@
+* Qualcomm SSBI
+
+Some Qualcomm MSM devices contain a point-to-point serial bus used to
+communicate with a limited range of devices (mostly power management
+chips).
+
+These require the following properties:
+
+- compatible: "qcom,ssbi"
+
+- qcom,controller-type
+  indicates the SSBI bus variant the controller should use to talk
+  with the slave device.  This should be one of "ssbi", "ssbi2", or
+  "pmic-arbiter".  The type chosen is determined by the attached
+  slave.
+
+The slave device should be the single child node of the ssbi device
+with a compatible field.
diff --git a/arch/arm/boot/dts/msm8660-surf.dts 
b/arch/arm/boot/dts/msm8660-surf.dts
index 31f2157..67f8670 100644
--- a/arch/arm/boot/dts/msm8660-surf.dts
+++ b/arch/arm/boot/dts/msm8660-surf.dts
@@ -38,4 +38,10 @@
  <0x19c0 0x1000>;
interrupts = <0 195 0x0>;
};
+
+   qcom,ssbi@50 {
+   compatible = "qcom,ssbi";
+   reg = <0x50 0x1000>;
+   qcom,controller-type = "pmic-arbiter";
+   };
 };
diff --git a/arch/arm/boot/dts/msm8960-cdp.dts 
b/arch/arm/boot/dts/msm8960-cdp.dts
index 9e621b5..c9b09a8 100644
--- a/arch/arm/boot/dts/msm8960-cdp.dts
+++ b/arch/arm/boot/dts/msm8960-cdp.dts
@@ -38,4 +38,10 @@
  <0x1640 0x1000>;
interrupts = <0 154 0x0>;
};
+
+   qcom,ssbi@50 {
+   compatible = "qcom,ssbi";
+   reg = <0x50 0x1000>;
+   qcom,controller-type = "pmic-arbiter";
+   };
 };
diff --git a/drivers/ssbi/ssbi.c b/drivers/ssbi/ssbi.c
index da086d4..6fbcb25 100644
--- a/drivers/ssbi/ssbi.c
+++ b/drivers/ssbi/ssbi.c
@@ -26,6 +26,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 /* SSBI 2.0 controller registers */
 #define SSBI2_CMD  0x0008
@@ -261,56 +263,13 @@ int msm_ssbi_write(struct device *dev, u16 addr, u8 *buf, 
int len)
 }
 EXPORT_SYMBOL_GPL(msm_ssbi_write);
 
-static int msm_ssbi_add_slave(struct msm_ssbi *ssbi,
-   const struct msm_ssbi_slave_info *slave)
-{
-   struct platform_device *slave_pdev;
-   int ret;
-
-   if (ssbi->slave) {
-   pr_err("slave already attached??\n");
-   return -EBUSY;
-   }
-
-   slave_pdev = platform_device_alloc(slave->name, -1);
-   if (!slave_pdev) {
-   pr_err("cannot allocate pdev for slave '%s'", slave->name);
-   ret = -ENOMEM;
-   goto err;
-   }
-
-   slave_pdev->dev.parent = ssbi->dev;
-   slave_pdev->dev.platform_data = slave->platform_data;
-
-   ret = platform_device_add(slave_pdev);
-   if (ret) {
-   pr_err("cannot add slave platform device for '%s'\n",
-   slave->name);
-   goto err;
-   }
-
-   ssbi->slave = &slave_pdev->dev;
-   return 0;
-
-err:
-   if (slave_pdev)
-   platform_device_put(slave_pdev);
-   return ret;
-}
-
 static int msm_ssbi_probe(struct platform_device *pdev)
 {
-   const struct msm_ssbi_platform_data *pdata = pdev->dev.platform_data;
+   struct device_node *np = pdev->dev.of_node;
struct resource *mem_res;
struct msm_ssbi *ssbi;
int ret = 0;
-
-   if (!pdata) {
-   pr_err("missing platform data\n");
-   return -EINVAL;
-   }
-
-   pr_debug("%s\n", pdata->slave.name);
+   const char *type;
 
ssbi = kzalloc(sizeof(struct msm_ssbi), GFP_KERNEL);
if (!ssbi) {
@@ -334,7 +293,25 @@ static int msm_ssbi_probe(struct platform_device *pdev)
ssbi->dev = &pdev->dev;
platform_set_drvdata(pdev, ssbi);
 
-  

[PATCH v2 0/11] Qualcomm SSBI bus driver

[David Brown]

This small series adds the Qualcomm SSBI bus driver.  The original
driver was developed as part of Android.  Kenneth Heitke updated this,
and sent it out a while back.  This series updates this driver to use
DeviceTree, and fixes a few things that have changed since it was
originally sent out.

In addition, the 11th patch, the RFC, is a small test driver that reads
the version register off of the pm8058 device typically connected to
an MSM8660 or MSM8960.  This is primarily useful to anyone wanting to
work on these pmic drivers.

Updates to the PMIC drivers themselves to use this driver to come.

Patch version:
  v2: Updates from mailing list feedback:
 - Use EXPORT_SYMBOL_GPL
 - Proper fix for driver remove section mismatch
 - Allow compilation as a module
 - Remove extraneous dev_err() messages
 - Comment use of busywait loop
 - Update MAINTAINERS file
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v2 06/11] ssbi: Comment the use of udelay()

[David Brown]

The ssbi driver uses a busywait loop to read its status register.  Add
a comment explaining the timing of the device itself so that future
developers can better understand this delay, and possibly diagnose any
problems.

Signed-off-by: David Brown 
---
 drivers/ssbi/ssbi.c | 13 +
 1 file changed, 13 insertions(+)

diff --git a/drivers/ssbi/ssbi.c b/drivers/ssbi/ssbi.c
index 6fbcb25..7ae8925 100644
--- a/drivers/ssbi/ssbi.c
+++ b/drivers/ssbi/ssbi.c
@@ -87,6 +87,15 @@ static inline void ssbi_writel(struct msm_ssbi *ssbi, u32 
val, u32 reg)
writel(val, ssbi->base + reg);
 }
 
+/*
+ * Via private exchange with one of the original authors, the hardware
+ * should generally finish a transaction in about 5us.  The worst
+ * case, is when using the arbiter and both other CPUs have just
+ * started trying to use the SSBI bus will result in a time of about
+ * 20us.  It should never take longer than this.
+ *
+ * As such, this wait merely spins, with a udelay.
+ */
 static int ssbi_wait_mask(struct msm_ssbi *ssbi, u32 set_mask, u32 clr_mask)
 {
u32 timeout = SSBI_TIMEOUT_US;
@@ -161,6 +170,10 @@ err:
return ret;
 }
 
+/*
+ * See ssbi_wait_mask for an explanation of the time and the
+ * busywait.
+ */
 static inline int
 msm_ssbi_pa_transfer(struct msm_ssbi *ssbi, u32 cmd, u8 *data)
 {
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v2 02/11] fix: Use EXPORT_SYMBOL_GPL

[David Brown]

Signed-off-by: David Brown 
---
 drivers/ssbi/ssbi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/ssbi/ssbi.c b/drivers/ssbi/ssbi.c
index 8b0b10d..c08a7b8 100644
--- a/drivers/ssbi/ssbi.c
+++ b/drivers/ssbi/ssbi.c
@@ -242,7 +242,7 @@ int msm_ssbi_read(struct device *dev, u16 addr, u8 *buf, 
int len)
 
return ret;
 }
-EXPORT_SYMBOL(msm_ssbi_read);
+EXPORT_SYMBOL_GPL(msm_ssbi_read);
 
 int msm_ssbi_write(struct device *dev, u16 addr, u8 *buf, int len)
 {
@@ -259,7 +259,7 @@ int msm_ssbi_write(struct device *dev, u16 addr, u8 *buf, 
int len)
 
return ret;
 }
-EXPORT_SYMBOL(msm_ssbi_write);
+EXPORT_SYMBOL_GPL(msm_ssbi_write);
 
 static int msm_ssbi_add_slave(struct msm_ssbi *ssbi,
const struct msm_ssbi_slave_info *slave)
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v2 11/11] RFC: SSBI: Simple pm8058 test driver

[David Brown]

A very small ssbi device driver that reads the pm8058 version register
and prints it out.

Signed-off-by: David Brown 
---
Resending due to address error in header

 arch/arm/boot/dts/msm8660-surf.dts |  4 +++
 arch/arm/boot/dts/msm8960-cdp.dts  |  4 +++
 drivers/ssbi/Makefile  |  1 +
 drivers/ssbi/ssbi-test.c   | 61 ++
 4 files changed, 70 insertions(+)
 create mode 100644 drivers/ssbi/ssbi-test.c

diff --git a/arch/arm/boot/dts/msm8660-surf.dts 
b/arch/arm/boot/dts/msm8660-surf.dts
index 67f8670..68a0c7c4 100644
--- a/arch/arm/boot/dts/msm8660-surf.dts
+++ b/arch/arm/boot/dts/msm8660-surf.dts
@@ -43,5 +43,9 @@
compatible = "qcom,ssbi";
reg = <0x50 0x1000>;
qcom,controller-type = "pmic-arbiter";
+
+   qcom,ssbi-test {
+   compatible = "qcom,ssbi-test";
+   };
};
 };
diff --git a/arch/arm/boot/dts/msm8960-cdp.dts 
b/arch/arm/boot/dts/msm8960-cdp.dts
index c9b09a8..60804d7 100644
--- a/arch/arm/boot/dts/msm8960-cdp.dts
+++ b/arch/arm/boot/dts/msm8960-cdp.dts
@@ -43,5 +43,9 @@
compatible = "qcom,ssbi";
reg = <0x50 0x1000>;
qcom,controller-type = "pmic-arbiter";
+
+   qcom,ssbi-test {
+   compatible = "qcom,ssbi-test";
+   };
};
 };
diff --git a/drivers/ssbi/Makefile b/drivers/ssbi/Makefile
index 38fb70c..dea13c1 100644
--- a/drivers/ssbi/Makefile
+++ b/drivers/ssbi/Makefile
@@ -1 +1,2 @@
 obj-$(CONFIG_SSBI) += ssbi.o
+obj-$(CONFIG_SSBI) += ssbi-test.o
diff --git a/drivers/ssbi/ssbi-test.c b/drivers/ssbi/ssbi-test.c
new file mode 100644
index 000..7804cfe
--- /dev/null
+++ b/drivers/ssbi/ssbi-test.c
@@ -0,0 +1,61 @@
+/* A simple ssbi test device. */
+
+#include 
+#include 
+#include 
+#include 
+
+static int __init ssbi_test_probe(struct platform_device *pdev)
+{
+   int ret;
+   char version;
+
+   dev_info(&pdev->dev, "probe, me = %p, parent = %p\n",
+pdev, pdev->dev.parent);
+
+   /* Let's try reading. */
+   ret = ssbi_read(pdev->dev.parent, 0x02, &version, 1);
+   if (ret != 0)
+   return ret;
+
+   dev_info(&pdev->dev, "Version = %02x\n", version);
+
+   /* Should already be hooked in. */
+   return 0;
+}
+
+static int ssbi_test_remove(struct platform_device *pdev)
+{
+   return 0;
+}
+
+static struct of_device_id ssbi_test_match_table[] = {
+   { .compatible = "qcom,ssbi-test" },
+   {}
+};
+
+static struct platform_driver ssbi_test_driver = {
+   .remove = ssbi_test_remove,
+   .driver = {
+   .name = "sbbi_test",
+   .owner = THIS_MODULE,
+   .of_match_table = ssbi_test_match_table,
+   },
+};
+
+static int __init ssbi_test_init(void)
+{
+   int ret;
+
+   ret = platform_driver_probe(&ssbi_test_driver, ssbi_test_probe);
+   return ret;
+}
+
+static void __exit ssbi_test_exit(void)
+{
+}
+
+module_init(ssbi_test_init);
+module_exit(ssbi_test_exit);
+
+MODULE_LICENSE("GPL");
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] msm fixes for v3.6

[David Brown]

The following changes since commit 28a33cbc24e4256c143dce96c7d93bf423229f92:

  Linux 3.5 (2012-07-21 13:58:29 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git 
tags/msm-fix-for3.6

for you to fetch changes up to e7501de53aa1a551526872f6c95901a00705f942:

  ARM: msm: Remove call to missing FPGA init on 8660 (2012-08-28 09:39:28 -0700)


Fixes for two problems with MSM:

  - Mapping issue on 7x00 targets.
  - Compilation problems with devicetree on 8660.


David Brown (1):
  ARM: msm: Remove call to missing FPGA init on 8660

Rohit Vaswani (2):
  ARM: msm: io: Remove 7x30 iomap region from 7x00
  ARM: msm: io: Change the default static iomappings to be shared

Stephen Boyd (2):
  ARM: msm: Add handle_irq handler for 8660 DT machine
  ARM: msm: Add msm8660-surf.dts to Makefile.boot

 arch/arm/mach-msm/Makefile.boot   |  2 ++
 arch/arm/mach-msm/board-msm8x60.c |  6 +-
 arch/arm/mach-msm/io.c| 28 +---
 3 files changed, 20 insertions(+), 16 deletions(-)

-- 
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH] ARM: Make sure dtc is built before running it

[David Brown]

'make dtbs' in a clean tree will try running the dtc before actually
building it.  Make these rules depend upon the scripts to build it.
---
 arch/arm/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 0298b00..926d840 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -279,10 +279,10 @@ zImage Image xipImage bootpImage uImage: vmlinux
 zinstall uinstall install: vmlinux
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 
-%.dtb:
+%.dtb: scripts
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
 
-dtbs:
+dtbs: scripts
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
 
 # We use MRPROPER_FILES and CLEAN_FILES now
-- 
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 05/16] ARM: msm: move platform_data definitions

[David Brown]

On Tue, Sep 11, 2012 at 02:59:39PM +0200, Arnd Bergmann wrote:
> Platform data for device drivers should be defined in
> include/linux/platform_data/*.h, not in the architecture
> and platform specific directories.
> 
> This moves such data out of the msm include directories
> 
> Signed-off-by: Arnd Bergmann 
> Cc: David Brown 
> Cc: Daniel Walker 
> Cc: Bryan Huntsman 
> Cc: Chris Ball 
> Cc: Florian Tobias Schandinat 
> Cc: linux-arm-...@vger.kernel.org
> ---
>  arch/arm/mach-msm/board-qsd8x50.c|2 
> +-
>  arch/arm/mach-msm/board-trout-mmc.c  |2 
> +-
>  arch/arm/mach-msm/board-trout-panel.c|2 
> +-
>  arch/arm/mach-msm/devices-msm7x00.c  |2 
> +-
>  arch/arm/mach-msm/devices-msm7x30.c  |2 
> +-
>  arch/arm/mach-msm/devices-qsd8x50.c  |2 
> +-
>  arch/arm/mach-msm/include/mach/board.h   |2 
> +-
>  drivers/mmc/host/msm_sdcc.c  |2 
> +-
>  drivers/video/msm/mddi.c |2 
> +-
>  drivers/video/msm/mddi_client_dummy.c|2 
> +-
>  drivers/video/msm/mddi_client_nt35399.c  |2 
> +-
>  drivers/video/msm/mddi_client_toshiba.c  |2 
> +-
>  drivers/video/msm/mdp.c  |2 
> +-
>  drivers/video/msm/mdp_hw.h   |2 
> +-
>  drivers/video/msm/mdp_ppp.c  |2 
> +-
>  drivers/video/msm/msm_fb.c   |2 
> +-
>  .../include/mach/mmc.h => include/linux/platform_data/mmc-msm_sdcc.h |0
>  .../mach/msm_fb.h => include/linux/platform_data/video-msm_fb.h  |0
>  18 files changed, 16 insertions(+), 16 deletions(-)
>  rename arch/arm/mach-msm/include/mach/mmc.h => 
> include/linux/platform_data/mmc-msm_sdcc.h (100%)
>  rename arch/arm/mach-msm/include/mach/msm_fb.h => 
> include/linux/platform_data/video-msm_fb.h (100%)

Acked-by: David Brown 

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 3/9] ARM: msm: Add DT support to msm_timer

[David Brown]

On Wed, Sep 05, 2012 at 12:28:53PM -0700, Stephen Boyd wrote:

> diff --git a/Documentation/devicetree/bindings/arm/msm/timer.txt 
> b/Documentation/devicetree/bindings/arm/msm/timer.txt

> +   timer@0200a004 {
> +   compatible = "qcom,msm-gpt", "qcom,msm-timer";
> +   interrupts = <1 2 0x301>;
> +   reg = <0x0200a004 0x10>;
> +   clock-frequency = <32768>;
> +   cpu-offset = <0x4>;
> +   };
> +
> +   timer@0200a024 {
> +   compatible = "qcom,msm-dgt", "qcom,msm-timer";
> +   interrupts = <1 3 0x301>;
> +   reg = <0x0200a024 0x10>,
> + <0x0200a034 0x4>;
> +   clock-frequency = <675>;
> +   cpu-offset = <0x4>;
> +   };

The names should be timer@200a004 and timer@200a024, without the
leading zero.  If there are no other concerns, I can just fix these up
when I pull the patch in.  No need to resend.

Thanks,
David

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 8/9] ARM: msm: Add DT support for 8960

[David Brown]

On Wed, Sep 05, 2012 at 12:28:58PM -0700, Stephen Boyd wrote:

> diff --git a/arch/arm/boot/dts/msm8960-cdp.dts 
> b/arch/arm/boot/dts/msm8960-cdp.dts
> +
> + intc: interrupt-controller@0200 {
> + compatible = "qcom,msm-qgic2";
> + interrupt-controller;
> + #interrupt-cells = <3>;
> + reg = < 0x0200 0x1000 >,
> +   < 0x02002000 0x1000 >;
> + };

> + timer@0200a004 {
...
> + timer@0200a024 {

Likewise here, the leading zeros need to be removed on the names.  I
can also take care of this one when I pull it in.

David


-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 8/9] ARM: msm: Add DT support for 8960

[David Brown]

On Wed, Sep 05, 2012 at 12:28:58PM -0700, Stephen Boyd wrote:

> diff --git a/arch/arm/boot/dts/msm8960-cdp.dts 
> b/arch/arm/boot/dts/msm8960-cdp.dts

> + intc: interrupt-controller@0200 {
> + timer@0200a004 {
> + timer@0200a024 {

Same here.  Again, I'll fix these when I pull the patch in.

I guess a question: According to
https://lists.ozlabs.org/pipermail/devicetree-discuss/2012-February/012412.html

these leading zeros shouldn't be there, but I do find a few hundred of
them in our existing devicetree files.  There are also a handful that
have a @0xnnn form of address.

David

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH v9 06/13] ARM: SoC: convert MSM SMP to SoC descriptor

[David Brown]

On Wed, Sep 12, 2012 at 04:58:19PM +0200, Arnd Bergmann wrote:
> From: Marc Zyngier 
> 
> Convert MSM SMP platforms to use the SoC descriptor to provide
> their SMP and CPU hotplug operations.
> 
> Cc: David Brown 
> Signed-off-by: Marc Zyngier 
> Signed-off-by: Arnd Bergmann 
> ---
>  arch/arm/mach-msm/board-msm8960.c |3 +++
>  arch/arm/mach-msm/board-msm8x60.c |7 +++

Stephen Boyd recently sent out a patch series that remove the non-DT
support for these two targets, which naturally generates a bunch of
conflicts.

I'm about to send out a pull request including these changes, and
after that, I'll rework this patch for the new board files, and give
it a try.

David Brown

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 11/24] ARM: msm: Don't touch GIC registers outside of GIC code

[David Brown]

From: Stephen Boyd 

The MSM code has some antiquated register writes to set up the
PPIs to be edge triggered. Now that we have the percpu irq
interface we don't need this code so let's remove it and update
the percpu irq user (msm_timer) to set the irq type.

Signed-off-by: Stephen Boyd 
Signed-off-by: David Brown 
---
 arch/arm/mach-msm/board-msm8960.c | 13 -
 arch/arm/mach-msm/board-msm8x60.c |  3 ---
 arch/arm/mach-msm/platsmp.c   |  8 
 arch/arm/mach-msm/timer.c |  4 ++--
 4 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/arch/arm/mach-msm/board-msm8960.c 
b/arch/arm/mach-msm/board-msm8960.c
index 65f4a1d..bdafe79 100644
--- a/arch/arm/mach-msm/board-msm8960.c
+++ b/arch/arm/mach-msm/board-msm8960.c
@@ -55,24 +55,11 @@ static void __init msm8960_map_io(void)
 
 static void __init msm8960_init_irq(void)
 {
-   unsigned int i;
gic_init(0, GIC_PPI_START, MSM_QGIC_DIST_BASE,
 (void *)MSM_QGIC_CPU_BASE);
 
-   /* Edge trigger PPIs except AVS_SVICINT and AVS_SVICINTSWDONE */
-   writel(0xD7FF, MSM_QGIC_DIST_BASE + GIC_DIST_CONFIG + 4);
-
if (machine_is_msm8960_rumi3())
writel(0x, MSM_QGIC_DIST_BASE + GIC_DIST_ENABLE_SET);
-
-   /* FIXME: Not installing AVS_SVICINT and AVS_SVICINTSWDONE yet
-* as they are configured as level, which does not play nice with
-* handle_percpu_irq.
-*/
-   for (i = GIC_PPI_START; i < GIC_SPI_START; i++) {
-   if (i != AVS_SVICINT && i != AVS_SVICINTSWDONE)
-   irq_set_handler(i, handle_percpu_irq);
-   }
 }
 
 static struct platform_device *sim_devices[] __initdata = {
diff --git a/arch/arm/mach-msm/board-msm8x60.c 
b/arch/arm/mach-msm/board-msm8x60.c
index ad87207..64ae269 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -67,9 +67,6 @@ static void __init msm8x60_init_irq(void)
of_irq_init(msm_dt_gic_match);
 #endif
 
-   /* Edge trigger PPIs except AVS_SVICINT and AVS_SVICINTSWDONE */
-   writel(0xD7FF, MSM_QGIC_DIST_BASE + GIC_DIST_CONFIG + 4);
-
/* RUMI does not adhere to GIC spec by enabling STIs by default.
 * Enable/clear is supposed to be RO for STIs, but is RW on RUMI.
 */
diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c
index db0117e..b119f99 100644
--- a/arch/arm/mach-msm/platsmp.c
+++ b/arch/arm/mach-msm/platsmp.c
@@ -22,17 +22,12 @@
 #include 
 #include 
 
-#include 
-
 #include "scm-boot.h"
 
 #define VDD_SC1_ARRAY_CLAMP_GFS_CTL 0x15A0
 #define SCSS_CPU1CORE_RESET 0xD80
 #define SCSS_DBG_STATUS_CORE_PWRDUP 0xE64
 
-/* Mask for edge trigger PPIs except AVS_SVICINT and AVS_SVICINTSWDONE */
-#define GIC_PPI_EDGE_MASK 0xD7FF
-
 extern void msm_secondary_startup(void);
 /*
  * control for which core is the next to come out of the secondary
@@ -50,9 +45,6 @@ static inline int get_core_count(void)
 
 void __cpuinit platform_secondary_init(unsigned int cpu)
 {
-   /* Configure edge-triggered PPIs */
-   writel(GIC_PPI_EDGE_MASK, MSM_QGIC_DIST_BASE + GIC_DIST_CONFIG + 4);
-
/*
 * if any interrupts are already enabled for the primary
 * core (e.g. timer irq), then they will not have been enabled
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index 004f935..846e1e5 100644
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -151,7 +151,7 @@ static int __cpuinit msm_local_timer_setup(struct 
clock_event_device *evt)
 
*__this_cpu_ptr(msm_evt.percpu_evt) = evt;
clockevents_register_device(evt);
-   enable_percpu_irq(evt->irq, 0);
+   enable_percpu_irq(evt->irq, IRQ_TYPE_EDGE_RISING);
return 0;
 }
 
@@ -219,7 +219,7 @@ static void __init msm_timer_init(void)
res = request_percpu_irq(ce->irq, msm_timer_interrupt,
 ce->name, msm_evt.percpu_evt);
if (!res) {
-   enable_percpu_irq(ce->irq, 0);
+   enable_percpu_irq(ce->irq, IRQ_TYPE_EDGE_RISING);
 #ifdef CONFIG_LOCAL_TIMERS
local_timer_register(&msm_local_timer_ops);
 #endif
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 14/24] ARM: msm: Move 8660 to DT timer

[David Brown]

From: Stephen Boyd 

Add the timer entry and point the machine descriptor to the
device tree based msm timer.

Signed-off-by: Stephen Boyd 
[dav...@codeaurora.org: Remove leading zeros]
Signed-off-by: David Brown 
---
 arch/arm/boot/dts/msm8660-surf.dts | 19 ++-
 arch/arm/mach-msm/board-msm8x60.c  |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/msm8660-surf.dts 
b/arch/arm/boot/dts/msm8660-surf.dts
index 45bc4bb..31f2157 100644
--- a/arch/arm/boot/dts/msm8660-surf.dts
+++ b/arch/arm/boot/dts/msm8660-surf.dts
@@ -7,7 +7,7 @@
compatible = "qcom,msm8660-surf", "qcom,msm8660";
interrupt-parent = <&intc>;
 
-   intc: interrupt-controller@0208 {
+   intc: interrupt-controller@208 {
compatible = "qcom,msm-8660-qgic";
interrupt-controller;
#interrupt-cells = <3>;
@@ -15,6 +15,23 @@
  < 0x02081000 0x1000 >;
};
 
+   timer@204 {
+   compatible = "qcom,msm-gpt", "qcom,msm-timer";
+   interrupts = <1 1 0x301>;
+   reg = <0x0204 0x10>;
+   clock-frequency = <32768>;
+   cpu-offset = <0x4>;
+   };
+
+   timer@224 {
+   compatible = "qcom,msm-dgt", "qcom,msm-timer";
+   interrupts = <1 0 0x301>;
+   reg = <0x0224 0x10>,
+ <0x0234 0x4>;
+   clock-frequency = <675>;
+   cpu-offset = <0x4>;
+   };
+
serial@19c40 {
compatible = "qcom,msm-hsuart", "qcom,msm-uart";
reg = <0x19c4 0x1000>,
diff --git a/arch/arm/mach-msm/board-msm8x60.c 
b/arch/arm/mach-msm/board-msm8x60.c
index 97db3cd..64c981d 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -154,7 +154,7 @@ DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device 
Tree)")
.handle_irq = gic_handle_irq,
.init_machine = msm8x60_dt_init,
.init_late = msm8x60_init_late,
-   .timer = &msm8x60_timer,
+   .timer = &msm_dt_timer,
.dt_compat = msm8x60_fluid_match,
 MACHINE_END
 #endif /* CONFIG_OF */
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 16/24] ARM: msm: Rename board-msm8x60 to signify its DT only status

[David Brown]

From: Stephen Boyd 

Rename this file to signify that this board is only supported via
devicetree.

Signed-off-by: Stephen Boyd 
Signed-off-by: David Brown 
---
 arch/arm/mach-msm/Makefile | 2 +-
 arch/arm/mach-msm/{board-msm8x60.c => board-dt-8660.c} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename arch/arm/mach-msm/{board-msm8x60.c => board-dt-8660.c} (100%)

diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 5fd0464..8794148 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -25,7 +25,7 @@ obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o 
board-trout-mmc.o b
 obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o
 obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o
 obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o
-obj-$(CONFIG_ARCH_MSM8X60) += board-msm8x60.o
+obj-$(CONFIG_ARCH_MSM8X60) += board-dt-8660.o
 obj-$(CONFIG_ARCH_MSM8960) += board-msm8960.o devices-msm8960.o
 
 obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-v1.o gpiomux.o
diff --git a/arch/arm/mach-msm/board-msm8x60.c 
b/arch/arm/mach-msm/board-dt-8660.c
similarity index 100%
rename from arch/arm/mach-msm/board-msm8x60.c
rename to arch/arm/mach-msm/board-dt-8660.c
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 17/24] ARM: msm: Move io mapping prototypes to common.h

[David Brown]

From: Stephen Boyd 

Consolidate the handful of iomapping functions into common.h so
that board files don't need to include mach/msm_iomap.h if they
don't need static virtual mapping addresses.

Signed-off-by: Stephen Boyd 
Signed-off-by: David Brown 
---
 arch/arm/mach-msm/board-dt-8660.c   |  1 -
 arch/arm/mach-msm/common.h  | 10 ++
 arch/arm/mach-msm/include/mach/board.h  |  1 -
 arch/arm/mach-msm/include/mach/msm_iomap-7x00.h |  7 ---
 arch/arm/mach-msm/include/mach/msm_iomap-7x30.h |  4 
 arch/arm/mach-msm/include/mach/msm_iomap-8960.h |  4 
 arch/arm/mach-msm/include/mach/msm_iomap-8x50.h |  4 
 arch/arm/mach-msm/include/mach/msm_iomap-8x60.h |  4 
 arch/arm/mach-msm/io.c  |  2 ++
 9 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/arch/arm/mach-msm/board-dt-8660.c 
b/arch/arm/mach-msm/board-dt-8660.c
index 0d32464..f77f57f 100644
--- a/arch/arm/mach-msm/board-dt-8660.c
+++ b/arch/arm/mach-msm/board-dt-8660.c
@@ -19,7 +19,6 @@
 #include 
 
 #include 
-#include 
 #include "common.h"
 
 static const struct of_device_id msm_dt_gic_match[] __initconst = {
diff --git a/arch/arm/mach-msm/common.h b/arch/arm/mach-msm/common.h
index a20e78e..9975575 100644
--- a/arch/arm/mach-msm/common.h
+++ b/arch/arm/mach-msm/common.h
@@ -18,4 +18,14 @@ extern struct sys_timer msm8960_timer;
 extern struct sys_timer msm_dt_timer;
 extern struct sys_timer qsd8x50_timer;
 
+extern void msm_map_common_io(void);
+extern void msm_map_msm7x30_io(void);
+extern void msm_map_msm8x60_io(void);
+extern void msm_map_msm8960_io(void);
+extern void msm_map_qsd8x50_io(void);
+
+extern void __iomem *__msm_ioremap_caller(unsigned long phys_addr, size_t size,
+ unsigned int mtype, void *caller);
+
+
 #endif
diff --git a/arch/arm/mach-msm/include/mach/board.h 
b/arch/arm/mach-msm/include/mach/board.h
index fc40bbc..09654ac 100644
--- a/arch/arm/mach-msm/include/mach/board.h
+++ b/arch/arm/mach-msm/include/mach/board.h
@@ -36,7 +36,6 @@ struct clk_lookup;
 /* common init routines for use by arch/arm/mach-msm/board-*.c */
 
 void __init msm_add_devices(void);
-void __init msm_map_common_io(void);
 void __init msm_init_irq(void);
 void __init msm_init_gpio(void);
 void __init msm_clock_init(struct clk_lookup *clock_tbl, unsigned num_clocks);
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h 
b/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
index 6c4046c..67dc0e9 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
@@ -105,11 +105,4 @@
 #define MSM_AD5_PHYS  0xAC00
 #define MSM_AD5_SIZE  (SZ_1M*13)
 
-#ifndef __ASSEMBLY__
-
-extern void __iomem *__msm_ioremap_caller(unsigned long phys_addr, size_t size,
- unsigned int mtype, void *caller);
-
-#endif
-
 #endif
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h 
b/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
index f944fe6..198202c 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
@@ -100,8 +100,4 @@
 #define MSM_HSUSB_PHYS0xA360
 #define MSM_HSUSB_SIZESZ_1K
 
-#ifndef __ASSEMBLY__
-extern void msm_map_msm7x30_io(void);
-#endif
-
 #endif
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8960.h 
b/arch/arm/mach-msm/include/mach/msm_iomap-8960.h
index facf434..9819a55 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8960.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8960.h
@@ -50,8 +50,4 @@
 #define MSM_DEBUG_UART_PHYS0x1644
 #endif
 
-#ifndef __ASSEMBLY__
-extern void msm_map_msm8960_io(void);
-#endif
-
 #endif
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h 
b/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
index da77cc1..0faa894 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
@@ -122,8 +122,4 @@
 #define MSM_SDC4_PHYS  0xA060
 #define MSM_SDC4_SIZE  SZ_4K
 
-#ifndef __ASSEMBLY__
-extern void msm_map_qsd8x50_io(void);
-#endif
-
 #endif
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h 
b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
index 21a2a88..c6d38f1 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
@@ -67,8 +67,4 @@
 #define MSM_DEBUG_UART_PHYS0x19C4
 #endif
 
-#ifndef __ASSEMBLY__
-extern void msm_map_msm8x60_io(void);
-#endif
-
 #endif
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index af43f6a..d908a37 100644
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -29,6 +29,8 @@
 
 #include 
 
+#include "common.h"
+
 #define MSM_CHIP_DEVICE_TYPE(name, chip, mem_type) { \
.virtual = (unsigned long) MSM_##name##_BASE, \
  

[PATCH 15/24] ARM: msm: Make 8660 a DT only target

[David Brown]

From: Stephen Boyd 

We don't plan to support anything besides devicetree on these
targets so remove all other machine support.

Signed-off-by: Stephen Boyd 
Signed-off-by: David Brown 
---
 arch/arm/mach-msm/Kconfig |  27 +-
 arch/arm/mach-msm/board-msm8x60.c | 106 ++
 arch/arm/mach-msm/common.h|   1 -
 arch/arm/mach-msm/timer.c |  12 -
 4 files changed, 6 insertions(+), 140 deletions(-)

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 1cd40ad..cd78427 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -38,8 +38,6 @@ config ARCH_QSD8X50
 
 config ARCH_MSM8X60
bool "MSM8X60"
-   select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3 && !MACH_MSM8X60_SIM \
- && !MACH_MSM8X60_FFA)
select ARCH_MSM_SCORPIONMP
select ARM_GIC
select CPU_V7
@@ -47,6 +45,7 @@ config ARCH_MSM8X60
select GPIO_MSM_V2
select MSM_GPIOMUX
select MSM_SCM if SMP
+   select USE_OF
 
 config ARCH_MSM8960
bool "MSM8960"
@@ -112,30 +111,6 @@ config MACH_QSD8X50A_ST1_5
help
  Support for the Qualcomm ST1.5.
 
-config MACH_MSM8X60_RUMI3
-   depends on ARCH_MSM8X60
-   bool "MSM8x60 RUMI3"
-   help
- Support for the Qualcomm MSM8x60 RUMI3 emulator.
-
-config MACH_MSM8X60_SURF
-   depends on ARCH_MSM8X60
-   bool "MSM8x60 SURF"
-   help
- Support for the Qualcomm MSM8x60 SURF eval board.
-
-config MACH_MSM8X60_SIM
-   depends on ARCH_MSM8X60
-   bool "MSM8x60 Simulator"
-   help
- Support for the Qualcomm MSM8x60 simulator.
-
-config MACH_MSM8X60_FFA
-   depends on ARCH_MSM8X60
-   bool "MSM8x60 FFA"
-   help
- Support for the Qualcomm MSM8x60 FFA eval board.
-
 config MACH_MSM8960_SIM
depends on ARCH_MSM8960
bool "MSM8960 Simulator"
diff --git a/arch/arm/mach-msm/board-msm8x60.c 
b/arch/arm/mach-msm/board-msm8x60.c
index 64c981d..0d32464 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2010-2012, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -10,73 +10,26 @@
  * GNU General Public License for more details.
  */
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
 #include 
-#include 
 #include 
 #include 
-#include 
 
-#include 
 #include 
 #include 
-#include 
 
 #include 
 #include 
 #include "common.h"
 
-static void __init msm8x60_fixup(struct tag *tag, char **cmdline,
-   struct meminfo *mi)
-{
-   for (; tag->hdr.size; tag = tag_next(tag))
-   if (tag->hdr.tag == ATAG_MEM &&
-   tag->u.mem.start == 0x4020) {
-   tag->u.mem.start = 0x4000;
-   tag->u.mem.size += SZ_2M;
-   }
-}
-
-static void __init msm8x60_reserve(void)
-{
-   memblock_remove(0x4000, SZ_2M);
-}
-
-static void __init msm8x60_map_io(void)
-{
-   msm_map_msm8x60_io();
-}
-
-#ifdef CONFIG_OF
-static struct of_device_id msm_dt_gic_match[] __initdata = {
+static const struct of_device_id msm_dt_gic_match[] __initconst = {
{ .compatible = "qcom,msm-8660-qgic", .data = gic_of_init },
{}
 };
-#endif
 
 static void __init msm8x60_init_irq(void)
 {
-   if (!of_have_populated_dt())
-   gic_init(0, GIC_PPI_START, MSM_QGIC_DIST_BASE,
-(void *)MSM_QGIC_CPU_BASE);
-#ifdef CONFIG_OF
-   else
-   of_irq_init(msm_dt_gic_match);
-#endif
-
-   /* RUMI does not adhere to GIC spec by enabling STIs by default.
-* Enable/clear is supposed to be RO for STIs, but is RW on RUMI.
-*/
-   if (!machine_is_msm8x60_sim())
-   writel(0x, MSM_QGIC_DIST_BASE + GIC_DIST_ENABLE_SET);
-}
-
-static void __init msm8x60_init(void)
-{
+   of_irq_init(msm_dt_gic_match);
 }
 
 static void __init msm8x60_init_late(void)
@@ -84,7 +37,6 @@ static void __init msm8x60_init_late(void)
smd_debugfs_init();
 }
 
-#ifdef CONFIG_OF
 static struct of_dev_auxdata msm_auxdata_lookup[] __initdata = {
{}
 };
@@ -100,56 +52,9 @@ static const char *msm8x60_fluid_match[] __initdata = {
"qcom,msm8660-surf",
NULL
 };
-#endif /* CONFIG_OF */
-
-MACHINE_START(MSM8X60_RUMI3, "QCT MSM8X60 RUMI3")
-   .fixup = msm8x60_fixup,
-   .reserve = msm8x60_reserve,
-   .map_io = msm8x60_map_io,
-   .init_irq = msm8x60_init_irq,
-   .handle_irq = gic_handle_irq,
-   .init_mach

[PATCH 13/24] ARM: msm: Add DT support to msm_timer

[David Brown]

From: Stephen Boyd 

Add support to setup the MSM timer via information obtained from
the devicetree.

Signed-off-by: Stephen Boyd 
[dav...@codeaurora.org: Remove leading zeros]
Signed-off-by: David Brown 
---
 .../devicetree/bindings/arm/msm/timer.txt  | 38 ++
 arch/arm/mach-msm/common.h |  1 +
 arch/arm/mach-msm/timer.c  | 87 ++
 3 files changed, 126 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/msm/timer.txt

diff --git a/Documentation/devicetree/bindings/arm/msm/timer.txt 
b/Documentation/devicetree/bindings/arm/msm/timer.txt
new file mode 100644
index 000..8c5907b
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/msm/timer.txt
@@ -0,0 +1,38 @@
+* MSM Timer
+
+Properties:
+
+- compatible : Should at least contain "qcom,msm-timer". More specific
+  properties such as "qcom,msm-gpt" and "qcom,msm-dgt" specify a general
+  purpose timer and a debug timer respectively.
+
+- interrupts : Interrupt indicating a match event.
+
+- reg : Specifies the base address of the timer registers. The second region
+  specifies an optional register used to configure the clock divider.
+
+- clock-frequency : The frequency of the timer in Hz.
+
+Optional:
+
+- cpu-offset : per-cpu offset used when the timer is accessed without the
+  CPU remapping facilities. The offset is cpu-offset * cpu-nr.
+
+Example:
+
+   timer@200a004 {
+   compatible = "qcom,msm-gpt", "qcom,msm-timer";
+   interrupts = <1 2 0x301>;
+   reg = <0x0200a004 0x10>;
+   clock-frequency = <32768>;
+   cpu-offset = <0x4>;
+   };
+
+   timer@200a024 {
+   compatible = "qcom,msm-dgt", "qcom,msm-timer";
+   interrupts = <1 3 0x301>;
+   reg = <0x0200a024 0x10>,
+ <0x0200a034 0x4>;
+   clock-frequency = <675>;
+   cpu-offset = <0x4>;
+   };
diff --git a/arch/arm/mach-msm/common.h b/arch/arm/mach-msm/common.h
index 4c2dd16..7d57fb0 100644
--- a/arch/arm/mach-msm/common.h
+++ b/arch/arm/mach-msm/common.h
@@ -16,6 +16,7 @@ extern struct sys_timer msm7x01_timer;
 extern struct sys_timer msm7x30_timer;
 extern struct sys_timer msm8x60_timer;
 extern struct sys_timer msm8960_timer;
+extern struct sys_timer msm_dt_timer;
 extern struct sys_timer qsd8x50_timer;
 
 #endif
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index e0b237b..9f9157a 100644
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -20,6 +20,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -216,6 +219,90 @@ err:
setup_sched_clock(msm_sched_clock_read, sched_bits, dgt_hz);
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id msm_dgt_match[] __initconst = {
+   { .compatible = "qcom,msm-dgt" },
+   { },
+};
+
+static const struct of_device_id msm_gpt_match[] __initconst = {
+   { .compatible = "qcom,msm-gpt" },
+   { },
+};
+
+static void __init msm_dt_timer_init(void)
+{
+   struct device_node *np;
+   u32 freq;
+   int irq;
+   struct resource res;
+   u32 percpu_offset;
+   void __iomem *dgt_clk_ctl;
+
+   np = of_find_matching_node(NULL, msm_gpt_match);
+   if (!np) {
+   pr_err("Can't find GPT DT node\n");
+   return;
+   }
+
+   event_base = of_iomap(np, 0);
+   if (!event_base) {
+   pr_err("Failed to map event base\n");
+   return;
+   }
+
+   irq = irq_of_parse_and_map(np, 0);
+   if (irq <= 0) {
+   pr_err("Can't get irq\n");
+   return;
+   }
+   of_node_put(np);
+
+   np = of_find_matching_node(NULL, msm_dgt_match);
+   if (!np) {
+   pr_err("Can't find DGT DT node\n");
+   return;
+   }
+
+   if (of_property_read_u32(np, "cpu-offset", &percpu_offset))
+   percpu_offset = 0;
+
+   if (of_address_to_resource(np, 0, &res)) {
+   pr_err("Failed to parse DGT resource\n");
+   return;
+   }
+
+   source_base = ioremap(res.start + percpu_offset, resource_size(&res));
+   if (!source_base) {
+   pr_err("Failed to map source base\n");
+   return;
+   }
+
+   if (!of_address_to_resource(np, 1, &res)) {
+   dgt_clk_ctl = ioremap(res.start + percpu_offset,
+ resource_size(&res));
+   if (!dgt_clk_ctl) {
+   pr_err("Failed to map DGT control base\n");
+   return;
+   }
+   wr

[PATCH 19/24] ARM: msm: Remove non-DT targets from 8960

[David Brown]

From: Stephen Boyd 

Remove the non-DT targets supported by 8960. This makes 8960 a
device tree only target.

Signed-off-by: Stephen Boyd 
Signed-off-by: David Brown 
---
 arch/arm/mach-msm/Kconfig   |  13 -
 arch/arm/mach-msm/Makefile  |   1 -
 arch/arm/mach-msm/board-msm8960.c   | 110 
 arch/arm/mach-msm/common.h  |   1 -
 arch/arm/mach-msm/devices-msm8960.c |  85 
 arch/arm/mach-msm/timer.c   |  13 -
 6 files changed, 223 deletions(-)
 delete mode 100644 arch/arm/mach-msm/board-msm8960.c
 delete mode 100644 arch/arm/mach-msm/devices-msm8960.c

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 2e5a27e..b2740c8 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -50,7 +50,6 @@ config ARCH_MSM8X60
 config ARCH_MSM8960
bool "MSM8960"
select ARCH_MSM_SCORPIONMP
-   select MACH_MSM8960_SIM if (!MACH_MSM8960_RUMI3)
select ARM_GIC
select CPU_V7
select MSM_V2_TLMM
@@ -112,18 +111,6 @@ config MACH_QSD8X50A_ST1_5
help
  Support for the Qualcomm ST1.5.
 
-config MACH_MSM8960_SIM
-   depends on ARCH_MSM8960
-   bool "MSM8960 Simulator"
-   help
- Support for the Qualcomm MSM8960 simulator.
-
-config MACH_MSM8960_RUMI3
-   depends on ARCH_MSM8960
-   bool "MSM8960 RUMI3"
-   help
- Support for the Qualcomm MSM8960 RUMI3 emulator.
-
 endmenu
 
 config MSM_SMD_PKG3
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index cef0ad4..9709766 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -26,7 +26,6 @@ obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o 
devices-msm7x00.o
 obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o
 obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o
 obj-$(CONFIG_ARCH_MSM8X60) += board-dt-8660.o
-obj-$(CONFIG_ARCH_MSM8960) += board-msm8960.o devices-msm8960.o
 obj-$(CONFIG_ARCH_MSM8960) += board-dt-8960.o
 
 obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-v1.o gpiomux.o
diff --git a/arch/arm/mach-msm/board-msm8960.c 
b/arch/arm/mach-msm/board-msm8960.c
deleted file mode 100644
index fafead2..000
--- a/arch/arm/mach-msm/board-msm8960.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- */
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-
-#include "devices.h"
-#include "common.h"
-
-static void __init msm8960_fixup(struct tag *tag, char **cmdline,
-   struct meminfo *mi)
-{
-   for (; tag->hdr.size; tag = tag_next(tag))
-   if (tag->hdr.tag == ATAG_MEM &&
-   tag->u.mem.start == 0x4020) {
-   tag->u.mem.start = 0x4000;
-   tag->u.mem.size += SZ_2M;
-   }
-}
-
-static void __init msm8960_reserve(void)
-{
-   memblock_remove(0x4000, SZ_2M);
-}
-
-static void __init msm8960_map_io(void)
-{
-   msm_map_msm8960_io();
-}
-
-static void __init msm8960_init_irq(void)
-{
-   gic_init(0, GIC_PPI_START, MSM_QGIC_DIST_BASE,
-(void *)MSM_QGIC_CPU_BASE);
-
-   if (machine_is_msm8960_rumi3())
-   writel(0x, MSM_QGIC_DIST_BASE + GIC_DIST_ENABLE_SET);
-}
-
-static struct platform_device *sim_devices[] __initdata = {
-   &msm8960_device_uart_gsbi2,
-};
-
-static struct platform_device *rumi3_devices[] __initdata = {
-   &msm8960_device_uart_gsbi5,
-};
-
-static void __init msm8960_sim_init(void)
-{
-   platform_add_devices(sim_devices, ARRAY_SIZE(sim_devices));
-}
-
-static void __init msm8960_rumi3_init(void)
-{
-   platform_add_devices(rumi3_devices, ARRAY_SIZE(rumi3_devices));
-}
-
-static void __init msm8960_init_late(void)
-{
-   smd_debugfs_init();
-}
-
-MACHINE_START(MSM8960_SIM, "QCT MSM8960 SIMULATOR")
-   .fixup = msm8960_fixup,
-   .reserve = msm8960_reserve,
-   .map_io = msm8960_map_io,
-   .init_irq = msm8960_init_irq,
-   .timer = &msm8960_timer,
-   .handle_irq = g

[PATCH 21/24] ARM: msm: Remove unused acpuclock-arm11

[David Brown]

From: Stephen Boyd 

This is dead code that isn't initialized or setup (although it is
compiled). Remove it and the data structures it references.

Signed-off-by: Stephen Boyd 
Signed-off-by: David Brown 
---
 arch/arm/mach-msm/Makefile |   2 +-
 arch/arm/mach-msm/acpuclock-arm11.c| 525 -
 arch/arm/mach-msm/acpuclock.h  |  32 --
 arch/arm/mach-msm/include/mach/board.h |  10 -
 4 files changed, 1 insertion(+), 568 deletions(-)
 delete mode 100644 arch/arm/mach-msm/acpuclock-arm11.c
 delete mode 100644 arch/arm/mach-msm/acpuclock.h

diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 9709766..17519fa 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -5,7 +5,7 @@ obj-$(CONFIG_DEBUG_FS) += clock-debug.o
 obj-$(CONFIG_MSM_VIC) += irq-vic.o
 obj-$(CONFIG_MSM_IOMMU) += devices-iommu.o
 
-obj-$(CONFIG_ARCH_MSM7X00A) += dma.o irq.o acpuclock-arm11.o
+obj-$(CONFIG_ARCH_MSM7X00A) += dma.o irq.o
 obj-$(CONFIG_ARCH_MSM7X30) += dma.o
 obj-$(CONFIG_ARCH_QSD8X50) += dma.o sirc.o
 
diff --git a/arch/arm/mach-msm/acpuclock-arm11.c 
b/arch/arm/mach-msm/acpuclock-arm11.c
deleted file mode 100644
index 805d4ee..000
--- a/arch/arm/mach-msm/acpuclock-arm11.c
+++ /dev/null
@@ -1,525 +0,0 @@
-/* arch/arm/mach-msm/acpuclock.c
- *
- * MSM architecture clock driver
- *
- * Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2007 QUALCOMM Incorporated
- * Author: San Mehat 
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "proc_comm.h"
-#include "acpuclock.h"
-
-
-#define A11S_CLK_CNTL_ADDR (MSM_CSR_BASE + 0x100)
-#define A11S_CLK_SEL_ADDR (MSM_CSR_BASE + 0x104)
-#define A11S_VDD_SVS_PLEVEL_ADDR (MSM_CSR_BASE + 0x124)
-
-/*
- * ARM11 clock configuration for specific ACPU speeds
- */
-
-#define ACPU_PLL_TCXO  -1
-#define ACPU_PLL_0 0
-#define ACPU_PLL_1 1
-#define ACPU_PLL_2 2
-#define ACPU_PLL_3 3
-
-#define PERF_SWITCH_DEBUG 0
-#define PERF_SWITCH_STEP_DEBUG 0
-
-struct clock_state
-{
-   struct clkctl_acpu_speed*current_speed;
-   struct mutexlock;
-   uint32_tacpu_switch_time_us;
-   uint32_tmax_speed_delta_khz;
-   uint32_tvdd_switch_time_us;
-   unsigned long   power_collapse_khz;
-   unsigned long   wait_for_irq_khz;
-};
-
-static struct clk *ebi1_clk;
-static struct clock_state drv_state = { 0 };
-
-static void __init acpuclk_init(void);
-
-/* MSM7201A Levels 3-6 all correspond to 1.2V, level 7 corresponds to 1.325V. 
*/
-enum {
-   VDD_0 = 0,
-   VDD_1 = 1,
-   VDD_2 = 2,
-   VDD_3 = 3,
-   VDD_4 = 3,
-   VDD_5 = 3,
-   VDD_6 = 3,
-   VDD_7 = 7,
-   VDD_END
-};
-
-struct clkctl_acpu_speed {
-   unsigned inta11clk_khz;
-   int pll;
-   unsigned inta11clk_src_sel;
-   unsigned inta11clk_src_div;
-   unsigned intahbclk_khz;
-   unsigned intahbclk_div;
-   int vdd;
-   unsigned intaxiclk_khz;
-   unsigned long   lpj; /* loops_per_jiffy */
-/* Index in acpu_freq_tbl[] for steppings. */
-   short   down;
-   short   up;
-};
-
-/*
- * ACPU speed table. Complete table is shown but certain speeds are commented
- * out to optimized speed switching. Initialize loops_per_jiffy to 0.
- *
- * Table stepping up/down is optimized for 256mhz jumps while staying on the
- * same PLL.
- */
-#if (0)
-static struct clkctl_acpu_speed  acpu_freq_tbl[] = {
-   { 19200, ACPU_PLL_TCXO, 0, 0, 19200, 0, VDD_0, 30720, 0, 0, 8 },
-   { 61440, ACPU_PLL_0,  4, 3, 61440,  0, VDD_0, 30720,  0, 0, 8 },
-   { 81920, ACPU_PLL_0,  4, 2, 40960,  1, VDD_0, 61440,  0, 0, 8 },
-   { 96000, ACPU_PLL_1,  1, 7, 48000,  1, VDD_0, 61440,  0, 0, 9 },
-   { 122880, ACPU_PLL_0, 4, 1, 61440,  1, VDD_3, 61440,  0, 0, 8 },
-   { 128000, ACPU_PLL_1, 1, 5, 64000,  1, VDD_3, 61440,  0, 0, 12 },
-   { 176000, ACPU_PLL_2, 2, 5, 88000,  1, VDD_3, 61440,  0, 0, 11 },
-   { 192000, ACPU_PLL_1, 1, 3, 64000,  2, VDD_3, 61440,  0, 0, 12 },
-   { 245760, ACPU_PLL_0, 4, 0, 81920,  2, VDD_4, 61440,  0, 0, 12 },
-   { 256000, ACPU_PLL_1, 1, 2, 128000, 2, VDD_5, 128000, 0, 0, 12 },
-   { 264000, ACPU_PLL_2, 2, 3, 88000,  2

[PATCH 23/24] ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist

[David Brown]

From: Stephen Boyd 

Remove the unused GCC, ACC, and shared memory definitions in the
8660 static mappings. This allows the 8660 header file to be
included in msm_iomap.h unconditionally.

Signed-off-by: Stephen Boyd 
Signed-off-by: David Brown 
---
 arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 11 ---
 arch/arm/mach-msm/include/mach/msm_iomap.h  |  3 +--
 arch/arm/mach-msm/io.c  |  2 --
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h 
b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
index c6d38f1..199372e 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
@@ -41,21 +41,10 @@
 #define MSM8X60_QGIC_CPU_PHYS  0x02081000
 #define MSM8X60_QGIC_CPU_SIZE  SZ_4K
 
-#define MSM_ACC_BASE   IOMEM(0xF0002000)
-#define MSM_ACC_PHYS   0x02001000
-#define MSM_ACC_SIZE   SZ_4K
-
-#define MSM_GCC_BASE   IOMEM(0xF0003000)
-#define MSM_GCC_PHYS   0x02082000
-#define MSM_GCC_SIZE   SZ_4K
-
 #define MSM_TLMM_BASE  IOMEM(0xF0004000)
 #define MSM_TLMM_PHYS  0x0080
 #define MSM_TLMM_SIZE  SZ_16K
 
-#define MSM_SHARED_RAM_BASEIOMEM(0xF010)
-#define MSM_SHARED_RAM_SIZESZ_1M
-
 #define MSM8X60_TMR_PHYS   0x0200
 #define MSM8X60_TMR_SIZE   SZ_4K
 
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap.h 
b/arch/arm/mach-msm/include/mach/msm_iomap.h
index 00afdfb..2ab7cf0 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap.h
@@ -41,12 +41,11 @@
 #include "msm_iomap-7x30.h"
 #elif defined(CONFIG_ARCH_QSD8X50)
 #include "msm_iomap-8x50.h"
-#elif defined(CONFIG_ARCH_MSM8X60)
-#include "msm_iomap-8x60.h"
 #else
 #include "msm_iomap-7x00.h"
 #endif
 
+#include "msm_iomap-8x60.h"
 #include "msm_iomap-8960.h"
 
 #define MSM_DEBUG_UART_SIZESZ_4K
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index 3854f6f..123ef9c 100644
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -111,8 +111,6 @@ static struct map_desc msm8x60_io_desc[] __initdata = {
MSM_CHIP_DEVICE(QGIC_CPU, MSM8X60),
MSM_CHIP_DEVICE(TMR, MSM8X60),
MSM_CHIP_DEVICE(TMR0, MSM8X60),
-   MSM_DEVICE(ACC),
-   MSM_DEVICE(GCC),
 #ifdef CONFIG_DEBUG_MSM8660_UART
MSM_DEVICE(DEBUG_UART),
 #endif
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 22/24] ARM: msm: Remove uncompiled board-msm7x27

[David Brown]

From: Stephen Boyd 

This board file has never been compiled. Let's just remove it
along with the one Kconfig reference to it in io.c.

Signed-off-by: Stephen Boyd 
Signed-off-by: David Brown 
---
 arch/arm/mach-msm/board-msm7x27.c | 170 --
 arch/arm/mach-msm/io.c|   3 +-
 2 files changed, 1 insertion(+), 172 deletions(-)
 delete mode 100644 arch/arm/mach-msm/board-msm7x27.c

diff --git a/arch/arm/mach-msm/board-msm7x27.c 
b/arch/arm/mach-msm/board-msm7x27.c
deleted file mode 100644
index 451ab1d..000
--- a/arch/arm/mach-msm/board-msm7x27.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
- * Author: Brian Swetland 
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#ifdef CONFIG_CACHE_L2X0
-#include 
-#endif
-
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-
-#include "devices.h"
-#include "socinfo.h"
-#include "clock.h"
-
-static struct resource smc91x_resources[] = {
-   [0] = {
-   .start  = 0x9C004300,
-   .end= 0x9C0043ff,
-   .flags  = IORESOURCE_MEM,
-   },
-   [1] = {
-   .start  = MSM_GPIO_TO_INT(132),
-   .end= MSM_GPIO_TO_INT(132),
-   .flags  = IORESOURCE_IRQ,
-   },
-};
-
-static struct platform_device smc91x_device = {
-   .name   = "smc91x",
-   .id = 0,
-   .num_resources  = ARRAY_SIZE(smc91x_resources),
-   .resource   = smc91x_resources,
-};
-
-static struct platform_device *devices[] __initdata = {
-   &msm_device_uart3,
-   &msm_device_smd,
-   &msm_device_dmov,
-   &msm_device_nand,
-   &smc91x_device,
-};
-
-extern struct sys_timer msm_timer;
-
-static void __init msm7x2x_init_irq(void)
-{
-   msm_init_irq();
-}
-
-static void __init msm7x2x_init(void)
-{
-   if (socinfo_init() < 0)
-   BUG();
-
-   if (machine_is_msm7x25_ffa() || machine_is_msm7x27_ffa()) {
-   smc91x_resources[0].start = 0x98000300;
-   smc91x_resources[0].end = 0x980003ff;
-   smc91x_resources[1].start = MSM_GPIO_TO_INT(85);
-   smc91x_resources[1].end = MSM_GPIO_TO_INT(85);
-   if (gpio_tlmm_config(GPIO_CFG(85, 0,
- GPIO_INPUT,
- GPIO_PULL_DOWN,
- GPIO_2MA),
-GPIO_ENABLE)) {
-   printk(KERN_ERR
-  "%s: Err: Config GPIO-85 INT\n",
-   __func__);
-   }
-   }
-
-   platform_add_devices(devices, ARRAY_SIZE(devices));
-}
-
-static void __init msm7x2x_map_io(void)
-{
-   msm_map_common_io();
-   /* Technically dependent on the SoC but using machine_is
-* macros since socinfo is not available this early and there
-* are plans to restructure the code which will eliminate the
-* need for socinfo.
-*/
-   if (machine_is_msm7x27_surf() || machine_is_msm7x27_ffa())
-   msm_clock_init(msm_clocks_7x27, msm_num_clocks_7x27);
-
-   if (machine_is_msm7x25_surf() || machine_is_msm7x25_ffa())
-   msm_clock_init(msm_clocks_7x25, msm_num_clocks_7x25);
-
-#ifdef CONFIG_CACHE_L2X0
-   if (machine_is_msm7x27_surf() || machine_is_msm7x27_ffa()) {
-   /* 7x27 has 256KB L2 cache:
-   64Kb/Way and 4-Way Associativity;
-   R/W latency: 3 cycles;
-   evmon/parity/share disabled. */
-   l2x0_init(MSM_L2CC_BASE, 0x00068012, 0xfe00);
-   }
-#endif
-}
-
-static void __init msm7x2x_init_late(void)
-{
-   smd_debugfs_init();
-}
-
-MACHINE_START(MSM7X27_SURF, "QCT MSM7x27 SURF")
-   .atag_offset= 0x100,
-   .map_io = msm7x2x_map_io,
-   .init_irq   = msm7x2x_init_irq,
-   .init_machine   = msm7x2x_init,
-   .init_late  = msm7x2x_init_late,
-   .timer  = &msm_timer,
-MACHINE_END
-
-MACHINE_START(MSM7X27_FFA, "QCT MSM7x27 FFA")
-   .atag_offset= 0x100,
-   .map_io = msm7x2x_map_io,

[PATCH 18/24] ARM: msm: Add DT support for 8960

[David Brown]

From: Stephen Boyd 

Add basic support to boot 8960 with device tree. For now just
support a basic machine with a uart device.

Signed-off-by: Stephen Boyd 
[dav...@codeaurora.org: Remove leading zeros]
Signed-off-by: David Brown 
---
 arch/arm/boot/dts/msm8960-cdp.dts | 41 
 arch/arm/mach-msm/Kconfig |  1 +
 arch/arm/mach-msm/Makefile|  1 +
 arch/arm/mach-msm/Makefile.boot   |  1 +
 arch/arm/mach-msm/board-dt-8960.c | 49 +++
 5 files changed, 93 insertions(+)
 create mode 100644 arch/arm/boot/dts/msm8960-cdp.dts
 create mode 100644 arch/arm/mach-msm/board-dt-8960.c

diff --git a/arch/arm/boot/dts/msm8960-cdp.dts 
b/arch/arm/boot/dts/msm8960-cdp.dts
new file mode 100644
index 000..9e621b5
--- /dev/null
+++ b/arch/arm/boot/dts/msm8960-cdp.dts
@@ -0,0 +1,41 @@
+/dts-v1/;
+
+/include/ "skeleton.dtsi"
+
+/ {
+   model = "Qualcomm MSM8960 CDP";
+   compatible = "qcom,msm8960-cdp", "qcom,msm8960";
+   interrupt-parent = <&intc>;
+
+   intc: interrupt-controller@200 {
+   compatible = "qcom,msm-qgic2";
+   interrupt-controller;
+   #interrupt-cells = <3>;
+   reg = < 0x0200 0x1000 >,
+ < 0x02002000 0x1000 >;
+   };
+
+   timer@200a004 {
+   compatible = "qcom,msm-gpt", "qcom,msm-timer";
+   interrupts = <1 2 0x301>;
+   reg = <0x0200a004 0x10>;
+   clock-frequency = <32768>;
+   cpu-offset = <0x8>;
+   };
+
+   timer@200a024 {
+   compatible = "qcom,msm-dgt", "qcom,msm-timer";
+   interrupts = <1 1 0x301>;
+   reg = <0x0200a024 0x10>,
+ <0x0200a034 0x4>;
+   clock-frequency = <675>;
+   cpu-offset = <0x8>;
+   };
+
+   serial@19c40 {
+   compatible = "qcom,msm-hsuart", "qcom,msm-uart";
+   reg = <0x1644 0x1000>,
+ <0x1640 0x1000>;
+   interrupts = <0 154 0x0>;
+   };
+};
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index cd78427..2e5a27e 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -56,6 +56,7 @@ config ARCH_MSM8960
select MSM_V2_TLMM
select MSM_GPIOMUX
select MSM_SCM if SMP
+   select USE_OF
 
 endchoice
 
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 8794148..cef0ad4 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o 
devices-msm7x30.o
 obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o
 obj-$(CONFIG_ARCH_MSM8X60) += board-dt-8660.o
 obj-$(CONFIG_ARCH_MSM8960) += board-msm8960.o devices-msm8960.o
+obj-$(CONFIG_ARCH_MSM8960) += board-dt-8960.o
 
 obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-v1.o gpiomux.o
 obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o gpiomux-v1.o gpiomux.o
diff --git a/arch/arm/mach-msm/Makefile.boot b/arch/arm/mach-msm/Makefile.boot
index 8de0678..f7d6ae9 100644
--- a/arch/arm/mach-msm/Makefile.boot
+++ b/arch/arm/mach-msm/Makefile.boot
@@ -3,3 +3,4 @@ params_phys-y   := 0x1100
 initrd_phys-y  := 0x1080
 
 dtb-$(CONFIG_ARCH_MSM8X60) += msm8660-surf.dtb
+dtb-$(CONFIG_ARCH_MSM8960) += msm8960-cdp.dtb
diff --git a/arch/arm/mach-msm/board-dt-8960.c 
b/arch/arm/mach-msm/board-dt-8960.c
new file mode 100644
index 000..8df99b8f
--- /dev/null
+++ b/arch/arm/mach-msm/board-dt-8960.c
@@ -0,0 +1,49 @@
+/* Copyright (c) 2012, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#include "common.h"
+
+static const struct of_device_id msm_dt_gic_match[] __initconst = {
+   { .compatible = "qcom,msm-qgic2", .data = gic_of_init },
+   { }
+};
+
+static void __init msm_dt_init_irq(void)
+{
+   of_irq_init(msm_dt_gic_match);
+}
+
+static void __init msm_dt_init(void)
+{
+   of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
+static const char * const msm8960_dt_match[] __initconst = {
+   "qcom,msm8960-cdp",
+   NULL
+};
+
+DT_MACHINE_START(MSM8960_DT, "Qualcomm MSM 

[PATCH 24/24] ARM: msm: Allow 8960 and 8660 to compile together

[David Brown]

From: Stephen Boyd 

Modify the Kconfig to allow the MSM 8660 and MSM 8960 targets to
compile together in the same build. As long as one of these two
targets is selected the choice menu used to select which SoC to
support will be hidden. Deselecting both of these targets will
reintroduce the choice menu, and allow users to select targets
that must be compiled in isolation.

Signed-off-by: Stephen Boyd 
Signed-off-by: David Brown 
---
 arch/arm/mach-msm/Kconfig | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index b2740c8..7902de15 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -1,8 +1,12 @@
 if ARCH_MSM
 
+comment "Qualcomm MSM SoC Type"
+   depends on (ARCH_MSM8X60 || ARCH_MSM8960)
+
 choice
prompt "Qualcomm MSM SoC Type"
default ARCH_MSM7X00A
+   depends on !(ARCH_MSM8X60 || ARCH_MSM8960)
 
 config ARCH_MSM7X00A
bool "MSM7x00A / MSM7x01A"
@@ -36,6 +40,8 @@ config ARCH_QSD8X50
select GPIO_MSM_V1
select MSM_PROC_COMM
 
+endchoice
+
 config ARCH_MSM8X60
bool "MSM8X60"
select ARCH_MSM_SCORPIONMP
@@ -57,8 +63,6 @@ config ARCH_MSM8960
select MSM_SCM if SMP
select USE_OF
 
-endchoice
-
 config MSM_HAS_DEBUG_UART_HS
bool
 
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 01/24] ARM: msm: Remove msm_hw_reset_hook

[David Brown]

From: Stephen Boyd 

This reset hook is never assigned and is dead code. Remove it so
we have one less header file in the mach directory.

Signed-off-by: Stephen Boyd 
Signed-off-by: David Brown 
---
 arch/arm/mach-msm/board-mahimahi.c  |  1 -
 arch/arm/mach-msm/board-sapphire.c  |  1 -
 arch/arm/mach-msm/include/mach/system.h | 19 ---
 arch/arm/mach-msm/proc_comm.c   |  1 -
 arch/arm/mach-msm/smd.c |  7 ---
 5 files changed, 29 deletions(-)
 delete mode 100644 arch/arm/mach-msm/include/mach/system.h

diff --git a/arch/arm/mach-msm/board-mahimahi.c 
b/arch/arm/mach-msm/board-mahimahi.c
index cf1f89a..df00bc0 100644
--- a/arch/arm/mach-msm/board-mahimahi.c
+++ b/arch/arm/mach-msm/board-mahimahi.c
@@ -30,7 +30,6 @@
 
 #include 
 #include 
-#include 
 
 #include "board-mahimahi.h"
 #include "devices.h"
diff --git a/arch/arm/mach-msm/board-sapphire.c 
b/arch/arm/mach-msm/board-sapphire.c
index 2e569ab..b7b0fc7 100644
--- a/arch/arm/mach-msm/board-sapphire.c
+++ b/arch/arm/mach-msm/board-sapphire.c
@@ -27,7 +27,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/arch/arm/mach-msm/include/mach/system.h 
b/arch/arm/mach-msm/include/mach/system.h
deleted file mode 100644
index f5fb2ec..000
--- a/arch/arm/mach-msm/include/mach/system.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* arch/arm/mach-msm/include/mach/system.h
- *
- * Copyright (C) 2007 Google, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-/* low level hardware reset hook -- for example, hitting the
- * PSHOLD line on the PMIC to hard reset the system
- */
-extern void (*msm_hw_reset_hook)(void);
diff --git a/arch/arm/mach-msm/proc_comm.c b/arch/arm/mach-msm/proc_comm.c
index 9980dc7..8f1eecd 100644
--- a/arch/arm/mach-msm/proc_comm.c
+++ b/arch/arm/mach-msm/proc_comm.c
@@ -19,7 +19,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include "proc_comm.h"
 
diff --git a/arch/arm/mach-msm/smd.c b/arch/arm/mach-msm/smd.c
index 657be73..84183ed 100644
--- a/arch/arm/mach-msm/smd.c
+++ b/arch/arm/mach-msm/smd.c
@@ -30,7 +30,6 @@
 #include 
 
 #include 
-#include 
 
 #include "smd_private.h"
 #include "proc_comm.h"
@@ -39,8 +38,6 @@
 #define CONFIG_QDSP6 1
 #endif
 
-void (*msm_hw_reset_hook)(void);
-
 #define MODULE_NAME "msm_smd"
 
 enum {
@@ -101,10 +98,6 @@ static void handle_modem_crash(void)
pr_err("ARM9 has CRASHED\n");
smd_diag();
 
-   /* hard reboot if possible */
-   if (msm_hw_reset_hook)
-   msm_hw_reset_hook();
-
/* in this case the modem or watchdog should reboot us */
for (;;)
;
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 20/24] ARM: msm: dma: use list_move_tail instead of list_del/list_add_tail

[David Brown]

From: Wei Yongjun 

Using list_move_tail() instead of list_del() + list_add_tail().

spatch with a semantic match is used to found this problem.
(http://coccinelle.lip6.fr/)

Signed-off-by: Wei Yongjun 
Signed-off-by: David Brown 
---
 arch/arm/mach-msm/dma.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/mach-msm/dma.c b/arch/arm/mach-msm/dma.c
index 02cae5e..354b91d 100644
--- a/arch/arm/mach-msm/dma.c
+++ b/arch/arm/mach-msm/dma.c
@@ -223,8 +223,7 @@ static irqreturn_t msm_datamover_irq_handler(int irq, void 
*dev_id)
PRINT_FLOW("msm_datamover_irq_handler id %d, status 
%x\n", id, ch_status);
if ((ch_status & DMOV_STATUS_CMD_PTR_RDY) && 
!list_empty(&ready_commands[id])) {
cmd = list_entry(ready_commands[id].next, 
typeof(*cmd), list);
-   list_del(&cmd->list);
-   list_add_tail(&cmd->list, &active_commands[id]);
+   list_move_tail(&cmd->list, 
&active_commands[id]);
if (cmd->execute_func)
cmd->execute_func(cmd);
PRINT_FLOW("msm_datamover_irq_handler id %d, 
start command\n", id);
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 06/24] ARM: msm: io: Change the default static iomappings to be shared

[David Brown]

From: Rohit Vaswani 

With 3.4 kernel the static iomappings can be shared with the ioremap
mappings. If ioremap is called with an address for which a static
mapping already exists, then that mapping should be used instead
of creating a new one.

However, the MT_DEVICE_NONSHARED flag prevents this. Hence, get rid
of this flag. Some targets (7X00) that require the static iomappings
to be NONSHARED use the MSM_DEVICE_TYPE and MSM_CHIP_DEVICE_TYPE macros.

Signed-off-by: Rohit Vaswani 
Signed-off-by: David Brown 
---
 arch/arm/mach-msm/io.c | 22 +-
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index 2409c0b..af43f6a 100644
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -29,27 +29,31 @@
 
 #include 
 
-#define MSM_CHIP_DEVICE(name, chip) {\
+#define MSM_CHIP_DEVICE_TYPE(name, chip, mem_type) { \
.virtual = (unsigned long) MSM_##name##_BASE, \
.pfn = __phys_to_pfn(chip##_##name##_PHYS), \
.length = chip##_##name##_SIZE, \
-   .type = MT_DEVICE_NONSHARED, \
+   .type = mem_type, \
 }
 
+#define MSM_DEVICE_TYPE(name, mem_type) \
+   MSM_CHIP_DEVICE_TYPE(name, MSM, mem_type)
+#define MSM_CHIP_DEVICE(name, chip) \
+   MSM_CHIP_DEVICE_TYPE(name, chip, MT_DEVICE)
 #define MSM_DEVICE(name) MSM_CHIP_DEVICE(name, MSM)
 
 #if defined(CONFIG_ARCH_MSM7X00A) || defined(CONFIG_ARCH_MSM7X27) \
|| defined(CONFIG_ARCH_MSM7X25)
 static struct map_desc msm_io_desc[] __initdata = {
-   MSM_DEVICE(VIC),
-   MSM_CHIP_DEVICE(CSR, MSM7X00),
-   MSM_DEVICE(DMOV),
-   MSM_CHIP_DEVICE(GPIO1, MSM7X00),
-   MSM_CHIP_DEVICE(GPIO2, MSM7X00),
-   MSM_DEVICE(CLK_CTL),
+   MSM_DEVICE_TYPE(VIC, MT_DEVICE_NONSHARED),
+   MSM_CHIP_DEVICE_TYPE(CSR, MSM7X00, MT_DEVICE_NONSHARED),
+   MSM_DEVICE_TYPE(DMOV, MT_DEVICE_NONSHARED),
+   MSM_CHIP_DEVICE_TYPE(GPIO1, MSM7X00, MT_DEVICE_NONSHARED),
+   MSM_CHIP_DEVICE_TYPE(GPIO2, MSM7X00, MT_DEVICE_NONSHARED),
+   MSM_DEVICE_TYPE(CLK_CTL, MT_DEVICE_NONSHARED),
 #if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \
defined(CONFIG_DEBUG_MSM_UART3)
-   MSM_DEVICE(DEBUG_UART),
+   MSM_DEVICE_TYPE(DEBUG_UART, MT_DEVICE_NONSHARED),
 #endif
{
.virtual =  (unsigned long) MSM_SHARED_RAM_BASE,
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 09/24] ARM: msm: Remove call to missing FPGA init on 8660

[David Brown]

A previous patch[1] added code to initialize an FPGA register on the
8660 "SURF" development platform.  Since this development platform is
not widely available, and there is now a more available device "the
Dragonboard" based on the same core SOC, this change was dropped.

However, the DT code kept a lingering call to this FPGA init function.
Remove it.

[1] https://lkml.org/lkml/2011/8/12/357

Signed-off-by: David Brown 
---
 arch/arm/mach-msm/board-msm8x60.c | 5 -
 1 file changed, 5 deletions(-)

diff --git a/arch/arm/mach-msm/board-msm8x60.c 
b/arch/arm/mach-msm/board-msm8x60.c
index 13ca9bb..ad87207 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -93,11 +93,6 @@ static struct of_dev_auxdata msm_auxdata_lookup[] __initdata 
= {
 
 static void __init msm8x60_dt_init(void)
 {
-   if (of_machine_is_compatible("qcom,msm8660-surf")) {
-   printk(KERN_INFO "Init surf UART registers\n");
-   msm8x60_init_uart12dm();
-   }
-
of_platform_populate(NULL, of_default_bus_match_table,
msm_auxdata_lookup, NULL);
 }
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 08/24] ARM: msm: Add msm8660-surf.dts to Makefile.boot

[David Brown]

From: Stephen Boyd 

Add this entry to the Makefile so that we can build the dtb
automatically with 'make dtbs'.

Signed-off-by: Stephen Boyd 
Signed-off-by: David Brown 
---
 arch/arm/mach-msm/Makefile.boot | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/mach-msm/Makefile.boot b/arch/arm/mach-msm/Makefile.boot
index 9b803a5..8de0678 100644
--- a/arch/arm/mach-msm/Makefile.boot
+++ b/arch/arm/mach-msm/Makefile.boot
@@ -1,3 +1,5 @@
   zreladdr-y   += 0x10008000
 params_phys-y  := 0x1100
 initrd_phys-y  := 0x1080
+
+dtb-$(CONFIG_ARCH_MSM8X60) += msm8660-surf.dtb
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] msm-core changes for v3.7

[David Brown]

Sigh.  I appear to have mangled the headers the first time.  So,
instead of a nice patch series in reply to the pull request, the pull
request is in reply to the first patch.  Sorry about that.

David

The following changes since commit 28a33cbc24e4256c143dce96c7d93bf423229f92:

  Linux 3.5 (2012-07-21 13:58:29 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git 
tags/msm-core-for-3.7

for you to fetch changes up to fe3a47b1c7cd74a7e39cec1fa0d89bd3724f4f65:

  ARM: msm: Allow 8960 and 8660 to compile together (2012-09-12 09:31:56 -0700)


In addition to some minor fixes, this series fully converts two
primary MSM targets (8660 and 8960) exclusively to devicetree.  It
removes a lot of dead code, both from the devicetree conversion, and
code that has never been compiled.

It is now possible to build both 8660 and 8960 into the same kernel.
Not quite ready to be part of a single zImage, but at least many of
the internal issues preventing this are resolved.


David Brown (1):
  ARM: msm: Remove call to missing FPGA init on 8660

Rohit Vaswani (2):
  ARM: msm: io: Remove 7x30 iomap region from 7x00
  ARM: msm: io: Change the default static iomappings to be shared

Stephen Boyd (20):
  ARM: msm: Remove msm_hw_reset_hook
  ARM: msm: clock-pcom: Mark functions static
  ARM: msm: Remove unused idle.c
  ARM: msm: Fix early debug uart mapping on some memory configs
  ARM: msm: Add handle_irq handler for 8660 DT machine
  ARM: msm: Add msm8660-surf.dts to Makefile.boot
  ARM: msm: Fix sparse warnings due to incorrect type
  ARM: msm: Don't touch GIC registers outside of GIC code
  ARM: msm: Allow timer.c to compile on multiple targets
  ARM: msm: Add DT support to msm_timer
  ARM: msm: Move 8660 to DT timer
  ARM: msm: Make 8660 a DT only target
  ARM: msm: Rename board-msm8x60 to signify its DT only status
  ARM: msm: Move io mapping prototypes to common.h
  ARM: msm: Add DT support for 8960
  ARM: msm: Remove non-DT targets from 8960
  ARM: msm: Remove unused acpuclock-arm11
  ARM: msm: Remove uncompiled board-msm7x27
  ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist
  ARM: msm: Allow 8960 and 8660 to compile together

Wei Yongjun (1):
  ARM: msm: dma: use list_move_tail instead of list_del/list_add_tail

 .../devicetree/bindings/arm/msm/timer.txt  |  38 ++
 arch/arm/boot/dts/msm8660-surf.dts |  19 +-
 arch/arm/boot/dts/msm8960-cdp.dts  |  41 ++
 arch/arm/mach-msm/Kconfig  |  49 +-
 arch/arm/mach-msm/Makefile |   8 +-
 arch/arm/mach-msm/Makefile.boot|   3 +
 arch/arm/mach-msm/acpuclock-arm11.c| 525 -
 arch/arm/mach-msm/acpuclock.h  |  32 --
 arch/arm/mach-msm/board-dt-8660.c  |  63 +++
 arch/arm/mach-msm/board-dt-8960.c  |  49 ++
 arch/arm/mach-msm/board-halibut.c  |   5 +-
 arch/arm/mach-msm/board-mahimahi.c |   1 -
 arch/arm/mach-msm/board-msm7x27.c  | 170 ---
 arch/arm/mach-msm/board-msm7x30.c  |   9 +-
 arch/arm/mach-msm/board-msm8960.c  | 122 -
 arch/arm/mach-msm/board-msm8x60.c  | 166 ---
 arch/arm/mach-msm/board-qsd8x50.c  |   7 +-
 arch/arm/mach-msm/board-sapphire.c |   1 -
 arch/arm/mach-msm/board-trout.c|   5 +-
 arch/arm/mach-msm/clock-pcom.c |  18 +-
 arch/arm/mach-msm/common.h |  30 ++
 arch/arm/mach-msm/devices-msm8960.c|  85 
 arch/arm/mach-msm/dma.c|   3 +-
 arch/arm/mach-msm/idle.c   |  49 --
 arch/arm/mach-msm/include/mach/board.h |  13 -
 arch/arm/mach-msm/include/mach/msm_iomap-7x00.h|   7 -
 arch/arm/mach-msm/include/mach/msm_iomap-7x30.h|   4 -
 arch/arm/mach-msm/include/mach/msm_iomap-8960.h|   6 +-
 arch/arm/mach-msm/include/mach/msm_iomap-8x50.h|   4 -
 arch/arm/mach-msm/include/mach/msm_iomap-8x60.h|  17 +-
 arch/arm/mach-msm/include/mach/msm_iomap.h |   3 +-
 arch/arm/mach-msm/include/mach/system.h|  19 -
 arch/arm/mach-msm/io.c |  32 +-
 arch/arm/mach-msm/platsmp.c|   8 -
 arch/arm/mach-msm/proc_comm.c  |   1 -
 arch/arm/mach-msm/smd.c|   7 -
 arch/arm/mach-msm/timer.c  | 188 ++--
 37 files changed, 443 insertions(+), 1364 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/msm/timer.txt
 create mode 100644 arch/arm/boot/dts/ms

[PATCH 07/24] ARM: msm: Add handle_irq handler for 8660 DT machine

[David Brown]

From: Stephen Boyd 

Commit 041f777 (ARM: msm: convert SMP platforms to
CONFIG_MULTI_IRQ_HANDLER, 2011-09-06) forgot to add the
.handle_irq for the DT machine record. Add it so we get
interrupts instead of panics on DT enabled bootloaders.

Signed-off-by: Stephen Boyd 
Signed-off-by: David Brown 
---
 arch/arm/mach-msm/board-msm8x60.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-msm/board-msm8x60.c 
b/arch/arm/mach-msm/board-msm8x60.c
index e37a724..13ca9bb 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -158,6 +158,7 @@ MACHINE_END
 DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
.map_io = msm8x60_map_io,
.init_irq = msm8x60_init_irq,
+   .handle_irq = gic_handle_irq,
.init_machine = msm8x60_dt_init,
.init_late = msm8x60_init_late,
.timer = &msm_timer,
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 03/24] ARM: msm: Remove unused idle.c

[David Brown]

From: Stephen Boyd 

Forcing arm_pm_idle to be msm_idle() doesn't make sense in
configurations that don't have CONFIG_MSM7X00A_IDLE=y (i.e. any
targets that aren't 7x00a). Furthermore, that config doesn't even
exist, so this entire file is dead code. Just remove it so we can
use the default idle support on MSM.

Signed-off-by: Stephen Boyd 
Signed-off-by: David Brown 
---
 arch/arm/mach-msm/Makefile |  2 +-
 arch/arm/mach-msm/idle.c   | 49 --
 2 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 arch/arm/mach-msm/idle.c

diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 4ad3969..5fd0464 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -1,4 +1,4 @@
-obj-y += io.o idle.o timer.o
+obj-y += io.o timer.o
 obj-y += clock.o
 obj-$(CONFIG_DEBUG_FS) += clock-debug.o
 
diff --git a/arch/arm/mach-msm/idle.c b/arch/arm/mach-msm/idle.c
deleted file mode 100644
index 0c9e13c..000
--- a/arch/arm/mach-msm/idle.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* arch/arm/mach-msm/idle.c
- *
- * Idle processing for MSM7K - work around bugs with SWFI.
- *
- * Copyright (c) 2007 QUALCOMM Incorporated.
- * Copyright (C) 2007 Google, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#include 
-#include 
-
-static void msm_idle(void)
-{
-#ifdef CONFIG_MSM7X00A_IDLE
-   asm volatile (
-
-   "mrc p15, 0, r1, c1, c0, 0/* read current CR*/ \n\t"
-   "bic r0, r1, #(1 << 2)/* clear dcache bit   */ \n\t"
-   "bic r0, r0, #(1 << 12)   /* clear icache bit   */ \n\t"
-   "mcr p15, 0, r0, c1, c0, 0/* disable d/i cache  */ \n\t"
-
-   "mov r0, #0   /* prepare wfi value  */ \n\t"
-   "mcr p15, 0, r0, c7, c10, 0   /* flush the cache*/ \n\t"
-   "mcr p15, 0, r0, c7, c10, 4   /* memory barrier */ \n\t"
-   "mcr p15, 0, r0, c7, c0, 4/* wait for interrupt */ \n\t"
-
-   "mcr p15, 0, r1, c1, c0, 0/* restore d/i cache  */ \n\t"
-
-   : : : "r0","r1" );
-#endif
-}
-
-static int __init msm_idle_init(void)
-{
-   arm_pm_idle = msm_idle;
-   return 0;
-}
-
-arch_initcall(msm_idle_init);
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 05/24] ARM: msm: io: Remove 7x30 iomap region from 7x00

[David Brown]

From: Rohit Vaswani 

This is redundant code.

Signed-off-by: Rohit Vaswani 
Signed-off-by: David Brown 
---
 arch/arm/mach-msm/io.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index a1e7b11..2409c0b 100644
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -51,9 +51,6 @@ static struct map_desc msm_io_desc[] __initdata = {
defined(CONFIG_DEBUG_MSM_UART3)
MSM_DEVICE(DEBUG_UART),
 #endif
-#ifdef CONFIG_ARCH_MSM7X30
-   MSM_DEVICE(GCC),
-#endif
{
.virtual =  (unsigned long) MSM_SHARED_RAM_BASE,
.pfn = __phys_to_pfn(MSM_SHARED_RAM_PHYS),
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 04/24] ARM: msm: Fix early debug uart mapping on some memory configs

[David Brown]

From: Stephen Boyd 

The uart mapping runs into the space allocated for lowmem on some
8960 boards when we have more than 512Mb of memory. We were
getting lucky before and our mapping wasn't part of DDR. Move the
mapping up into the vmalloc area which will always be outside of
the lowmem mapping regardless of how much lowmem actually exists.

Signed-off-by: Stephen Boyd 
Signed-off-by: David Brown 
---
 arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 2 +-
 arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8960.h 
b/arch/arm/mach-msm/include/mach/msm_iomap-8960.h
index a1752c0..facf434 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8960.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8960.h
@@ -46,7 +46,7 @@
 #define MSM8960_TMR0_SIZE  SZ_4K
 
 #ifdef CONFIG_DEBUG_MSM8960_UART
-#define MSM_DEBUG_UART_BASE0xE104
+#define MSM_DEBUG_UART_BASE0xF004
 #define MSM_DEBUG_UART_PHYS0x1644
 #endif
 
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h 
b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
index 5aed57d..21a2a88 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
@@ -63,7 +63,7 @@
 #define MSM8X60_TMR0_SIZE  SZ_4K
 
 #ifdef CONFIG_DEBUG_MSM8660_UART
-#define MSM_DEBUG_UART_BASE0xE104
+#define MSM_DEBUG_UART_BASE0xF004
 #define MSM_DEBUG_UART_PHYS0x19C4
 #endif
 
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 02/24] ARM: msm: clock-pcom: Mark functions static

[David Brown]

From: Stephen Boyd 

These functions are only used within clock-pcom.c, therefore mark
them as static.

Signed-off-by: Stephen Boyd 
Signed-off-by: David Brown 
---
 arch/arm/mach-msm/clock-pcom.c | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm/mach-msm/clock-pcom.c b/arch/arm/mach-msm/clock-pcom.c
index 63b7113..a52c970 100644
--- a/arch/arm/mach-msm/clock-pcom.c
+++ b/arch/arm/mach-msm/clock-pcom.c
@@ -25,7 +25,7 @@
 /*
  * glue for the proc_comm interface
  */
-int pc_clk_enable(unsigned id)
+static int pc_clk_enable(unsigned id)
 {
int rc = msm_proc_comm(PCOM_CLKCTL_RPC_ENABLE, &id, NULL);
if (rc < 0)
@@ -34,7 +34,7 @@ int pc_clk_enable(unsigned id)
return (int)id < 0 ? -EINVAL : 0;
 }
 
-void pc_clk_disable(unsigned id)
+static void pc_clk_disable(unsigned id)
 {
msm_proc_comm(PCOM_CLKCTL_RPC_DISABLE, &id, NULL);
 }
@@ -54,7 +54,7 @@ int pc_clk_reset(unsigned id, enum clk_reset_action action)
return (int)id < 0 ? -EINVAL : 0;
 }
 
-int pc_clk_set_rate(unsigned id, unsigned rate)
+static int pc_clk_set_rate(unsigned id, unsigned rate)
 {
/* The rate _might_ be rounded off to the nearest KHz value by the
 * remote function. So a return value of 0 doesn't necessarily mean
@@ -67,7 +67,7 @@ int pc_clk_set_rate(unsigned id, unsigned rate)
return (int)id < 0 ? -EINVAL : 0;
 }
 
-int pc_clk_set_min_rate(unsigned id, unsigned rate)
+static int pc_clk_set_min_rate(unsigned id, unsigned rate)
 {
int rc = msm_proc_comm(PCOM_CLKCTL_RPC_MIN_RATE, &id, &rate);
if (rc < 0)
@@ -76,7 +76,7 @@ int pc_clk_set_min_rate(unsigned id, unsigned rate)
return (int)id < 0 ? -EINVAL : 0;
 }
 
-int pc_clk_set_max_rate(unsigned id, unsigned rate)
+static int pc_clk_set_max_rate(unsigned id, unsigned rate)
 {
int rc = msm_proc_comm(PCOM_CLKCTL_RPC_MAX_RATE, &id, &rate);
if (rc < 0)
@@ -85,7 +85,7 @@ int pc_clk_set_max_rate(unsigned id, unsigned rate)
return (int)id < 0 ? -EINVAL : 0;
 }
 
-int pc_clk_set_flags(unsigned id, unsigned flags)
+static int pc_clk_set_flags(unsigned id, unsigned flags)
 {
int rc = msm_proc_comm(PCOM_CLKCTL_RPC_SET_FLAGS, &id, &flags);
if (rc < 0)
@@ -94,7 +94,7 @@ int pc_clk_set_flags(unsigned id, unsigned flags)
return (int)id < 0 ? -EINVAL : 0;
 }
 
-unsigned pc_clk_get_rate(unsigned id)
+static unsigned pc_clk_get_rate(unsigned id)
 {
if (msm_proc_comm(PCOM_CLKCTL_RPC_RATE, &id, NULL))
return 0;
@@ -102,7 +102,7 @@ unsigned pc_clk_get_rate(unsigned id)
return id;
 }
 
-unsigned pc_clk_is_enabled(unsigned id)
+static unsigned pc_clk_is_enabled(unsigned id)
 {
if (msm_proc_comm(PCOM_CLKCTL_RPC_ENABLED, &id, NULL))
return 0;
@@ -110,7 +110,7 @@ unsigned pc_clk_is_enabled(unsigned id)
return id;
 }
 
-long pc_clk_round_rate(unsigned id, unsigned rate)
+static long pc_clk_round_rate(unsigned id, unsigned rate)
 {
 
/* Not really supported; pc_clk_set_rate() does rounding on it's own. */
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 12/24] ARM: msm: Allow timer.c to compile on multiple targets

[David Brown]

From: Stephen Boyd 

The timer code relies on #defines from mach/iomap.h, cpu_is_*()
checks, and a global irq #define. All this makes this file
impossible to compile in a mult-target build. Therefore, make a
sys_timer struct for each SoC so that machine descriptors can
reference the correct timer. Then go through and replace all the
defines with raw values that are passed to a common
initialization function.

This paves the way to adding DT support to this code as well as
allows us to compile this file on multiple targets at the same
time.

Signed-off-by: Stephen Boyd 
Signed-off-by: David Brown 
---
 arch/arm/mach-msm/board-halibut.c  |   5 +-
 arch/arm/mach-msm/board-msm7x30.c  |   9 ++-
 arch/arm/mach-msm/board-msm8960.c  |   5 +-
 arch/arm/mach-msm/board-msm8x60.c  |  11 +--
 arch/arm/mach-msm/board-qsd8x50.c  |   7 +-
 arch/arm/mach-msm/board-trout.c|   5 +-
 arch/arm/mach-msm/common.h |  21 ++
 arch/arm/mach-msm/include/mach/board.h |   2 -
 arch/arm/mach-msm/timer.c  | 120 +++--
 9 files changed, 125 insertions(+), 60 deletions(-)
 create mode 100644 arch/arm/mach-msm/common.h

diff --git a/arch/arm/mach-msm/board-halibut.c 
b/arch/arm/mach-msm/board-halibut.c
index 4fa3e99..6ce542e 100644
--- a/arch/arm/mach-msm/board-halibut.c
+++ b/arch/arm/mach-msm/board-halibut.c
@@ -36,6 +36,7 @@
 #include 
 
 #include "devices.h"
+#include "common.h"
 
 static struct resource smc91x_resources[] = {
[0] = {
@@ -66,8 +67,6 @@ static struct platform_device *devices[] __initdata = {
&smc91x_device,
 };
 
-extern struct sys_timer msm_timer;
-
 static void __init halibut_init_early(void)
 {
arch_ioremap_caller = __msm_ioremap_caller;
@@ -107,5 +106,5 @@ MACHINE_START(HALIBUT, "Halibut Board (QCT SURF7200A)")
.init_irq   = halibut_init_irq,
.init_machine   = halibut_init,
.init_late  = halibut_init_late,
-   .timer  = &msm_timer,
+   .timer  = &msm7x01_timer,
 MACHINE_END
diff --git a/arch/arm/mach-msm/board-msm7x30.c 
b/arch/arm/mach-msm/board-msm7x30.c
index a500137..effa6f4 100644
--- a/arch/arm/mach-msm/board-msm7x30.c
+++ b/arch/arm/mach-msm/board-msm7x30.c
@@ -38,8 +38,7 @@
 #include "devices.h"
 #include "gpiomux.h"
 #include "proc_comm.h"
-
-extern struct sys_timer msm_timer;
+#include "common.h"
 
 static void __init msm7x30_fixup(struct tag *tag, char **cmdline,
struct meminfo *mi)
@@ -132,7 +131,7 @@ MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF")
.init_irq = msm7x30_init_irq,
.init_machine = msm7x30_init,
.init_late = msm7x30_init_late,
-   .timer = &msm_timer,
+   .timer = &msm7x30_timer,
 MACHINE_END
 
 MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA")
@@ -143,7 +142,7 @@ MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA")
.init_irq = msm7x30_init_irq,
.init_machine = msm7x30_init,
.init_late = msm7x30_init_late,
-   .timer = &msm_timer,
+   .timer = &msm7x30_timer,
 MACHINE_END
 
 MACHINE_START(MSM7X30_FLUID, "QCT MSM7X30 FLUID")
@@ -154,5 +153,5 @@ MACHINE_START(MSM7X30_FLUID, "QCT MSM7X30 FLUID")
.init_irq = msm7x30_init_irq,
.init_machine = msm7x30_init,
.init_late = msm7x30_init_late,
-   .timer = &msm_timer,
+   .timer = &msm7x30_timer,
 MACHINE_END
diff --git a/arch/arm/mach-msm/board-msm8960.c 
b/arch/arm/mach-msm/board-msm8960.c
index bdafe79..fafead2 100644
--- a/arch/arm/mach-msm/board-msm8960.c
+++ b/arch/arm/mach-msm/board-msm8960.c
@@ -31,6 +31,7 @@
 #include 
 
 #include "devices.h"
+#include "common.h"
 
 static void __init msm8960_fixup(struct tag *tag, char **cmdline,
struct meminfo *mi)
@@ -90,7 +91,7 @@ MACHINE_START(MSM8960_SIM, "QCT MSM8960 SIMULATOR")
.reserve = msm8960_reserve,
.map_io = msm8960_map_io,
.init_irq = msm8960_init_irq,
-   .timer = &msm_timer,
+   .timer = &msm8960_timer,
.handle_irq = gic_handle_irq,
.init_machine = msm8960_sim_init,
.init_late = msm8960_init_late,
@@ -101,7 +102,7 @@ MACHINE_START(MSM8960_RUMI3, "QCT MSM8960 RUMI3")
.reserve = msm8960_reserve,
.map_io = msm8960_map_io,
.init_irq = msm8960_init_irq,
-   .timer = &msm_timer,
+   .timer = &msm8960_timer,
.handle_irq = gic_handle_irq,
.init_machine = msm8960_rumi3_init,
.init_late = msm8960_init_late,
diff --git a/arch/arm/mach-msm/board-msm8x60.c 
b/arch/arm/mach-msm/board-msm8x60.c
index 64ae269..97db3cd 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -28,6 +28,7 @@
 
 #include 
 #include 
+#include "common.h"
 
 static void __init msm8x

[PATCH 10/24] ARM: msm: Fix sparse warnings due to incorrect type

[David Brown]

From: Stephen Boyd 

arch/arm/mach-msm/timer.c:153:3: warning: incorrect type in initializer 
(different address spaces)
arch/arm/mach-msm/timer.c:153:3:expected void const [noderef] 
*__vpp_verify
arch/arm/mach-msm/timer.c:153:3:got struct clock_event_device [noderef] 
**
arch/arm/mach-msm/timer.c:153:38: warning: incorrect type in assignment 
(different address spaces)
arch/arm/mach-msm/timer.c:153:38:expected struct clock_event_device 
[noderef] *
arch/arm/mach-msm/timer.c:153:38:got struct clock_event_device *evt
arch/arm/mach-msm/timer.c:191:22: warning: incorrect type in assignment 
(different address spaces)
arch/arm/mach-msm/timer.c:191:22:expected struct clock_event_device 
[noderef] **static [toplevel] percpu_evt
arch/arm/mach-msm/timer.c:191:22:got struct clock_event_device *[noderef] 
*
arch/arm/mach-msm/timer.c:196:4: warning: incorrect type in initializer 
(different address spaces)
arch/arm/mach-msm/timer.c:196:4:expected void const [noderef] 
*__vpp_verify
arch/arm/mach-msm/timer.c:196:4:got struct clock_event_device [noderef] 
**
arch/arm/mach-msm/timer.c:196:39: warning: incorrect type in assignment 
(different address spaces)
arch/arm/mach-msm/timer.c:196:39:expected struct clock_event_device 
[noderef] *
arch/arm/mach-msm/timer.c:196:39:got struct clock_event_device *ce
arch/arm/mach-msm/timer.c:198:24: warning: incorrect type in argument 4 
(different address spaces)
arch/arm/mach-msm/timer.c:198:24:expected void [noderef] 
*percpu_dev_id
arch/arm/mach-msm/timer.c:198:24:got struct clock_event_device [noderef] 
**static [toplevel] percpu_evt

Signed-off-by: Stephen Boyd 
Signed-off-by: David Brown 
---
 arch/arm/mach-msm/timer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index 81280825..004f935 100644
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -101,7 +101,7 @@ static struct clock_event_device msm_clockevent = {
 
 static union {
struct clock_event_device *evt;
-   struct clock_event_device __percpu **percpu_evt;
+   struct clock_event_device * __percpu *percpu_evt;
 } msm_evt;
 
 static void __iomem *source_base;
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 1/2] ARM: SoC: convert MSM SMP to SoC descriptor

[David Brown]

From: Marc Zyngier 

Convert MSM SMP platforms to use the SoC descriptor to provide
their SMP and CPU hotplug operations.

Cc: David Brown 
Signed-off-by: Marc Zyngier 
Signed-off-by: Arnd Bergmann 
---
This is an adaptation of this change on top of the msm-for-3.7 tree I
recently sent out a pull request for.  The only real change is to
resolve the conflicts with the simplified board files.

 arch/arm/mach-msm/board-dt-8660.c |  2 ++
 arch/arm/mach-msm/board-dt-8960.c |  2 ++
 arch/arm/mach-msm/core.h  |  2 ++
 arch/arm/mach-msm/hotplug.c   | 18 +++---
 arch/arm/mach-msm/platsmp.c   | 19 +++
 5 files changed, 24 insertions(+), 19 deletions(-)
 create mode 100644 arch/arm/mach-msm/core.h

diff --git a/arch/arm/mach-msm/board-dt-8660.c 
b/arch/arm/mach-msm/board-dt-8660.c
index f77f57f..e5643f6 100644
--- a/arch/arm/mach-msm/board-dt-8660.c
+++ b/arch/arm/mach-msm/board-dt-8660.c
@@ -20,6 +20,7 @@
 
 #include 
 #include "common.h"
+#include "core.h"
 
 static const struct of_device_id msm_dt_gic_match[] __initconst = {
{ .compatible = "qcom,msm-8660-qgic", .data = gic_of_init },
@@ -53,6 +54,7 @@ static const char *msm8x60_fluid_match[] __initdata = {
 };
 
 DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
+   .smp = smp_ops(msm_smp_ops),
.map_io = msm_map_msm8x60_io,
.init_irq = msm8x60_init_irq,
.handle_irq = gic_handle_irq,
diff --git a/arch/arm/mach-msm/board-dt-8960.c 
b/arch/arm/mach-msm/board-dt-8960.c
index 8df99b8..139d61b 100644
--- a/arch/arm/mach-msm/board-dt-8960.c
+++ b/arch/arm/mach-msm/board-dt-8960.c
@@ -18,6 +18,7 @@
 #include 
 
 #include "common.h"
+#include "core.h"
 
 static const struct of_device_id msm_dt_gic_match[] __initconst = {
{ .compatible = "qcom,msm-qgic2", .data = gic_of_init },
@@ -40,6 +41,7 @@ static const char * const msm8960_dt_match[] __initconst = {
 };
 
 DT_MACHINE_START(MSM8960_DT, "Qualcomm MSM (Flattened Device Tree)")
+   .smp = smp_ops(msm_smp_ops),
.map_io = msm_map_msm8960_io,
.init_irq = msm_dt_init_irq,
.timer = &msm_dt_timer,
diff --git a/arch/arm/mach-msm/core.h b/arch/arm/mach-msm/core.h
new file mode 100644
index 000..a9bab53
--- /dev/null
+++ b/arch/arm/mach-msm/core.h
@@ -0,0 +1,2 @@
+extern struct smp_operations msm_smp_ops;
+extern void msm_cpu_die(unsigned int cpu);
diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c
index a446fc1..d0f79e8 100644
--- a/arch/arm/mach-msm/hotplug.c
+++ b/arch/arm/mach-msm/hotplug.c
@@ -13,6 +13,8 @@
 #include 
 #include 
 
+#include "core.h"
+
 extern volatile int pen_release;
 
 static inline void cpu_enter_lowpower(void)
@@ -57,17 +59,12 @@ static inline void platform_do_lowpower(unsigned int cpu)
}
 }
 
-int platform_cpu_kill(unsigned int cpu)
-{
-   return 1;
-}
-
 /*
  * platform-specific code to shutdown a CPU
  *
  * Called with IRQs disabled
  */
-void platform_cpu_die(unsigned int cpu)
+void msm_cpu_die(unsigned int cpu)
 {
/*
 * we're ready for shutdown now, so do it
@@ -81,12 +78,3 @@ void platform_cpu_die(unsigned int cpu)
 */
cpu_leave_lowpower();
 }
-
-int platform_cpu_disable(unsigned int cpu)
-{
-   /*
-* we don't allow CPU 0 to be shutdown (it is still too special
-* e.g. clock tick interrupts)
-*/
-   return cpu == 0 ? -EPERM : 0;
-}
diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c
index b119f99..313bd7d 100644
--- a/arch/arm/mach-msm/platsmp.c
+++ b/arch/arm/mach-msm/platsmp.c
@@ -23,6 +23,7 @@
 #include 
 
 #include "scm-boot.h"
+#include "core.h"
 
 #define VDD_SC1_ARRAY_CLAMP_GFS_CTL 0x15A0
 #define SCSS_CPU1CORE_RESET 0xD80
@@ -43,7 +44,7 @@ static inline int get_core_count(void)
return ((read_cpuid_id() >> 4) & 3) + 1;
 }
 
-void __cpuinit platform_secondary_init(unsigned int cpu)
+static void __cpuinit msm_secondary_init(unsigned int cpu)
 {
/*
 * if any interrupts are already enabled for the primary
@@ -85,7 +86,7 @@ static __cpuinit void prepare_cold_cpu(unsigned int cpu)
  "address\n");
 }
 
-int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int __cpuinit msm_boot_secondary(unsigned int cpu, struct task_struct 
*idle)
 {
unsigned long timeout;
static int cold_boot_done;
@@ -145,7 +146,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct 
task_struct *idle)
  * does not support the ARM SCU, so just set the possible cpu mask to
  * NR_CPUS.
  */
-void __init smp_init_cpus(void)
+static void __init msm_smp_init_cpus(void)
 {
unsigned int i, ncores = get_core_count();
 
@@ -161,6 +162,16 @@ void __init smp_init_cpus(void)
 set_smp_cross_call(gic_raise_softirq);
 }
 
-void __init

[PATCH 2/2] ARM: msm: Move core.h contents into common.h

[David Brown]

No real need to have a separate core.h from the common.h file.  Fold
these two prototypes into the common header file.

Cc: Arnd Bergmann 
Signed-off-by: David Brown 
---
This is Stephen Boyd's suggestion to not have a separate core.h.  It
is probably best to just fold this into the previous patch.

 arch/arm/mach-msm/board-dt-8660.c | 1 -
 arch/arm/mach-msm/board-dt-8960.c | 1 -
 arch/arm/mach-msm/common.h| 2 ++
 arch/arm/mach-msm/core.h  | 2 --
 arch/arm/mach-msm/hotplug.c   | 2 +-
 arch/arm/mach-msm/platsmp.c   | 2 +-
 6 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 arch/arm/mach-msm/core.h

diff --git a/arch/arm/mach-msm/board-dt-8660.c 
b/arch/arm/mach-msm/board-dt-8660.c
index e5643f6..b5b4de2 100644
--- a/arch/arm/mach-msm/board-dt-8660.c
+++ b/arch/arm/mach-msm/board-dt-8660.c
@@ -20,7 +20,6 @@
 
 #include 
 #include "common.h"
-#include "core.h"
 
 static const struct of_device_id msm_dt_gic_match[] __initconst = {
{ .compatible = "qcom,msm-8660-qgic", .data = gic_of_init },
diff --git a/arch/arm/mach-msm/board-dt-8960.c 
b/arch/arm/mach-msm/board-dt-8960.c
index 139d61b..4490edb 100644
--- a/arch/arm/mach-msm/board-dt-8960.c
+++ b/arch/arm/mach-msm/board-dt-8960.c
@@ -18,7 +18,6 @@
 #include 
 
 #include "common.h"
-#include "core.h"
 
 static const struct of_device_id msm_dt_gic_match[] __initconst = {
{ .compatible = "qcom,msm-qgic2", .data = gic_of_init },
diff --git a/arch/arm/mach-msm/common.h b/arch/arm/mach-msm/common.h
index d68e5d7..633a7159 100644
--- a/arch/arm/mach-msm/common.h
+++ b/arch/arm/mach-msm/common.h
@@ -26,5 +26,7 @@ extern void msm_map_qsd8x50_io(void);
 extern void __iomem *__msm_ioremap_caller(unsigned long phys_addr, size_t size,
  unsigned int mtype, void *caller);
 
+extern struct smp_operations msm_smp_ops;
+extern void msm_cpu_die(unsigned int cpu);
 
 #endif
diff --git a/arch/arm/mach-msm/core.h b/arch/arm/mach-msm/core.h
deleted file mode 100644
index a9bab53..000
--- a/arch/arm/mach-msm/core.h
+++ /dev/null
@@ -1,2 +0,0 @@
-extern struct smp_operations msm_smp_ops;
-extern void msm_cpu_die(unsigned int cpu);
diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c
index d0f79e8..3f87911 100644
--- a/arch/arm/mach-msm/hotplug.c
+++ b/arch/arm/mach-msm/hotplug.c
@@ -13,7 +13,7 @@
 #include 
 #include 
 
-#include "core.h"
+#include "common.h"
 
 extern volatile int pen_release;
 
diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c
index 313bd7d..948f970 100644
--- a/arch/arm/mach-msm/platsmp.c
+++ b/arch/arm/mach-msm/platsmp.c
@@ -23,7 +23,7 @@
 #include 
 
 #include "scm-boot.h"
-#include "core.h"
+#include "common.h"
 
 #define VDD_SC1_ARRAY_CLAMP_GFS_CTL 0x15A0
 #define SCSS_CPU1CORE_RESET 0xD80
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] msm-core changes for v3.7

[David Brown]

On Wed, Sep 12, 2012 at 11:36:28PM -0700, Olof Johansson wrote:

> I think it could be a good idea to split off the cleanups and fixes to
> a separate branch. For the other patches there seems to be enough for
> at least a 'dt' branch and either a multi-platform topic branch or a
> 'boards' topic branch -- probably the former. So see my annotation
> below for suggested sorting (I didn't check for
> conflicts/dependencies).

I'll give a go at splitting things up tomorrow, then.  I'd held off on
making separate branches because there are a bunch of changes to
similar stuff.  Even if I get them separated, they are unlikely to
build without all being applied.

But, I'll see what I can do.

David

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 1/2] ARM: SoC: convert MSM SMP to SoC descriptor

[David Brown]

On Thu, Sep 13, 2012 at 08:47:19AM +, Arnd Bergmann wrote:
> On Wednesday 12 September 2012, David Brown wrote:
> > 
> > From: Marc Zyngier 
> > 
> > Convert MSM SMP platforms to use the SoC descriptor to provide
> > their SMP and CPU hotplug operations.
> > 
> > Cc: David Brown 
> > Signed-off-by: Marc Zyngier 
> > Signed-off-by: Arnd Bergmann 
> > ---
> > This is an adaptation of this change on top of the msm-for-3.7 tree I
> > recently sent out a pull request for.  The only real change is to
> > resolve the conflicts with the simplified board files.
> 
> Not sure what I'm supposed to do with this patch, it doesn't apply
> unless I rebase all of the SMP patches on top of your msm-for-3.7 branch,
> which would be rather odd.
> 
> I'll make sure the branches merge fine and then apply your patch 2/2
> on top of the merge, ok?

Yeah, it shouldn't hurt anything to just wait until both get merged
in.  The patch was mostly a heads up that your series was going to
conflict with msm changes coming in.

Olof wanted me to try and split the msm-for-3.7 into a few branches,
so I'm going to work on that this morning.  I'm not quite sure how
well it will work, since, for example, most of the cleanups are
preparing the tree for the devicetree changes.

David

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL 0/5] MSM changes for 3.7 merge window

[David Brown]

Following are 5 pull requests for the MSM SoC.  The first 5 are
cleanups, fixes, devicetree, and some board changes that finally allow
us to build more than one SoC into a single kernel image.

The fifth patch is my merge, which can be used as a reference to the
intended merge resolution.

David

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL 1/5] msm cleanups

[David Brown]

The following changes since commit 28a33cbc24e4256c143dce96c7d93bf423229f92:

  Linux 3.5 (2012-07-21 13:58:29 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git 
tags/msm-cleanup-for-3.7

for you to fetch changes up to e63770acb3c1e7334885ed4673aed1375f93484a:

  ARM: msm: Remove uncompiled board-msm7x27 (2012-09-13 11:13:08 -0700)


Various cleanups for the msm targets.  Most of this is removing dead
code, along with a fix of a sparse warning, a list fix from a semantic
patch, and marking some functions as static.


Stephen Boyd (6):
  ARM: msm: Remove msm_hw_reset_hook
  ARM: msm: clock-pcom: Mark functions static
  ARM: msm: Remove unused idle.c
  ARM: msm: Fix sparse warnings due to incorrect type
  ARM: msm: Remove unused acpuclock-arm11
  ARM: msm: Remove uncompiled board-msm7x27

Wei Yongjun (1):
  ARM: msm: dma: use list_move_tail instead of list_del/list_add_tail

 arch/arm/mach-msm/Makefile  |   4 +-
 arch/arm/mach-msm/acpuclock-arm11.c | 525 
 arch/arm/mach-msm/acpuclock.h   |  32 --
 arch/arm/mach-msm/board-mahimahi.c  |   1 -
 arch/arm/mach-msm/board-msm7x27.c   | 170 ---
 arch/arm/mach-msm/board-sapphire.c  |   1 -
 arch/arm/mach-msm/clock-pcom.c  |  18 +-
 arch/arm/mach-msm/dma.c |   3 +-
 arch/arm/mach-msm/idle.c|  49 ---
 arch/arm/mach-msm/include/mach/board.h  |  10 -
 arch/arm/mach-msm/include/mach/system.h |  19 --
 arch/arm/mach-msm/io.c  |   3 +-
 arch/arm/mach-msm/proc_comm.c   |   1 -
 arch/arm/mach-msm/smd.c |   7 -
 arch/arm/mach-msm/timer.c   |   2 +-
 15 files changed, 14 insertions(+), 831 deletions(-)
 delete mode 100644 arch/arm/mach-msm/acpuclock-arm11.c
 delete mode 100644 arch/arm/mach-msm/acpuclock.h
 delete mode 100644 arch/arm/mach-msm/board-msm7x27.c
 delete mode 100644 arch/arm/mach-msm/idle.c
 delete mode 100644 arch/arm/mach-msm/include/mach/system.h

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL 2/5] msm non-critical fixes

[David Brown]

The following changes since commit 28a33cbc24e4256c143dce96c7d93bf423229f92:

  Linux 3.5 (2012-07-21 13:58:29 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git 
tags/msm-fix-noncrit-for-3.7

for you to fetch changes up to 10717e04d3502cf4a8aa6408d59093e2bbb4645b:

  ARM: msm: Fix early debug uart mapping on some memory configs (2012-09-13 
10:48:35 -0700)


Some non-critical fixes for msm platforms.  The missing FPGA init call
fix is necessary to compile the 8660 target.  The iomapping calls are
needed to prevent duplicate mappings with differing attributes.  And,
the debug UART change keeps the debug UART working on targets with
more than 512MB of memory.


David Brown (1):
  ARM: msm: Remove call to missing FPGA init on 8660

Rohit Vaswani (2):
  ARM: msm: io: Remove 7x30 iomap region from 7x00
  ARM: msm: io: Change the default static iomappings to be shared

Stephen Boyd (1):
  ARM: msm: Fix early debug uart mapping on some memory configs

 arch/arm/mach-msm/board-msm8x60.c   |  5 -
 arch/arm/mach-msm/include/mach/msm_iomap-8960.h |  2 +-
 arch/arm/mach-msm/include/mach/msm_iomap-8x60.h |  2 +-
 arch/arm/mach-msm/io.c  | 25 +
 4 files changed, 15 insertions(+), 19 deletions(-)

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL 3/5] msm devicetree changes

[David Brown]

The following changes since commit 28a33cbc24e4256c143dce96c7d93bf423229f92:

  Linux 3.5 (2012-07-21 13:58:29 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git 
tags/msm-dt-for-3.7

for you to fetch changes up to 0607fa5884f1759b396a0e1c07be561515daddc8:

  ARM: msm: Remove non-DT targets from 8960 (2012-09-13 11:17:01 -0700)


These patches migrate both the 8660 and 8960 targets on msm to be
devicetree only.  This also sets most of the frame in place necessary
to build both targets into the same image.

There's a couple of cleanups in here that are kept in this series
because they are intimately tied to the changes necessary to support
the devicetree conversions.


Stephen Boyd (11):
  ARM: msm: Add handle_irq handler for 8660 DT machine
  ARM: msm: Add msm8660-surf.dts to Makefile.boot
  ARM: msm: Don't touch GIC registers outside of GIC code
  ARM: msm: Allow timer.c to compile on multiple targets
  ARM: msm: Add DT support to msm_timer
  ARM: msm: Move 8660 to DT timer
  ARM: msm: Make 8660 a DT only target
  ARM: msm: Rename board-msm8x60 to signify its DT only status
  ARM: msm: Move io mapping prototypes to common.h
  ARM: msm: Add DT support for 8960
  ARM: msm: Remove non-DT targets from 8960

 .../devicetree/bindings/arm/msm/timer.txt  |  38 +
 arch/arm/boot/dts/msm8660-surf.dts |  19 ++-
 arch/arm/boot/dts/msm8960-cdp.dts  |  41 +
 arch/arm/mach-msm/Kconfig  |  41 +
 arch/arm/mach-msm/Makefile |   4 +-
 arch/arm/mach-msm/Makefile.boot|   3 +
 arch/arm/mach-msm/board-dt-8660.c  |  68 
 arch/arm/mach-msm/board-dt-8960.c  |  49 ++
 arch/arm/mach-msm/board-halibut.c  |   5 +-
 arch/arm/mach-msm/board-msm7x30.c  |   9 +-
 arch/arm/mach-msm/board-msm8960.c  | 122 --
 arch/arm/mach-msm/board-msm8x60.c  | 166 --
 arch/arm/mach-msm/board-qsd8x50.c  |   7 +-
 arch/arm/mach-msm/board-trout.c|   5 +-
 arch/arm/mach-msm/common.h |  30 
 arch/arm/mach-msm/devices-msm8960.c|  85 --
 arch/arm/mach-msm/include/mach/board.h |   3 -
 arch/arm/mach-msm/include/mach/msm_iomap-7x00.h|   7 -
 arch/arm/mach-msm/include/mach/msm_iomap-7x30.h|   4 -
 arch/arm/mach-msm/include/mach/msm_iomap-8960.h|   4 -
 arch/arm/mach-msm/include/mach/msm_iomap-8x50.h|   4 -
 arch/arm/mach-msm/include/mach/msm_iomap-8x60.h|   4 -
 arch/arm/mach-msm/io.c |   2 +
 arch/arm/mach-msm/platsmp.c|   8 -
 arch/arm/mach-msm/timer.c  | 186 -
 25 files changed, 412 insertions(+), 502 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/msm/timer.txt
 create mode 100644 arch/arm/boot/dts/msm8960-cdp.dts
 create mode 100644 arch/arm/mach-msm/board-dt-8660.c
 create mode 100644 arch/arm/mach-msm/board-dt-8960.c
 delete mode 100644 arch/arm/mach-msm/board-msm8960.c
 delete mode 100644 arch/arm/mach-msm/board-msm8x60.c
 create mode 100644 arch/arm/mach-msm/common.h
 delete mode 100644 arch/arm/mach-msm/devices-msm8960.c

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL 4/5] msm board changes

[David Brown]

The following changes since commit 28a33cbc24e4256c143dce96c7d93bf423229f92:

  Linux 3.5 (2012-07-21 13:58:29 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git 
tags/msm-board-for-3.7

for you to fetch changes up to 33fcb13dc543af610c7c930dbfeeed6e6ed02376:

  ARM: msm: Allow 8960 and 8660 to compile together (2012-09-13 11:17:47 -0700)


Final parts to allow msm8660 and msm8960 to build into the same
kernel.  This won't work without the changes from msm-dt-for-3.7.


Stephen Boyd (2):
  ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist
  ARM: msm: Allow 8960 and 8660 to compile together

 arch/arm/mach-msm/Kconfig   |  8 ++--
 arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 11 ---
 arch/arm/mach-msm/include/mach/msm_iomap.h  |  3 +--
 arch/arm/mach-msm/io.c  |  2 --
 4 files changed, 7 insertions(+), 17 deletions(-)

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL 5/5] msm all changes

[David Brown]

The following changes since commit 28a33cbc24e4256c143dce96c7d93bf423229f92:

  Linux 3.5 (2012-07-21 13:58:29 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git 
tags/msm-merged-for-3.7

for you to fetch changes up to 9b9b5ed018ac77127140d41fbfbe0224fad1d088:

  Merge branch '36/board' into 36/merged (2012-09-13 11:23:22 -0700)



This is a merge of the following tags:
msm-board-for-3.7
msm-cleanup-for-3.7
msm-dt-for-3.7
msm-fix-noncrit-for-3.7

mostly to show the correct merge resolution.  There's a trivial merge
resolve in arch/arm/mach-msm/io.c.

The rename of arch/arm/mach-msm/board-msm8x60.c to
arch/arm/mach-msm/board-dt-8660.c seems to have confused git, causing
it to drop
  ARM: msm: Remove call to missing FPGA init on 8660
so this merge resolution fixes that.

--------
David Brown (5):
  ARM: msm: Remove call to missing FPGA init on 8660
  Merge branch '36/cleanup' into 36/merged
  Merge branch '36/fix-noncrit' into 36/merged
  Merge branch '36/dt' into 36/merged
  Merge branch '36/board' into 36/merged

Rohit Vaswani (2):
  ARM: msm: io: Remove 7x30 iomap region from 7x00
  ARM: msm: io: Change the default static iomappings to be shared

Stephen Boyd (20):
  ARM: msm: Remove msm_hw_reset_hook
  ARM: msm: clock-pcom: Mark functions static
  ARM: msm: Remove unused idle.c
  ARM: msm: Fix early debug uart mapping on some memory configs
  ARM: msm: Add handle_irq handler for 8660 DT machine
  ARM: msm: Add msm8660-surf.dts to Makefile.boot
  ARM: msm: Fix sparse warnings due to incorrect type
  ARM: msm: Remove unused acpuclock-arm11
  ARM: msm: Remove uncompiled board-msm7x27
  ARM: msm: Don't touch GIC registers outside of GIC code
  ARM: msm: Allow timer.c to compile on multiple targets
  ARM: msm: Add DT support to msm_timer
  ARM: msm: Move 8660 to DT timer
  ARM: msm: Make 8660 a DT only target
  ARM: msm: Rename board-msm8x60 to signify its DT only status
  ARM: msm: Move io mapping prototypes to common.h
  ARM: msm: Add DT support for 8960
  ARM: msm: Remove non-DT targets from 8960
  ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist
  ARM: msm: Allow 8960 and 8660 to compile together

Wei Yongjun (1):
  ARM: msm: dma: use list_move_tail instead of list_del/list_add_tail

 .../devicetree/bindings/arm/msm/timer.txt  |  38 ++
 arch/arm/boot/dts/msm8660-surf.dts |  19 +-
 arch/arm/boot/dts/msm8960-cdp.dts  |  41 ++
 arch/arm/mach-msm/Kconfig  |  49 +-
 arch/arm/mach-msm/Makefile |   8 +-
 arch/arm/mach-msm/Makefile.boot|   3 +
 arch/arm/mach-msm/acpuclock-arm11.c| 525 -
 arch/arm/mach-msm/acpuclock.h  |  32 --
 arch/arm/mach-msm/board-dt-8660.c  |  63 +++
 arch/arm/mach-msm/board-dt-8960.c  |  49 ++
 arch/arm/mach-msm/board-halibut.c  |   5 +-
 arch/arm/mach-msm/board-mahimahi.c |   1 -
 arch/arm/mach-msm/board-msm7x27.c  | 170 ---
 arch/arm/mach-msm/board-msm7x30.c  |   9 +-
 arch/arm/mach-msm/board-msm8960.c  | 122 -
 arch/arm/mach-msm/board-msm8x60.c  | 166 ---
 arch/arm/mach-msm/board-qsd8x50.c  |   7 +-
 arch/arm/mach-msm/board-sapphire.c |   1 -
 arch/arm/mach-msm/board-trout.c|   5 +-
 arch/arm/mach-msm/clock-pcom.c |  18 +-
 arch/arm/mach-msm/common.h |  30 ++
 arch/arm/mach-msm/devices-msm8960.c|  85 
 arch/arm/mach-msm/dma.c|   3 +-
 arch/arm/mach-msm/idle.c   |  49 --
 arch/arm/mach-msm/include/mach/board.h |  13 -
 arch/arm/mach-msm/include/mach/msm_iomap-7x00.h|   7 -
 arch/arm/mach-msm/include/mach/msm_iomap-7x30.h|   4 -
 arch/arm/mach-msm/include/mach/msm_iomap-8960.h|   6 +-
 arch/arm/mach-msm/include/mach/msm_iomap-8x50.h|   4 -
 arch/arm/mach-msm/include/mach/msm_iomap-8x60.h|  17 +-
 arch/arm/mach-msm/include/mach/msm_iomap.h |   3 +-
 arch/arm/mach-msm/include/mach/system.h|  19 -
 arch/arm/mach-msm/io.c |  32 +-
 arch/arm/mach-msm/platsmp.c|   8 -
 arch/arm/mach-msm/proc_comm.c  |   1 -
 arch/arm/mach-msm/smd.c|   7 -
 arch/arm/mach-msm/timer.c  | 188 ++--
 37 files changed, 443 insertions(+), 1364 deletions(-)
 create mode 100644 Documentation/device

[GIT PULL 1/5] msm cleanups (resend)

[David Brown]

[resending to proper In-Reply-To]

The following changes since commit 28a33cbc24e4256c143dce96c7d93bf423229f92:

  Linux 3.5 (2012-07-21 13:58:29 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git 
tags/msm-cleanup-for-3.7

for you to fetch changes up to e63770acb3c1e7334885ed4673aed1375f93484a:

  ARM: msm: Remove uncompiled board-msm7x27 (2012-09-13 11:13:08 -0700)


Various cleanups for the msm targets.  Most of this is removing dead
code, along with a fix of a sparse warning, a list fix from a semantic
patch, and marking some functions as static.


Stephen Boyd (6):
  ARM: msm: Remove msm_hw_reset_hook
  ARM: msm: clock-pcom: Mark functions static
  ARM: msm: Remove unused idle.c
  ARM: msm: Fix sparse warnings due to incorrect type
  ARM: msm: Remove unused acpuclock-arm11
  ARM: msm: Remove uncompiled board-msm7x27

Wei Yongjun (1):
  ARM: msm: dma: use list_move_tail instead of list_del/list_add_tail

 arch/arm/mach-msm/Makefile  |   4 +-
 arch/arm/mach-msm/acpuclock-arm11.c | 525 
 arch/arm/mach-msm/acpuclock.h   |  32 --
 arch/arm/mach-msm/board-mahimahi.c  |   1 -
 arch/arm/mach-msm/board-msm7x27.c   | 170 ---
 arch/arm/mach-msm/board-sapphire.c  |   1 -
 arch/arm/mach-msm/clock-pcom.c  |  18 +-
 arch/arm/mach-msm/dma.c |   3 +-
 arch/arm/mach-msm/idle.c|  49 ---
 arch/arm/mach-msm/include/mach/board.h  |  10 -
 arch/arm/mach-msm/include/mach/system.h |  19 --
 arch/arm/mach-msm/io.c  |   3 +-
 arch/arm/mach-msm/proc_comm.c   |   1 -
 arch/arm/mach-msm/smd.c |   7 -
 arch/arm/mach-msm/timer.c   |   2 +-
 15 files changed, 14 insertions(+), 831 deletions(-)
 delete mode 100644 arch/arm/mach-msm/acpuclock-arm11.c
 delete mode 100644 arch/arm/mach-msm/acpuclock.h
 delete mode 100644 arch/arm/mach-msm/board-msm7x27.c
 delete mode 100644 arch/arm/mach-msm/idle.c
 delete mode 100644 arch/arm/mach-msm/include/mach/system.h

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 6/8] mmc: use the new

[David Brown]

On Fri, Sep 14, 2012 at 06:24:01PM +0200, Davide Ciminaghi wrote:
> From: Alessandro Rubini 
> 
> Signed-off-by: Alessandro Rubini 
> Acked-by: Giancarlo Asnaghi 
> ---
>  drivers/mmc/host/msm_sdcc.c |    2 +-

Acked-by: David Brown 

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCHv2] ARM: Push selects for TWD/SCU into machine entries

[David Brown]

On Wed, Oct 24, 2012 at 10:24:35AM -0700, Stephen Boyd wrote:
> The TWD and SCU configs are selected by default as long as
> MSM_SCORPIONMP is false and/or MCT is false. Implementing the
> logic this way certainly saves lines in the Kconfig but it
> precludes those machines which select MSM_SCORPIONMP or MCT from
> participating in the single zImage effort because when those
> machines are combined with other SMP capable machines the TWD and
> SCU are no longer selected by default.
> 
> Push the select out to the machine entries so that we can compile
> these machines together and still select the appropriate configs.

>  arch/arm/mach-msm/Kconfig  | 7 ++-

Acked-by: David Brown 

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 1/2] ARM: msm: Add support for MSM8974 Dragonboard

[David Brown]

On Tue, Aug 06, 2013 at 12:14:46PM +0300, Ivan T. Ivanov wrote:


Attached patch enables earlyprink for this board.

[920] booting linux @ 0x8000, ramdisk @ 0x200 (1067699), tags/device tree @ 
0x1e0
Uncompressing Linux... done, booting the kernel.
[0.00] Booting Linux on physical CPU 0x0
[0.00] Linux version 3.11.0-rc4-3-g7c8394e (iivanov@dev) (gcc 
version 4.6.3 (GCC) ) #502 SMP PREEMPT Tue Aug 6 12:09:07 EEST3
[0.00] CPU: ARMv7 Processor [512f06f0] revision 0 (ARMv7), cr=10c5387d
[0.00] CPU: PIPT / VIPT nonaliasing data cache, PIPT instruction cache
[0.00] Machine: Qualcomm MSM (Flattened Device Tree), model: Qualcomm 
MSM8974 Dragonboard


We'll need to have either Rohit include this in his patch series, or
you'll have to format this as a valid patch.

Thanks,
David

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] ARM: msm: Move msm devicetrees under a Qualcomm dir

[David Brown]

On Thu, Sep 12, 2013 at 12:55:36PM -0500, Kumar Gala wrote:


On Sep 12, 2013, at 12:06 PM, Olof Johansson wrote:



My original request to please use a common prefix for your product
families stands. Please prefix with msm-*, or if you have to, qcom-*
instead, since you guys can't seem to make your mind up on standard
prefixes (msm, apq, etc).


This is silly, I dont see the reason to go with
qcom-apq-.dts and than in the future drop qcom- when we
mostly likely shift to a dir structure.  As engineers we are all too
aware of the lack of sanity in marketing names, but its what we have
so we have to live with it.


At least what we'd decided a year or two ago was to call _everything_
with an msm* prefix.  If marketing comes up with cute prefixes for
things, we would basically ignore them.  So, under that, it should be
an msm8074-dragonboard.  Admittedly, it might be a little confusing
with the name of the product having the apq in it, but as others have
pointed out, I think there is less confusing than not having a common
prefix on our MSM products.

At least so far, there are no chips where apq vs msm actually
distinguishes anything.  In fact, a simple "decoder ring" would point
out that the 'apq' usually corresponds with the second digit being a
zero.  It doesn't help that we've added an 'mpq' prefix as well.

I don't really see how to satisfy all of this other than qcom-apq*, or
just continue to use msm*.

David

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCHv4 2/3] ARM: msm: Add support for APQ8074 Dragonboard

[David Brown]

On Thu, Sep 26, 2013 at 02:33:53PM -0500, Kumar Gala wrote:


"ePAPR 1.1 section 2.2.1.1 "Node Name Requirements" specifies that any
node that has a reg property must include a unit address in its name
with value matching the first entry in its reg property. Conversely, if
a node does not have a reg property, the node name must not include a
unit address."

The soc node we have does not have a reg property ?


Not 100% sure what people will decide on this.  There are a number of
examples on the PPC side (arch/powerpc/boot/dts) that are soc@ADDR,
but they don't typically have "reg" properties at the soc level.

Let's go ahead w/o the unit address (as you have it) for now.


What is the address even supposed to mean?  Are we expecting multiple
'soc' nodes?

David
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 08/27] mmc: msm_sdcc: Move away from using deprecated APIs

[David Brown]

On Thu, Sep 26, 2013 at 04:54:33PM +0200, Ulf Hansson wrote:

Suspend and resume of cards are being handled from the protocol layer
and consequently the mmc_suspend|resume_host APIs are deprecated.

This means we can simplify the suspend|resume callbacks by removing the
use of the deprecated APIs.

Additionally, remove dead code which also used the deprecated APIs.

Cc: David Brown 
Cc: Daniel Walker 
Cc: Bryan Huntsman 
Cc: linux-arm-...@vger.kernel.org
Signed-off-by: Ulf Hansson 
---
drivers/mmc/host/msm_sdcc.c |   27 ++-
1 file changed, 2 insertions(+), 25 deletions(-)


Acked-by: David Brown 

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] iommu: remove unnecessary platform_set_drvdata()

[David Brown]

On Thu, Aug 22, 2013 at 10:53:01AM +0900, Jingoo Han wrote:

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han 
---
drivers/iommu/msm_iommu_dev.c |2 --


With the splitting:

Acked-by: David Brown 

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH] msm_serial: fix clock rate on DMA-based uarts

[David Brown]

The driver explicitly requests a clock rate for the UART, but it is
off by a factor of four from the dividers that it programs into the
UART.  Fix this by setting the rate to 1/4 of the current value.

Signed-off-by: David Brown 
---
 drivers/tty/serial/msm_serial.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index 8131e2c..033e0bc 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -896,7 +896,7 @@ static int __init msm_serial_probe(struct platform_device 
*pdev)
return PTR_ERR(msm_port->clk);
 
if (msm_port->is_uartdm)
-   clk_set_rate(msm_port->clk, 7372800);
+   clk_set_rate(msm_port->clk, 1843200);
 
port->uartclk = clk_get_rate(msm_port->clk);
printk(KERN_INFO "uartclk = %d\n", port->uartclk);
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Adding 'msm' tree to linux-next.

[David Brown]

Stephen,

I'd like to add the msm soc tree to Linux next.

  git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git for-next

I had removed it when the creation of the ARM SoC tree, but now that
msm is getting a bit more active, I'd like to get it included in next
to get it in a bit earlier.

Thanks,
David Brown
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 8/9] ARM: msm: Add DT support for 8960

[David Brown]

On Wed, Sep 05, 2012 at 12:28:58PM -0700, Stephen Boyd wrote:

> +DT_MACHINE_START(MSM8960_DT, "Qualcomm MSM (Flattened Device Tree)")

The description string should specify the general name of what this is
suspporting.  Right now, with these patches, it would list

  Qualcomm MSM (Flattened Device Tree)

twice as the two targets we support (and isn't helpful when you see
which one it picks).  I'd put the "MSM" name by itself without
thinking about it too much.  It wasn't that confusing, since there was
only one at the time.

Perhaps make the 8660 one "Qualcomm MSM8660 (Flattened Device Tree)"
and the 8960 one "Qualcomm MSM8960 (Flattened Device Tree)"

I realize that the chip numbers are a bit confusing, so probably best
to pick a canonical name for the description.

David

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH v4 0/7] enable support for AMBA drivers under x86

[David Brown]

On Mon, Dec 10, 2012 at 02:42:29PM +0100, Davide Ciminaghi wrote:
> Acked-by/Reviewed-by situation:
> 
> v1:
> 
> "mmc: use the new "
> Acked by David Brown (see https://lkml.org/lkml/2012/9/14/613)

The change doesn't look substantially different, you can keep my Ack
for it.

David

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL 1/3] msm cleanups for 3.11

[David Brown]

The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:

  Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git 
tags/msm-cleanup-for-3.11

for you to fetch changes up to 1aa3d1a3c7d235c47e30c7c8c6b5ef02fb1536b3:

  mfd: ssbi: Use devm_* and simplify code (2013-06-12 14:50:12 -0700)


Cleanups for MSM for 3.11

These are a handful of cleanups to the MSM tree.  The gpio cleanups
get us closer to having proper pinmux and gpio support.


Maxime Ripard (1):
  ARM: msm: Remove init_irq declaration in machine description

Rohit Vaswani (4):
  msm: Remove unused file core.h
  msm: iomap: Remove unused bases and mappings
  ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs
  gpio: msm: Add device tree and irqdomain support for gpio-msm-v2

Stephen Boyd (1):
  mfd: ssbi: Use devm_* and simplify code

 .../devicetree/bindings/gpio/gpio-msm.txt  |  26 +++
 arch/arm/boot/dts/msm8660-surf.dts |  11 ++
 arch/arm/boot/dts/msm8960-cdp.dts  |  11 ++
 arch/arm/mach-msm/Kconfig  |  13 +-
 arch/arm/mach-msm/Makefile |   6 +-
 arch/arm/mach-msm/board-dt-8660.c  |   2 -
 arch/arm/mach-msm/board-dt-8960.c  |   2 -
 arch/arm/mach-msm/core.h   |   2 -
 arch/arm/mach-msm/gpiomux-8x60.c   |  19 --
 arch/arm/mach-msm/gpiomux-v2.c |  25 ---
 arch/arm/mach-msm/gpiomux-v2.h |  61 ---
 arch/arm/mach-msm/gpiomux.c|  15 ++
 arch/arm/mach-msm/gpiomux.h|   5 -
 arch/arm/mach-msm/include/mach/msm_iomap-8960.h|   7 -
 arch/arm/mach-msm/include/mach/msm_iomap-8x60.h|   6 -
 arch/arm/mach-msm/include/mach/msm_iomap.h |   2 -
 arch/arm/mach-msm/io.c |   4 -
 drivers/gpio/Kconfig   |   2 +-
 drivers/gpio/gpio-msm-v2.c | 195 -
 drivers/ssbi/ssbi.c|  69 ++--
 20 files changed, 197 insertions(+), 286 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-msm.txt
 delete mode 100644 arch/arm/mach-msm/core.h
 delete mode 100644 arch/arm/mach-msm/gpiomux-8x60.c
 delete mode 100644 arch/arm/mach-msm/gpiomux-v2.c
 delete mode 100644 arch/arm/mach-msm/gpiomux-v2.h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL 2/3] msm fixes for 3.11

[David Brown]

The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:

  Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git 
tags/msm-fix-for-3.11

for you to fetch changes up to 7ba655fc965b073292349fa49fb9d16d701185bc:

  gpio: msm-v1: Remove errant __devinit to fix compile (2013-06-12 14:49:06 
-0700)


Some minor fixes for MSM for 3.11

I don't expect these to be necessary for stable, since the fixes are
to recently added code.  The strncpy fix is only in debug code that
isn't normally compiled or used (and is being removed in upcoming
patches).


Chen Gang (1):
  arch: arm: mach-msm: using strlcpy instead of strncpy

Stephen Boyd (3):
  ARM: dts: msm: Fix bad register addresses
  mfd: ssbi: Add MODULE_DEVICE_TABLE
  gpio: msm-v1: Remove errant __devinit to fix compile

 arch/arm/boot/dts/msm8660-surf.dts | 4 ++--
 arch/arm/boot/dts/msm8960-cdp.dts  | 2 +-
 arch/arm/mach-msm/clock-debug.c| 2 +-
 drivers/gpio/gpio-msm-v1.c | 2 +-
 drivers/ssbi/ssbi.c| 1 +
 5 files changed, 6 insertions(+), 5 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL 0/3] msm changes for 3.11

[David Brown]

The following three pull requests are for the MSM tree for 3.11.  In
addition to cleanups and fixes, there is starting to be some work
toward getting full clock support in the MSM tree.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL 2/3] msm fixes for 3.11

[David Brown]

The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:

  Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git 
tags/msm-fix-for-3.11

for you to fetch changes up to 7ba655fc965b073292349fa49fb9d16d701185bc:

  gpio: msm-v1: Remove errant __devinit to fix compile (2013-06-12 14:49:06 
-0700)


Some minor fixes for MSM for 3.11

I don't expect these to be necessary for stable, since the fixes are
to recently added code.  The strncpy fix is only in debug code that
isn't normally compiled or used (and is being removed in upcoming
patches).


Chen Gang (1):
  arch: arm: mach-msm: using strlcpy instead of strncpy

Stephen Boyd (3):
  ARM: dts: msm: Fix bad register addresses
  mfd: ssbi: Add MODULE_DEVICE_TABLE
  gpio: msm-v1: Remove errant __devinit to fix compile

 arch/arm/boot/dts/msm8660-surf.dts | 4 ++--
 arch/arm/boot/dts/msm8960-cdp.dts  | 2 +-
 arch/arm/mach-msm/clock-debug.c| 2 +-
 drivers/gpio/gpio-msm-v1.c | 2 +-
 drivers/ssbi/ssbi.c| 1 +
 5 files changed, 6 insertions(+), 5 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL 3/3] msm clock for 3.11

[David Brown]

The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:

 Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)

are available in the git repository at:

 git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git 
tags/msm-clock-for-3.11

for you to fetch changes up to f54c1c11053d8aaf318a096b8b332fd41a394a66:

 ARM: msm: Migrate to common clock framework (2013-06-12 14:43:31 -0700)


MSM clock updates for 3.11.

Per Stephen Boyd's coverletter:

This patchset moves the existing MSM clock code and affected drivers
to the common clock framework. A prerequisite of moving to the common
clock framework is to use clk_prepare() and clk_enable() so the first
few patches migrate drivers to that call (clk_prepare() is a no-op on
MSM right now). It also removes some custom clock APIs that MSM
provides and finally moves the proc_comm clock code to the common
struct clk.

This patch series will be used as the foundation of the MSM 8660/8960
clock code that I plan to send out after this series.


Stephen Boyd (12):
 msm_serial: Convert to clk_prepare/unprepare
 msm_serial: Use devm_clk_get() and properly return errors
 usb: otg: msm: Convert to clk_prepare/unprepare
 msm_sdcc: Convert to clk_prepare/unprepare
 msm: iommu: Convert to clk_prepare/unprepare
 msm: iommu: Use clk_set_rate() instead of clk_set_min_rate()
 ARM: msm: Remove custom clk_set_flags() API
 ARM: msm: Remove custom clk_set_{max,min}_rate() API
 ARM: msm: Remove clock-7x30.h include file
 ARM: msm: Prepare clk_get() users in mach-msm for clock-pcom driver
 ARM: msm: Make proc_comm clock control into a platform driver
 ARM: msm: Migrate to common clock framework

arch/arm/Kconfig   |   2 +-
arch/arm/mach-msm/Makefile |  10 +-
arch/arm/mach-msm/board-halibut.c  |   2 +-
arch/arm/mach-msm/board-msm7x30.c  |   2 +-
arch/arm/mach-msm/board-qsd8x50.c  |   2 +-
arch/arm/mach-msm/board-trout-panel.c  |  19 ++--
arch/arm/mach-msm/board-trout.c|   3 +-
arch/arm/mach-msm/clock-7x30.h | 155 --
arch/arm/mach-msm/clock-debug.c| 130 --
arch/arm/mach-msm/clock-pcom.c | 149 ++---
arch/arm/mach-msm/clock-pcom.h |  31 +++---
arch/arm/mach-msm/clock.c  | 166 +
arch/arm/mach-msm/clock.h  |  51 +++---
arch/arm/mach-msm/devices-msm7x00.c|  12 ++-
arch/arm/mach-msm/devices-msm7x30.c|  14 ++-
arch/arm/mach-msm/devices-qsd8x50.c|  11 ++-
arch/arm/mach-msm/devices.h|  15 +--
arch/arm/mach-msm/dma.c|   5 +-
arch/arm/mach-msm/include/mach/board.h |   5 -
arch/arm/mach-msm/include/mach/clk.h   |   9 --
drivers/iommu/msm_iommu_dev.c  |  20 ++--
drivers/mmc/host/msm_sdcc.c|  14 ++-
drivers/tty/serial/msm_serial.c|  35 +++
drivers/usb/phy/phy-msm-usb.c  |  38 
24 files changed, 241 insertions(+), 659 deletions(-)
delete mode 100644 arch/arm/mach-msm/clock-7x30.h
delete mode 100644 arch/arm/mach-msm/clock-debug.c

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH/RESEND 01/12] msm_serial: Convert to clk_prepare/unprepare

[David Brown]

On Mon, Jun 17, 2013 at 10:55:10AM -0700, Greg Kroah-Hartman wrote:

On Mon, Jun 17, 2013 at 10:43:08AM -0700, Stephen Boyd wrote:

Add calls to clk_prepare and unprepare so that MSM can migrate to
the common clock framework.

Cc: Greg Kroah-Hartman 
Signed-off-by: Stephen Boyd 


Acked-by: Greg Kroah-Hartman 

Or do you want me to take the serial ones through my tree?  It's your
choice, either is fine for me.


I can go ahead and pull them through the MSM tree.

Thanks,
David

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL 2/3] msm fixes for 3.11

[David Brown]

On Fri, Jun 14, 2013 at 06:26:17PM -0700, Olof Johansson wrote:


Stephen Boyd (3):
  ARM: dts: msm: Fix bad register addresses


Hmm. I see that the msm-hsuart device nodes completely lack reg entries. That's
considerably more important to fix than the cosmetic unit address that's not
even needed unless two nodes happen to have the same name.


I'm not seeing the missing reg entries in anyone's tree.

However, it appears that both of us resolved the merge conflict
differently, and both did it incorrectly.

How would you like this to be fixed?  Should I just send you a patch
based off of the current soc tree?

Thanks,
David

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH] ARM: dts: msm: Fix merge resolution

[David Brown]

Commit e45600107b (Merge tag 'msm-cleanup-for-3.11' of
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into
next/cleanup) incorrectly resolved a merge conflict, resulting in a
node address that doesn't match the register address.

Fix this node address.

Signed-off-by: David Brown 
Cc: Stephen Boyd 
---
 arch/arm/boot/dts/msm8960-cdp.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/msm8960-cdp.dts 
b/arch/arm/boot/dts/msm8960-cdp.dts
index e9eb835..db2060c 100644
--- a/arch/arm/boot/dts/msm8960-cdp.dts
+++ b/arch/arm/boot/dts/msm8960-cdp.dts
@@ -37,7 +37,7 @@
reg = <0xfd51 0x4000>;
};
 
-   serial@1944 {
+   serial@1644 {
compatible = "qcom,msm-hsuart", "qcom,msm-uart";
reg = <0x1644 0x1000>,
  <0x1640 0x1000>;
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Changes pulled into MSM tree

[David Brown]

The following changes have been pulled into the msm tree for my next
pull request.  I expect to send the pull request after these sit in
next for a few days.  The changes can be seen at:

 git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git for-next

Chen Gang (1):
 arch: arm: mach-msm: using strlcpy instead of strncpy

Maxime Ripard (1):
 ARM: msm: Remove init_irq declaration in machine description

Rohit Vaswani (3):
 ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs
 ARM: msm: Remove unused and unmapped MSM_TLMM_BASE for 8x60
 gpio: msm: Add device tree and irqdomain support for gpio-msm-v2

Stephen Boyd (1):
 ARM: dts: msm: Fix bad register addresses

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCHv3 0/3] Cleanup MSM_GPIOMUX and add DT support for gpio-msm

[David Brown]

On Fri, May 24, 2013 at 11:32:19AM -0700, Rohit Vaswani wrote:


Could this series go through David's tree or is there a better way to do this?
It would be great if I can have you ack for the gpio patch.


Due to pending feedback, and compilation failures on ppc, I'll drop
this series from my tree for now.

David

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH/RESEND 00/12] Convert MSM to common clock framework

[David Brown]

On Thu, Jun 20, 2013 at 06:29:52PM -0700, Stephen Boyd wrote:

On 06/17, Stephen Boyd wrote:

Resending to collect higher level maintainer acks per Olof's request.
The plan is to push this patchset through MSM to the arm-soc tree.

This patchset moves the existing MSM clock code and affected drivers to the
common clock framework. A prerequisite of moving to the common clock
framework is to use clk_prepare() and clk_enable() so the first
few patches migrate drivers to that call (clk_prepare() is a no-op on MSM
right now). It also removes some custom clock APIs that MSM provides
and finally moves the proc_comm clock code to the common struct clk.

This patch series will be used as the foundation of the MSM 8660/8960
clock code that I plan to send out after this series.



David, can you pick this up and send it off to arm-soc now?


I'm still not seeing an Ack from

 msm_sdcc: Convert to clk_prepare/unprepare

Thanks,
David

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] ARM: Fix dtb dependency to use order-only prerequisites

[David Brown]

On Mon, Jun 24, 2013 at 01:41:57PM -0700, Doug Anderson wrote:

The %.dtb dependency is specified to depend on the PHONY "scripts".
That means that it'll build every time even if the underlying dtb file
hasn't been touched.  Use an order-only prerequisites to fix this.
Also mark "dtbs" as PHONY for correctness.

This was broken in (70b0476 ARM: 7513/1: Make sure dtc is built before
running it).

Reported-by: Mike Frysinger 
Signed-off-by: Doug Anderson 
---
arch/arm/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)


Reviewed-by: David Brown 

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL v2] msm clock for 3.11

[David Brown]

This pull request differs from the previous one for the clock code by:

  - Gathered additional Acked-by lines.
  - A small #include fixup found by Stephen Boyd

The only Ack not received was from Chris Ball, who is CC'd on this
request.

The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:

  Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git 
tags/msm-clock-for-3.11b

for you to fetch changes up to 8cc7f5338e729b79194e6c22e3c794faaef974b8:

  ARM: msm: Migrate to common clock framework (2013-06-24 13:08:05 -0700)


MSM clock updates for 3.11.

Per Stephen Boyd's coverletter:

Resending to collect higher level maintainer acks per Olof's request.
The plan is to push this patchset through MSM to the arm-soc tree.

This patchset moves the existing MSM clock code and affected drivers
to the common clock framework. A prerequisite of moving to the common
clock framework is to use clk_prepare() and clk_enable() so the first
few patches migrate drivers to that call (clk_prepare() is a no-op on
MSM right now). It also removes some custom clock APIs that MSM
provides and finally moves the proc_comm clock code to the common
struct clk.

This patch series will be used as the foundation of the MSM 8660/8960
clock code that I plan to send out after this series.


Stephen Boyd (12):
  msm_serial: Convert to clk_prepare/unprepare
  msm_serial: Use devm_clk_get() and properly return errors
  usb: otg: msm: Convert to clk_prepare/unprepare
  msm_sdcc: Convert to clk_prepare/unprepare
  msm: iommu: Convert to clk_prepare/unprepare
  msm: iommu: Use clk_set_rate() instead of clk_set_min_rate()
  ARM: msm: Remove custom clk_set_flags() API
  ARM: msm: Remove custom clk_set_{max,min}_rate() API
  ARM: msm: Remove clock-7x30.h include file
  ARM: msm: Prepare clk_get() users in mach-msm for clock-pcom driver
  ARM: msm: Make proc_comm clock control into a platform driver
  ARM: msm: Migrate to common clock framework

 arch/arm/Kconfig   |   2 +-
 arch/arm/mach-msm/Makefile |  10 +-
 arch/arm/mach-msm/board-halibut.c  |   2 +-
 arch/arm/mach-msm/board-msm7x30.c  |   2 +-
 arch/arm/mach-msm/board-qsd8x50.c  |   2 +-
 arch/arm/mach-msm/board-trout-panel.c  |  19 ++--
 arch/arm/mach-msm/board-trout.c|   3 +-
 arch/arm/mach-msm/clock-7x30.h | 155 --
 arch/arm/mach-msm/clock-debug.c| 130 --
 arch/arm/mach-msm/clock-pcom.c | 149 ++---
 arch/arm/mach-msm/clock-pcom.h |  31 +++---
 arch/arm/mach-msm/clock.c  | 166 +
 arch/arm/mach-msm/clock.h  |  51 +++---
 arch/arm/mach-msm/devices-msm7x00.c|  12 ++-
 arch/arm/mach-msm/devices-msm7x30.c|  15 ++-
 arch/arm/mach-msm/devices-qsd8x50.c|  12 ++-
 arch/arm/mach-msm/devices.h|  15 +--
 arch/arm/mach-msm/dma.c|   5 +-
 arch/arm/mach-msm/include/mach/board.h |   5 -
 arch/arm/mach-msm/include/mach/clk.h   |   9 --
 drivers/iommu/msm_iommu_dev.c  |  20 ++--
 drivers/mmc/host/msm_sdcc.c|  14 ++-
 drivers/tty/serial/msm_serial.c|  35 +++
 drivers/usb/phy/phy-msm-usb.c  |  38 
 24 files changed, 243 insertions(+), 659 deletions(-)
 delete mode 100644 arch/arm/mach-msm/clock-7x30.h
 delete mode 100644 arch/arm/mach-msm/clock-debug.c
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 0/3] Fix msm timer clearing bugs

[David Brown]

Stephen Boyd  writes:

> Patches are based on v3.9-rc2. These patches will conflict with
> my other patch series to remove the local timer API, but the
> conflict isn't impossible to resolve and we can figure out how to
> deal with that after review.
>
> Patch 1 is a bug fix which could probably go into 3.9 if desired.
> Patch 2 overhauls the DT binding to be cleaner, and patch 3 fixes
> a bug where we don't wait for the timer to be clear before
> programming it leading to no more ticks.
>
> Stephen Boyd (3):
>   ARM: msm: Stop counting before reprogramming clockevent
>   ARM: msm: Rework timer binding to be more general
>   ARM: msm: Wait for timer clear to complete
>
>  .../devicetree/bindings/arm/msm/timer.txt  |  41 
>  arch/arm/boot/dts/msm8660-surf.dts |  20 ++--
>  arch/arm/boot/dts/msm8960-cdp.dts  |  22 ++--
>  arch/arm/mach-msm/timer.c  | 115 
> ++---
>  4 files changed, 90 insertions(+), 108 deletions(-)

I've pulled these into msm for/next, so the conflicts will probably show
up soon.

David

-- 
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] msm fix for 3.9 -- timer

[David Brown]

The following changes since commit f6161aa153581da4a3867a2d1a7caf4be19b6ec9:

  Linux 3.9-rc2 (2013-03-10 16:54:19 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git 
tags/msm-fix-3.9

for you to fetch changes up to 4080d2d11a2d572228c2b8d02406e997b87ba6a5:

  ARM: msm: Stop counting before reprogramming clockevent (2013-03-22 10:45:39 
-0700)


This fix is intended for v3.9.  It fixes a timer bug on MSM targets
that cause system hangs.


Stephen Boyd (1):
  ARM: msm: Stop counting before reprogramming clockevent

 arch/arm/mach-msm/timer.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

-- 
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH] mfd: pm8921: Disable driver until it gets fixed

[David Brown]

The pm8921 driver has been broken for a while now, but was prevented
from compiling because the SSBI bus driver was missing.  Now that SSBI
is present, pm8921 causes compile fails.

Until the pm8921 driver is fixed, mark it as BROKEN to prevent
compiles from failing.

Cc: Greg KH 
Cc: Stephen Rothwell 
Signed-off-by: David Brown 
---
Someone is working on the pm8921 driver, but we need to disable it
until those patches are posted.

 drivers/mfd/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 5bfa7bb..b9723a8 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -990,7 +990,7 @@ config MFD_PM8XXX
 
 config MFD_PM8921_CORE
tristate "Qualcomm PM8921 PMIC chip"
-   depends on SSBI
+   depends on SSBI && BROKEN
select MFD_CORE
select MFD_PM8XXX
help
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH v2] tty: serial: Add initial MSM UART High Speed Lite driver

[David Brown]

On Mon, Jul 22, 2013 at 10:05:48AM +0300, Ivan T. Ivanov wrote:

From: "Ivan T. Ivanov" 

This is a tty driver with console support for Qualcomm's UART
controllers found in the MSM8974 chipsets. Driver is completely
based on implementation found in codeaurora.org msm_serial_hs_lite
with Android dependences removed. Other changes include, moved to
device managed resources and few cleanups.

Driver functionality was tested in LEGACY_HSUART and BLSP_HSUART mode.


Ivan, do we need this driver with the fixes Stephen Boyd posted that
are supposed to fix the problems with the existing msm_serial.c
driver?  If a single driver can correctly support both devices, that
seems like a better solution to me.

David

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] msm gpio fixes for 3.11

[David Brown]

The following changes since commit ad81f0545ef01ea651886dddac4bef6cec930092:

  Linux 3.11-rc1 (2013-07-14 15:18:27 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git 
tags/msm-3.11-fix1

for you to fetch changes up to 8fd62389a778c902c7e8532594ea924bbaf465e8:

  ARM: msm: Consolidate gpiomux for older architectures (2013-07-26 14:55:38 
-0700)


Fixes for MSM for 3.11

Two small fixes for MSM.

The first fixes the a gpio controller register address.  I didn't see
any acks from the devicetree maintainers, so I've copied them on this
pull request.  The change itself is minor, and just to the register
address.

The second change removes the gpiomux V1 code from MSM.  This was
breaking compilation for some of the targets.


Rohit Vaswani (2):
  ARM: msm: dts: Fix the gpio register address for msm8960
  ARM: msm: Consolidate gpiomux for older architectures

 arch/arm/boot/dts/msm8960-cdp.dts |  4 ++--
 arch/arm/mach-msm/Kconfig |  3 +--
 arch/arm/mach-msm/gpiomux-v1.c| 33 -
 arch/arm/mach-msm/gpiomux.h   | 10 --
 4 files changed, 3 insertions(+), 47 deletions(-)
 delete mode 100644 arch/arm/mach-msm/gpiomux-v1.c
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH v2 1/6] usb: phy: msm: Move mach depndend code to platform data

[David Brown]

On Mon, Jul 29, 2013 at 10:04:19AM +0300, Ivan T. Ivanov wrote:

From: "Ivan T. Ivanov" 

This patch fix compilation error and is an intermediate step
before the addition of DeviceTree support for newer targets.
Fix suggested here: https://lkml.org/lkml/2013/6/19/381

Cc: David Brown 
Cc: Daniel Walker 
Cc: Bryan Huntsman 
Cc: Felipe Balbi 
Cc: Greg Kroah-Hartman 
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-...@vger.kernel.org

Signed-off-by: Ivan T. Ivanov 
---
arch/arm/mach-msm/board-msm7x30.c |   35 +++
arch/arm/mach-msm/board-qsd8x50.c |   35 +++


Acked-by: David Brown 

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH v2 6/9] ARM: msm: Move mach/board.h contents to common.h

[David Brown]

On Wed, Jul 24, 2013 at 01:54:31PM -0700, Stephen Boyd wrote:

The contents of mach/board.h are only used by files within
mach-msm so there is no need to export this file outside of the
mach-msm directory. Move the contents of the file to common.h to
allow us to compile MSM in the multi-platform kernel.

Cc: Florian Tobias Schandinat 
Signed-off-by: Stephen Boyd 
---
drivers/video/msm/msm_fb.c |  1 -


It'd be nice to get a framebuffer Ack from this part.

original patch:
 https://patchwork.kernel.org/patch/2833029/

David

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] mmc: sdhci-msm: Add support for MSM chipsets

[David Brown]

On Tue, Jul 30, 2013 at 05:40:16PM +0100, Chris Ball wrote:


On Tue, Jul 30 2013, Georgi Djakov wrote:

This platform driver adds the support of Secure Digital Host
Controller Interface compliant controller in MSM chipsets.

CC: Asutosh Das 
CC: Venkat Gopalakrishnan 
CC: Sahitya Tummala 
CC: Subhash Jadavani 
Signed-off-by: Georgi Djakov 
---
This is an initial version of the Qualcomm MSM SDHCI driver.
It is based on the SDHCI code from coreaurora.org with minor
modifications. The MMC standard DT bindings are used where
possible. The patch applies to v3.11-rc3.


Is the arch code that will use this driver already in mainline,
or on its way in?


It is on it's way.  Once all of the necessary Acks are in place, I'll
be pulling it in.

David

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH v2 3/9] ARM: msm: Move debug-macro.S to include/debug

[David Brown]

On Wed, Jul 24, 2013 at 01:54:28PM -0700, Stephen Boyd wrote:

One more step to allowing MSM to participate in the
multi-platform defconfig.


Full patch: https://patchwork.kernel.org/patch/2833034/


Signed-off-by: Stephen Boyd 
---
arch/arm/Kconfig.debug |  9 +++-
.../mach/debug-macro.S => include/debug/msm.S} | 32 ++-
arch/arm/mach-msm/include/mach/msm_iomap-8960.h|  5 --
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h|  5 --
arch/arm/mach-msm/include/mach/msm_iomap.h | 12 -
arch/arm/mach-msm/include/mach/uncompress.h| 63 --
arch/arm/mach-msm/io.c | 40 +++---
7 files changed, 58 insertions(+), 108 deletions(-)
rename arch/arm/{mach-msm/include/mach/debug-macro.S => include/debug/msm.S} 
(61%)
delete mode 100644 arch/arm/mach-msm/include/mach/uncompress.h


Any comments on this?  This is mostly an MSM change, but I'd like to
get an Ack from someone because of the file moving into
arch/arm/include/debug.

Thanks,
David

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[ARM ATTEND] DT binding and support and general SOC

[David Brown]

Qualcomm is starting to ramp up actually contributing support for MSM
to the mainline kernel.  There are at least a couple of areas where I
see direct discussion involvement would be useful:

 - DT binding.  The Qualcomm out-of-tree code has roughly 37k lines
   of dts/dtsi files.  There has been a lot of effort here to try an
   manage/organize these bindings, but for the most part, this work
   has happened entirely internally.  As more MSM code is
   contributed, there will be a lot more bindings coming in.  I can
   bring experience with what we've done/learned with our current
   internal bindings, as well as bring feedback to more align our
   work with how the ARM bindings in general are moving.

 - SoC code structure and layout.  As ARM increases in variants (new
   CPU types, lots of SoCs, 64-bit etc), I think we should have some
   discussion of how to best organize the code.

David Brown

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 08/18] ARM: msm: Switch to sched_clock_register()

[David Brown]

On Wed, Jul 31, 2013 at 03:31:07PM -0700, Stephen Boyd wrote:

The 32 bit sched_clock interface now supports 64 bits. Upgrade to
the 64 bit function to allow us to remove the 32 bit registration
interface.

Cc: David Brown 
Signed-off-by: Stephen Boyd 
---
arch/arm/mach-msm/timer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)


Acked-by: David Brown 

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [RESEND PATCH 1/2] ARM: msm: Add support for MSM8974

[David Brown]

On Thu, Aug 01, 2013 at 08:36:38PM -0700, Rohit Vaswani wrote:

On 8/1/2013 7:29 PM, Stephen Warren wrote:

On 08/01/2013 07:23 PM, Rohit Vaswani wrote:

This patch adds basic board support for MSM8974 which
belongs to the Snapdragon 800 family.
For now, just support a basic machine with device tree.
  arch/arm/boot/dts/msm8974.dts | 26 ++

That's odd. If this is support for an SoC, why not a *.dtsi file rather
than *.dts?


I am not sure why I would need a dtsi if I am just adding the 1 file for
the SoC support ?


The .dts file should be for a specific board, not a general SoC.  Note
the names of the other board .dts files for MSM.  We'll probably want
a msm8974.dtsi at some point, though.

David

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 1/3] mfd: pm8921: include missing linux/module.h

[David Brown]

On Tue, Aug 20, 2013 at 04:01:26PM +0900, Jingoo Han wrote:

Include  in order to fix the following errors.

drivers/mfd/pm8921-core.c:209:16: error: expected declaration specifiers or 
'...' before string constant
drivers/mfd/pm8921-core.c:210:20: error: expected declaration specifiers or 
'...' before string constant
drivers/mfd/pm8921-core.c:211:16: error: expected declaration specifiers or 
'...' before string constant
drivers/mfd/pm8921-core.c:212:14: error: expected declaration specifiers or 
'...' before string constant

Signed-off-by: Jingoo Han 
---
drivers/mfd/pm8921-core.c |1 +
1 file changed, 1 insertion(+)


Acked-by: David Brown 

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] [TRIVIAL] ARM: msm: fix compilation error in gpiomux

[David Brown]

On Wed, Aug 07, 2013 at 08:34:39AM +0200, Krzysztof Kozlowski wrote:

Fix compilation error in gpiomux (CONFIG_MSM_GPIOMUX=y):
arch/arm/mach-msm/gpiomux.c:24:13: error: static declaration of
‘__msm_gpiomux_write’ follows non-static declaration
arch/arm/mach-msm/gpiomux.h:85:6: note: previous declaration of
‘__msm_gpiomux_write’ was here

Signed-off-by: Krzysztof Kozlowski 


Thanks, I'll pull this in.

 

Daivd

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[GIT PULL] msm cleanups for v3.12

[David Brown]

The following changes since commit 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b:

  Linux 3.11-rc2 (2013-07-21 12:05:29 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git 
for-3.12/msm-cleanup2

for you to fetch changes up to b80a0dc53df68c6862b8985ecc12856edb080248:

  ARM: msm: fix compilation error in gpiomux (2013-08-07 10:39:31 -0700)


General cleanups for MSM for 3.12

This is a series of cleanups to the MSM code.  These are a healthy
start to bringing the MSM code closer to the state of current ARM code
and getting more of it ready for conversion to devicetree.



This is missing an Ack for the "Move debug-macro.S to include/debug".
Stephen incorporated feedback from RMK, which I folded into the patch.

There are conflicts in arch/arm/Kconfig.debug which are resolved in
the linux-next tree.

Krzysztof Kozlowski (1):
  ARM: msm: fix compilation error in gpiomux

Rohit Vaswani (1):
  ARM: msm: Remove unused and unmapped MSM_TLMM_BASE for 8x60

Stephen Boyd (8):
  ARM: msm: Don't compile __msm_ioremap_caller() unless used
  ARM: msm: Move debug-macro.S to include/debug
  ARM: msm: Remove TMR and TMR0 static mappings
  ARM: msm: Migrate msm_timer to CLOCKSOURCE_OF_DECLARE
  ARM: msm: Move mach/board.h contents to common.h
  ARM: msm: Remove devices-iommu.c
  iommu/msm: Move mach includes to iommu directory
  ARM: msm: Only compile io.c on platforms that use it

 arch/arm/Kconfig   |   1 +
 arch/arm/Kconfig.debug |   9 +-
 .../mach/debug-macro.S => include/debug/msm.S} |  32 +-
 arch/arm/mach-msm/Makefile |   9 +-
 arch/arm/mach-msm/board-dt-8660.c  |   4 +-
 arch/arm/mach-msm/board-dt-8960.c  |   3 +-
 arch/arm/mach-msm/board-halibut.c  |   1 -
 arch/arm/mach-msm/board-mahimahi.c |   2 +-
 arch/arm/mach-msm/board-msm7x30.c  |   1 -
 arch/arm/mach-msm/board-qsd8x50.c  |   1 -
 arch/arm/mach-msm/board-sapphire.c |   2 +-
 arch/arm/mach-msm/board-trout.c|   1 -
 arch/arm/mach-msm/board-trout.h|   2 +-
 arch/arm/mach-msm/common.h |  18 +-
 arch/arm/mach-msm/devices-iommu.c  | 912 -
 arch/arm/mach-msm/devices-msm7x30.c|   2 +-
 arch/arm/mach-msm/devices-qsd8x50.c|   2 +-
 arch/arm/mach-msm/gpiomux.c|   2 +-
 arch/arm/mach-msm/include/mach/board.h |  38 -
 arch/arm/mach-msm/include/mach/msm_iomap-8960.h|  46 --
 arch/arm/mach-msm/include/mach/msm_iomap-8x60.h|  53 --
 arch/arm/mach-msm/include/mach/msm_iomap.h |  17 -
 arch/arm/mach-msm/include/mach/uncompress.h|  63 --
 arch/arm/mach-msm/io.c |  67 +-
 arch/arm/mach-msm/timer.c  |  17 +-
 drivers/iommu/msm_iommu.c  |   4 +-
 .../mach/iommu.h => drivers/iommu/msm_iommu.h  |   0
 drivers/iommu/msm_iommu_dev.c  |   4 +-
 .../iommu/msm_iommu_hw-8xxx.h  |   0
 drivers/video/msm/msm_fb.c |   1 -
 30 files changed, 94 insertions(+), 1220 deletions(-)
 rename arch/arm/{mach-msm/include/mach/debug-macro.S => include/debug/msm.S} 
(61%)
 delete mode 100644 arch/arm/mach-msm/devices-iommu.c
 delete mode 100644 arch/arm/mach-msm/include/mach/board.h
 delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-8960.h
 delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
 delete mode 100644 arch/arm/mach-msm/include/mach/uncompress.h
 rename arch/arm/mach-msm/include/mach/iommu.h => drivers/iommu/msm_iommu.h 
(100%)
 rename arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h => 
drivers/iommu/msm_iommu_hw-8xxx.h (100%)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] msm cleanups for v3.12

[David Brown]

On Wed, Aug 07, 2013 at 01:58:16PM -0700, David Brown wrote:

The following changes since commit 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b:

 Linux 3.11-rc2 (2013-07-21 12:05:29 -0700)

are available in the git repository at:

 git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git 
for-3.12/msm-cleanup2

for you to fetch changes up to b80a0dc53df68c6862b8985ecc12856edb080248:

 ARM: msm: fix compilation error in gpiomux (2013-08-07 10:39:31 -0700)


Sigh, it looks like this fixes code that was removed in last-week's
fix patches.  I can either regenerate the pull request, or feel free
to "resolve" this by just using the removal of the code.

David

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [GIT PULL] msm cleanups for v3.12

[David Brown]

On Wed, Aug 07, 2013 at 02:52:59PM -0700, David Brown wrote:

On Wed, Aug 07, 2013 at 01:58:16PM -0700, David Brown wrote:

The following changes since commit 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b:

 Linux 3.11-rc2 (2013-07-21 12:05:29 -0700)

are available in the git repository at:

 git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git 
for-3.12/msm-cleanup2

for you to fetch changes up to b80a0dc53df68c6862b8985ecc12856edb080248:

 ARM: msm: fix compilation error in gpiomux (2013-08-07 10:39:31 -0700)


Sigh, it looks like this fixes code that was removed in last-week's
fix patches.  I can either regenerate the pull request, or feel free
to "resolve" this by just using the removal of the code.


Sorry, this patch doesn't actually conflict with the fixes, but is
incorrect in light of them.  I will resend the pull request without
this patch.

David

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/