Commit graph

691,473 commits

Author SHA1 Message Date
Zhao Qiang
1291e49e89 QE/CPM: move muram management functions to qe_common
QE and CPM have the same muram, they use the same management
functions. Now QE support both ARM and PowerPC, it is necessary
to move QE to "driver/soc", so move the muram management functions
from cpm_common to qe_common for preparing to move QE code to "driver/soc"

Signed-off-by: Zhao Qiang <qiang.zhao@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
2015-12-22 17:10:18 -06:00
Zhao Qiang
0e6e01ff69 CPM/QE: use genalloc to manage CPM/QE muram
Use genalloc to manage CPM/QE muram instead of rheap.

Signed-off-by: Zhao Qiang <qiang.zhao@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
2015-12-22 17:10:18 -06:00
Zhao Qiang
b26981c8f7 genalloc:support allocating specific region
Add new algo for genalloc, it reserve a specific region of
memory

Signed-off-by: Zhao Qiang <qiang.zhao@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
2015-12-22 17:10:17 -06:00
Zhao Qiang
de2dd0eb30 genalloc:support memory-allocation with bytes-alignment to genalloc
Bytes alignment is required to manage some special RAM,
so add gen_pool_first_fit_align to genalloc,
meanwhile add gen_pool_alloc_algo to pass algo in case user
layer using more than one algo, and pass data to
gen_pool_first_fit_align(modify gen_pool_alloc as a wrapper)

Signed-off-by: Zhao Qiang <qiang.zhao@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
2015-12-22 17:10:17 -06:00
Olof Johansson
7ca08a90cd Allwinner DT patches, round 2
Mostly some audio codec patches to enable it on more boards, and a bunch
 devices activation (Ethernet, touchscreen, backlights). One more board has
 been added too.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWebeDAAoJEBx+YmzsjxAg68oP+wd0LTH68CYluEmKEC9DIehl
 T4tKtM8AIfchpfkI3u9+5b0gegrY1je4QzIlx5cUExC9DZ9EbarcU63sJfh+Dlv1
 IgXnXXHeFsDp7T/oyZnXtS7C1c3T3SJibatNZbyAhRiskf0eX2DsNd212jWkKzoM
 fU9Z/Gh7AX27ikfwgHqhTZ4kizaqCcX+LHu7ewPqeu4cKj2LHnZxjUB/gjMAP/bo
 05z40CAyYaeP2kfsLK9cfga/5xQiKAmF8mqhMXXcy4RewLgkFNeCZ1zKj3IBMeq8
 /Z80lwzK678Bq9aGImY4u3Gb6bevCOCMXp+N360Cp4mcU7sMneectIMuFZekwB40
 eMThwy+tPLcTMjFyNwvkIpcVeP/j13Ud+jy3NyiLvA/lOw4QUbjbCIdFRwCkn8Dd
 FC1wdVRitEEZEZH8JBkdH/GFJS7Z2IXFPiK8FOmohGQ3r796v4UwZqoBwpPrh1JT
 Bs213si+PaLmh5EIZgjePTuWszP/gPytwlTwypWMnhGC3NTcIP8c2Xm6W+5SdtLP
 gVtChNAD/tGAH/Ix98SlO8bESJw7aGP6WIriD5iJMq6jtgHsTDN1f5xU/Z0M1iX0
 o3mJ7pfNJFW3bDplpcMNwC2IY0ZT1LhNaBymuhyjp0GpP6I2bKzfisWuGgmwe+QS
 lBocYjqi5VlVEBvFVX1U
 =1z4m
 -----END PGP SIGNATURE-----

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

Allwinner DT patches, round 2

Mostly some audio codec patches to enable it on more boards, and a bunch
devices activation (Ethernet, touchscreen, backlights). One more board has
been added too.

* tag 'sunxi-dt-for-4.5-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: dts: sun5i: Add dts file for the Empire Electronix D709 tablet
  ARM: dts: sun7i: Enable gmac on Wits Pro A20 DKT
  ARM: dt: sun7i: Enable audio codec on MK808C
  ARM: sunxi: dt: enable audio codec on mk802
  ARM: dts: sun7i: Add PA gpio pin to Wexler TAB7200 tablet
  ARM: dts: sun7i: Add backlight node to Wexler TAB7200 tablet
  ARM: dts: sun7i: Enable touchscreen on Wexler TAB7200 tablet
  ARM: dts: sun7i: Enable PWM controller on Wexler TAB7200 tablet
  ARM: dts: sun4i: gemei-g9: Enable PA GPIO pin configuration
  ARM: dts: sun4i: Enable onboard codec used on the pov protab2-ips9 tablet
  ARM: dts: sun5i: Enable onboard codec used on the UTOO P66 tablet

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 15:02:50 -08:00
Olof Johansson
250481d3de Second batch of DT changes for 4.5:
- addition of sound nodes for sama5d2 and the xplained
 - addition of a new patform by Landis+Gyr: VInCo
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJWeW4XAAoJEKbNnwlvZCyz7AUQAJrTmkhHVP/c0RizSORhoBHV
 f7Kc5RPE0fr6oEskcNmtH11eFP39WHh5yHRrJJlsWx6Bievb1HYVo9ReIOmbcwgQ
 DytPVnnGho5Rj6RAEVoIOVxKPSk+sBhUPukNhHMkCSVOguYc+gLe1vGTr68Lw5Wj
 swxYPuvxBENQey7hwmr1z4LBTYBUDfudKPjF4nE9uWphqD9e2+oHhkbWO0jenLT1
 7ByoRQMevG4LLOUXZXC1crzJx7dtqZjCHqjHZPL6gAAxtSRZzQ989g2KyiDiP8Vb
 YjL0oM12Q4cXXrON7rCHF+Qp/2gVEv/ioIvYN+lkGo21S64Ko37/tWiO4vslL9p8
 4Jmk0faMQlcTSji5d2uRCYM2CZ3cdPAQg6aA4nxBAGY3puvlCowrAtEiw7t9kU6r
 kGSTEhIlb3UFyQGQNMef4fv051k49azzKdyzwNLpvvyPuIMIad/rP+KJ4/sTF8nH
 FoFYfBqWyNrj5X6ZO2nn3XzvV3+fBUehaPAvEq9zQvmCkgBkrWYLJMs1cILNYbtj
 YjSv73mUgt2Hz1A155okPuRnf5RN1jFInqfguUoitB28ZTlj7GhwKtmXT7Opno5P
 muDvwi9l2S/Ec3GeFDO2g0Y5EPsYdav50/BGGMV46VEZYmChbRvJaYHXjOjhehl8
 1PVuHLlpLfvpKFujFguR
 =XTmq
 -----END PGP SIGNATURE-----

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

Second batch of DT changes for 4.5:
- addition of sound nodes for sama5d2 and the xplained
- addition of a new patform by Landis+Gyr: VInCo

* tag 'at91-4.5-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: at91/dt: sama5d2 Xplained: add pdmic node
  ARM: at91/dt: sama5d2: add pdmic node
  ARM: at91/dt: Add Support for the L+G VInCo platform

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 15:02:08 -08:00
Olof Johansson
f3afce26de The i.MX defconfig updates for 4.5:
- Drop CONFIG_SOC_LS1021A support, as it needs LPAE which is not
   available with imx_v6_v7_defconfig.
 - Enable VF610_ADC, HDMI audio and PCI_MSI support
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJWeV+iAAoJEFBXWFqHsHzOB1sH/Ru5qv6aLNiEXXeCS+NGQyQR
 WMiJhxEYEzrXQ7nut04MCxXlmU+6bawxeK/fFv2Ll81RNQHKuzSXQxbuQCtrgDB1
 Vwf1KcLfMiyHS2gOlmv6CXAGU39Hvtkc7GEiwypHOEkjFLQuif/0biLGwDAJ3UY0
 VHD0ZokirveOcP3/kwR6AfIoY13GYiVRMTiSSLtzFE3OwYDpkjoxv9pQCNHL6bl+
 7Zp8T72kEo4SIfeA9lrl3ywuBtR2sp1sASbLWPkgRupWK4uXkd2PAYVk2tehfGn8
 6bcnfCVoBGg4zqHiFgQMoszobVXoybPZ0dmottae7+C9jf40TQKxvn/FM/8h8B0=
 =Fxdw
 -----END PGP SIGNATURE-----

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

The i.MX defconfig updates for 4.5:
- Drop CONFIG_SOC_LS1021A support, as it needs LPAE which is not
  available with imx_v6_v7_defconfig.
- Enable VF610_ADC, HDMI audio and PCI_MSI support

