Commit graph

519315 commits

Author SHA1 Message Date
Arnd Bergmann
a258e3f811 ARM: tegra: Devicetree changes for v4.2-rc1
Contains a couple of fixes and additions to device tree files. The most
 notable change is a fix for a misapplied patch that was only exposed by
 a recent change in the regulator subsystem that caused USB to break on
 Tegra124 recently.
 
 Other than that there are a more or less random assortment of additions
 to enable various features on a couple of boards.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJVU1KlAAoJEN0jrNd/PrOhMKgP/jOIwMgc+RC6uud66kAb8oQ8
 itcNWwhHFv/7fiCeIbCq8qsp51DHPxhDuWeBP/FIhfExJcDD+P2pfrKpXlI1bCrz
 jgOHfgauKSzSEIQcFU3uYWMr7qR7euVtaBsB0v16HtSpTcRnNKv/hvlvYPFYVl5D
 NvWyYB7hjHrbAur97vrJJ9e+RKZGfKo0bOqikyQ5ftbKcASa9HNY6JAeOrV+Delw
 LPA3P98eXcwVSBgdHw++iOqVZNbs+kNXnRV8dcjgWXdXsI2LQGgZrbEb5WS7/29j
 0Jaz9dwMJ4EC9yZaiT2sOXxdOjnSJ5MC1lE/CuCjE8Kz4fsq8sCudTp90fi6eFxT
 QcrneJ7d7LzjprDpKdK8E/YgPHjp5pOVuBvqtJ/RtjHFCVlaZ5OvZMdNX0zqY7SU
 T+3kYNXTcFhJHyQOtajGOSixVyqOEVddjjCvSyH+QXB6MmkH37Jcg6A7J/t6VrX3
 eK0VQMqkB10hZj8pzP/kN4dpiw3YQXxszF9luQ10AjHZvnADyGKesaDXYEjGD3FL
 ux1hjQHTAuRauID4XUzu2vfNQqYbLb0papQ+6RnlgBn4P+jS/45xTZEchUU5Xoj/
 SGTgxqNM4TjCDGf6iYzpbKi/A/T46w5Xt05r2g57qkQPcITVJK6MHtbEmPjWR1jP
 3CJ0qItO/dSTi61vV0XW
 =8R5I
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-4.2-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt

Merge "ARM: tegra: Devicetree changes for v4.2-rc1" from Thierry Reding:

Contains a couple of fixes and additions to device tree files. The most
notable change is a fix for a misapplied patch that was only exposed by
a recent change in the regulator subsystem that caused USB to break on
Tegra124 recently.

Other than that there are a more or less random assortment of additions
to enable various features on a couple of boards.

* tag 'tegra-for-4.2-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Fix hda2codec_2x clock and reset names
  ARM: tegra: Add Tegra30 HDA support
  ARM: tegra: Cardhu device-tree comment spelling fix
  ARM: tegra: venice2: Set min-/max-microvolt for VDD_LED supply
  ARM: tegra: venice2: Mark eMMC as non-removable
  ARM: tegra: jetson-tk1: Enable HDA support
  ARM: tegra: Add missing HDMI +5V regulator
  ARM: tegra: cardhu: Add power and volume keys
  ARM: tegra: Correct which USB controller has the UTMI pad registers
2015-05-13 18:02:49 +02:00
Arnd Bergmann
2cac46a415 SoCFPGA update for v4.2 part 2
- Add a DTS node for the A9 SCU
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJVU1L4AAoJEBmUBAuBoyj05zEP/02UJVcqCHT2P/z/1XJnIwed
 hZgO0Oej4ZEc+futAIx6IeMEkgNoIDZX1rdijiQe3Uv2QK8niC7R8yOjwcZrM8jZ
 ws/jyKWpCBsV0J+lzZevxa3DpxMHPmcx0W9gAqYpikrwgbXt0Dyy62CQkp+XKZ5d
 mluxSEbkSlORddzD8eQbM1yuVlFGg9RAzdwaeZk4j6x+vq2Zk+jEwq5EKLBIiO/U
 kGwu/mEryiWl+lzqV7Nlagt4uLASsT5ZxEjr4zUx9ddDTJo4mqStqONdDPMTdf9h
 0qzHrWa9mMhI7RLoOWBuvTEcvEVPSRNhVfo6cY8ZnQcZ/V5tj4sG3jAPUFXkFSMd
 iZW3mud5P45ugbKiumR5R7ve3t6yxhvNqWH9FZqfnlPPNXtCaUqBGB772A0Xr2Hz
 mRPu2Vl9cjmGdrWQHqF5sViPdm52E8Het3/HO0ccsx4aoH+jhgGKeqmiK779EKTA
 lA0NPBrL5PRzjNacNwnR7RxtLpcISf5CbsV0ojiIDtB8x11TCg1Zct+ogeE03luT
 YpTNuOgTEg7Gy4oa6LPPXahUS+6RffHmASjlt15xaWx/x5MaCXTyk3H4JtSumDiL
 blFzdQmNUcO2YpggSgyS0UzRFyqYJIRPq7lHKMJz5NMfaHVzu4VzoDKmJVo4zG2T
 BftEOP7ROh5wq1HkWJs3
 =23ne
 -----END PGP SIGNATURE-----

Merge tag 'socfpga_dts_for_v4.2_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt

Merge "SoCFPGA update for v4.2 part 2" from Dinh Nguyen:
- Add a DTS node for the A9 SCU

* tag 'socfpga_dts_for_v4.2_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: dts: add the a9-scu node
2015-05-13 17:47:47 +02:00
Arnd Bergmann
2b424c7a0b Some misc improvements defining additional supply regulators, enabling
the Cortex-A12 HW PMU on the rk3288 and the tsadc on some more rk3288
 boards, as well as some usb properties and marking the radxarock pmic
 as system-power-controller.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJVU2Y0AAoJEPOmecmc0R2BXCQIAIV6yQP+f6ACIPJEVRk8yD3W
 YyJ/mXgrSD/RaaFYnEO3PPVC8TibVI6a7SIoa4y92g0LW7VYn7UQY1wzlrt3rzR5
 rY71uB/Ew0yQBJe1rsw+Sn7couG9U/g3YB/guJmFfO2rS9xn6wICKcLxYNaIp9sb
 WOwzNlpWwpejCdYLzxw9BP0qxFRE2ZlxoF96VB+j5s+IcnvKGGo3twYqtyN5YEjK
 dB7Bbnq6n9VWgYMkuijxyQ00skUNUb+7ciHSO4pksPtuSa4K+GsqjkTu37nkBPmn
 t53c+M93WuI5hplFRM3UwXKH6ELqhEuq0GN4dPzRD5VBWcWYOMXl8AmhfOlR6cU=
 =39uK
 -----END PGP SIGNATURE-----

