[PATCH] ARM: qcom: Enable basic support for Qualcomm platforms in multi_v7_defconfig

[PATCH] ARM: qcom: Enable basic support for Qualcomm platforms in multi_v7_defconfig

[Kumar Gala]

Enable support for the MSM8x60, MSM8960, and MSM8974 SoCs, clocks and
serial console as part of the standard multi_v7_defconfig.

Signed-off-by: Kumar Gala <galak@codeaurora.org>
---

I leave this to the arm-soc guys to apply because of possible conflicts
with other updates to multi_v7_defconfig.

- k

 arch/arm/configs/multi_v7_defconfig | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 56549f1..145bf97 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -9,8 +9,6 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_ARMADA_370=y
-CONFIG_MACH_ARMADA_375=y
-CONFIG_MACH_ARMADA_38X=y
 CONFIG_MACH_ARMADA_XP=y
 CONFIG_ARCH_BCM=y
 CONFIG_ARCH_BCM_MOBILE=y
@@ -31,8 +29,12 @@ CONFIG_ARCH_OMAP3=y
 CONFIG_ARCH_OMAP4=y
 CONFIG_SOC_OMAP5=y
 CONFIG_SOC_AM33XX=y
-CONFIG_SOC_DRA7XX=y
 CONFIG_SOC_AM43XX=y
+CONFIG_SOC_DRA7XX=y
+CONFIG_ARCH_QCOM=y
+CONFIG_ARCH_MSM8X60=y
+CONFIG_ARCH_MSM8960=y
+CONFIG_ARCH_MSM8974=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_PLAT_SPEAR=y
@@ -148,6 +150,8 @@ CONFIG_SERIAL_SIRFSOC_CONSOLE=y
 CONFIG_SERIAL_TEGRA=y
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_SERIAL_MSM=y
+CONFIG_SERIAL_MSM_CONSOLE=y
 CONFIG_SERIAL_VT8500=y
 CONFIG_SERIAL_VT8500_CONSOLE=y
 CONFIG_SERIAL_OF_PLATFORM=y
@@ -160,7 +164,6 @@ CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
 CONFIG_SERIAL_ST_ASC=y
 CONFIG_SERIAL_ST_ASC_CONSOLE=y
 CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PINCTRL=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_MV64XXX=y
@@ -191,7 +194,6 @@ CONFIG_SENSORS_LM90=y
 CONFIG_THERMAL=y
 CONFIG_ARMADA_THERMAL=y
 CONFIG_WATCHDOG=y
-CONFIG_ORION_WATCHDOG=y
 CONFIG_MFD_AS3722=y
 CONFIG_MFD_CROS_EC=y
 CONFIG_MFD_CROS_EC_SPI=y
@@ -298,6 +300,10 @@ CONFIG_MFD_NVEC=y
 CONFIG_KEYBOARD_NVEC=y
 CONFIG_SERIO_NVEC_PS2=y
 CONFIG_NVEC_POWER=y
+CONFIG_COMMON_CLK_QCOM=y
+CONFIG_MSM_GCC_8660=y
+CONFIG_MSM_MMCC_8960=y
+CONFIG_MSM_MMCC_8974=y
 CONFIG_TEGRA_IOMMU_GART=y
 CONFIG_TEGRA_IOMMU_SMMU=y
 CONFIG_MEMORY=y
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

[PATCH] ARM: qcom: Enable basic support for Qualcomm platforms in multi_v7_defconfig

[Kevin Hilman]

Kumar Gala <galak@codeaurora.org> writes:

> Enable support for the MSM8x60, MSM8960, and MSM8974 SoCs, clocks and
> serial console as part of the standard multi_v7_defconfig.
>
> Signed-off-by: Kumar Gala <galak@codeaurora.org>
> ---
>
> I leave this to the arm-soc guys to apply because of possible conflicts
> with other updates to multi_v7_defconfig.

Seem to be a handful of !qcom changes here, probably resulting from a
run of 'make savedefconfig' without all the new changes in.

I've thinned this out to only the qcom changes and applied the following
to next/boards.  I think it's better to do any 'make savedefconfig'
cleanups as a separate, cleanup-only patch as needed.

Kevin


>From 60476e4ad5a1369467ab8a061ae8ce601478646d Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@codeaurora.org>
Date: Tue, 25 Feb 2014 14:34:05 -0600
Subject: [PATCH] ARM: qcom: Enable basic support for Qualcomm platforms in
 multi_v7_defconfig

Enable support for the MSM8x60, MSM8960, and MSM8974 SoCs, clocks and
serial console as part of the standard multi_v7_defconfig.

Signed-off-by: Kumar Gala <galak@codeaurora.org>
[khilman: removed non-qcom changes]
Signed-off-by: Kevin Hilman <khilman@linaro.org>
---
 arch/arm/configs/multi_v7_defconfig | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 56549f178fe3..64e850d4896c 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -33,6 +33,10 @@ CONFIG_SOC_OMAP5=y
 CONFIG_SOC_AM33XX=y
 CONFIG_SOC_DRA7XX=y
 CONFIG_SOC_AM43XX=y