* tag 'imx-defconfig-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: enable PCI_MSI
  ARM: imx_v6_v7_defconfig: Select HDMI audio support
  ARM: imx_v6_v7_defconfig: Select VF610_ADC
  ARM: imx_v6_v7_defconfig: Remove CONFIG_SOC_LS1021A

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 15:00:22 -08:00
Olof Johansson
84829814d6 The i.MX device tree updates for 4.5:
- New boards support: imx51-ts4800, imx6q-novena, CompuLab imx7d SoM/SBC,
   vf610m4-cosmic
 - Add ADC device support for imx6ul and imx7d
 - Remove config space from PCIe controller ranges property for i.MX6
 - Add Vivante GPU nodes for i.MX6
 - Add DCU, LCD, and SATA devices for LS1021A
 - A series to update Ventana gw5xxx boards getting HDMI and LVDS to work
   simultaneously and devices like PWM and SPI added
 - Quite a few random cleanups and minor updates
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJWeV5EAAoJEFBXWFqHsHzOk8YH/RrzIcDxVa7E6PiVErJmDluH
 ihMgY1mQcgXBcBEVKc0F9gKXZVN7W1xHGTHxVZp83mTxEJArBjFhojFQYReUaALU
 sQKot0sD8EWBlcC+fvuLzhHc8jE2Udioi/Ys/kgl8T82Q/LXTCnUmBnsPaVshqod
 WQ4i4Hk/QV6FbCEgvJvwEMEth53JYLVlAkuVbXi32eo7iv6u6d/LEdCW88bpV8Gv
 OxnGg8BiBV3TdAaAcNX72p5IRy9AYMY2hYIx9MCec+H2ws/jzn7xvfkhLta6luTP
 4JMvdToQWkhscIEDK1Q/3PtJVmX1al1PWKLTve3tza6jTTc7Opav8XN1hH3nJls=
 =hXxT
 -----END PGP SIGNATURE-----

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

The i.MX device tree updates for 4.5:
- New boards support: imx51-ts4800, imx6q-novena, CompuLab imx7d SoM/SBC,
  vf610m4-cosmic
- Add ADC device support for imx6ul and imx7d
- Remove config space from PCIe controller ranges property for i.MX6
- Add Vivante GPU nodes for i.MX6
- Add DCU, LCD, and SATA devices for LS1021A
- A series to update Ventana gw5xxx boards getting HDMI and LVDS to work
  simultaneously and devices like PWM and SPI added
- Quite a few random cleanups and minor updates

* tag 'imx-dt-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (50 commits)
  ARM: dts: imx7d: sbc-imx7: add basic board support
  ARM: dts: imx7d: cl-som-imx7: add basic module support
  ARM: dts: TS-4800: add touchscreen support
  ARM: dts: ts-4800: Add LCD support
  ARM: dts: imx6q: add Novena board
  devicetree: bindings: Add vendor prefix for Kosagi
  ARM: dts: TS-4800: use weim IP to map the FPGA
  ARM: dts: TS-4800: drop uart rts/cts pin reservations
  ARM: dts: imx6: add Vivante GPU nodes
  ARM: dts: imx28: add alternate auart4 pinmux
  ARM: dts: ls1021a: add sata node to dts
  ARM: dts: TS-4800: add basic device tree
  of: documentation: add bindings documentation for TS-4800
  of: add vendor prefix for Technologic Systems
  ARM: dts: imx7d-sdb: add ADC support
  ARM: dts: imx7d.dtsi: add ADC support
  ARM: dts: vf-colibri: add CAN support
  ARM: mxs: dt: cfa10057: fix backlight PWM
  ARM: dts: imx6qdl: move GIC to right location in DT
  ARM: dts: imx6qdl: add IPU aliases
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 14:59:55 -08:00
Olof Johansson
9d67d4624f The i.MX SoC updates for 4.5:
- Select HAVE_IMX_SRC for i.MX7 to avoid a randconfig build error
 - Enable cpufreq support on i.MX7D
 - A couple of random cleanup on iomux-imx31 and mach-imx6ul
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJWeVfeAAoJEFBXWFqHsHzOOmcH/A3mzA0g2FLMZIbJNY5tqrap
 z1aejsrdkL00vJWGcI0FJt7G1JkYUFYPjjDnbkbeYnXwfi66ZafWdHeSy5QIFfFv
 lbbF5Na9FESO5A+iWtvpScS/Frz1kk8Uq4SDiglzq+pV9MmQH7Ik3bbk57/h2sGA
 Uk+SntoiEPmU0d/Jp0pnA66g6FYdDXhl6Ie1fBZSsToCDVvG/dD2O37NrhehzH1A
 htxcPjuEfmYJRju3T2zgpTdgQ/vchMoCDH2hndi52LVz2LF6RRvoNvhm/qPM4Pg9
 OlifVrFa8LMBSV9az7Fu9w0GYyKkHdE5ECxXWJvCi0w+p1zGb3rWf3Aj6aR4kag=
 =Gsgx
 -----END PGP SIGNATURE-----

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

The i.MX SoC updates for 4.5:
- Select HAVE_IMX_SRC for i.MX7 to avoid a randconfig build error
- Enable cpufreq support on i.MX7D
- A couple of random cleanup on iomux-imx31 and mach-imx6ul

* tag 'imx-soc-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx: select SRC for i.MX7
  ARM: mach-imx: iomux-imx31: fix spelling mistake in error message
  ARM: imx: enable cpufreq device on i.mx7d
  mach-imx/mach-imx6ul.c: proper constness with __initconst

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 14:58:48 -08:00
Linus Walleij
1f33b0131a ARM: sa1100/simpad: Be sure to clamp return value
As we want gpio_chip .get() calls to be able to return negative
error codes and propagate to drivers, we need to go over all
drivers and make sure their return values are clamped to [0,1].
We do this by using the ret = !!(val) design pattern.

Cc: arm@kernel.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 14:57:50 -08:00
Linus Walleij
86d5e657d2 ARM: scoop: Be sure to clamp return value
As we want gpio_chip .get() calls to be able to return negative
error codes and propagate to drivers, we need to go over all
drivers and make sure their return values are clamped to [0,1].
We do this by using the ret = !!(val) design pattern.

Cc: arm@kernel.org
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 14:57:21 -08:00
Heiko Stübner
2b8890bac2 ARM: multi_v7_defconfig: enable rk808 clkout module
The rk808 supplies two clock outputs with one going back into the soc as
32kHz supply, supplying some core soc clocks with it. The system can boot
without it being present, but it is needed for example as source clock
for the thermal driver.

Signed-off-by: Heiko Stuebner <heiko.stuebner@collabora.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 14:55:53 -08:00
Heiko Stübner
514cfd99c0 ARM: multi_v7_defconfig: enable rockchip crypto module
This enables the newly added hardware crypto module
found for example on the rk3288.

Signed-off-by: Heiko Stuebner <heiko.stuebner@collabora.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 14:55:49 -08:00
Heiko Stübner
e330eb86ba ARM: multi_v7_defconfig: enable Rockchip io-domain driver
The io-domain driver is necessary to notify the soc about voltages changes
happening on supplying regulators. Probably the most important user right
now is the mmc tuning code, where the soc needs to get notified when the
voltage is dropped to the 1.8V point.

As this option is necessary to sucessfully tune UHS cards etc, it should
get built in.

