Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit a111ff6

Browse files
author
Tudor Ambarus
committed
Merge a5db8e4 ("Merge tag 'soc-arm-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc") into android-mainline
Steps on the way to v6.11-rc1 Change-Id: I07af6aac0533fec1aef53fd6c72a6f94b44b66f1 Signed-off-by: Tudor Ambarus <tudordana@google.com>
2 parents 16d16da + a5db8e4 commit a111ff6

File tree

23 files changed

+318
-443
lines changed

23 files changed

+318
-443
lines changed

‎CREDITS

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -796,6 +796,11 @@ E: luisfcorreia@gmail.com
796796
D: Ralink rt2x00 WLAN driver
797797
S: Belas, Portugal
798798

799+
N: Benoît Cousson
800+
E: bcousson@baylibre.com
801+
D: TI OMAP Devicetree platforms
802+
D: TI OMAP HWMOD boards
803+
799804
N: Alan Cox
800805
W: http://www.linux.org.uk/diary/
801806
D: Linux Networking (0.99.10->2.0.29)
@@ -4368,6 +4373,10 @@ N: Haojian Zhuang
43684373
E: haojian.zhuang@gmail.com
43694374
D: MMP support
43704375

4376+
N: Tsahee Zidenberg
4377+
E: tsahee@annapurnalabs.com
4378+
D: Annapurna Labs Alpine Architecture
4379+
43714380
N: Richard Zidlicky
43724381
E: rz@linux-m68k.org, rdzidlic@geocities.com
43734382
W: http://www.geocities.com/rdzidlic

‎Documentation/devicetree/bindings/arm/rtsm-dcscb.txt

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

‎MAINTAINERS

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1887,6 +1887,15 @@ F: include/dt-bindings/reset/actions,*
18871887
F: include/linux/soc/actions/
18881888
N: owl
18891889

1890+
ARM/AIROHA SOC SUPPORT
1891+
M: Matthias Brugger <matthias.bgg@gmail.com>
1892+
M: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
1893+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1894+
L: linux-mediatek@lists.infradead.org (moderated for non-subscribers)
1895+
S: Odd Fixes
1896+
F: arch/arm/boot/dts/airoha/
1897+
F: arch/arm64/boot/dts/airoha/
1898+
18901899
ARM/Allwinner SoC Clock Support
18911900
M: Emilio López <emilio@elopez.com.ar>
18921901
S: Maintained
@@ -1974,10 +1983,9 @@ F: drivers/soc/amlogic/
19741983
N: meson
19751984

19761985
ARM/Annapurna Labs ALPINE ARCHITECTURE
1977-
M: Tsahee Zidenberg <tsahee@annapurnalabs.com>
19781986
M: Antoine Tenart <atenart@kernel.org>
19791987
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1980-
S: Maintained
1988+
S: Odd Fixes
19811989
F: arch/arm/boot/dts/amazon/
19821990
F: arch/arm/mach-alpine/
19831991
F: arch/arm64/boot/dts/amazon/
@@ -16421,7 +16429,6 @@ S: Maintained
1642116429
F: arch/arm/*omap*/*clock*
1642216430

1642316431
OMAP DEVICE TREE SUPPORT
16424-
M: Benoît Cousson <bcousson@baylibre.com>
1642516432
M: Tony Lindgren <tony@atomide.com>
1642616433
L: linux-omap@vger.kernel.org
1642716434
L: devicetree@vger.kernel.org
@@ -16476,7 +16483,6 @@ S: Maintained
1647616483
F: arch/arm/mach-omap2/omap_hwmod*data*
1647716484

1647816485
OMAP HWMOD SUPPORT
16479-
M: Benoît Cousson <bcousson@baylibre.com>
1648016486
M: Paul Walmsley <paul@pwsan.com>
1648116487
L: linux-omap@vger.kernel.org
1648216488
S: Maintained
@@ -19423,6 +19429,7 @@ F: arch/riscv/boot/dts/
1942319429
X: arch/riscv/boot/dts/allwinner/
1942419430
X: arch/riscv/boot/dts/renesas/
1942519431
X: arch/riscv/boot/dts/sophgo/
19432+
X: arch/riscv/boot/dts/thead/
1942619433

