diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-08-23 14:50:04 +0100 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-01-08 10:29:53 +0000 |
| commit | 0c0cc7a98a782bcf6342db4ec515f8c8112690c3 (patch) | |
| tree | fcf36547fedc665dc44585832fac62d87bbfe632 /arch | |
| parent | becc52742111afeaba86ff20cdbeda90e350018a (diff) | |
asoc: sa11x0/assabet: use gpiod APIs for some gpios
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-sa1100/assabet.c | 19 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/clock.c | 2 |
2 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c index 2a267122b4a1..84649207dbb9 100644 --- a/arch/arm/mach-sa1100/assabet.c +++ b/arch/arm/mach-sa1100/assabet.c @@ -438,6 +438,22 @@ static struct resource neponset_resources[] = { }; #endif +static struct gpiod_lookup_table assabet_uda1341_gpio_table = { + .dev_id = "uda134x-codec", + .table = { + GPIO_LOOKUP("assabet", 21, "qmute", GPIO_ACTIVE_HIGH), + { }, + }, +}; + +static struct gpiod_lookup_table assabet_audio_gpio_table = { + .dev_id = "assabet-asoc", + .table = { + GPIO_LOOKUP("assabet", 23, "spkr-shtdn", GPIO_ACTIVE_HIGH), + { }, + }, +}; + static struct gpiod_lookup_table assabet_cf_gpio_table = { .dev_id = "sa11x0-pcmcia.1", .table = { @@ -543,6 +559,9 @@ static struct gpiod_lookup_table assabet_uart3_gpio_table = { static void __init assabet_init(void) { + gpiod_add_lookup_table(&assabet_uda1341_gpio_table); + gpiod_add_lookup_table(&assabet_audio_gpio_table); + /* * Ensure that the power supply is in "high power" mode. */ diff --git a/arch/arm/mach-sa1100/clock.c b/arch/arm/mach-sa1100/clock.c index 9ced1c559eca..a104cfa4b123 100644 --- a/arch/arm/mach-sa1100/clock.c +++ b/arch/arm/mach-sa1100/clock.c @@ -124,6 +124,8 @@ int __init sa11xx_clk_init(void) clk_hw_register_clkdev(hw, NULL, "sa11x0-pcmcia.1"); clk_hw_register_clkdev(hw, NULL, "1800"); + clk_hw_register_clkdev(hw, NULL, "assabet-asoc"); + hw = clk_hw_register_mux(NULL, "tucr-mux", clk_tucr_parents, ARRAY_SIZE(clk_tucr_parents), 0, (void __iomem *)&TUCR, FShft(TUCR_TSEL), |