Signed-off-by: Heiko Stuebner <heiko.stuebner@collabora.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 14:55:46 -08:00
Olof Johansson
a6dcb26264 Second set of omap device tree changes for v4.5 merge window. This series
updates the EDMA bindings based on the various fixes to split EDMA into
 separate independent devices. It also adds support for more devices on the
 CompuLab cm-t335 and LogicPD Torpedo boards, and enables the new bindings
 for qspi for am437x and dra7. There are also few dra7 regulator fixes, and
 change of gpoi-key,wakeup to wakeup-source.
 
 These depend on commit ae0add740c ("dmaengine: edma: DT: Change reserved
 slot array from 16bit to 32bit type") already merged into mainline.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWeGeiAAoJEBvUPslcq6VzreMQAJD+jmhslEeY5vhdHiu8qiV8
 7DVb16H0grLVlUe1D+sCztOUqwtZWb8e2iHG6C+rwbnq01L4/LXVDu1USQ1wq5yN
 cgRyYu02UOWPPsUHADUSV4hao9lihhIG8X4+K/dFpp3Pa8V/VbAJ+lgFJ7el2gYd
 qNjl2f6fO4yQE6Zr5MfhYZQaaYTIdxxFeU2evgTBsEz6hnrpUJ04VQYE7jffoP0t
 n8xh6cGRvHTH7MGthgyQJ0QmW3e0Cl09aoHhyT2PzQ+rxgotpEdDxD+V1R4rN7x9
 yj2MoZAlQnHhbBRRMRHnvTwbw/ad1gHYGTroxAjAHzCDXGHJWXukRhVusRvwqqIN
 OOlMOVtlu/Lkw+jXAZ8JaW+OBeuX7mVAGZMCVQsdrdyQSjujr3H/bdU6GsBYKAFC
 vxXFjI8/R6w9ekhan0KCVTvvW/89uni/BSiRhYQWES2PQYQdtW2hIlKFJZfbfvS0
 71qj4dpv+Yii6P9MfsCwXjaUOnQ9HBFHvI2SG4gB7rn9va0mjfqhAWV32eDYXBdI
 I2GLZvnowifT1ALHTu01768yy4iFn1ngAtC53XW4L3+PWnNq0f8kPv2PXXaa4W5e
 fIzBdzY/NXOjLR/Lt56Qer6s5MGhpdJvvcOQCmAxXYheuwwMNzdMUgex04tHz0Xh
 B5KsQaXR3PLR+QA5WISI
 =+G24
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.5/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Second set of omap device tree changes for v4.5 merge window. This series
updates the EDMA bindings based on the various fixes to split EDMA into
separate independent devices. It also adds support for more devices on the
CompuLab cm-t335 and LogicPD Torpedo boards, and enables the new bindings
for qspi for am437x and dra7. There are also few dra7 regulator fixes, and
change of gpoi-key,wakeup to wakeup-source.

These depend on commit ae0add740c ("dmaengine: edma: DT: Change reserved
slot array from 16bit to 32bit type") already merged into mainline.

* tag 'omap-for-v4.5/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: LogicPD Torpedo: Add Touchscreen Support
  ARM: dts: DRA7-EVM: Add regulator-allow-bypass property for ldo9
  ARM: dts: DRA72-EVM: Add regulator-allow-bypass property for ldo1 and ldo2
  ARM: dts: AM4372: add entry for qspi mmap region
  ARM: dts: DRA7: add entry for qspi mmap region
  ARM: OMAP2+: LogicPD Torpedo: Revert Duplicative Entries
  ARM: OMAP2+: LogicPD Torpedo + Wireless: Add Bluetooth
  ARM: OMAP2+: LogicPD Torpedo: Add LCD Type 15 Support
  ARM: dts: cm-t335: add support for bluetooth
  ARM: dts: cm-t335: add support for DVI/LCD
  ARM: dts: cm-t335: add support for I2C GPIO expander
  ARM: dts: cm-t335: add support for SBC-T335
  ARM: dts: cm-t335: add support for USB0
  ARM: dts: omap: replace legacy *,wakeup property with wakeup-source
  ARM: dts: am335x: replace gpio-key,wakeup with wakeup-source property
  ARM: DTS: am437x: Use the new DT bindings for the eDMA3
  ARM: DTS: am33xx: Use the new DT bindings for the eDMA3
  dmaengine: edma: DT: Change reserved slot array from 16bit to 32bit type
  dmaengine: edma: DT: Change memcpy channel array from 16bit to 32bit type

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 14:55:02 -08:00
Olof Johansson
f625cb8c6d TI wakeup M3 IPC device driver for v4.5 merge window. This driver will
eventually allow am33xx and am437x to support PM with their Cortex-M3
 power management processor.
 
 This driver has been waiting to get merged for quite a while but has
 had dependencies to the remoteproc that are now out of the way.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWeGRZAAoJEBvUPslcq6VzBTAP+gI8u6J/YqvMU3yoRBXWFCbE
 OhYKU0NNEgGqGKoJ0nk+uC7johZN0uEPZnhUeOC/KypBt8xYbMYDJv4t3lXb39e5
 kfhy0bdQrNJkVbuEb+dR0zzLlAG8DMu1vChkigip8JLrOccMY1vZvMBItSNSVwY5
 nmp7euJkBDIS3vA5QLZH26EmIr2YTMXByckcwP+R2YZ1aAVjeoiH4xNDA5Ef1mdP
 /9Lt1So9ZwniSqXnDMkW65OmVbFYd7TvtpMITbFkkCb+HAlRjo7c28QbFT0iYKN0
 /omQG+45Jm8Mx5FwFI7OnvafWwGu7TA2gqdF5DlbFoqib/b6HBJdw/itbAKELnuX
 hZAAEtnxCc/6TeA1MvqGpuYfSVCax3EowdqGXHbO4y3m4OrL5cC3hTedCPDcFF1+
 I0y+TyytKN0d72Tq+soRvr6iCMT1EkuAUSRGQs32OeyKv64gRGwvqwNv1aZ4l39O
 GIFEB7RDAA3AdR/Yxm+Wngr228xkNfXv4WaGiQWr2lzbw69fBwbwzhNkJ9yUJbxf
 gib0IetARMtGWHeniaYglMeutKHpt4rmF1JDhxARksdGdLE8q2d68SOUNMvotNBi
 eMb1fbahhEu/k9LxY1ulr7gVNmZ5V4qradH6DPD5xWhHtcYTk5MJMeKx9P+CZ6RW
 CpJk9g6InhmEfnen4XMy
 =1/5M
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.5/wakeup-m3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers

TI wakeup M3 IPC device driver for v4.5 merge window. This driver will
eventually allow am33xx and am437x to support PM with their Cortex-M3
power management processor.

This driver has been waiting to get merged for quite a while but has
had dependencies to the remoteproc that are now out of the way.

* tag 'omap-for-v4.5/wakeup-m3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  soc: ti: Add wkup_m3_ipc driver
  Documentation: dt: add bindings for TI Wakeup M3 IPC device

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 14:54:03 -08:00
Olof Johansson
45e2916be2 SoC changes for omaps for v4.5 merge window. The main change here is to
change the omap initcall levels a bit to initialize things later to allow
 early device drivers at core_initcall level. This makes things easier
 for us as most clocks can be made into regular device drivers except for
 a few early clocks needed to initialize system timers. I wanted to have
 these changes sit in Linux next for a few weeks before sending out a pull
 request, and so far now issues have showed up.
 
 The other changes in this series are timer changes for making use of the
 new PWM driver, and timer changes to support more high security SoCs.
 Also few minor improvments for module autoidle settings for ti81xx spinbox
 and dra7 debug on uart4 in hwmod code. The rest is pretty much just removal
 of platform data for SoCs that are all device tree only nowadays.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWeGDyAAoJEBvUPslcq6Vz/PsQALn5JcQgZe5Od95l4clQKKLT
 OTDkRlfTUAWHNsDMNBqSAJZtRR4tWA4fECqusIyocJs2g74745MKcfuD1z0hSr+F
 kvyYX/7lnS1AwU0RalACIoPlSh/ZR3Jrp4pXfiaNQGjr180SEmAtAu3jTUA4xUjZ
 CdyILrzP7lckCUuF1vCguaM5hNqSEy0f6a1XCieG35k2nDrLq+C4QZ6YN8/ZGKLD
 HADCFWllMcxgmTvxLy4JtUMYK/ujHJOl8QTEpUujzxRnZasZVJpB+lGsosIyR+d1
 oXu9PaclyYYKK0/FtqQx2urhzu1POxaA8j2WDZB9k8Dt6csXZptkXoBdY7qJpOM2
 0rL/57uv95hC1ufHVz6oRiRjvik0G4QL8M8cIpG4i4puTR0Uw+3HYy7UfYMsnK60
 1piWmgaBb/VDYL/XTFE8FJW5WlEosWwezwoneY1yTCzMmtKX8KjFtxISYodrWuV8
 rwnmLf5mn4/1HjmnqlYZHnCnMwdfbDsAV+5SPGIspkHT10un4wFgrLs9+2k3wntL
 Je8H168+r9FS+ZND9kdN6HL+yf0ruC813l+p7cQ+RIy4hHyXoiFLeQnxAUcORNF5
 0vUR47WZCMpgD2IjIDuDg9ZJp3gzEVNMbxbz5VpAwm4vgx/2QAMNs5l9Q8vQQd2O
 uuHoE8Fi4KTY4LJTqPj6
 =69mE
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.5/soc-initcall' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

SoC changes for omaps for v4.5 merge window. The main change here is to
change the omap initcall levels a bit to initialize things later to allow
early device drivers at core_initcall level. This makes things easier
for us as most clocks can be made into regular device drivers except for
a few early clocks needed to initialize system timers. I wanted to have
these changes sit in Linux next for a few weeks before sending out a pull
request, and so far now issues have showed up.

The other changes in this series are timer changes for making use of the
new PWM driver, and timer changes to support more high security SoCs.
Also few minor improvments for module autoidle settings for ti81xx spinbox
and dra7 debug on uart4 in hwmod code. The rest is pretty much just removal
of platform data for SoCs that are all device tree only nowadays.

* tag 'omap-for-v4.5/soc-initcall' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Remove device creation for omap-pcm-audio
  ARM: OMAP1: Remove device creation for omap-pcm-audio
  ARM: OMAP2+: Change core_initcall levels to postcore_initcall
  ARM: DRA7: hwmod: Enable DEBUG_LL for UART4
  ARM: OMAP: RX-51: fix a typo in log writing
  ARM: omap4: hwmod: Remove elm address space from hwmod data
  ARM: OMAP2+: timer: Remove secure timer for DRA7xx HS devices
  ARM: OMAP: dmtimer: check for fixed timers during config
  ARM: OMAP2+: Remove omap_mmu_dev_attr structure
  ARM: OMAP4: hwmod data: Remove legacy IOMMU attr and addrs
  ARM: OMAP3: hwmod data: Remove legacy IOMMU data
  ARM: OMAP2+: Remove legacy device instantiation of IOMMUs
  ARM: OMAP2+: Add hwmod spinbox support for dm816x
  ARM: OMAP: add DT support for ti,dm816-timer
  ARM: OMAP: dmtimer: Add clock source from DT

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 14:49:17 -08:00
Eli Sennesh
3563ff88e6 greybus: firmware and svc: detect the difference between ES2 and ES3 chips
The Greybus SVC code needs to read and clear the module boot status upon
hotplug; this requires reading two different attributes depending on whether
we're running on ES2 or ES3.  On Marti Bolivar's (mbolivar@leaflabs.com)
advice, we detect ES2 using the unique ES2_DDBL1_MFR_ID and ES2_DDBL1_PROD_ID
for ES2 hardware, and treat all other chips as ES3 appropriately.  This patch
detects the difference and adds the appropriate definitions for ES3 hardware.

Signed-off-by: Eli Sennesh <esennesh@leaflabs.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2015-12-22 14:38:46 -08:00
Doug Ledford
882f3b3b91 Merge branches '4.5/Or-cleanup' and '4.5/rdma-cq' into k.o/for-4.5
Signed-off-by: Doug Ledford <dledford@redhat.com>

Conflicts:
	drivers/infiniband/ulp/iser/iser_verbs.c
2015-12-22 17:03:15 -05:00
David S. Miller
83a76006e0 Merge branch 'bindtodevice_tw_rst'
Florian Westphal says:

====================
tcp: honour SO_BINDTODEVICE for TW_RST case too

This is V2, this time as a small series since I followed Erics advice
to split this into smaller chunks, I hope this makes it easier to
review.

First patch adds inet_sk_transparent helper.
Second patch contains an if/else swap that I split from the
original TW_RST v1 one.
Third patch is the actual change without the superfluous sock_net change.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-22 17:03:06 -05:00
Florian Westphal
271c3b9b7b tcp: honour SO_BINDTODEVICE for TW_RST case too
Hannes points out that when we generate tcp reset for timewait sockets we
pretend we found no socket and pass NULL sk to tcp_vX_send_reset().

Make it cope with inet tw sockets and then provide tw sk.

This makes RSTs appear on correct interface when SO_BINDTODEVICE is used.

Packetdrill test case:
// want default route to be used, we rely on BINDTODEVICE
`ip route del 192.0.2.0/24 via 192.168.0.2 dev tun0`

0.000 socket(..., SOCK_STREAM, IPPROTO_TCP) = 3
// test case still works due to BINDTODEVICE
0.001 setsockopt(3, SOL_SOCKET, SO_BINDTODEVICE, "tun0", 4) = 0
0.100...0.200 connect(3, ..., ...) = 0

0.100 > S 0:0(0) <mss 1460,sackOK,nop,nop>
0.200 < S. 0:0(0) ack 1 win 32792 <mss 1460,sackOK,nop,nop>
0.200 > . 1:1(0) ack 1

0.210 close(3) = 0

0.210 > F. 1:1(0) ack 1 win 29200
0.300 < . 1:1(0) ack 2 win 46

// more data while in FIN_WAIT2, expect RST
1.300 < P. 1:1001(1000) ack 1 win 46

// fails without this change -- default route is used
1.301 > R 1:1(0) win 0

Reported-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Eric Dumazet <edumazet@google.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-22 17:03:05 -05:00
Florian Westphal
e46787f0dd tcp: send_reset: test for non-NULL sk first
tcp_md5_do_lookup requires a full socket, so once we extend
_send_reset() to also accept timewait socket we would have to change

if (!sk && hash_location)

to something like

if ((!sk || !sk_fullsock(sk)) && hash_location) {
  ...
} else {
  (sk && sk_fullsock(sk)) tcp_md5_do_lookup()
}

Switch the two branches: check if we have a socket first, then
fall back to a listener lookup if we saw a md5 option (hash_location).

Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Eric Dumazet <edumazet@google.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-22 17:03:05 -05:00
Florian Westphal
b1f0a0e99c net: add inet_sk_transparent() helper
Avoids cluttering tcp_v4_send_reset when followup patch extends
it to deal with timewait sockets.

Suggested-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Eric Dumazet <edumazet@google.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-22 17:03:05 -05:00
Or Gerlitz
182a2da0c7 IB/core: Remove ib_query_device
The copy of the attributes present on the device is now used by all consumers
except for uverbs in case of serving user-space query, where dev->query_device
is called.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
2015-12-22 17:01:40 -05:00
WANG Cong
5449a5ca9b addrconf: always initialize sysctl table data
When sysctl performs restrict writes, it allows to write from
a middle position of a sysctl file, which requires us to initialize
the table data before calling proc_dostring() for the write case.

Fixes: 3d1bec9932 ("ipv6: introduce secret_stable to ipv6_devconf")
Reported-by: Sasha Levin <sasha.levin@oracle.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Tested-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-22 17:00:58 -05:00
David S. Miller
024f35c552 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:

====================
pull request (net): ipsec 2015-12-22

Just one patch to fix dst_entries_init with multiple namespaces.
From Dan Streetman.

Please pull or let me know if there are problems.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-22 16:26:31 -05:00
Jiri Pirko
f4cee3af0d mlxsw: core: Use devm_kzalloc to allocate mlxsw_hwmon structure
KASan reported use-after-free for the hwmon structure. So fix this by
using devm_kzalloc and let the core take care about freeing the memory
during device dettach.

Reported-by: Ido Schimmel <idosch@mellanox.com>
Fixes: 89309da39 ("mlxsw: core: Implement temperature hwmon interface")
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-22 16:25:09 -05:00
Olof Johansson
741db4a72a Few fixes for omaps to allow am437x only builds to boot properly with
CPU_IDLE and ARM TWD timer. This is probably a common configuration setup
 for people making products with these SoCs so let's make sure it works.
 
 Also a wakeirq fix for duovero parlor making my life a bit easier as that
 allows me to run basic PM regression tests on it.
 
 It would be nice to have these in v4.4, but if it gets too late for that
 because of the holidays, it is not super critical if these get merged for
 v4.5.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWeGJhAAoJEBvUPslcq6VzU4wQAJqyWnzl5+frGf8TeTJTwAD2
 yDXbiTDYAZAZ4ajFY5aocrAvQfd/z9zU4ar6liylfAMzOM3S4HRDTaUYc2jbr42s
 +uNNRY3EGMRzbLuRfyZZRgui0aImBpIDXhBhK1njQoYWt9wWIVxNCv2I9pImWm+n
 kyZBDK7xIunQTndgMIMTk8MPVQ5tbPrFbkOWUAZT2bIOmhhhjf/fdMpVL47tbssc
 5XuS5YmyglT3spdaYzrAfZbxf19+CMVmTh2KD9FZOCv4OZPXvPOJ3JkqrJeARvPI
 Idt6DjitznShJ7wQuIuRH+uS7N2fEDviZR3Of1kZBawBxt7ig58O7TizZLRUtTk+
 Uj2QuXfccw8qu122chdpCI1eV5oOok157V3Yhsm7Oyi12H/eu5WMee2boJh6cz9R
 KIih+5/FX6yUCgfHow7XR6vpQ2A50BJoU55+EB3yb81hsy/t4eHxbFaJfUcs7DNg
 yLjtAxL1tO96VNFF+Kdgps69AOaHbo7/rNYgRvRZ4uxdSkE+YJhnHfcu6m59lFSR
 k7Ybw+CCvZ+jH3IE+aGLumPguL10ntytv16G2UDwCzuvCaq59fUPUOCdxuBf+RNB
 3Bd1NCkcsi8xPSypf7YXa3AfNM2XkNprHVZJadM57EBE3bVZ19+1OiBtf2gn+YAE
 72gzwGGPixUNr8OjZNX0
 =tGjX
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.4/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Few fixes for omaps to allow am437x only builds to boot properly with
CPU_IDLE and ARM TWD timer. This is probably a common configuration setup
for people making products with these SoCs so let's make sure it works.

Also a wakeirq fix for duovero parlor making my life a bit easier as that
allows me to run basic PM regression tests on it.

It would be nice to have these in v4.4, but if it gets too late for that
because of the holidays, it is not super critical if these get merged for
v4.5.

* tag 'omap-for-v4.4/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: Fix UART wakeirq for omap4 duovero parlor
  ARM: OMAP2+: AM43xx: select ARM TWD timer
  ARM: OMAP2+: am43xx: enable GENERIC_CLOCKEVENTS_BROADCAST

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 13:24:29 -08:00
Olof Johansson
ab7f0bbba4 SoCFPGA DTS update for v4.5, part 2
- clean up mcvevk dts file, replace space with tab
 - Disable SDMMC node in base socfpga.dtsi file
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWd6LmAAoJEBmUBAuBoyj07VkQAJ3wcDok3sF+dFAQRDSJ7zJN
 ZBkWa12MYmkCSpb2QXwP8kCjgLH9Xs1BQJy/HR9M2b8obnUe6nUeluvkdjzI1KN3
 4CCmfOoO6uHeG90j4zYi4A3DWKjbAODNva8qe6jQrBheBCVq8jgsfdNNxojiDnL6
 b2SSmQcqfcboxXMa5NxwMDYr0V9wVfWguiEO5ZhABADZhBL1hc0kS7QTHpGS9FiA
 rHUF2lOyb6dnj++JLyVnqSMgHHCFPPm1l2DKFXfp14jhLk2LTTPFmciaH0RUklnf
 Csq94ev6iQLqGIqTNkDwyShhxI2CctBYeMhnxQe1ozxgZHprZDXU/TTNcDW2u/YN
 tvn62a/eZEVrO+J2tqbCYK2Bjx3b3eTz18dN7KGn9EgA8i+b8S8bO62kypTLa6UM
 KVC4wjH8+AWavl92sroNp/gsW/QVrMlHMz4K/cJWglQGufe5gA1v01TU7YhvHWNR
 GBMwvbg1pyz7ZmcZQaVfOZlitWTxyqi9oDH6vMw6XPBrr+7Cb0wiSWAh/A1p59Bk
 4X36w52kpn2SGbJDQNgaueAQSqaNlu8JB70j7GoWVJZnNZHEzg6YDDHcxjbKf/N+
 lFSVspqNAMWSjqctJbO7CW4jMqo/2+/q+6o1D4sJvNTz/QGNfXFj8t5gD45CbQVp
 BUqrClNJC6Rx/G/Y4XG7
 =VS3e
 -----END PGP SIGNATURE-----

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

SoCFPGA DTS update for v4.5, part 2
- clean up mcvevk dts file, replace space with tab
- Disable SDMMC node in base socfpga.dtsi file

* tag 'socfpga_dts_for_v4.5_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: dts: Enable MMC support at correct place in the DT
  ARM: socfpga: Repair incorrectly applied MCV patch

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 13:18:44 -08:00
Olof Johansson
8907dbaa36 Merge branch 'treewide/cleanup' into next/soc
Merge in cleanup to avoid internal conflicts with newly added code.

* treewide/cleanup:
  ARM: use "depends on" for SoC configs instead of "if" after prompt
  ARM/clocksource: use automatic DT probing for ux500 PRCMU
  ARM: use const and __initconst for smp_operations
  ARM: hisi: do not export smp_operations structures

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 13:10:00 -08:00
Olof Johansson
0ac0148831 New node for the broadcast-timer of the rk3368, a non-critical fix for
a regulator voltage and a typo fix.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJWd005AAoJEPOmecmc0R2BT1cH/AtopgXkiguqobWz/tHhaz/T
 OHETYVDzISgp4w/FnpugPollw4LhLkC4JkA7Sr41tNZzIq2loqSW1f94ige1Qmfo
 dtt/eUr9ULN3GAa3b1sUbK7W/slw3zt7o2TggEG375BsubQagyVNE2P28j9vIArr
 XL+XsekAGnj46MwvP/1Wro/fm6wUWZJV22itIBllZnQoTm51CjmzXajAeO1p4pxx
 /K9pc+twcEjk2IoIWmn9gLLUC96HsQDCxU8lo74Ywiz9B5GZ+JFIJLAGjwAmPLei
 O66yl/gnzJlszt09L0p6MqwzavJhVX80xcWiBdEKj8FRjOeSvfn7nnuYt5sPb6s=
 =zB/I
 -----END PGP SIGNATURE-----

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

New node for the broadcast-timer of the rk3368, a non-critical fix for
a regulator voltage and a typo fix.

* tag 'v4.5-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: Add the broadcast-timer for RK3368 SoC
  arm64: dts: rockchip: Fix typo in rk3368 sdmmc card detect pin name
  arm64: dts: rockchip: correct voltage range for rk3368-evb-act8846 board

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 13:07:48 -08:00
Olof Johansson
84658cbde8 Another new soc - the rk3228 quad-core cortex-a7, a new rk3036 board,
support for the efuses on Rockchip socs and some improvements for
 rk3288 regulators.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJWd0xyAAoJEPOmecmc0R2B71UIAJu6jDdfk5kmYzyXjBloBNwd
 PVRojGzVjCwCiVKX7GWINSf3D7dTKeYUwVs9uouVW4Q/iIk/l4Iq46+yg20ZODNM
 3haS2hwztRPEKeU+0qhYdoJf2cWOKzk0RP90umTMMVt2xnqbQCBFAW4NuE4DBLHe
 5o7R99ORKHi+IjBaI6Wtk1JoRNNkyYIDW6eLC9mxAJs32mr1ee45uidhPBD+VX+n
 1nf/yUPs6bc1yPyNhFN49AywYvjg02y96/4ER6bBtOcEw91uDc0ld0M10H/mvujT
 B+w8U6xBUWulUU53MS8aVKDZ+bp4o6YZZbIq/FJtaz3c+bhj8Rjl4UnlZh+gaiA=
 =Zp6y
 -----END PGP SIGNATURE-----

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

Another new soc - the rk3228 quad-core cortex-a7, a new rk3036 board,
support for the efuses on Rockchip socs and some improvements for
rk3288 regulators.

* tag 'v4.5-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: add the kylin board for rk3036
  ARM: dts: rockchip: add the sdio/sdmmc node for rk3036
  ARM: dts: rockchip: fix the pinctrl bias settings for rk3036
  ARM: dts: rockchip: add eFuse node for rk3188 SoCs
  ARM: dts: rockchip: add eFuse node for rk3066a SoCs
  ARM: dts: rockchip: add eFuse config of rk3288 SoC
  ARM: dts: rockchip: add rk3228-evb board
  ARM: dts: rockchip: add core rk3228 dtsi
  clk: rockchip: Add the clock ids of rk3288 eFuses
  ARM: dts: rockchip: Fix typo in rk3288 sdmmc card detect pin name
  ARM: dts: rockchip: fix voltage ranges for rk3288-evb-act8846 board
  ARM: dts: rockchip: move the public part to rk3288-evb common
  ARM: dts: rockchip: add 2 regulators for rk3288-evb-act8846
  ARM: dts: rockchip: correct the name of REG8 for rk3288-evb-act8846
  clk: rockchip: add dt-binding header for rk3228
  clk: rockchip: add id for mipidsi sclk on rk3288

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 13:07:11 -08:00
Olof Johansson
9cdac4a20a SMP special case for the rk3036 and addition of the rk3228
quad-core Cortex-A7 cpu.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJWcdThAAoJEPOmecmc0R2BFeMH/2jlwJrDe88hK1/7uQaFhKTN
 Ykiphn6JM33/32D8iGNeoU1/ylW8y72Yb09mPwaBbpwCqtNlhb7iJIIhVqAOac57
 PfJgTvq6bzXeqsKQkstZ3fCu/TP4rucXH6D1XUmR3N5BIfo7iNjrxR2QnKXv522E
 HABnLjS7AY/CZXp2yudwku9RBBG1w0yGqxbvyfJEnOsuzopb50yBEAls6UXY1yei
 W/bY2fEeiQLtt2SWjS40p9+PZcrG2VQHDuKefhD8HeRIROXg/36QfM/DXxGJnJOA
 3mMYx+zGxfWul+b82SsS6Z4tKQ+GCG7G5ABc2Gnd2NYpa3ESIJJQRLGU3VozidA=
 =NGaT
 -----END PGP SIGNATURE-----

Merge tag 'v4.5-rockchip-soc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc

SMP special case for the rk3036 and addition of the rk3228
quad-core Cortex-A7 cpu.

* tag 'v4.5-rockchip-soc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: rockchip: enable support for RK3228 SoCs
  ARM: rockchip: use const and __initconst for rk3036 smp_operations
  ARM: rockchip: add support smp for rk3036

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 13:06:15 -08:00
Olof Johansson
12ee126d91 Device Tree additions for LPC18xx platform
NXP LPC18xx EEPROM support plus board updates for CIAA board and
 EA4357 Dev kit.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQEcBAABCAAGBQJWdyKDAAoJEF5zSH4+/j/aVlsH/2WtAYZb+OH3rRZv1kJLEnKE
 WArHcMqBNc4IJ/dmlj7itt9mRQnj87aRZ9JB1wbzmKM0MjSdcWNesC9mhkamUFMz
 LMG1HovWF2n1Hoa1gKLMhogoRkCoMA9Eb7Pet6Cu3xHEtesFLX3ch7lCEzlDQE6e
 GHH/QsfDmMxHOyeKdH4bA4oHQPBC4umUmqUTps2/hbcwjbAI51SYSmXnBFfcGBXO
 ZDTGT9SLJLXNZ7QOQsI2fePXX9tX9E6PkxIDiZ6ddphJUGQKLatSP4qYJHVfTFsh
 YPIhetTqruwm2GB0lyEnErmWVHGvFMlo2tohQJh98/QPdvS7aityYDNIuSNxDGY=
 =DwB7
 -----END PGP SIGNATURE-----

Merge tag 'lpc18xx_dts_for_4.5' of https://github.com/manabian/linux-lpc into next/dt

Device Tree additions for LPC18xx platform

NXP LPC18xx EEPROM support plus board updates for CIAA board and
EA4357 Dev kit.

* tag 'lpc18xx_dts_for_4.5' of https://github.com/manabian/linux-lpc:
  ARM: dts: lpc4337-ciaa: add i2c0 and devices
  ARM: dts: lpc4337-ciaa: enable SCT-PWM
  ARM: dts: lpc4357-ea4357: add mma7455 i2c accelerometer
  ARM: dts: lpc4357: enable EEPROM memory
  ARM: dts: lpc18xx: add EEPROM memory node

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 13:03:55 -08:00
Olof Johansson
295ea80ea3 Defconfig additions for LPC18xx platform
Add LPC18xx EEPROM driver and MMA7455 IIO driver for the
 accelerometer found on EA4357 Dev kit.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQEcBAABCAAGBQJWdyJeAAoJEF5zSH4+/j/aiCgH/iE5+0oo4g0c6doBjeAxNd7l
 6R9gr9Jd6NUFMOoBLoCi3ANyi32B5TLngNxsH/lC8xnMdwW0Fdxo2hmULqEC7XUb
 NaXVlgZmiD6ZorYo9q5aScUBQlH6T9HEgpOSaKxq3zfpcTkcOWstWCSELTZgR3vt
 pU2V8AOSXJZcY/o5UZgsyomSmzajU1W52LhxyKjT5lnlfqrA+n3qqbKuw6k77mR+
 CD+OCmqmAwFwQot4Sy020cHQslHio/uukkPXuM6kmGoiw1iLbwrHjhtiGES+2Dfe
 bqZVNIpNwbQXdE9gb3p/as7hYNS1m1ha1AR2piLAPlov7YaZq9aPv/sOxrDOwl8=
 =J6Rm
 -----END PGP SIGNATURE-----

Merge tag 'lpc18xx_defconfig_for_4.5' of https://github.com/manabian/linux-lpc into next/defconfig

Defconfig additions for LPC18xx platform

Add LPC18xx EEPROM driver and MMA7455 IIO driver for the
accelerometer found on EA4357 Dev kit.

* tag 'lpc18xx_defconfig_for_4.5' of https://github.com/manabian/linux-lpc:
  ARM: configs: lpc18xx: enable EEPROM NVMEM driver
  ARM: configs: lpc18xx: enable mma7455 IIO driver

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 13:03:12 -08:00
Olof Johansson
9518f8a469 Change the scpsys to builtin_platform_driver_probe.
Add regulator support for scpsys driver.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJWdxkqAAoJELQ5Ylss8dND1bMP/0KvyxO3PELRZ5VFVURapOGP
 UjwhHw5MGxTwNIDN395DwCtjGq4dX7j5cGDGgXhmg+Me6Hhu4aWjD90hFffl5yov
 Y0TQJeV2tQ7zJZ1vKReiFxFT/uUdC8vAya+fGKrIAAPDFWLHLXX6HRUInlHNMNmf
 iZ0PPIHxwKmyNmClC8Qea7lwlBPD3qTawJfw0atFUdQbbdR/1Wi0Zu1SfKwDL969
 evI6WmrvnCmYNY+kUQresaTXpWD7OmiyC8iIgqrVrd4FrVmYfGRwxP5DIMs4RUsH
 28EhuxcSGPMz1H8rY5OEsMhwjWi6c/okzxK7JUjVUGydvaYBRnoWrTSCGKJqKZ3S
 ySf2zTn7gQFRelvvdyi9iMZEm9aXpYkQRasY5ktMKlrBVTLfjpolPfhSewhBhY9h
 2FN7WuWenLkyfx2/oZFJlrYpbvj0ecLMU7yYccG4/adiIec8VknbOTt2QCHIS8p3
 qDLbzfekFOCU+C/jy2GX1CRclQE4L4icog1P5hHZ9j5FBY7LaclFLYF/jEUX6FFJ
 7BFDLbzphwRrJGW5orxfOkiRJKth7uer7d1drMjaItDrAKJRkXSI4Cus8RPTx1lf
 qxyVL+av9ceLWxMIVVneu+uzjssH8cGzWS7YeJa5fbJm/46v0IlmnptSwd82SHmN
 fzwtYg2UYN5VKSC67eRa
 =pz5g
 -----END PGP SIGNATURE-----

Merge tag 'v4.4-next-soc' of https://github.com/mbgg/linux-mediatek into next/drivers

Change the scpsys to builtin_platform_driver_probe.

Add regulator support for scpsys driver.

* tag 'v4.4-next-soc' of https://github.com/mbgg/linux-mediatek:
  drivers/soc: make mediatek/mtk-scpsys.c explicitly non-modular
  soc: mediatek: SCPSYS: Add regulator support

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 13:02:28 -08:00
Olof Johansson
a25682e2a1 Enable mediatek clocksource driver by default as otherwise the system
does not boot.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJWdxa8AAoJELQ5Ylss8dNDVxMP/iXCSr5/l9o20YihFvMopONT
 KZ+u9rqhjV9rWN/IDi+Y+DwZnuK5s0xVsBPsHaNIZ+bJApjRVdpo9K5UyXFExlvX
 EBmRFYpw/D8XqCkO/ijlWU2wrqL63Wa6zAIQOqBUTzEP+YlFi2S+GUGqq2QrxEza
 t/WsP5KR258xzHYw/HE+qVX+idlp/4uYTF2/UvcHpFhW3DCfMIJCpj/sj5pEMd7n
 hkw69wTejSd1gf+NgOibqKtS7ds3/tm1mDkdJgMqkqHUUtU0UPXwGBGnyxS6NUDl
 Az9FhjTpBR006DIrYKsBsxzKUnTcVeRdsEPRzbRkcC7E2eWnA8ycazqP9pJG1NG6
 OR52O2uBaGiDMpUO4qre1gRkQLTC7qV/91/YNitI+J1qxjHmkLhV9cfx+mpmJwDT
 HAtkY7Ozq6zMRvGSprypbfl49HImebg2eGPsMWE6AIe/9lDp8aOYaBXjWU+/nynt
 7FQCE2WtXDpFI9CHWOQy+hK/Mw5cu1DtSL7nxqVLm6LQ5CEdx5FvTDn2bzk7ox3c
 pgGY6eQf/XzA+pNxCYMIF/bbv2oOtqK+GaZsriUrmMQeMhxcZKTMC03RGLyl/Ccm
 g+eY0z4r8w2o0BIWdrVNTaSOcD8mz2vavxO1nV+YLO1K2cahoEQq3AnivnRaV+fl
 Ow9K1GvfNeYhPf2TnzXx
 =uTZJ
 -----END PGP SIGNATURE-----

Merge tag 'v4.4-next-kconfig' of https://github.com/mbgg/linux-mediatek into next/config64

Enable mediatek clocksource driver by default as otherwise the system
does not boot.

* tag 'v4.4-next-kconfig' of https://github.com/mbgg/linux-mediatek:
  arm64: mediatek: enable MTK_TIMER

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 13:02:00 -08:00
Lorenzo Colitti
2010b93e93 net: tcp: deal with listen sockets properly in tcp_abort.
When closing a listen socket, tcp_abort currently calls
tcp_done without clearing the request queue. If the socket has a
child socket that is established but not yet accepted, the child
socket is then left without a parent, causing a leak.

Fix this by setting the socket state to TCP_CLOSE and calling
inet_csk_listen_stop with the socket lock held, like tcp_close
does.

Tested using net_test. With this patch, calling SOCK_DESTROY on a
listen socket that has an established but not yet accepted child
socket results in the parent and the child being closed, such
that they no longer appear in sock_diag dumps.

Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-22 16:01:47 -05:00
Viresh Kumar
0e9403a0fb greybus: interface: Expose DDBL1 manufacturing and production id in sysfs
These ids are already fetched from the SVC, but were never exposed to
sysfs. Userspace may be interested in using these values and hence these
must be exposed to it.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2015-12-22 13:00:52 -08:00
Viresh Kumar
b32a5c5346 greybus: interface: Prefix DDBL1 attributes with ddbl1_ instead of unipro_
The Device descriptor block Level 1 (DDBL1) attributes are specified by
the MIPI standard and prefixing them with 'unipro_' isn't the best thing
to do. They should be prefixed with DDBL1 instead.

To make it more readable/clear:
- rename macros and variable by prefixing them with ddbl1_.
- write full names for mfg and prod ids as manufacturer and product ids.
- replace mfg (manufacturing) with mfr (manufacturer)

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2015-12-22 13:00:52 -08:00
Olof Johansson
4e9ab19576 Add regulators to the scpsys binding.
Move the include of the reset contoller to include/dt-bindings/reset.
 
 Add basic support for mt2701 SoC and evaluation board.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJWdxfdAAoJELQ5Ylss8dNDxEgP/RhO5qFNw7ThTlVd8HHHGXqu
 JuUy8WsVsp5cPq1Aksf9qNYlkv3tdGtKDmVv1QDTg5lIB7ytrm6uO3m+4feM+Awk
 6qya8meRQowZTBU9SoBMLiNvKSiHkHnGeXVW3br92cPK9uxNJlCU9M1y9h9T7siW
 OdxQ884c09/ubTgUnspDPIrpoCCjcLvHhy+6etEfU6zZLxxOrOUbCFkOHxf4EHwZ
 BVDgukpxlDb3yL+GX9S0IfZu7EDu7MnUx/14RqyEPeAdXG4GR+cLrVg5s0YYyLuI
 YTRcwd7/WClMhGIYprf0mX8kPGJKC/L5JK7DGu1GmdLMCZ+vke5xgdqIiK0ssxkH
 O8VJIWRL1W6OuJQpZUDxRGpMo0aR+0fhpR5FuAtCyM8kaq8zTT182SpXR1AgsYmD
 FF8L6bxX68YIY8PHCs0B6wjN6gKGcQdXVPMAvPlLLaGbw5qZtLqiM2zQnaZSD6JM
 9IpNx3jjjIWNHLol3wOQnosECJONqa/JuiWyCOA/5mGRAJS+NE7tEEnm9yTPrc3M
 7dn4RrYq50xf0roqLpAmFZ6MU7RVA31vn0DkFnmRvoEzt5ZLAUMsg2nJImyhhMrm
 f5cdYIumHQCT0lpSvZL8gL/D+7AIffQaaQIfXzb7TsvJuta2kJSNhEbV1gNxS5Bs
 iPSJYeaMLhq807UJG+lw
 =qUem
 -----END PGP SIGNATURE-----

Merge tag 'v4.4-next-dts' of https://github.com/mbgg/linux-mediatek into next/dt

Add regulators to the scpsys binding.

Move the include of the reset contoller to include/dt-bindings/reset.

Add basic support for mt2701 SoC and evaluation board.

* tag 'v4.4-next-dts' of https://github.com/mbgg/linux-mediatek:
  dt-bindings: soc: Add supplies for Mediatek SCPSYS unit
  ARM: mediatek: DT: Move reset controller constants into common location
  ARM: dts: mediatek: add MT2701 basic support
  Document: DT: Add bindings for mediatek MT2701 SoC Platform

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 13:00:45 -08:00
Olof Johansson
9205a7ade8 Update psci support to the arm,psci-1.0 to mt8173
Add display PWM driver to mt8173
 
 Add mediatek general porpose timer to mt8173
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJWdximAAoJELQ5Ylss8dNDsZ4QAIDi9HPJpKzHCs+W/7+F3e+P
 LZ+fIEYzRhhKgBWCGOWmbrOAVweOhi5ja5tk2IlOcLvZceY7X03EZLsPV0WCofKW
 F7Hcp/Qs+VhAVinUlz5Zgx8nuS3BAd+U9iOi/2CcGczj8zYB9Un2cfV4ZqTImgol
 5zgt3kXpqX3RiZ/ubkUODMsH9RLcW1yRuIyzDUlNO18GjV0+luat9Ws+fU+dMOyM
 RnfjLALnga3QwIol0tMFktLJpfbwCkKKtLY3kRKEjS1FFg+4ucSwnBfRetxtdEcQ
 ebBwF2Vh/tvx/13ewer5Xjmz/J2qRriK8WWqK88CPbSguvRjSpnwJpurGtirfT4B
 AbrlIRZyhjwyhw4Us2KCTnOvjmsuHUKsvGTJPyLBpBCsQ1s9cL/DDhbd+z3j5hdM
 qekKvGP5yygYcqyc1t5tOs5POO1Ey2/vZ4cJdfWql/0AXhwDSgjr//rUYuAAsMrJ
 g/ySJPN4erb3hR3CbfLwbYMW9wErTbUGGRbe3Buzx7nTd/zhax1psbakS2SyI2q9
 410Plhm1iHhildOyJjAINMMqXqE4uyo1eCXxr2/Ul93Xf1epcvaerBFVE/Fk2DHc
 ecIN8ufWaKfkBbBCeAs1XYVeO5zbv4YyvTTw07B2A9bKs44Skk8zOhsKJIw6ydjT
 lU2HvzhLowA8fExy1Viy
 =xWtj
 -----END PGP SIGNATURE-----

Merge tag 'v4.4-next-arm64' of https://github.com/mbgg/linux-mediatek into next/dt64

Update psci support to the arm,psci-1.0 to mt8173

Add display PWM driver to mt8173

Add mediatek general porpose timer to mt8173

* tag 'v4.4-next-arm64' of https://github.com/mbgg/linux-mediatek:
  arm64: dts: mediatek: mt8173 PSCI-1.0 support
  arm64: dts: mt8173: add MT8173 display PWM driver support node
  arm64: dts: mt8173: add timer node

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 13:00:10 -08:00
Jiri Pirko
e7bc73cbb5 mlxsw: core: Allow to reset temperature history via hwmon interface
Add another sysfs hwmon attribute to expose possibility to reset
temperature sensors history.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-22 16:00:04 -05:00
Johan Hovold
a5a7723a0d greybus: es2: clean up csi-config request
Use __packed and __u8 for csi-config request that is going out on the
wire.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2015-12-22 12:59:02 -08:00
Johan Hovold
61a748a30d greybus: svc: drop copy-pasted function header
Drop function header that was copied but never updated or removed when
adding gb_svc_link_config.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2015-12-22 12:59:02 -08:00
Andrey Ryabinin
e459dfeeb6 ipv6/addrlabel: fix ip6addrlbl_get()
ip6addrlbl_get() has never worked. If ip6addrlbl_hold() succeeded,
ip6addrlbl_get() will exit with '-ESRCH'. If ip6addrlbl_hold() failed,
ip6addrlbl_get() will use about to be free ip6addrlbl_entry pointer.

Fix this by inverting ip6addrlbl_hold() check.

Fixes: 2a8cc6c890 ("[IPV6] ADDRCONF: Support RFC3484 configurable address selection policy table.")
Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Reviewed-by: Cong Wang <cwang@twopensource.com>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-22 15:57:54 -05:00
Ido Schimmel
ef9cdd0fed switchdev: bridge: Pass ageing time as clock_t instead of jiffies
The bridge's ageing time is offloaded to hardware when:
	1) A port joins a bridge
	2) The ageing time of the bridge is changed

