Allow MSM DT platforms to be built multi-platform
Subsystems (8)
v2 cover Allow MSM DT platforms to be built multi-platform
These patches allow the DT based MSM platforms to be built as part of the multi-platform kernel. I need acks from Chris Ball on the mmc patch and Rob/Dave on the drm patch. I dropped Arnd's ack on patch 6 because I've rebased that patch on top of the patchset David sent out (which this is in reply to). The rebase was fairly minor and the new patch for drm/msm is trivial. Please consider for v3.14.
Changes since v1:
* Rebased onto David's v3.14 patchset
* Picked up acks
* New patch for drm/msm driver
Ivan T. Ivanov (1):
usb: phy: msm: Move mach dependent code to platform data
Stephen Boyd (6):
mmc: msm_sdcc: Limit driver to platforms that use it
tty: serial: Limit msm_serial_hs driver to platforms that use it
ARM: msm: Only build clock.c on proc_comm based platforms
ARM: msm: Only build timer.c if required
drm/msm: Drop unnecessary mach include
ARM: msm: Move MSM's DT based hardware to multi-platform support
arch/arm/Kconfig | 4 +- arch/arm/mach-msm/Kconfig | 85 ++++++++++++++++------------- arch/arm/mach-msm/Makefile | 4 +- arch/arm/mach-msm/board-msm7x30.c | 35 ++++++++++++ arch/arm/mach-msm/board-qsd8x50.c | 35 ++++++++++++ drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c | 2 - drivers/mmc/host/Kconfig | 2 +- drivers/tty/serial/Kconfig | 2 +- drivers/usb/phy/phy-msm-usb.c | 35 +++++------- include/linux/usb/msm_hsusb.h | 3 + 10 files changed, 142 insertions(+), 65 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 1/7 usb: phy: msm: Move mach dependent code to platform data
From: "Ivan T. Ivanov" <[email protected]>
This patch fix compilation error when driver is compiled in multi-platform builds.
drivers/built-in.o: In function `msm_otg_link_clk_reset':./drivers/usb/phy/phy-msm-usb.c:314: undefined reference to clk_reset' ./drivers/usb/phy/phy-msm-usb.c:318: undefined reference to clk_reset'
Use platform data supplied reset handlers and adjust error messages reported when reset sequence fail.
This is an intermediate step before adding support for reset framework and newer targets.
--- arch/arm/mach-msm/board-msm7x30.c | 35 +++++++++++++++++++++++++++++++++++ arch/arm/mach-msm/board-qsd8x50.c | 35 +++++++++++++++++++++++++++++++++++ drivers/usb/phy/phy-msm-usb.c | 35 +++++++++++++++-------------------- include/linux/usb/msm_hsusb.h | 3 +++ 4 files changed, 88 insertions(+), 20 deletions(-)
arch/arm/mach-msm/board-msm7x30.c +35 -0
@@ -30,6 +30,7 @@#include <asm/memory.h> #include <asm/setup.h> +#include <mach/clk.h> #include <mach/msm_iomap.h> #include <mach/dma.h>
@@ -60,10 +61,44 @@ static int hsusb_phy_init_seq[] = {-1 }; +static int hsusb_link_clk_reset (struct clk *link_clk,bool assert) +{ +int ret; + +if (assert) { + ret =clk_reset (link_clk,CLK_RESET_ASSERT ); +if (ret) +pr_err ("usb hs_clk assert failed\n" ); + }else { + ret =clk_reset (link_clk,CLK_RESET_DEASSERT ); +if (ret) +pr_err ("usb hs_clk deassert failed\n" ); + } +return ret; +} + +static int hsusb_phy_clk_reset (struct clk *phy_clk) +{ +int ret; + + ret =clk_reset (phy_clk,CLK_RESET_ASSERT ); +if (ret) { +pr_err ("usb phy clk assert failed\n" ); +return ret; + } +usleep_range (10000 ,12000 ); + ret =clk_reset (phy_clk,CLK_RESET_DEASSERT ); +if (ret) +pr_err ("usb phy clk deassert failed\n" ); +return ret; +} +static struct msm_otg_platform_data msm_otg_pdata = { .phy_init_seq = hsusb_phy_init_seq, .mode =USB_PERIPHERAL , .otg_control =OTG_PHY_CONTROL , + .link_clk_reset = hsusb_link_clk_reset, + .phy_clk_reset = hsusb_phy_clk_reset, };struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS ] = {
arch/arm/mach-msm/board-qsd8x50.c +35 -0
@@ -31,6 +31,7 @@#include <mach/irqs.h> #include <mach/sirc.h> #include <mach/vreg.h> +#include <mach/clk.h> #include <linux/platform_data/mmc-msm_sdcc.h> #include "devices.h"
@@ -81,10 +82,44 @@ static int hsusb_phy_init_seq[] = {-1 }; +static int hsusb_link_clk_reset (struct clk *link_clk,bool assert) +{ +int ret; + +if (assert) { + ret =clk_reset (link_clk,CLK_RESET_ASSERT ); +if (ret) +pr_err ("usb hs_clk assert failed\n" ); + }else { + ret =clk_reset (link_clk,CLK_RESET_DEASSERT ); +if (ret) +pr_err ("usb hs_clk deassert failed\n" ); + } +return ret; +} + +static int hsusb_phy_clk_reset (struct clk *phy_clk) +{ +int ret; + + ret =clk_reset (phy_clk,CLK_RESET_ASSERT ); +if (ret) { +pr_err ("usb phy clk assert failed\n" ); +return ret; + } +usleep_range (10000 ,12000 ); + ret =clk_reset (phy_clk,CLK_RESET_DEASSERT ); +if (ret) +pr_err ("usb phy clk deassert failed\n" ); +return ret; +} +static struct msm_otg_platform_data msm_otg_pdata = { .phy_init_seq = hsusb_phy_init_seq, .mode =USB_PERIPHERAL , .otg_control =OTG_PHY_CONTROL , + .link_clk_reset = hsusb_link_clk_reset, + .phy_clk_reset = hsusb_phy_clk_reset, };static struct platform_device *devices[]__initdata = {
drivers/usb/phy/phy-msm-usb.c +15 -20
@@ -40,8 +40,6 @@#include <linux/usb/msm_hsusb_hw.h> #include <linux/regulator/consumer.h> -#include <mach/clk.h> -#define MSM_USB_BASE (motg->regs)#define DRIVER_NAME "msm_otg"
@@ -308,33 +306,30 @@ static void ulpi_init(struct msm_otg *motg)static int msm_otg_link_clk_reset (struct msm_otg *motg,bool assert) { -int ret; +int ret =0 ; + +if (!motg->pdata->link_clk_reset) +return ret; + + ret = motg->pdata->link_clk_reset (motg->clk, assert); +if (ret) +dev_err (motg->phy.dev,"usb link clk reset %s failed\n" , + assert ?"assert" :"deassert" ); -if (assert) { - ret =clk_reset (motg->clk,CLK_RESET_ASSERT ); -if (ret) -dev_err (motg->phy.dev,"usb hs_clk assert failed\n" ); - }else { - ret =clk_reset (motg->clk,CLK_RESET_DEASSERT ); -if (ret) -dev_err (motg->phy.dev,"usb hs_clk deassert failed\n" ); - }return ret; }static int msm_otg_phy_clk_reset (struct msm_otg *motg) { -int ret; +int ret =0 ; - ret =clk_reset (motg->phy_reset_clk,CLK_RESET_ASSERT ); -if (ret) { -dev_err (motg->phy.dev,"usb phy clk assert failed\n" ); +if (!motg->pdata->phy_clk_reset)return ret; - } -usleep_range (10000 ,12000 ); - ret =clk_reset (motg->phy_reset_clk,CLK_RESET_DEASSERT ); + + ret = motg->pdata->phy_clk_reset (motg->phy_reset_clk);if (ret) -dev_err (motg->phy.dev,"usb phy clk deassert failed\n" ); +dev_err (motg->phy.dev,"usb phy clk reset failed\n" ); +return ret; }
include/linux/usb/msm_hsusb.h +3 -0
@@ -20,6 +20,7 @@#include <linux/types.h> #include <linux/usb/otg.h> +#include <linux/clk.h> /** * Supported USB modes
@@ -135,6 +136,8 @@ struct msm_otg_platform_data {enum msm_usb_phy_type phy_type;void (*setup_gpio)(enum usb_otg_state state);char *pclk_src_name; +int (*link_clk_reset)(struct clk *link_clk,bool assert); +int (*phy_clk_reset)(struct clk *phy_clk); };/**
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 2/7 mmc: msm_sdcc: Limit driver to platforms that use it
In reply to Stephen BoydThe msm_sdcc driver uses mach specific dma APIs. This is not compatible with the multi-platform ARM effort. Let's only compile this driver on MSM devices that are prepared to support it, allowing the DT based MSM devices to enter the multi-platform ARM build.
--- drivers/mmc/host/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/Kconfig +1 -1
@@ -324,7 +324,7 @@ config MMC_ATMELMCI config MMC_MSM tristate "Qualcomm SDCC Controller Support" - depends on MMC && ARCH_MSM + depends on MMC && (ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50) help This provides support for the SD/MMC cell found in the MSM and QSD SOCs from Qualcomm. The controller also has
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 3/7 tty: serial: Limit msm_serial_hs driver to platforms that use it
In reply to Stephen BoydThe msm_serial_hs driver uses mach specific dma APIs. This is not compatible with the multi-platform ARM effort. Let's only compile this driver on MSM devices that are prepared to support it; allowing the DT based MSM devices to enter the multi-platform ARM build.
--- drivers/tty/serial/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/Kconfig +1 -1
@@ -1035,7 +1035,7 @@ config SERIAL_MSM_CONSOLE config SERIAL_MSM_HS tristate "MSM UART High Speed: Serial Driver" - depends on ARCH_MSM + depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50 select SERIAL_CORE help If you have a machine based on MSM family of SoCs, you
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 4/7 ARM: msm: Only build clock.c on proc_comm based platforms
In reply to Stephen BoydThe functionality provided by clock.c in mach-msm is only needed on proc_comm based platforms. Only build the file if proc_comm is enabled. This prevents compile failures for platforms that are part of the multi-platform kernel.
--- arch/arm/mach-msm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-msm/Makefile +1 -1
@@ -1,5 +1,5 @@ obj-y += timer.o -obj-y += clock.o +obj-$(CONFIG_MSM_PROC_COMM) += clock.o obj-$(CONFIG_MSM_VIC) += irq-vic.o
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 5/7 ARM: msm: Only build timer.c if required
In reply to Stephen BoydThe MSM timer is only used on MSM devices that don't have the architected timers. Introduce a hidden Kconfig option for this driver so that we don't build it on the platforms that don't need it.
--- arch/arm/mach-msm/Kconfig | 9 +++++++++ arch/arm/mach-msm/Makefile | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-)
arch/arm/mach-msm/Kconfig +9 -0
@@ -16,6 +16,7 @@ config ARCH_MSM7X00A select MACH_TROUT if !MACH_HALIBUT select MSM_PROC_COMM select MSM_SMD + select MSM_TIMER select MSM_SMD_PKG3 config ARCH_MSM7X30
@@ -27,6 +28,7 @@ config ARCH_MSM7X30 select MSM_GPIOMUX select MSM_PROC_COMM select MSM_SMD + select MSM_TIMER select MSM_VIC config ARCH_QSD8X50
@@ -38,6 +40,7 @@ config ARCH_QSD8X50 select MSM_GPIOMUX select MSM_PROC_COMM select MSM_SMD + select MSM_TIMER select MSM_VIC endchoice
@@ -50,6 +53,7 @@ config ARCH_MSM8X60 select GPIO_MSM_V2 select HAVE_SMP select MSM_SCM if SMP + select MSM_TIMER config ARCH_MSM8960 bool "MSM8960"
@@ -59,6 +63,7 @@ config ARCH_MSM8960 select HAVE_SMP select GPIO_MSM_V2 select MSM_SCM if SMP + select MSM_TIMER config ARCH_MSM8974 bool "MSM8974"
@@ -145,4 +150,8 @@ config MSM_GPIOMUX config MSM_SCM bool + +config MSM_TIMER + bool + endif
arch/arm/mach-msm/Makefile +1 -1
@@ -1,4 +1,4 @@ -obj-y += timer.o +obj-$(CONFIG_MSM_TIMER) += timer.o obj-$(CONFIG_MSM_PROC_COMM) += clock.o obj-$(CONFIG_MSM_VIC) += irq-vic.o
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 6/7 drm/msm: Drop unnecessary mach include
In reply to Stephen BoydThis file doesn't use the clk_reset() API that is exposed in mach-msm's mach/clk.h file. Remove the include so that this driver can be compiled as part of the multi-platform kernel.
--- drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c +0 -2
@@ -15,8 +15,6 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <mach/clk.h> -#include "mdp4_kms.h" #include "drm_crtc.h"
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 7/7 ARM: msm: Move MSM's DT based hardware to multi-platform support
In reply to Stephen BoydThe DT based MSM platforms can join the multi-platform builds, so introduce a DT based ARCH_MSM option. This option allows DT based MSM platforms to be built into the multi-platform kernel. Also introduce a hidden ARCH_MSM config that both the DT and non-DT platform support code select to avoid churn in places that depend on CONFIG_ARCH_MSM.
---
Arnd acked v1 but this is slightly different due to 8974 coming in.
arch/arm/Kconfig | 4 +-- arch/arm/mach-msm/Kconfig | 80 ++++++++++++++++++++++++----------------------- 2 files changed, 43 insertions(+), 41 deletions(-)
arch/arm/Kconfig +2 -2
@@ -631,10 +631,10 @@ config ARCH_PXA help Support for Intel/Marvell's PXA2xx/PXA3xx processor line. -config ARCH_MSM +config ARCH_MSM_NODT bool "Qualcomm MSM" + select ARCH_MSM select ARCH_REQUIRE_GPIOLIB - select CLKSRC_OF if OF select COMMON_CLK select GENERIC_CLOCKEVENTS help
arch/arm/mach-msm/Kconfig +41 -39
108 lines not on this page · raw message
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Quoted 5 lines · Stephen Boyd
These patches allow the DT based MSM platforms to be built as part of the multi-platform kernel. I need acks from Chris Ball on the mmc patch and Rob/Dave on the drm patch. I dropped Arnd's ack on patch 6 because I've rebased that patch on top of the patchset David sent out (which this is in reply to).
Forgot to add --in-reply-to. This is on top of these patches:
Subject: [PATCH 0/7] MSM patches for 3.14
Date: Fri, 20 Dec 2013 11:09:13 -0800
Message-Id: <[email protected]>
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v2 6/7] drm/msm: Drop unnecessary mach include
In reply to Stephen BoydQuoted 6 lines · Stephen Boyd
This file doesn't use the
clk_reset()API that is exposed in mach-msm'smach/clk.hfile. Remove the include so that this driver can be compiled as part of the multi-platform kernel.Cc Rob Clark <[email protected]>Cc Dave Airlie <[email protected]>
Quoted 17 lines
--- drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c | 2 -- 1 file changed, 2 deletions(-)drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c +0
-2@@ -15,8 +15,6 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <mach/clk.h> -#include "mdp4_kms.h" #include "drm_crtc.h"
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v2 6/7] drm/msm: Drop unnecessary mach include
In reply to Stephen BoydQuoted 3 lines · Stephen Boyd
This file doesn't use the
clk_reset()API that is exposed in mach-msm'smach/clk.hfile. Remove the include so that this driver can be compiled as part of the multi-platform kernel.
Thanks!
Quoted 23 lines
Cc Rob Clark <[email protected]>Cc Dave Airlie <[email protected]>--- drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c | 2 -- 1 file changed, 2 deletions(-)drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c +0
-3@@ -15,8 +15,6 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <mach/clk.h> -#include "mdp4_kms.h" #include "drm_crtc.h" --The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v2 6/7] drm/msm: Drop unnecessary mach include
Quoted 8 lines · Rob Clark
Quoted 3 lines · Stephen Boyd
This file doesn't use the
clk_reset()API that is exposed in mach-msm'smach/clk.hfile. Remove the include so that this driver can be compiled as part of the multi-platform kernel.Thanks!
Signed-off-by Rob Clark <[email protected]>
oh, fwiw, things are a bit re-arranged on msm-next-staging (to add 8074 and 8060a support).. currently I have:
------------------
#if defined(CONFIG_ARCH_MSM)
# include <mach/clk.h>
#elif defined(CONFIG_COMPILE_TEST)
/* stubs we need for compile-test: */
static inline struct device *msm_iommu_get_ctx(const char *ctx_name)
{
return NULL;
}#endif
------------------
Not really sure what to do about msm_iommu_get_ctx(), or whether I still need that?
BR,
-R
Quoted 25 lines
Quoted 25 lines
Cc Rob Clark <[email protected]>Cc Dave Airlie <[email protected]>--- drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c | 2 -- 1 file changed, 2 deletions(-)drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c +0
-3@@ -15,8 +15,6 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <mach/clk.h> -#include "mdp4_kms.h" #include "drm_crtc.h" --The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v2 6/7] drm/msm: Drop unnecessary mach include
Quoted 9 lines · Rob Clark
Quoted 8 lines · Rob Clark
Quoted 3 lines · Stephen Boyd
This file doesn't use the
clk_reset()API that is exposed in mach-msm'smach/clk.hfile. Remove the include so that this driver can be compiled as part of the multi-platform kernel.Thanks!
Signed-off-by Rob Clark <[email protected]>
I think you mean Acked-by? Signed-off-by usually means you're sending the patch along.
Quoted 10 lines
oh, fwiw, things are a bit re-arranged on msm-next-staging (to add 8074 and 8060a support).. currently I have:
------------------
#ifdefined(CONFIG_ARCH_MSM)
# include <mach/clk.h>
#elifdefined(CONFIG_COMPILE_TEST)
/* stubs we need for compile-test: */
static inline struct device *msm_iommu_get_ctx(const char*ctx_name)
Quoted 9 lines
{ return NULL; }#endif
------------------Not really sure what to do about
msm_iommu_get_ctx(), or whether I still need that?
I think the drm Kconfig should be selecting the MSM iommu Kconfig symbol. At least for now, it's a direct compile time dependency of this driver. I still don't see a use of mach/clk.h though, so we should be able to drop it completely.
Is your msm-next-staging tree going into v3.14? I don't see anything in linux-next so far.
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v2 3/7] tty: serial: Limit msm_serial_hs driver to platforms that use it
In reply to Stephen BoydQuoted 8 lines · Stephen Boyd
The
msm_serial_hsdriver uses mach specific dma APIs. This is not compatible with the multi-platform ARM effort. Let's only compile this driver on MSM devices that are prepared to support it; allowing the DT based MSM devices to enter the multi-platform ARM build.Signed-off-by Stephen Boyd <[email protected]>
Do you have a plan to deal with this in the future? Aren't you going to need it in the future on modern SoCs?
Arnd
Quoted 6 lines · Stephen Boyd
These patches allow the DT based MSM platforms to be built as part of the multi-platform kernel. I need acks from Chris Ball on the mmc patch and Rob/Dave on the drm patch. I dropped Arnd's ack on patch 6 because I've rebased that patch on top of the patchset David sent out (which this is in reply to). The rebase was fairly minor and the new patch for drm/msm is trivial. Please consider for v3.14.
Just for the record, I'm definitely happy with the way this is turning out, don't see my question on the serial driver as a NAK. I assume we will apply the patches for 3.14, but I first want to have a better understanding on where we are with the stuff that is already queued up for 3.14.
Arnd
Re: [PATCH v2 3/7] tty: serial: Limit msm_serial_hs driver to platforms that use it
In reply to Arnd BergmannQuoted 7 lines · Arnd Bergmann
Quoted 6 lines · Stephen Boyd
The
msm_serial_hsdriver uses mach specific dma APIs. This is not compatible with the multi-platform ARM effort. Let's only compile this driver on MSM devices that are prepared to support it; allowing the DT based MSM devices to enter the multi-platform ARM build.
Quoted 5 lines
Quoted 2 lines
Signed-off-by Stephen Boyd <[email protected]>Do you have a plan to deal with this in the future? Aren't you going to need it in the future on modern SoCs?
Yes, we plan to add the code for dma based serial devices into the msm_serial.c driver. In the process we'll use the linux DMA apis instead of using mach specific ones.
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v2 3/7] tty: serial: Limit msm_serial_hs driver to platforms that use it
Quoted 3 lines · On Thursday 02 January 2014 12:20:21 Stephen Boyd wrote:
Yes, we plan to add the code for dma based serial devices into the
msm_serial.cdriver. In the process we'll use the linux DMA apis instead of using mach specific ones.
Ok, very good.
Arnd
Quoted 7 lines · Arnd Bergmann
Quoted 6 lines · Stephen Boyd
These patches allow the DT based MSM platforms to be built as part of the multi-platform kernel. I need acks from Chris Ball on the mmc patch and Rob/Dave on the drm patch. I dropped Arnd's ack on patch 6 because I've rebased that patch on top of the patchset David sent out (which this is in reply to). The rebase was fairly minor and the new patch for drm/msm is trivial. Please consider for v3.14.
Quoted 5 lines
Just for the record, I'm definitely happy with the way this is turning out, don't see my question on the serial driver as a NAK. I assume we will apply the patches for 3.14, but I first want to have a better understanding on where we are with the stuff that is already queued up for 3.14.
It would be great if we could get these patches in for 3.14. Now that Olof has applied the collection of patches that David sent, these patches should apply cleanly on top of arm-soc.git qcom/soc. Can you apply them directly to the arm-soc tree?
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Quoted 14 lines · Stephen Boyd
Quoted 7 lines · Arnd Bergmann
Quoted 6 lines · Stephen Boyd
These patches allow the DT based MSM platforms to be built as part of the multi-platform kernel. I need acks from Chris Ball on the mmc patch and Rob/Dave on the drm patch. I dropped Arnd's ack on patch 6 because I've rebased that patch on top of the patchset David sent out (which this is in reply to). The rebase was fairly minor and the new patch for drm/msm is trivial. Please consider for v3.14.
Quoted 5 lines
Just for the record, I'm definitely happy with the way this is turning out, don't see my question on the serial driver as a NAK. I assume we will apply the patches for 3.14, but I first want to have a better understanding on where we are with the stuff that is already queued up for 3.14.
Quoted 4 lines
It would be great if we could get these patches in for 3.14. Now that Olof has applied the collection of patches that David sent, these patches should apply cleanly on top of arm-soc.git qcom/soc. Can you apply them directly to the arm-soc tree?
Yeah, we'll get to it in a bit.
-Olof
Quoted 15 lines · Olof Johansson
Quoted 14 lines · Stephen Boyd
Quoted 12 lines · Arnd Bergmann
Quoted 6 lines · Stephen Boyd
These patches allow the DT based MSM platforms to be built as part of the multi-platform kernel. I need acks from Chris Ball on the mmc patch and Rob/Dave on the drm patch. I dropped Arnd's ack on patch 6 because I've rebased that patch on top of the patchset David sent out (which this is in reply to). The rebase was fairly minor and the new patch for drm/msm is trivial. Please consider for v3.14.
Just for the record, I'm definitely happy with the way this is turning out, don't see my question on the serial driver as a NAK. I assume we will apply the patches for 3.14, but I first want to have a better understanding on where we are with the stuff that is already queued up for 3.14.
Quoted 6 lines
Quoted 4 lines
It would be great if we could get these patches in for 3.14. Now that Olof has applied the collection of patches that David sent, these patches should apply cleanly on top of arm-soc.git qcom/soc. Can you apply them directly to the arm-soc tree?
Yeah, we'll get to it in a bit.
Ok, I've applied all but the DRM patch since Rob needed that respun. It should probably be merged through the DRM tree given the conflicts.
-Olof
Re: [PATCH v2 6/7] drm/msm: Drop unnecessary mach include
In reply to Stephen BoydQuoted 7 lines · Stephen Boyd
Quoted 6 lines · Rob Clark
Quoted 5 lines · Rob Clark
Quoted 3 lines · Stephen Boyd
This file doesn't use the
clk_reset()API that is exposed in mach-msm'smach/clk.hfile. Remove the include so that this driver can be compiled as part of the multi-platform kernel.
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
Thanks!
Signed-off-by Rob Clark <[email protected]>I think you mean Acked-by? Signed-off-by usually means you're sending the patch along.
I've held off applying this, but I have applied the others -- please merge this through the DRM tree since it will need to go on top of changes there.
That also means that enabling the MSM DTM driver in a multiplatform kernel will cause build breakages until the equivalent patch has been picked up. Since it's not enabled by any defconfigs I'm not too worried, but it will show up on randconfigs.
-Olof
Re: [PATCH v2 6/7] drm/msm: Drop unnecessary mach include
Quoted 12 lines · Olof Johansson
Quoted 11 lines · Stephen Boyd
Quoted 8 lines · Rob Clark
Quoted 7 lines · Rob Clark
Quoted 3 lines · Stephen Boyd
This file doesn't use the
clk_reset()API that is exposed in mach-msm'smach/clk.hfile. Remove the include so that this driver can be compiled as part of the multi-platform kernel.Thanks!
Signed-off-by Rob Clark <[email protected]>I think you mean Acked-by? Signed-off-by usually means you're sending the patch along.
Quoted 9 lines
I've held off applying this, but I have applied the others -- please merge this through the DRM tree since it will need to go on top of changes there.
That also means that enabling the MSM DTM driver in a multiplatform kernel will cause build breakages until the equivalent patch has been picked up. Since it's not enabled by any defconfigs I'm not too worried, but it will show up on randconfigs.
Ok. I think Rob's still planning to send his patch through the DRM tree so we should be ok on the other end of the merge window.
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation