Skip to content

Commit 9cf8d2b

Browse files
committed
Merge branch 'newsoc/pxa1908' into soc/newsoc
This adds initial support for the Marvell PXA1908 SoC and "samsung,coreprimevelte", a smartphone using the SoC. *Important note*: There is a regression on all of the v6.16 RCs where the board does not boot unrelated to the patches in this set. See: https://lore.kernel.org/regressions/3367665.aeNJFYEL58@radijator/ USB works and the phone can boot a rootfs from an SD card, but there are some warnings in the dmesg: During SMP initialization: [ 0.006519] CPU features: SANITY CHECK: Unexpected variation in SYS_CNTFRQ_EL0. Boot CPU: 0x000000018cba80, CPU1: 0x00000000000000 [ 0.006542] CPU features: Unsupported CPU feature variation detected. [ 0.006589] CPU1: Booted secondary processor 0x0000000001 [0x410fd032] [ 0.010710] Detected VIPT I-cache on CPU2 [ 0.010716] CPU features: SANITY CHECK: Unexpected variation in SYS_CNTFRQ_EL0. Boot CPU: 0x000000018cba80, CPU2: 0x00000000000000 [ 0.010758] CPU2: Booted secondary processor 0x0000000002 [0x410fd032] [ 0.014849] Detected VIPT I-cache on CPU3 [ 0.014855] CPU features: SANITY CHECK: Unexpected variation in SYS_CNTFRQ_EL0. Boot CPU: 0x000000018cba80, CPU3: 0x00000000000000 [ 0.014895] CPU3: Booted secondary processor 0x0000000003 [0x410fd032] SMMU probing fails: [ 0.101798] arm-smmu c0010000.iommu: probing hardware configuration... [ 0.101809] arm-smmu c0010000.iommu: SMMUv1 with: [ 0.101816] arm-smmu c0010000.iommu: no translation support! A 3.14 based Marvell tree is available on GitHub acorn-marvell/brillo_pxa_kernel, and a Samsung one on GitHub CoderCharmander/g361f-kernel. Andreas Färber attempted to upstream support for this SoC in 2017: https://lore.kernel.org/lkml/[email protected]/ Signed-off-by: Duje Mihanović <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]> * newsoc/pxa1908: MAINTAINERS: add myself as Marvell PXA1908 maintainer arm64: dts: Add DTS for Marvell PXA1908 and samsung,coreprimevelte arm64: Kconfig.platforms: Add config for Marvell PXA1908 platform dt-bindings: marvell: Document PXA1908 SoC and samsung,coreprimevelte dt-bindings: mmc: sdhci-pxa: restrict pinctrl to pxav1
2 parents 86731a2 + f3e7970 commit 9cf8d2b

File tree

8 files changed

+676
-16
lines changed

8 files changed

+676
-16
lines changed

Documentation/devicetree/bindings/arm/mrvl/mrvl.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ properties:
3535
- enum:
3636
- dell,wyse-ariel
3737
- const: marvell,mmp3
38+
- description: PXA1908 based boards
39+
items:
40+
- enum:
41+
- samsung,coreprimevelte
42+
- const: marvell,pxa1908
3843

3944
additionalProperties: true
4045

Documentation/devicetree/bindings/mmc/sdhci-pxa.yaml

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,26 @@ allOf:
3030
maxItems: 1
3131
reg-names:
3232
maxItems: 1
33+
- if:
34+
properties:
35+
compatible:
36+
contains:
37+
const: mrvl,pxav1-mmc
38+
then:
39+
properties:
40+
pinctrl-names:
41+
description:
42+
Optional for supporting PXA168 SDIO IRQ errata to switch CMD pin between
43+
SDIO CMD and GPIO mode.
44+
items:
45+
- const: default
46+
- const: state_cmd_gpio
47+
pinctrl-0:
48+
description:
49+
Should contain default pinctrl.
50+
pinctrl-1:
51+
description:
52+
Should switch CMD pin to GPIO mode as a high output.
3353

3454
properties:
3555
compatible:
@@ -62,22 +82,6 @@ properties:
6282
- const: io
6383
- const: core
6484

65-
pinctrl-names:
66-
description:
67-
Optional for supporting PXA168 SDIO IRQ errata to switch CMD pin between
68-
SDIO CMD and GPIO mode.
69-
items:
70-
- const: default
71-
- const: state_cmd_gpio
72-
73-
pinctrl-0:
74-
description:
75-
Should contain default pinctrl.
76-
77-
pinctrl-1:
78-
description:
79-
Should switch CMD pin to GPIO mode as a high output.
80-
8185
mrvl,clk-delay-cycles:
8286
description: Specify a number of cycles to delay for tuning.
8387
$ref: /schemas/types.yaml#/definitions/uint32

MAINTAINERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2787,6 +2787,14 @@ F: drivers/irqchip/irq-mvebu-*
27872787
F: drivers/pinctrl/mvebu/
27882788
F: drivers/rtc/rtc-armada38x.c
27892789

2790+
ARM/Marvell PXA1908 SOC support
2791+
M: Duje Mihanović <[email protected]>
2792+
L: [email protected] (moderated for non-subscribers)
2793+
S: Maintained
2794+
F: arch/arm64/boot/dts/marvell/mmp/
2795+
F: drivers/clk/mmp/clk-pxa1908*.c
2796+
F: include/dt-bindings/clock/marvell,pxa1908.h
2797+
27902798
ARM/Mediatek RTC DRIVER
27912799
M: Eddie Huang <[email protected]>
27922800
M: Sean Wang <[email protected]>

arch/arm64/Kconfig.platforms

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,14 @@ config ARCH_MESON
178178
This enables support for the arm64 based Amlogic SoCs
179179
such as the s905, S905X/D, S912, A113X/D or S905X/D2
180180

181+
config ARCH_MMP
182+
bool "Marvell MMP SoC Family"
183+
select PINCTRL
184+
select PINCTRL_SINGLE
185+
help
186+
This enables support for Marvell MMP SoC family, currently
187+
supporting PXA1908 aka IAP140.
188+
181189
config ARCH_MVEBU
182190
bool "Marvell EBU SoC Family"
183191
select ARMADA_AP806_SYSCON

arch/arm64/boot/dts/marvell/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,5 @@ dtb-$(CONFIG_ARCH_MVEBU) += cn9130-cf-base.dtb
3232
dtb-$(CONFIG_ARCH_MVEBU) += cn9130-cf-pro.dtb
3333
dtb-$(CONFIG_ARCH_MVEBU) += cn9131-cf-solidwan.dtb
3434
dtb-$(CONFIG_ARCH_MVEBU) += cn9132-clearfog.dtb
35+
36+
subdir-y += mmp
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
dtb-$(CONFIG_ARCH_MMP) += pxa1908-samsung-coreprimevelte.dtb

0 commit comments

Comments
 (0)