[PATCH v2 2/3] usb: chipidea: msm: Add device tree support
From: Ivan T. Ivanov iiva...@mm-sol.com
Allows controller to be specified via device tree.
Pass PHY phandle specified in DT to core driver.
Signed-off-by: Ivan T. Ivanov iiva...@mm-sol.com
---
drivers/usb/chipidea/ci_hdrc_msm.c | 23 ++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c
b/drivers/usb/chipidea/ci_hdrc_msm.c
index 2d51d85..3f67f1f 100644
--- a/drivers/usb/chipidea/ci_hdrc_msm.c
+++ b/drivers/usb/chipidea/ci_hdrc_msm.c
@@ -57,9 +57,21 @@ static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = {
static int ci_hdrc_msm_probe(struct platform_device *pdev)
{
struct platform_device *plat_ci;
+ struct usb_phy *phy;
dev_dbg(pdev-dev, ci_hdrc_msm_probe\n);
+ /*
+* OTG(PHY) driver takes care of PHY initialization, clock management,
+* powering up VBUS, mapping of registers address space and power
+* management.
+*/
+ phy = devm_usb_get_phy_by_phandle(pdev-dev, usb-phy, 0);
+ if (IS_ERR(phy))
+ return PTR_ERR(phy);
+
+ ci_hdrc_msm_platdata.phy = phy;
+
plat_ci = ci_hdrc_add_device(pdev-dev,
pdev-resource, pdev-num_resources,
ci_hdrc_msm_platdata);
@@ -86,10 +98,19 @@ static int ci_hdrc_msm_remove(struct platform_device *pdev)
return 0;
}
+static struct of_device_id msm_ci_dt_match[] = {
+ { .compatible = qcom,ci-hdrc, },
+ { }
+};
+MODULE_DEVICE_TABLE(of, msm_ci_dt_match);
+
static struct platform_driver ci_hdrc_msm_driver = {
.probe = ci_hdrc_msm_probe,
.remove = ci_hdrc_msm_remove,
- .driver = { .name = msm_hsusb, },
+ .driver = {
+ .name = msm_hsusb,
+ .of_match_table = msm_ci_dt_match,
+ },
};
module_platform_driver(ci_hdrc_msm_driver);
--
1.7.9.5
--
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 1/3] usb: chipidea: msm: Add device tree binding information
From: Ivan T. Ivanov iiva...@mm-sol.com
Document device tree binding information as required by
the Qualcomm USB controller.
Signed-off-by: Ivan T. Ivanov iiva...@mm-sol.com
---
.../devicetree/bindings/usb/msm-hsusb.txt | 17 +
1 file changed, 17 insertions(+)
diff --git a/Documentation/devicetree/bindings/usb/msm-hsusb.txt
b/Documentation/devicetree/bindings/usb/msm-hsusb.txt
index 5ea26c6..d4e7e41 100644
--- a/Documentation/devicetree/bindings/usb/msm-hsusb.txt
+++ b/Documentation/devicetree/bindings/usb/msm-hsusb.txt
@@ -15,3 +15,20 @@ Example EHCI controller device node:
usb-phy = usb_otg;
};
+CI13xxx (Chipidea) USB controllers
+
+Required properties:
+- compatible: should contain qcom,ci-hdrc
+- reg: offset and length of the register set in the memory map
+- interrupts: interrupt-specifier for the controller interrupt.
+- usb-phy: phandle for the PHY device
+- dr_mode: Sould be peripheral
+
+ gadget@f9a55000 {
+ compatible = qcom,ci-hdrc;
+ reg = 0xf9a55000 0x400;
+ dr_mode = peripheral;
+ interrupts = 0 134 0;
+ usb-phy = usb_otg;
+ };
+
--
1.7.9.5
--
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 3/3] usb: chipidea: msm: Initialize offset of the capability registers
From: Ivan T. Ivanov iiva...@mm-sol.com
Since commit 62bb84e (usb: gadget: ci13xxx: convert to platform device)
start address of the capability registers is not passed correctly to
udc_probe(). Fix this.
Signed-off-by: Ivan T. Ivanov iiva...@mm-sol.com
---
drivers/usb/chipidea/ci_hdrc_msm.c |1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c
b/drivers/usb/chipidea/ci_hdrc_msm.c
index 3f67f1f..7ed3fad 100644
--- a/drivers/usb/chipidea/ci_hdrc_msm.c
+++ b/drivers/usb/chipidea/ci_hdrc_msm.c
@@ -47,6 +47,7 @@ static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci,
unsigned event)
static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = {
.name = ci_hdrc_msm,
+ .capoffset = DEF_CAPOFFSET,
.flags = CI_HDRC_REGS_SHARED |
CI_HDRC_REQUIRE_TRANSCEIVER |
CI_HDRC_DISABLE_STREAMING,
--
1.7.9.5
--
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 2/3] usb: chipidea: msm: Add device tree support
Hey Ivan-
Nit below.
On Tue, Feb 18, 2014 at 03:21:20PM +0200, Ivan T. Ivanov wrote:
From: Ivan T. Ivanov iiva...@mm-sol.com
Allows controller to be specified via device tree.
Pass PHY phandle specified in DT to core driver.
Signed-off-by: Ivan T. Ivanov iiva...@mm-sol.com
---
drivers/usb/chipidea/ci_hdrc_msm.c | 23 ++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c
b/drivers/usb/chipidea/ci_hdrc_msm.c
index 2d51d85..3f67f1f 100644
--- a/drivers/usb/chipidea/ci_hdrc_msm.c
+++ b/drivers/usb/chipidea/ci_hdrc_msm.c
@@ -57,9 +57,21 @@ static struct ci_hdrc_platform_data ci_hdrc_msm_platdata =
{
static int ci_hdrc_msm_probe(struct platform_device *pdev)
{
struct platform_device *plat_ci;
+ struct usb_phy *phy;
dev_dbg(pdev-dev, ci_hdrc_msm_probe\n);
+ /*
+ * OTG(PHY) driver takes care of PHY initialization, clock management,
+ * powering up VBUS, mapping of registers address space and power
+ * management.
+ */
+ phy = devm_usb_get_phy_by_phandle(pdev-dev, usb-phy, 0);
+ if (IS_ERR(phy))
+ return PTR_ERR(phy);
+
+ ci_hdrc_msm_platdata.phy = phy;
+
plat_ci = ci_hdrc_add_device(pdev-dev,
pdev-resource, pdev-num_resources,
ci_hdrc_msm_platdata);
@@ -86,10 +98,19 @@ static int ci_hdrc_msm_remove(struct platform_device
*pdev)
return 0;
}
+static struct of_device_id msm_ci_dt_match[] = {
const?
+ { .compatible = qcom,ci-hdrc, },
+ { }
+};
+MODULE_DEVICE_TABLE(of, msm_ci_dt_match);
--
Qualcomm Innovation Center, Inc. is a member of 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 1/3] usb: chipidea: msm: Add device tree binding information
On Tue, Feb 18, 2014 at 03:21:19PM +0200, Ivan T. Ivanov wrote: From: Ivan T. Ivanov iiva...@mm-sol.com Document device tree binding information as required by the Qualcomm USB controller. Signed-off-by: Ivan T. Ivanov iiva...@mm-sol.com --- .../devicetree/bindings/usb/msm-hsusb.txt | 17 + Is this really the appropriate place to document this? It seems like this binding doc should be merged with the i.MX ci13xxx binding in a common ci13xxx doc. -- Qualcomm Innovation Center, Inc. is a member of 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] usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP
On Fri, Jan 17, 2014 at 12:26:50PM -0600, Josh Cartwright wrote:
On Fri, Jan 17, 2014 at 11:58:51AM -0600, Josh Cartwright wrote:
Both the PM_RUNTIME and PM_SLEEP callbacks call into the common
msm_otg_{suspend,resume} routines, however these routines are only being
built when CONFIG_PM_SLEEP. In addition, msm_otg_{suspend,resume} also
depends on msm_hsusb_config_vddcx(), which is only built when
CONFIG_PM_SLEEP.
Fix the CONFIG_PM_RUNTIME, !CONFIG_PM_SLEEP case by changing the
preprocessor conditional, and moving msm_hsusb_config_vddcx().
While we're here, eliminate the CONFIG_PM conditional for setting
up the dev_pm_ops.
This address the following errors Russell King has hit doing randconfig
builds:
drivers/usb/phy/phy-msm-usb.c: In function 'msm_otg_runtime_suspend':
drivers/usb/phy/phy-msm-usb.c:1691:2: error: implicit declaration of
function 'msm_otg_suspend'
drivers/usb/phy/phy-msm-usb.c: In function 'msm_otg_runtime_resume':
drivers/usb/phy/phy-msm-usb.c:1699:2: error: implicit declaration of
function 'msm_otg_resume'
Cc: Ivan T. Ivanov iiva...@mm-sol.com
Reported-by: Russell King rmk+ker...@arm.linux.org.uk
Signed-off-by: Josh Cartwright jo...@codeaurora.org
---
v1-v2: Change conditional to simply CONFIG_PM (thanks ccov and khilman!)
drivers/usb/phy/phy-msm-usb.c | 57
---
1 file changed, 26 insertions(+), 31 deletions(-)
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index 8546c8d..5b169a7 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
[..]
@@ -440,7 +414,32 @@ static int msm_otg_reset(struct usb_phy *phy)
#define PHY_SUSPEND_TIMEOUT_USEC (500 * 1000)
#define PHY_RESUME_TIMEOUT_USEC(100 * 1000)
-#ifdef CONFIG_PM_SLEEP
+#if CONFIG_PM
*sigh*. This, of course, should have been #ifdef CONFIG_PM. Fixed
v3 below.
sorry, please git send-email it properly.
--
balbi
signature.asc
Description: Digital signature
Re: [PATCH v2] usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP
On Tue, Feb 18, 2014 at 10:24:16AM -0600, Felipe Balbi wrote:
On Fri, Jan 17, 2014 at 12:26:50PM -0600, Josh Cartwright wrote:
On Fri, Jan 17, 2014 at 11:58:51AM -0600, Josh Cartwright wrote:
Both the PM_RUNTIME and PM_SLEEP callbacks call into the common
msm_otg_{suspend,resume} routines, however these routines are only being
built when CONFIG_PM_SLEEP. In addition, msm_otg_{suspend,resume} also
depends on msm_hsusb_config_vddcx(), which is only built when
CONFIG_PM_SLEEP.
Fix the CONFIG_PM_RUNTIME, !CONFIG_PM_SLEEP case by changing the
preprocessor conditional, and moving msm_hsusb_config_vddcx().
While we're here, eliminate the CONFIG_PM conditional for setting
up the dev_pm_ops.
This address the following errors Russell King has hit doing randconfig
builds:
drivers/usb/phy/phy-msm-usb.c: In function 'msm_otg_runtime_suspend':
drivers/usb/phy/phy-msm-usb.c:1691:2: error: implicit declaration of
function 'msm_otg_suspend'
drivers/usb/phy/phy-msm-usb.c: In function 'msm_otg_runtime_resume':
drivers/usb/phy/phy-msm-usb.c:1699:2: error: implicit declaration of
function 'msm_otg_resume'
Cc: Ivan T. Ivanov iiva...@mm-sol.com
Reported-by: Russell King rmk+ker...@arm.linux.org.uk
Signed-off-by: Josh Cartwright jo...@codeaurora.org
---
v1-v2: Change conditional to simply CONFIG_PM (thanks ccov and khilman!)
drivers/usb/phy/phy-msm-usb.c | 57
---
1 file changed, 26 insertions(+), 31 deletions(-)
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index 8546c8d..5b169a7 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
[..]
@@ -440,7 +414,32 @@ static int msm_otg_reset(struct usb_phy *phy)
#define PHY_SUSPEND_TIMEOUT_USEC (500 * 1000)
#define PHY_RESUME_TIMEOUT_USEC (100 * 1000)
-#ifdef CONFIG_PM_SLEEP
+#if CONFIG_PM
*sigh*. This, of course, should have been #ifdef CONFIG_PM. Fixed
v3 below.
sorry, please git send-email it properly.
No problem, will do. FWIW, it's applicable with git am --scissors.
--
Qualcomm Innovation Center, Inc. is a member of 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] qcom SoC changes for v3.15
On Feb 11, 2014, at 3:19 PM, Kumar Gala ga...@codeaurora.org wrote: The following changes since commit cf1e8f0cd665e2a9966d2bee4e11ecc0938ff166: ARM: qcom: Rename various msm prefixed functions to qcom (2014-02-06 16:20:41 -0600) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git tags/qcom-soc-for-3.15 for you to fetch changes up to 6990c132abc984bd6e75ac2be1f1d657cd600f63: ARM: qcom: Add SMP support for KPSSv2 (2014-02-11 15:00:40 -0600) Qualcomm ARM Based SoC Updates for v3.15 * Add support for determining smp ops based on device tree. * Add DT binding specs for Krait/Scorpion enable method * Add DT binding specs for various Krait Processor controller complexes * Add SoC SMP support for Krait Processor Subsystem v1 v2 Rohit Vaswani (4): ARM: qcom: Re-organize platsmp to make it extensible devicetree: bindings: Document Krait/Scorpion cpus and enable-method ARM: qcom: Add SMP support for KPSSv1 ARM: qcom: Add SMP support for KPSSv2 Stephen Boyd (3): ARM: Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp devicetree: bindings: Document qcom,kpss-acc devicetree: bindings: Document qcom,saw2 node Documentation/devicetree/bindings/arm/cpus.txt | 25 +- .../devicetree/bindings/arm/msm/qcom,kpss-acc.txt | 30 ++ .../devicetree/bindings/arm/msm/qcom,saw2.txt | 35 +++ arch/arm/include/asm/smp.h | 9 + arch/arm/kernel/devtree.c | 40 +++ arch/arm/mach-msm/common.h | 2 - arch/arm/mach-qcom/board.c | 14 - arch/arm/mach-qcom/platsmp.c | 341 ++--- arch/arm/mach-qcom/scm-boot.h | 8 +- include/asm-generic/vmlinux.lds.h | 10 + 10 files changed, 444 insertions(+), 70 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt — ping - k -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of 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 RESEND v3] usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP
Both the PM_RUNTIME and PM_SLEEP callbacks call into the common
msm_otg_{suspend,resume} routines, however these routines are only being
built when CONFIG_PM_SLEEP. In addition, msm_otg_{suspend,resume} also
depends on msm_hsusb_config_vddcx(), which is only built when
CONFIG_PM_SLEEP.
Fix the CONFIG_PM_RUNTIME, !CONFIG_PM_SLEEP case by changing the
preprocessor conditional, and moving msm_hsusb_config_vddcx().
While we're here, eliminate the CONFIG_PM conditional for setting
up the dev_pm_ops.
This address the following errors Russell King has hit doing randconfig
builds:
drivers/usb/phy/phy-msm-usb.c: In function 'msm_otg_runtime_suspend':
drivers/usb/phy/phy-msm-usb.c:1691:2: error: implicit declaration of function
'msm_otg_suspend'
drivers/usb/phy/phy-msm-usb.c: In function 'msm_otg_runtime_resume':
drivers/usb/phy/phy-msm-usb.c:1699:2: error: implicit declaration of function
'msm_otg_resume'
Cc: Ivan T. Ivanov iiva...@mm-sol.com
Reported-by: Russell King rmk+ker...@arm.linux.org.uk
Signed-off-by: Josh Cartwright jo...@codeaurora.org
---
drivers/usb/phy/phy-msm-usb.c | 57 ---
1 file changed, 26 insertions(+), 31 deletions(-)
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index 64c9d14e..5b37b81 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -159,32 +159,6 @@ put_3p3:
return rc;
}
-#ifdef CONFIG_PM_SLEEP
-#define USB_PHY_SUSP_DIG_VOL 50
-static int msm_hsusb_config_vddcx(int high)
-{
- int max_vol = USB_PHY_VDD_DIG_VOL_MAX;
- int min_vol;
- int ret;
-
- if (high)
- min_vol = USB_PHY_VDD_DIG_VOL_MIN;
- else
- min_vol = USB_PHY_SUSP_DIG_VOL;
-
- ret = regulator_set_voltage(hsusb_vddcx, min_vol, max_vol);
- if (ret) {
- pr_err(%s: unable to set the voltage for regulator
- HSUSB_VDDCX\n, __func__);
- return ret;
- }
-
- pr_debug(%s: min_vol:%d max_vol:%d\n, __func__, min_vol, max_vol);
-
- return ret;
-}
-#endif
-
static int msm_hsusb_ldo_set_mode(int on)
{
int ret = 0;
@@ -440,7 +414,32 @@ static int msm_otg_reset(struct usb_phy *phy)
#define PHY_SUSPEND_TIMEOUT_USEC (500 * 1000)
#define PHY_RESUME_TIMEOUT_USEC(100 * 1000)
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_PM
+
+#define USB_PHY_SUSP_DIG_VOL 50
+static int msm_hsusb_config_vddcx(int high)
+{
+ int max_vol = USB_PHY_VDD_DIG_VOL_MAX;
+ int min_vol;
+ int ret;
+
+ if (high)
+ min_vol = USB_PHY_VDD_DIG_VOL_MIN;
+ else
+ min_vol = USB_PHY_SUSP_DIG_VOL;
+
+ ret = regulator_set_voltage(hsusb_vddcx, min_vol, max_vol);
+ if (ret) {
+ pr_err(%s: unable to set the voltage for regulator
+ HSUSB_VDDCX\n, __func__);
+ return ret;
+ }
+
+ pr_debug(%s: min_vol:%d max_vol:%d\n, __func__, min_vol, max_vol);
+
+ return ret;
+}
+
static int msm_otg_suspend(struct msm_otg *motg)
{
struct usb_phy *phy = motg-phy;
@@ -1734,22 +1733,18 @@ static int msm_otg_pm_resume(struct device *dev)
}
#endif
-#ifdef CONFIG_PM
static const struct dev_pm_ops msm_otg_dev_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(msm_otg_pm_suspend, msm_otg_pm_resume)
SET_RUNTIME_PM_OPS(msm_otg_runtime_suspend, msm_otg_runtime_resume,
msm_otg_runtime_idle)
};
-#endif
static struct platform_driver msm_otg_driver = {
.remove = msm_otg_remove,
.driver = {
.name = DRIVER_NAME,
.owner = THIS_MODULE,
-#ifdef CONFIG_PM
.pm = msm_otg_dev_pm_ops,
-#endif
},
};
--
Qualcomm Innovation Center, Inc. is a member of 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] usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP
On Tue, Feb 18, 2014 at 10:33:21AM -0600, Josh Cartwright wrote:
On Tue, Feb 18, 2014 at 10:24:16AM -0600, Felipe Balbi wrote:
On Fri, Jan 17, 2014 at 12:26:50PM -0600, Josh Cartwright wrote:
On Fri, Jan 17, 2014 at 11:58:51AM -0600, Josh Cartwright wrote:
Both the PM_RUNTIME and PM_SLEEP callbacks call into the common
msm_otg_{suspend,resume} routines, however these routines are only being
built when CONFIG_PM_SLEEP. In addition, msm_otg_{suspend,resume} also
depends on msm_hsusb_config_vddcx(), which is only built when
CONFIG_PM_SLEEP.
Fix the CONFIG_PM_RUNTIME, !CONFIG_PM_SLEEP case by changing the
preprocessor conditional, and moving msm_hsusb_config_vddcx().
While we're here, eliminate the CONFIG_PM conditional for setting
up the dev_pm_ops.
This address the following errors Russell King has hit doing randconfig
builds:
drivers/usb/phy/phy-msm-usb.c: In function 'msm_otg_runtime_suspend':
drivers/usb/phy/phy-msm-usb.c:1691:2: error: implicit declaration of
function 'msm_otg_suspend'
drivers/usb/phy/phy-msm-usb.c: In function 'msm_otg_runtime_resume':
drivers/usb/phy/phy-msm-usb.c:1699:2: error: implicit declaration of
function 'msm_otg_resume'
Cc: Ivan T. Ivanov iiva...@mm-sol.com
Reported-by: Russell King rmk+ker...@arm.linux.org.uk
Signed-off-by: Josh Cartwright jo...@codeaurora.org
---
v1-v2: Change conditional to simply CONFIG_PM (thanks ccov and
khilman!)
drivers/usb/phy/phy-msm-usb.c | 57
---
1 file changed, 26 insertions(+), 31 deletions(-)
diff --git a/drivers/usb/phy/phy-msm-usb.c
b/drivers/usb/phy/phy-msm-usb.c
index 8546c8d..5b169a7 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
[..]
@@ -440,7 +414,32 @@ static int msm_otg_reset(struct usb_phy *phy)
#define PHY_SUSPEND_TIMEOUT_USEC (500 * 1000)
#define PHY_RESUME_TIMEOUT_USEC(100 * 1000)
-#ifdef CONFIG_PM_SLEEP
+#if CONFIG_PM
*sigh*. This, of course, should have been #ifdef CONFIG_PM. Fixed
v3 below.
sorry, please git send-email it properly.
No problem, will do. FWIW, it's applicable with git am --scissors.
ahaa, I didn't know about that option. Thanks :-)
--
balbi
signature.asc
Description: Digital signature
Re: [GIT PULL] qcom cleanups for v3.15
On Feb 10, 2014, at 5:23 PM, Kumar Gala ga...@codeaurora.org wrote:
The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72:
Linus 3.14-rc1 (2014-02-02 16:42:13 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git
tags/qcom-cleanup-for-3.15
for you to fetch changes up to cf1e8f0cd665e2a9966d2bee4e11ecc0938ff166:
ARM: qcom: Rename various msm prefixed functions to qcom (2014-02-06
16:20:41 -0600)
General cleanups for MSM/QCOM for 3.15
Split of the multiplatform support for the Qualcomm SoCs into a mach-qcom
while we leave mach-msm as legacy support. Also, some smp and device tree
related cleanups.
Kumar Gala (6):
ARM: dts: msm: split out msm8660 and msm8960 soc into dts include
ARM: msm: kill off hotplug.c
clocksource: qcom: Move clocksource code out of mach-msm
ARM: qcom: Split Qualcomm support into legacy and multiplatform
clocksource: qcom: split building of legacy vs multiplatform support
ARM: qcom: Rename various msm prefixed functions to qcom
Rohit Vaswani (1):
ARM: msm: Remove pen_release usage
MAINTAINERS| 8 +++
arch/arm/Kconfig | 7 +-
arch/arm/Kconfig.debug | 2 +-
arch/arm/Makefile | 1 +
arch/arm/boot/dts/Makefile | 6 +-
arch/arm/boot/dts/qcom-msm8660-surf.dts| 59 +
arch/arm/boot/dts/qcom-msm8660.dtsi| 63 ++
arch/arm/boot/dts/qcom-msm8960-cdp.dts | 66 +--
arch/arm/boot/dts/qcom-msm8960.dtsi| 70
arch/arm/mach-msm/Kconfig | 54 ++--
arch/arm/mach-msm/Makefile | 8 ---
arch/arm/mach-msm/common.h | 1 -
arch/arm/mach-msm/headsmp.S| 39
arch/arm/mach-msm/hotplug.c| 74 --
arch/arm/mach-qcom/Kconfig | 33 ++
arch/arm/mach-qcom/Makefile| 5 ++
.../arm/{mach-msm/board-dt.c = mach-qcom/board.c} | 15 ++---
arch/arm/{mach-msm = mach-qcom}/platsmp.c | 66 ++-
arch/arm/{mach-msm = mach-qcom}/scm-boot.c| 0
arch/arm/{mach-msm = mach-qcom}/scm-boot.h| 0
arch/arm/{mach-msm = mach-qcom}/scm.c | 0
arch/arm/{mach-msm = mach-qcom}/scm.h | 0
drivers/clocksource/Kconfig| 3 +
drivers/clocksource/Makefile | 1 +
.../timer.c = drivers/clocksource/qcom-timer.c| 29 -
25 files changed, 240 insertions(+), 370 deletions(-)
create mode 100644 arch/arm/boot/dts/qcom-msm8660.dtsi
create mode 100644 arch/arm/boot/dts/qcom-msm8960.dtsi
delete mode 100644 arch/arm/mach-msm/headsmp.S
delete mode 100644 arch/arm/mach-msm/hotplug.c
create mode 100644 arch/arm/mach-qcom/Kconfig
create mode 100644 arch/arm/mach-qcom/Makefile
rename arch/arm/{mach-msm/board-dt.c = mach-qcom/board.c} (68%)
rename arch/arm/{mach-msm = mach-qcom}/platsmp.c (65%)
rename arch/arm/{mach-msm = mach-qcom}/scm-boot.c (100%)
rename arch/arm/{mach-msm = mach-qcom}/scm-boot.h (100%)
rename arch/arm/{mach-msm = mach-qcom}/scm.c (100%)
rename arch/arm/{mach-msm = mach-qcom}/scm.h (100%)
rename arch/arm/mach-msm/timer.c = drivers/clocksource/qcom-timer.c (98%)
ping
- k
--
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of 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 2/3] usb: chipidea: msm: Add device tree support
Hello. On 02/18/2014 04:21 PM, Ivan T. Ivanov wrote: From: Ivan T. Ivanov iiva...@mm-sol.com Allows controller to be specified via device tree. Pass PHY phandle specified in DT to core driver. Signed-off-by: Ivan T. Ivanov iiva...@mm-sol.com --- drivers/usb/chipidea/ci_hdrc_msm.c | 23 ++- 1 file changed, 22 insertions(+), 1 deletion(-) You also need to describe the binding you're creating in Documentation/devicetree/bindings/usb/file.txt. WBR, Sergei -- 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 2/3] usb: chipidea: msm: Add device tree support
Hi, On Tue, 2014-02-18 at 20:53 +0300, Sergei Shtylyov wrote: Hello. On 02/18/2014 04:21 PM, Ivan T. Ivanov wrote: From: Ivan T. Ivanov iiva...@mm-sol.com Allows controller to be specified via device tree. Pass PHY phandle specified in DT to core driver. Signed-off-by: Ivan T. Ivanov iiva...@mm-sol.com --- drivers/usb/chipidea/ci_hdrc_msm.c | 23 ++- 1 file changed, 22 insertions(+), 1 deletion(-) You also need to describe the binding you're creating in Documentation/devicetree/bindings/usb/file.txt. Did you check [PATCH v2 1/3]? Regards, Ivan WBR, Sergei -- 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 2/3] usb: chipidea: msm: Add device tree support
On Tue, 2014-02-18 at 08:08 -0600, Josh Cartwright wrote:
Hey Ivan-
Nit below.
On Tue, Feb 18, 2014 at 03:21:20PM +0200, Ivan T. Ivanov wrote:
+static struct of_device_id msm_ci_dt_match[] = {
const?
Thanks, will do.
Regards,
Ivan
+ { .compatible = qcom,ci-hdrc, },
+ { }
+};
+MODULE_DEVICE_TABLE(of, msm_ci_dt_match);
--
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 1/3] usb: chipidea: msm: Add device tree binding information
Hi, On Tue, 2014-02-18 at 10:13 -0600, Josh Cartwright wrote: On Tue, Feb 18, 2014 at 03:21:19PM +0200, Ivan T. Ivanov wrote: From: Ivan T. Ivanov iiva...@mm-sol.com Document device tree binding information as required by the Qualcomm USB controller. Signed-off-by: Ivan T. Ivanov iiva...@mm-sol.com --- .../devicetree/bindings/usb/msm-hsusb.txt | 17 + Is this really the appropriate place to document this? It seems like this binding doc should be merged with the i.MX ci13xxx binding in a common ci13xxx doc. This driver is a glue layer driver which control Qualcomm specific logic around Chipidea IP core. It is supposed to hold non standard Chipidea properties, but I suppose that ci-hdrc-qcom.txt will be better name and will be similar to i.MX chosen name. What do you think? Regards, Ivan -- 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 2/3] usb: chipidea: msm: Add device tree support
On 02/18/2014 08:14 PM, Ivan T. Ivanov wrote: From: Ivan T. Ivanov iiva...@mm-sol.com Allows controller to be specified via device tree. Pass PHY phandle specified in DT to core driver. Signed-off-by: Ivan T. Ivanov iiva...@mm-sol.com --- drivers/usb/chipidea/ci_hdrc_msm.c | 23 ++- 1 file changed, 22 insertions(+), 1 deletion(-) You also need to describe the binding you're creating in Documentation/devicetree/bindings/usb/file.txt. Did you check [PATCH v2 1/3]? Did you send it to 'linux-usb'? I just didn't get the patch. (Typically, the bindings are described in the same patch the DT support is added to the driver bu YMMV, of course.) Regards, Ivan WBR, Sergei -- 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 v3 7/7] devicetree: bindings: Document PM8921/8058 PMICs
On 02/13/14 03:06, Lee Jones wrote: These match the #defines in that file. I'd like to be explicit about the numbers to prevent people from thinking they have to use #defines and to match what other irq controllers have done (gic, atmel-aic, etc.) I believe people _do_ have to use the #defines? Is there a good reason for you not wanting to use them? No, there isn't any requirement to use #defines in DT. -- Qualcomm Innovation Center, Inc. is a member of 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 v5 1/6] spmi: Linux driver framework for SPMI
On Sat, Feb 15, 2014 at 05:47:48PM -0600, Felipe Balbi wrote:
On Mon, Feb 03, 2014 at 05:05:33PM -0600, Josh Cartwright wrote:
+#ifdef CONFIG_PM_RUNTIME
+static int spmi_runtime_suspend(struct device *dev)
+{
+ struct spmi_device *sdev = to_spmi_device(dev);
+ int err;
+
+ err = pm_generic_runtime_suspend(dev);
+ if (err)
+ return err;
+
+ return spmi_command_sleep(sdev);
shouldn't this too calls be swapped ? I mean, some pm_runtime
implementations could be gating clocks at the driver's
-runtime_suspend() callback.
Perhaps. I had added the explicit SLEEP/WAKEUP commands to
suspend()/resume(), but now I'm thinking issuing these commands should
not be the responsibility of the core, since the semantics of the
SLEEP/ACTIVE state aren't well defined in general (each
implementation/slave defines what, if anything, these states mean).
Fortunately, there are no users yet, so this is a painless change. :)
Thanks for taking a look.
Josh
--
Qualcomm Innovation Center, Inc. is a member of 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 1/3] usb: chipidea: msm: Add device tree binding information
On Tue, Feb 18, 2014 at 07:27:00PM +0200, Ivan T. Ivanov wrote: On Tue, 2014-02-18 at 10:13 -0600, Josh Cartwright wrote: On Tue, Feb 18, 2014 at 03:21:19PM +0200, Ivan T. Ivanov wrote: .../devicetree/bindings/usb/msm-hsusb.txt | 17 + Is this really the appropriate place to document this? It seems like this binding doc should be merged with the i.MX ci13xxx binding in a common ci13xxx doc. This driver is a glue layer driver which control Qualcomm specific logic around Chipidea IP core. It is supposed to hold non standard Chipidea properties, but I suppose that ci-hdrc-qcom.txt will be better name and will be similar to i.MX chosen name. What do you think? Sounds like an improvement to me. -- Qualcomm Innovation Center, Inc. is a member of 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 1/3] usb: chipidea: msm: Add device tree binding information
On Tue, Feb 18, 2014 at 02:21:19PM +0100, Ivan T. Ivanov wrote: From: Ivan T. Ivanov iiva...@mm-sol.com Document device tree binding information as required by the Qualcomm USB controller. Signed-off-by: Ivan T. Ivanov iiva...@mm-sol.com --- .../devicetree/bindings/usb/msm-hsusb.txt | 17 + Although you mentioned to Josh that this is intended for non-standard Chipidea properties, I don't see any other than requiring that 'dr_mode' must be peripheral. It would seem that this should all be integrated into a ci3xxx.txt. 1 file changed, 17 insertions(+) diff --git a/Documentation/devicetree/bindings/usb/msm-hsusb.txt b/Documentation/devicetree/bindings/usb/msm-hsusb.txt index 5ea26c6..d4e7e41 100644 --- a/Documentation/devicetree/bindings/usb/msm-hsusb.txt +++ b/Documentation/devicetree/bindings/usb/msm-hsusb.txt @@ -15,3 +15,20 @@ Example EHCI controller device node: usb-phy = usb_otg; }; +CI13xxx (Chipidea) USB controllers + +Required properties: +- compatible: should contain qcom,ci-hdrc Is there nothing more specific you could put here? Maybe a hardware revision, or something? +- reg: offset and length of the register set in the memory map +- interrupts: interrupt-specifier for the controller interrupt. +- usb-phy: phandle for the PHY device +- dr_mode: Sould be peripheral s/Sould/should/ -Courtney -- 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 2/3] usb: chipidea: msm: Add device tree support
On Tue, Feb 18, 2014 at 07:31:55PM +0100, Sergei Shtylyov wrote: On 02/18/2014 08:14 PM, Ivan T. Ivanov wrote: From: Ivan T. Ivanov iiva...@mm-sol.com Allows controller to be specified via device tree. Pass PHY phandle specified in DT to core driver. Signed-off-by: Ivan T. Ivanov iiva...@mm-sol.com --- drivers/usb/chipidea/ci_hdrc_msm.c | 23 ++- 1 file changed, 22 insertions(+), 1 deletion(-) You also need to describe the binding you're creating in Documentation/devicetree/bindings/usb/file.txt. Did you check [PATCH v2 1/3]? Did you send it to 'linux-usb'? I just didn't get the patch. (Typically, the bindings are described in the same patch the DT support is added to the driver bu YMMV, of course.) Although I would personally agree that this is the most logical method, it would appear that the DT guys disagree with us [1]. Lately, they seem to have either given up or are otherwise preoccupied, so perhaps you can still slip a few patches by them. ;) -Courtney [1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/submitting-patches.txt -- 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: dts: qcom: Add RNG device tree node
On 02/12, Stanimir Varbanov wrote: Hi, Stephen On 02/08/2014 05:37 AM, Stephen Boyd wrote: On 02/07, Stanimir Varbanov wrote: Add the necessary DT node to probe the rng driver on msm8974 platforms. Looks good. We should add it to msm8960-cdp and enable the driver in the defconfig as well. Sure, I can prepare a patch. Unfortunately I haven't msm8960 CDP to test it. No problem. I have one on my desk and can run a test if you like. -- Qualcomm Innovation Center, Inc. is a member of 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
[PATCHv4 2/2] arm: Get rid of meminfo
memblock is now fully integrated into the kernel and is the prefered
method for tracking memory. Rather than reinvent the wheel with
meminfo, migrate to using memblock directly instead of meminfo as
an intermediate.
Acked-by: Jason Cooper ja...@lakedaemon.net
Acked-by: Catalin Marinas catalin.mari...@arm.com
Acked-by: Santosh Shilimkar santosh.shilim...@ti.com
Acked-by: Kukjin Kim kgene@samsung.com
Tested-by: Marek Szyprowski m.szyprow...@samsung.com
Tested-by: Leif Lindholm leif.lindh...@linaro.org
Signed-off-by: Laura Abbott lau...@codeaurora.org
---
arch/arm/include/asm/mach/arch.h |4 +-
arch/arm/include/asm/memblock.h |3 +-
arch/arm/include/asm/setup.h | 23 --
arch/arm/kernel/atags_parse.c|5 +-
arch/arm/kernel/devtree.c|5 --
arch/arm/kernel/setup.c | 30 ++--
arch/arm/mach-clps711x/board-clep7312.c |7 +-
arch/arm/mach-clps711x/board-edb7211.c | 10 +--
arch/arm/mach-clps711x/board-p720t.c |2 +-
arch/arm/mach-footbridge/cats-hw.c |2 +-
arch/arm/mach-footbridge/netwinder-hw.c |2 +-
arch/arm/mach-msm/board-halibut.c|6 --
arch/arm/mach-msm/board-mahimahi.c | 13 +---
arch/arm/mach-msm/board-msm7x30.c|3 +-
arch/arm/mach-msm/board-sapphire.c | 13 ++--
arch/arm/mach-msm/board-trout.c |8 +--
arch/arm/mach-orion5x/common.c |3 +-
arch/arm/mach-orion5x/common.h |3 +-
arch/arm/mach-pxa/cm-x300.c |3 +-
arch/arm/mach-pxa/corgi.c| 10 +--
arch/arm/mach-pxa/eseries.c |9 +--
arch/arm/mach-pxa/poodle.c |8 +--
arch/arm/mach-pxa/spitz.c|8 +--
arch/arm/mach-pxa/tosa.c |8 +--
arch/arm/mach-realview/core.c| 11 +--
arch/arm/mach-realview/core.h|3 +-
arch/arm/mach-realview/realview_pb1176.c |8 +--
arch/arm/mach-realview/realview_pbx.c| 17 ++---
arch/arm/mach-s3c24xx/mach-smdk2413.c|8 +--
arch/arm/mach-s3c24xx/mach-vstms.c |8 +--
arch/arm/mach-sa1100/assabet.c |2 +-
arch/arm/mm/init.c | 67 +++---
arch/arm/mm/mmu.c| 115 +-
arch/arm/mm/nommu.c | 66 +
34 files changed, 172 insertions(+), 321 deletions(-)
diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index 17a3fa2..c43473a 100644
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@ -14,7 +14,6 @@
#include linux/reboot.h
struct tag;
-struct meminfo;
struct pt_regs;
struct smp_operations;
#ifdef CONFIG_SMP
@@ -47,8 +46,7 @@ struct machine_desc {
enum reboot_modereboot_mode;/* default restart mode */
struct smp_operations *smp; /* SMP operations */
bool(*smp_init)(void);
- void(*fixup)(struct tag *, char **,
-struct meminfo *);
+ void(*fixup)(struct tag *, char **);
void(*init_meminfo)(void);
void(*reserve)(void);/* reserve mem blocks */
void(*map_io)(void);/* IO mapping function */
diff --git a/arch/arm/include/asm/memblock.h b/arch/arm/include/asm/memblock.h
index c2f5102..bf47a6c 100644
--- a/arch/arm/include/asm/memblock.h
+++ b/arch/arm/include/asm/memblock.h
@@ -1,10 +1,9 @@
#ifndef _ASM_ARM_MEMBLOCK_H
#define _ASM_ARM_MEMBLOCK_H
-struct meminfo;
struct machine_desc;
-void arm_memblock_init(struct meminfo *, const struct machine_desc *);
+void arm_memblock_init(const struct machine_desc *);
phys_addr_t arm_memblock_steal(phys_addr_t size, phys_addr_t align);
#endif
diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h
index 8d6a089..0196091 100644
--- a/arch/arm/include/asm/setup.h
+++ b/arch/arm/include/asm/setup.h
@@ -26,29 +26,6 @@ static const struct tagtable __tagtable_##fn __tag = { tag,
fn }
*/
#define NR_BANKS CONFIG_ARM_NR_BANKS
-struct membank {
- phys_addr_t start;
- phys_addr_t size;
- unsigned int highmem;
-};
-
-struct meminfo {
- int nr_banks;
- struct membank bank[NR_BANKS];
-};
-
-extern struct meminfo meminfo;
-
-#define for_each_bank(iter,mi) \
- for (iter = 0; iter (mi)-nr_banks; iter++)
-
-#define bank_pfn_start(bank) __phys_to_pfn((bank)-start)
-#define bank_pfn_end(bank) __phys_to_pfn((bank)-start + (bank)-size)
-#define bank_pfn_size(bank)((bank)-size PAGE_SHIFT)
-#define bank_phys_start(bank) (bank)-start
-#define bank_phys_end(bank)((bank)-start + (bank)-size)
-#define bank_phys_size(bank) (bank)-size
-
extern int arm_add_memory(u64 start, u64 size);
extern void
Re: [PATCH v2 2/3] usb: chipidea: msm: Add device tree support
Hello. On 02/19/2014 12:34 AM, Courtney Cavin wrote: From: Ivan T. Ivanov iiva...@mm-sol.com Allows controller to be specified via device tree. Pass PHY phandle specified in DT to core driver. Signed-off-by: Ivan T. Ivanov iiva...@mm-sol.com --- drivers/usb/chipidea/ci_hdrc_msm.c | 23 ++- 1 file changed, 22 insertions(+), 1 deletion(-) You also need to describe the binding you're creating in Documentation/devicetree/bindings/usb/file.txt. Did you check [PATCH v2 1/3]? Did you send it to 'linux-usb'? I just didn't get the patch. (Typically, the bindings are described in the same patch the DT support is added to the driver bu YMMV, of course.) Although I would personally agree that this is the most logical method, it would appear that the DT guys disagree with us [1]. Lately, they Thank you for the reference. seem to have either given up or are otherwise preoccupied, so perhaps you can still slip a few patches by them. ;) Yeah, I was at last able to get my Ethernet driver bindings applied. :-) -Courtney [1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/submitting-patches.txt WBR, Sergei -- 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: [PATCHv4 2/2] arm: Get rid of meminfo
On Tue, Feb 18, 2014 at 02:15:33PM -0800, Laura Abbott wrote:
memblock is now fully integrated into the kernel and is the prefered
method for tracking memory. Rather than reinvent the wheel with
meminfo, migrate to using memblock directly instead of meminfo as
an intermediate.
#define NR_BANKS CONFIG_ARM_NR_BANKS
-struct membank {
- phys_addr_t start;
- phys_addr_t size;
- unsigned int highmem;
-};
-
-struct meminfo {
- int nr_banks;
- struct membank bank[NR_BANKS];
-};
Doesn't this make NR_BANKS (and CONFIG_ARM_NR_BANKS) unused?
--
FTTC broadband for 0.8mile line: 5.8Mbps down 500kbps up. Estimation
in database were 13.1 to 19Mbit for a good line, about 7.5+ for a bad.
Estimate before purchase was up to 13.2Mbit.
--
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: [PATCHv4 2/2] arm: Get rid of meminfo
On Tue, 18 Feb 2014, Laura Abbott wrote:
memblock is now fully integrated into the kernel and is the prefered
method for tracking memory. Rather than reinvent the wheel with
meminfo, migrate to using memblock directly instead of meminfo as
an intermediate.
Acked-by: Jason Cooper ja...@lakedaemon.net
Acked-by: Catalin Marinas catalin.mari...@arm.com
Acked-by: Santosh Shilimkar santosh.shilim...@ti.com
Acked-by: Kukjin Kim kgene@samsung.com
Tested-by: Marek Szyprowski m.szyprow...@samsung.com
Tested-by: Leif Lindholm leif.lindh...@linaro.org
Signed-off-by: Laura Abbott lau...@codeaurora.org
Reviewed-by: Nicolas Pitre n...@linaro.org
A small comments below.
diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h
index 8d6a089..0196091 100644
--- a/arch/arm/include/asm/setup.h
+++ b/arch/arm/include/asm/setup.h
@@ -26,29 +26,6 @@ static const struct tagtable __tagtable_##fn __tag = {
tag, fn }
*/
#define NR_BANKS CONFIG_ARM_NR_BANKS
This may go as well now. Please consider this patch as well for your
series:
Subject: [PATCH] arm: Get rid of NR_BANKS
This constant is no longer used, except in the atag_to_fdt compatibility
layer where a local definition is now provided. This could be removed
entirely i.e. having no limits but this is probably not worth it.
Signed-off-by: Nicolas Pitre n...@linaro.org
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e254198177..1ca42ed304 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1090,11 +1090,6 @@ source arch/arm/firmware/Kconfig
source arch/arm/mm/Kconfig
-config ARM_NR_BANKS
- int
- default 16 if ARCH_EP93XX
- default 8
-
config IWMMXT
bool Enable iWMMXt support if !CPU_PJ4
depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4
diff --git a/arch/arm/boot/compressed/atags_to_fdt.c
b/arch/arm/boot/compressed/atags_to_fdt.c
index d1153c8a76..9448aa0c66 100644
--- a/arch/arm/boot/compressed/atags_to_fdt.c
+++ b/arch/arm/boot/compressed/atags_to_fdt.c
@@ -7,6 +7,8 @@
#define do_extend_cmdline 0
#endif
+#define NR_BANKS 16
+
static int node_offset(void *fdt, const char *node_path)
{
int offset = fdt_path_offset(fdt, node_path);
diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h
index 01960916dd..e0adb9f1bf 100644
--- a/arch/arm/include/asm/setup.h
+++ b/arch/arm/include/asm/setup.h
@@ -21,11 +21,6 @@
#define __tagtable(tag, fn) \
static const struct tagtable __tagtable_##fn __tag = { tag, fn }
-/*
- * Memory map description
- */
-#define NR_BANKS CONFIG_ARM_NR_BANKS
-
extern int arm_add_memory(u64 start, u64 size);
extern void early_print(const char *str, ...);
extern void dump_machine_table(void);
--
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: [PATCHv4 2/2] arm: Get rid of meminfo
On Tue, 18 Feb 2014, Russell King - ARM Linux wrote:
On Tue, Feb 18, 2014 at 02:15:33PM -0800, Laura Abbott wrote:
memblock is now fully integrated into the kernel and is the prefered
method for tracking memory. Rather than reinvent the wheel with
meminfo, migrate to using memblock directly instead of meminfo as
an intermediate.
#define NR_BANKS CONFIG_ARM_NR_BANKS
-struct membank {
- phys_addr_t start;
- phys_addr_t size;
- unsigned int highmem;
-};
-
-struct meminfo {
- int nr_banks;
- struct membank bank[NR_BANKS];
-};
Doesn't this make NR_BANKS (and CONFIG_ARM_NR_BANKS) unused?
Still used in atag_to_fdt.c but I just sent a patch moving it there.
Nicolas
--
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] qcom cleanups for v3.15
On 02/10/14 15:23, Kumar Gala wrote: Kumar Gala (6): ARM: dts: msm: split out msm8660 and msm8960 soc into dts include ARM: msm: kill off hotplug.c clocksource: qcom: Move clocksource code out of mach-msm ARM: qcom: Split Qualcomm support into legacy and multiplatform Sorry to nag, but can you please address my comment on this patch? -- Qualcomm Innovation Center, Inc. is a member of 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 v5 2/4] devicetree: bindings: Document Krait CPU/L1 EDAC
(Sorry, this discussion stalled due to merge window + life events) On 01/17, Lorenzo Pieralisi wrote: On Thu, Jan 16, 2014 at 07:26:17PM +, Stephen Boyd wrote: On 01/16, Lorenzo Pieralisi wrote: On Thu, Jan 16, 2014 at 06:05:05PM +, Stephen Boyd wrote: On 01/16, Lorenzo Pieralisi wrote: Do we really want to do that ? I am not sure. A cpus node is supposed to be a container node, we should not define this binding just because we know the kernel creates a platform device for it then. This is just copying more of the ePAPR spec into this document. It just so happens that having a compatible field here allows a platform device to be created. I don't see why that's a problem. I do not see why you cannot define a node like pmu or arch-timer and stick a compatible property in there. cpus node does not represent a device, and must not be created as a platform device, that's my opinion. I had what you're suggesting before in the original revision of this patch. Please take a look at the original patch series[1]. I suppose it could be tweaked slightly to still have a cache node for the L2 interrupt and the next-level-cache pointer from the CPUs. Ok, sorry, we are running around in circles here, basically you moved the node to cpus according to reviews. I still think that treating cpus as a device is not a great idea, even though I am in the same position with C-states and probably will add C-state tables in the cpus node. http://comments.gmane.org/gmane.linux.power-management.general/41012 I just would like to see under cpus nodes and properties that apply to all ARM systems, and avoid defining properties (eg interrupts) that have different meanings for different ARM cores. The question related to why the kernel should create a platform device out of cpus is still open. I really do not want to block your series for these simple issues but we have to make a decision and stick to that, I am fine either way if we have a plan. Do you just want a backup plan in case we don't make a platform device out of the cpus node? I believe we can always add code somewhere to create a platform device at runtime if we detect the cpus node has a compatible string equal to qcom,krait. We could probably change this driver's module_init() to scan the DT for such a compatible string and create the platform device right there. If we get more than one interrupt in the cpus node we can add interrupt-names and then have software look for interrupts by name instead of number. -- Qualcomm Innovation Center, Inc. is a member of 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 0/3] usb: chipidea: msm: Clean and fix glue layer driver
Ivan, I'm having tremendous problems getting this driver to initialize. For some reason, I can't get the driver to actually transition the hardware into peripheral mode. At first I was getting a lot of probe deferrals, based on not finding the regulators early enough in the boot, and I thought it was an issue with the gadget drivers loading before the driver could complete its setup. However, I switched everything to loading via modules, and now have less probe deferrals, but I still can't get the driver to activate. I see zero interrupts. In particular the routine hw_device_state (which turns on interrupts in the controller) is never called, because I can't get msm_otg_start_peripheral to actually kick the hardware. I've sprinkled the code in drivers/usb/chipidea and drivers/usb/phy/phy-msm-usb.c liberally with printks and WARNs to help me see what's going on, but I'm having a hard time tracing it down. I'm pretty sure I've got the DTS correct, but my USB config might not match yours. (Would you mind sharing your config?). I tried configuring the qcom,otg-control for user controlled mode setting (via debugfs), and even with doing echo peripheral /sys/kernel/debug/msm_otg/mode, it just wouldn't start the hardware (call hw_device_state(...1)). Any ideas you can provide would be welcome (e.g. for things to try, look at, etc.) My kernel is based on an internal Sony 3.13-rc6 kernel with clock and regulator patches applied, as well as your phy-msm-usb.c patches from November and your chipidea patches from yesterday. Thanks, -- Tim In the printk dump below, UBTO=udc_bind_to_driver CIS=ci_udc_start MOSP=msm_otg_set_peripheral MOSW=msm_otg_sm_work [10] platform_init() [10] target_init() [10] Display Init: Start [10] display_init(),target_id=10. [30] Config MIPI_VIDEO_PANEL. [30] Turn on MIPI_VIDEO_PANEL. [50] Video lane tested successfully [50] Display Init: Done [70] partition misc doesn't exist [80] error in emmc_recovery_init [80] No 'misc' partition found [80] Error reading MISC partition [80] failed to get ffbm cookie[90] use_signed_kernel=1, is_unlocked=0, is_tampered=1. [90] Loading boot image (7829504): start [550] Loading boot image (7829504): done [550] Found Appeneded Flattened Device tree [550] cmdline: console=ttyMSM,115200,n8 androidboot.hardware=qcom user_debug=31 maxcpus=2 msm_rtb.filter=0x37 ehci-hcd.park=3 earl yprintk debug androidboot.emmc=true androidboot.serialno=40081a14 androidboot.baseband=apq [570] Updating device tree: start [570] Updating device tree: done [580] booting linux @ 0x8000, ramdisk @ 0x200 (4234892), tags/device tree @ 0x1e0 [580] Turn off MIPI_VIDEO_PANEL. [580] Continuous splash enabled, keeping panel alive. Uncompressing Linux... done, booting the kernel. [0.00] Booting Linux on physical CPU 0x0 [0.00] TRB: version 8 [0.00] Linux version 3.13.0-rc6-00147-g00bb56a-dirty (10102229@ussvlx8980) (gcc version 4.6.x-google 20120106 (prerelease) (GCC) ) #40 SMP PREEMPT Tue Feb 18 19:24:12 PST 2014 [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 model: Qualcomm APQ8074 Dragonboard [0.00] bootconsole [earlycon0] enabled [0.00] Memory policy: Data cache writealloc [0.00] On node 0 totalpages: 524288 [0.00] free_area_init_node: node 0, pgdat c0908d80, node_mem_map c098 [0.00] Normal zone: 1520 pages used for memmap [0.00] Normal zone: 0 pages reserved [0.00] Normal zone: 194560 pages, LIFO batch:31 [0.00] HighMem zone: 2576 pages used for memmap [0.00] HighMem zone: 329728 pages, LIFO batch:31 [0.00] PERCPU: Embedded 8 pages/cpu @c1993000 s12224 r8192 d12352 u32768 [0.00] pcpu-alloc: s12224 r8192 d12352 u32768 alloc=8*4096 [0.00] pcpu-alloc: [0] 0 [0] 1 [0] 2 [0] 3 [0.00] Built 1 zonelists in Zone order, mobility grouping on. Total pages: 522768 [0.00] Kernel command line: console=ttyMSM,115200,n8 androidboot.hardware=qcom user_debug=31 maxcpus=2 msm_rtb.filter=0x37 ehci-hcd.park=3 earlyprintk debug androidboot.emmc=true androidboot.serialno=40081a14 androidboot.baseband=apq [0.00] PID hash table entries: 4096 (order: 2, 16384 bytes) [0.00] Dentry cache hash table entries: 131072 (order: 7, 524288 bytes) [0.00] Inode-cache hash table entries: 65536 (order: 6, 262144 bytes) [0.00] Memory: 2067932K/2097152K available (4734K kernel code, 262K rwdata, 1912K rodata, 287K init, 446K bss, 29220K rese rved, 1318912K highmem) [0.00] Virtual kernel memory layout: [0.00] vector : 0x - 0x1000 ( 4 kB) [0.00] fixmap : 0xfff0 - 0xfffe ( 896 kB) [0.00] vmalloc : 0xf000 - 0xff00 ( 240 MB) [0.00] lowmem : 0xc000 - 0xef80 ( 760 MB) [0.00]
Re: [PATCH] usb: phy: msm: fix possible build error
On 02/18, Felipe Balbi wrote:
This will fail builds on configs where
CONFIG_PM_RUNTIME=y and CONFIG_PM_SLEEP=n.
Following build error will show up:
drivers/usb/phy/phy-msm-usb.c: In function ???msm_otg_runtime_suspend???:
drivers/usb/phy/phy-msm-usb.c:1693:2: error: implicit declaration of \
function ???msm_otg_suspend??? [-Werror=implicit-function-declaration]
return msm_otg_suspend(motg);
^
drivers/usb/phy/phy-msm-usb.c: In function ???msm_otg_runtime_resume???:
drivers/usb/phy/phy-msm-usb.c:1701:2: error: implicit declaration of \
function ???msm_otg_resume??? [-Werror=implicit-function-declaration]
return msm_otg_resume(motg);
^
This patch fixes the error by defining msm_otg_{suspend,resume}
whenever CONFIG_PM=y.
Signed-off-by: Felipe Balbi ba...@ti.com
I'm lost. Didn't Josh send a patch for this to you already?
[1] https://patchwork.kernel.org/patch/3673401/
---
drivers/usb/phy/phy-msm-usb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index 64c9d14e..96f31aa 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -159,7 +159,7 @@ put_3p3:
return rc;
}
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_PM
#define USB_PHY_SUSP_DIG_VOL 50
static int msm_hsusb_config_vddcx(int high)
{
@@ -440,7 +440,7 @@ static int msm_otg_reset(struct usb_phy *phy)
#define PHY_SUSPEND_TIMEOUT_USEC (500 * 1000)
#define PHY_RESUME_TIMEOUT_USEC (100 * 1000)
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_PM
static int msm_otg_suspend(struct msm_otg *motg)
{
struct usb_phy *phy = motg-phy;
--
1.9.0
--
Qualcomm Innovation Center, Inc. is a member of 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
