Commit graph

547,562 commits

Author SHA1 Message Date
Olof Johansson
a83e682ee2 ARM: tegra: Default configuration updates for v4.4-rc1
Enable touchscreen and audio support on Toradex Colibri platforms.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJWJj4RAAoJEN0jrNd/PrOhO9YP/Rr5wwioLC1/jjipyUueeU05
 jw70ngx5UpHexK7zeqdbPn+E80iVggqyTRhxav6fwTbcXNHkrVa1tpxy5aLTZyNJ
 GGjWOiHicEhapZZyh10A3/r9SL5vKaIjXGlKxFwEiraT1eEeO/H4yTSSBPGeMVEz
 ZfKNypWBpJmkzWaPMjcWeaCQyxuhQDwpwVbURnVVWN3ONik6OgTnr6clOQww2sVp
 rwNw+Cz57gSJU9+udtH5b34ugg24tgblLYoh6JYPZomkc8nhGgaLFCBXsC1cdwwJ
 fV/NvW/qlw2JU4tv7O7L2amO/n0CmcS6iZFqhRykj5wA0oOyHYJp1fsiV9tdmk2p
 ywn4wVwRhnHXnYwmydtylmW2AZSrncHK1KcuI5ZAOq6/C7KK/mJJJ6ROMNJr8jz2
 72YFOuRBw2zSNKKfNGa/97vJvk8kWdOzkz7P0SXj6F9CrgVGtTSUHMBhTJbQFyX0
 LqHEyFmnVmCzGRyEQbZwGsxQs23kekG+qKeWRCS+0c3PJn5G01XcK/n0ZWgwraiz
 cM1U5TmebRuZSKHybZfy1/WqAO7MOUJ+4knTPZcdERaxc3SClFnBRHXNOzaTe2VL
 vFYU6gvvGT8Yc5ZkjIaTdDZXdZM0YfKLIDKQjU992LXg/dgYNt//UU+DKFG/5daR
 6DBlbNBCQNRAxlAsYX0o
 =sAW5
 -----END PGP SIGNATURE-----

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

ARM: tegra: Default configuration updates for v4.4-rc1

Enable touchscreen and audio support on Toradex Colibri platforms.

* tag 'tegra-for-4.4-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Update multi_v7_defconfig
  ARM: tegra: Update default configuration
  ARM: tegra: Rebuild default configuration on v4.3-rc1

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-26 09:47:19 +09:00
Olof Johansson
98376f6af8 defconfig update for 4.4:
- Add sama5d2 and its peripherals to sama5_defconfig and multi_v7_defconfig
 - Trivial savedefconfig updates to at91_dt_defconfig and sama5_defconfig
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJWJUqOAAoJEKbNnwlvZCyzn8MQAMRloaLeoQVRkfBhixdRI3Pr
 FMUl/fbQJQib/tWytsSIXktEy67MesHeOxI0kSeN1zeuqzEUswvsuShV7ibuoBl9
 r+mE9lJqp7B3qJu4mD+yfH39v79zmGyCkop9wWkdiSSmxZinBc6JipfeH5k4U97/
 3965uRnI5+mKz4UKyEAxnOz6OKVjkOc5ZwR9X1VGpaVJBjl7hYHQOVTVzR3s4phg
 +b51+hzVdBMaIBgPaE56Nqzn0ZecR9aLV2hCTpL4Avkqx7A/TiQdmtrjpOivMFYK
 OracOxjTk2yAmDGaibMYDy7l67uTY/jBW5z40LVfSNa/W4y+/t2JfocAbW04Eete
 MVvGfaBFG1lvrlBDy0+q4HzqnkKFGvyG3OaFinL+CgSXOOQ2o3nD89WWZIY9rUXa
 EZhTkz0f+cPs5pPJjY4hFwtMvuSYSt/qRBpTeBtRM5A8GIHYroCNv9Ng1pJPCIlh
 YM1mqMSGWE20Navf17QfVKoJW7zLZ5THWeGAo/bWXYp4y/PRtQNQ1/mr43nBuYe9
 o4B5QELGgLkoFp1NTyfR+I4TwRFux7Oy1Cg17F2J2Lr1FxY4foVtW91+0UP/pg4g
 I7zUzIa8khqWcK92uLRX3ayicuRPP8cTJd4Bwe2A2PEV8h8ap7AK6K2ZcQHqTKs6
 3Ee/qG3jNzVdLROLerlK
 =urST
 -----END PGP SIGNATURE-----

Merge tag 'at91-ab-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/defconfig

defconfig update for 4.4:
- Add sama5d2 and its peripherals to sama5_defconfig and multi_v7_defconfig
- Trivial savedefconfig updates to at91_dt_defconfig and sama5_defconfig

* tag 'at91-ab-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: multi_v7_defconfig: Add Atmel SDHCI device
  ARM: multi_v7_defconfig: Add Atmel Flexcom device
  ARM: multi_v7_defconfig: Add Atmel SAMA5D2 SoC
  ARM: at91/defconfig: add sama5d2 and its new devices to sama5 defconfig
  ARM: at91/defconfig: update at91_dt defconfig
  ARM: at91/defconfig: update sama5 defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-26 09:44:07 +09:00
Olof Johansson
302f9f6b16 The i.MX defconfig updates for 4.4:
- Enable i.MX6UL touchscreen controller support.
  - Remove CONFIG_VMSPLIT_2G option since we already enabled
    CONFIG_HIGHMEM support.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJWJQbyAAoJEFBXWFqHsHzOyXEH/24wElW4Qai0X/87Cqfy8+tN
 KdhbhyWcjiZO5cAiAEzhQMKiQ+e5S0uDQvyqXn3jJFj8Tr9VwK+ZfoPJcIPqtI2m
 qCjpvLq2XfkwDdsH1Y9KIKblTZLXpgvlhtGileIcENLzKa5MezUMJ9tMPZR79pb3
 7s0FieGgk3FbkhnQJASl7giSu1zsnPaOncoqTLLHwEc/7J/3vpvePRdawincCp2M
 OK32Cea1dgy1I7fYuluj3f5EMOSeKLy3Q0wSqUzWd72OMCQdfT1qm/al4W+5jwiY
 NbX/UVJnDwYB3/mJDOia/TF1KhpXwBP5m6JeIrvbMXY40i3KAbkcerqvWSdxm8I=
 =H7D1
 -----END PGP SIGNATURE-----

