1. 28 7月, 2014 3 次提交
    • A
      Merge tag 'v3.17-rockchip-rk3xxx-dts' of... · 1c607f0a
      Arnd Bergmann 提交于
      Merge tag 'v3.17-rockchip-rk3xxx-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
      
      Merge "ARM: dts: changes for existing rockchip boards" from Heiko Stuebner:
      
      Collected changes for existing Rockchip boards
      - convert to new clock driver
      - bring structure in line with recent rk3288 comments
        (no soc-nodes, using phandles when adding changes, sorted by address)
      - i2c, board-pmic and pwm nodes nodes
      - sd card slot and ir receiver on radxa rock
      
      * tag 'v3.17-rockchip-rk3xxx-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
        ARM: dts: rk3188-radxarock: add GPIO IR receiver node
        ARM: dts: rockchip: add pwm nodes
        ARM: dts: rockchip: add both clocks to uart nodes
        ARM: dts: rk3188-radxarock: enable sd-card slot
        ARM: dts: add i2c and regulator nodes to rk3188-radxarock
        ARM: dts: rockchip: add tps65910 regulator for bqcurie2
        ARM: dts: add rk3066 and rk3188 i2c device nodes and pinctrl settings
        ARM: dts: rockchip: oder nodes by register address
        ARM: dts: rockchip: remove address from pinctrl nodes
        ARM: dts: uses handles to reference nodes for changes
        ARM: dts: rockchip: add handles for shared nodes that don't have one yet
        ARM: dts: rockchip: remove soc subnodes
        arm: dts: rockchip: remove obsolete clock gate definitions
        ARM: dts: rockchip: move oscillator input clock into main dtsi
        ARM: dts: rockchip: add cru nodes and update device clocks to use it
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      1c607f0a
    • A
      Merge tag 'v3.17-rockchip-rk3288' of... · b99cfa66
      Arnd Bergmann 提交于
      Merge tag 'v3.17-rockchip-rk3288' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
      
      Merge "Initial support for Rockchip RK3288 SoCs" from Heiko Stuebner:
      
      * tag 'v3.17-rockchip-rk3288' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
        ARM: dts: Build dtbs for Rockchip boards
        ARM: dts: add rk3288 evaluation board
        ARM: dts: rockchip: add core rk3288 dtsi
        ARM: rockchip: enable support for RK3288 SoCs
        ARM: Kconfig: set default gpio number for rockchip SoCs
        ARM: rockchip: add debug uart used by rk3288
        ARM: rockchip: clarify usability of DEBUG_RK3X_UART debug_ll options
        dt-bindings: arm: add cortex-a12 and cortex-a17 cpu compatible properties
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      b99cfa66
    • A
      Merge branch 'clk-rockchip' of git://git.linaro.org/people/mike.turquette/linux into next/soc · 3fdef7e3
      Arnd Bergmann 提交于
      This is a dependency for the rk3288 DT updates, the branch should
      first get merged through Mike's clk git.
      
      * 'clk-rockchip' of git://git.linaro.org/people/mike.turquette/linux:
        ARM: rockchip: Select ARCH_HAS_RESET_CONTROLLER
        clk: rockchip: add clock controller for rk3288
        dt-bindings: add documentation for rk3288 cru
        clk: rockchip: add clock driver for rk3188 and rk3066 clocks
        dt-bindings: add documentation for rk3188 clock and reset unit
        clk: rockchip: add reset controller
        clk: rockchip: add clock type for pll clocks and pll used on rk3066
        clk: rockchip: add basic infrastructure for clock branches
        clk: composite: improve rate_hw sanity check logic
        clk: composite: allow read-only clocks
        clk: composite: support determine_rate using rate_ops->round_rate + mux_ops->set_parent
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      3fdef7e3
  2. 27 7月, 2014 15 次提交
  3. 26 7月, 2014 8 次提交
  4. 24 7月, 2014 2 次提交
  5. 23 7月, 2014 4 次提交
  6. 21 7月, 2014 2 次提交
  7. 20 7月, 2014 6 次提交
    • O
      Merge tag 'samsung-dt' of... · aaaa10b0
      Olof Johansson 提交于
      Merge tag 'samsung-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
      
      Merge "Samsung DT updates for v3.17" from Kukjin Kim:
      
      exynos3250: add i2s dt for audio interface
      
      exynos4
       - cleanup arm-pmu node because of 4 pmu on
         exynos4412 but 2 pmu on other exynos4 SoCs
       - add support sub-nodes to exynos usb host for exynos4
      
      exynos4412-odroid-common
       - fix T-FLASH hotplug detection
       - disable 'always on' for BUCK8
       - add support for GPIO based buttons
       - add MAX98090 audio codec
      
      exynos4412-odroidx2 and exynos4412-odroidu3
      - refactor exynos4412-odroidx and exynos4412-odroid-common
        for odroid-x2 and u2/u3
      
      exynos4412-odroidx
       - add support for USB phy, host and device
       - enable common hardware blocks, secure firmware calls,
         watchdog, g2d and fimc (mem2mem) multimedia accelerators
       - add support for USB phy, host and device
       - correct memory size
      
      exynos5410
       - fill in CPU clock-frequency property to avoid warning
      
      exynos5420
       - remove display pd because of instability
      
      exynos5420-peach-pit and exynos5800-peach-pi
       - sort nodes each other to check its differences easily
       - enable audio support and add sound-card name property
       - add mask-tpm-reset node
       - add cros_ec including keyboard, i2c tunnel and tps65090
         and battery under the i2c tunnel
      
      * tag 'samsung-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        ARM: dts: Add I2S dt node for exynos3250
        ARM: dts: Add cros_ec to exynos5420-peach-pit and exynos5800-peach-pi
        ARM: dts: clean up arm-pmu node for exynos4
        ARM: dts: remove display power domain for exynos5420
        ARM: dts: Add sound nodes for Odroid-X2/U3 boards
        ARM: dts: fix T-FLASH hotplug detection for exynos4412-odroid-common
        ARM: dts: add support for GPIO buttons for exynos4412-odroid
        ARM: dts: disable 'always on' for BUCK8 regulator for exynos4412-odroid-common
        ARM: dts: refactor Odroid DTS file and add support for Odroid X2 and U2/U3
        ARM: dts: correct memory size for exynos4412-odroidx
        ARM: dts: add support for USB phy, host and device for exynos4412-odroidx
        ARM: dts: enable common hardware blocks for exynos4412-odroidx
        ARM: dts: add port sub-nodes to exynos usb host modules for exynos4
        ARM: dts: Add mask-tpm-reset node in exynos5800-peach-pi
        ARM: dts: Add mask-tpm-reset node in exynos5420-peach-pit
        ARM: dts: Add sound-card name for Snow/Peach-Pit/Peach-Pi
        ARM: dts: Fill in CPU clock-frequency for exynos5410
        ARM: dts: Sort nodes within Peach-pit/Peach-pi dts files
        ARM: dts: Enable audio support for exynos5800-peach-pi
      aaaa10b0
    • O
      Merge tag 'tegra-for-3.17-dt' of... · 223f93ed
      Olof Johansson 提交于
      Merge tag 'tegra-for-3.17-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt
      
      Merge "ARM: tegra: device tree changes for 3.17" from Thierry Reding:
      
      - New board support:
        * Apalis T30
      - HDA support for Tegra124 and Venice2
      - Display on Medcom Wide and Roth
      - GK20A support on Tegra124
      - XUSB pad controller for Tegra124 and Jetson TK1
      - Various cleanups
      
      This pulls in the for-3.17/fuse-move, for-3.17/dt-cros-ec-kbd and
      for-3.17/xusb-padctl branches to resolve dependencies.
      
      Note that the Apalis T30 support has a runtime dependency on the
      for-3.17/pcie-regulators branch, so they should preferably be applied
      in that order. I didn't merge that branch into this because Apalis T30
      support is new, therefore can't regress, and because the dependency
      exists only at runtime.
      
      * tag 'tegra-for-3.17-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: (28 commits)
        ARM: tegra: roth: add display DT node
        ARM: tegra: Fix typoed ams,ext-control properties
        ARM: tegra: jetson-tk1: Add XUSB pad controller
        ARM: tegra: tegra124: Add XUSB pad controller
        ARM: tegra: add GK20A GPU to Tegra124 DT
        ARM: tegra: of: add GK20A device tree binding
        ARM: tegra: roth: enable input on mmc clock pins
        ARM: tegra: roth: fix unsupported pinmux properties
        ARM: tegra: Migrate Apalis T30 PCIe power supply scheme
        ARM: tegra: tamonten: add the display to the Medcom Wide
        ARM: tegra: tamonten: add the base board regulators
        ARM: tegra: initial support for apalis t30
        ARM: tegra: jetson-tk1: mark eMMC as non-removable
        ARM: tegra: venice2 - Enable HDA
        ARM: tegra: Add Tegra124 HDA support
        ARM: tegra: Add the EC i2c tunnel to tegra124-venice2
        soc/tegra: fuse: fix dummy functions
        soc/tegra: fuse: move APB DMA into Tegra20 fuse driver
        soc/tegra: Add efuse and apbmisc bindings
        soc/tegra: Add efuse driver for Tegra
        ...
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      223f93ed
    • O
      Merge tag 'tegra-for-3.17-xusb-padctl' of... · 58cd070a
      Olof Johansson 提交于
      Merge tag 'tegra-for-3.17-xusb-padctl' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt
      
      Merge "ARM: tegra: Add XUSB pad controller support" from Thierry Reding:
      
      Adds device tree bindings and a driver for the XUSB pad controller found
      on Tegra114 and later. This is a prerequisites for PCIe, SATA and XUSB
      drivers which are all currently being reviewed or pending for merge.
      
      This is a separate branch in case it needs to be pulled into the pinctrl
      tree to resolve conflicts.
      
      * tag 'tegra-for-3.17-xusb-padctl' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
        pinctrl: Add NVIDIA Tegra XUSB pad controller support
        of: Add NVIDIA Tegra XUSB pad controller binding
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      58cd070a
    • O
      Merge tag 'sunxi-dt-for-3.17' of... · 15bebad6
      Olof Johansson 提交于
      Merge tag 'sunxi-dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt
      
      Merge "Allwinner DT additions for 3.17" from Maxime Ripard:
      
      Among the few patches that we have so far, there's a few noticeable changes:
       - Introduction of the Allwinner A23 SoC
       - Support for the GMAC on the A31. This is only available so far on the
         boards which bootloader enable the PHY regulator.
       - Addition of the infrared receiver
      
      * tag 'sunxi-dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (22 commits)
        ARM: dts: sun6i: Add Merrii A31 Hummingbird support
        ARM: dts: sun6i: Add ethernet alias for GMAC
        ARM: dts: sun6i: Add A31 GMAC gigabit ethernet controller node
        ARM: dts: sun6i: Add GMAC clock node to the A31 dtsi
        ARM: dts: sun6i: Add pin muxing options for GMAC
        ARM: sun8i: Add PRCM clock and reset controller nodes to the DTSI
        ARM: sun8i: Add reset controller nodes to the DTSI
        ARM: sun8i: Add basic clock nodes to the DTSI
        ARM: dts: sun4i: Add ir node to various boards
        ARM: dts: sun4i: Add ir controller nodes and pinmux
        ARM: dts: sun4i: Add new ba10-tvbox board
        ARM: dts: sun7i: Add board support for LinkSprite pcDuino V3
        ARM: dts: sun7i: Add ir receiver support to a20-i12-tvbox
        ARM: dts: sun7i: Rename sun7i-a20-ir to sun4i-a10-ir
        ARM: dts: sun7i: Add AXP209 support to various boards
        ARM: dts: sun4i: Add AXP209 support to various boards
        ARM: dts: sunxi: Add #interrupt-cells to pinctrl nodes
        ARM: sun8i: dt: Add Ippo-q8h v5 support
        ARM: sunxi: Add Allwinner A23 dtsi
        ARM: sunxi: Add IR controllers on A20 to dtsi
        ...
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      15bebad6
    • O
      Merge tag 'zynq-dt-for-3.17' of git://git.xilinx.com/linux-xlnx into next/dt · 73034623
      Olof Johansson 提交于
      Merge "Xilinx Zynq changes for v3.17" from Michal Simek:
      
      arm: Xilinx Zynq dt patches for v3.17
      
      - Document and use new cadence serial binding
      
      * tag 'zynq-dt-for-3.17' of git://git.xilinx.com/linux-xlnx:
        ARM: zynq: DT: Migrate UART to Cadence binding
        tty: cadence: Document DT binding
        + Linux 3.16-rc5
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      73034623
    • O
      Merge tag 'imx-dt-3.17' of... · 1409f3fd
      Olof Johansson 提交于
      Merge tag 'imx-dt-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
      
      Merge "ARM: imx: device tree updates for 3.17" from Shawn Guo:
      
      The i.MX device tree updates for 3.17:
       - Add device tree sources and pin function header for i.MX6SX SoC
       - Initial imx6sx-sdb board support with FEC, MMC, USB, PMIC, Audio
         and GPIO key enabled
       - New board support: mbimxsd25 and mbimxsd27 from Eukrea, aristainetos
         imx6dl boards, Rex Pro and Basic, Ka-Ro TX6
       - Restructure imx6qdl-wandboard.dtsi for new rev C1 board
       - Split M28EVK and M53EVK into SoM and EVK parts
       - A few correction around SDMA, SSI and SATA device nodes
       - Add eSATA support for Cubox-i board
       - Updates on edmqmx6 to enable PCIe, I2C and CAN
       - Use DT macro for clock ID for imx27 and imx6qdl
       - Add FlexCAN support for VF610 SoC
      
      * tag 'imx-dt-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (125 commits)
        ARM: dts: vf610: add FlexCAN node
        ARM: dts: add initial Rex Basic board support
        ARM: dts: add initial Rex Pro board support
        ARM: dts: mx5: Split M53EVK into SoM and EVK parts
        ARM: dts: imx6: RIoTboard explicitly define pad settings
        ARM: dts: vf610: fix length of eshdc1 register property
        ARM: dts: Restructure imx6qdl-wandboard.dtsi for new rev C1 board.
        ARM: dts: imx53: correct clock-names of SATA node
        ARM: imx6: Align ssi nodes between mx6 variants
        ARM: i.MX27 clk: dts: Use clock defines in DTS files
        ARM: dts: imx: correct sdma compatbile for imx6sl and imx6sx
        ARM: dts: imx6sx-sdb: Add audio support
        ARM: dts: imx6sx: Pass the fsl,fifo-depth property
        ARM: dts: imx6sx: Fix sdma node
        ARM: dts: imx6: edmqmx6: Add can bus
        ARM: dts: imx6: edmqmx6: Add two other i2c buses
        ARM: dts: imx6: edmqmx6: Add PCIe support
        ARM: dts: imx25-pdk: Add USB OTG support
        ARM: dts: i.MX53: add aipstz nodes
        ARM: dts: mxs: Split M28EVK into SoM and EVK parts
        ...
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      1409f3fd