In the first case the ageing time is offloaded as jiffies, but in the
second case it's offloaded as clock_t, which is what existing switchdev
drivers expect to receive.

Fixes: 6ac311ae8b ("Adding switchdev ageing notification on port bridged")
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-22 15:56:44 -05:00
Olof Johansson
2ea698c635 mvebu dt for 4.5 (part 3)
Add dts for the following boards:
 - Zyxel NSA325
 - PogoPlug series 4
 Add GPU support for Dove
 Update boolean property to wakeup source for isil
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZ0DyIACgkQCwYYjhRyO9UXAgCcCB9oM0SblUt6+OqKVXEdwwNU
 2u4AoJPIDr/m9QoIvBj+H55XeGCmXFuI
 =KHo9
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-dt-4.5-3' of git://git.infradead.org/linux-mvebu into next/dt

mvebu dt for 4.5 (part 3)

Add dts for the following boards:
- Zyxel NSA325
- PogoPlug series 4
Add GPU support for Dove
Update boolean property to wakeup source for isil

* tag 'mvebu-dt-4.5-3' of git://git.infradead.org/linux-mvebu:
  ARM: dts: armada: replace isil, irq2-can-wakeup-machine with wakeup-source property
  ARM: dts: enable GPU for SolidRun's Cubox
  ARM: dts: dove: add DT GPU support
  ARM: mvebu: kirkwood: add PogoPlug series 4 device tree
  ARM: mvebu: add kirkwood compatibles for cloudengine boards
  ARM: dts: kirkwood: Add DTS for Zyxel NSA325

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 12:56:14 -08:00
Olof Johansson
0ef917f4fb Renesas ARM Based SoC GIC Cleanup for v4.5
On several Renesas ARM SoCs, the GIC is described in DT as being a
 Cortex A9 GIC, while it's actually a PL390. This is not only stated in
 the documentation, but has been verified by reading the GICD_IIDR
 register.
 
 To correct this:
   1. Update the DT compatible value to match reality,
   2. Update the board staging drivers to match the above.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWc2ANAAoJENfPZGlqN0++e00QAKF5jow6bvOKqM9jckbXHZE8
 +aUJAikdXaSsqrSgUycuAw8VBVHA3XyIIKqmuj1wmyZmdAV4BxDob8pfQqZiTtwy
 TcXJSiycw15eHgOIagCu8vQF+0GGwbAN3BrfX+Q8UddrE47xQDMkkfn23JwD+5oZ
 SbP6ux9MoI0WtUP2LJU6vNjqCpUkKQ189k1Z0QlVnk6xhoX14MnnkiHF9NM39VJU
 7/Lc5Acu4DbgTtdhXFlrpNjll9gTLB/EulrVl6oEY8R73qs8QtfxlQt70e2529UN
 9dPGDzioNz5I00w1hf1+QiJHQ4g+dttJgUOl3hBGkTuAr9ewvd2vmG5XtNZZ2XLb
 sg3fRhU7grTUQM1qpTnAezEqW1XXBx0Qop8w4fidDusJn6DJnA7YKGaWllgEtZKQ
 FQd76g5raLV/P4RMNI/7MK9+KmVN3Rh0O2nZ8zHppKYTvOPj37919LGSKFnH5979
 1Ep3UqY5J5sRT/vmlrfr/eTGRfdnXBd+q8XcJQHCi9o2n33ZMDRTBH56GA1zjHsO
 BUYeerWOl+ECd/w5MFDfrjy0lVO52cmdgmMbzG3+UqQbdISodxnQKUK9DbbNITOg
 HvJptZ1DVXZTm2E6We1nJW/ClyyvVhyojJj9aw4LMGMD3fGSJXX6QZb38+gbM64U
 MvN97VADxhMUWHD+tO/w
 =+GQm
 -----END PGP SIGNATURE-----

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