Merge tag 'imx-defconfig-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig

The i.MX defconfig updates for 4.4:
 - Enable i.MX6UL touchscreen controller support.
 - Remove CONFIG_VMSPLIT_2G option since we already enabled
   CONFIG_HIGHMEM support.

* tag 'imx-defconfig-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: Remove CONFIG_VMSPLIT_2G
  ARM: imx_v6_v7_defconfig: enable imx6ul_tsc

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-23 10:56:01 -07:00
Olof Johansson
57dbe1baac Allwinner defconfig changes for 4.4
A bunch of defconfig changes to enable support for new drivers.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWIn+gAAoJEBx+YmzsjxAgquQP/20gRC/wzuxJPQkiN9NIrkWg
 CTfDzr6Tbm1/Wu8HhfBAEPHLrRLQ9pSL+tQ8pYUOzS/1b/Jjs45qARqaJfhmfmAX
 jz0Kp/VyqZ7vg81nutfp/QGK0EMst2izeKkmkI55WKVMJy+xZ3e7J9ED7XRJg7V5
 +RU8P+/nCzFVc1gboYf2qa4rE+EW49E2jNV2MBpkU2TA8vqzyF7w/Ye5Rv20Q8Zo
 kGpIxbDg9ua0Ak8TVgSX8ocq+wlqD5OyOIixTJ0X+MovHKGl0gDZ4Pj43XrZuGEj
 0Wl3AIn69e0cVYatTWIvBT+LkntIVihfgsZsZg+QdcNfumxeJkYs4p56JCRaM2zf
 JdqpRTjq/ueZ3WkwItK07mAoVshKrK5+IcAR8zhbOAWACQ9N1lHMIODnNIvLWveq
 0R8eymRQN5yyYJ22o5Jc+EellWGmbLKC89QYnQPs8um2TlhTB4whlswa6UMi4DZP
 1zWCixjGEuKTJIGRf+vdKQVJZrMEXVSWO9/TM6j2z0dPa6gOGu1Jfp9H2kZseXZ9
 XfBr8CPiawkPpz4nQNxNgv4zYhRPRj1TltDsExpVUjjkQsNOMQpS6+l86uWEilaT
 xW3R3FJ5h7kIhdR+FEi1/t1SZKlQbrniLZ+lMdxefFbMO9d7NBkNyPztL9fbI4Nv
 bF8RmqZPK06kkYPVvBAq
 =g7fp
 -----END PGP SIGNATURE-----

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

Allwinner defconfig changes for 4.4

A bunch of defconfig changes to enable support for new drivers.

* tag 'sunxi-defconfig-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi_defconfig: enable MODULE_UNLOAD
  can: Allwinner A10/A20 CAN Controller support - Defconfig
  can: Allwinner A10/A20 CAN Controller support - Defconfig
  ARM: sunxi_defconfig: Enable LRADC keys (KEYBOARD_SUN4I_LRADC)

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-23 10:20:34 -07:00
Olof Johansson
df3e6906d3 mvebu config for 4.4 (part 1)
Update the v7 defconfig witth usefull config for the Seagate NAS
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYiY+EACgkQCwYYjhRyO9WANACfdPTeOBofTpIFChzcNlg823Su
 BIYAn1XQ+oxXKt/mmh0xWRJGcIEKQJPP
 =+DPM
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-config-4.4-1' of git://git.infradead.org/linux-mvebu into next/defconfig

mvebu config for 4.4 (part 1)

Update the v7 defconfig witth usefull config for the Seagate NAS

* tag 'mvebu-config-4.4-1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: enable options for Seagate NAS in mvebu_v7_defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-23 10:16:12 -07:00
Olof Johansson
b52d232027 SoCFPGA defconfig update for v4.4
- Add the FPGA manager config option
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJWIHFZAAoJEBmUBAuBoyj0cCcP/0DbZu6BiP8xHcQ/Qy1ys6kf
 vhuVQofEIcP9bxCDPr3HoL8Seb90Pyx0P+8YfG6N1LPPLAM8JHLaTrGyRx7IOukq
 qNgZAZLafUfLNA8UEGgX24I3YzA+n1sbEXTRO5WTJJKk711MaLdOAgIsvNczqiJV
 +JxXI2VXTEqMHvQxSGt4EIDOW9g9p6HMlwy9PQaOqQF8isL4Qv6H1yEa+4UvkWy4
 72XniFE/x2sewAdPHX8ajvRydHdYb8OiJPJY6d3oiHB1iSJNIb/U+rMmpVjDlbHw
 u1vD3K1PP7HA52RwHvqDj93T/JXIDvoZc7mU9GBykhZ2TDtP1GIfsvpurRGYW9+N
 5pG+bzjY/DmbQWWKIgKGdTAzEa9ntAZp3Yk7z0N2na6jv5AxsICn5cBFhzdYUrwc
 nm2L1ISndBpt6qlN/WEFC0BBOdnx62lvc4eYwXF35KUQfzBQtG0slUELJ+5QsE0X
 U+Oi+GGnl5lnP3yCpppxXBlMfVbze+BLUxyms2ZcdUzx7p4cCf9kKE3vHmVBQ6kv
 sHELAIF1KIKSyRZK3BChOYOywSDfY4bvIP6ijF2wVCzPXLUtZ3me7x7S+RlRBgJS
 9s60Whc/dizhspdUXgt6i0ePp5AelFTon49w8vPGdTkgGoEO0xdAS3KIYeRFznLm
 71872hoWPCp96MBohaJB
 =iB+B
 -----END PGP SIGNATURE-----

Merge tag 'socfpga_defconfig_for_v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/defconfig

