S3C64XX: Fix dev-audio build
Subsystems (3)
PATCH 1/1 S3C64XX: Fix dev-audio build
As reported when the patch was posted commit 71269364 ("ARM: S3C64XX:
Add I2S resources in platform code") uses pin names for the IISv4 data output pins which are not present in mainline, causing dev-audio to fail to build. Fix this by using the defines which are actually present in the kernel source.
Signed-off-by Mark Brown <[email protected]>
--- arch/arm/plat-s3c64xx/dev-audio.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/plat-s3c64xx/dev-audio.c +3 -3
@@ -51,9 +51,9 @@ static int s3c64xx_i2sv3_cfg_gpio(struct platform_device *pdev)static int s3c64xx_i2sv4_cfg_gpio (struct platform_device *pdev) { -s3c_gpio_cfgpin (S3C64XX_GPC (4 ),S3C64XX_GPC4_I2S0_V40_DO ); -s3c_gpio_cfgpin (S3C64XX_GPC (5 ),S3C64XX_GPC5_I2S1_V40_DO ); -s3c_gpio_cfgpin (S3C64XX_GPC (7 ),S3C64XX_GPC7_I2S2_V40_DO ); +s3c_gpio_cfgpin (S3C64XX_GPC (4 ),S3C64XX_GPC4_I2S_V40_DO0 ); +s3c_gpio_cfgpin (S3C64XX_GPC (5 ),S3C64XX_GPC5_I2S_V40_DO1 ); +s3c_gpio_cfgpin (S3C64XX_GPC (7 ),S3C64XX_GPC7_I2S_V40_DO2 );s3c_gpio_cfgpin (S3C64XX_GPH (6 ),S3C64XX_GPH6_I2S_V40_BCLK );s3c_gpio_cfgpin (S3C64XX_GPH (7 ),S3C64XX_GPH7_I2S_V40_CDCLK );s3c_gpio_cfgpin (S3C64XX_GPH (8 ),S3C64XX_GPH8_I2S_V40_LRCLK );
Signature · 1 line
1.6.6
Ben Dooks
AppliedPATCH 1/1 S3C64XX: Fix dev-audio build
Quoted 5 lines · Mark Brown
As reported when the patch was posted commit 71269364 ("ARM: S3C64XX:
Add I2S resources in platform code") uses pin names for the IISv4 data output pins which are not present in mainline, causing dev-audio to fail to build. Fix this by using the defines which are actually present in the kernel source.
applied to next-samsung-s3c64xx2, etc.
Quoted 25 lines
Signed-off-by Mark Brown <[email protected]>--- arch/arm/plat-s3c64xx/dev-audio.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)arch/arm/plat-s3c64xx/dev-audio.c +3
-3@@ -51,9 +51,9 @@ static int s3c64xx_i2sv3_cfg_gpio(struct platform_device *pdev)static int s3c64xx_i2sv4_cfg_gpio (struct platform_device *pdev) { -s3c_gpio_cfgpin (S3C64XX_GPC (4 ),S3C64XX_GPC4_I2S0_V40_DO ); -s3c_gpio_cfgpin (S3C64XX_GPC (5 ),S3C64XX_GPC5_I2S1_V40_DO ); -s3c_gpio_cfgpin (S3C64XX_GPC (7 ),S3C64XX_GPC7_I2S2_V40_DO ); +s3c_gpio_cfgpin (S3C64XX_GPC (4 ),S3C64XX_GPC4_I2S_V40_DO0 ); +s3c_gpio_cfgpin (S3C64XX_GPC (5 ),S3C64XX_GPC5_I2S_V40_DO1 ); +s3c_gpio_cfgpin (S3C64XX_GPC (7 ),S3C64XX_GPC7_I2S_V40_DO2 );s3c_gpio_cfgpin (S3C64XX_GPH (6 ),S3C64XX_GPH6_I2S_V40_BCLK );s3c_gpio_cfgpin (S3C64XX_GPH (7 ),S3C64XX_GPH7_I2S_V40_CDCLK );s3c_gpio_cfgpin (S3C64XX_GPH (8 ),S3C64XX_GPH8_I2S_V40_LRCLK );Signature · 1 line
1.6.6
Signature · 5 lines
-- Ben Q: What's a light-year? A: One-third less calories than a regular year.