1942719434
RISC-V PMU DRIVERS
1942819435
M: Atish Patra <atishp@atishpatra.org>
@@ -19439,6 +19446,7 @@ M: Guo Ren <guoren@kernel.org>
1943919446
M: Fu Wei <wefu@redhat.com>
1944019447
L: linux-riscv@lists.infradead.org
1944119448
S: Maintained
19449+
T: git https://github.com/pdp7/linux.git
1944219450
F: arch/riscv/boot/dts/thead/
1944319451

1944419452
RNBD BLOCK DRIVERS

‎arch/arm/configs/at91_dt_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ CONFIG_VIDEO_OV2640=m
143143
CONFIG_VIDEO_OV7740=m
144144
CONFIG_DRM=y
145145
CONFIG_DRM_ATMEL_HLCDC=y
146+
CONFIG_DRM_MICROCHIP_LVDS_SERIALIZER=y
146147
CONFIG_DRM_PANEL_SIMPLE=y
147148
CONFIG_DRM_PANEL_EDP=y
148149
CONFIG_FB_ATMEL=y

‎arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ CONFIG_SMSC911X=y
133133
# CONFIG_NET_VENDOR_STMICRO is not set
134134
CONFIG_MICREL_PHY=y
135135
CONFIG_AT803X_PHY=y
136+
CONFIG_DP83867_PHY=y
136137
CONFIG_CAN_FLEXCAN=y
137138
CONFIG_USB_PEGASUS=m
138139
CONFIG_USB_RTL8150=m
@@ -180,6 +181,7 @@ CONFIG_TOUCHSCREEN_SX8654=y
180181
CONFIG_TOUCHSCREEN_COLIBRI_VF50=y
181182
CONFIG_INPUT_MISC=y
182183
CONFIG_INPUT_MMA8450=y
184+
CONFIG_INPUT_GPIO_BEEPER=m
183185
CONFIG_SERIO_SERPORT=m
184186
# CONFIG_LEGACY_PTYS is not set
185187
CONFIG_SERIAL_IMX=y
@@ -211,6 +213,7 @@ CONFIG_GPIO_SIOX=m
211213
CONFIG_GPIO_VF610=y
212214
CONFIG_GPIO_MAX732X=y
213215
CONFIG_GPIO_PCA953X=y
216+
CONFIG_GPIO_PCA953X_IRQ=y
214217
CONFIG_GPIO_PCF857X=y
215218
CONFIG_GPIO_BD71815=y
216219
CONFIG_GPIO_STMPE=y
@@ -226,6 +229,7 @@ CONFIG_RN5T618_POWER=m
226229
CONFIG_SENSORS_MC13783_ADC=y
227230
CONFIG_SENSORS_GPIO_FAN=y
228231
CONFIG_SENSORS_IIO_HWMON=y
232+
CONFIG_SENSORS_LM75=m
229233
CONFIG_SENSORS_PWM_FAN=y
230234
CONFIG_SENSORS_SY7636A=y
231235
CONFIG_THERMAL_STATISTICS=y
@@ -282,6 +286,9 @@ CONFIG_DRM_PANEL_LVDS=y
282286
CONFIG_DRM_PANEL_SIMPLE=y
283287
CONFIG_DRM_PANEL_EDP=y
284288
CONFIG_DRM_PANEL_SEIKO_43WVF1G=y
289+
CONFIG_DRM_DISPLAY_CONNECTOR=y
290+
CONFIG_DRM_LVDS_CODEC=m
291+
CONFIG_DRM_SII902X=y
285292
CONFIG_DRM_TI_TFP410=y
286293
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
287294
CONFIG_DRM_DW_HDMI_CEC=y

‎arch/arm/configs/multi_v7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,7 @@ CONFIG_SPI_XILINX=y
469469
CONFIG_SPI_SPIDEV=y
470470
CONFIG_SPMI=y
471471
CONFIG_PINCTRL_AS3722=y
472+
CONFIG_PINCTRL_MCP23S08=m
472473
CONFIG_PINCTRL_MICROCHIP_SGPIO=y
473474
CONFIG_PINCTRL_OCELOT=y
474475
CONFIG_PINCTRL_PALMAS=y

