tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'soc-fixes-5.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann:
"One last set of changes for the soc tree:
- fix clock frequency on lan966x
- fix incorrect GPIO numbers on some pxa machines
- update Baolin's email address"
* tag 'soc-fixes-5.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
ARM: pxa2xx: Fix GPIO descriptor tables
mailmap: update Baolin Wang's email
ARM: dts: lan966x: fix sys_clk frequency
+14
-10
+4
.mailmap
+4
.mailmap
···
60
60
Atish Patra <atishp@atishpatra.org> <atish.patra@wdc.com>
61
61
Axel Dyks <xl@xlsigned.net>
62
62
Axel Lin <axel.lin@gmail.com>
63
+
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@linaro.org>
64
+
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@spreadtrum.com>
65
+
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@unisoc.com>
66
+
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang7@gmail.com>
63
67
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
64
68
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>
65
69
Ben Gardner <bgardner@wabtec.com>
+1
-1
arch/arm/boot/dts/lan966x.dtsi
+1
-1
arch/arm/boot/dts/lan966x.dtsi
+1
-1
arch/arm/mach-pxa/corgi.c
+1
-1
arch/arm/mach-pxa/corgi.c
···
549
549
};
550
550
551
551
static struct gpiod_lookup_table corgi_spi_gpio_table = {
552
-
.dev_id = "pxa2xx-spi.1",
552
+
.dev_id = "spi1",
553
553
.table = {
554
554
GPIO_LOOKUP_IDX("gpio-pxa", CORGI_GPIO_ADS7846_CS, "cs", 0, GPIO_ACTIVE_LOW),
555
555
GPIO_LOOKUP_IDX("gpio-pxa", CORGI_GPIO_LCDCON_CS, "cs", 1, GPIO_ACTIVE_LOW),
+1
-1
arch/arm/mach-pxa/hx4700.c
+1
-1
arch/arm/mach-pxa/hx4700.c
+2
-2
arch/arm/mach-pxa/icontrol.c
+2
-2
arch/arm/mach-pxa/icontrol.c
···
140
140
};
141
141
142
142
static struct gpiod_lookup_table pxa_ssp3_gpio_table = {
143
-
.dev_id = "pxa2xx-spi.3",
143
+
.dev_id = "spi3",
144
144
.table = {
145
145
GPIO_LOOKUP_IDX("gpio-pxa", ICONTROL_MCP251x_nCS1, "cs", 0, GPIO_ACTIVE_LOW),
146
146
GPIO_LOOKUP_IDX("gpio-pxa", ICONTROL_MCP251x_nCS2, "cs", 1, GPIO_ACTIVE_LOW),
···
149
149
};
150
150
151
151
static struct gpiod_lookup_table pxa_ssp4_gpio_table = {
152
-
.dev_id = "pxa2xx-spi.4",
152
+
.dev_id = "spi4",
153
153
.table = {
154
154
GPIO_LOOKUP_IDX("gpio-pxa", ICONTROL_MCP251x_nCS3, "cs", 0, GPIO_ACTIVE_LOW),
155
155
GPIO_LOOKUP_IDX("gpio-pxa", ICONTROL_MCP251x_nCS4, "cs", 1, GPIO_ACTIVE_LOW),
+1
-1
arch/arm/mach-pxa/littleton.c
+1
-1
arch/arm/mach-pxa/littleton.c
+1
-1
arch/arm/mach-pxa/magician.c
+1
-1
arch/arm/mach-pxa/magician.c
···
994
994
};
995
995
996
996
static struct gpiod_lookup_table magician_spi_gpio_table = {
997
-
.dev_id = "pxa2xx-spi.2",
997
+
.dev_id = "spi2",
998
998
.table = {
999
999
/* NOTICE must be GPIO, incompatibility with hw PXA SPI framing */
1000
1000
GPIO_LOOKUP_IDX("gpio-pxa", GPIO14_MAGICIAN_TSC2046_CS, "cs", 0, GPIO_ACTIVE_LOW),
+1
-1
arch/arm/mach-pxa/spitz.c
+1
-1
arch/arm/mach-pxa/spitz.c
···
578
578
};
579
579
580
580
static struct gpiod_lookup_table spitz_spi_gpio_table = {
581
-
.dev_id = "pxa2xx-spi.2",
581
+
.dev_id = "spi2",
582
582
.table = {
583
583
GPIO_LOOKUP_IDX("gpio-pxa", SPITZ_GPIO_ADS7846_CS, "cs", 0, GPIO_ACTIVE_LOW),
584
584
GPIO_LOOKUP_IDX("gpio-pxa", SPITZ_GPIO_LCDCON_CS, "cs", 1, GPIO_ACTIVE_LOW),
+2
-2
arch/arm/mach-pxa/z2.c
+2
-2
arch/arm/mach-pxa/z2.c
···
623
623
};
624
624
625
625
static struct gpiod_lookup_table pxa_ssp1_gpio_table = {
626
-
.dev_id = "pxa2xx-spi.1",
626
+
.dev_id = "spi1",
627
627
.table = {
628
628
GPIO_LOOKUP_IDX("gpio-pxa", GPIO24_ZIPITZ2_WIFI_CS, "cs", 0, GPIO_ACTIVE_LOW),
629
629
{ },
···
631
631
};
632
632
633
633
static struct gpiod_lookup_table pxa_ssp2_gpio_table = {
634
-
.dev_id = "pxa2xx-spi.2",
634
+
.dev_id = "spi2",
635
635
.table = {
636
636
GPIO_LOOKUP_IDX("gpio-pxa", GPIO88_ZIPITZ2_LCD_CS, "cs", 0, GPIO_ACTIVE_LOW),
637
637
{ },