Re: [PATCH] MAINTAINERS: Change QCOM entries
On Fri, Dec 11, 2015 at 03:46:18PM -0600, Andy Gross wrote: From: Andy Gross <agr...@codeaurora.org> This patch changes the email address for Andy Gross and David Brown and drops Kumar Gala. In addition, it changes the location of the repository. Signed-off-by: Andy Gross <andy.gr...@linaro.org> Signed-off-by: Andy Gross <agr...@codeaurora.org> Acked-by: David Brown <david.br...@linaro.org> -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What is git repo for linux-arm-msm code?
On Thu, Dec 26, 2013 at 09:37:25AM -0800, Subodh Nijsure wrote: I came across the mailing list through the codeaurora.org linux-msm page. I am working on hardware platform that is based on IFC6440 hardware. Kernel we have is fairly old. We are having issues with I2c working reliably same with 3G modem causing system to lock up. ( This is on Android platform). So I was looking to test the system with more latest kernel, hence few questions. What is the git repo where all the patches that are proposed/approved merged to before Linus picks them up via linux-arm merge requests? Is the android's version of msm kernel found at https://android.googlesource.com/kernel/msm the correct location to download latest msm kernel? Generally, patches go into git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git before going to a pull request through the linux arm tree. However, this doesn't generally contain patches for very long, and most things will get into the ARM SOC tree fairly quickly. There are also trees on codeaurora.org that are the trees used in commercial devices, which will have a lot of code that is not yet in the upstream kernel. This may or may not be useful to you, depending on your needs. 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 0/7] MSM patches for 3.14
The following series contains a warning fix, a bit of cleanup, adds a few more boards. There are still numerous patches floating with issues, but things seem to be moving in the right direction. These have all been sent previously to the lists, and received reviews and necessary acks. Josh Cartwright (1): ARM: msm: trout: fix uninit var warning Rohit Vaswani (2): ARM: msm: Add support for APQ8074 Dragonboard defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974 Stephen Boyd (4): ARM: msm: Simplify ARCH_MSM_DT config ARM: dts: MSM8974: Add restart node ARM: dts: MSM8974: Add MMIO architected timer node ARM: msm_defconfig: Enable restart driver arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 6 ++ arch/arm/boot/dts/qcom-msm8974.dtsi| 97 ++ arch/arm/configs/msm_defconfig | 3 + arch/arm/mach-msm/Kconfig | 15 +++- arch/arm/mach-msm/board-dt.c | 9 +++ arch/arm/mach-msm/board-trout.c| 12 ++-- 7 files changed, 136 insertions(+), 9 deletions(-) create mode 100644 arch/arm/boot/dts/qcom-apq8074-dragonboard.dts create mode 100644 arch/arm/boot/dts/qcom-msm8974.dtsi -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/7] ARM: msm: Add support for APQ8074 Dragonboard
From: Rohit Vaswani rvasw...@codeaurora.org
This patch adds basic board support for APQ8074 Dragonboard
which belongs to the Snapdragon 800 family.
For now, just support a basic machine with device tree.
Signed-off-by: Rohit Vaswani rvasw...@codeaurora.org
Acked-by: Kumar Gala ga...@codeaurora.org
Signed-off-by: David Brown dav...@codeaurora.org
---
arch/arm/boot/dts/Makefile | 3 ++-
arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 6 +
arch/arm/boot/dts/qcom-msm8974.dtsi| 33 ++
arch/arm/mach-msm/Kconfig | 11 -
arch/arm/mach-msm/board-dt.c | 9 +++
5 files changed, 60 insertions(+), 2 deletions(-)
create mode 100644 arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
create mode 100644 arch/arm/boot/dts/qcom-msm8974.dtsi
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index d57c1a6..5b37694 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -105,7 +105,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
kirkwood-ts219-6282.dtb
dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \
- qcom-msm8960-cdp.dtb
+ qcom-msm8960-cdp.dtb \
+ qcom-apq8074-dragonboard.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
armada-370-mirabox.dtb \
armada-370-netgear-rn102.dtb \
diff --git a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
new file mode 100644
index 000..13ac3e2
--- /dev/null
+++ b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
@@ -0,0 +1,6 @@
+#include qcom-msm8974.dtsi
+
+/ {
+ model = Qualcomm APQ8074 Dragonboard;
+ compatible = qcom,apq8074-dragonboard, qcom,apq8074;
+};
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi
b/arch/arm/boot/dts/qcom-msm8974.dtsi
new file mode 100644
index 000..2ebb4f0
--- /dev/null
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -0,0 +1,33 @@
+/dts-v1/;
+
+#include skeleton.dtsi
+
+/ {
+ model = Qualcomm MSM8974;
+ compatible = qcom,msm8974;
+ interrupt-parent = intc;
+
+ soc: soc {
+ #address-cells = 1;
+ #size-cells = 1;
+ ranges;
+ compatible = simple-bus;
+
+ intc: interrupt-controller@f900 {
+ compatible = qcom,msm-qgic2;
+ interrupt-controller;
+ #interrupt-cells = 3;
+ reg = 0xf900 0x1000,
+ 0xf9002000 0x1000;
+ };
+
+ timer {
+ compatible = arm,armv7-timer;
+ interrupts = 1 2 0xf08,
+1 3 0xf08,
+1 4 0xf08,
+1 1 0xf08;
+ clock-frequency = 1920;
+ };
+ };
+};
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 2586c28..5e5782d 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -58,9 +58,18 @@ config ARCH_MSM8960
select GPIO_MSM_V2
select MSM_SCM if SMP
+config ARCH_MSM8974
+ bool MSM8974
+ select ARM_GIC
+ select CPU_V7
+ select HAVE_ARM_ARCH_TIMER
+ select HAVE_SMP
+ select MSM_SCM if SMP
+ select USE_OF
+
config ARCH_MSM_DT
def_bool y
- depends on (ARCH_MSM8X60 || ARCH_MSM8960)
+ depends on (ARCH_MSM8X60 || ARCH_MSM8960 || ARCH_MSM8974)
select SPARSE_IRQ
select USE_OF
diff --git a/arch/arm/mach-msm/board-dt.c b/arch/arm/mach-msm/board-dt.c
index 16e6183..1f11d93 100644
--- a/arch/arm/mach-msm/board-dt.c
+++ b/arch/arm/mach-msm/board-dt.c
@@ -26,7 +26,16 @@ static const char * const msm_dt_match[] __initconst = {
NULL
};
+static const char * const apq8074_dt_match[] __initconst = {
+ qcom,apq8074-dragonboard,
+ NULL
+};
+
DT_MACHINE_START(MSM_DT, Qualcomm MSM (Flattened Device Tree))
.smp = smp_ops(msm_smp_ops),
.dt_compat = msm_dt_match,
MACHINE_END
+
+DT_MACHINE_START(APQ_DT, Qualcomm MSM (Flattened Device Tree))
+ .dt_compat = apq8074_dt_match,
+MACHINE_END
--
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-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/7] ARM: msm: trout: fix uninit var warning
From: Josh Cartwright jo...@codeaurora.org
Fix the following warning when !CONFIG_MMC:
arch/arm/mach-msm/board-trout.c: In function 'trout_init':
arch/arm/mach-msm/board-trout.c:67:6: warning: unused variable 'rc'
[-Wunused-variable]
int rc;
^
Also, while we're here, rework explicit printk(KERN_CRIT..) to use
pr_crit.
Signed-off-by: Josh Cartwright jo...@codeaurora.org
Signed-off-by: David Brown dav...@codeaurora.org
---
arch/arm/mach-msm/board-trout.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c
index ccf6621..015d544 100644
--- a/arch/arm/mach-msm/board-trout.c
+++ b/arch/arm/mach-msm/board-trout.c
@@ -13,6 +13,7 @@
* GNU General Public License for more details.
*
*/
+#define pr_fmt(fmt) %s: fmt, __func__
#include linux/kernel.h
#include linux/init.h
@@ -68,12 +69,11 @@ static void __init trout_init(void)
platform_add_devices(devices, ARRAY_SIZE(devices));
-#ifdef CONFIG_MMC
-rc = trout_init_mmc(system_rev);
-if (rc)
-printk(KERN_CRIT %s: MMC init failure (%d)\n, __func__, rc);
-#endif
-
+ if (IS_ENABLED(CONFIG_MMC)) {
+ rc = trout_init_mmc(system_rev);
+ if (rc)
+ pr_crit(MMC init failure (%d)\n, rc);
+ }
}
static struct map_desc trout_io_desc[] __initdata = {
--
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-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 4/7] ARM: msm: Simplify ARCH_MSM_DT config
From: Stephen Boyd sb...@codeaurora.org This doesn't need to be a def_bool y. Instead we can have every DT supported platform select ARCH_MSM_DT and we achieve the same thing with less chance of conflicts. Signed-off-by: Stephen Boyd sb...@codeaurora.org Signed-off-by: David Brown dav...@codeaurora.org --- arch/arm/mach-msm/Kconfig | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index 5e5782d..702553b 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -44,6 +44,7 @@ endchoice config ARCH_MSM8X60 bool MSM8X60 + select ARCH_MSM_DT select ARM_GIC select CPU_V7 select GPIO_MSM_V2 @@ -52,6 +53,7 @@ config ARCH_MSM8X60 config ARCH_MSM8960 bool MSM8960 + select ARCH_MSM_DT select ARM_GIC select CPU_V7 select HAVE_SMP @@ -60,6 +62,7 @@ config ARCH_MSM8960 config ARCH_MSM8974 bool MSM8974 + select ARCH_MSM_DT select ARM_GIC select CPU_V7 select HAVE_ARM_ARCH_TIMER @@ -68,8 +71,7 @@ config ARCH_MSM8974 select USE_OF config ARCH_MSM_DT - def_bool y - depends on (ARCH_MSM8X60 || ARCH_MSM8960 || ARCH_MSM8974) + bool select SPARSE_IRQ select USE_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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/7] defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
From: Rohit Vaswani rvasw...@codeaurora.org This patch enables MSM8974 build support. Signed-off-by: Rohit Vaswani rvasw...@codeaurora.org Signed-off-by: David Brown dav...@codeaurora.org --- arch/arm/configs/msm_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/msm_defconfig b/arch/arm/configs/msm_defconfig index 690b5f9..0ed32e5 100644 --- a/arch/arm/configs/msm_defconfig +++ b/arch/arm/configs/msm_defconfig @@ -20,6 +20,7 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_ARCH_MSM=y CONFIG_ARCH_MSM8X60=y CONFIG_ARCH_MSM8960=y +CONFIG_ARCH_MSM8974=y CONFIG_SMP=y CONFIG_PREEMPT=y CONFIG_AEABI=y -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 5/7] ARM: dts: MSM8974: Add restart node
From: Stephen Boyd sb...@codeaurora.org
Add the restart node so we can reboot the device.
Signed-off-by: Stephen Boyd sb...@codeaurora.org
Signed-off-by: David Brown dav...@codeaurora.org
---
arch/arm/boot/dts/qcom-msm8974.dtsi | 5 +
1 file changed, 5 insertions(+)
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi
b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 2ebb4f0..df18637 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -29,5 +29,10 @@
1 1 0xf08;
clock-frequency = 1920;
};
+
+ restart@fc4ab000 {
+ compatible = qcom,pshold;
+ reg = 0xfc4ab000 0x4;
+ };
};
};
--
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-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 6/7] ARM: dts: MSM8974: Add MMIO architected timer node
From: Stephen Boyd sb...@codeaurora.org
Add the mmio architected timer node.
Signed-off-by: Stephen Boyd sb...@codeaurora.org
Signed-off-by: David Brown dav...@codeaurora.org
---
arch/arm/boot/dts/qcom-msm8974.dtsi | 59 +
1 file changed, 59 insertions(+)
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi
b/arch/arm/boot/dts/qcom-msm8974.dtsi
index df18637..6ac9496 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -30,6 +30,65 @@
clock-frequency = 1920;
};
+ timer@f902 {
+ #address-cells = 1;
+ #size-cells = 1;
+ ranges;
+ compatible = arm,armv7-timer-mem;
+ reg = 0xf902 0x1000;
+ clock-frequency = 1920;
+
+ frame@f9021000 {
+ frame-number = 0;
+ interrupts = 0 8 0x4,
+0 7 0x4;
+ reg = 0xf9021000 0x1000,
+ 0xf9022000 0x1000;
+ };
+
+ frame@f9023000 {
+ frame-number = 1;
+ interrupts = 0 9 0x4;
+ reg = 0xf9023000 0x1000;
+ status = disabled;
+ };
+
+ frame@f9024000 {
+ frame-number = 2;
+ interrupts = 0 10 0x4;
+ reg = 0xf9024000 0x1000;
+ status = disabled;
+ };
+
+ frame@f9025000 {
+ frame-number = 3;
+ interrupts = 0 11 0x4;
+ reg = 0xf9025000 0x1000;
+ status = disabled;
+ };
+
+ frame@f9026000 {
+ frame-number = 4;
+ interrupts = 0 12 0x4;
+ reg = 0xf9026000 0x1000;
+ status = disabled;
+ };
+
+ frame@f9027000 {
+ frame-number = 5;
+ interrupts = 0 13 0x4;
+ reg = 0xf9027000 0x1000;
+ status = disabled;
+ };
+
+ frame@f9028000 {
+ frame-number = 6;
+ interrupts = 0 14 0x4;
+ reg = 0xf9028000 0x1000;
+ status = disabled;
+ };
+ };
+
restart@fc4ab000 {
compatible = qcom,pshold;
reg = 0xfc4ab000 0x4;
--
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-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 7/7] ARM: msm_defconfig: Enable restart driver
From: Stephen Boyd sb...@codeaurora.org Signed-off-by: Stephen Boyd sb...@codeaurora.org Signed-off-by: David Brown dav...@codeaurora.org --- arch/arm/configs/msm_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/msm_defconfig b/arch/arm/configs/msm_defconfig index 0ed32e5..c5698b7 100644 --- a/arch/arm/configs/msm_defconfig +++ b/arch/arm/configs/msm_defconfig @@ -89,6 +89,8 @@ CONFIG_SSBI=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y CONFIG_POWER_SUPPLY=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_MSM=y CONFIG_THERMAL=y CONFIG_REGULATOR=y CONFIG_MEDIA_SUPPORT=y -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v4 00/15] usb: phy: msm: Fixes, cleanups and DT support
On Thu, Dec 19, 2013 at 05:26:13PM -0600, Felipe Balbi wrote: it's getting quite late for me. I still want to leave my stuff soaking in linux-next for a while. I'll try my best, though, if you ack it ASAP Thanks. Patch 1 already has my Ack in it, and I've sent an ack for number 6. 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v4 06/15] usb: phy: msm: Replace custom enum usb_mode_type with enum usb_dr_mode
On Tue, Nov 12, 2013 at 04:51:41PM +0200, Ivan T. Ivanov wrote: From: Ivan T. Ivanov iiva...@mm-sol.com Use enum usb_dr_mode and drop default usb_dr_mode from platform data. USB DT bindings states: dr_mode: ...In case this attribute isn't passed via DT, USB DRD controllers should default to OTG..., so remove redundand field. Signed-off-by: Ivan T. Ivanov iiva...@mm-sol.com --- arch/arm/mach-msm/board-msm7x30.c |2 +- arch/arm/mach-msm/board-qsd8x50.c |2 +- Acked-by: David Brown dav...@codeaurora.org -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 6/6] ARM: dts: msm: Add Krait CPU/L2 nodes
On Wed, Oct 30, 2013 at 01:25:36PM -0700, Stephen Boyd wrote: This allows us to probe the krait-edac driver. Cc: David Brown dav...@codeaurora.org Signed-off-by: Stephen Boyd sb...@codeaurora.org --- arch/arm/boot/dts/qcom-msm8974.dtsi | 37 + 1 file changed, 37 insertions(+) Acked-by: David Brown dav...@codeaurora.org -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 0/4] Remove older ARM msm SoC support
Over the past few years, the ARM msm SoC tree has picked up support for a handfull of SoCs. Each of these targets had a brief period of activity, and has since only received trivial fixes. Support has only been minimal, generally serial console, and possibly storage. None of these saw conversion to device tree, and they contain a lot of headers and other aspects that prevent use in the ARM multi-platform kernel. Current activity on MSM seems to be focused on newer SoCs. These devices have the advantage of having dev-boards available, so hopefully there will be more community activity. There also seems to be effort into better DT and multi-platform support on these targets, but not the older ones. This patch series removes support for the three older Qualcomm SoC families: 7x00, 7x30, and 8x50. If there is a serious desire to support any of these SoCs, patches that make them properly support DT, and multi-platform can begin by adding the necessary files back. Note that because these patches remove a lot of lines of code, and the lengths exceed the size typically allowed on the mailing lists, I've generated the patches with the '-D' option to format-patch. I can send full patches on request, and I've also made the patches available at: git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git for-3.14/big-cleanup David Brown (4): ARM: msm: Remove unused board files ARM: msm: Remove 7x00 support ARM: msm: Remove 7x30 support ARM: msm: Remove 8x50 support arch/arm/mach-msm/Kconfig | 104 --- arch/arm/mach-msm/Makefile | 20 - arch/arm/mach-msm/board-halibut.c | 110 --- arch/arm/mach-msm/board-mahimahi.c | 88 -- arch/arm/mach-msm/board-msm7x30.c | 157 arch/arm/mach-msm/board-qsd8x50.c | 213 - arch/arm/mach-msm/board-sapphire.c | 117 --- arch/arm/mach-msm/board-trout-gpio.c| 233 - arch/arm/mach-msm/board-trout-mmc.c | 185 arch/arm/mach-msm/board-trout-panel.c | 292 --- arch/arm/mach-msm/board-trout.c | 113 --- arch/arm/mach-msm/board-trout.h | 162 arch/arm/mach-msm/clock-pcom.c | 177 arch/arm/mach-msm/clock-pcom.h | 145 arch/arm/mach-msm/devices-msm7x00.c | 480 --- arch/arm/mach-msm/devices-msm7x30.c | 246 -- arch/arm/mach-msm/devices-qsd8x50.c | 388 - arch/arm/mach-msm/devices.h | 53 -- arch/arm/mach-msm/dma.c | 295 --- arch/arm/mach-msm/gpiomux-8x50.c| 51 -- arch/arm/mach-msm/gpiomux-v1.h | 67 -- arch/arm/mach-msm/gpiomux.c | 111 --- arch/arm/mach-msm/gpiomux.h | 84 -- arch/arm/mach-msm/include/mach/entry-macro.S| 36 - arch/arm/mach-msm/include/mach/hardware.h | 18 - arch/arm/mach-msm/include/mach/irqs-7x00.h | 75 -- arch/arm/mach-msm/include/mach/irqs-7x30.h | 153 arch/arm/mach-msm/include/mach/irqs-8x50.h | 88 -- arch/arm/mach-msm/include/mach/irqs.h | 37 - arch/arm/mach-msm/include/mach/msm_gpiomux.h| 38 - arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 108 --- arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 103 --- arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 125 --- arch/arm/mach-msm/include/mach/msm_iomap.h | 53 -- arch/arm/mach-msm/include/mach/msm_smd.h| 109 --- arch/arm/mach-msm/include/mach/sirc.h | 98 --- arch/arm/mach-msm/include/mach/vreg.h | 29 - arch/arm/mach-msm/io.c | 161 arch/arm/mach-msm/irq-vic.c | 363 arch/arm/mach-msm/irq.c | 151 arch/arm/mach-msm/last_radio_log.c | 71 -- arch/arm/mach-msm/proc_comm.c | 129 --- arch/arm/mach-msm/proc_comm.h | 258 -- arch/arm/mach-msm/sirc.c| 172 arch/arm/mach-msm/smd.c | 1035 --- arch/arm/mach-msm/smd_debug.c | 311 --- arch/arm/mach-msm/smd_private.h | 403 - arch/arm/mach-msm/vreg.c| 220 - 48 files changed, 8235 deletions(-) delete mode 100644 arch/arm/mach-msm/board-halibut.c delete mode 100644 arch/arm/mach-msm/board-mahimahi.c delete mode 100644 arch/arm/mach-msm/board-msm7x30.c delete mode 100644 arch/arm/mach-msm/board-qsd8x50.c delete mode 100644 arch/arm/mach-msm/board-sapphire.c delete mode 100644 arch/arm/mach-msm/board-trout-gpio.c delete mode 100644 arch/arm/mach-msm/board-trout-mmc.c delete mode 100644 arch/arm/mach-msm/board-trout-panel.c delete mode 100644 arch/arm/mach-msm/board-trout.c delete mode 100644
[PATCH 4/4] ARM: msm: Remove 8x50 support
The MSM8x50 SoC support was added in 2010 based on code from Google's Android kernels. Platform support is fairly minimal, and the only changes that have been made have been trivial and cleanup changes. This code has not been converted to device tree, and is hindering support for the multi-platform kernel on ARM. If someone wishes to continue support for this target, patches that provide devicetree and multi-platform support can start by re-adding these files. Signed-off-by: David Brown dav...@codeaurora.org --- Note that this patch was made with -D. I can send the full patch on request, and have also made the tree available at: git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git for-3.14/big-cleanup arch/arm/mach-msm/Kconfig | 57 -- arch/arm/mach-msm/Makefile | 14 - arch/arm/mach-msm/board-qsd8x50.c | 213 - arch/arm/mach-msm/clock-pcom.c | 177 arch/arm/mach-msm/clock-pcom.h | 145 arch/arm/mach-msm/devices-qsd8x50.c | 388 - arch/arm/mach-msm/devices.h | 53 -- arch/arm/mach-msm/dma.c | 295 --- arch/arm/mach-msm/gpiomux-8x50.c| 51 -- arch/arm/mach-msm/gpiomux-v1.h | 67 -- arch/arm/mach-msm/gpiomux.c | 111 --- arch/arm/mach-msm/gpiomux.h | 84 -- arch/arm/mach-msm/include/mach/entry-macro.S| 36 - arch/arm/mach-msm/include/mach/hardware.h | 18 - arch/arm/mach-msm/include/mach/irqs-8x50.h | 88 -- arch/arm/mach-msm/include/mach/irqs.h | 37 - arch/arm/mach-msm/include/mach/msm_gpiomux.h| 38 - arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 125 --- arch/arm/mach-msm/include/mach/msm_iomap.h | 53 -- arch/arm/mach-msm/include/mach/msm_smd.h| 109 --- arch/arm/mach-msm/include/mach/sirc.h | 98 --- arch/arm/mach-msm/include/mach/vreg.h | 29 - arch/arm/mach-msm/io.c | 161 arch/arm/mach-msm/irq-vic.c | 363 arch/arm/mach-msm/last_radio_log.c | 71 -- arch/arm/mach-msm/proc_comm.c | 129 --- arch/arm/mach-msm/proc_comm.h | 258 -- arch/arm/mach-msm/sirc.c| 172 arch/arm/mach-msm/smd.c | 1035 --- arch/arm/mach-msm/smd_debug.c | 311 --- arch/arm/mach-msm/smd_private.h | 403 - arch/arm/mach-msm/vreg.c| 220 - 32 files changed, 5409 deletions(-) delete mode 100644 arch/arm/mach-msm/board-qsd8x50.c delete mode 100644 arch/arm/mach-msm/clock-pcom.c delete mode 100644 arch/arm/mach-msm/clock-pcom.h delete mode 100644 arch/arm/mach-msm/devices-qsd8x50.c delete mode 100644 arch/arm/mach-msm/devices.h delete mode 100644 arch/arm/mach-msm/dma.c delete mode 100644 arch/arm/mach-msm/gpiomux-8x50.c delete mode 100644 arch/arm/mach-msm/gpiomux-v1.h delete mode 100644 arch/arm/mach-msm/gpiomux.c delete mode 100644 arch/arm/mach-msm/gpiomux.h delete mode 100644 arch/arm/mach-msm/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-msm/include/mach/hardware.h delete mode 100644 arch/arm/mach-msm/include/mach/irqs-8x50.h delete mode 100644 arch/arm/mach-msm/include/mach/irqs.h delete mode 100644 arch/arm/mach-msm/include/mach/msm_gpiomux.h delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-8x50.h delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap.h delete mode 100644 arch/arm/mach-msm/include/mach/msm_smd.h delete mode 100644 arch/arm/mach-msm/include/mach/sirc.h delete mode 100644 arch/arm/mach-msm/include/mach/vreg.h delete mode 100644 arch/arm/mach-msm/io.c delete mode 100644 arch/arm/mach-msm/irq-vic.c delete mode 100644 arch/arm/mach-msm/last_radio_log.c delete mode 100644 arch/arm/mach-msm/proc_comm.c delete mode 100644 arch/arm/mach-msm/proc_comm.h delete mode 100644 arch/arm/mach-msm/sirc.c delete mode 100644 arch/arm/mach-msm/smd.c delete mode 100644 arch/arm/mach-msm/smd_debug.c delete mode 100644 arch/arm/mach-msm/smd_private.h delete mode 100644 arch/arm/mach-msm/vreg.c diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index c9c113d..cb239ca 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -3,24 +3,6 @@ if ARCH_MSM comment Qualcomm MSM SoC Type depends on ARCH_MSM_DT -choice - prompt Qualcomm MSM SoC Type - default ARCH_QSD8X50 - depends on !ARCH_MSM_DT - -config ARCH_QSD8X50 - bool QSD8X50 - select ARCH_MSM_SCORPION - select CPU_V7 - select GPIO_MSM_V1 - select MACH_QSD8X50_SURF if !MACH_QSD8X50A_ST1_5 - select MSM_GPIOMUX - select MSM_PROC_COMM - select MSM_SMD - select MSM_VIC - -endchoice
[PATCH 1/4] ARM: msm: Remove unused board files
These board files were added in 2010, and have never been compiled in the tree. If these targets were to be included, at this point, they would need to be done using device tree, so there is no reason to keep these files around. Signed-off-by: David Brown dav...@codeaurora.org --- Note that this patch was made with -D. I can send the full patch on request, and have also made the tree available at: git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git for-3.14/big-cleanup arch/arm/mach-msm/board-mahimahi.c | 88 arch/arm/mach-msm/board-sapphire.c | 117 - 2 files changed, 205 deletions(-) delete mode 100644 arch/arm/mach-msm/board-mahimahi.c delete mode 100644 arch/arm/mach-msm/board-sapphire.c diff --git a/arch/arm/mach-msm/board-mahimahi.c b/arch/arm/mach-msm/board-mahimahi.c deleted file mode 100644 index 7d9981c..000 diff --git a/arch/arm/mach-msm/board-sapphire.c b/arch/arm/mach-msm/board-sapphire.c deleted file mode 100644 index 3276051..000 -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/4] ARM: msm: Remove 7x30 support
The MSM7x30 SoC support was added in 2009 based on code from Google's Android kernels. Platform support is fairly minimal, and the only changes that have been made have been trivial and cleanup changes. This code has not been converted to device tree, and is hindering supporting multiple-platform on ARM. If someone wishes to continue support for this target, patches that provide devicetree and multi-platform support can start by re-adding these files. Signed-off-by: David Brown dav...@codeaurora.org --- Note that this patch was made with -D. I can send the full patch on request, and have also made the tree available at: git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git for-3.14/big-cleanup arch/arm/mach-msm/Kconfig | 19 +- arch/arm/mach-msm/Makefile | 2 - arch/arm/mach-msm/board-msm7x30.c | 157 --- arch/arm/mach-msm/devices-msm7x30.c | 246 arch/arm/mach-msm/include/mach/irqs-7x30.h | 153 --- arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 103 -- 6 files changed, 1 insertion(+), 679 deletions(-) delete mode 100644 arch/arm/mach-msm/board-msm7x30.c delete mode 100644 arch/arm/mach-msm/devices-msm7x30.c delete mode 100644 arch/arm/mach-msm/include/mach/irqs-7x30.h delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-7x30.h diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index d43d20c..c9c113d 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -5,20 +5,9 @@ comment Qualcomm MSM SoC Type choice prompt Qualcomm MSM SoC Type - default ARCH_MSM7X30 + default ARCH_QSD8X50 depends on !ARCH_MSM_DT -config ARCH_MSM7X30 - bool MSM7x30 - select ARCH_MSM_SCORPION - select CPU_V7 - select GPIO_MSM_V1 - select MACH_MSM7X30_SURF # if ! - select MSM_GPIOMUX - select MSM_PROC_COMM - select MSM_SMD - select MSM_VIC - config ARCH_QSD8X50 bool QSD8X50 select ARCH_MSM_SCORPION @@ -69,12 +58,6 @@ config MSM_VIC menu Qualcomm MSM Board Type depends on !ARCH_MSM_DT -config MACH_MSM7X30_SURF - depends on ARCH_MSM7X30 - bool MSM7x30 SURF - help - Support for the Qualcomm MSM7x30 SURF eval board. - config MACH_QSD8X50_SURF depends on ARCH_QSD8X50 bool QSD8x50 SURF diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index c7a5b53..4bc7ee4 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -8,7 +8,6 @@ obj-$(CONFIG_ARCH_QSD8X50) += sirc.o obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o obj-$(CONFIG_ARCH_MSM7X00A) += dma.o io.o -obj-$(CONFIG_ARCH_MSM7X30) += dma.o io.o obj-$(CONFIG_ARCH_QSD8X50) += dma.o io.o obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o @@ -20,7 +19,6 @@ CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o obj-$(CONFIG_SMP) += headsmp.o platsmp.o -obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o obj-$(CONFIG_ARCH_MSM_DT) += board-dt.o obj-$(CONFIG_MSM_GPIOMUX) += gpiomux.o diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c deleted file mode 100644 index f9af5a4..000 diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c deleted file mode 100644 index c15ea8a..000 diff --git a/arch/arm/mach-msm/include/mach/irqs-7x30.h b/arch/arm/mach-msm/include/mach/irqs-7x30.h deleted file mode 100644 index 1f15902..000 diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h b/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h deleted file mode 100644 index 198202c..000 -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 0/6] drm/msm: queued up patches for 3.13
On Sun, Oct 20, 2013 at 12:10:53PM -0400, Rob Clark wrote: Fyi, here are the queued up patches I have so far for 3.13. I'm happy with these changes. You can add a Acked-by: David Brown dav...@codeaurora.org if you want. David Rob Clark (6): drm/msm: prime support drm/msm: support render nodes drm/msm: resync generated headers drm/msm: add plane support drm/msm: rework inactive-work drm/msm: EBUSY status handling in msm_gem_fault() drivers/gpu/drm/msm/Makefile | 1 + drivers/gpu/drm/msm/adreno/a2xx.xml.h | 42 ++- drivers/gpu/drm/msm/adreno/a3xx.xml.h | 46 +-- drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 10 +- drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h| 10 +- drivers/gpu/drm/msm/dsi/dsi.xml.h | 6 +- drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 6 +- drivers/gpu/drm/msm/dsi/sfpb.xml.h | 6 +- drivers/gpu/drm/msm/hdmi/hdmi.xml.h| 6 +- drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 6 +- drivers/gpu/drm/msm/mdp4/mdp4.xml.h| 126 +-- drivers/gpu/drm/msm/mdp4/mdp4_crtc.c | 147 ++- drivers/gpu/drm/msm/mdp4/mdp4_format.c | 16 +++ drivers/gpu/drm/msm/mdp4/mdp4_kms.c| 17 +++ drivers/gpu/drm/msm/mdp4/mdp4_kms.h| 56 - drivers/gpu/drm/msm/mdp4/mdp4_plane.c | 30 +++-- drivers/gpu/drm/msm/msm_drv.c | 60 -- drivers/gpu/drm/msm/msm_drv.h | 37 +- drivers/gpu/drm/msm/msm_gem.c | 160 +++-- drivers/gpu/drm/msm/msm_gem.h | 3 - drivers/gpu/drm/msm/msm_gem_prime.c| 56 + drivers/gpu/drm/msm/msm_gpu.c | 4 +- 22 files changed, 614 insertions(+), 237 deletions(-) create mode 100644 drivers/gpu/drm/msm/msm_gem_prime.c -- 1.8.3.1 -- To unsubscribe from this list: send the line unsubscribe linux-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCHv6 2/4] ARM: msm: Add support for APQ8074 Dragonboard
On Thu, Oct 17, 2013 at 11:25:10AM -0700, Rohit Vaswani wrote: This patch adds basic board support for APQ8074 Dragonboard which belongs to the Snapdragon 800 family. For now, just support a basic machine with device tree. Signed-off-by: Rohit Vaswani rvasw...@codeaurora.org --- Do you mind putting some history in the commentary part of your patches, especially, like this one, when you make it to v6. Just a brief description of what you've changed makes it a lot easier for reviewers to determine if their concern has been addressed, and what else might have changed. This missed yesterday's pull request, so I'll probably make another one to include this. 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/4] ARM: debug: msm: Add DEBUG_LL support for ARCH_MSM8974
On Thu, Oct 03, 2013 at 04:05:56PM -0700, Rohit Vaswani wrote: Add debug uart support for MSM8974. This patch adds a Kconfig entry and the base address for the debug uart. Signed-off-by: Rohit Vaswani rvasw...@codeaurora.org --- arch/arm/Kconfig.debug | 9 + arch/arm/include/debug/msm.S | 5 + 2 files changed, 14 insertions(+) Acked-by: David Brown dav...@codeaurora.org -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL] msm cleanups for v3.13
The following changes since commit 4a10c2ac2f368583138b774ca41fac4207911983:
Linux 3.12-rc2 (2013-09-23 15:41:09 -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.13
for you to fetch changes up to 81cf1e061d001fab44dbaa85fc4fbfb6da6713a1:
ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix (2013-09-25
13:02:56 -0700)
General cleanups for MSM for 3.13
Some small cleanups for MSM. Removes extraneous irq definitions that
aren't used on DT targets, moves the single existing board file to
board-dt.c in antipication of additional targets, and renames the
existing DT files to have a common 'qcom' prefix.
Kumar Gala (1):
ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix
Rohit Vaswani (1):
ARM: msm: Create a common board-dt and config ARCH_MSM_DT
Stephen Boyd (1):
ARM: msm: Remove irqs-*.h files for DT based targets
arch/arm/boot/dts/Makefile | 4 +-
.../{msm8660-surf.dts = qcom-msm8660-surf.dts}| 0
.../dts/{msm8960-cdp.dts = qcom-msm8960-cdp.dts} | 0
arch/arm/mach-msm/Kconfig | 13 +-
arch/arm/mach-msm/Makefile | 3 +-
arch/arm/mach-msm/board-dt-8660.c | 48
arch/arm/mach-msm/{board-dt-8960.c = board-dt.c} | 17 +-
arch/arm/mach-msm/include/mach/irqs-8960.h | 277 -
arch/arm/mach-msm/include/mach/irqs-8x60.h | 258 ---
arch/arm/mach-msm/include/mach/irqs.h | 5 -
10 files changed, 20 insertions(+), 605 deletions(-)
rename arch/arm/boot/dts/{msm8660-surf.dts = qcom-msm8660-surf.dts} (100%)
rename arch/arm/boot/dts/{msm8960-cdp.dts = qcom-msm8960-cdp.dts} (100%)
delete mode 100644 arch/arm/mach-msm/board-dt-8660.c
rename arch/arm/mach-msm/{board-dt-8960.c = board-dt.c} (64%)
delete mode 100644 arch/arm/mach-msm/include/mach/irqs-8960.h
delete mode 100644 arch/arm/mach-msm/include/mach/irqs-8x60.h
--
To unsubscribe from this list: send the line unsubscribe linux-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/4] ARM: debug: Create CONFIG_DEBUG_MSM_UART and re-organize the selects for MSM
On Thu, Oct 03, 2013 at 04:05:54PM -0700, Rohit Vaswani wrote: Create the hidden config DEBUG_MSM_UART and clean-up the default selection for CONFIG_DEBUG_LL_INCLUDE. Signed-off-by: Rohit Vaswani rvasw...@codeaurora.org Acked-by: David Brown dav...@codeaurora.org -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] ehci-msm: Remove global struct usb_phy variable
On Fri, Oct 11, 2013 at 02:46:09PM +0300, Ivan T. Ivanov wrote: From: Ivan T. Ivanov iiva...@mm-sol.com Use struct usb_hcd::phy to hold USB PHY instance. Signed-off-by: Ivan T. Ivanov iiva...@mm-sol.com --- drivers/usb/host/ehci-msm.c |5 +++-- Acked-by: David Brown dav...@codeaurora.org -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] USB: ehci-msm: Add device tree support and binding information
On Fri, Oct 11, 2013 at 02:46:10PM +0300, Ivan T. Ivanov wrote: From: Ivan T. Ivanov iiva...@mm-sol.com Allows MSM EHCI controller to be specified via device tree. Signed-off-by: Ivan T. Ivanov iiva...@mm-sol.com --- .../devicetree/bindings/usb/msm-hsusb.txt | 17 + drivers/usb/host/ehci-msm.c| 15 +-- Acked-by: David Brown dav...@codeaurora.org -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] clocksource: put nodes passed to CLOCKSOURCE_OF_DECLARE callbacks centrally
On Tue, Oct 01, 2013 at 11:00:53AM +0200, Uwe Kleine-König wrote: Instead of letting each driver call of_node_put do it centrally in the loop that also calls the CLOCKSOURCE_OF_DECLARE callbacks. This is less prone to error and also moves getting and putting the references into the same function. Consequently all respective of_node_put calls in drivers are removed. Signed-off-by: Uwe Kleine-König u.kleine-koe...@pengutronix.de --- arch/arm/mach-msm/timer.c | 1 - Acked-by: David Brown dav...@codeaurora.org -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 08/27] mmc: msm_sdcc: Move away from using deprecated APIs
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 dav...@codeaurora.org Cc: Daniel Walker dwal...@fifo99.com Cc: Bryan Huntsman bry...@codeaurora.org Cc: linux-arm-msm@vger.kernel.org Signed-off-by: Ulf Hansson ulf.hans...@linaro.org --- drivers/mmc/host/msm_sdcc.c | 27 ++- 1 file changed, 2 insertions(+), 25 deletions(-) Acked-by: David Brown dav...@codeaurora.org -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: msm: Move msm devicetrees under a Qualcomm dir
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-apqSOC-BOARD.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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] ARM: msm: Add support for MSM8974 Dragonboard
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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [BUG] mach-msm/msm_vibrator.c - very long vibration if CPU suspends
On Wed, Sep 04, 2013 at 05:24:50PM -0400, abhilash jindal wrote: msm_vibrator.c uses hrtimer to switch off the phone vibration as follows- hrtimer_start(vibe_timer, ktime_set(value / 1000, (value % 1000) * 100), HRTIMER_MODE_REL); However, hrtimer does not get fired after the CPU suspends. Hence, if the CPU suspends before the timer gets fired, the phone continues vibrating until the next time when CPU wakes up causing unnecessary battery drain (which can be as long as 15 minutes). IMHO, one way to fix it would be to replace hrtimer by android alarm timer. It looks like this file exists only in the codeaurora.org MSM tree, and not in the mainline kernel. The first thing I'd mention is that if you are an MSM customer, you'll be much better off reporting this through the customer support chain. Otherwise, I can forward this information internally. I'm not sure if they'll be any response, since it doesn't appear to be used in any recent targets. 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] [TRIVIAL] ARM: msm: fix compilation error in gpiomux
On Thu, Aug 08, 2013 at 03:17:25PM -0700, Rohit Vaswani wrote: On 8/7/2013 11:32 PM, Krzysztof Kozlowski wrote: On śro, 2013-08-07 at 14:08 -0700, Stephen Boyd wrote: On 08/07, David Brown wrote: 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 k.kozlow...@samsung.com Thanks, I'll pull this in. https://patchwork.kernel.org/patch/2839921/ I believe this is fixed by Rohit's patch that has already been taken in a pull request? https://lkml.org/lkml/2013/7/26/608 Yes, Rohit's patch fixes the problem so this is already in linux-msm tree. David, please can you confirm which pull request has this patch ? It is in Linus' current tree. Olof pulled it into the ARM tree on Sunday, and Linus pulled those fixes yesterday morning. 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] [TRIVIAL] ARM: msm: fix compilation error in gpiomux
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 k.kozlow...@samsung.com Thanks, I'll pull this in. https://patchwork.kernel.org/patch/2839921/ 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PULL] msm cleanups for v3.12
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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PULL] msm cleanups for v3.12
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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL v2] msm cleanups for v3.12
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
tags/msm-cleanup3-for-3.12
for you to fetch changes up to 3294a7e7c3a55bb4eb9d98b0af5643a7ea44afe1:
ARM: msm: Only compile io.c on platforms that use it (2013-08-06 11:18:04
-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.
Otherwise, same as last pull with head commit dropped.
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/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 -
29 files changed, 93 insertions(+), 1219 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-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [RESEND PATCH 1/2] ARM: msm: Add support for MSM8974
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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] mmc: sdhci-msm: Add support for MSM chipsets
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 asuto...@codeaurora.org CC: Venkat Gopalakrishnan venk...@codeaurora.org CC: Sahitya Tummala stumm...@codeaurora.org CC: Subhash Jadavani subha...@codeaurora.org Signed-off-by: Georgi Djakov gdja...@mm-sol.com --- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 3/9] ARM: msm: Move debug-macro.S to include/debug
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 sb...@codeaurora.org
---
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-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 6/9] ARM: msm: Move mach/board.h contents to common.h
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 florianschandi...@gmx.de Signed-off-by: Stephen Boyd sb...@codeaurora.org --- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2] tty: serial: Add initial MSM UART High Speed Lite driver
On Mon, Jul 22, 2013 at 10:05:48AM +0300, Ivan T. Ivanov wrote: From: Ivan T. Ivanov iiva...@mm-sol.com 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL] msm gpio fixes for 3.11
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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/7] usb: phy: msm: Move mach dependent code to platform data
On Mon, Jun 24, 2013 at 06:27:38PM +0300, Ivan T. Ivanov wrote: From: Ivan T. Ivanov iiva...@mm-sol.com 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 dav...@codeaurora.org Cc: Daniel Walker dwal...@fifo99.com Cc: Bryan Huntsman bry...@codeaurora.org Cc: Russell King li...@arm.linux.org.uk Cc: Felipe Balbi ba...@ti.com Cc: Greg Kroah-Hartman gre...@linuxfoundation.org Cc: Stephen Boyd sb...@codeaurora.org Cc: linux-arm-ker...@lists.infradead.org Cc: linux-ker...@vger.kernel.org Signed-off-by: Ivan T. Ivanov iiva...@mm-sol.com --- arch/arm/mach-msm/board-msm7x30.c | 35 +++ arch/arm/mach-msm/board-qsd8x50.c | 34 +++ drivers/usb/phy/phy-msm-usb.c | 55 ++--- include/linux/usb/msm_hsusb.h |2 ++ 4 files changed, 85 insertions(+), 41 deletions(-) Acked-by: David Brown dav...@codeaurora.org -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/4] msm_serial: Fix NUL byte output on UARTDM
On Wed, Jul 24, 2013 at 11:37:28AM -0700, Stephen Boyd wrote: UARTDM serial devices require us to wait for the entire TX fifo to drain before we can change the contents of the NCF_TX register. Furthermore, if we write any characters to the TX fifo within the same clock cycle of changing the NCF_TX register the NCF_TX register won't latch properly. To fix these issues we should read back the NCF_TX register to delay any TX fifo accesses by a clock cycle and we should wait for the TX fifo to drain (instead of just waiting for the fifo to be ready to receive more characters). Failure to do so leads to random NUL bytes interspersed in the output. Signed-off-by: Stephen Boyd sb...@codeaurora.org --- drivers/tty/serial/msm_serial.c | 14 +- drivers/tty/serial/msm_serial.h | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) Acked-by: David Brown dav...@codeaurora.org -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 4/4] msm_serial: Send more than 1 character at a time on UARTDM
On Wed, Jul 24, 2013 at 11:37:31AM -0700, Stephen Boyd wrote: UARTDM cores have a TX fifo that can accept more than one character per register write, but the msm_serial driver currently only supports 1 character mode. Add support for this mode of operation to speed up the transmit path on DM devices. Signed-off-by: Stephen Boyd sb...@codeaurora.org --- drivers/tty/serial/msm_serial.c | 51 ++--- 1 file changed, 32 insertions(+), 19 deletions(-) Acked-by: David Brown dav...@codeaurora.org -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 0/3] MSM gpio fixes
On Sat, Jul 20, 2013 at 10:54:42PM +0200, Linus Walleij wrote: On Thu, Jul 18, 2013 at 10:07 PM, David Brown dav...@codeaurora.org wrote: Rohit sent these three fixes out on June 18. I still need a devicetree ack for the first patch, and would like these to get pulled in for v3.11 Rohit Vaswani (3): ARM: msm: dts: Fix the gpio register address for msm8960 drivers: gpio: msm: Fix the error condition for reading ngpio OK for these two... ARM: msm: Consolidate gpiomux for older architectures This does not look like a fix? Surely this can wait for v3.12? It fixes compilation. But, it could also wait for v3.12. 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/3] ARM: msm: dts: Fix the gpio register address for msm8960
From: Rohit Vaswani rvasw...@codeaurora.org
Fix the the gpio reg address for the device tree entry.
Signed-off-by: Rohit Vaswani rvasw...@codeaurora.org
Signed-off-by: David Brown dav...@codeaurora.org
---
arch/arm/boot/dts/msm8960-cdp.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/msm8960-cdp.dts
b/arch/arm/boot/dts/msm8960-cdp.dts
index db2060c..9c1167b0 100644
--- a/arch/arm/boot/dts/msm8960-cdp.dts
+++ b/arch/arm/boot/dts/msm8960-cdp.dts
@@ -26,7 +26,7 @@
cpu-offset = 0x8;
};
- msmgpio: gpio@fd51 {
+ msmgpio: gpio@80 {
compatible = qcom,msm-gpio;
gpio-controller;
#gpio-cells = 2;
@@ -34,7 +34,7 @@
interrupts = 0 32 0x4;
interrupt-controller;
#interrupt-cells = 2;
- reg = 0xfd51 0x4000;
+ reg = 0x80 0x4000;
};
serial@1644 {
--
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-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 0/3] MSM gpio fixes
Rohit sent these three fixes out on June 18. I still need a devicetree ack for the first patch, and would like these to get pulled in for v3.11 Rohit Vaswani (3): ARM: msm: dts: Fix the gpio register address for msm8960 drivers: gpio: msm: Fix the error condition for reading ngpio 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 -- drivers/gpio/gpio-msm-v2.c| 2 +- 5 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 arch/arm/mach-msm/gpiomux-v1.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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/3] drivers: gpio: msm: Fix the error condition for reading ngpio
From: Rohit Vaswani rvasw...@codeaurora.org
of_property_read_u32 return 0 on success. The check was using a ! to
return error. Fix the if condition.
Signed-off-by: Rohit Vaswani rvasw...@codeaurora.org
Acked-by: Linus Walleij linus.wall...@linaro.org
Reviewed-by: Pankaj Jangra jangra.pank...@gmail.com
Cc: Bird, Tim tim.b...@sonymobile.com
Signed-off-by: David Brown dav...@codeaurora.org
---
drivers/gpio/gpio-msm-v2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpio/gpio-msm-v2.c b/drivers/gpio/gpio-msm-v2.c
index f4491a4..c2fa770 100644
--- a/drivers/gpio/gpio-msm-v2.c
+++ b/drivers/gpio/gpio-msm-v2.c
@@ -378,7 +378,7 @@ static int msm_gpio_probe(struct platform_device *pdev)
int ret, ngpio;
struct resource *res;
- if (!of_property_read_u32(pdev-dev.of_node, ngpio, ngpio)) {
+ if (of_property_read_u32(pdev-dev.of_node, ngpio, ngpio)) {
dev_err(pdev-dev, %s: ngpio property missing\n, __func__);
return -EINVAL;
}
--
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-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/3] ARM: msm: Consolidate gpiomux for older architectures
From: Rohit Vaswani rvasw...@codeaurora.org
Msm gpiomux can be used only for 7x30 and 8x50.
Prevent compilation and fix build issues on 7X00, 8X60 and 8960.
Signed-off-by: Rohit Vaswani rvasw...@codeaurora.org
Signed-off-by: David Brown dav...@codeaurora.org
---
arch/arm/mach-msm/Kconfig | 3 +--
arch/arm/mach-msm/gpiomux-v1.c | 33 -
arch/arm/mach-msm/gpiomux.h| 10 --
3 files changed, 1 insertion(+), 45 deletions(-)
delete mode 100644 arch/arm/mach-msm/gpiomux-v1.c
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 614e41e..905efc8 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -121,8 +121,7 @@ config MSM_SMD
bool
config MSM_GPIOMUX
- depends on !(ARCH_MSM8X60 || ARCH_MSM8960)
- bool MSM V1 TLMM GPIOMUX architecture
+ bool
help
Support for MSM V1 TLMM GPIOMUX architecture.
diff --git a/arch/arm/mach-msm/gpiomux-v1.c b/arch/arm/mach-msm/gpiomux-v1.c
deleted file mode 100644
index 27de2ab..000
--- a/arch/arm/mach-msm/gpiomux-v1.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (c) 2010, 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 linux/kernel.h
-#include gpiomux.h
-#include proc_comm.h
-
-void __msm_gpiomux_write(unsigned gpio, gpiomux_config_t val)
-{
- unsigned tlmm_config = (val ~GPIOMUX_CTL_MASK) |
- ((gpio 0x3ff) 4);
- unsigned tlmm_disable = 0;
- int rc;
-
- rc = msm_proc_comm(PCOM_RPC_GPIO_TLMM_CONFIG_EX,
- tlmm_config, tlmm_disable);
- if (rc)
- pr_err(%s: unexpected proc_comm failure %d: %08x %08x\n,
- __func__, rc, tlmm_config, tlmm_disable);
-}
diff --git a/arch/arm/mach-msm/gpiomux.h b/arch/arm/mach-msm/gpiomux.h
index 8e82f41..4410d77 100644
--- a/arch/arm/mach-msm/gpiomux.h
+++ b/arch/arm/mach-msm/gpiomux.h
@@ -73,16 +73,6 @@ extern struct msm_gpiomux_config
msm_gpiomux_configs[GPIOMUX_NGPIOS];
int msm_gpiomux_write(unsigned gpio,
gpiomux_config_t active,
gpiomux_config_t suspended);
-
-/* Architecture-internal function for use by the framework only.
- * This function can assume the following:
- * - the gpio value has passed a bounds-check
- * - the gpiomux spinlock has been obtained
- *
- * This function is not for public consumption. External users
- * should use msm_gpiomux_write.
- */
-void __msm_gpiomux_write(unsigned gpio, gpiomux_config_t val);
#else
static inline int msm_gpiomux_write(unsigned gpio,
gpiomux_config_t active,
--
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-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH/RESEND 00/12] Convert MSM to common clock framework
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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL v2] msm clock for 3.11
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-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH/RESEND 01/12] msm_serial: Convert to clk_prepare/unprepare
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 gre...@linuxfoundation.org Signed-off-by: Stephen Boyd sb...@codeaurora.org Acked-by: Greg Kroah-Hartman gre...@linuxfoundation.org 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: dts: msm: Fix merge resolution
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 dav...@codeaurora.org
Cc: Stephen Boyd sb...@codeaurora.org
---
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-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL 1/3] msm cleanups for 3.11
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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL 2/3] msm fixes for 3.11
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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL 0/3] msm changes for 3.11
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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL 2/3] msm fixes for 3.11
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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL 3/3] msm clock for 3.11
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-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Changes pulled into MSM tree
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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 14/20] ARM: msm: Remove init_irq declaration in machine description
On Tue, May 14, 2013 at 05:38:47PM +0200, Maxime Ripard wrote: Commit ebafed7a (ARM: irq: Call irqchip_init if no init_irq function is specified) removed the need to explictly setup the init_irq field in the machine description when using only irqchip_init. Remove that declaration for msm as well. Signed-off-by: Maxime Ripard maxime.rip...@free-electrons.com --- arch/arm/mach-msm/board-dt-8660.c | 2 -- arch/arm/mach-msm/board-dt-8960.c | 2 -- 2 files changed, 4 deletions(-) I've replaced the patch in my msm-cleanup tree with this one. I'll push this out once the support goes into the arm soc tree. 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 08/14] ARM: msm: Remove init_irq declaration in machine description
On Mon, May 13, 2013 at 11:44:07AM +0200, Maxime Ripard wrote: Commit ebafed7a (ARM: irq: Call irqchip_init if no init_irq function is specified) removed the need to explictly setup the init_irq field in the machine description when using only irqchip_init. Remove that declaration for msm as well. Signed-off-by: Maxime Ripard maxime.rip...@free-electrons.com --- arch/arm/mach-msm/board-dt-8660.c | 1 - arch/arm/mach-msm/board-dt-8960.c | 1 - 2 files changed, 2 deletions(-) I'll pull this into my msm-cleanup tree. 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL] msm cleanup for 3.10
The following changes since commit 6dbe51c251a327e012439c4772097a13df43c5b8: Linux 3.9-rc1 (2013-03-03 15:11:05 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-cleanup-3.10 for you to fetch changes up to 641f71699ec96fb742cc891b9ea4f3a46c60050e: ARM: msm: Remove unused cpu.h header file (2013-03-05 12:05:43 -0800) Cleanups for MSM for 3.10 These are some patches for various parts of MSM that gradually bring us closer to being part of single zimage. Stephen Boyd (4): ARM: msm: Move dma.h #defines that are private to dma.c mmc: msm_sdcc: Remove unnecessary include gpio: Make gpio-msm-v1 into a platform driver ARM: msm: Remove unused cpu.h header file arch/arm/mach-msm/board-halibut.c| 1 + arch/arm/mach-msm/board-msm7x30.c| 1 + arch/arm/mach-msm/board-qsd8x50.c| 1 + arch/arm/mach-msm/board-trout.c | 1 + arch/arm/mach-msm/devices-msm7x00.c | 31 + arch/arm/mach-msm/devices-msm7x30.c | 31 + arch/arm/mach-msm/devices-qsd8x50.c | 31 + arch/arm/mach-msm/devices.h | 4 + arch/arm/mach-msm/dma.c | 26 + arch/arm/mach-msm/include/mach/cpu.h | 54 - arch/arm/mach-msm/include/mach/dma.h | 26 - drivers/gpio/gpio-msm-v1.c | 220 --- drivers/mmc/host/msm_sdcc.c | 1 - 13 files changed, 276 insertions(+), 152 deletions(-) delete mode 100644 arch/arm/mach-msm/include/mach/cpu.h -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL] msm core for 3.10
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-core-3.10 for you to fetch changes up to e25e3d1fef2c57e49aef64535341c15fe2b29b4a: ARM: msm: Wait for timer clear to complete (2013-03-22 10:46:16 -0700) Patches for MSM core These patches are changes to the MSM timer code that will be for upcoming targets, including a generalization of the binding and preventing a missing timer interrupt. Stephen Boyd (2): 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 | 110 ++--- 4 files changed, 86 insertions(+), 107 deletions(-) -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL] msm defconfig for 3.10
The following changes since commit 6dbe51c251a327e012439c4772097a13df43c5b8: Linux 3.9-rc1 (2013-03-03 15:11:05 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-defconfig-3.10 for you to fetch changes up to dd465b2400a77bea6e5a95045feb6dbcf2e48a38: ARM: msm: enable SSBI driver in defconfig (2013-03-12 11:14:32 -0700) Defconfig updates for MSM The msm_defconfig is quite out of date. This allows the targets we are actively working on to be more easily build and run tested. David Brown (1): ARM: msm: enable SSBI driver in defconfig Stephen Boyd (1): ARM: msm: Concentrate defconfig on DT supported devices arch/arm/configs/msm_defconfig | 154 + 1 file changed, 109 insertions(+), 45 deletions(-) -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL] msm fixes for 3.10
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.10 for you to fetch changes up to 73a8c28f167c9e7bc42eafc0bcbd298031709430: ARM: msm: Fix uncompess.h tx underrun check (2013-04-11 09:40:35 -0700) Some minor fixes for MSM for 3.10 - Fix a timer problem that causes missed ticks and hangs. - Fix a problem with the decompressor UART dropping characters. Stephen Boyd (2): ARM: msm: Stop counting before reprogramming clockevent ARM: msm: Fix uncompess.h tx underrun check arch/arm/mach-msm/include/mach/uncompress.h | 2 +- arch/arm/mach-msm/timer.c | 5 - 2 files changed, 5 insertions(+), 2 deletions(-) -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] mfd: pm8921: Disable driver until it gets fixed
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 g...@kroah.com Cc: Stephen Rothwell s...@canb.auug.org.au Signed-off-by: David Brown dav...@codeaurora.org --- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL] msm fix for 3.9 -- timer
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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 0/3] Fix msm timer clearing bugs
Stephen Boyd sb...@codeaurora.org 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/6] platform-drivers: msm: add single-wire serial bus interface (SSBI) driver
Greg Kroah-Hartman gre...@linuxfoundation.org writes:
+static int ssbi_wait_mask(struct msm_ssbi *ssbi, u32 set_mask, u32 clr_mask)
+{
+u32 timeout = SSBI_TIMEOUT_US;
+u32 val;
+
+while (timeout--) {
+val = ssbi_readl(ssbi, SSBI2_STATUS);
+if (((val set_mask) == set_mask) ((val clr_mask) == 0))
+return 0;
+udelay(1);
Busy loop? Really?
Finally was able to dig up some of the reason for this. The
transactions typically take about 5us. In the case of contention with
another CPU, it could take as much as 20us.
Would it be sufficient to just explain this in a comment?
David
--
To unsubscribe from this list: send the line unsubscribe linux-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 0/11] Qualcomm SSBI bus driver
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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 01/11] platform-drivers: msm: add single-wire serial bus interface (SSBI) driver
From: Kenneth Heitke khei...@codeaurora.org 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 d...@android.com 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 khei...@codeaurora.org Signed-off-by: David Brown dav...@codeaurora.org --- 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 d...@android.com + * - 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 linux/delay.h +#include linux/err.h +#include linux/io.h +#include linux/kernel.h +#include linux/platform_device.h +#include linux/slab.h +#include linux/msm_ssbi.h +#include linux/module.h + +/* 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
[PATCH v2 04/11] ssbi: Allow compilation as a module
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 dav...@codeaurora.org
---
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-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 10/11] MAINTAINERS: add ssbi
The ssbi device is specific to the Qualcomm MSM SoCs. Signed-off-by: David Brown dav...@codeaurora.org --- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 02/11] fix: Use EXPORT_SYMBOL_GPL
Signed-off-by: David Brown dav...@codeaurora.org
---
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-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 11/11] RFC: SSBI: Simple pm8058 test driver
A very small ssbi device driver that reads the pm8058 version register
and prints it out.
Signed-off-by: David Brown dav...@codeaurora.org
---
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 linux/module.h
+#include linux/of.h
+#include linux/of_device.h
+#include linux/ssbi.h
+
+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-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/6] platform-drivers: msm: add single-wire serial bus interface (SSBI) driver
Sekhar Nori nsek...@ti.com writes: On 3/7/2013 11:31 AM, Greg Kroah-Hartman wrote: On Wed, Mar 06, 2013 at 09:20:45PM -0800, David Brown wrote: Greg Kroah-Hartman gre...@linuxfoundation.org writes: On Wed, Mar 06, 2013 at 04:29:42PM -0800, David Brown wrote: +menu Qualcomm MSM SSBI bus support + depends on ARCH_MSM Why? In the sense that ARCH_MSM are the only devices that ever were, or ever will be made with this device. It doesn't strictly depend on it, but do we want to clutter the config for everything else. It's not clutter. You want me to build this on other platforms, to catch api and other types of build breakages. This is the way for almost all Linux drivers. Not having a depends on helps build coverage, but I have seen objections to showing up irrelevant configurations to users (of x86 for example). See one here from Linus for OMAP_OCP2SCP http://lkml.indiana.edu/hypermail/linux/kernel/1210.0/00785.html If this case is different, I am not sure why. This was, in fact, the reason I put the dependency there. I found it a little annoying being asked about a bunch of OMAP devices when building the x86 kernel. At least they weren't cancer curing options (default y). 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 6/6] RFC: SSBI: Simple pm8058 test driver
A very small ssbi device driver that reads the pm8058 version register
;and prints it out.
This isn't really a useful driver, hence the RFC, but it is useful for
someone wanting to test the SSBI driver itself. Once the PMIC drivers
are finished, this isn't useful at all.
Signed-off-by: David Brown dav...@codeaurora.org
---
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 ea8c1e4..3561280 100644
--- a/drivers/ssbi/Makefile
+++ b/drivers/ssbi/Makefile
@@ -2,3 +2,4 @@
# Makefile for the MSM specific device drivers.
#
obj-$(CONFIG_MSM_SSBI) += ssbi.o
+obj-$(CONFIG_MSM_SSBI) += ssbi-test.o
diff --git a/drivers/ssbi/ssbi-test.c b/drivers/ssbi/ssbi-test.c
new file mode 100644
index 000..dea4dd0
--- /dev/null
+++ b/drivers/ssbi/ssbi-test.c
@@ -0,0 +1,61 @@
+/* A simple ssbi test device. */
+
+#include linux/module.h
+#include linux/of.h
+#include linux/of_device.h
+#include linux/msm_ssbi.h
+
+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 = msm_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-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 4/6] ssbi: Use regular init level
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 dav...@codeaurora.org
---
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 4d503da..4c02421 100644
--- a/drivers/ssbi/ssbi.c
+++ b/drivers/ssbi/ssbi.c
@@ -366,7 +366,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-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 0/6] Qualcomm SSBI bus driver
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 6th 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. David -- To unsubscribe from this list: send the line unsubscribe linux-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/6] platform-drivers: msm: add single-wire serial bus interface (SSBI) driver
From: Kenneth Heitke khei...@codeaurora.org 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 d...@android.com 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 khei...@codeaurora.org Signed-off-by: David Brown dav...@codeaurora.org --- drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/ssbi/Kconfig | 17 ++ drivers/ssbi/Makefile| 4 + drivers/ssbi/ssbi.c | 397 +++ include/linux/msm_ssbi.h | 49 ++ 6 files changed, 470 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..b667e62 --- /dev/null +++ b/drivers/ssbi/Kconfig @@ -0,0 +1,17 @@ +# +# MSM SSBI bus support +# + +menu Qualcomm MSM SSBI bus support + depends on ARCH_MSM + +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..ea8c1e4 --- /dev/null +++ b/drivers/ssbi/Makefile @@ -0,0 +1,4 @@ +# +# Makefile for the MSM specific device drivers. +# +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 d...@android.com + * - 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 linux/delay.h +#include linux/err.h +#include linux/io.h +#include linux/kernel.h +#include linux/platform_device.h +#include linux/slab.h +#include linux/msm_ssbi.h +#include linux/module.h + +/* 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
Re: [PATCH] ARM: Scorpion is a v7 architecture, not v6
Arnd Bergmann a...@arndb.de writes: On Monday 04 March 2013, Stephen Boyd wrote: config ARCH_MULTI_V6 - bool ARMv6 based platforms (ARM11, Scorpion, ...) + bool ARMv6 based platforms (ARM11) select ARCH_MULTI_V6_V7 select CPU_V6 Sorry about that, my fault. Was there also an ARMv6 core from Qualcomm, or did you only use ARM11 at the time? I believe the v6 core in the Qualcomm chips was an ARM11. 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 5/8] ARM: MSM: Divorce msm_timer from local timer API
Stephen Boyd sb...@codeaurora.org writes: Separate the msm_timer from the local timer API. This will allow us to remove ARM local timer support in the near future and gets us closer to moving this driver to drivers/clocksource. Cc: David Brown dav...@codeaurora.org Cc: Daniel Walker dwal...@fifo99.com Cc: Bryan Huntsman bry...@codeaurora.org Signed-off-by: Stephen Boyd sb...@codeaurora.org --- arch/arm/mach-msm/timer.c | 125 +- Acked-by: David Brown dav...@codeaurora.org -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 03/19] ARM: msm: proc_comm_boot_wait should not be __init
Arnd Bergmann a...@arndb.de 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 a...@arndb.de Cc: David Brown dav...@codeaurora.org Cc: Bryan Huntsman bry...@codeaurora.org Cc: Daniel Walker c_dwa...@quicinc.com Cc: linux-arm-msm@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 dav...@codeaurora.org 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 01/24] MAINTAINERS: remove drivers/platform/msm/
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 khei...@codeaurora.org Cc: David Brown dav...@codeaurora.org Cc: Daniel Walker dwal...@fifo99.com Cc: Bryan Huntsman bry...@codeaurora.org Cc: linux-arm-msm@vger.kernel.org Signed-off-by: Cesar Eduardo Barros ces...@cesarb.net --- 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 dav...@codeaurora.org -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 235/493] mfd: remove use of __devinit
On Mon, Nov 19, 2012 at 01:23:04PM -0500, Bill Pemberton wrote: CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed. Signed-off-by: Bill Pemberton wf...@virginia.edu --- drivers/mfd/pm8921-core.c | 4 ++-- drivers/mfd/pm8xxx-irq.c | 2 +- include/linux/mfd/pm8xxx/irq.h| 4 ++-- Acked-by: David Brown dav...@codeaurora.org -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 270/493] arm: remove use of __devinit
On Mon, Nov 19, 2012 at 01:23:39PM -0500, Bill Pemberton wrote: CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed. Signed-off-by: Bill Pemberton wf...@virginia.edu --- arch/arm/mach-msm/proc_comm.c| 2 +- arch/arm/mach-msm/smd.c | 2 +- Acked-by: David Brown dav...@codeaurora.org -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 412/493] mfd: remove use of __devexit
On Mon, Nov 19, 2012 at 01:26:01PM -0500, Bill Pemberton wrote: CONFIG_HOTPLUG is going away as an option so __devexit is no longer needed. --- drivers/mfd/pm8921-core.c | 2 +- drivers/mfd/pm8xxx-irq.c | 2 +- include/linux/mfd/pm8xxx/irq.h| 4 ++-- Acked-by: David Brown dav...@codeaurora.org -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 429/493] tty: remove use of __devexit
On Mon, Nov 19, 2012 at 01:26:18PM -0500, Bill Pemberton wrote: CONFIG_HOTPLUG is going away as an option so __devexit is no longer needed. Signed-off-by: Bill Pemberton wf...@virginia.edu --- drivers/tty/serial/msm_serial.c | 2 +- drivers/tty/serial/msm_serial_hs.c | 2 +- Acked-by: David Brown dav...@codeaurora.org -- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] msm: clock: fix return value check in msm_clock_init()
On Fri, Sep 21, 2012 at 02:23:13PM +0800, Wei Yongjun wrote: From: Wei Yongjun yongjun_...@trendmicro.com.cn In case of error, the function clk_get() returns ERR_PTR() not NULL pointer. The NULL test in return value check should be replaced with IS_ERR(). dpatch engine is used to auto generated this patch. (https://github.com/weiyj/dpatch) Signed-off-by: Wei Yongjun yongjun_...@trendmicro.com.cn --- arch/arm/mach-msm/clock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-msm/clock.c b/arch/arm/mach-msm/clock.c index d9145df..fd52891 100644 --- a/arch/arm/mach-msm/clock.c +++ b/arch/arm/mach-msm/clock.c @@ -148,7 +148,7 @@ void __init msm_clock_init(struct clk_lookup *clock_tbl, unsigned num_clocks) mutex_unlock(clocks_mutex); ebi1_clk = clk_get(NULL, ebi1_clk); - BUG_ON(ebi1_clk == NULL); + BUG_ON(IS_ERR(ebi1_clk)); It looks like this code is being removed entirely by a patch that just was sent out by Stephen Boyd. Stephen, can you make sure that this gets included if this comes back, but for now I think this is already taken care of. 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 4/5] gpio: Make gpio-msm-v1 into a platform driver
On Thu, Sep 20, 2012 at 08:45:50AM +0200, Linus Walleij wrote: On Wed, Sep 19, 2012 at 9:00 AM, Stephen Boyd sb...@codeaurora.org wrote: Doing this removes the dependence of this driver on the msm_iomap.h and cpu.h mach include headers provied by MSM. This is necessary to support single zImage work in the future and allows us to remove cpu.h entirely and brings us closer to removing msm_iomap.h. Cc: Grant Likely grant.lik...@secretlab.ca Cc: Linus Walleij linus.wall...@linaro.org Cc: Rohit Vaswani rvasw...@codeaurora.org Signed-off-by: Stephen Boyd sb...@codeaurora.org This must be encouraged: Acked-by: Linus Walleij linus.wall...@linaro.org Stephen, do you have a mainline-based kernel tree that can boot on my DragonBoard? It's just sitting idle here... I pushed David in the past, just naggin'... We're working on it :-) The main thing coming that's needed are clocks. There are some more things (such as regulators) that will be needed to get things like SD/MMC working, and that'll be next. 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PULL] msm-core changes for v3.7
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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] ARM: SoC: convert MSM SMP to SoC descriptor
On Thu, Sep 13, 2012 at 08:47:19AM +, Arnd Bergmann wrote: On Wednesday 12 September 2012, David Brown wrote: From: Marc Zyngier marc.zyng...@arm.com Convert MSM SMP platforms to use the SoC descriptor to provide their SMP and CPU hotplug operations. Cc: David Brown dav...@codeaurora.org Signed-off-by: Marc Zyngier marc.zyng...@arm.com Signed-off-by: Arnd Bergmann a...@arndb.de --- 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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL 0/5] MSM changes for 3.7 merge window
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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL 1/5] msm cleanups
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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL 2/5] msm non-critical fixes
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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL 3/5] msm devicetree changes
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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL 4/5] msm board changes
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-arm-msm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL 5/5] msm all changes
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/devicetree/bindings/arm/msm/timer.txt create mode 100644 arch/arm
Re: [PATCH 3/9] ARM: msm: Add DT support to msm_timer
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-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 8/9] ARM: msm: Add DT support for 8960
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-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 8/9] ARM: msm: Add DT support for 8960
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-arm-msm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