SoCFPGA defconfig update for v4.4
- Add the FPGA manager config option

* tag 'socfpga_defconfig_for_v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga_defconfig: enable fpga manager

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-22 10:10:28 -07:00
Olof Johansson
c2c73aa859 Second Round of Renesas ARM Based SoC Defconfig Updates for v4.4
* Enable HDMI output for Renesas RCar
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWHvPWAAoJENfPZGlqN0++4QIP/1hNhJqDJoR459PmbVwRNhaR
 hdBEPH1S+O2p0fYGA+ZNJSCbtzNhIdfCehh7w0cNjDV8sA3ViIiMCQZzGygmGB2J
 koNbwc0mzLgZGGl5aW3p2Mc2pZzS116x5bXrT40w9Y86ClntB7WKYBSt0svm6iLf
 2p4X5KSzJUESYY5+LVRRLt3mDpE6dT1xanMLgzYq21NLIi+E2vXuIS7haAkJMO7U
 zaYknQk/McrhzBNCpVP2azI5ax7guX4gX+qvD4lcIja6VDO7dhKEL65iqPdfOgOv
 MuFC0SJI/hOYvKga5ogmGOhZAY5PrCSBToAVMnEc0EKiFYe50Z5llVZ6PO8TWy26
 /c8tHmSyZ4SAhBflxrEMqzmXD8KtP0HwcbB90ZyCHZ614HCPM44CN/Aw2cU7KUMb
 3iw+frAsVV4NaqNLSzpEGLgr2PH9XVfkwWhA1BUlE1yGhm4OPl9jjKJ56Wx9LF70
 bQx9uuttA2DkLd0yaX8/2V65EPQZQfZwvqwjYQonK1vDAsvtgiGexrZtEcy4tjzd
 nPaXhHA7o6pwxt3UvTYg6HWMW0tuVQ9/oqtJkZIS4SNUaBuhzEX6vILJAMbaWDLF
 AuUiDcPUaDjd0pqU4RQmLPcPt1R1m6YXWSlyPVI+4AdCaQd1YacbSXCU/e0i57XY
 h42pRb4yFiveCmeNTmj0
 =9fOc
 -----END PGP SIGNATURE-----

Merge tag 'renesas-defconfig2-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig

Second Round of Renesas ARM Based SoC Defconfig Updates for v4.4

* Enable HDMI output for Renesas RCar

* tag 'renesas-defconfig2-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: multi_v7_defconfig: enable HDMI output for Renesas RCar
  ARM: shmobile: defconfig: enable HDMI output for RCar

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-22 09:46:49 -07:00
Olof Johansson
7c83d2f79e Qualcomm ARM Based defconfig Updates for v4.4
* Enable QCOM SMD/RPM in multi_v7_defconfig
 * Enable QCOM SMD/RPM in qcom_defconfig
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJWFt3kAAoJEFKiBbHx2RXVzncQAJA73WO4i7P9Wyev7lj+IVLC
 PMyOQjI1TAb2pLGItI9r5FoG6Ege/hndHkk07GfdwflG6Aso8+Sl1oGJX8Ic6Kvb
 CBDQ97Bz2PAwYHG8UGgfPvSs6Nkf9hFVknTqlL0x0IFnA0XvjyAiyTAk8JPqRDxR
 nyCfAzqPOfIbFhydIy1uCaL2q6QEzzfUBuC9VmaIvkVDZ9pP/vynBYIStAUrK9SN
 xY71ViZY1Od2J2XlC0DlMcnviGspvwObAjBJbwcQ6wFxGtSE0MYcqi9bnYmHOPrd
 zrmLebXCpOZJ7kT6vbpcJNLoZQKAfmDyleRlQXI77KxkaPPUUnuAwOnUbq1aDWLd
 x1lbZ/E8H+cgB+vN0BzmTuLHWny88fm7CmJkb/s4FU6SX7CV+AAlDj/g+5wNoDD+
 GfS3zNbzXqVL0Y5cf7Qd7X880CDtpxaDK2OhumXM1jept9ooNAbtpBmG8RQFB8Ck
 019+wn9x8nKNW0HLaqMgZ5jh2/8QtC6p0Ngf4VraN1xrG7crMK5EGoyB793Q3iET
 JCpyjhEkkGUCg02Gm0VMQguSZtWtaiCJC+8y6/Qlyb15y2Go2JvxErkGjKWrn//X
 5dsZp7t5+kfn3I2VO2BcoyXoqDYB7A7IK8ZC74da/z0gdHjvHATOeTE+bWuhe0E7
 WMMtEofdcDAt/FUlivDc
 =E2ul
 -----END PGP SIGNATURE-----

Merge tag 'qcom-defconfig-for-4.4' of git://codeaurora.org/quic/kernel/agross-msm into next/defconfig

Qualcomm ARM Based defconfig Updates for v4.4

* Enable QCOM SMD/RPM in multi_v7_defconfig
* Enable QCOM SMD/RPM in qcom_defconfig

* tag 'qcom-defconfig-for-4.4' of git://codeaurora.org/quic/kernel/agross-msm:
  ARM: multi_v7_defconfig: Enable QCOM SMD/RPM
  ARM: qcom_defconfig: Enable SMD-RPM regulators

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-22 09:44:41 -07:00
Antoine Tenart
d3b4aa7f78 ARM: multi_v7_defconfig: improve multi_v7_defconfig support for Berlin
Some drivers used on a Marvell Berlin kernel were missing from
multi_v7_defconfig. This series add them:

  * The pxa168 Ethernet driver is added as a loadable module.
  * The Berlin ADC driver is added as a loadable module.
  * Both the Berlin USB PHY and SATA PHY drivers are added,
    built-in, as they are required for the already available USB
    and SATA functionalities in multi_v7_defconfig.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-22 09:38:15 -07:00
Thierry Reding
2fb43cecf5 ARM: tegra: Update multi_v7_defconfig
Enable some options that have recently been enabled on Tegra platforms:

  * TOUCHSCREEN_WM97XX: touchscreen support on Toradex Colibri
  * SND_SOC_TEGRA_WM9712: audio support on Toradex Colibri

