]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 26 Mar 2013 08:51:09 +0000 (09:51 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 26 Mar 2013 08:51:09 +0000 (09:51 +0100)
1  2 
MAINTAINERS
boards.cfg
drivers/mmc/sdhci.c
include/configs/exynos5250-dt.h
include/fdtdec.h
lib/fdtdec.c

diff --combined MAINTAINERS
index 09430ba4a33fe89c6777d0776b3496f35b54aa4d,f6723efc84e47e59b3974d8cba9d1ca20bdc4101..646997327e24f6f0d3a8f7554415718d1cb5ebaa
@@@ -150,6 -150,9 +150,6 @@@ Wolfgang Denk <wd@denx.de
  
        P3G4            MPC7410
  
 -      PCIPPC2         MPC750
 -      PCIPPC6         MPC750
 -
  Phil Edworthy <phil.edworthy@renesas.com>
  
        rsk7264         SH7264
@@@ -231,7 -234,6 +231,7 @@@ Wolfgang Grandegger <wg@denx.de
  
  Anatolij Gustschin <agust@denx.de>
  
 +      ac14xx          MPC5121e
        O2D             MPC5200
        O2D300          MPC5200
        O2DNT2          MPC5200
@@@ -395,7 -397,6 +395,7 @@@ Ricardo Ribalda <ricardo.ribalda@uam.es
  Stefan Roese <sr@denx.de>
  
        a3m071          MPC5200
 +      a4m2k           MPC5200
  
        P3M7448         MPC7448
  
@@@ -606,7 -607,6 +606,7 @@@ Enric Balletbo i Serra <eballetbo@iseeb
  
        igep0020        ARM ARMV7 (OMAP3xx SoC)
        igep0030        ARM ARMV7 (OMAP3xx SoC)
 +      igep0032        ARM ARMV7 (OMAP3xx SoC)
  
  Eric Benard <eric@eukrea.com>
  
@@@ -833,10 -833,6 +833,10 @@@ Stelian Pop <stelian@popies.net
        at91sam9263ek   ARM926EJS (AT91SAM9263 SoC)
        at91sam9rlek    ARM926EJS (AT91SAM9RL SoC)
  
 +Matt Porter <mporter@ti.com>
 +
 +      ti814x_evm      ARM ARMV7 (TI814x Soc)
 +
  Dave Purdy <david.c.purdy@gmail.com>
  
        pogo_e02        ARM926EJS (Kirkwood SoC)
@@@ -914,6 -910,10 +914,10 @@@ Matt Sealey <matt@genesi-usa.com
  Bo Shen <voice.shen@atmel.com>
        at91sam9x5ek            ARM926EJS (AT91SAM9G15,G25,G35,X25,X35 SoC)
  
+ Rajeshwari Shinde <rajeshwari.s@samsung.com>
+       snow                    ARM ARMV7 (EXYNOS5250 SoC)
  Michal Simek <monstr@monstr.eu>
  
        zynq            ARM ARMV7 (Zynq SoC)
@@@ -979,8 -979,6 +983,8 @@@ Tom Warren <twarren@nvidia.com
  
        harmony         Tegra20 (ARM7 & A9 Dual Core)
        seaboard        Tegra20 (ARM7 & A9 Dual Core)
 +      cardhu          Tegra30 (ARM7 & A9 Quad Core)
 +      dalmore         Tegra114 (ARM7 & A15 Quad Core)
  
  Tom Warren <twarren@nvidia.com>
  Stephen Warren <swarren@nvidia.com>
@@@ -1042,14 -1040,6 +1046,14 @@@ Pali Rohár <pali.rohar@gmail.com
  
        nokia_rx51      ARM ARMV7 (OMAP34xx SoC)
  
 +Eric Nelson <eric.nelson@boundarydevices.com>
 +      nitrogen6dl             i.MX6DL         1GB
 +      nitrogen6dl2g           i.MX6DL         2GB
 +      nitrogen6q              i.MX6Q/6D       1GB
 +      nitrogen6q2g            i.MX6Q/6D       2GB
 +      nitrogen6s              i.MX6S          512MB
 +      nitrogen6s1g            i.MX6S          1GB
 +
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards:
@@@ -1240,7 -1230,7 +1244,7 @@@ Yoshihiro Shimoda <yoshihiro.shimoda.uh
  #     Board           CPU                                             #
  #########################################################################
  
 -Mike Frysinger <vapier@gentoo.org>
 +Sonic Zhang <sonic.adi@gmail.com>
  Blackfin Team <u-boot-devel@blackfin.uclinux.org>
  
        BF506F-EZKIT    BF506
        BF538F-EZKIT    BF538
        BF548-EZKIT     BF548
        BF561-EZKIT     BF561
 +      BF609-EZKIT     BF609
  
  M.Hasewinkel (MHA) <info@ssv-embedded.de>
  
diff --combined boards.cfg
index 718a5d6f4e7235b62021c70d9a596b0932776568,54357eb5a26b874793fb44b26ef571e2561400e1..5fc70be8f537956c09faee52012664a7ffb70701
@@@ -95,7 -95,6 +95,7 @@@ at91sam9g10ek_nandflash      ar
  at91sam9g20ek_dataflash_cs0  arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,SYS_USE_DATAFLASH_CS0
  at91sam9g20ek_dataflash_cs1  arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,SYS_USE_DATAFLASH_CS1
  at91sam9g20ek_nandflash      arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,SYS_USE_NANDFLASH
 +at91sam9g20ek_2mmc_nandflash arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_NANDFLASH
  at91sam9m10g45ek_nandflash   arm         arm926ejs   at91sam9m10g45ek    atmel          at91        at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_NANDFLASH
  at91sam9rlek_dataflash       arm         arm926ejs   at91sam9rlek        atmel          at91        at91sam9rlek:AT91SAM9RL,SYS_USE_DATAFLASH
  at91sam9rlek_nandflash       arm         arm926ejs   at91sam9rlek        atmel          at91        at91sam9rlek:AT91SAM9RL,SYS_USE_NANDFLASH
@@@ -234,14 -233,11 +234,14 @@@ integratorap_cm946es         ar
  integratorcp_cm946es         arm         arm946es    integrator          armltd         -               integratorcp:CM946ES
  ca9x4_ct_vxp                 arm         armv7       vexpress            armltd
  am335x_evm                   arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1
 +am335x_evm_spiboot           arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,SPI_BOOT
  am335x_evm_uart1             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL2,CONS_INDEX=2
  am335x_evm_uart2             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL3,CONS_INDEX=3
  am335x_evm_uart3             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL4,CONS_INDEX=4
  am335x_evm_uart4             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL5,CONS_INDEX=5
  am335x_evm_uart5             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL6,CONS_INDEX=6
 +am335x_evm_usbspl            arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,SPL_USBETH_SUPPORT
 +ti814x_evm                   arm         armv7       ti814x              ti             am33xx
  pcm051                       arm         armv7       pcm051              phytec         am33xx      pcm051
  highbank                     arm         armv7       highbank            -              highbank
  mx51_efikamx                 arm         armv7       mx51_efikamx        genesi         mx5           mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_mx.cfg
@@@ -258,12 -254,6 +258,12 @@@ mx6qsabreauto                ar
  mx6qsabrelite                arm         armv7       mx6qsabrelite       freescale      mx6           mx6qsabrelite:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
  mx6qsabresd                  arm         armv7       mx6qsabresd         freescale      mx6           mx6qsabresd:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
  eco5pk                       arm         armv7       eco5pk              8dtech         omap3
 +nitrogen6dl                  arm         armv7       nitrogen6x          boundary       mx6           nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024
 +nitrogen6dl2g                arm         armv7       nitrogen6x          boundary       mx6           nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048
 +nitrogen6q                   arm         armv7       nitrogen6x          boundary       mx6           nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024
 +nitrogen6q2g                 arm         armv7       nitrogen6x          boundary       mx6           nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048
 +nitrogen6s                   arm         armv7       nitrogen6x          boundary       mx6           nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512
 +nitrogen6s1g                 arm         armv7       nitrogen6x          boundary       mx6           nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024
  cm_t35                       arm         armv7       cm_t35              -              omap3
  omap3_overo                  arm         armv7       overo               -              omap3
  omap3_pandora                arm         armv7       pandora             -              omap3
@@@ -272,7 -262,6 +272,7 @@@ igep0020                     ar
  igep0020_nand                arm         armv7       igep00x0            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND
  igep0030                     arm         armv7       igep00x0            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND
  igep0030_nand                arm         armv7       igep00x0            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND
 +igep0032                     arm         armv7       igep00x0            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0032,BOOT_ONENAND
  am3517_evm                   arm         armv7       am3517evm           logicpd        omap3
  mt_ventoux                   arm         armv7       mt_ventoux          teejet         omap3
  omap3_zoom1                  arm         armv7       zoom1               logicpd        omap3
@@@ -293,11 -282,11 +293,12 @@@ nokia_rx51                   ar
  omap4_panda                  arm         armv7       panda               ti             omap4
  omap4_sdp4430                arm         armv7       sdp4430             ti             omap4
  omap5_evm                    arm         armv7       omap5_evm           ti           omap5
 +dra7xx_evm                 arm         armv7       dra7xx              ti             omap5
  s5p_goni                     arm         armv7       goni                samsung        s5pc1xx
  smdkc100                     arm         armv7       smdkc100            samsung        s5pc1xx
  origen                             arm         armv7       origen              samsung        exynos
  s5pc210_universal            arm         armv7       universal_c210      samsung        exynos
+ snow                       arm         armv7       smdk5250            samsung        exynos
  smdk5250                   arm         armv7       smdk5250            samsung        exynos
  smdkv310                   arm         armv7       smdkv310            samsung        exynos
  trats                        arm         armv7       trats               samsung        exynos
@@@ -313,7 -302,6 +314,7 @@@ snowball                     ar
  kzm9g                        arm         armv7       kzm9g               kmc            rmobile
  armadillo-800eva             arm         armv7       armadillo-800eva    atmark-techno  rmobile
  zynq                         arm         armv7       zynq                xilinx         zynq
 +zynq_dcc                     arm         armv7       zynq                xilinx         zynq        zynq:ZYNQ_DCC
  socfpga_cyclone5                arm         armv7          socfpga_cyclone5    altera             socfpga
  actux1_4_16                  arm         ixp         actux1              -              -           actux1:FLASH2X2
  actux1_4_32                  arm         ixp         actux1              -              -           actux1:FLASH2X2,RAM_32MB
@@@ -374,7 -362,6 +375,7 @@@ bf538f-ezkit                 blackfi
  bf548-ezkit                  blackfin    blackfin
  bf561-acvilon                blackfin    blackfin
  bf561-ezkit                  blackfin    blackfin
 +bf609-ezkit                  blackfin    blackfin
  blackstamp                   blackfin    blackfin
  blackvme                     blackfin    blackfin
  br4                          blackfin    blackfin
@@@ -478,6 -465,8 +479,6 @@@ openrisc-generic             openris
  EVB64260                     powerpc     74xx_7xx    evb64260            -              -           EVB64260
  EVB64260_750CX               powerpc     74xx_7xx    evb64260            -              -           EVB64260
  P3G4                         powerpc     74xx_7xx    evb64260
 -PCIPPC2                      powerpc     74xx_7xx    pcippc2
 -PCIPPC6                      powerpc     74xx_7xx    pcippc2
  ppmc7xx                      powerpc     74xx_7xx
  ZUMA                         powerpc     74xx_7xx    evb64260
  ELPPC                        powerpc     74xx_7xx    elppc               eltec
@@@ -492,12 -481,10 +493,12 @@@ aria                         powerp
  mecp5123                     powerpc     mpc512x     -                   esd
  mpc5121ads                   powerpc     mpc512x     mpc5121ads          freescale
  mpc5121ads_rev2              powerpc     mpc512x     mpc5121ads          freescale      -           mpc5121ads:MPC5121ADS_REV2
 +ac14xx                       powerpc     mpc512x     ac14xx              ifm
  cmi_mpc5xx                   powerpc     mpc5xx      cmi
  PATI                         powerpc     mpc5xx      pati                mpl
  a3m071                       powerpc     mpc5xxx     a3m071
  a4m072                       powerpc     mpc5xxx     a4m072
 +a4m2k                        powerpc     mpc5xxx     a3m071              -              -           a3m071:A4M2K
  BC3450                       powerpc     mpc5xxx     bc3450
  canmb                        powerpc     mpc5xxx
  cm5200                       powerpc     mpc5xxx
@@@ -719,10 -706,9 +720,10 @@@ SIMPC8313_SP                 powerp
  TQM834x                      powerpc     mpc83xx     tqm834x             tqc
  suvd3                        powerpc     mpc83xx     km83xx              keymile        -           suvd3:SUVD3
  kmvect1                      powerpc     mpc83xx     km83xx              keymile        -           suvd3:KMVECT1
 -tuge1                        powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KM_DISABLE_APP2,TUGE1
 -tuxx1                        powerpc     mpc83xx     km83xx              keymile
 -kmsupx5                      powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KM_DISABLE_APP2,KMSUPX5
 +tuge1                        powerpc     mpc83xx     km83xx              keymile        -           tuxx1:TUGE1
 +tuxx1                        powerpc     mpc83xx     km83xx              keymile        -           tuxx1:TUXX1
 +kmopti2                      powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KMOPTI2
 +kmsupx5                      powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KMSUPX5
  sbc8548                      powerpc     mpc85xx     sbc8548             -              -           sbc8548
  sbc8548_PCI_33               powerpc     mpc85xx     sbc8548             -              -           sbc8548:PCI,33
  sbc8548_PCI_33_PCIE          powerpc     mpc85xx     sbc8548             -              -           sbc8548:PCI,33,PCIE
diff --combined drivers/mmc/sdhci.c
index daca0ea4f7021aa5138b3395ed3c7bca5e8834c0,551b4232c8ef3c0434715816f1c2ae51a2d9dfe3..1eaea04ad108ac27fe5e4c954eed7fb1221384d2
@@@ -412,9 -412,11 +412,11 @@@ int sdhci_init(struct mmc *mmc
                        status = sdhci_readl(host, SDHCI_PRESENT_STATE);
        }
  
-       /* Eable all state */
-       sdhci_writel(host, SDHCI_INT_ALL_MASK, SDHCI_INT_ENABLE);
-       sdhci_writel(host, SDHCI_INT_ALL_MASK, SDHCI_SIGNAL_ENABLE);
+       /* Enable only interrupts served by the SD controller */
+       sdhci_writel(host, SDHCI_INT_DATA_MASK | SDHCI_INT_CMD_MASK
+                    , SDHCI_INT_ENABLE);
+       /* Mask all sdhci interrupt sources */
+       sdhci_writel(host, 0x0, SDHCI_SIGNAL_ENABLE);
  
        return 0;
  }