Merge tag 'v4.2-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Merge "ARM: rockchip: dts changes for 4.2" from Heiko Stuebner:

Some misc improvements defining additional supply regulators, enabling
the Cortex-A12 HW PMU on the rk3288 and the tsadc on some more rk3288
boards, as well as some usb properties and marking the radxarock pmic
as system-power-controller.

* tag 'v4.2-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: add system-power-controller to act8846 on radxarock
  ARM: dts: rockchip: add properties for dwc2 usb otg controller
  ARM: dts: rockchip: enable tsadc on rk3288 boards
  ARM: dts: rockchip: add act8846 supplies on rk3288-firefly
  ARM: dts: rockchip: Specify VMMC and VQMMC on rk3288-evb
  ARM: dts: rockchip: Enable Cortex-A12 HW PMU events on rk3288
2015-05-13 17:41:54 +02:00
Dinh Nguyen
8508452e57 ARM: socfpga: dts: add the a9-scu node
Add the dts node for the A9 SCU.

Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2015-05-13 08:30:03 -05:00
Arnd Bergmann
9d8a71ff5c Ux500 Device Tree changes for the v4.2 series:
Define CPU topology, connect that with CoreSight blocks,
 add sensor information to DT boards.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVUyYjAAoJEEEQszewGV1zZGIP/jiHCMNtMgFOjPxfDI3lwvpl
 p9b6YUeEVknUk0yObYmHcqt6vg71zhiAUndJV5P/dN7jN2n8Cr7JIs52uVkpGuhh
 2CkQgXTMlCpR6LnFWgUT1OMRKg6EBP/JFOJdHbFq+HD6QsBAD9oKULt9VPValtrM
 2VkktKaetXHJND7nwdC8MTKe+4oOs/YpOy+yKVYb/iWNMrTCPCFLBI5BRKLUaPdd
 A0EtGARSkCGU9QZkGvuyhI4UY1KWi4JjKfD9GNmka3FTq8y5MGjdgn1VEw9whZcW
 wtJFiTuZ9CM+Jm+WyJx6bdZwlIjMKMrGaaMDeRnoh9UQml4+DDyJJWgbeAT8rhQS
 XP5NG4I9X1RSqen1XUikPPBl2V5u1baIfaP4noLxuu4yVYfUTuC76T+k+FCAPxQu
 Ymw/RWWmPwodXrN7OBlpPW7rTUk269LVCrWpIFQkhkDnrmYH4Rs8CAv4boDd3yj1
 P4ew49Cu0Y489vR8DBndbUlXjL/ssD2Uh4DZp8fzURTfnu2P6Yzk9Q98At87uqqp
 Hz/OfLBcnX5N7myu+fMkKBf7Ju3Nz/Ho1hA/q8rsPXfazvQcYm5gL9vI1wljRn0B
 b8++F+scoiM0iEY/OpjWX8box9w+gE7lq/14QqRVpRmCNyC1JtlQT7AoXCSDMkic
 EJn4vhHoLu4Bhl9/ypND
 =+QE+
 -----END PGP SIGNATURE-----

Merge tag 'ux500-v4.2-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt

Merge "Ux500 Device Tree changes for the v4.2 series" form Linus Walleij:

Define CPU topology, connect that with CoreSight blocks,
add sensor information to DT boards.

* tag 'ux500-v4.2-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: add the sensors to the STUIB board
  ARM: ux500: assign the sensor trigger IRQs
  ARM: ux500: fix lsm303dlh magnetometer compat string
  ARM: ux500: add CoreSight blocks to DTS file
  ARM: ux500: define CPU topology
2015-05-13 13:37:26 +02:00
Linus Walleij
df44ad87ab ARM: ux500: add the sensors to the STUIB board
This adds the device tree data for the LIS331DL and the
AK8974 magnetometer to the STUIB board device tree include
file.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-05-13 12:22:19 +02:00
Linus Walleij
22a9316702 ARM: ux500: assign the sensor trigger IRQs
The ST sensors on the Ux500 boards were not utilizing the IRQs
for data ready sample triggers. Enable this by assigning the
right GPIO lines and interrupt lines (when the GPIO lines are
used for IRQs) to the accelerometer, gyro and magnetometer
sensors.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-05-13 12:22:18 +02:00
Linus Walleij
93deea9a60 ARM: ux500: fix lsm303dlh magnetometer compat string
The magnetometer found on the Ux500 TVK and Snowball boards
is a LSM303DLH not a LSM303DLM, small differences but still
different. Put in the right compatible strings and things start
working smoothly.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-05-13 12:22:18 +02:00
Linus Walleij
b557457f63 ARM: ux500: add CoreSight blocks to DTS file
This registers all the CoreSight blocks on the DB8500 SoC:
each core has a PTM (v1.0, r1p0-00rel0) connected, both connected
to a funnel (DK-TM908-r0p1-00rel0) which in turn connects to a
replicator (DM-TM909-r0p1-00rel0). The replicator has two outputs,
port 0 to a TPIU interface and port 1 to an ETB
(DK-TM907-r0p3-00rel0). The CoreSight blocks are all clocked by
the APEATCLK from the PRCMU and their AHB interconnect is clocked
from a separate clock called APETRACECLK.

The SoC also has a CTI/CTM block which can be added later as we
have upstream support in the CoreSight subsystem.

Acked-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-05-13 12:22:17 +02:00
Michael Niewöhner
9ab79be0da ARM: dts: rockchip: add system-power-controller to act8846 on radxarock
The act8846 is the main pmic and system-power-controller on radxarock boards,
so add the necessary property.