Renesas ARM Based SoC GIC Cleanup for v4.5

On several Renesas ARM SoCs, the GIC is described in DT as being a
Cortex A9 GIC, while it's actually a PL390. This is not only stated in
the documentation, but has been verified by reading the GICD_IIDR
register.

To correct this:
  1. Update the DT compatible value to match reality,
  2. Update the board staging drivers to match the above.

* tag 'renesas-gic-cleanup-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  staging: board: armadillo800eva: Use "arm,pl390"
  staging: board: kzm9d: Use "arm,pl390"
  ARM: shmobile: r8a7778 dtsi: Use "arm,pl390" for GIC
  ARM: shmobile: emev2 dtsi: Use "arm,pl390" for GIC
  ARM: shmobile: r8a7740 dtsi: Use "arm,pl390" for GIC
  ARM: shmobile: r7s72100 dtsi: Use "arm,pl390" for GIC

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 12:54:04 -08:00
Olof Johansson
0d639e0a65 Third Round of Renesas ARM Based SoC DT Updates for v4.5
* Use SoC-specific usb-dmac and IPMMU compatibility strings
 * Add internal delay for i2c IPs
 * Add missing serial devices to r8a7793
 * Enable DMA for r8a7793 serial devices
 * Add serial port config to chosen/stdout-path
 * Tidyup #sound-dai-cells settings for r8a7798/bockw
 * Remove deprecated #gpio-range-cells from r8a7793
 * Add EtherAVB support to r8a7791
 * Add MSIOF support to sh73a0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWc2HNAAoJENfPZGlqN0++39sP/0oRTGW5rtS1YqDuB6lhf8UN
 kEoXXX2LSyNTw28MqWx4k3ow1zOK8Q75NOgs07pgdSXyIE+2nQgXvVZuq7Piosoe
 jm+tbVkuwXMNjbcJlX7Sx5zsobUZR6pIb46jBaF7gWVi9FVbqm/9xhHxY3mnqlhs
 bXF5FU7VrLH2VVh2OC1SyMPbXQhGEOVxhyhNZq2u+7x0AJfxnZwc7XVHlqO4netn
 emg4BfIAcvcFFc/PBmFeJg48BOf1OJqz0mR2m15k1+J3Uzjq7KZDaV1Ur33h60FT
 cV2rgHj9CdhDev0ri0aqApMPHhkTPeybxjrKqG0B+AtLnP369Nul9Br/HaLXcbDX
 mwoYYoG3VeZR1Zvn0ShNuhjiAq9RjFFyyIO2dpBUNQ3V++irGKFc6PSA9h/SdmwU
 8AJqdXuMdPmdMekWsHpywpVlUD0fksZ1gOivu9YwY5sTvOtOJfFfGKWOX/u6zSsR
 el7fFnypnPg63DT8flCxhkpJQYP5M0GJKOk0eaa6wEzZAf0xuspXpdVHIvyRDbXP
 t+NgUMXWq30bP6ihiQuG7qwhzYcLIGnEbTtsUWQgYu/G4h1lPp9OOCsKM7oSD29n
 ABO5u+xIutjXo6lxw+cehGTeN6V9FFHqs0rafV0lUhVwEmRSZ7g1UhKr64+EPhXW
 NxX/WLeR2kdIU7WCDtNC
 =bncx
 -----END PGP SIGNATURE-----

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

