* linux-next: manual merge of the arm64 tree with the arm-soc tree
@ 2015-04-07 1:46 Stephen Rothwell
2015-04-07 9:13 ` Catalin Marinas
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2015-04-07 1:46 UTC (permalink / raw)
To: Catalin Marinas, Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Will Deacon, Abhimanyu Kapur, Kumar Gala
[-- Attachment #1: Type: text/plain, Size: 1719 bytes --]
Hi Catalin,
Today's linux-next merge of the arm64 tree got a conflict in
arch/arm64/configs/defconfig between commit d7f64a44356c ("arm64: qcom:
Add support for Qualcomm MSM8916 SoC") from the arm-soc tree and commit
475bfd3d67fa ("arm64: defconfig: updates for 4.1") from the arm64 tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm64/configs/defconfig
index 96bba367f80c,e07896c819ef..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -31,10 -31,12 +31,14 @@@ CONFIG_MODULES=
CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_DEADLINE is not set
+ CONFIG_ARCH_EXYNOS7=y
CONFIG_ARCH_FSL_LS2085A=y
CONFIG_ARCH_MEDIATEK=y
+CONFIG_ARCH_QCOM=y
+CONFIG_ARCH_SPRD=y
+ CONFIG_ARCH_SEATTLE=y
+ CONFIG_ARCH_TEGRA=y
+ CONFIG_ARCH_TEGRA_132_SOC=y
CONFIG_ARCH_THUNDER=y
CONFIG_ARCH_VEXPRESS=y
CONFIG_ARCH_XGENE=y
@@@ -105,9 -104,10 +111,11 @@@ CONFIG_VIRTIO_CONSOLE=
# CONFIG_HW_RANDOM is not set
CONFIG_SPI=y
CONFIG_SPI_PL022=y
+CONFIG_PINCTRL_MSM8916=y
CONFIG_GPIO_PL061=y
CONFIG_GPIO_XGENE=y
+ CONFIG_POWER_RESET_XGENE=y
+ CONFIG_POWER_RESET_SYSCON=y
# CONFIG_HWMON is not set
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@@ -133,10 -133,9 +141,11 @@@ CONFIG_MMC_SPI=
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_EFI=y
CONFIG_RTC_DRV_XGENE=y
+ CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO_BALLOON=y
CONFIG_VIRTIO_MMIO=y
+CONFIG_COMMON_CLK_QCOM=y
+CONFIG_MSM_GCC_8916=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_PHY_XGENE=y
CONFIG_EXT2_FS=y
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the arm64 tree with the arm-soc tree
2015-04-07 1:46 linux-next: manual merge of the arm64 tree with the arm-soc tree Stephen Rothwell
@ 2015-04-07 9:13 ` Catalin Marinas
0 siblings, 0 replies; 5+ messages in thread
From: Catalin Marinas @ 2015-04-07 9:13 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Olof Johansson, Arnd Bergmann, linux-arm-kernel, Kumar Gala,
linux-next, Will Deacon, linux-kernel, Abhimanyu Kapur
Hi Stephen,
On Tue, Apr 07, 2015 at 11:46:00AM +1000, Stephen Rothwell wrote:
> diff --cc arch/arm64/configs/defconfig
> index 96bba367f80c,e07896c819ef..000000000000
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@@ -31,10 -31,12 +31,14 @@@ CONFIG_MODULES=
> CONFIG_MODULE_UNLOAD=y
> # CONFIG_BLK_DEV_BSG is not set
> # CONFIG_IOSCHED_DEADLINE is not set
> + CONFIG_ARCH_EXYNOS7=y
> CONFIG_ARCH_FSL_LS2085A=y
> CONFIG_ARCH_MEDIATEK=y
> +CONFIG_ARCH_QCOM=y
> +CONFIG_ARCH_SPRD=y
> + CONFIG_ARCH_SEATTLE=y
> + CONFIG_ARCH_TEGRA=y
> + CONFIG_ARCH_TEGRA_132_SOC=y
> CONFIG_ARCH_THUNDER=y
> CONFIG_ARCH_VEXPRESS=y
> CONFIG_ARCH_XGENE=y
> @@@ -105,9 -104,10 +111,11 @@@ CONFIG_VIRTIO_CONSOLE=
> # CONFIG_HW_RANDOM is not set
> CONFIG_SPI=y
> CONFIG_SPI_PL022=y
> +CONFIG_PINCTRL_MSM8916=y
> CONFIG_GPIO_PL061=y
> CONFIG_GPIO_XGENE=y
> + CONFIG_POWER_RESET_XGENE=y
> + CONFIG_POWER_RESET_SYSCON=y
> # CONFIG_HWMON is not set
> CONFIG_REGULATOR=y
> CONFIG_REGULATOR_FIXED_VOLTAGE=y
> @@@ -133,10 -133,9 +141,11 @@@ CONFIG_MMC_SPI=
> CONFIG_RTC_CLASS=y
> CONFIG_RTC_DRV_EFI=y
> CONFIG_RTC_DRV_XGENE=y
> + CONFIG_VIRTIO_PCI=y
> CONFIG_VIRTIO_BALLOON=y
> CONFIG_VIRTIO_MMIO=y
> +CONFIG_COMMON_CLK_QCOM=y
> +CONFIG_MSM_GCC_8916=y
> # CONFIG_IOMMU_SUPPORT is not set
> CONFIG_PHY_XGENE=y
> CONFIG_EXT2_FS=y
It looks fine. Thanks.
--
Catalin
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: manual merge of the arm64 tree with the arm-soc tree
@ 2016-02-28 23:51 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2016-02-28 23:51 UTC (permalink / raw)
To: Catalin Marinas, Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Jayachandran C, Florian Fainelli, Will Deacon
Hi Catalin,
Today's linux-next merge of the arm64 tree got a conflict in:
arch/arm64/include/asm/cputype.h
between commit:
9eb8a2cdf65c ("arm64: cputype info for Broadcom Vulcan")
from the arm-soc tree and commit:
d5370f754875 ("arm64: prefetch: add alternative pattern for CPUs without a prefetcher")
from the arm64 tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc arch/arm64/include/asm/cputype.h
index 3dcecdf3d6ee,b3a83da152a7..000000000000
--- a/arch/arm64/include/asm/cputype.h
+++ b/arch/arm64/include/asm/cputype.h
@@@ -76,10 -80,20 +81,22 @@@
#define CAVIUM_CPU_PART_THUNDERX 0x0A1
+#define BRCM_CPU_PART_VULCAN 0x516
+
+ #define MIDR_CORTEX_A53 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A53)
+ #define MIDR_CORTEX_A57 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A57)
+ #define MIDR_THUNDERX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX)
+
#ifndef __ASSEMBLY__
+ #include <asm/sysreg.h>
+
+ #define read_cpuid(reg) ({ \
+ u64 __val; \
+ asm("mrs_s %0, " __stringify(reg) : "=r" (__val)); \
+ __val; \
+ })
+
/*
* The CPU ID never changes at run time, so we might as well tell the
* compiler that it's constant. Use this function to read the CPU ID
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the arm64 tree with the arm-soc tree
2015-03-30 23:21 Stephen Rothwell
@ 2015-03-31 14:04 ` Catalin Marinas
0 siblings, 0 replies; 5+ messages in thread
From: Catalin Marinas @ 2015-03-31 14:04 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Olof Johansson, Arnd Bergmann, linux-arm-kernel, Zhizhou Zhang,
linux-next, Will Deacon, linux-kernel
Hi Stephen,
On Tue, Mar 31, 2015 at 10:21:22AM +1100, Stephen Rothwell wrote:
> diff --cc arch/arm64/configs/defconfig
> index f3c8619f8fe1,e07896c819ef..000000000000
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@@ -31,9 -31,12 +31,13 @@@ CONFIG_MODULES=
> CONFIG_MODULE_UNLOAD=y
> # CONFIG_BLK_DEV_BSG is not set
> # CONFIG_IOSCHED_DEADLINE is not set
> + CONFIG_ARCH_EXYNOS7=y
> CONFIG_ARCH_FSL_LS2085A=y
> CONFIG_ARCH_MEDIATEK=y
> +CONFIG_ARCH_SPRD=y
> + CONFIG_ARCH_SEATTLE=y
> + CONFIG_ARCH_TEGRA=y
> + CONFIG_ARCH_TEGRA_132_SOC=y
> CONFIG_ARCH_THUNDER=y
> CONFIG_ARCH_VEXPRESS=y
> CONFIG_ARCH_XGENE=y
Thanks. Looks fine.
--
Catalin
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: manual merge of the arm64 tree with the arm-soc tree
@ 2015-03-30 23:21 Stephen Rothwell
2015-03-31 14:04 ` Catalin Marinas
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2015-03-30 23:21 UTC (permalink / raw)
To: Catalin Marinas, Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Will Deacon, Zhizhou Zhang
[-- Attachment #1: Type: text/plain, Size: 1052 bytes --]
Hi Catalin,
Today's linux-next merge of the arm64 tree got a conflict in
arch/arm64/configs/defconfig between commit c4bb799588f6 ("arm64: Add
support for Spreadtrum's Sharkl64 Platform in Kconfig and defconfig")
from the arm-soc tree and commit 475bfd3d67fa ("arm64: defconfig:
updates for 4.1") from the arm64 tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm64/configs/defconfig
index f3c8619f8fe1,e07896c819ef..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -31,9 -31,12 +31,13 @@@ CONFIG_MODULES=
CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_DEADLINE is not set
+ CONFIG_ARCH_EXYNOS7=y
CONFIG_ARCH_FSL_LS2085A=y
CONFIG_ARCH_MEDIATEK=y
+CONFIG_ARCH_SPRD=y
+ CONFIG_ARCH_SEATTLE=y
+ CONFIG_ARCH_TEGRA=y
+ CONFIG_ARCH_TEGRA_132_SOC=y
CONFIG_ARCH_THUNDER=y
CONFIG_ARCH_VEXPRESS=y
CONFIG_ARCH_XGENE=y
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-02-28 23:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-07 1:46 linux-next: manual merge of the arm64 tree with the arm-soc tree Stephen Rothwell
2015-04-07 9:13 ` Catalin Marinas
-- strict thread matches above, loose matches on Subject: below --
2016-02-28 23:51 Stephen Rothwell
2015-03-30 23:21 Stephen Rothwell
2015-03-31 14:04 ` Catalin Marinas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).