Skip to content

Commit aebbfaf

Browse files
torvaldstorvalds
committed
Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC platform updates from Arnd Bergmann: "The APM X-Gene platform is now maintained by folks from Ampere computing that took over the product line a while ago, this gets reflected in the MAINTAINERS file. Cleanups continue on the older mach-davinci and mach-pxa platform, to get them to be more like the modern ones. For pxa, we now remove the Raumfeld platform code as it now works with device tree based booting. i.MX adds a couple new features for the i.MX7ULP SoC Mediatek gains support for a new SoC: MT7629 is a new wireless router platform, following MT7623. Aside from those, there are the usual minor cleanups and bugfixes across several platforms" * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (49 commits) MAINTAINERS: Update Ampere email address usb: ohci-da8xx: remove unused callbacks from platform data ARM: davinci: da830-evm: remove legacy usb helpers ARM: davinci: omapl138-hawk: remove legacy usb helpers usb: ohci-da8xx: add vbus and overcurrent gpios ARM: davinci: da830-evm: use gpio lookup entries for usb gpios ARM: davinci: omapl138-hawk: use gpio lookup entries for usb gpios usb: ohci-da8xx: add a helper pointer to &pdev->dev usb: ohci-da8xx: add a new line after local variables arm64: meson: enable g12a clock controller MAINTAINERS: Add entry for uDPU board ARM: davinci: da850-evm: use GPIO hogs instead of the legacy API arm: mediatek: add MT7629 smp bring up code Revert "ARM: mediatek: add MT7623a smp bringup code" dt-bindings: soc: fix typo of MT8173 power dt-bindings ARM: meson: remove COMMON_CLK_AMLOGIC selection arm64: meson: remove COMMON_CLK_AMLOGIC selection ARM: lpc32xx: remove platform data of ARM PL111 LCD controller ARM: lpc32xx: remove platform data of ARM PL180 SD/MMC controller ARM: lpc32xx: Use kmemdup to replace duplicating its implementation ...
2 parents fa29f5b + 49b35cd commit aebbfaf

40 files changed

+389
-1867
lines changed

‎MAINTAINERS

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,34 +1036,34 @@ F: drivers/net/appletalk/
10361036
F: net/appletalk/
10371037

10381038
APPLIED MICRO (APM) X-GENE DEVICE TREE SUPPORT
1039-
M: Duc Dang <dhdang@apm.com>
1039+
M: Khuong Dinh <khuong@os.amperecomputing.com>
10401040
S: Supported
10411041
F: arch/arm64/boot/dts/apm/
10421042

10431043
APPLIED MICRO (APM) X-GENE SOC EDAC
1044-
M: Loc Ho <lho@apm.com>
1044+
M: Khuong Dinh <khuong@os.amperecomputing.com>
10451045
S: Supported
10461046
F: drivers/edac/xgene_edac.c
10471047
F: Documentation/devicetree/bindings/edac/apm-xgene-edac.txt
10481048

10491049
APPLIED MICRO (APM) X-GENE SOC ETHERNET (V2) DRIVER
1050-
M: Iyappan Subramanian <isubramanian@apm.com>
1051-
M: Keyur Chudgar <kchudgar@apm.com>
1050+
M: Iyappan Subramanian <iyappan@os.amperecomputing.com>
1051+
M: Keyur Chudgar <keyur@os.amperecomputing.com>
10521052
S: Supported
10531053
F: drivers/net/ethernet/apm/xgene-v2/
10541054

10551055
APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER
1056-
M: Iyappan Subramanian <isubramanian@apm.com>
1057-
M: Keyur Chudgar <kchudgar@apm.com>
1058-
M: Quan Nguyen <qnguyen@apm.com>
1056+
M: Iyappan Subramanian <iyappan@os.amperecomputing.com>
1057+
M: Keyur Chudgar <keyur@os.amperecomputing.com>
1058+
M: Quan Nguyen <quan@os.amperecomputing.com>
10591059
S: Supported
10601060
F: drivers/net/ethernet/apm/xgene/
10611061
F: drivers/net/phy/mdio-xgene.c
10621062
F: Documentation/devicetree/bindings/net/apm-xgene-enet.txt
10631063
F: Documentation/devicetree/bindings/net/apm-xgene-mdio.txt
10641064

10651065
APPLIED MICRO (APM) X-GENE SOC PMU
1066-
M: Tai Nguyen <ttnguyen@apm.com>
1066+
M: Khuong Dinh <khuong@os.amperecomputing.com>
10671067
S: Supported
10681068
F: drivers/perf/xgene_pmu.c
10691069
F: Documentation/perf/xgene-pmu.txt
@@ -1530,21 +1530,14 @@ ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
15301530
M: Shawn Guo <shawnguo@kernel.org>
15311531
M: Sascha Hauer <s.hauer@pengutronix.de>
15321532
R: Pengutronix Kernel Team <kernel@pengutronix.de>
1533-
R: Fabio Estevam <fabio.estevam@nxp.com>
1533+
R: Fabio Estevam <festevam@gmail.com>
15341534
R: NXP Linux Team <linux-imx@nxp.com>
15351535
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
15361536
S: Maintained
15371537
T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
1538-
F: arch/arm/mach-imx/
1539-
F: arch/arm/mach-mxs/
1540-
F: arch/arm/boot/dts/imx*
1541-
F: arch/arm/configs/imx*_defconfig
1542-
F: arch/arm64/boot/dts/freescale/imx*
1543-
F: drivers/clk/imx/
1544-
F: drivers/firmware/imx/
1545-
F: drivers/soc/imx/
1546-
F: include/linux/firmware/imx/
1547-
F: include/soc/imx/
1538+
N: imx
1539+
N: mxs
1540+
X: drivers/media/i2c/
15481541

