rk31: update i2s/codec/backlight config & iomux

diff --git a/arch/arm/configs/rk31_fpga_defconfig b/arch/arm/configs/rk31_fpga_defconfig
index d4f9f0e6cffebf96aacb25b2e32e2c6a3c518666..1647438bf279440be77888246aeee8c7cfd511b9 100644 (file)
--- a/arch/arm/configs/rk31_fpga_defconfig
+++ b/arch/arm/configs/rk31_fpga_defconfig
@@ -76,6 +76,10 @@ CONFIG_SPI_FPGA_GPIO_IRQ_NUM=0
 # CONFIG_HWMON is not set
 # CONFIG_MFD_SUPPORT is not set
 CONFIG_FB=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_DISPLAY_SUPPORT=y
 CONFIG_LCD_TD043MGEA1=y
 CONFIG_FB_ROCKCHIP=y
@@ -85,6 +89,18 @@ CONFIG_LCDC1_RK31=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_SOUND=y
+CONFIG_SND=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_VERBOSE_PROCFS is not set
+# CONFIG_SND_DRIVERS is not set
+# CONFIG_SND_ARM is not set
+CONFIG_SND_SOC=y
+CONFIG_SND_RK29_SOC=y
+CONFIG_SND_RK29_SOC_I2S_2CH=y
+CONFIG_SND_I2S_DMA_EVENT_STATIC=y
+CONFIG_SND_RK29_SOC_RK1000=y
+CONFIG_SND_RK29_CODEC_SOC_SLAVE=y
 # CONFIG_HID_SUPPORT is not set
 # CONFIG_USB_SUPPORT is not set
 CONFIG_MMC=y

diff --git a/arch/arm/mach-rk30/iomux.c b/arch/arm/mach-rk30/iomux.c
index bbd37a149f421db5a5d79af6341628015fa9b337..9c2f237fe11de6ef96e3e2d62feed6cc979b13b8 100755 (executable)
--- a/arch/arm/mach-rk30/iomux.c
+++ b/arch/arm/mach-rk30/iomux.c
@@ -189,6 +189,7 @@ MUX_CFG(GPIO3D2_SDMMC1INTN_NAME,                    GPIO3D,   4,     1,   0,        DEFAULT)
 MUX_CFG(GPIO3D1_SDMMC1BACKENDPWR_NAME,                 GPIO3D,   2,     1,   0,        DEFAULT) 
 MUX_CFG(GPIO3D0_SDMMC1PWREN_NAME,                      GPIO3D,   0,     1,   0,        DEFAULT) 
 
+#if defined(CONFIG_ARCH_RK30)
 //GPIO4A
 MUX_CFG(GPIO4A7_FLASHDATA15_NAME,                      GPIO4A,   14,    1,   0,        DEFAULT) 
 MUX_CFG(GPIO4A6_FLASHDATA14_NAME,                      GPIO4A,   12,    1,   0,        DEFAULT) 
@@ -232,6 +233,7 @@ MUX_CFG(GPIO4D0_SMCDATA8_TRACEDATA8_NAME,           GPIO4D,   0,     2,   0,        DEFAULT)
 //GPIO6B
 MUX_CFG(GPIO6B7_TESTCLOCKOUT_NAME,                     GPIO6B,   14,    1,   0,        DEFAULT) 
 
+#endif
 };     
 
 

diff --git a/drivers/gpio/gpio-rk30.c b/drivers/gpio/gpio-rk30.c
index 520d5a74d8e3c9a1d04c0d2ee2945d02868055a3..14417a33a4a935652c290b9c8f0cbf804d5e5877 100755 (executable)
--- a/drivers/gpio/gpio-rk30.c
+++ b/drivers/gpio/gpio-rk30.c
@@ -318,8 +318,10 @@ static void rk30_gpiolib_set(struct gpio_chip *chip, unsigned offset, int val)
        spin_unlock_irqrestore(&bank->lock, flags);
 }
 
+
 static int rk30_gpiolib_pull_updown(struct gpio_chip *chip, unsigned offset, unsigned enable)
 {
+#if defined(CONFIG_ARCH_RK30)
        struct rk30_gpio_bank *bank = to_rk30_gpio_bank(chip);
        unsigned long flags;
 
@@ -329,10 +331,11 @@ static int rk30_gpiolib_pull_updown(struct gpio_chip *chip, unsigned offset, uns
        else    
                rk30_gpio_bit_op((void *__iomem) RK30_GRF_BASE, GRF_GPIO0L_PULL + bank->id * 8, (1<<(offset+16)) | offset_to_bit(offset), !enable);
        spin_unlock_irqrestore(&bank->lock, flags);
-
+#endif
        return 0;
 }
 
+
 static int rk30_gpiolib_to_irq(struct gpio_chip *chip, unsigned offset)
 {
        return chip->base + offset;