1. Oct 26, 2015
    • Olof Johansson's avatar
      Merge tag 'arm/soc/for-4.4/rpi-dt-v2' of https://github.com/Broadcom/stblinux into next/dt · 64ebda3a
      Olof Johansson authored
      This pull request contains the DT changes for BCM2835 in 4.4.  It
      pulls in clk/clk-bcm2835 (which Stephen Boyd has said would be stable)
      because the DT changes to enable the clock driver need the driver
      itself to be present. These changes include the following:
      
      - Eric Anholt, moves the bcm2835 clock driver under bcm/ where it belongs with
        other Broadcom clock providers drivers, defines the binding for new clock
        driver, adds support for programming the BCM2835 audio domain, adds the DDC I2C
        controller to Device Tree, and finally migrates the Device Tree to use the new
        clock driver binding
      
      - Lubomir Rintel adds support for the Raspberry Pi Model A+ and B revision 2, and
        remove the I2S controller which is non-existent on Raspberry Pi Model B
      
      - Stefan Wahren adds an uart0 label for referencing the UART adapter
      
      * tag 'arm/soc/for-4.4/rpi-dt-v2' of https://github.com/Broadcom/stblinux
      
      :
        ARM: bcm2835: Add the DDC I2C controller to the device tree.
        ARM: bcm2835: Switch to using the new clock driver support.
        ARM: bcm2835: dt: Add Raspberry Pi Model A+
        ARM: bcm2835: dt: Add Raspberry Pi Model B rev2
        ARM: bcm2835: dt: Raspberry Pi Model B had no I2S
        ARM: bcm2835: add label for uart0
        clk: bcm2835: Add support for programming the audio domain clocks
        clk: bcm2835: Add binding docs for the new platform clock driver.
        clk: bcm2835: Move under bcm/ with other Broadcom SoC clk drivers.
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      64ebda3a
    • Masahiro Yamada's avatar
      ARM: dts: uniphier: add I2C aliases for ProXstream2 boards · 5f760486
      Masahiro Yamada authored
      
      
      Add aliases to fix the I2C indexes like the other UniPhier boards.
      
      Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      5f760486
    • Olof Johansson's avatar
      Merge tag 'samsung-dt-2' of... · 99b6eb55
      Olof Johansson authored
      Merge tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
      
      Samsung 2nd DT updates for v4.4
      
      - use exynos5420-dw-mshc instead of exynos5250 for exynos3250
      - add DISP1 clocks and the DISP1 power domain of two closk
        on exynos5250 (clock commit got Stephen's ack)
      - add vbus regulators on exynos3250, exynos4210 and exynos4412 boards
      - fix typo in regulator enable GPIO property on s5pv20-aquila and goni
      - document: correct the example of exynos power domain clocks
      - document: consolidate exynos SoC dt-bindings and non-Samsung
        boards related compatibles (FriendlyARM, Google, Hardkernel
        and Insignal)
      - update MAINTAINER entries accordingly (documentation)
      
      * tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung
      
      :
        MAINTAINERS: Add documentation and dt-bindings for exynos stuff
        dt-bindings: EXYNOS: Document compatibles from other vendors
        dt-bindings: Consolidate Exynos SoC bindings
        ARM: dts: Add clocks to DISP1 domain in exynos5250
        dt-bindings: Correct the example for Exynos power domain clocks
        ARM: dts: Fix typo in regulator enable GPIO property in s5pv210-goni
        ARM: dts: Fix typo in regulator enable GPIO property in s5pv210-aquila
        ARM: dts: Add vbus regulator to USB2 phy nodes on exynos3250, exynos4210 and exynos4412 boards
        clk: samsung: exynos5250: Add DISP1 clocks
        ARM: dts: use exynos5420-dw-mshc compatible for exynos3250
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      99b6eb55
    • Olof Johansson's avatar
      Merge tag 'tegra-for-4.4-dt' of... · 3eb52a06
      Olof Johansson authored
      Merge tag 'tegra-for-4.4-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt
      
      ARM: tegra: Devicetree changes for v4.4-rc1
      
      Mostly a bunch of updates to the Toradex Apalis and Colibri platforms
      along with a couple of cleanup patches.
      
      * tag 'tegra-for-4.4-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux
      
      : (25 commits)
        ARM: tegra: Use consistent indentation for SATA node
        ARM: tegra: colibri-eval: Fix power/wakeup key
        ARM: tegra: colibri-eval: Add comment concerning SD/MMC
        ARM: tegra: colibri-eval: Fix vendor string of M41T0M6 RTC
        ARM: tegra: colibri: Properly align pin names
        ARM: tegra: colibri: Replace eMMC label by comment
        ARM: tegra: colibri: Activate STMPE811 touch controller
        ARM: tegra: colibri: Add touch pen interrupt pin muxing
        ARM: tegra: colibri: Fix comment about 3v3 fixed supply
        ARM: tegra: colibri: Add pin muxing for on-module power I2C
        ARM: tegra: colibri: Improve comment about thermal alert pin
        ARM: tegra: colibri: Fix HDMI supplies
        ARM: tegra: colibri: Update hardware revisions compatibility
        ARM: tegra: apalis-eval: Fix power/wakeup key
        ARM: tegra: apalis-eval: Fix backlight PWM comment
        ARM: tegra: apalis-eval: Set OTG dr_mode
        ARM: tegra: apalis-eval: Enable HDA controller
        ARM: tegra: apalis: Properly align pin names
        ARM: tegra: apalis: Add digital audio pin muxing
        ARM: tegra: apalis: Add comment concerning eMMC
        ...
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      3eb52a06
  2. Oct 24, 2015
  3. Oct 23, 2015
    • Eric Anholt's avatar
      ARM: bcm2835: Add the DDC I2C controller to the device tree. · 121432c7
      Eric Anholt authored
      
      
      We need to use it for getting video modes over HDMI.
      
      Signed-off-by: default avatarEric Anholt <eric@anholt.net>
      Acked-by: default avatarStephen Warren <swarren@wwwdotorg.org>
      121432c7
    • Eric Anholt's avatar
      ARM: bcm2835: Switch to using the new clock driver support. · 94cb7f76
      Eric Anholt authored
      
      
      This will give us the ability to set the pixel and HDMI state machine
      clocks for the VC4 KMS driver, change the CPU frequency, and
      potentially gate clocks in the future (once we also write a power
      domain driver).  It also gives the uart an explicit clock reference,
      so that we don't need to change the physical addresses of the old
      fixed clk_bcm2835.c clocks for Raspberry Pi 2 port.
      
      Two clocks get their frequencies updated as a result of this.  One is
      uart's apb_pclk, which was previously accidentally grabbing the fixed
      uart0_pclk due to the apb_pclk not having clk_register_clkdev()
      called.  The uart doesn't seem to do anything with apb_pclk other than
      make sure it's on, so that appears safe (also, as far as I can see,
      the apb clock is actually the same as the VPU clock).  The other is
      EMMC, which according to the docs was supposed to be in the 50-100Mhz
      range, but it turns out the firmware needed to change to running it at
      the 250Mhz core clock speed to avoid a bug in clock domain crossing.
      
      Additionally, anything using BCM2835_CLOCK_VPU will now have a correct
      clock rate if the user configures the boot-time core clock speed using
      config.txt.
      
      Signed-off-by: default avatarEric Anholt <eric@anholt.net>
      Acked-by: default avatarStephen Warren <swarren@wwwdotorg.org>
      94cb7f76
    • Eric Anholt's avatar
      Merge remote-tracking branch 'clk/clk-bcm2835' into bcm2835-dt-next · 83e7f6e1
      Eric Anholt authored
      
      
      The DT changes for enabling the clock driver on 2835 require that the
      clock driver be present.  Stephen Boyd has said that these commits
      would be stable for merging.
      
      Signed-off-by: default avatarEric Anholt <eric@anholt.net>
      83e7f6e1