Signed-off-by: Thierry Reding <treding@nvidia.com>
2015-10-20 14:47:07 +02:00
Ludovic Desroches
4af8540f00 ARM: multi_v7_defconfig: Add Atmel SDHCI device
The AT91 SDHCI device has been introduced with Atmel SAMA5D2 SoC.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
2015-10-19 21:52:21 +02:00
Ludovic Desroches
deb8d801ee ARM: multi_v7_defconfig: Add Atmel Flexcom device
The Flexcom device has been introduced with Atmel SAMA5D2 SoC.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
2015-10-19 21:52:21 +02:00
Ludovic Desroches
08a61cbfd2 ARM: multi_v7_defconfig: Add Atmel SAMA5D2 SoC
Add Atmel SAMA5D2 SoC family to multi_v7 image.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
2015-10-19 21:52:21 +02:00
Ludovic Desroches
a40629a034 ARM: at91/defconfig: add sama5d2 and its new devices to sama5 defconfig
Add SAMA5D2 SoC plus Atmel flexcom and Atmel sdhci devices.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
2015-10-19 21:52:21 +02:00
Ludovic Desroches
23bf637d54 ARM: at91/defconfig: update at91_dt defconfig
Trivial savedefconfig update.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
2015-10-19 21:52:00 +02:00
Ludovic Desroches
86dcfca525 ARM: at91/defconfig: update sama5 defconfig
Trivial savedefconfig update.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
2015-10-19 21:51:49 +02:00
Maxime Coquelin
fb40c67769 ARM: configs: Enable FIXED_PHY in multi_v7 defconfig
CONFIG_FIXED_PHY is needed to have Ethernet working on STi boards.

Select it as built-in since RootFS is accessible from NFS on these boards.

Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-10-15 22:40:18 +02:00
Joachim Eastwood
04004d4d9a ARM: configs: update lpc18xx defconfig
- Enable SPIFI Flash and JFFS2 to support rootfs on Flash memory
- Enable USB Phy, mass storage and SCSI to support USB memory
- Enable PCF857x and JC42 I2C devices found on Hitex board
- Enable PL172 to support memory mapped NOR Flash
- New LPC18xx drivers: I2C, Watchdog, SCT PWM and RTC

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-10-15 22:25:01 +02:00
Alan Tull
b97cecc7a6 ARM: socfpga_defconfig: enable fpga manager
Enable fpga manager framework and low level driver for
socfpga in socfpga_defconfig

Signed-off-by: Alan Tull <atull@opensource.altera.com>
Reviewed-by: Moritz Fischer <moritz.fischer@ettus.com>
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2015-10-13 14:25:18 -05:00
Wolfram Sang
fec3fb4734 ARM: multi_v7_defconfig: enable HDMI output for Renesas RCar
Actviate HDMI output of the RCar DU (and LVDS while we are here).
Enable the HDMI encoder chip found on Lager/Koelsch boards.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-10-13 10:42:17 +09:00
Simon Guinot
ea592ed290 ARM: mvebu: enable options for Seagate NAS in mvebu_v7_defconfig
This patch enables the following options needed by the Seagate
Personal Cloud 1 and 2-Bay and the Seagate NAS 2 and 4-Bay:

SATA_AHCI
POWER_RESET_GPIO
RTC_DRV_DS1307
RTC_DRV_PCF8563

Additionnally this patch also enables NEW_LEDS which was missing for
some reasons.

Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
2015-10-12 16:49:13 +02:00
Wolfram Sang
687dfe660a ARM: shmobile: defconfig: enable HDMI output for RCar
Actviate HDMI output of the RCar DU (and LVDS while we are here).
Enable the HDMI encoder chip found on Lager/Koelsch boards.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-10-12 09:18:06 +09:00
Andy Gross
f14b3692c2 arm64: defconfig: Enable devices for MSM8916
This patch enables a number of devices currently supported by the MSM8916
boards.  These include I2C, SPI, DMA, SMEM, SMD, and SMD regulator support.

Signed-off-by: Andy Gross <agross@codeaurora.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-10-09 17:12:28 +02:00
Andy Gross
4e7fb93081 ARM: multi_v7_defconfig: Enable QCOM SMD/RPM
This patch enables all of the options necessary to support the Qualcomm SMD
RPM regulator driver.

Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-10-08 15:59:46 -05:00
Andy Gross
76416cbb93 ARM: qcom_defconfig: Enable SMD-RPM regulators
This patch enables all of the options required to support SMD RPM based
regulators.

Signed-off-by: Andy Gross <agross@codeaurora.org>
2015-10-08 15:59:46 -05:00
Arnd Bergmann
8a893d5abc Couple of ARM Keystone config patches
- Sync up the config with savedefconfig
 	- Add basic systemd options
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWE/tRAAoJEHJsHOdBp5c//pAP/A/P2EFC6ulPcWaNqpkITJN1
 Mqusz7ha2ZmdrQR6rLZRDad+TSi/zh95RrikswaT+ON1JdsYhioDjUNMuxPmrAqv
 vJbdKCUYstumxjrsVJXp7WnyzNp8MECBSKV2qp97nXpQNhqBzyiXVmqnl+36AZ4+
 kCFPF8pVQSVhCSnKwkU2ZYkLw7Zg4xkEBVcv0hRtOTZ0BaCE7CGEYpmbn0ntV6gM
 b3XYPefpbt5Ok2ReGffZi434BQpj3ke/9v5R6QfkhdI8ud1Ucp+8x696qhTEXUnY
 Iuu/YfMEF6k4CXRwsaRQSWK0usin73WHHMCMcggzUdThd6xSa5BfBlrYP5YNyfIZ
 pSbOZiE/IoyISn/KnUhn54uuW9qKAuSkpVB0hh89Y7Y48DOuXVRm5dYUsxSkER0H
 ANSyjYJwyXuja5qSyQIHDCOKFtjziGoW/DF5QkjYhIINMViYqRS6pGP7jDGdcGC3
 hmeWKIN7ddxMVtI7TfJnaKzN6g/LiWL8W1QA3h20WEuaK0DtquES+RerO7RpLR3x
 mL1nnddyFFlmRjRd0IoIIhv7hkW/e22B74cIjD7Rya+PoGzBHwbYCbmZ9g060J7z
 GbM6quCLGWzcc/XciM7pS91hyYEDnrij+mLhxlQQ2wMAssAdgohC+yBZx9httokW
 WUKrC8qNbRqvZNmd5oxd
 =FjzF
 -----END PGP SIGNATURE-----