Third Round of Renesas ARM Based SoC DT Updates for v4.5

* Use SoC-specific usb-dmac and IPMMU compatibility strings
* Add internal delay for i2c IPs
* Add missing serial devices to r8a7793
* Enable DMA for r8a7793 serial devices
* Add serial port config to chosen/stdout-path
* Tidyup #sound-dai-cells settings for r8a7798/bockw
* Remove deprecated #gpio-range-cells from r8a7793
* Add EtherAVB support to r8a7791
* Add MSIOF support to sh73a0

* tag 'renesas-dt3-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (25 commits)
  ARM: shmobile: r8a779x: use SoC-specific usb-dmac compatibility strings
  ARM: shmobile: r8a7794: IPMMU compat string SoC part number update
  ARM: shmobile: r8a7793: IPMMU compat string SoC part number update
  ARM: shmobile: r8a7791: IPMMU compat string SoC part number update
  ARM: shmobile: r8a7790: IPMMU compat string SoC part number update
  ARM: shmobile: r8a7794: dtsi: add internal delay for i2c IPs
  ARM: shmobile: r8a7791: dtsi: add internal delay for i2c IPs
  ARM: shmobile: r8a7790: dtsi: add internal delay for i2c IPs
  ARM: shmobile: r8a7793: Describe DMA for the serial ports
  ARM: shmobile: r8a7793: Add missing serial devices to DT
  ARM: shmobile: lager dts: Add serial port config to chosen/stdout-path
  ARM: shmobile: porter dts: Add serial port config to chosen/stdout-path
  ARM: shmobile: silk dts: Add serial port config to chosen/stdout-path
  ARM: shmobile: gose dts: Add serial port config to chosen/stdout-path
  ARM: shmobile: bockw dts: Update console parameters
  ARM: shmobile: ape6evm dts: Add serial port config to chosen/stdout-path
  ARM: shmobile: alt dts: Add serial port config to chosen/stdout-path
  ARM: shmobile: koelsch dts: Add serial port config to chosen/stdout-path
  ARM: shmobile: r8a7778: tidyup #sound-dai-cells settings
  ARM: shmobile: bockw dts: Override #sound-dai-cells to zero
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-12-22 12:52:40 -08:00