‎arch/arm/configs/vexpress_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ CONFIG_CPUSETS=y
1414
CONFIG_BLK_DEV_INITRD=y
1515
CONFIG_PROFILING=y
1616
CONFIG_ARCH_VEXPRESS=y
17-
CONFIG_ARCH_VEXPRESS_DCSCB=y
1817
CONFIG_ARCH_VEXPRESS_TC2_PM=y
1918
CONFIG_SMP=y
2019
CONFIG_HAVE_ARM_ARCH_TIMER=y

‎arch/arm/mach-pxa/devices.c

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <linux/clk-provider.h>
88
#include <linux/dma-mapping.h>
99
#include <linux/dmaengine.h>
10+
#include <linux/gpio-pxa.h>
1011
#include <linux/platform_data/i2c-pxa.h>
1112
#include <linux/soc/pxa/cpu.h>
1213

@@ -17,6 +18,7 @@
1718
#include <linux/platform_data/usb-ohci-pxa27x.h>
1819
#include <linux/platform_data/mmp_dma.h>
1920

21+
#include "mfp-pxa2xx.h"
2022
#include "regs-ost.h"
2123
#include "reset.h"
2224
#include "devices.h"
@@ -46,7 +48,7 @@ struct platform_device pxa_device_pmu = {
4648
.num_resources = 1,
4749
};
4850

