Skip to content

Commit 6e207b8

Browse files
torvaldstorvalds
committed
Merge tag 'arm-soc-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC updates from Olof Johansson: "A few SoC (code) changes have queued up this cycle, mostly for minor changes and some refactoring and cleanup of legacy platforms. This branch also contains a few of the fixes that weren't sent in by the end of the release (all fairly minor). - Adding an additional maintainer for the TEE subsystem (Sumit Garg) - Quite a significant modernization of the IXP4xx platforms by Linus Walleij, revisiting with a new PCI host driver/binding, removing legacy mach/* include dependencies and moving platform detection/config to drivers/soc. Also some updates/cleanup of platform data. - Core power domain support for Tegra platforms, and some improvements in build test coverage by adding stubs for compile test targets. - A handful of updates to i.MX platforms, adding legacy (non-PSCI) SMP support on i.MX7D, SoC ID setup for i.MX50, removal of platform data and board fixups for iMX6/7. ... and a few smaller changes and fixes for Samsung, OMAP, Allwinner, Rockchip" * tag 'arm-soc-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (53 commits) MAINTAINERS: Add myself as TEE subsystem reviewer ixp4xx: fix spelling mistake in Kconfig "Devce" -> "Device" hw_random: ixp4xx: Add OF support hw_random: ixp4xx: Add DT bindings hw_random: ixp4xx: Turn into a module hw_random: ixp4xx: Use SPDX license tag hw_random: ixp4xx: enable compile-testing pata: ixp4xx: split platform data to its own header soc: ixp4xx: move cpu detection to linux/soc/ixp4xx/cpu.h PCI: ixp4xx: Add a new driver for IXP4xx PCI: ixp4xx: Add device tree bindings for IXP4xx ARM/ixp4xx: Make NEED_MACH_IO_H optional ARM/ixp4xx: Move the virtual IObases MAINTAINERS: ARM/MStar/Sigmastar SoCs: Add a link to the MStar tree ARM: debug: add UART early console support for MSTAR SoCs ARM: dts: ux500: Fix LED probing ARM: imx: add smp support for imx7d ARM: imx6q: drop of_platform_default_populate() from init_machine arm64: dts: rockchip: Update RK3399 PCI host bridge window to 32-bit address memory soc/tegra: fuse: Fix Tegra234-only builds ...
2 parents b6fd9e2 + 42accad commit 6e207b8

76 files changed

Lines changed: 1841 additions & 460 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/devicetree/bindings/pci/intel,ixp4xx-pci.yaml‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/pci/intel,ixp4xx-pci.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Intel IXP4xx PCI controller
8+
9+
maintainers:
10+
- Linus Walleij <linus.walleij@linaro.org>
11+
12+
description: PCI host controller found in the Intel IXP4xx SoC series.
13+
14+
allOf:
15+
- $ref: /schemas/pci/pci-bus.yaml#
16+
17+
properties:
18+
compatible:
19+
items:
20+
- enum:
21+
- intel,ixp42x-pci
22+
- intel,ixp43x-pci
23+
description: The two supported variants are ixp42x and ixp43x,
24+
though more variants may exist.
25+
26+
reg:
27+
items:
28+
- description: IXP4xx-specific registers
29+
30+
interrupts:
31+
items:
32+
- description: Main PCI interrupt
33+
- description: PCI DMA interrupt 1
34+
- description: PCI DMA interrupt 2
35+
36+
ranges:
37+
maxItems: 2
38+
description: Typically one memory range of 64MB and one IO
39+
space range of 64KB.
40+
41+
dma-ranges:
42+
maxItems: 1
43+
description: The DMA range tells the PCI host which addresses
44+
the RAM is at. It can map only 64MB so if the RAM is bigger
45+
than 64MB the DMA access has to be restricted to these
46+
addresses.
47+
48+
"#interrupt-cells": true
49+
50+
interrupt-map: true
51+
52+
interrupt-map-mask:
53+
items:
54+
- const: 0xf800
55+
- const: 0
56+
- const: 0
57+
- const: 7
58+
59+
required:
60+
- compatible
61+
- reg
62+
- dma-ranges
63+
- "#interrupt-cells"
64+
- interrupt-map
65+
- interrupt-map-mask
66+
67+
unevaluatedProperties: false
68+
69+
examples:
70+
- |
71+
pci@c0000000 {
72+
compatible = "intel,ixp43x-pci";
73+
reg = <0xc0000000 0x1000>;
74+
#address-cells = <3>;
75+
#size-cells = <2>;
76+
device_type = "pci";
77+
bus-range = <0x00 0xff>;
78+
79+
ranges =
80+
<0x02000000 0 0x48000000 0x48000000 0 0x04000000>,
81+
<0x01000000 0 0x00000000 0x4c000000 0 0x00010000>;
82+
dma-ranges =
83+
<0x02000000 0 0x00000000 0x00000000 0 0x04000000>;
84+
85+
#interrupt-cells = <1>;
86+
interrupt-map-mask = <0xf800 0 0 7>;
87+
interrupt-map =
88+
<0x0800 0 0 1 &gpio0 11 3>, /* INT A on slot 1 is irq 11 */
89+
<0x0800 0 0 2 &gpio0 10 3>, /* INT B on slot 1 is irq 10 */
90+
<0x0800 0 0 3 &gpio0 9 3>, /* INT C on slot 1 is irq 9 */
91+
<0x0800 0 0 4 &gpio0 8 3>, /* INT D on slot 1 is irq 8 */
92+
<0x1000 0 0 1 &gpio0 10 3>, /* INT A on slot 2 is irq 10 */
93+
<0x1000 0 0 2 &gpio0 9 3>, /* INT B on slot 2 is irq 9 */
94+
<0x1000 0 0 3 &gpio0 8 3>, /* INT C on slot 2 is irq 8 */
95+
<0x1000 0 0 4 &gpio0 11 3>, /* INT D on slot 2 is irq 11 */
96+
<0x1800 0 0 1 &gpio0 9 3>, /* INT A on slot 3 is irq 9 */
97+
<0x1800 0 0 2 &gpio0 8 3>, /* INT B on slot 3 is irq 8 */
98+
<0x1800 0 0 3 &gpio0 11 3>, /* INT C on slot 3 is irq 11 */
99+
<0x1800 0 0 4 &gpio0 10 3>; /* INT D on slot 3 is irq 10 */
100+
};