Merge tag 'keystone-config' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/defconfig

Merge "Couple of ARM Keystone config patches" from Santosh Shilimkar:
	- Sync up the config with savedefconfig
	- Add basic systemd options

* tag 'keystone-config' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: configs: keystone: Add basic systemd related options
  ARM: configs: keystone: sync to savedefconfig
2015-10-08 17:31:52 +02:00
Sjoerd Simons
1590a419ac ARM: multi_v7_defconfig: Support RTC devices commonly used on Rockchip boards
Similar to the power management situation on Rockchip boards, there are
two common RTC setups. For boards using the RK808 chip as a PMIC that
chip also serves as the RTC, while boards using the ACT8846 typically use
the Haoyu Microelectronics HYM8563 chip as their RTC.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-10-06 16:12:46 +02:00
Sjoerd Simons
0ed9eb30c6 ARM: multi_v7_defconfig: Enable the Rockchip USB 2.0 phy
Most Rockchip SoCs have a DesignWare HS OTG USB 2.0 controller, enable
the driver for the Rockchip USB 2.0 PHY to make that functional.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-10-06 16:12:12 +02:00
Sjoerd Simons
cc68819a58 ARM: multi_v7_defconfig: Enable Rockchip display support
Enable options needed for HDMI out on rockchip: DRM driver, Rockchip
DesignWare HDMI glue and the rockchip IOMMU (dependency of the DRM
driver).

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-10-06 16:10:41 +02:00
Sjoerd Simons
307440f4db ARM: multi_v7_defconfig: Enable common regulators for rockchip boards
Rockchip boards seem to have two common regulator setups. Various board
used the Active Semi act8846 often in combination with Silergy syr82x
regulators (e.g. Radxa Rock Pro/Rock 2, Firefly, and Netxeon R89 etc),
while others use regulator part of the Rockchip RK808 chip (e.g. the
various Veyron based chromebooks, Chipspark Popmetal etc)

Enable all these regulators.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-10-06 16:10:00 +02:00
Sjoerd Simons
2be40ba6d7 ARM: multi_v7_defconfig: Enable common Rockchip devices/busses
Enable Rockchip I2C, SPI, PWM, thermal drivers.

Builtin are I2C (as it often required to control the pmic) and Thermal
drivers (to prevent thermal damage). SPI and PWM drivers configured as
modules

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-10-06 16:07:31 +02:00
Srinivas Kandagatla
b605aded44 ARM: multi_v7_defconfig: Add missing QCOM APQ8064 configs
This patch adds few missing essential configs in the multi_v7_defconf,
absense of some configs like PINCTRL_APQ8064 would prevent the board from
getting access to serial.

cc: Kevin Hilman <khilman@kernel.org>
cc: Tyler Baker <tyler.baker@linaro.org>
Tested-by: Andy Gross <agross@codeaurora.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-10-06 16:04:49 +02:00
Arnd Bergmann
bd57a6a90e Merge tag 'arm-soc/for-4.4/defconfig' of http://github.com/Broadcom/stblinux into next/defconfig
Merge "Broadcom defconfig changes for v4.4" from Florian Fainelli:

This pull request contains the following changes for the multi_v7_defconfig:

- Jon adds support for the NorthStar Plus SocS to the multi_v7_defconfig file

* tag 'arm-soc/for-4.4/defconfig' of http://github.com/Broadcom/stblinux:
  ARM: multi_v7_defconfig: Add NSP to defconfig
2015-10-06 16:03:48 +02:00
Arnd Bergmann
aea843bc38 Renesas ARM Based SoC Defconfig Updates for v4.4
* Remove now non-existent MACH_MARZEN from defconfigs
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJV+n6wAAoJENfPZGlqN0++Ff8QAKnF5ecpFZ2g5Eq1jwNq8Rni
 iAP3KvB0J5018zFjZc+hMDTc1XkluBVplQaJ4hiDpGICtaD+Eip8ZbieOUFHIeDT
 a5kvoqMdxIABKdpAYNqRKzXENUiwzDg6GAJckvB2Z7cG9VlyGtLI1oVQnNGQQLYA
 fx44V5zBW12wNSEQAeQpfWLGUWHI72Xo4F02zP2bMdqnBWQjueajskVx3J1gI6/r
 3BrGpRmkxD8SFu1LfNBYTZp7DuulFGqZKF2nNQc66rb0VFTXC8QgTtHh/Nbyv/nA
 NoqdWAOvpxQN9cjKU/USPqDyBedYm9VQOUYFSLSKmoMceQt/mOTKeSBs356A4u5f
 P7qZ4x3C7QuJTcyIxW+k4UHpYTSSFt3bQcx+89eSiSicWm4GEBTAi5m76AWVOLf0
 SGTmJB9pucymz4BNGatp6/FMLtBj3VjXu3VhGxeeTavl67UdGvRr6KhKRxUIDlQo
 /9K0Dq23WXY6gIkm0FFHHMcXUmqkBcL1ArXWnfXgdKuxWjJIFu7ir/FSXadss8cb
 rP3Ql4iMwBmLKvGfZ5dnoNqIRjQfkGO+gnDQK/y6c2C/AD1rcwBudTBBvk0gFn1I
 D9nT5GG43wPr8YrRxqjwFZEWVBxJnDLlAM9CTZSCPHM6X7uq+/Zg54QQzX1UfKY4
 P24qMZsZIiY03tOrY8/g
 =iUhT
 -----END PGP SIGNATURE-----