Signed-off-by: Michael Niewoehner <mniewoeh@stud.hs-offenburg.de>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-05-12 22:27:05 +02:00
Arnd Bergmann
58d2bc7b29 Allwinner DT additions for 4.1, take 1
All the device tree related changes for the 4.1 merge window.
 
 It has a rather big diffstat, because of a lot of mechanical and harmless
 changes, as described below.
 
 There is mostly:
   - The end of the DT relicensing. All our DT should now be under the dual
     X11/GPL license.
   - Convertion of all the DT to a label based syntax, instead of
     duplicating the tree like was done before.
   - Rework of the A10s and A13 DTSI to share the common devices
   - A few drivers enablings: A80 USB, the A31 PMIC, A31 and A23 arch
     timers, etc
   - Fix the checkpatch warnings
   - A few new boards : cubieboard4, mele i7, utoo p66, auxtex t004,
     pcduino3 nano, gemei G9, mk808c, jesurun q5, orange pi, orange pi mini
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVUQKFAAoJEBx+YmzsjxAgescP/3hr9XCfBlJ7Grxcw85cpgsc
 6qsUYVIUSZWD1SDwxXtSbcqqbLjLnVkfmn4//TK38Vtlod79rMrMEwCBiM9ugNF0
 KdsvaX9Y/lhT8vT37wqwxy36JYP1BYciYtQn1x+gitBlgkwAtHmNHnbJgw1pgAtR
 yK3xjACBn3mw17NlXq2/cQ0aPX7eap1OZ7X14UM82tiFBMUDKb6xh1oz52Yh6bYE
 h+KYI7GVCzmfLk3keqdv1KjhJQC1Xu2t9aWixSU+r5F9vu3/dVzZhQQ+4c3lQJCC
 71V2uW7KblWEjrJwftqP6hjTAQlWbR8gVx/ICM44gpwnKXYANDL7O+FDgemW4wim
 er2EFuzKPcll9jYwzrXe1w5jllxLae2lvmQy1in9fW80FUZExTjOuJxtKPWc2t7J
 2DBn8PspwoJDKgo2OkAydNstef+WmFM0xDPeP7xTU7k0k3QpjQY5bTEm39PzVuoa
 CtLhV63ndpxbGXoJglZ7PQiMH+APkX3rjYH2aRvD6cAuVDqPjAJTKkNJ0VLx2gaz
 wd5rw726Ob8p/1T34/z84c6Rh0wOhBnNGzb0zbAMhXveyjfmLLS9sUwvD8Yuv7EU
 5p0TfM5uRxoxQP2VOFPxHr0ZGEYHVaX918khfD3ykF0jpAfz5FhCCZsbhoJDMLuY
 HLUb0hp5v6D1zRM95tdg
 =6TQo
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-dt-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt

Pull "Allwinner DT additions for 4.1, take 1" from Maxime Ripard:

All the device tree related changes for the 4.1 merge window.

It has a rather big diffstat, because of a lot of mechanical and harmless
changes, as described below.

There is mostly:
  - The end of the DT relicensing. All our DT should now be under the dual
    X11/GPL license.
  - Convertion of all the DT to a label based syntax, instead of
    duplicating the tree like was done before.
  - Rework of the A10s and A13 DTSI to share the common devices
  - A few drivers enablings: A80 USB, the A31 PMIC, A31 and A23 arch
    timers, etc
  - Fix the checkpatch warnings
  - A few new boards : cubieboard4, mele i7, utoo p66, auxtex t004,
    pcduino3 nano, gemei G9, mk808c, jesurun q5, orange pi, orange pi mini

* tag 'sunxi-dt-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (84 commits)
  ARM: sunxi: dt: Split the SPI pinctrl groups
  ARM: sunxi: dt: Fix whitespace errors
  ARM: sunxi: DT: Fix lines over 80 characters
  ARM: sunxi: dt: Remove the FSF address
  ARM: sunxi: dts: split IR pins for A10 and A20
  ARM: sun7i: dt: Add new MK808C device
  ARM: dts: sun6i: Set PLL6 as parent to AHB1 clock in AHB1 clock node
  ARM: dts: sunxi: Update ahb clocks for sun5i and sun7i
  ARM: dts: sun7i: Add dts file for the Jesurun Q5 top set box
  ARM: dts: sun5i: Enable touchscreen on Utoo P66
  ARM: dts: sun7i: Add dts file for the Orangepi mini SBC
  ARM: dts: sun7i: Add dts file for the Orangepi SBC
  ARM: dts: sun7i: Add A20 SRAM and SRAM controller
  ARM: dts: sun5i: Add A13 and A10s SRAM and SRAM controller
  ARM: dts: sun4i: Add A10 SRAM and SRAM controller
  ARM: dts: sun5i: Add broken-hpi property for Utoo-P66 eMMC
  ARM: sun8i: dt: Enable A23 SMP support
  ARM: dts: sun6i: Add cpu thermal zones to dtsi
  ARM: dts: sun6i: Add cpu clock reference and operating points to dtsi
  ARM: sunxi: DT: Add stdout-path property
  ...
2015-05-12 17:23:34 +02:00
Arnd Bergmann
03d6d706a2 SoCFPGA DTS updates for v4.2
- Add accelerometer to sockit
 - Update and clean up support for the Arria10 platform
 - Add sdmmc_clk/4 clock node SoCFPGA Cyclone5/Arria5
 - Update ethernet nodes with multicast/unicast/fifo-depth properties
 - Add clocks for Arria10 platform
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJVUPgLAAoJEBmUBAuBoyj0tKMP/Av4Ls7Wm8kNatdA64oaefBa
 OJ8b2XIINiXCtYUexmw1auNiYglFfIMQkh/NHe83tl9USk7Tg0TgR7Hpe4TfkO57
 woSrz6GgIhwv3tHJiYZeczuZhlTwEl1sie/w3i+HYQRP8+nXyT5dw270tpMRTG5g
 +npltqCrqwa3vhHo5Nsz29l260unq/fXr5l59XqtBMp80Z3S4NStNA+gPqg5P1yI
 34RZkJvDrf8ePemRd4Et7ZLg7+Wv4SswomCEhg//WaO11EbwTLCOXc0D8MQ5ZThE
 I8S3jplpgn85fauOm8d++7jt7T5tIPmPUowxtkI9byLgaWYb7XtMkF/qAuqEWG5f
 FTfgh1GTJU8NCrlQLTXsehNuUENq+NBIEI75TlRSArTUUkUkrXua+PQAEe3Ae9B1
 Afniu3yIiPzgQgo+aXzbePuVyBNbf5VETB7AMsVf4PeVov8esHklAMt0sqXyepwy
 N6kvb6kAFI3U6yWhGMhljCT+oXconCnVUSfWm16/ss17TFWg1nJwGfDhphvEvyKu
 05ILLIYTUW6NRTbIE4Cy2peaDKXV/ZgN348JGtq27+4RKLV2sPtEbIDCEhzedKxS
 IeO+ACTzzMGnlhp9j6T0afQ0mpWPfExDBTvfqItFc7YATUdYv8Ja5VDeGFmpDc81
 LF+lhVo0blxtRdY3QpDf
 =fVwi
 -----END PGP SIGNATURE-----

Merge tag 'socfpga_dts_for_v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt

Pull "SoCFPGA DTS updates for v4.2" from Dinh Nguyen:

