Skip to content

Commit 9d8a861

Browse files
torvaldstorvalds
committed
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
2 parents 39c3c39 + c5cdb92 commit 9d8a861

File tree

9 files changed

+14
-10
lines changed

9 files changed

+14
-10
lines changed

‎.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ Arnd Bergmann <[email protected]>
6060
Atish Patra <[email protected]> <[email protected]>
6161
Axel Dyks <[email protected]>
6262
Axel Lin <[email protected]>
63+
Baolin Wang <[email protected]> <[email protected]>
64+
Baolin Wang <[email protected]> <[email protected]>
65+
Baolin Wang <[email protected]> <[email protected]>
66+
Baolin Wang <[email protected]> <[email protected]>
6367
Bart Van Assche <[email protected]> <[email protected]>
6468
Bart Van Assche <[email protected]> <[email protected]>
6569
Ben Gardner <[email protected]>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
sys_clk: sys_clk {
3939
compatible = "fixed-clock";
4040
#clock-cells = <0>;
41-
clock-frequency = <162500000>;
41+
clock-frequency = <165625000>;
4242
};
4343

4444
cpu_clk: cpu_clk {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ static struct pxa2xx_spi_controller corgi_spi_info = {
549549
};
550550

551551
static struct gpiod_lookup_table corgi_spi_gpio_table = {
552-
.dev_id = "pxa2xx-spi.1",
552+
.dev_id = "spi1",
553553
.table = {
554554
GPIO_LOOKUP_IDX("gpio-pxa", CORGI_GPIO_ADS7846_CS, "cs", 0, GPIO_ACTIVE_LOW),
555555
GPIO_LOOKUP_IDX("gpio-pxa", CORGI_GPIO_LCDCON_CS, "cs", 1, GPIO_ACTIVE_LOW),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ static struct pxa2xx_spi_controller pxa_ssp2_master_info = {
635635
};
636636

637637
static struct gpiod_lookup_table pxa_ssp2_gpio_table = {
638-
.dev_id = "pxa2xx-spi.2",
638+
.dev_id = "spi2",
639639
.table = {
640640
GPIO_LOOKUP_IDX("gpio-pxa", GPIO88_HX4700_TSC2046_CS, "cs", 0, GPIO_ACTIVE_LOW),
641641
{ },

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ struct platform_device pxa_spi_ssp4 = {
140140
};
141141

142142
static struct gpiod_lookup_table pxa_ssp3_gpio_table = {
143-
.dev_id = "pxa2xx-spi.3",
143+
.dev_id = "spi3",
144144
.table = {
145145
GPIO_LOOKUP_IDX("gpio-pxa", ICONTROL_MCP251x_nCS1, "cs", 0, GPIO_ACTIVE_LOW),
146146
GPIO_LOOKUP_IDX("gpio-pxa", ICONTROL_MCP251x_nCS2, "cs", 1, GPIO_ACTIVE_LOW),
@@ -149,7 +149,7 @@ static struct gpiod_lookup_table pxa_ssp3_gpio_table = {
149149
};
150150

151151
static struct gpiod_lookup_table pxa_ssp4_gpio_table = {
152-
.dev_id = "pxa2xx-spi.4",
152+
.dev_id = "spi4",
153153
.table = {
154154
GPIO_LOOKUP_IDX("gpio-pxa", ICONTROL_MCP251x_nCS3, "cs", 0, GPIO_ACTIVE_LOW),
155155
GPIO_LOOKUP_IDX("gpio-pxa", ICONTROL_MCP251x_nCS4, "cs", 1, GPIO_ACTIVE_LOW),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ static struct spi_board_info littleton_spi_devices[] __initdata = {
207207
};
208208

209209
static struct gpiod_lookup_table littleton_spi_gpio_table = {
210-
.dev_id = "pxa2xx-spi.2",
210+
.dev_id = "spi2",
211211
.table = {
212212
GPIO_LOOKUP_IDX("gpio-pxa", LITTLETON_GPIO_LCD_CS, "cs", 0, GPIO_ACTIVE_LOW),
213213
{ },

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,7 @@ static struct pxa2xx_spi_controller magician_spi_info = {
994994
};
995995

996996
static struct gpiod_lookup_table magician_spi_gpio_table = {
997-
.dev_id = "pxa2xx-spi.2",
997+
.dev_id = "spi2",
998998
.table = {
999999
/* NOTICE must be GPIO, incompatibility with hw PXA SPI framing */
10001000
GPIO_LOOKUP_IDX("gpio-pxa", GPIO14_MAGICIAN_TSC2046_CS, "cs", 0, GPIO_ACTIVE_LOW),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ static struct pxa2xx_spi_controller spitz_spi_info = {
578578
};
579579

580580
static struct gpiod_lookup_table spitz_spi_gpio_table = {
581-
.dev_id = "pxa2xx-spi.2",
581+
.dev_id = "spi2",
582582
.table = {
583583
GPIO_LOOKUP_IDX("gpio-pxa", SPITZ_GPIO_ADS7846_CS, "cs", 0, GPIO_ACTIVE_LOW),
584584
GPIO_LOOKUP_IDX("gpio-pxa", SPITZ_GPIO_LCDCON_CS, "cs", 1, GPIO_ACTIVE_LOW),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -623,15 +623,15 @@ static struct pxa2xx_spi_controller pxa_ssp2_master_info = {
623623
};
624624

625625
static struct gpiod_lookup_table pxa_ssp1_gpio_table = {
626-
.dev_id = "pxa2xx-spi.1",
626+
.dev_id = "spi1",
627627
.table = {
628628
GPIO_LOOKUP_IDX("gpio-pxa", GPIO24_ZIPITZ2_WIFI_CS, "cs", 0, GPIO_ACTIVE_LOW),
629629
{ },
630630
},
631631
};
632632

633633
static struct gpiod_lookup_table pxa_ssp2_gpio_table = {
634-
.dev_id = "pxa2xx-spi.2",
634+
.dev_id = "spi2",
635635
.table = {
636636
GPIO_LOOKUP_IDX("gpio-pxa", GPIO88_ZIPITZ2_LCD_CS, "cs", 0, GPIO_ACTIVE_LOW),
637637
{ },

0 commit comments

Comments
 (0)