Merge tag 'renesas-defconfig-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig

Merge "Renesas ARM Based SoC Defconfig Updates for v4.4" from Simon Horman:

* Remove now non-existent MACH_MARZEN from defconfigs

* tag 'renesas-defconfig-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: multi_v7_defconfig: Remove Marzen
  ARM: shmobile: Remove Marzen from shmobile_defconfig
2015-10-06 16:02:34 +02:00
Linus Torvalds
049e6dde7e Linux 4.3-rc4 v4.3-rc4 2015-10-04 16:57:17 +01:00
Linus Torvalds
30c44659f4 Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull strscpy string copy function implementation from Chris Metcalf.

Chris sent this during the merge window, but I waffled back and forth on
the pull request, which is why it's going in only now.

The new "strscpy()" function is definitely easier to use and more secure
than either strncpy() or strlcpy(), both of which are horrible nasty
interfaces that have serious and irredeemable problems.

strncpy() has a useless return value, and doesn't NUL-terminate an
overlong result.  To make matters worse, it pads a short result with
zeroes, which is a performance disaster if you have big buffers.

strlcpy(), by contrast, is a mis-designed "fix" for strlcpy(), lacking
the insane NUL padding, but having a differently broken return value
which returns the original length of the source string.  Which means
that it will read characters past the count from the source buffer, and
you have to trust the source to be properly terminated.  It also makes
error handling fragile, since the test for overflow is unnecessarily
subtle.

strscpy() avoids both these problems, guaranteeing the NUL termination
(but not excessive padding) if the destination size wasn't zero, and
making the overflow condition very obvious by returning -E2BIG.  It also
doesn't read past the size of the source, and can thus be used for
untrusted source data too.

So why did I waffle about this for so long?

Every time we introduce a new-and-improved interface, people start doing
these interminable series of trivial conversion patches.

And every time that happens, somebody does some silly mistake, and the
conversion patch to the improved interface actually makes things worse.
Because the patch is mindnumbing and trivial, nobody has the attention
span to look at it carefully, and it's usually done over large swatches
of source code which means that not every conversion gets tested.

So I'm pulling the strscpy() support because it *is* a better interface.
But I will refuse to pull mindless conversion patches.  Use this in
places where it makes sense, but don't do trivial patches to fix things
that aren't actually known to be broken.

* 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  tile: use global strscpy() rather than private copy
  string: provide strscpy()
  Make asm/word-at-a-time.h available on all architectures
2015-10-04 16:31:13 +01:00
Linus Torvalds
15ecf9a986 Assorted fixes for md in 4.3-rc
Two tagged for -stable
 One is really a cleanup to match and improve kmemcache interface.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJWDjJNAAoJEDnsnt1WYoG5bOkP/ioJ8DZWkobOWSpnjbNCKIyg
 xrX3FlTq8MJHPfeqGDzfznjYTZ7vb9ZYkZNkn1HUIOXKCkG0hqr1GL1eVZmKAbgZ
 B3nuyIuArZe+IXQ5mMoMXn5qpp7/2mO/JPaqBBrUmxHMx+c+Xx0LC0QUdL7GXzY5
 oQ8SahoLrl7Xl4/i9dSuhVD9rDhzuC7ZmykLkYrtquxFC69tH4PRUWak0RXXvHsE
 mzADdqCwATLUu2FvEudoaCecXHxRmcn47CuALcqdaZF+VVPe8WsjIySmeVDRCixZ
 k9njCdNiqtoKzb87MJECclYbCdHUVcKMNqaOoBkLaZnJumNFABwrPP3LnMtdaNpy
 TrjYh3x5/xrdOgmWBML2gK/suEtaN2hgT6KyI38rAwlYQlEppxd94ZbIH0Q0wY+L
 Unhcn28h56janKYVzyumA0Z5p6fbpxkI2OLEws4HzSqq6Ajpuc7yxDSCbUmE2vXL
 WIoVAgH6PEr5sUCMH7xxqWejoXDi1KinPPVELKuMTWCiwRFr3CnZZzPXGJX5DXSG
 nS9HCR35WmXuQx9pqC4/YOk7HBmllnNMHUrFlOYCzAn2qbjsCZ0whNlKe78qvN2z
 +OYiVRF8KmSNAkP+S47sxeyEEYMi4aKVNe1ur1jVjYmA5keIdmjbnIRjGXfSNzff
 PdvMqZcGouq4jsz2fqQf
 =yqg5
 -----END PGP SIGNATURE-----

Merge tag 'md/4.3-fixes' of git://neil.brown.name/md

Pull md fixes from Neil Brown:
 "Assorted fixes for md in 4.3-rc.

  Two tagged for -stable, and one is really a cleanup to match and
  improve kmemcache interface.

* tag 'md/4.3-fixes' of git://neil.brown.name/md:
  md/bitmap: don't pass -1 to bitmap_storage_alloc.
  md/raid1: Avoid raid1 resync getting stuck
  md: drop null test before destroy functions
  md: clear CHANGE_PENDING in readonly array
  md/raid0: apply base queue limits *before* disk_stack_limits
  md/raid5: don't index beyond end of array in need_this_block().
  raid5: update analysis state for failed stripe
  md: wait for pending superblock updates before switching to read-only
2015-10-04 11:47:28 +01:00
Linus Torvalds
0d8770815f Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle:
 "This week's round of MIPS fixes:
   - Fix JZ4740 build
   - Fix fallback to GFP_DMA
   - FP seccomp in case of ENOSYS
   - Fix bootmem panic
   - A number of FP and CPS fixes
   - Wire up new syscalls
   - Make sure BPF assembler objects can properly be disassembled
   - Fix BPF assembler code for MIPS I"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: scall: Always run the seccomp syscall filters
  MIPS: Octeon: Fix kernel panic on startup from memory corruption
  MIPS: Fix R2300 FP context switch handling
  MIPS: Fix octeon FP context switch handling
  MIPS: BPF: Fix load delay slots.
  MIPS: BPF: Do all exports of symbols with FEXPORT().
  MIPS: Fix the build on jz4740 after removing the custom gpio.h
  MIPS: CPS: #ifdef on CONFIG_MIPS_MT_SMP rather than CONFIG_MIPS_MT
  MIPS: CPS: Don't include MT code in non-MT kernels.
  MIPS: CPS: Stop dangling delay slot from has_mt.
  MIPS: dma-default: Fix 32-bit fall back to GFP_DMA
  MIPS: Wire up userfaultfd and membarrier syscalls.