15491542
ARM/FREESCALE VYBRID ARM ARCHITECTURE
15501543
M: Shawn Guo <shawnguo@kernel.org>
@@ -2108,6 +2101,8 @@ Q: http://patchwork.kernel.org/project/linux-renesas-soc/list/
21082101
T: git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
21092102
S: Supported
21102103
F: arch/arm/boot/dts/emev2*
2104+
F: arch/arm/boot/dts/gr-peach*
2105+
F: arch/arm/boot/dts/iwg20d-q7*
21112106
F: arch/arm/boot/dts/r7s*
21122107
F: arch/arm/boot/dts/r8a*
21132108
F: arch/arm/boot/dts/r9a*
@@ -9888,6 +9883,11 @@ S: Maintained
98889883
F: drivers/mtd/nand/raw/meson_*
98899884
F: Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt
98909885

9886+
METHODE UDPU SUPPORT
9887+
M: Vladimir Vid <vladimir.vid@sartura.hr>
9888+
S: Maintained
9889+
F: arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
9890+
98919891
MICROBLAZE ARCHITECTURE
98929892
M: Michal Simek <monstr@monstr.eu>
98939893
W: http://www.monstr.eu/fdt/
@@ -11613,7 +11613,7 @@ F: Documentation/devicetree/bindings/pci/altera-pcie.txt
1161311613
F: drivers/pci/controller/pcie-altera.c
1161411614

1161511615
PCI DRIVER FOR APPLIEDMICRO XGENE
11616-
M: Tanmay Inamdar <tinamdar@apm.com>
11616+
M: Toan Le <toan@os.amperecomputing.com>
1161711617
L: linux-pci@vger.kernel.org
1161811618
L: linux-arm-kernel@lists.infradead.org
1161911619
S: Maintained
@@ -11791,7 +11791,7 @@ F: Documentation/devicetree/bindings/pci/altera-pcie-msi.txt
1179111791
F: drivers/pci/controller/pcie-altera-msi.c
1179211792

1179311793
PCI MSI DRIVER FOR APPLIEDMICRO XGENE
11794-
M: Duc Dang <dhdang@apm.com>
11794+
M: Toan Le <toan@os.amperecomputing.com>
1179511795
L: linux-pci@vger.kernel.org
1179611796
L: linux-arm-kernel@lists.infradead.org
1179711797
S: Maintained
@@ -14759,7 +14759,7 @@ S: Maintained
1475914759
F: drivers/tty/serial/8250/8250_dw.c
1476014760

1476114761
SYNOPSYS DESIGNWARE APB GPIO DRIVER
14762-
M: Hoan Tran <hotran@apm.com>
14762+
M: Hoan Tran <hoan@os.amperecomputing.com>
1476314763
L: linux-gpio@vger.kernel.org
1476414764
S: Maintained
1476514765
F: drivers/gpio/gpio-dwapb.c

‎arch/arm/configs/pxa_defconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@ CONFIG_MACH_MIOA701=y
6666
CONFIG_PXA_EZX=y
6767
CONFIG_MACH_MP900C=y
6868
CONFIG_ARCH_PXA_PALM=y
69-
CONFIG_MACH_RAUMFELD_RC=y
70-
CONFIG_MACH_RAUMFELD_CONNECTOR=y
71-
CONFIG_MACH_RAUMFELD_SPEAKER=y
7269
CONFIG_PXA_SHARPSL=y
7370
CONFIG_MACH_POODLE=y
7471
CONFIG_MACH_CORGI=y
@@ -498,7 +495,6 @@ CONFIG_SND_PXA2XX_SOC_E800=m
498495
CONFIG_SND_PXA2XX_SOC_EM_X270=m
499496
CONFIG_SND_PXA2XX_SOC_PALM27X=y
500497
CONFIG_SND_SOC_ZYLONITE=m
501-
CONFIG_SND_SOC_RAUMFELD=m
502498
CONFIG_SND_PXA2XX_SOC_HX4700=m
503499
CONFIG_SND_PXA2XX_SOC_MAGICIAN=m
504500
CONFIG_SND_PXA2XX_SOC_MIOA701=m

‎arch/arm/configs/raumfeld_defconfig

Lines changed: 0 additions & 197 deletions
This file was deleted.

0 commit comments

Comments
 (0)