49-
static struct resource pxamci_resources[] = {
51+
static const struct resource pxamci_resources[] = {
5052
[0] = {
5153
.start = 0x41100000,
5254
.end = 0x41100fff,
@@ -59,22 +61,26 @@ static struct resource pxamci_resources[] = {
5961
},
6062
};
6163

62-
static u64 pxamci_dmamask = 0xffffffffUL;
63-
64-
struct platform_device pxa_device_mci = {
65-
.name = "pxa2xx-mci",
66-
.id = 0,
67-
.dev = {
68-
.dma_mask = &pxamci_dmamask,
69-
.coherent_dma_mask = 0xffffffff,
70-
},
71-
.num_resources = ARRAY_SIZE(pxamci_resources),
72-
.resource = pxamci_resources,
73-
};
74-
75-
void __init pxa_set_mci_info(struct pxamci_platform_data *info)
64+
void __init pxa_set_mci_info(const struct pxamci_platform_data *info,
65+
const struct property_entry *props)
7666
{
77-
pxa_register_device(&pxa_device_mci, info);
67+
const struct platform_device_info mci_info = {
68+
.name = "pxa2xx-mci",
69+
.id = 0,
70+
.res = pxamci_resources,
71+
.num_res = ARRAY_SIZE(pxamci_resources),
72+
.data = info,
73+
.size_data = sizeof(*info),
74+
.dma_mask = 0xffffffffUL,
75+
.properties = props,
76+
};
77+
struct platform_device *mci_dev;
78+
int err;
79+
80+
mci_dev = platform_device_register_full(&mci_info);
81+
err = PTR_ERR_OR_ZERO(mci_dev);
82+
if (err)
83+
pr_err("Unable to create mci device: %d\n", err);
7884
}
7985

8086
static struct pxa2xx_udc_mach_info pxa_udc_info = {
@@ -627,6 +633,11 @@ struct platform_device pxa27x_device_pwm1 = {
627633
};
628634
#endif /* CONFIG_PXA27x || CONFIG_PXA3xx */
629635

636+
#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x)
637+
const struct software_node pxa2xx_gpiochip_node = {
638+
.name = "gpio-pxa",
639+
};
640+
630641
struct resource pxa_resource_gpio[] = {
631642
{
632643
.start = 0x40e00000,
@@ -650,19 +661,31 @@ struct resource pxa_resource_gpio[] = {
650661
},
651662
};
652663

664+
static struct pxa_gpio_platform_data pxa2xx_gpio_info = {
665+
.irq_base = PXA_GPIO_TO_IRQ(0),
666+
.gpio_set_wake = gpio_set_wake,
667+
};
668+
653669
struct platform_device pxa25x_device_gpio = {
654670
.name = "pxa25x-gpio",
655671
.id = -1,
656672
.num_resources = ARRAY_SIZE(pxa_resource_gpio),
657673
.resource = pxa_resource_gpio,
674+
.dev = {
675+
.platform_data = &pxa2xx_gpio_info,
676+
},
658677
};
659678

660679
struct platform_device pxa27x_device_gpio = {
661680
.name = "pxa27x-gpio",
662681
.id = -1,
663682
.num_resources = ARRAY_SIZE(pxa_resource_gpio),
664683
.resource = pxa_resource_gpio,
684+
.dev = {
685+
.platform_data = &pxa2xx_gpio_info,
686+
},
665687
};
688+
#endif /* CONFIG_PXA25x || CONFIG_PXA27x */
666689

667690
static struct resource pxa_dma_resource[] = {
668691
[0] = {

‎arch/arm/mach-pxa/devices.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
struct mmp_dma_platdata;
55

66
extern struct platform_device pxa_device_pmu;
7-
extern struct platform_device pxa_device_mci;
87
extern struct platform_device pxa3xx_device_mci2;
98
extern struct platform_device pxa3xx_device_mci3;
109
extern struct platform_device pxa25x_device_udc;
@@ -53,8 +52,8 @@ extern struct platform_device pxa_device_asoc_ssp4;
5352

5453
extern struct platform_device pxa25x_device_gpio;
5554
extern struct platform_device pxa27x_device_gpio;
56-
extern struct platform_device pxa3xx_device_gpio;
57-
extern struct platform_device pxa93x_device_gpio;
55+
56+
extern const struct software_node pxa2xx_gpiochip_node;
5857

5958
void __init pxa_register_device(struct platform_device *dev, void *data);
6059
void __init pxa2xx_set_dmac_info(struct mmp_dma_platdata *dma_pdata);

‎arch/arm/mach-pxa/gumstix.c

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ static struct pxamci_platform_data gumstix_mci_platform_data = {
9090

9191
static void __init gumstix_mmc_init(void)
9292
{
93-
pxa_set_mci_info(&gumstix_mci_platform_data);
93+
pxa_set_mci_info(&gumstix_mci_platform_data, NULL);
9494
}
9595
#else
9696
static void __init gumstix_mmc_init(void)
@@ -100,26 +100,22 @@ static void __init gumstix_mmc_init(void)
100100
#endif
101101

102102
#ifdef CONFIG_USB_PXA25X
103-
static struct gpiod_lookup_table gumstix_gpio_vbus_gpiod_table = {
104-
.dev_id = "gpio-vbus",
105-
.table = {
106-
GPIO_LOOKUP("gpio-pxa", GPIO_GUMSTIX_USB_GPIOn,
107-
"vbus", GPIO_ACTIVE_HIGH),
108-
GPIO_LOOKUP("gpio-pxa", GPIO_GUMSTIX_USB_GPIOx,
109-
"pullup", GPIO_ACTIVE_HIGH),
110-
{ },
111-
},
103+
static const struct property_entry spitz_mci_props[] __initconst = {
104+
PROPERTY_ENTRY_GPIO("vbus-gpios", &pxa2xx_gpiochip_node,
105+
GPIO_GUMSTIX_USB_GPIOn, GPIO_ACTIVE_HIGH),
106+
PROPERTY_ENTRY_GPIO("pullup-gpios", &pxa2xx_gpiochip_node,
107+
GPIO_GUMSTIX_USB_GPIOx, GPIO_ACTIVE_HIGH),
108+
{ }
112109
};
113110

114-
static struct platform_device gumstix_gpio_vbus = {
111+
static const struct platform_device_info gumstix_gpio_vbus_info __initconst = {
115112
.name = "gpio-vbus",
116-
.id = -1,
113+
.id = PLATFORM_DEVID_NONE,
117114
};
118115

119116
static void __init gumstix_udc_init(void)
120117
{
121-
gpiod_add_lookup_table(&gumstix_gpio_vbus_gpiod_table);
122-
platform_device_register(&gumstix_gpio_vbus);
118+
platform_device_register_full(&gumstix_gpio_vbus_info);
123119
}
124120
#else
125121
static void gumstix_udc_init(void)

0 commit comments

Comments
 (0)