@@@ -438,7 -440,6 +440,7 @@@ int add_sdhci(struct sdhci_host *host, 
        mmc->set_ios = sdhci_set_ios;
        mmc->init = sdhci_init;
        mmc->getcd = NULL;
 +      mmc->getwp = NULL;
  
        caps = sdhci_readl(host, SDHCI_CAPABILITIES);
  #ifdef CONFIG_MMC_SDMA
index 1c624d4a54e1482bbc1eb8c671d15d1bc9325d1b,f334d4595a2045c8729a78a781d8b0cc36bd65bf..2b9d6ac061e226d812431a93d74ea3bc464a8991
@@@ -33,7 -33,6 +33,7 @@@
  
  #include <asm/arch/cpu.h>             /* get chip and board defs */
  
 +#define CONFIG_SYS_GENERIC_BOARD
  #define CONFIG_ARCH_CPU_INIT
  #define CONFIG_DISPLAY_CPUINFO
  #define CONFIG_DISPLAY_BOARDINFO
  #define CONFIG_BOOTDELAY              3
  #define CONFIG_ZERO_BOOTDELAY_CHECK
  
+ /* Thermal Management Unit */
+ #define CONFIG_EXYNOS_TMU
+ #define CONFIG_CMD_DTT
+ #define CONFIG_TMU_CMD_DTT
  /* USB */
  #define CONFIG_CMD_USB
  #define CONFIG_USB_EHCI
  #ifdef CONFIG_CMD_SOUND
  #define CONFIG_SOUND
  #define CONFIG_I2S
+ #define CONFIG_SOUND_MAX98095
  #define CONFIG_SOUND_WM8994
  #endif
  
diff --combined include/fdtdec.h
index 21894835d1b4c9414313ad3243d1142d3a26cab1,6552942116562a56cb5a854942ce40e335bbfe90..4fd1b670dc860a34f27da510467eb5284627dfb0
@@@ -62,7 -62,6 +62,7 @@@ struct fdt_memory 
  enum fdt_compat_id {
        COMPAT_UNKNOWN,
        COMPAT_NVIDIA_TEGRA20_USB,      /* Tegra20 USB port */
 +      COMPAT_NVIDIA_TEGRA114_I2C,     /* Tegra114 I2C w/single clock source */
        COMPAT_NVIDIA_TEGRA20_I2C,      /* Tegra20 i2c */
        COMPAT_NVIDIA_TEGRA20_DVC,      /* Tegra20 dvc (really just i2c) */
        COMPAT_NVIDIA_TEGRA20_EMC,      /* Tegra20 memory controller */
@@@ -71,8 -70,6 +71,8 @@@
        COMPAT_NVIDIA_TEGRA20_NAND,     /* Tegra2 NAND controller */
        COMPAT_NVIDIA_TEGRA20_PWM,      /* Tegra 2 PWM controller */
        COMPAT_NVIDIA_TEGRA20_DC,       /* Tegra 2 Display controller */
 +      COMPAT_NVIDIA_TEGRA30_SDMMC,    /* Tegra30 SDMMC controller */
 +      COMPAT_NVIDIA_TEGRA20_SDMMC,    /* Tegra20 SDMMC controller */
        COMPAT_NVIDIA_TEGRA20_SFLASH,   /* Tegra 2 SPI flash controller */
        COMPAT_NVIDIA_TEGRA20_SLINK,    /* Tegra 2 SPI SLINK controller */
        COMPAT_SMSC_LAN9215,            /* SMSC 10/100 Ethernet LAN9215 */
@@@ -83,7 -80,9 +83,9 @@@
        COMPAT_SAMSUNG_EXYNOS_SPI,      /* Exynos SPI */
        COMPAT_SAMSUNG_EXYNOS_EHCI,     /* Exynos EHCI controller */
        COMPAT_SAMSUNG_EXYNOS_USB_PHY,  /* Exynos phy controller for usb2.0 */
+       COMPAT_SAMSUNG_EXYNOS_TMU,      /* Exynos TMU */
        COMPAT_MAXIM_MAX77686_PMIC,     /* MAX77686 PMIC */
+       COMPAT_MAXIM_98095_CODEC,       /* MAX98095 Codec */
  
        COMPAT_COUNT,
  };
diff --combined lib/fdtdec.c
index 43f29f5c6b40992fbc2087a80053a74262149452,88f6b68270bb534173359749f071828d96a66c1c..b232096f92374e311dcdaba938f22a4bdc5039e2
@@@ -37,7 -37,6 +37,7 @@@ DECLARE_GLOBAL_DATA_PTR
  static const char * const compat_names[COMPAT_COUNT] = {
        COMPAT(UNKNOWN, "<none>"),
        COMPAT(NVIDIA_TEGRA20_USB, "nvidia,tegra20-ehci"),
 +      COMPAT(NVIDIA_TEGRA114_I2C, "nvidia,tegra114-i2c"),
        COMPAT(NVIDIA_TEGRA20_I2C, "nvidia,tegra20-i2c"),
        COMPAT(NVIDIA_TEGRA20_DVC, "nvidia,tegra20-i2c-dvc"),
        COMPAT(NVIDIA_TEGRA20_EMC, "nvidia,tegra20-emc"),
@@@ -46,8 -45,6 +46,8 @@@
        COMPAT(NVIDIA_TEGRA20_NAND, "nvidia,tegra20-nand"),
        COMPAT(NVIDIA_TEGRA20_PWM, "nvidia,tegra20-pwm"),
        COMPAT(NVIDIA_TEGRA20_DC, "nvidia,tegra20-dc"),
 +      COMPAT(NVIDIA_TEGRA30_SDMMC, "nvidia,tegra30-sdhci"),
 +      COMPAT(NVIDIA_TEGRA20_SDMMC, "nvidia,tegra20-sdhci"),
        COMPAT(NVIDIA_TEGRA20_SFLASH, "nvidia,tegra20-sflash"),
        COMPAT(NVIDIA_TEGRA20_SLINK, "nvidia,tegra20-slink"),
        COMPAT(SMSC_LAN9215, "smsc,lan9215"),
@@@ -58,7 -55,9 +58,9 @@@
        COMPAT(SAMSUNG_EXYNOS_SPI, "samsung,exynos-spi"),
        COMPAT(SAMSUNG_EXYNOS_EHCI, "samsung,exynos-ehci"),
        COMPAT(SAMSUNG_EXYNOS_USB_PHY, "samsung,exynos-usb-phy"),
+       COMPAT(SAMSUNG_EXYNOS_TMU, "samsung,exynos-tmu"),
        COMPAT(MAXIM_MAX77686_PMIC, "maxim,max77686_pmic"),
+       COMPAT(MAXIM_98095_CODEC, "maxim,max98095-codec"),
  };
  
  const char *fdtdec_get_compatible(enum fdt_compat_id id)