diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-10-23 06:57:50 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-10-23 06:57:50 +0200 |
| commit | 274035751e25ee15a064e43cde7b4e7a9b75d921 (patch) | |
| tree | bf5f3f18f14855043324ef02a116532d866e3dac /drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c | |
| parent | ALSA: Remove transfer_ack_{begin,end} callbacks from struct snd_pcm_runtime (diff) | |
| parent | ASoC: cht_bsw_rt5672: Use snd_pcm_hw_constraint_single() (diff) | |
| download | linux-274035751e25ee15a064e43cde7b4e7a9b75d921.tar.xz linux-274035751e25ee15a064e43cde7b4e7a9b75d921.zip | |
Merge branch 'topic/hw-constraint-single' into for-next
Diffstat (limited to 'drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c')
| -rw-r--r-- | drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c b/drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c index 63676617bc59..f9a3f8f446f7 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c +++ b/drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c @@ -653,7 +653,7 @@ static const struct sunxi_desc_pin sun5i_a10s_pins[] = { SUNXI_FUNCTION(0x0, "gpio_in"), SUNXI_FUNCTION(0x1, "gpio_out"), SUNXI_FUNCTION(0x2, "spi1"), /* CS1 */ - SUNXI_FUNCTION(0x3, "uart3"), /* PWM1 */ + SUNXI_FUNCTION(0x3, "pwm"), /* PWM1 */ SUNXI_FUNCTION(0x5, "uart2"), /* CTS */ SUNXI_FUNCTION_IRQ(0x6, 13)), /* EINT13 */ }; |