2015-10-04 11:41:58 +01:00
Linus Torvalds
3e519dde1e Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner:
 "This update contains:

   - Fix for a long standing race affecting /proc/irq/NNN

   - One line fix for ARM GICV3-ITS counting the wrong data

   - Warning silencing in ARM GICV3-ITS.  Another GCC trying to be
     overly clever issue"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/gic-v3-its: Count additional LPIs for the aliased devices
  irqchip/gic-v3-its: Silence warning when its_lpi_alloc_chunks gets inlined
  genirq: Fix race in register_irq_proc()
2015-10-04 11:40:09 +01:00
Markos Chandras
d218af7849 MIPS: scall: Always run the seccomp syscall filters
The MIPS syscall handler code used to return -ENOSYS on invalid
syscalls. Whilst this is expected, it caused problems for seccomp
filters because the said filters never had the change to run since
the code returned -ENOSYS before triggering them. This caused
problems on the chromium testsuite for filters looking for invalid
syscalls. This has now changed and the seccomp filters are always
run even if the syscall is invalid. We return -ENOSYS once we
return from the seccomp filters. Moreover, similar codepaths have
been merged in the process which simplifies somewhat the overall
syscall code.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11236/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2015-10-04 12:10:56 +02:00
Linus Torvalds
2cf30826bb Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
 "Fixes all around the map: W+X kernel mapping fix, WCHAN fixes, two
  build failure fixes for corner case configs, x32 header fix and a
  speling fix"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/headers/uapi: Fix __BITS_PER_LONG value for x32 builds
  x86/mm: Set NX on gap between __ex_table and rodata
  x86/kexec: Fix kexec crash in syscall kexec_file_load()
  x86/process: Unify 32bit and 64bit implementations of get_wchan()
  x86/process: Add proper bound checks in 64bit get_wchan()
  x86, efi, kasan: Fix build failure on !KASAN && KMEMCHECK=y kernels
  x86/hyperv: Fix the build in the !CONFIG_KEXEC_CORE case
  x86/cpufeatures: Correct spelling of the HWP_NOTIFY flag
2015-10-03 10:53:05 -04:00
Linus Torvalds
37cc7ab1d2 Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Ingo Molnar:
 "An abs64() fix in the watchdog driver, and two clocksource driver
  NO_IRQ assumption fixes"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource: Fix abs() usage w/ 64bit values
  clocksource/drivers/keystone: Fix bad NO_IRQ usage
  clocksource/drivers/rockchip: Fix bad NO_IRQ usage
2015-10-03 10:51:41 -04:00
Linus Torvalds
a758379b03 Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI fixes from Ingo Molnar:
 "Two EFI fixes: one for x86, one for ARM, fixing a boot crash bug that
  can trigger under newer EFI firmware"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  arm64/efi: Fix boot crash by not padding between EFI_MEMORY_RUNTIME regions
  x86/efi: Fix boot crash by mapping EFI memmap entries bottom-up at runtime, instead of top-down
2015-10-03 10:46:41 -04:00
Linus Torvalds
14f97d9713 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
 "Bunch of fixes all over the place, all pretty small: amdgpu, i915,
  exynos, one qxl and one vmwgfx.

  There is also a bunch of mst fixes, I left some cleanups in the series
  as I didn't think it was worth splitting up the tested series"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (37 commits)
  drm/dp/mst: add some defines for logical/physical ports
  drm/dp/mst: drop cancel work sync in the mstb destroy path (v2)
  drm/dp/mst: split connector registration into two parts (v2)
  drm/dp/mst: update the link_address_sent before sending the link address (v3)
  drm/dp/mst: fixup handling hotplug on port removal.
  drm/dp/mst: don't pass port into the path builder function
  drm/radeon: drop radeon_fb_helper_set_par
  drm: handle cursor_set2 in restore_fbdev_mode
  drm/exynos: Staticize local function in exynos_drm_gem.c
  drm/exynos: fimd: actually disable dp clock
  drm/exynos: dp: remove suspend/resume functions
  drm/qxl: recreate the primary surface when the bo is not primary
  drm/amdgpu: only print meaningful VM faults
  drm/amdgpu/cgs: remove import_gpu_mem
  drm/i915: Call non-locking version of drm_kms_helper_poll_enable(), v2
  drm: Add a non-locking version of drm_kms_helper_poll_enable(), v2
  drm/vmwgfx: Fix a command submission hang regression
  drm/exynos: remove unused mode_fixup() code
  drm/exynos: remove decon_mode_fixup()
  drm/exynos: remove fimd_mode_fixup()
  ...
2015-10-03 10:39:31 -04:00
Linus Torvalds
978ab6a009 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input layer fixes from Dmitry Torokhov:
 "Fixes for two recent regressions (in Synaptics PS/2 and uinput
  drivers) and some more driver fixups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Revert "Input: synaptics - fix handling of disabling gesture mode"
  Input: psmouse - fix data race in __ps2_command
  Input: elan_i2c - add all valid ic type for i2c/smbus
  Input: zhenhua - ensure we have BITREVERSE
  Input: omap4-keypad - fix memory leak
  Input: serio - fix blocking of parport
  Input: uinput - fix crash when using ABS events
  Input: elan_i2c - expand maximum product_id form 0xFF to 0xFFFF
  Input: elan_i2c - add ic type 0x03
  Input: elan_i2c - don't require known iap version
  Input: imx6ul_tsc - fix controller name
  Input: imx6ul_tsc - use the preferred method for kzalloc()
  Input: imx6ul_tsc - check for negative return value
  Input: imx6ul_tsc - propagate the errors
  Input: walkera0701 - fix abs() calculations on 64 bit values
  Input: mms114 - remove unneded semicolons
  Input: pm8941-pwrkey - remove unneded semicolon
  Input: fix typo in MT documentation
  Input: cyapa - fix address of Gen3 devices in device tree documentation