- Add accelerometer to sockit
- Update and clean up support for the Arria10 platform
- Add sdmmc_clk/4 clock node SoCFPGA Cyclone5/Arria5
- Update ethernet nodes with multicast/unicast/fifo-depth properties
- Add clocks for Arria10 platform

* tag 'socfpga_dts_for_v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: dts: add clocks to the Arria10 platform
  ARM: socfpga: dts: Add tx-fifo-depth and rx-fifo-depth properties
  ARM: socfpga: dts: Add multicast bins and unicast filter entries
  ARM: socfpga: dts: Add a clock node for sdmmc CIU
  ARM: socfpga: dts: rename socdk board file to socdk_sdmmc
  ARM: socfpga: dts: enable UART1 for the debug uart
  ARM: socfpga: dts: disable the sdmmc, and uart nodes in the base arria10
  ARM: socfpga: dts: add cpu1-start-addr for Arria 10
  ARM: socfpga: dts: Add adxl34x
2015-05-12 17:22:11 +02:00
Arnd Bergmann
9ef1375d00 First batch of DT changes for 4.2:
- cleanup and addition of Overkiz boards
 - at91sam9x5: pwm0 pinctrl definition
 - delete deprecated mainck nodes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJVUHotAAoJEAf03oE53VmQatMH/1EfZrA905nbZVpj/qvIjAsQ
 ZV95zIINbUIZqhvwjqbMlqMbYYDDFfdZcdlgPk0iKS2MKiyEkJ9h7J1Ek3dNwqvr
 W4Ub9ariNd/3PmD5AerhGdtsvPq0sUSYgUcynqtpTaejefU3Vq0edeEI7Nv2o+MN
 x63lz1CoGi2L7Z4qdEuF9YHUjIUTMHROMwUXUA9yBR+N3k4xc8JrL5NlMGDTouVa
 3NAxz+0RmCNlYuozONpFTefO7bw9IK6Uy6XIqk21Br5pFiXv67zHaw3n483XLuxW
 3UUZQlchm8NAPSSckOmJ6MUzvGcMyoBOvjSV8Sp+IDmljf0oJie4D9/r08fp+q4=
 =v9ZQ
 -----END PGP SIGNATURE-----

Merge tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt

Pull "First batch of DT changes for 4.2" from Nicolas Ferre:

- cleanup and addition of Overkiz boards
- at91sam9x5: pwm0 pinctrl definition
- delete deprecated mainck nodes

* tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/dt: drop deprecated mainck node from pmc
  ARM: at91/dt: add support for kizbox2
  ARM: at91/dt: add support for kizboxmini
  ARM: at91/dt: sam9x5: add pinctrl for pwm0
  ARM: at91/dt: at91-kizbox: update chosen node
  ARM: at91/dt: at91-kizbox: re-size nand partitions
  ARM: at91/dt: at91-kizbox: leds related changes
  ARM: at91/dt: at91-kizbox: gpio-keys related changes
  ARM: at91/dt: at91-kizbox: user proper serial uart
  ARM: at91/dt: at91-kizbox: sanitize file
  ARM: at91/dt: kizbox: rename to at91-kizbox
2015-05-12 17:19:06 +02:00
Arnd Bergmann
0b1480103f ARM: DT: Hisilicon hip04 soc and D01 board updates for 4.2
- Add hip04 GPIO nodes
 - Add NANDC nodes for hip04 and D01 board
 - Add hip04 ethernet related nodes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVTBseAAoJEAvIV27ZiWZcqjcP/iboUW/3RpbKafraJdUNBKV5
 SIQvSdV1oNiWYjq+75ZZdp0Jk9lE1GAhefNmhGUET6oubu6jW3w8//uIO0/9ZhjN
 3SyPuQIkYDGzonegvAUw+ffnpwEXP0yrdcBjsQRMmSf1tAHuxLK9e7pEH/G1jUou
 g8e3bmfkXXG2mMUQSGg+oEhzUpEuiPjTDD3BcWK1Cb3aJBoUBH6wtE/fy2clPwEP
 WXa6KjsBBUuONLH1za/usq+4jBzgOa7gfzRWRMCk5/uhcuJ3ojOGp6TgruLmg6q3
 XiZVRaAp9Wjz8nA4nkP2SWRVkDUYbhvTNu3lPkfcCDiR2mbinWDdzdw1gk3Zadnr
 UYbpXWgkR9m0E+0WG8/LuE1eg+XmoSB5GiCkwPAYo513eUy73NUwTtcry4V7RkSJ
 V7tgRhhqN3M31PrRuYxImu092f/zR3xAxSfX2JchD2c/GQeEJ5XNuvTmRH7JgpCP
 2Jo7BHXFMTFbodYPmaUlze7U1RaKw+Knt1MJCrJznpMX6m0S0DcWI6qtBWfATxJY
 lPL1jq9XDAlvz7+S5GwefS/ydR6nRJgQwb4UaWdKQodS6t3ahPodUte6dWFZ9gGN
 ANi4e+0YQl4xuqTHT2/154dlkpK4DSu8ZH9UaCf1c1GM9J3lLPTozFieqfq2XXhj
 f4o/Qbez4ZImuhfdJGoz
 =n1gB
 -----END PGP SIGNATURE-----

Merge tag 'hip04-dt-for-4.2' of git://github.com/hisilicon/linux-hisi into next/dt

Merge "ARM: DT: Hisilicon hip04 soc and D01 board updates for 4.2" from Wei Xu:

- Add hip04 GPIO nodes
- Add NANDC nodes for hip04 and D01 board
- Add hip04 ethernet related nodes

* tag 'hip04-dt-for-4.2' of git://github.com/hisilicon/linux-hisi:
  ARM: dts: add HiSilicon hip04 ethernet controller resource
  mtd: hisilicon: add device tree node for NAND controller
  ARM: dts: hip04: add GPIO pieces
