]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Merge branch 'lvds-support' into uboot-rel
authorLothar Waßmann <LW@KARO-electronics.de>
Wed, 11 Dec 2013 09:29:16 +0000 (10:29 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Wed, 11 Dec 2013 09:29:16 +0000 (10:29 +0100)
1  2 
board/karo/tx53/tx53.c
board/karo/tx6/tx6qdl.c

Simple merge
index 387908a656974ce211181deb33a8c20196f1cf93,27fc6fac1d81e8de580fa51643cad3a80c957e3e..edea4457412cb37366424b8b60194a5be890fb3b
@@@ -1289,8 -1324,20 +1322,9 @@@ static struct node_info nodes[] = 
  static const char *tx6_touchpanels[] = {
        "ti,tsc2007",
        "edt,edt-ft5x06",
+       "eeti,egalax_ts",
  };
  
 -#ifndef CONFIG_SYS_LVDS_IF
 -static inline void tx6_fdt_fixup_sata(void *blob)
 -{
 -      karo_fdt_enable_node(blob, "/soc/sata", 0);
 -}
 -#else
 -static inline void tx6_fdt_fixup_sata(void *blob)
 -{
 -}
 -#endif
 -
  void ft_board_setup(void *blob, bd_t *bd)
  {
        const char *baseboard = getenv("baseboard");