+CONFIG_ARCH_QCOM=y
+CONFIG_ARCH_MSM8X60=y
+CONFIG_ARCH_MSM8960=y
+CONFIG_ARCH_MSM8974=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_PLAT_SPEAR=y
@@ -148,6 +152,8 @@ CONFIG_SERIAL_SIRFSOC_CONSOLE=y
 CONFIG_SERIAL_TEGRA=y
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_SERIAL_MSM=y
+CONFIG_SERIAL_MSM_CONSOLE=y
 CONFIG_SERIAL_VT8500=y
 CONFIG_SERIAL_VT8500_CONSOLE=y
 CONFIG_SERIAL_OF_PLATFORM=y
@@ -298,6 +304,10 @@ CONFIG_MFD_NVEC=y
 CONFIG_KEYBOARD_NVEC=y
 CONFIG_SERIO_NVEC_PS2=y
 CONFIG_NVEC_POWER=y
+CONFIG_COMMON_CLK_QCOM=y
+CONFIG_MSM_GCC_8660=y
+CONFIG_MSM_MMCC_8960=y
+CONFIG_MSM_MMCC_8974=y
 CONFIG_TEGRA_IOMMU_GART=y
 CONFIG_TEGRA_IOMMU_SMMU=y
 CONFIG_MEMORY=y
-- 
1.8.3

[PATCH] ARM: qcom: Enable basic support for Qualcomm platforms in multi_v7_defconfig

[Kumar Gala]

On Feb 26, 2014, at 5:43 PM, Kevin Hilman <khilman@linaro.org> wrote:

> Kumar Gala <galak@codeaurora.org> writes:
> 
>> Enable support for the MSM8x60, MSM8960, and MSM8974 SoCs, clocks and
>> serial console as part of the standard multi_v7_defconfig.
>> 
>> Signed-off-by: Kumar Gala <galak@codeaurora.org>
>> ---
>> 
>> I leave this to the arm-soc guys to apply because of possible conflicts
>> with other updates to multi_v7_defconfig.
> 
> Seem to be a handful of !qcom changes here, probably resulting from a
> run of 'make savedefconfig' without all the new changes in.
> 
> I've thinned this out to only the qcom changes and applied the following
> to next/boards.  I think it's better to do any 'make savedefconfig'
> cleanups as a separate, cleanup-only patch as needed.
> 
> Kevin

I had it as two separate patches in my tree, but merged before sending, wasn?t sure how defconfig updates where desired.  Will do so in the future.

Now if you guys can just merge the 'qcom-dt-for-3.15? pull request ;)

- k

-- 
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation

[PATCH] ARM: qcom: Enable basic support for Qualcomm platforms in multi_v7_defconfig

[Kevin Hilman]

Hi Kumar,

Kevin Hilman <khilman@linaro.org> writes:

> Kumar Gala <galak@codeaurora.org> writes:
>
>> Enable support for the MSM8x60, MSM8960, and MSM8974 SoCs, clocks and
>> serial console as part of the standard multi_v7_defconfig.
>>
>> Signed-off-by: Kumar Gala <galak@codeaurora.org>
>> ---
>>
>> I leave this to the arm-soc guys to apply because of possible conflicts
>> with other updates to multi_v7_defconfig.
>
> Seem to be a handful of !qcom changes here, probably resulting from a
> run of 'make savedefconfig' without all the new changes in.
>
> I've thinned this out to only the qcom changes and applied the following
> to next/boards.  I think it's better to do any 'make savedefconfig'
> cleanups as a separate, cleanup-only patch as needed.

Bisecting a new boot failure on u8500/snowball came down to this patch.
Simply disabling CONFIG_ARCH_QCOM in mutli_v7_defconfig gets the
u8500/snowball booting again, so it looks like there may still be some
qcom specifics that are being run on non-qcom platforms with a
multi-platform config.

Could you audit for initcalls/drivers being initialized on non-qcom
SoCs?

Thanks,

Kevin

[PATCH] ARM: qcom: Enable basic support for Qualcomm platforms in multi_v7_defconfig

[Stephen Boyd]

On 02/28, Kevin Hilman wrote:
> Hi Kumar,
> 
> Kevin Hilman <khilman@linaro.org> writes:
> 
> > Kumar Gala <galak@codeaurora.org> writes:
> >
> >> Enable support for the MSM8x60, MSM8960, and MSM8974 SoCs, clocks and
> >> serial console as part of the standard multi_v7_defconfig.
> >>
> >> Signed-off-by: Kumar Gala <galak@codeaurora.org>
> >> ---
> >>
> >> I leave this to the arm-soc guys to apply because of possible conflicts
> >> with other updates to multi_v7_defconfig.
> >
> > Seem to be a handful of !qcom changes here, probably resulting from a
> > run of 'make savedefconfig' without all the new changes in.
> >
> > I've thinned this out to only the qcom changes and applied the following
> > to next/boards.  I think it's better to do any 'make savedefconfig'
> > cleanups as a separate, cleanup-only patch as needed.
> 
> Bisecting a new boot failure on u8500/snowball came down to this patch.
> Simply disabling CONFIG_ARCH_QCOM in mutli_v7_defconfig gets the
> u8500/snowball booting again, so it looks like there may still be some
> qcom specifics that are being run on non-qcom platforms with a
> multi-platform config.
> 
> Could you audit for initcalls/drivers being initialized on non-qcom
> SoCs?
> 