2015-05-12 17:05:39 +02:00
Masahiro Yamada
8e678e06e7 ARM: dts: UniPhier: add support for UniPhier SoCs and boards
Initial device trees for UniPhier SoCs: PH1-sLD3, PH1-LD4, PH1-Pro4,
and PH1-sLD8.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-05-12 16:56:27 +02:00
Arnd Bergmann
3b2cd4d08a STi DT updates for v4.2, round 1.
Highlights:
 -----------
  - Add DT nodes for SSC on STiH407 family
  - Add DT nodes for SD/MMC on STiH407 & STiH418
  - Add DT node for LPC on STiH407
  - Add Sata DT nodes for STiH407
  - Fix PIO3 & PIO35 pins retiming on STiH407
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVQjPFAAoJEMo4jShGhw+JdX0P/AmZ8/+UhflYisudIVvCH1Ok
 QPUno7423gjgwGNIyOI8E2ueQA80FJohpabeIRSIzMz/rQsWsCFMsc/f5rr7CKdj
 rFx11I9t7xabYZxgEzbfzJMXEKP1ZndBbt3p76no/ynSo515Y8t+mxsTxW8maqCZ
 8l8Cr8eSp292foZujs74O6xno77NXZvf/O9zvLNcTrUOT8RBzKMyQ9L0gcMz8FKT
 GZB2CVDMHgUBnaQdaPKOa3adJ2IOzQcJjDhGIisLwF2Mv5Li3YPjI41t/b5g591Q
 Jvf5NZmz0v0cSZltfZsSuulYUeXBizzHLWMM+viRharsZf2UahiFilr8uyXtnBJI
 QgkCbWlaDmz+YEzJQaHy359eDw4NjGNE54AcjSE+sNImu0N4s0WUPdaXt5DQADvq
 Xi4KlMGfkiwpt9Lm8PoM4vY8NoNeGH0CRKdUQQhBkYn3De4VW/G0N+NOgOsTsEyQ
 hLqGvJnnmps3gMn/m+XSBMVNVZEwDmxMFt4hzNCwaDn0NKhzxxYrbQNK0sdbf8tR
 H8yWpQLtO+pVoSTrvOPqHWiGcfe+vHmynVmVHQj17/w7ho3JW0cTgXHmgSNZahnW
 omluWSFi5CswNYG/So6vsThXemp+omsCOUMCfaPoFz/6pE+kTsYvw245JvgtrD4w
 DcWnjE7MQ8NQc8lK9YX7
 =fWhS
 -----END PGP SIGNATURE-----

Merge tag 'sti-dt-for-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti into next/dt

Pull "STi DT updates for v4.2, round 1." from Maxime Coquelin:

Highlights:
-----------
 - Add DT nodes for SSC on STiH407 family
 - Add DT nodes for SD/MMC on STiH407 & STiH418
 - Add DT node for LPC on STiH407
 - Add Sata DT nodes for STiH407
 - Fix PIO3 & PIO35 pins retiming on STiH407

* tag 'sti-dt-for-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti:
  ARM: DT: STi: STiH407: Add sata DT nodes.
  ARM: STi: DT: STiH407: Fix retime pin mask for PIO5 and PIO35
  ARM: STi: DT: STiH407: Add Device Tree node for the LPC
  mfd: dt-bindings: Provide human readable defines for LPC mode choosing
  ARM: STi: DT: STiH418: Add dt nodes for sdhci and emmc.
  ARM: STi: DT: STiH407: Add dt nodes for sdhci and emmc.
  ARM: sti: Provide DT nodes for SBC SSC[0..2]
  ARM: sti: Provide DT nodes for SSC[0..4]
2015-05-12 16:50:28 +02:00
Baruch Siach
905ea449c6 ARM: digicolor: add i2c master controller support
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-05-12 15:16:27 +02:00
Baruch Siach
f4e18ae33f ARM: digicolor: enable CX92755 on-chip RTC device
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-05-12 15:16:27 +02:00
Dinh Nguyen
da29d824a6 ARM: socfpga: dts: add clocks to the Arria10 platform
Add all the clock nodes for the Arria10 platform. At the same time, update
the peripherals with their respective clocks property.

Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
---
v2: Add the l4_sys_free_clk node
2015-05-11 13:26:02 -05:00
Vince Bridgers
c01e8cdb7b ARM: socfpga: dts: Add tx-fifo-depth and rx-fifo-depth properties
Add tx-fifo-depth and rx-fifo-depth devicetree properties for socfpga
stmmac. These devicetree properties will be used to configure certain
features of the stmmac on the socfpga.

Signed-off-by: Vince Bridgers <vbridger@opensource.altera.com>
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2015-05-11 13:15:00 -05:00
Vince Bridgers
be9863cac2 ARM: socfpga: dts: Add multicast bins and unicast filter entries
Add multicast-filter-bins and perfect-filter-entries configuration properties
to the socfpga devicetree for the Arria 10 socfpga.

Signed-off-by: Vince Bridgers <vbridger@opensource.altera.com>
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2015-05-11 13:14:59 -05:00
Dinh Nguyen
5459f9abe2 ARM: socfpga: dts: Add a clock node for sdmmc CIU
The CIU(Card Interface Unit) get its clock from the sdmmc_clk_divided clock
which is used to clock the card. The sdmmc_clk_divided clock is the sdmmc_clk
passed through a fixed divider of 4. This patch adds the sdmmc_clk_divided
node and makes the sdmmc_clk it's parent.

Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
---
v2: renamed ciu_clk to sdmmc_clk_divided
2015-05-11 13:14:59 -05:00
Dinh Nguyen
88c8e4c264 ARM: socfpga: dts: rename socdk board file to socdk_sdmmc
Rename the socfpga_arria10_socdk board file to socfpga_arria10_socdk_sdmmc
as Arria 10 devkit cannot support SDMMC and QSPI at the same time. Thus
we will need to have 2 separate board files, one for SDMMC and one for
QSPI. We also add a new base board dtsi file, socfpga_arria10_socdk.dtsi
so that we use common peripherals for each flavor of the devkits.

Add the sdmmc node to the socfpga_arria10_socdk_sdmmc.dts board file.

Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2015-05-11 13:14:59 -05:00
Dinh Nguyen
74568da48f ARM: socfpga: dts: enable UART1 for the debug uart
Arria10 devkit is using UART1 for the debug uart port. Remove
unused aliases.

Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
---
v2: Add removal of unused aliases
2015-05-11 13:14:59 -05:00
Dinh Nguyen
1dfb7d2fd6 ARM: socfpga: dts: disable the sdmmc, and uart nodes in the base arria10
Add status = "disabled" in the base DTSI for Arria10.  The SDMMC and uart
nodes should be enabled in the appropriate board file.

Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2015-05-11 13:14:59 -05:00
Dinh Nguyen
08d6638f1a ARM: socfpga: dts: add cpu1-start-addr for Arria 10
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2015-05-11 13:14:58 -05:00
Walter Lozano
bf513bf046 ARM: socfpga: dts: Add adxl34x
This patch adds the DTS bindings for the adxl34x digital
accelerometer.

Signed-off-by: Walter Lozano <walter@vanguardiasur.com.ar>
Acked-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2015-05-11 13:14:58 -05:00
Gaël PORTAY
7107bb0b28 ARM: at91/dt: drop deprecated mainck node from pmc
The clock-frequency property became obsolete since the rework of the main
clock driver in 3.16 (see commit 27cb1c2083).