2015-10-02 17:53:25 -04:00
John Stultz
67dfae0cd7 clocksource: Fix abs() usage w/ 64bit values
This patch fixes one cases where abs() was being used with 64-bit
nanosecond values, where the result may be capped at 32-bits.

This potentially could cause watchdog false negatives on 32-bit
systems, so this patch addresses the issue by using abs64().

Signed-off-by: John Stultz <john.stultz@linaro.org>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/1442279124-7309-2-git-send-email-john.stultz@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2015-10-02 22:53:01 +02:00
Linus Torvalds
5634347dee - Fix for transparent huge page change_protection() logic which was
inadvertently changing a huge pmd page into a pmd table entry.
 - Function graph tracer panic fix caused by the return_to_handler code
   corrupting the multi-regs function return value (composite types).
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWDr76AAoJEGvWsS0AyF7xdKsP/1oE1dM/xXhQbYcJxXV3MgnT
 05pXmxxJUz7o2meVcbsz4c4UbhdHaQX2//jsgwxmoTNZo4EVz15c8GLWCPh5IRsw
 FQ/bVbDNmbOMZd4RSKShfIkW4bjelT5Mn/WuxUQoIX0qx316hmfFXMLCK2Gg7iOc
 hLkERWrbwHUynu0/lzE9EphOcLIGMmuT6n4qXtdhiLoFFMg8iuKDoxetj14oR3GC
 LQ5JHpvnS6ECLl50RbVvWLCSymnfhzveGvW/d58rFHFRY5PnjV2LATfLCkaKiz8h
 szxJLFuZZzP0lmhOZ9LUaRnNwTUFx5sg0FMEJaLimnTWZ2KmvxBgMuZz+vutjjlz
 DHsQQWVVW771Yzv4vWkv/4oAd/IMcoZFLaAjVYxcjzEFC/kB/i1zRSe8BMxdTs1u
 xqIi3Iv6c7Kv7VdANfTuR9zvFDPRSLoK1UEqQ0Sdvg9NuP8rPrn2ZaMyL1fIwxaL
 AO9JTAWqCYhgWXfeCAQYI1aDEdeE1ndK7a6eX6RDu1nRupQAHfTvV+DwfLRTF6g2
 T3IwfcDuquZHNaKBR6CIgF0xSzyfk7Wsbf3QPqtIGjGsyoHfrcf/9y0b3yNxXNq9
 GEepvrYQfdoP2xhwOyDK+8kNt0HxMiCrrPD0dni95No8DDct1TJ3kPnBdWyfAWLi
 sNNSuGbqMTRpONnuC9kK
 =AJCF
 -----END PGP SIGNATURE-----

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 fixes from Catalin Marinas:

 - Fix for transparent huge page change_protection() logic which was
   inadvertently changing a huge pmd page into a pmd table entry.

 - Function graph tracer panic fix caused by the return_to_handler code
   corrupting the multi-regs function return value (composite types).

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: ftrace: fix function_graph tracer panic
  arm64: Fix THP protection change logic
2015-10-02 14:54:16 -04:00
Linus Torvalds
b55a97e759 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
 "Summary:
   - Fix for accidental modification of arguments of syscall functions
   - Wire up new syscalls
   - Update defconfigs"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/defconfig: Update defconfigs for v4.3-rc1
  m68k: Define asmlinkage_protect
  m68k: Wire up membarrier
  m68k: Wire up userfaultfd
  m68k: Wire up direct socket calls
2015-10-02 14:51:46 -04:00
Marc Zyngier
791c76d584 irqchip/gic-v3-its: Count additional LPIs for the aliased devices
When configuring the interrupt mapping for a new device, we
iterate over all the possible aliases to account for their
maximum MSI allocation. This was introduced by e8137f4f50
("irqchip: gicv3-its: Iterate over PCI aliases to generate ITS configuration").

Turns out that the code doing that is a bit braindead, and repeatedly
accounts for the same device over and over.

Fix this by counting the actual alias that is passed to us by the
core code.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Alex Shi <alex.shi@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: David Daney <ddaney.cavm@gmail.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1443800646-8074-3-git-send-email-marc.zyngier@arm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2015-10-02 20:51:41 +02:00
Marc Zyngier
c8415b9470 irqchip/gic-v3-its: Silence warning when its_lpi_alloc_chunks gets inlined
More agressive inlining in recent versions of GCC have uncovered
a new set of warnings:

 drivers/irqchip/irq-gic-v3-its.c: In function its_msi_prepare:
  drivers/irqchip/irq-gic-v3-its.c:1148:26: warning: lpi_base may be used
    uninitialized in this function [-Wmaybe-uninitialized]
     dev->event_map.lpi_base = lpi_base;
                          ^
 drivers/irqchip/irq-gic-v3-its.c:1116:6: note: lpi_base was declared here
  int lpi_base;
	      ^
 drivers/irqchip/irq-gic-v3-its.c:1149:25: warning: nr_lpis may be used
  uninitialized in this function [-Wmaybe-uninitialized]
   dev->event_map.nr_lpis = nr_lpis;
	                         ^
 drivers/irqchip/irq-gic-v3-its.c:1117:6: note: nr_lpis was declared here
  int nr_lpis;
	      ^
The warning is fairly benign (there is no code path that could
actually use uninitialized variables), but let's silence it anyway
by zeroing the variables on the error path.

Reported-by: Alex Shi <alex.shi@linaro.org>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: David Daney <ddaney.cavm@gmail.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1443800646-8074-2-git-send-email-marc.zyngier@arm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2015-10-02 20:51:41 +02:00