Changeset 20132


Ignore:
Timestamp:
2010-03-11T03:00:59+01:00 (7 years ago)
Author:
lars
Message:

[xburst] Add kernel sound packages

Location:
trunk/target/linux/xburst
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/xburst/Makefile

    r19986 r20132  
    1111BOARDNAME:=Ingenic XBurst 
    1212FEATURES:=jffs2 tgz ubifs audio 
    13 SUBTARGETS:=qi_lb60 n526 
     13SUBTARGETS:=qi_lb60 n516 n526 
    1414 
    1515LINUX_VERSION:=2.6.32.9 
  • trunk/target/linux/xburst/config-2.6.32

    r19986 r20132  
    7373CONFIG_EXT3_FS=y 
    7474CONFIG_FAT_FS=y 
    75 CONFIG_FB_JZ4740=y 
     75# CONFIG_FB_JZ4740 is not set 
    7676CONFIG_FB_SYS_COPYAREA=y 
    7777CONFIG_FB_SYS_FILLRECT=y 
     
    294294# CONFIG_SIBYTE_SENTOSA is not set 
    295295# CONFIG_SIBYTE_SWARM is not set 
    296 # CONFIG_SND_DRIVERS is not set 
    297 # CONFIG_SND_EMU10K1_SEQ is not set 
    298 CONFIG_SND_JACK=y 
    299 CONFIG_SND_JZ4740_SOC_I2S=y 
     296# CONFIG_SND_SOC_ALL_CODECS is not set 
     297# CONFIG_SND_SOC_JZCODEC is not set 
     298# CONFIG_SND_SOC_JZ4740 is not set 
     299# CONFIG_SND_JZ4740_SOC_N516 is not set 
     300# CONFIG_SND_JZ4740_SOC_N526 is not set 
    300301# CONFIG_SND_JZ4740_SOC_QI_LB60 is not set 
    301 CONFIG_SND_JZ4740_SOC=y 
    302 CONFIG_SND_MIXER_OSS=y 
    303 # CONFIG_SND_OPL3_LIB_SEQ is not set 
    304 # CONFIG_SND_OPL4_LIB_SEQ is not set 
    305 CONFIG_SND_PCM_OSS=y 
    306 CONFIG_SND_PCM=y 
    307 # CONFIG_SND_RAWMIDI_SEQ is not set 
    308 # CONFIG_SND_SBAWE_SEQ is not set 
    309 # CONFIG_SND_SOC_ALL_CODECS is not set 
    310 CONFIG_SND_SOC_I2C_AND_SPI=y 
    311 CONFIG_SND_SOC_JZCODEC=y 
    312 CONFIG_SND_SOC=y 
    313 CONFIG_SND_TIMER=y 
    314 # CONFIG_SND_VERBOSE_PROCFS is not set 
    315 CONFIG_SND=y 
    316 CONFIG_SOC_JZ4740=y 
    317 # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set 
    318 CONFIG_SOUND_OSS_CORE=y 
    319 CONFIG_SOUND=y 
    320302# CONFIG_SPI_SPIDEV is not set 
    321303# CONFIG_SQUASHFS is not set 
     
    379361# CONFIG_USB_G_PRINTER is not set 
    380362# CONFIG_USB_G_SERIAL is not set 
    381 # CONFIG_USB_JZ4740 is not set 
     363CONFIG_USB_JZ4740=y 
    382364# CONFIG_USB_MIDI_GADGET is not set 
    383365CONFIG_USB_SUPPORT=y 
  • trunk/target/linux/xburst/modules.mk

    r19098 r20132  
    1 ifeq ($(CONFIG_TARGET_xburst),y) 
    2         SOUNDCORE_FILES =  
    3         SOUNDCORE_LOAD =  
    4 endif 
     1 
     2 
     3SOUND_MENU:=Sound Support 
     4 
     5define KernelPackage/sound-soc-jz4740 
     6  SUBMENU:=$(SOUND_MENU) 
     7  DEPENDS:=kmod-sound-soc-core @TARGET_xburst 
     8  TITLE:=JZ4740 SoC sound support 
     9  KCONFIG:=CONFIG_SND_JZ4740_SOC CONFIG_SND_JZ4740_SOC_I2S @TARGET_xburst 
     10  FILES:=$(LINUX_DIR)/sound/soc/jz4740/snd-soc-jz4740.$(LINUX_KMOD_SUFFIX) \ 
     11  $(LINUX_DIR)/sound/soc/jz4740/snd-soc-jz4740-i2s.$(LINUX_KMOD_SUFFIX) 
     12  AUTOLOAD:=$(call AutoLoad,40,snd-soc-jz4740 snd-soc-jz4740-pcm) 
     13endef 
     14 
     15define KernelPackage/sound-soc-jzcodec 
     16  SUBMENU:=$(SOUND_MENU) 
     17  DEPENDS:=kmod-sound-soc-core @TARGET_xburst 
     18  TITLE:=JZ4740 SoC internal codec support 
     19  KCONFIG:=CONFIG_SND_SOC_JZCODEC 
     20  FILES:=$(LINUX_DIR)/sound/soc/codecs/snd-soc-jzcodec.$(LINUX_KMOD_SUFFIX) 
     21  AUTOLOAD:=$(call AutoLoad,40,snd-soc-jzcodec) 
     22endef 
     23 
     24define KernelPackage/sound-soc-xburst/default 
     25  SUBMENU:=$(SOUND_MENU) 
     26  DEPENDS:=kmod-sound-soc-jz4740 kmod-sound-soc-jzcodec @TARGET_xburst_$(if $(4),$(4),$(3)) 
     27  TITLE:=$(1) sound support 
     28  KCONFIG:=CONFIG_SND_JZ4740_SOC_$(2) 
     29  FILES:=$(LINUX_DIR)/sound/soc/jz4740/snd-soc-$(3).$(LINUX_KMOD_SUFFIX) 
     30  AUTOLOAD:=$(call AutoLoad,45,snd-soc-$(3)) 
     31endef 
     32 
     33define KernelPackage/sound-soc-qi_lb60 
     34$(call KernelPackage/sound-soc-xburst/default,QI NanoNote,QI_LB60,qi-lb60,qi_lb60) 
     35endef 
     36 
     37define KernelPackage/sound-soc-n516 
     38$(call KernelPackage/sound-soc-xburst/default,Hanvon N516,N516,n516) 
     39endef 
     40 
     41define KernelPackage/sound-soc-n526 
     42$(call KernelPackage/sound-soc-xburst/default,Hanvon N526,N526,n526) 
     43endef 
     44 
     45$(eval $(call KernelPackage,sound-soc-jz4740)) 
     46$(eval $(call KernelPackage,sound-soc-jzcodec)) 
     47$(eval $(call KernelPackage,sound-soc-qi_lb60)) 
     48$(eval $(call KernelPackage,sound-soc-n516)) 
     49$(eval $(call KernelPackage,sound-soc-n526)) 
  • trunk/target/linux/xburst/n516/config-2.6.32

    r19987 r20132  
    33CONFIG_FB_METRONOME=m 
    44CONFIG_FB_SYS_FOPS=m 
    5 # CONFIG_FRAMEBUFFER_CONSOLE is not set 
    65CONFIG_HWMON=y 
    76# CONFIG_HWMON_DEBUG_CHIP is not set 
     
    1110CONFIG_I2C_GPIO=y 
    1211CONFIG_JZ4740_N516=y 
    13 # CONFIG_KEYBOARD_GPIO is not set 
    1412CONFIG_LEDS_GPIO=y 
    1513CONFIG_MTD_CMDLINE_PARTS=y 
    1614CONFIG_N516_LPC=y 
    1715CONFIG_NEW_LEDS=y 
    18 # CONFIG_REGULATOR_FIXED_VOLTAGE is not set 
    19 # CONFIG_REGULATOR_LP3971 is not set 
    20 # CONFIG_REGULATOR_MAX1586 is not set 
    21 # CONFIG_REGULATOR_TPS65023 is not set 
    22 # CONFIG_REGULATOR_TPS6507X is not set 
    2316CONFIG_SENSORS_LM75=y 
    24 # CONFIG_USB_ARCH_HAS_HCD is not set 
    25 # CONFIG_USB_ARCH_HAS_OHCI is not set 
     17CONFIG_SOC_JZ4740=y 
  • trunk/target/linux/xburst/n516/target.mk

    r19987 r20132  
    11BOARDNAME:=Hanvon N516 e-book reader 
    2 #DEFAULT_PACKAGES += uboot-xburst-n516 
     2DEFAULT_PACKAGES += \ 
     3        kmod-sound-core \ 
     4        kmod-sound-soc-core \ 
     5        kmod-sound-soc-jz4740 \ 
     6        kmod-sound-soc-jzcodec \ 
     7        kmod-sound-soc-n516 \ 
     8 
  • trunk/target/linux/xburst/n526/target.mk

    r19986 r20132  
    11BOARDNAME:=Hanvon N526 e-book reader 
    2 DEFAULT_PACKAGES += uboot-xburst-n526 
     2DEFAULT_PACKAGES += \ 
     3        kmod-sound-core \ 
     4        kmod-sound-soc-core \ 
     5        kmod-sound-soc-jz4740 \ 
     6        kmod-sound-soc-jzcodec \ 
     7        kmod-sound-soc-n516 \ 
  • trunk/target/linux/xburst/patches-2.6.32/001-core.patch

    r19358 r20132  
    3131        bool "LASAT Networks platforms" 
    3232        select CEVT_R4K 
    33 @@ -677,6 +680,7 @@ source "arch/mips/alchemy/Kconfig" 
    34  source "arch/mips/basler/excite/Kconfig" 
    35  source "arch/mips/bcm63xx/Kconfig" 
    36  source "arch/mips/jazz/Kconfig" 
    37 +source "arch/mips/jz4740/Kconfig" 
    38  source "arch/mips/lasat/Kconfig" 
    39  source "arch/mips/pmc-sierra/Kconfig" 
    40  source "arch/mips/sgi-ip27/Kconfig" 
    41 @@ -1913,6 +1917,14 @@ config NR_CPUS 
    42   
    43  source "kernel/time/Kconfig" 
    44   
    45 +# the value of (max order + 1) 
    46 +config FORCE_MAX_ZONEORDER 
    47 +       prompt "MAX_ZONEORDER" 
    48 +       int 
    49 +       default "12" 
    50 +       help 
    51 +        The max memory that can be allocated = 4KB * 2^(CONFIG_FORCE_MAX_ZONEORDER - 1) 
    52 + 
    53  # 
    54  # Timer Interrupt Frequency Configuration 
    55  # 
    5633--- a/arch/mips/Makefile 
    5734+++ b/arch/mips/Makefile 
     
    158135+ * Valid machtype for group INGENIC 
    159136+ */ 
    160 +#define  MACH_INGENIC_JZ4720   0       /* JZ4730 SOC           */ 
     137+#define  MACH_INGENIC_JZ4730   0       /* JZ4730 SOC           */ 
    161138+#define  MACH_INGENIC_JZ4740   1       /* JZ4740 SOC           */ 
    162139+ 
     
    200177 }; 
    201178  
    202 --- a/arch/mips/include/asm/mach-generic/irq.h 
    203 +++ b/arch/mips/include/asm/mach-generic/irq.h 
    204 @@ -9,7 +9,7 @@ 
    205  #define __ASM_MACH_GENERIC_IRQ_H 
    206   
    207  #ifndef NR_IRQS 
    208 -#define NR_IRQS        128 
    209 +#define NR_IRQS        256 
    210  #endif 
    211   
    212  #ifdef CONFIG_I8259 
    213179--- a/arch/mips/include/asm/r4kcache.h 
    214180+++ b/arch/mips/include/asm/r4kcache.h 
     
    536502+ 
    537503 #endif /* _ASM_R4KCACHE_H */ 
    538 --- a/arch/mips/include/asm/suspend.h 
    539 +++ b/arch/mips/include/asm/suspend.h 
    540 @@ -2,6 +2,9 @@ 
    541  #define __ASM_SUSPEND_H 
    542   
    543  static inline int arch_prepare_suspend(void) { return 0; } 
    544 +#if defined(CONFIG_PM) && defined(CONFIG_JZSOC) 
    545 +extern int jz_pm_init(void); 
    546 +#endif 
    547   
    548  /* References to section boundaries */ 
    549  extern const void __nosave_begin, __nosave_end; 
    550504--- a/arch/mips/kernel/cpu-probe.c 
    551505+++ b/arch/mips/kernel/cpu-probe.c 
     
    558512                break; 
    559513  
    560 @@ -902,6 +903,23 @@ static inline void cpu_probe_cavium(stru 
     514@@ -902,6 +903,21 @@ static inline void cpu_probe_cavium(stru 
    561515        } 
    562516 } 
     
    569523+       case PRID_IMP_JZRISC: 
    570524+               c->cputype = CPU_JZRISC; 
    571 +               c->isa_level = MIPS_CPU_ISA_M32R1; 
    572 +               c->tlbsize = 32; 
    573525+               __cpu_name[cpu] = "Ingenic JZRISC"; 
    574526+               break; 
     
    592544  
    593545        BUG_ON(!__cpu_name[cpu]); 
    594 --- a/arch/mips/mm/c-r4k.c 
    595 +++ b/arch/mips/mm/c-r4k.c 
    596 @@ -928,6 +928,36 @@ static void __cpuinit probe_pcache(void) 
    597                 c->dcache.waybit = 0; 
    598                 break; 
    599   
    600 +       case CPU_JZRISC: 
    601 +               config1 = read_c0_config1(); 
    602 +               config1 = (config1 >> 22) & 0x07; 
    603 +               if (config1 == 0x07) 
    604 +                       config1 = 10; 
    605 +               else 
    606 +                       config1 = config1 + 11; 
    607 +               config1 += 2; 
    608 +               icache_size = (1 << config1); 
    609 +               c->icache.linesz = 32; 
    610 +               c->icache.ways = 4; 
    611 +               c->icache.waybit = __ffs(icache_size / c->icache.ways); 
    612 + 
    613 +               config1 = read_c0_config1(); 
    614 +               config1 = (config1 >> 13) & 0x07; 
    615 +               if (config1 == 0x07) 
    616 +                       config1 = 10; 
    617 +               else 
    618 +                       config1 = config1 + 11; 
    619 +               config1 += 2; 
    620 +               dcache_size = (1 << config1); 
    621 +               c->dcache.linesz = 32; 
    622 +               c->dcache.ways = 4; 
    623 +               c->dcache.waybit = __ffs(dcache_size / c->dcache.ways); 
    624 + 
    625 +               c->dcache.flags = 0; 
    626 +               c->options |= MIPS_CPU_PREFETCH; 
    627 + 
    628 +               break; 
    629 + 
    630         default: 
    631                 if (!(config & MIPS_CONF_M)) 
    632                         panic("Don't know how to probe P-caches on this cpu."); 
    633 --- a/arch/mips/mm/cache.c 
    634 +++ b/arch/mips/mm/cache.c 
    635 @@ -52,6 +52,8 @@ void (*_dma_cache_wback)(unsigned long s 
    636  void (*_dma_cache_inv)(unsigned long start, unsigned long size); 
    637   
    638  EXPORT_SYMBOL(_dma_cache_wback_inv); 
    639 +EXPORT_SYMBOL(_dma_cache_wback); 
    640 +EXPORT_SYMBOL(_dma_cache_inv); 
    641   
    642  #endif /* CONFIG_DMA_NONCOHERENT */ 
    643   
    644546--- a/arch/mips/mm/tlbex.c 
    645547+++ b/arch/mips/mm/tlbex.c 
  • trunk/target/linux/xburst/qi_lb60/target.mk

    r19986 r20132  
    11BOARDNAME:=QI Ben Nanonote (qi_lb60) 
    2 #DEFAULT_PACKAGES += uboot-xburst-qi_lb60 
     2DEFAULT_PACKAGES += \ 
     3        kmod-sound-core \ 
     4        kmod-sound-soc-core \ 
     5        kmod-sound-soc-jz4740 \ 
     6        kmod-sound-soc-jzcodec \ 
     7        kmod-sound-soc-qi_lb60 \ 
     8 
Note: See TracChangeset for help on using the changeset viewer.