It now get and uses the clock-frequency from the main_xtal node.

Signed-off-by: Gaël PORTAY <g.portay@overkiz.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-05-11 11:24:01 +02:00
Gaël PORTAY
13afc4a83a ARM: at91/dt: add support for kizbox2
Add DT file for Kizbox 2 board.
This board is based on Atmel's SAMA5D31 Cortex-A5 SoC.

Signed-off-by: Gaël PORTAY <g.portay@overkiz.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-05-11 11:20:27 +02:00
Gaël PORTAY
a9c0d1d277 ARM: at91/dt: add support for kizboxmini
Add DT file for Kizbox mini board.
This board is based on Atmel's AT91SAM9G25 SoC.

Signed-off-by: Gaël PORTAY <g.portay@overkiz.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-05-11 11:20:26 +02:00
Gaël PORTAY
b76b7c2c40 ARM: at91/dt: sam9x5: add pinctrl for pwm0
Defines the pinctrl configurations for PWM0.

Signed-off-by: Gaël PORTAY <g.portay@overkiz.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-05-11 11:09:32 +02:00
Linus Torvalds
030bbdbf4c Linux 4.1-rc3 2015-05-10 15:12:29 -07:00
Linus Torvalds
01d07351f2 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
 "I really need to get back to sending these on my Friday, instead of my
  Monday morning, but nothing too amazing in here: a few amdkfd fixes, a
  few radeon fixes, i915 fixes, one tegra fix and one core fix"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm: Zero out invalid vblank timestamp in drm_update_vblank_count.
  drm/tegra: Don't use vblank_disable_immediate on incapable driver.
  drm/radeon: stop trying to suspend UVD sessions
  drm/radeon: more strictly validate the UVD codec
  drm/radeon: make UVD handle checking more strict
  drm/radeon: make VCE handle check more strict
  drm/radeon: fix userptr lockup
  drm/radeon: fix userptr BO unpin bug v3
  drm/amdkfd: Initialize sdma vm when creating sdma queue
  drm/amdkfd: Don't report local memory size
  drm/amdkfd: allow unregister process with queues
  drm/i915: Drop PIPE-A quirk for 945GSE HP Mini
  drm/i915: Sink rate read should be saved in deca-kHz
  drm/i915/dp: there is no audio on port A
  drm/i915: Add missing MacBook Pro models with dual channel LVDS
  drm/i915: Assume dual channel LVDS if pixel clock necessitates it
  drm/radeon: don't setup audio on asics that don't support it
  drm/radeon: disable semaphores for UVD V1 (v2)
2015-05-10 14:58:53 -07:00
Dave Airlie
332545b301 Merge tag 'drm-intel-fixes-2015-05-08' of git://anongit.freedesktop.org/drm-intel into drm-fixes
misc i915 fixes.

* tag 'drm-intel-fixes-2015-05-08' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Drop PIPE-A quirk for 945GSE HP Mini
  drm/i915: Sink rate read should be saved in deca-kHz
  drm/i915/dp: there is no audio on port A
  drm/i915: Add missing MacBook Pro models with dual channel LVDS
  drm/i915: Assume dual channel LVDS if pixel clock necessitates it
2015-05-11 06:06:22 +10:00
Mario Kleiner
fdb68e09bb drm: Zero out invalid vblank timestamp in drm_update_vblank_count.
Since commit 844b03f277 we make
sure that after vblank irq off, we return the last valid
(vblank count, vblank timestamp) pair to clients, e.g., during
modesets, which is good.

An overlooked side effect of that commit for kms drivers without
support for precise vblank timestamping is that at vblank irq
enable, when we update the vblank counter from the hw counter, we
can't update the corresponding vblank timestamp, so now we have a
totally mismatched timestamp for the new count to confuse clients.

Restore old client visible behaviour from before Linux 3.17, but
zero out the timestamp at vblank counter update (instead of disable
as in original implementation) if we can't generate a meaningful
timestamp immediately for the new vblank counter. This will fix
this regression, so callers know they need to retry again later
if they need a valid timestamp, but at the same time preserves
the improvements made in the commit mentioned above.

Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Cc: <stable@vger.kernel.org> #v3.17+

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2015-05-11 06:02:38 +10:00
Linus Torvalds
41f2a93cc6 Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
 "A set of ARM fixes:

   - fix an off-by-one error in the iommu DMA ops, which caused errors
     with a 4GiB size.

   - remove comments mentioning the non-existent CONFIG_CPU_ARM1020_CPU_IDLE
     macro.

   - remove useless CONFIG_CPU_ICACHE_STREAMING_DISABLE blocks, where
     this symbol never appeared in any Kconfig.

   - fix Feroceon code to cope with a previous change correctly (it
     incorrectly left an additional word in an assembly structure
     definition)

   - avoid a misleading IRQ affinity warning in the ARM PMU code for
     IRQs which are already affine to their CPUs.

   - fix the node name printed in the IRQ affinity warning"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 8352/1: perf: Fix the pmu node name in warning message
  ARM: 8351/1: perf: don't warn about missing interrupt-affinity property for PPIs
  ARM: 8350/1: proc-feroceon: Fix feroceon_proc_info macro
  ARM: 8349/1: arch/arm/mm/proc-arm925.S: remove dead #ifdef block
  ARM: 8348/1: remove comments on CPU_ARM1020_CPU_IDLE
  ARM: 8347/1: dma-mapping: fix off-by-one check in arm_setup_iommu_dma_ops