Can you try disabling CONFIG_ARCH_MSM8X60 and
CONFIG_ARCH_MSM8960? MY suspicion is the text offset movement is
causing problems, but I hope I'm wrong.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation

[PATCH] ARM: qcom: Enable basic support for Qualcomm platforms in multi_v7_defconfig

[Kevin Hilman]

Stephen Boyd <sboyd@codeaurora.org> writes:

> On 02/28, Kevin Hilman wrote:
>> Hi Kumar,
>> 
>> Kevin Hilman <khilman@linaro.org> writes:
>> 
>> > Kumar Gala <galak@codeaurora.org> writes:
>> >
>> >> Enable support for the MSM8x60, MSM8960, and MSM8974 SoCs, clocks and
>> >> serial console as part of the standard multi_v7_defconfig.
>> >>
>> >> Signed-off-by: Kumar Gala <galak@codeaurora.org>
>> >> ---
>> >>
>> >> I leave this to the arm-soc guys to apply because of possible conflicts
>> >> with other updates to multi_v7_defconfig.
>> >
>> > Seem to be a handful of !qcom changes here, probably resulting from a
>> > run of 'make savedefconfig' without all the new changes in.
>> >
>> > I've thinned this out to only the qcom changes and applied the following
>> > to next/boards.  I think it's better to do any 'make savedefconfig'
>> > cleanups as a separate, cleanup-only patch as needed.
>> 
>> Bisecting a new boot failure on u8500/snowball came down to this patch.
>> Simply disabling CONFIG_ARCH_QCOM in mutli_v7_defconfig gets the
>> u8500/snowball booting again, so it looks like there may still be some
>> qcom specifics that are being run on non-qcom platforms with a
>> multi-platform config.
>> 
>> Could you audit for initcalls/drivers being initialized on non-qcom
>> SoCs?
>> 
>
> Can you try disabling CONFIG_ARCH_MSM8X60 and
> CONFIG_ARCH_MSM8960? MY suspicion is the text offset movement is
> causing problems, but I hope I'm wrong.

Sorry to dash your hopes, but you're right.

Starting from a fresh multi_v7_defconfig and disabling those two Kconfig
options gets the snowball booting again on multi_v7_defconfig.

Kevin

[PATCH] ARM: qcom: Enable basic support for Qualcomm platforms in multi_v7_defconfig

[Kevin Hilman]

Kevin Hilman <khilman@linaro.org> writes:

> Stephen Boyd <sboyd@codeaurora.org> writes:
>
>> On 02/28, Kevin Hilman wrote:
>>> Hi Kumar,
>>> 
>>> Kevin Hilman <khilman@linaro.org> writes:
>>> 
>>> > Kumar Gala <galak@codeaurora.org> writes:
>>> >
>>> >> Enable support for the MSM8x60, MSM8960, and MSM8974 SoCs, clocks and
>>> >> serial console as part of the standard multi_v7_defconfig.
>>> >>
>>> >> Signed-off-by: Kumar Gala <galak@codeaurora.org>
>>> >> ---
>>> >>
>>> >> I leave this to the arm-soc guys to apply because of possible conflicts
>>> >> with other updates to multi_v7_defconfig.
>>> >
>>> > Seem to be a handful of !qcom changes here, probably resulting from a
>>> > run of 'make savedefconfig' without all the new changes in.
>>> >
>>> > I've thinned this out to only the qcom changes and applied the following
>>> > to next/boards.  I think it's better to do any 'make savedefconfig'
>>> > cleanups as a separate, cleanup-only patch as needed.
>>> 
>>> Bisecting a new boot failure on u8500/snowball came down to this patch.
>>> Simply disabling CONFIG_ARCH_QCOM in mutli_v7_defconfig gets the
>>> u8500/snowball booting again, so it looks like there may still be some
>>> qcom specifics that are being run on non-qcom platforms with a
>>> multi-platform config.
>>> 
>>> Could you audit for initcalls/drivers being initialized on non-qcom
>>> SoCs?
>>> 
>>
>> Can you try disabling CONFIG_ARCH_MSM8X60 and
>> CONFIG_ARCH_MSM8960? MY suspicion is the text offset movement is
>> causing problems, but I hope I'm wrong.
>
> Sorry to dash your hopes, but you're right.
>
> Starting from a fresh multi_v7_defconfig and disabling those two Kconfig
> options gets the snowball booting again on multi_v7_defconfig.

For the record...

After some discussion on IRC, we discovered this is because those
options add a 2Mb offset to TEXT_OFFSET, and my boot tool wasn't taking
that into account when creating the uImage to boot on snowball.

I guess it's time to upgrade u-boot on snowball with bootz support so it
can directly boot a zImage.

Kevin