‎Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/rng/intel,ixp46x-rng.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Intel IXP46x RNG bindings
8+
9+
description: |
10+
The Intel IXP46x has a random number generator at a fixed physical
11+
location in memory. Each read is guaranteed to provide a unique
12+
32 bit random number.
13+
14+
maintainers:
15+
- Linus Walleij <linus.walleij@linaro.org>
16+
17+
properties:
18+
compatible:
19+
const: intel,ixp46x-rng
20+
21+
reg:
22+
maxItems: 1
23+
24+
required:
25+
- compatible
26+
- reg
27+
28+
additionalProperties: false
29+
30+
examples:
31+
- |
32+
rng@70002100 {
33+
compatible = "intel,ixp46x-rng";
34+
reg = <0x70002100 4>;
35+
};
36+

‎MAINTAINERS‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2210,6 +2210,7 @@ M: Daniel Palmer <daniel@thingy.jp>
22102210
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
22112211
S: Maintained
22122212
W: http://linux-chenxing.org/
2213+
T: git git://github.com/linux-chenxing/linux.git
22132214
F: Documentation/devicetree/bindings/arm/mstar/*
22142215
F: Documentation/devicetree/bindings/clock/mstar,msc313-mpll.yaml
22152216
F: Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml
@@ -2479,9 +2480,12 @@ F: drivers/*/*/*s3c24*
24792480
F: drivers/*/*s3c24*
24802481
F: drivers/*/*s3c64xx*
24812482
F: drivers/*/*s5pv210*
2483+
F: drivers/clocksource/samsung_pwm_timer.c
24822484
F: drivers/memory/samsung/
2485+
F: drivers/pwm/pwm-samsung.c
24832486
F: drivers/soc/samsung/
24842487
F: drivers/tty/serial/samsung*
2488+
F: include/clocksource/samsung_pwm.h
24852489
F: include/linux/platform_data/*s3c*
24862490
F: include/linux/serial_s3c.h
24872491
F: include/linux/soc/samsung/
@@ -9381,6 +9385,7 @@ F: include/linux/soc/ixp4xx/qmgr.h
93819385
INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
93829386
M: Deepak Saxena <dsaxena@plexity.net>
93839387
S: Maintained
9388+
F: Documentation/devicetree/bindings/display/intel,ixp46x-rng.yaml
93849389
F: drivers/char/hw_random/ixp4xx-rng.c
93859390

93869391
INTEL KEEM BAY DRM DRIVER
@@ -13510,12 +13515,6 @@ L: linux-omap@vger.kernel.org
1351013515
S: Maintained
1351113516
F: arch/arm/mach-omap2/omap_hwmod*data*
1351213517

13513-
OMAP HWMOD DATA FOR OMAP4-BASED DEVICES
13514-
M: Benoît Cousson <bcousson@baylibre.com>
13515-
L: linux-omap@vger.kernel.org
13516-
S: Maintained
13517-
F: arch/arm/mach-omap2/omap_hwmod_44xx_data.c
13518-
1351913518
OMAP HWMOD SUPPORT
1352013519
M: Benoît Cousson <bcousson@baylibre.com>
1352113520
M: Paul Walmsley <paul@pwsan.com>
@@ -14179,6 +14178,12 @@ S: Maintained
1417914178
F: Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml
1418014179
F: drivers/pci/controller/dwc/pcie-fu740.c
1418114180

14181+
PCI DRIVER FOR INTEL IXP4XX
14182+
M: Linus Walleij <linus.walleij@linaro.org>
14183+
S: Maintained
14184+
F: Documentation/devicetree/bindings/pci/intel,ixp4xx-pci.yaml
14185+
F: drivers/pci/controller/pci-ixp4xx.c
14186+
1418214187
PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
1418314188
M: Jonathan Derrick <jonathan.derrick@intel.com>
1418414189
L: linux-pci@vger.kernel.org
@@ -18126,6 +18131,7 @@ F: include/media/i2c/tw9910.h
1812618131

1812718132
TEE SUBSYSTEM
1812818133
M: Jens Wiklander <jens.wiklander@linaro.org>
18134+
R: Sumit Garg <sumit.garg@linaro.org>
1812918135
L: op-tee@lists.trustedfirmware.org
1813018136
S: Maintained
1813118137
F: Documentation/staging/tee.rst

‎arch/arm/Kconfig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,8 @@ config ARCH_IXP4XX
394394
select HAVE_PCI
395395
select IXP4XX_IRQ
396396
select IXP4XX_TIMER
397-
select NEED_MACH_IO_H
397+
# With the new PCI driver this is not needed
398+
select NEED_MACH_IO_H if PCI_IXP4XX_LEGACY
398399
select USB_EHCI_BIG_ENDIAN_DESC
399400
select USB_EHCI_BIG_ENDIAN_MMIO
400401
help

‎arch/arm/Kconfig.debug‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,14 @@ choice
609609
when u-boot hands over to the kernel, the system
610610
silently crashes, with no serial output at all.
611611

612+
config DEBUG_MSTARV7_PMUART
613+
bool "Kernel low-level debugging messages via MSTARV7 PM UART"
614+
depends on ARCH_MSTARV7
615+
select DEBUG_UART_8250
616+
help
617+
Say Y here if you want kernel low-level debugging support
618+
for MSTAR ARMv7-based platforms on PM UART.
619+
612620
config DEBUG_MT6589_UART0
613621
bool "Mediatek mt6589 UART0"
614622
depends on ARCH_MEDIATEK
@@ -1607,6 +1615,7 @@ config DEBUG_UART_PHYS
16071615
default 0x18000400 if DEBUG_BCM_HR2
16081616
default 0x18023000 if DEBUG_BCM_IPROC_UART3
16091617
default 0x1c090000 if DEBUG_VEXPRESS_UART0_RS1
1618+
default 0x1f221000 if DEBUG_MSTARV7_PMUART
16101619
default 0x20001000 if DEBUG_HIP01_UART
16111620
default 0x20060000 if DEBUG_RK29_UART0
16121621
default 0x20064000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
@@ -1724,6 +1733,7 @@ config DEBUG_UART_VIRT
17241733
default 0xf0100000 if DEBUG_DIGICOLOR_UA0
17251734
default 0xf01fb000 if DEBUG_NOMADIK_UART
17261735
default 0xf0201000 if DEBUG_BCM2835 || DEBUG_BCM2836
1736+
default 0xf0221000 if DEBUG_MSTARV7_PMUART
17271737
default 0xf1000300 if DEBUG_BCM_5301X
17281738
default 0xf1000400 if DEBUG_BCM_HR2
17291739
default 0xf1002000 if DEBUG_MT8127_UART0
@@ -1805,8 +1815,8 @@ config DEBUG_UART_VIRT
18051815
default 0xfedc0000 if DEBUG_EP93XX
18061816
default 0xfee003f8 if DEBUG_FOOTBRIDGE_COM1
18071817
default 0xfee20000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART
1808-
default 0xfef00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN
1809-
default 0xfef00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN
1818+
default 0xfec00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN
1819+
default 0xfec00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN
18101820
default 0xfef36000 if DEBUG_HIGHBANK_UART
18111821
default 0xfefb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1
18121822
default 0xfefb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2
@@ -1829,6 +1839,7 @@ config DEBUG_UART_8250_SHIFT
18291839
default 0 if DEBUG_FOOTBRIDGE_COM1 || ARCH_IOP32X || DEBUG_BCM_5301X || \
18301840
DEBUG_BCM_HR2 || DEBUG_OMAP7XXUART1 || DEBUG_OMAP7XXUART2 || \
18311841
DEBUG_OMAP7XXUART3
1842+
default 3 if DEBUG_MSTARV7_PMUART
18321843
default 2
18331844

18341845
config DEBUG_UART_8250_WORD

‎arch/arm/boot/dts/am5718.dtsi‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,13 @@
1717
* VCP1, VCP2
1818
* MLB
1919
* ISS
20-
* USB3, USB4
20+
* USB3
2121
*/
2222