2015-05-10 11:16:48 -07:00
Linus Torvalds
8425ac7a0d Samsung fixes for v4.1
- fixes commit ea08de16eb ("ARM: dts: Add DISP1 power
   domain for exynos5420") which causes 'unhandled fault:
   imprecise external abort' error when PD turned off.
   : make DP a consumer of DISP1 power domain
 
 - fixes 's3c-rtc' probe failure on Odriod-X2/U2/U3 boards.
   : add 'rtc_src' clock to rtc node for source clock of rtc
 
 - fixes typo for 'cpu-crit-0' trip point on exynos5420/5440
 
 - fixes S2R failure on exynos5250-snow due to card power of
   Marvell WiFi driver (suspend/resume)
   : add keep-power-in-susped to WiFi SDIO node
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJVT23xAAoJEA0Cl+kVi2xqZIcP/0CAA25uvidVXdNVYlJbSvr3
 4kesNDG/LGrVnv6xt132iJsXtIfWQxG6nJkhE1x5G9zSgsAjtQWcsCr068Itktsg
 CG1yl/8z6TB+wS0PhTXaa985V62euTws89YGJau6YCZVSXKKcGDjM5e2RJn80yOL
 IMipw8x5xTt0GsIKtC2AyewcNq05SSNtwvYe8CPJ9wGFQPy3gZ1t5WqSwW2mMG+K
 C6mibaN7gs9+sS2ncHglZtHKAR2VxJTNCkq/LOCYlDSftT01GhmhG1fl/tUxEqUD
 1bFTTajA21CNnEvWCdkFkMHkEy7lzW8WCX3tAwDHGON/NdWERV4FSaLTqR0o1ekO
 vLeUSvgtRntBtUY3ojvyfoYq4vrdQF1uoL2r932iO9FILUBpwRYAyG152VFJyZRx
 Hx50yCgyljG3X8xUp5VgiuNwDCgatiFBCeb3YT0qrB9YbnLXqqAUAfMSng8a15dc
 rbD02YsYvYcJPf7RDnS9QQV+ZSSmZIkY7JmxkJ/UJ0SA7dAJBtKrXQyliLVlExHu
 Cz0ye5NHjC+jxwPU/OEFRSZi8bKJXe/q6bAXDRA0vkZWd0G6C+wOq8bnzSWkRM+D
 +/uzxajdDbfs7mr2mPFyc3H22MiwWSOFIRVsCXVKqTN0yVvlaLvHtolUayAD3RrR
 oo25jYh9CYGZhxd+7TVb
 =YBxq
 -----END PGP SIGNATURE-----

Merge tag 'samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

Pull samsung fixes from Kukjin Kim:
 "Here is Samsung fixes for v4.1.  Since I've missed to send this via
  arm-soc tree before v4.1-rc3, so I'm sending this to you directly

   - fix commit ea08de16eb ("ARM: dts: Add DISP1 power domain for
     exynos5420") which causes 'unhandled fault: imprecise external
     abort' error when PD turned off.  ("make DP a consumer of DISP1
     power domain")

   - fix 's3c-rtc' probe failure on Odriod-X2/U2/U3 boards ("add
     'rtc_src' clock to rtc node for source clock of rtc")

   - fix typo for 'cpu-crit-0' trip point on exynos5420/5440

   - fix S2R failure on exynos5250-snow due to card power of Marvell
     WiFi driver (suspend/resume) ("add keep-power-in-susped to WiFi
     SDIO node")"

* tag 'samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: dts: Add keep-power-in-suspend to WiFi SDIO node for exynos5250-snow
  ARM: dts: Fix typo in trip point temperature for exynos5420/5440
  ARM: dts: add 'rtc_src' clock to rtc node for exynos4412-odroid boards
  ARM: dts: Make DP a consumer of DISP1 power domain on Exynos5420
2015-05-10 11:13:19 -07:00
Maxime Ripard
f3022c6ca0 ARM: sunxi: dt: Split the SPI pinctrl groups
The pinctrl groups for SPI until now were also adding the chip selects in
the SPI pinctrl group.

This was causing a few issues, since a board was forced to use a random
number of chipselects, even though it might use one of these chip selects
for another pin.

The number of chipselects defined was also not the same from one group to
another because of different needs at the time these groups have been
introduced, resulting in no clear view from the board DTS on what exactly
is being muxed, which even might change in the future.

Solve this by creating different pinctrl groups for the chipselects and the
standard SPI pins (CLK, MOSI and MISO) so that we fix both issues.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-05-10 10:23:56 +02:00
Maxime Ripard
8358aada4e ARM: sunxi: dt: Fix whitespace errors
A few lines (probably copy pasted) have an indentation mixing tabs and
spaces that triggers a checkpatch warning.

Fix those, and while we're at it, fix the space-indented sections.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-05-10 10:22:24 +02:00
Maxime Ripard
d8cacaa34f ARM: sunxi: DT: Fix lines over 80 characters
A few lines in our DTSIs are over the 80 characters limit, making
checkpatch complain about that.

If possible (and relevant), wrap these lines to 80 characters.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-05-10 10:22:23 +02:00
Maxime Ripard
c0c2eb2476 ARM: sunxi: dt: Remove the FSF address
The FSF address triggers a warning on checkpatch, saying that the FSF
license is already present in the Linux source code, and that it has
already changed in the past.

Remove it from our DT, as suggested.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-05-10 10:22:23 +02:00
Linus Torvalds
8f59ae0643 ARM: SoC fixes for 4.1-rc2
A few patches have come up since the merge window. The largest one is a
 rewrite of the PXA lubbock/mainstone IRQ handling. This was already
 broken in 2011 by a change to the GPIO code and only noticed now.
 
 The other changes contained here are:
 
 MAINTAINERS file updates:
 - Ray Jui and Scott Branden are now co-maintainers for some of the
   mach-bcm chips, while Christian Daudt and Marc Carino have stepped
   down.
 - Andrew Victor is no longer maintaining at91. Instead, Alexandre
   Belloni now becomes an official maintainer, after having done a
   bulk of the work for a while.
 - Baruch Siach, who added the mach-digicolor platform in 4.1
   is now listed as maintainer
 - The git URL for mach-socfpga has changed
 
 Bug fixes:
 - Three bug fixes for new rockchip rk3288 code
 - A regression fix to make SD card support work on certain ux500
   boards
 - multiple smaller dts fixes for imx, omap, mvebu, and shmobile
 - a regression fiix for omap3 power consumption
 - a fix for regression in the ARM CCI bus driver
 
 Configuration changes:
 - more imx platforms are now enabled in multi_v7_defconfig
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIVAwUAVU5vsWCrR//JCVInAQK5Zw/9GMFUQcLfwqfUitabRvA+FjbEYyeKHW2Y
 BCm5OJSOH2MB4/suvmYggIESncHGCzw2iZZwFJ3seuO7vyFAg2pLOmpm2VBvIfqP
 JgokZOhfHDTujogpakNn8ByKszxb/XkuzuDF3AS2BX4H25Rhp7jX6EgrubK9zDcH
 wYsaAXSwc8uUe2885cOK8qYoBhkPRsMqUa4HHp4Z51QNwa+koV9xMFlNyy/j8N8F
 xKjfAW5LCeEdviOjFlYb0Bb3JIerIKmosjHx55g6XCEB1TUKAN6TmqXRUU89dj/0
 MQoD5pXCI1RaV8qjpAFqwcFmfnsAzRob9n1WWEgqwCiKdIDX7E98WeJNGrQ6SlSA
 xePcS+1MMNkTi20CdTSHPwVg5CFz7VG9YTMDrvGtz9tuGtCBQHGhA5o8eQ6eXDYz
 cEMc781Ax4M4Uc3OKb+9M9OAnB+RyJmizjzgR7cQHaQfzI7hVgRAxywu9Z0j4HKJ
 4OmtcOAfwZyEKms9AzvbozKWROVY+T9rC7Aup6SlOSaxupqCdvrMb2XffrixmuVz
 B9vox64BT0Ot0/jqTsZs5YR3UDlX7v1UTx8+BIta7zDvPXIFUSU+dNcS4BDsOkDa
 8Knhi4BpydNaKCxMb8/Q7BjzxNsaMcCEUvNfrjOH7LMHmQhygiKmOSOj3fxEM9S5
 xMSWzw3U0yU=
 =lVQn
 -----END PGP SIGNATURE-----

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Arnd Bergmann:
 "A few patches have come up since the merge window.  The largest one is
  a rewrite of the PXA lubbock/mainstone IRQ handling.  This was already
  broken in 2011 by a change to the GPIO code and only noticed now.

  The other changes contained here are:

  MAINTAINERS file updates:

   - Ray Jui and Scott Branden are now co-maintainers for some of the
     mach-bcm chips, while Christian Daudt and Marc Carino have stepped
     down.

   - Andrew Victor is no longer maintaining at91.  Instead, Alexandre
     Belloni now becomes an official maintainer, after having done a
     bulk of the work for a while.

   - Baruch Siach, who added the mach-digicolor platform in 4.1 is now
     listed as maintainer

   - The git URL for mach-socfpga has changed

  Bug fixes:

   - Three bug fixes for new rockchip rk3288 code

   - A regression fix to make SD card support work on certain ux500
     boards

   - multiple smaller dts fixes for imx, omap, mvebu, and shmobile

   - a regression fiix for omap3 power consumption

   - a fix for regression in the ARM CCI bus driver

  Configuration changes:

   - more imx platforms are now enabled in multi_v7_defconfig"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits)
  MAINTAINERS: add Conexant Digicolor machines entry
  MAINTAINERS: socfpga: update the git repo for SoCFPGA
  ARM: multi_v7_defconfig: Select more FSL SoCs
  MAINTAINERS: replace an AT91 maintainer
  drivers: CCI: fix used_mask init in validate_group()
  bus: omap_l3_noc: Fix master id address decoding for OMAP5
  bus: omap_l3_noc: Fix offset for DRA7 CLK1_HOST_CLK1_2 instance
  ARM: dts: dra7: Fix efuse register size for ABB
  ARM: dts: am57xx-beagle-x15: Switch GPIO fan number
  ARM: dts: am57xx-beagle-x15: Switch UART mux pins
  ARM: dts: am437x-sk: reduce col-scan-delay-us
  ARM: dts: am437x-sk: fix for new newhaven display module revision
  ARM: dts: am57xx-beagle-x15: Fix RTC aliases
  ARM: dts: am57xx-beagle-x15: Fix IRQ type for mcp7941x
  ARM: dts: omap3: Add #iommu-cells to isp and iva iommu
  ARM: omap2plus_defconfig: Enable EXTCON_USB_GPIO
  ARM: dts: OMAP3-N900: Add microphone bias voltages
  ARM: OMAP2+: Fix omap off idle power consumption creeping up
  MAINTAINERS: Update brcmstb entry
  MAINTAINERS: Remove Christian Daudt for mach-bcm
  ...
2015-05-09 16:13:38 -07:00
Linus Torvalds
51dfcb076d Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull user-namespace fix from Eric Biederman:
 "Eric Windish recently reported a really bug that allows mounting fresh
  copies of proc and sysfs when it really should not be allowed.  The
  code attempted to verify that proc and sysfs were fully visible but
  there is a test missing to ensure that the root of the filesystem is
  visible.  Doh!

  The following patch fixes that.

  This fixes a containment issue that the docker folks are seeing"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  mnt: Fix fs_fully_visible to verify the root directory is visible
2015-05-09 16:07:14 -07:00
Linus Torvalds
9d88f22a81 Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq updates from Thomas Gleixner:
 "Two patches from the irq departement:

   - a simple fix to make dummy_irq_chip usable for wakeup scenarios

   - removal of the gic arch_extn hackery.  Now that all users are
     converted we really want to get rid of the interface so people wont
     come up with new use cases"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip: gic: Drop support for gic_arch_extn
  genirq: Set IRQCHIP_SKIP_SET_WAKE flag for dummy_irq_chip
2015-05-09 14:59:05 -07:00
Linus Torvalds
95f3b1f4b1 Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Thomas Gleixner:
 "A simple fix to actually shut down a detached device instead of
  keeping it active"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clockevents: Shutdown detached clockevent device
2015-05-09 14:57:49 -07:00
Rusty Russell
1a9f064f51 m32r: make flush_cpumask non-volatile.
We cast away the volatile, but really, why make it volatile at all?
We already do a mb() inside the cpumask_empty() loop.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-05-09 11:09:29 -07:00
Eric W. Biederman
7e96c1b0e0 mnt: Fix fs_fully_visible to verify the root directory is visible
This fixes a dumb bug in fs_fully_visible that allows proc or sys to
be mounted if there is a bind mount of part of /proc/ or /sys/ visible.

Cc: stable@vger.kernel.org
Reported-by: Eric Windisch <ewindisch@docker.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
2015-05-09 11:55:50 -05:00
Linus Torvalds
95c607d93f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
 "A couple of fixes for bugs caught while digging in fs/namei.c.  The
  first one is this cycle regression, the second is 3.11 and later"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  path_openat(): fix double fput()
  namei: d_is_negative() should be checked before ->d_seq validation
2015-05-08 21:39:12 -07:00
Al Viro
f15133df08 path_openat(): fix double fput()
path_openat() jumps to the wrong place after do_tmpfile() - it has
already done path_cleanup() (as part of path_lookupat() called by
do_tmpfile()), so doing that again can lead to double fput().

Cc: stable@vger.kernel.org	# v3.11+
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-05-09 00:12:48 -04:00
Al Viro
766c4cbfac namei: d_is_negative() should be checked before ->d_seq validation
Fetching ->d_inode, verifying ->d_seq and finding d_is_negative() to
be true does *not* mean that inode we'd fetched had been NULL - that
holds only while ->d_seq is still unchanged.

Shift d_is_negative() checks into lookup_fast() prior to ->d_seq
verification.

Reported-by: Steven Rostedt <rostedt@goodmis.org>
Tested-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-05-09 00:12:35 -04:00