Commit 9d8a8616 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 39c3c396 c5cdb928

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -60,6 +60,10 @@ Arnd Bergmann <arnd@arndb.de> 
Atish Patra <atishp@atishpatra.org> <atish.patra@wdc.com>

Axel Dyks <xl@xlsigned.net>

Axel Lin <axel.lin@gmail.com>

Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@linaro.org>

Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@spreadtrum.com>

Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@unisoc.com>

Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang7@gmail.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>

Ben Gardner <bgardner@wabtec.com>

arch/arm/boot/dts/lan966x.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
		sys_clk: sys_clk {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <162500000>;

			clock-frequency = <165625000>;

		};



		cpu_clk: cpu_clk {

arch/arm/mach-pxa/corgi.c

+1 −1
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ static struct pxa2xx_spi_controller corgi_spi_info = { 
};



static struct gpiod_lookup_table corgi_spi_gpio_table = {

	.dev_id = "pxa2xx-spi.1",

	.dev_id = "spi1",

	.table = {

		GPIO_LOOKUP_IDX("gpio-pxa", CORGI_GPIO_ADS7846_CS, "cs", 0, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("gpio-pxa", CORGI_GPIO_LCDCON_CS, "cs", 1, GPIO_ACTIVE_LOW),

arch/arm/mach-pxa/hx4700.c

+1 −1
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ static struct pxa2xx_spi_controller pxa_ssp2_master_info = { 
};



static struct gpiod_lookup_table pxa_ssp2_gpio_table = {

	.dev_id = "pxa2xx-spi.2",

	.dev_id = "spi2",

	.table = {

		GPIO_LOOKUP_IDX("gpio-pxa", GPIO88_HX4700_TSC2046_CS, "cs", 0, GPIO_ACTIVE_LOW),

		{ },

arch/arm/mach-pxa/icontrol.c

+2 −2
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ struct platform_device pxa_spi_ssp4 = { 
};



static struct gpiod_lookup_table pxa_ssp3_gpio_table = {

	.dev_id = "pxa2xx-spi.3",

	.dev_id = "spi3",

	.table = {

		GPIO_LOOKUP_IDX("gpio-pxa", ICONTROL_MCP251x_nCS1, "cs", 0, GPIO_ACTIVE_LOW),

		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 = { 
};



static struct gpiod_lookup_table pxa_ssp4_gpio_table = {

	.dev_id = "pxa2xx-spi.4",

	.dev_id = "spi4",

	.table = {

		GPIO_LOOKUP_IDX("gpio-pxa", ICONTROL_MCP251x_nCS3, "cs", 0, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("gpio-pxa", ICONTROL_MCP251x_nCS4, "cs", 1, GPIO_ACTIVE_LOW),