2323
&usb3_tm {
2424
status = "disabled";
2525
};
2626

27-
&usb4_tm {
28-
status = "disabled";
29-
};
30-
3127
&atl_tm {
3228
status = "disabled";
3329
};

‎arch/arm/boot/dts/dra7-l4.dtsi‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4129,28 +4129,6 @@
41294129
};
41304130
};
41314131

4132-
usb4_tm: target-module@140000 { /* 0x48940000, ap 75 3c.0 */
4133-
compatible = "ti,sysc-omap4", "ti,sysc";
4134-
reg = <0x140000 0x4>,
4135-
<0x140010 0x4>;
4136-
reg-names = "rev", "sysc";
4137-
ti,sysc-mask = <SYSC_OMAP4_DMADISABLE>;
4138-
ti,sysc-midle = <SYSC_IDLE_FORCE>,
4139-
<SYSC_IDLE_NO>,
4140-
<SYSC_IDLE_SMART>,
4141-
<SYSC_IDLE_SMART_WKUP>;
4142-
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
4143-
<SYSC_IDLE_NO>,
4144-
<SYSC_IDLE_SMART>,
4145-
<SYSC_IDLE_SMART_WKUP>;
4146-
/* Domains (P, C): l3init_pwrdm, l3init_clkdm */
4147-
clocks = <&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS4_CLKCTRL 0>;
4148-
clock-names = "fck";
4149-
#address-cells = <1>;
4150-
#size-cells = <1>;
4151-
ranges = <0x0 0x140000 0x20000>;
4152-
};
4153-
41544132
target-module@170000 { /* 0x48970000, ap 21 0a.0 */
41554133
compatible = "ti,sysc-omap4", "ti,sysc";
41564134
reg = <0x170010 0x4>;

‎arch/arm/boot/dts/dra71x.dtsi‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,3 @@
1111
&rtctarget {
1212
status = "disabled";
1313
};
14-
15-
&usb4_tm {
16-
status = "disabled";
17-
};

‎arch/arm/boot/dts/dra72x.dtsi‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,3 @@
108108
&pcie2_rc {
109109
compatible = "ti,dra726-pcie-rc", "ti,dra7-pcie";
110110
};
111-
112-
&usb4_tm {
113-
status = "disabled";
114-
};

0 commit comments

Comments
 (0)