1. 31 Jan, 2019 35 commits
  2. 30 Jan, 2019 5 commits
    • Tom Rini's avatar
      Merge branch 'master' of git://git.denx.de/u-boot-sunxi · 552452f8
      Tom Rini authored
      - Enable DM_MMC support
      552452f8
    • Jagan Teki's avatar
      arm: sunxi: Enable DM_MMC · a7cca579
      Jagan Teki authored
      
      
      Enable DM_MMC for all Allwinner SoCs, this will eventually
      enable BLK.
      
      Also removed DM_MMC enablement in few parts of sunxi
      configurations.
      Signed-off-by: Jagan Teki's avatarJagan Teki <jagan@amarulasolutions.com>
      Reviewed-by: André Przywara's avatarAndre Przywara <andre.przywara@arm.com>
      Signed-off-by: André Przywara's avatarAndre Przywara <andre.przywara@arm.com>
      a7cca579
    • Jagan Teki's avatar
      sunxi: A64: pinebook-u-boot: Include sunxi-u-boot.dtsi · cebeba9f
      Jagan Teki authored
      
      
      Like other Allwinner A64 boards, pinebook also need altering
      auto-numbering of mmc2 to mmc1 which is available in common
      sunxi dsti file, sunxi-u-boot.dtsi
      
      Pinebook has a separate sun50i-a64-pinebook-u-boot.dtsi which
      takes more precedence for u-boot.dtsi inclusion and it eventually
      failed to include the sunxi-u-boot.dtsi.
      
      So, this patch add support to include the sunxi-u-boot.dtsi in the
      sun50i-a64-pinebook-u-boot.dtsi
      Signed-off-by: Jagan Teki's avatarJagan Teki <jagan@amarulasolutions.com>
      Tested-by: Vasily Khoruzhick <anarsoul@gmail.com> # Pinebook
      cebeba9f
    • Jagan Teki's avatar
      arm: dts: sunxi: Alter mmc2 auto-numbering to mmc1 · 708b5da3
      Jagan Teki authored
      
      
      Environment and fastboot mmc devices are configured based on the number
      of mmc slots defined on particular board configs, MMC_SUNXI_SLOT_EXTRA.
      
      If MMC_SUNXI_SLOT_EXTRA is more than 1, the default env and fastboot
      mmc devices is mmc1 by assuming mmc0 is SD and mmc1 is emmc device.
      
      But with DM_MMC the mmc devices are numbered as per the dts node
      enablement. If there is a chance of having enabling all mmc nodes
      in dts say mmc0, mmc1, mmc2 then the default env and fastboot devices
      will failed to assign proper emmc device since mmc2 is emmc in most
      of the Allwinner platforms.
      
      So, we need to alter the auto-numbering by aliasing mmc2 to mmc1 since
      aliases take precedence over auto-numbering.
      
      If the dts enables mmc0, mmc1, mmc2, then all the nodes will probe
      sequentially and auto-numbered as it is. but when aliases mmc1 with mmc2
      the resulting number should be that mmc0 is till mmc0, mmc2 become mmc1
      and mmc2 become mmc1
      
      Without aliases of mmc1 = &mmc2;
      -------------------------------
      MMC:   mmc@1c0f000: 0, mmc@1c10000: 1, mmc@1c11000: 2
      
      With aliases of mmc1 = &mmc2;
      ----------------------------
      MMC:   Device 'mmc@1c11000': seq 1 is in use by 'mmc@1c10000'
      mmc@1c0f000: 0, mmc@1c10000: 2, mmc@1c11000: 1
      Loading Environment from FAT... OK
      
      Some platforms like A20 has mmc0...mmc3, but there is no usecases now
      for enabling all mmc controllers in any of A20 board dts files.
      Signed-off-by: Jagan Teki's avatarJagan Teki <jagan@amarulasolutions.com>
      708b5da3
    • André Przywara's avatar
      sunxi: clk: enable clk and reset for CCU devices · 13b0867d
      André Przywara authored and Jagan Teki's avatar Jagan Teki committed
      
      
      Some Allwinner clock devices have parent clocks and reset gates itself,
      which need to be activated for them to work.
      
      Add some code to just assert all resets and enable all clocks given.
      This should enable the A80 MMC config clock, which requires both to be
      activated. The full CCU devices typically don't require resets, and have
      just fixed clocks as their parents. Since we treat both as optional and
      enabling fixed clocks is a NOP, this works for all cases, without the need
      to differentiate between those clock types.
      Signed-off-by: André Przywara's avatarAndre Przywara <andre.przywara@arm.com>
      Acked-by: default avatarJagan Teki <jagan@openedev.com>
      13b0867d