1. 05 Dec, 2014 5 commits
    • Olof Johansson's avatar
      Revert "ARM: dts: rockchip: temporarily disable smp on rk3288" · 08bcc754
      Olof Johansson authored
      We now have the physical-timers patches lined up as a dependency in this same
      branch, so we can revert the temporary disablement.
      
      This reverts commit b77d4394.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      08bcc754
    • Olof Johansson's avatar
      Merge branch 'clocksource/physical-timers' into next/dt · fb3268b0
      Olof Johansson authored
      These are a pre-req to get rk3288 SMP to work with some firmwares, so merge
      it in here as well as in next/drivers.
      
      * clocksource/physical-timers:
        clocksource: arch_timer: Allow the device tree to specify uninitialized timer registers
        clocksource: arch_timer: Fix code to use physical timers when requested
      fb3268b0
    • Doug Anderson's avatar
      clocksource: arch_timer: Allow the device tree to specify uninitialized timer registers · 65b5732d
      Doug Anderson authored
      Some 32-bit (ARMv7) systems are architected like this:
      
      * The firmware doesn't know and doesn't care about hypervisor mode and
        we don't want to add the complexity of hypervisor there.
      
      * The firmware isn't involved in SMP bringup or resume.
      
      * The ARCH timer come up with an uninitialized offset (CNTVOFF)
        between the virtual and physical counters.  Each core gets a
        different random offset.
      
      * The device boots in "Secure SVC" mode.
      
      * Nothing has touched the reset value of CNTHCTL.PL1PCEN or
        CNTHCTL.PL1PCTEN (both default to 1 at reset)
      
      On systems like the above, it doesn't make sense to use the virtual
      counter.  There's nobody managing the offset and each time a core goes
      down and comes back up it will get reinitialized to some other random
      value.
      
      This adds an optional property which can inform the kernel of this
      situation, and firmware is free to remove the property if it is going
      to initialize the CNTVOFF registers when each CPU comes out of reset.
      
      Currently, the best course of action in this case is to use the
      physical timer, which is why it is important that CNTHCTL hasn't been
      changed from its reset value and it's a reasonable assumption given
      that the firmware has never entered HYP mode.
      
      Note that it's been said that on ARMv8 systems the firmware and
      kernel really can't be architected as described above.  That means
      using the physical timer like this really only makes sense for ARMv7
      systems.
      Signed-off-by: default avatarDoug Anderson <dianders@chromium.org>
      Signed-off-by: default avatarSonny Rao <sonnyrao@chromium.org>
      Reviewed-by: default avatarMark Rutland <mark.rutland@arm.com>
      Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
      Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      65b5732d
    • Sonny Rao's avatar
      clocksource: arch_timer: Fix code to use physical timers when requested · 0b46b8a7
      Sonny Rao authored
      This is a bug fix for using physical arch timers when
      the arch_timer_use_virtual boolean is false.  It restores the
      arch_counter_get_cntpct() function after removal in
      
      0d651e4e "clocksource: arch_timer: use virtual counters"
      
      We need this on certain ARMv7 systems which are architected like this:
      
      * The firmware doesn't know and doesn't care about hypervisor mode and
        we don't want to add the complexity of hypervisor there.
      
      * The firmware isn't involved in SMP bringup or resume.
      
      * The ARCH timer come up with an uninitialized offset between the
        virtual and physical counters.  Each core gets a different random
        offset.
      
      * The device boots in "Secure SVC" mode.
      
      * Nothing has touched the reset value of CNTHCTL.PL1PCEN or
        CNTHCTL.PL1PCTEN (both default to 1 at reset)
      
      One example of such as system is RK3288 where it is much simpler to
      use the physical counter since there's nobody managing the offset and
      each time a core goes down and comes back up it will get reinitialized
      to some other random value.
      
      Fixes: 0d651e4e ("clocksource: arch_timer: use virtual counters")
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarSonny Rao <sonnyrao@chromium.org>
      Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      0b46b8a7
    • Olof Johansson's avatar
      Merge tag 'bcm5301x-dt-2014-12-04' of https://github.com/hauke/linux into next/dt · 83b63c69
      Olof Johansson authored
      Merge "ARM: BCM5301X: DT changes for v3.19 #2" from Hauke Mehrtens:
      
      ARM: BCM5301X: dts updates
      
      This adds the IRQ number to the main dts file and some new dts files
      for newly added devices.
      Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
      
      * tag 'bcm5301x-dt-2014-12-04' of https://github.com/hauke/linux:
        ARM: BCM5301X: Add DT for Buffalo WZR-600DHP2
        ARM: BCM5301X: Add DT for Asus RT-N18U
        ARM: BCM5301X: Add DT for Buffalo WZR-1750DHP
        ARM: BCM5301X: Add DT for Netgear R6300 V2
        ARM: BCM5301X: Add buttons for Netgear R6250
        ARM: BCM5301X: Add IRQs to Broadcom's bus-axi in DTS file
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      83b63c69
  2. 04 Dec, 2014 7 commits
  3. 02 Dec, 2014 1 commit
  4. 01 Dec, 2014 5 commits
  5. 30 Nov, 2014 2 commits
  6. 28 Nov, 2014 9 commits
    • Arnd Bergmann's avatar
      Merge tag 'bcm5301x-dt-2014-11-27' of https://github.com/hauke/linux into next/dt · e44cfd46
      Arnd Bergmann authored
      Pull "ARM: BCM5301X: Add some more devices to device tree" from Hauke Mehrtens:
      
      The most important part is adding the axi bus to the SoC dtsi file,
      this is the main bus on the SoC.
      
      These patches were all send to the arm list and I haven't got any
      negative responses.
      Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
      
      * tag 'bcm5301x-dt-2014-11-27' of https://github.com/hauke/linux:
        ARM: BCM5301X: Add LEDs for Netgear R6250 V1
        ARM: BCM5301X: Add Broadcom's bus-axi to the DTS file
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      e44cfd46
    • Arnd Bergmann's avatar
      Merge tag 'mvebu-dt-3.19-2' of git://git.infradead.org/linux-mvebu into next/dt · 6ecbdabe
      Arnd Bergmann authored
      Pull "mvebu DT changes for v3.19 (round 2)" from Jason Cooper:
      
       - mvebu
          - Use simple-card audio on Armada 370 DB
          - Add DSA node for Armada 370 DB
          - Add SDHCI to Armada 38x
          - Armada 370/XP rework to support new Synology boards
          - Add Synology DS213j and DS414
          - Various pinctrl and uart and alias fixes to help bootloaders
      
      * tag 'mvebu-dt-3.19-2' of git://git.infradead.org/linux-mvebu:
        arm: mvebu: normalize pinctrl entries for Armada SoCs
        arm: mvebu: fix wrongly named DS414 pinctrl entries
        arm: mvebu: add .dts file for Synology DS414
        arm: mvebu: add .dts file for Synology DS213j
        arm: mvebu: define and use common Armada XP SPI pinctrl setting
        arm: mvebu: define and use common Armada XP UART2/3 pinctrl settings
        arm: mvebu: define and use common Armada 370 UART pinctrl settings
        arm: mvebu: define and use common Armada 370 SPI pinctrl settings
        arm: mvebu: move Armada 370/XP pinctrl node definition armada-370-xp.dtsi
        arm: mvebu: use recently introduced uart label for stdout-path
        arm: mvebu: add uartX labels for Armada SoC serial nodes
        arm: mvebu: fix vendor prefix typo in kirkwood-synology.dtsi
        ARM: mvebu: fix ordering in Armada 370 .dtsi
        ARM: mvebu: adjust ethernet aliases according to U-Boot requirements for A38x
        ARM: mvebu: remove clock-frequency from Armada 38x SDHCI Device Tree node
        ARM: mvebu: enable no-1-8-v flag for Armada 385 DB SDHCI interface
        mvebu: 370 RD: Add support for the switch
        ARM: mvebu: use simple-card DT binding for audio on Armada 370 DB
        ARM: mvebu: remove conflicting muxing on Armada 370 DB
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      6ecbdabe
    • Arnd Bergmann's avatar
      Merge tag 'sirf-dts-for-3.19' of... · ca763758
      Arnd Bergmann authored
      Merge tag 'sirf-dts-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux into next/dt
      
      Pull "change pinmux pingroup and add some lost node/prop" from Barry Song:
      
      1. add resets properity for some nodes;
      2. change pinctrl groups for audio
      3. add PMU node
      
      * tag 'sirf-dts-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux:
        ARM: dts: atlas6: add resets property for SPI nodes
        ARM: dts: atlas6: add resets property for VPP nodes
        ARM: dts: prima2: add resets property for VPP nodes
        ARM: dts: prima2: add resets property for GPS nodes
        ARM: dts: prima2: add node for Performance Monitor Unit
        ARM: dts: atlas6: Add I2S external clock input pingroup
        ARM: dts: atlas6: add a separate pingroup for i2s mclk output
        ARM: dts: prima2: add I2S 2ch, 6ch, nodin, mclk groups
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      ca763758
    • Arnd Bergmann's avatar
      Merge tag 'sunxi-simplefb-for-3.19' of... · fe0c888b
      Arnd Bergmann authored
      Merge tag 'sunxi-simplefb-for-3.19' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt
      
      Pull "Allwinner simple frambuffer support" from Maxime Ripard:
      
      This enables the simple framebuffer on all the supported Allwinner SoCs (but
      the A80). That allows to have at last a video display usable by using the
      framebuffer the firmware might have set up.
      
      * tag 'sunxi-simplefb-for-3.19' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (55 commits)
        ARM: dts: sunxi: Update simplefb nodes so that u-boot can find them
        ARM: dts: sunxi: Add de_be0 clk parent pll to simplefb node
        ARM: dts: sun7i: Add simplefb node
        ARM: dts: sun6i: Add simplefb node
        ARM: dts: sun5i: Add simplefb node
        ARM: dts: sun4i: Add simplefb node
        ARM: dts: sun6i: Add ethernet support to M9 board
        ARM: sun6i: DT: Add PLL6 multiple outputs
        ARM: dts: sun6i: Add support for the status led
        ARM: dts: sun6i: Add EHCI support for the M9 board
        ARM: dts: sunxi: Add regulator-boot-on property to ahci-5v regulator
        ARM: dts: sun7i: Cubietruck: add power supply regulator for USB OTG VBUS
        ARM: dts: sun7i: Cubietruck: override regulator pin
        ARM: sun7i: dtsi: add support for usbphy0
        ARM: dtsi: sunxi: add common VBUS regulator
        ARM: dts: sunxi: Banana Pi: increase startup-delay for the GMAC PHY regulator
        ARM: sun5i: olinuxino: Relicense the device tree under GPLv2/X11
        ARM: sun4i: cubieboard: Relicense the device tree under GPLv2/X11
        ARM: sun7i: pcduino3: Relicense the device tree under GPLv2/X11
        ARM: sun4i: pcduino: Relicense the device tree under GPLv2/X11
        ...
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      fe0c888b
    • Arnd Bergmann's avatar
      Merge tag 'imx-dt-3.19' of... · 6b7f0570
      Arnd Bergmann authored
      Merge tag 'imx-dt-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
      
      Pull "The i.MX device tree changes for 3.19" from Shawn Guo:
      
       - Device additions for board vf610-colibri, pwm, backlight, I2C, RTC,
         ADC etc.
       - Update i.MX6 phyFLEX board to include PCIe, CAN and audio support
       - Improve SSI clocks description for i.MX5 platforms
       - Add ENET2 support for imx6sx-sdb board
       - Add device tree source for LS1021A SoC, board QDS and TWR
       - Enable cpufreq support for i.MX53
       - Enable VPU device support for i.MX6QDL
       - Enable poweroff support for i.MX6 SoCs
       - Add support for TBS2910 Matrix ARM mini PC which is built on i.MX6Q
       - Create generic base device trees for Vybrid and add support for
         Colibri VF50
      
      Note: the change set is built on top of imx-soc-3.19 to resolve the
      dependency that  "ARM: dts: imx53: add cpufreq-dt support" uses the
      clock define IMX5_CLK_ARM that is added by "ARM: imx53: clk: add ARM
      clock".
      
      * tag 'imx-dt-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (51 commits)
        ARM: dts: imx6q-tbs2910: Enable snvs-poweroff
        ARM: dts: imx6: add pm_power_off support for i.mx6 chips
        ARM: dts: vf-colibri: add USB regulators
        ARM: dts: imx6: phyFLEX: Add CAN support
        ARM: dts: imx6: phyFLEX: Add PCIe
        ARM: dts: imx6: phyFLEX: Set correct interrupt for pmic
        ARM: dts: imx6: phyFLEX: Enable gpmi in module file
        ARM: dts: imx6: phyFLEX: set nodes in alphabetical order
        ARM: dts: vf-colibri-eval-v3.dts: Enable ST-M41T0M6 RTC
        ARM: dts: vf-colibri: Add I2C support
        ARM: dts: imx6qdl: Enable CODA960 VPU
        ARM: dts: imx6q-tbs2910: Remove unneeded 'fsl,mode' property
        ARM: dts: vf610: enable USB misc/phy nodes where necessary
        ARM: dts: vf610: use new GPIO support
        ARM: dts: pbab01: enable I2S audio on phyFLEX-i.MX6 boards
        ARM: dts: pbab01: move i2c pins and frequency configuration into pfla02
        ARM: dts: vf500-colibri: add Colibri VF50 support
        ARM: dts: vf610: create generic base device trees
        ARM: dts: vf610: assign oscillator to clock module
        dt-bindings: arm: add Freescale LS1021A SoC device tree binding
        ...
      
      Signed-off-by; Arnd Bergmann <arnd@arndb.de>
      6b7f0570
    • Arnd Bergmann's avatar
      Merge tag 'omap-for-v3.19/dt-part2-updated' of... · ea4409cc
      Arnd Bergmann authored
      Merge tag 'omap-for-v3.19/dt-part2-updated' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
      
      Pull "More dts changes for omaps to add support for new devices" from Tony Lindgren:
      
      - Add DCAN support am335x, am437x and dra7
      
      - Add devices for sb-t3x computers
      
      - Add support for NovaTech OrionLXm
      
      - Add n900 battery and si4713 support
      
      * tag 'omap-for-v3.19/dt-part2-updated' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (26 commits)
        ARM: dts: am335x-evm: Add DCAN1 details
        ARM: dts: am33xx: Update DCAN nodes
        ARM: dts: am33xx: Add control module syscon node
        ARM: dts: am437x-gp: Add dcan support
        ARM: dts: am4372: Add DCAN nodes
        ARM: dts: am4372: Add control module syscon node
        ARM: dts: dra72-evm: Add CAN support
        ARM: dts: dra7-evm: Add CAN support
        ARM: dts: DRA7: Add DCAN nodes
        ARM: dts: dra7: Add syscon regmap for CORE CONTROL area
        ARM: dts: sbc-t3x30: add audio support
        ARM: dts: sbc-t3x: add TV out display alias
        ARM: dts: cm-t3x: add TV out support
        ARM: dts: cm-t3x: add I2C1 pinmux
        ARM: dts: AM43xx: add tscadc DT entries for am437x-evm and am43x-epos-evm
        ARM: dts: cm-t3x30: add keypad support
        ARM: dts: sb-t35: add EEPROM support
        ARM: dts: cm-t3x: add EEPROM support
        ARM: OMAP2+: remove cm-t3x touchscreen pdata quirk
        ARM: dts: cm-t3x: add ADS7846 touchscreen support
        ...
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      ea4409cc
    • Arnd Bergmann's avatar
      Merge tag 'samsung-dt-3' of... · bcc8cef7
      Arnd Bergmann authored
      Merge tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
      
      Pull "Samsung 3rd DT updates for v3.19" from Kukjin Kim:
      
      - exynos3250
        : remove unused bootargs on exynos3250-rinato
        : add new board dt file for exynos3250-monk
      - exynos4
        : add missing clock for MFC
        : specify default clocks for camera
      - exynos4x12
        : add TMU related DT nodes
      - exynos4412-trats2
        : add max77693-haptic and pwm nodes, enable TMU support
      - exynos4412-odroid
        : specify audio clock parents and rates
      - exynos5250 and exynos5420
        : add syscon based phandle to i2c device nodes
      - exynos5250-spring
        : add trackpad, temperature sensor and usb3505 pinctrl
      
      Note: based on previous tags/samsung-dt-2 for v3.19
      
      * tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        ARM: dts: add sysreg phandle to i2c device nodes for exynos
        ARM: dts: Remove unused bootargs from exynos3250-rinato
        ARM: dts: add board dts file for Exynos3250-based Monk board
        Documentation: devicetree: Add Exynos-based boards compatible string
        ARM: dts: add missing clock to MFC device for exynos4
        ARM: dts: Specify audio clock parents and rates for exynos4412-odroid-common
        ARM: dts: Add trackpad to exynos5250-spring
        ARM: dts: Add temperature sensor to exynos5250-spring
        ARM: dts: Add usb3503 pinctrl to exynos5250-spring
        ARM: dts: Add max77693-haptic node for exynos4412-trats2
        ARM: dts: add pwm node for exynos4412-trats2
        ARM: dts: Specify default clocks for Exynos4 camera devices
        ARM: dts: Enable TMU support for exynos4412-trats2
        ARM: dts: Device tree node definition for TMU on exynos4x12
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      bcc8cef7
    • Arnd Bergmann's avatar
      Merge tag 'samsung-dt-2' of... · 16a8cb59
      Arnd Bergmann authored
      Merge tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
      
      Pull "Samsung 2nd DT updates for v3.19" from Kukjin Kim:
      
      - add micro SD card SDHCI node for exynos4412-trats
      - add exynos4415 DT
      - add exynos3250-rinato DT and sleep mode support
      
      Note: based on previous tags/samsung-dt for v3.19
      
      * tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        ARM: dts: Add micro SD card SDHCI node for exynos4412-trats
        ARM: dts: Add dts files for exynos4415 SoC
        ARM: dts: Add sleep mode of regulator for exynos3250-rinato
        ARM: dts: Add sleep mode pin configuration for exynos3250-rinato
        ARM: dts: Add board dts file for exynos3250-rinato
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      16a8cb59
    • Arnd Bergmann's avatar
      Merge tag 'v3.19-rockchip-dts3' of... · 3510c70d
      Arnd Bergmann authored
      Merge tag 'v3.19-rockchip-dts3' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
      
      Pull "temporarily disable rk3288-smp" from Heiko Stuebner:
      
      Disable smp again on rk3288 temporarily to make Olof's boottest
      run again, until the patches for using the physical architected
      timers got accepted.
      
      * tag 'v3.19-rockchip-dts3' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
        ARM: dts: rockchip: temporarily disable smp on rk3288
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      3510c70d
  7. 27 Nov, 2014 3 commits
  8. 26 Nov, 2014 6 commits
  9. 25 Nov, 2014 2 commits