42952 Commits

Author SHA1 Message Date
Olof Johansson
64aa1fe183 SoCFPGA dts cleanup for v4.4
- Re-order DTS nodes into correct alphabetical order
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWIQUIAAoJEBmUBAuBoyj0/4EQAJ/qm7dW4n7Ma+rfjKUiXvYl
 KvK7ZOV7Tpou/uEv15LJxSmElGweVdx8que8o7MPOsa6fBj52TSP1YymoeLeblN2
 Ho3TVwSn2GKfUsvREr65UbEIG5MQcwKuC0aR5ReFvcw6YFwr0te6ZmO2xeaDzSau
 +qUmA1YCKGRPWP/vgUZ/bvW0QoR6AM6wlhMzosbDwHFiU5z2+FrV7gb95dyIIC2I
 eSTHWHRMAxFlNKDqy3CDnSV5r9n/5DzNvuuaqe1wmQ+M15KjLb03q+Ro7M3Rd0Vb
 NK8v+ECJH7bhgXRz4SXJqCBOE24mMmQPaG5G8Wu9ugbw0rX9TCyEFBpMDEm4jbnR
 TpAaQCrgMreXd4t44KRLG1uBm6MC9hrKRt4ShnYoMeaP+MuMQShIsbLTpMEpKCJw
 tpH9hC3eWmGHuVQ0KjwazopVRTDNq0Rnbt0C0z7WrYz+0XPpmRJvlOVa1e7BeRdM
 v/N0kzc//NOhrrXhFGUzfgAzlGnTBCTqfgnDmsyo68D+2iTq3yp3JPpM6owZNxQY
 MROlx9v3qv5ZbhqpSHcpjLnG1pB14ZmYGn55clsCUhCp38uciUuw1nJVFXYOBGHz
 L1AtwrjZ+lsNzgNkmsYLcTuuQWRvaakvcz2ri1Vjf+dEmx+Pi1vxcEqwfIGWDJZU
 KiA9aGVItcy4IVZ9uo5i
 =r89u
 -----END PGP SIGNATURE-----

Merge tag 'socfpga_for_v4.4_cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt

SoCFPGA dts cleanup for v4.4
- Re-order DTS nodes into correct alphabetical order

* tag 'socfpga_for_v4.4_cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: dts: sort nodes alphabetically

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-22 10:08:46 -07:00
Olof Johansson
9174455472 SoCFPGA DTS update for v4.4, part 2
- Add the FPGA manager node
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJWIHDcAAoJEBmUBAuBoyj08BoP/ReJ+kYRuyxpfCWzsWxA2Oun
 FJ8vSR6iZf45xyk59yQuJyO7ZKL04FFEGoZvJ6HJVcFCLYIZ2tWZSd3vMUVosy2X
 +rPwD1qj9iK/8mDlniYagnjfIwIkNDQHhtGb9e3alMWh1wQ+IBHbmms2+YhvVpZI
 2rITOKE+lZW+sSpCEv8NahOAT8TydhvO889M1d6Ot5S62Oy3ZRhCGcyTri+2ggg9
 9wyGleCzAZogZYjseSCEYad8SOBZlXXOtV/afmVy0Afkv2GjIAA7MqxdySxLe+9q
 3hsG6jOF5zIk97auzYR6oGjAoqLE+7Hi9sIh2NijKecVCz2w7JQC0hYyBQq3fzjz
 xoN4MivX9TbX12qlviS8HHRhu4ZuTzR40FqV7Kb1qSXEmykxilRaG2P1He5Wxf0d
 vnmr7YKkIzRzrhrPdimLwQ2/MqHjc2zUPQImKFdF4jQHJFGkFpo8TG2PK9j90UKC
 1pQ7qr/LiZxafBu5m5L8RRe4I058hCe9VQD84HnSrxpZpawX/23F4v/K/G1g9C7p
 k8mDTIK00BWScmeRJrluturge5c43b28oNP704EZruZFXX7BYJ/0Z9ui5a1+c5AU
 4NuRGAQVjEK07XxKpp5pgbiEU3MJprrXQ5ovkXr4PS4o7KSJHLrv6WctXyCb/gmS
 CbJamjZqeZZN2etlbf6D
 =nm0g
 -----END PGP SIGNATURE-----

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

SoCFPGA DTS update for v4.4, part 2
- Add the FPGA manager node

* tag 'socfpga_dts_for_v4.4_part_2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: dts: add fpga manager

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-22 10:07:04 -07:00
Stephen Boyd
b96fc2f3c1 ARM: Remove __ref on hotplug cpu die path
Now that __cpuinit has been removed, the __ref markings on these
functions are useless. Remove them. This also reduces the size of
the multi_v7_defconfig image:

$ size before after
   text    data     bss     dec     hex filename
   12683578        1470996  348904 14503478         dd4e36 before
   12683274        1470996  348904 14503174         dd4d06 after

presumably because now we don't have to jump to code in the
.ref.text section and/or the noinline marking is removed.

Cc: Shiraz Hashim <shiraz.linux.kernel@gmail.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: <linux-omap@vger.kernel.org>
Cc: <linux-arm-msm@vger.kernel.org>
Cc: <spear-devel@list.st.com>
Cc: <linux-tegra@vger.kernel.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Barry Song <baohua@kernel.org>
Acked-by: Andy Gross <agross@codeaurora.org>
Acked-by: Viresh Kumar <vireshk@kernel.org>
Acked-by: Thierry Reding <thierry.reding@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Sudeep Holla <sudeep.holla@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-22 09:55:03 -07:00
Sudeep Holla
4db7062c9a ARM: dts: fix gpio-keys wakeup-source property
The keyboard driver for GPIO buttons(gpio-keys) checks for one of the
two boolean properties to enable gpio buttons as wakeup source:
1. "wakeup-source" or
2. the legacy "gpio-key,wakeup"

However juno, ste-snowball and emev2-kzm9d dts file have a undetected
"wakeup" property to indictate the wakeup source.

This patch fixes it by making use of "wakeup-source" property.

Cc: Magnus Damm <magnus.damm@gmail.com>
Acked-by: Simon Horman <horms@verge.net.au>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-22 09:53:57 -07:00
Marc Zyngier
0cc09e8518 ARM: Remove open-coded version of IRQCHIP_DECLARE
Now that the IRQCHIP_DECLARE macro has been moved to linux/irqchip.h,
it becomes possible to cleanup the open-coded versions of the same
macro that have been added to some private irqchips implementations.

Cc: Sascha Hauer <kernel@pengutronix.de>
Acked-by: Kukjin Kim <kgene@kernel.org>
Acked-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: Shawn Guo <shawnguo@kernel.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-22 09:52:49 -07:00
Olof Johansson
9aa2b26bd3 Second Round of Renesas ARM Based SoC Cleanup for v4.4
* Remove now unused legacy pm domain code
 * Add missing of_node_put to pm-rmobile
 * Corresct spelling of interrupt-names in renesas-memory-controller binding
   documentation
 * Correct signdness of CPU id in shmobile apmu implementation
 * Make some functions static as appropriate
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWHvIfAAoJENfPZGlqN0++VqsQAI+fxALXRc+tTii6UQmZJdZ4
 vwHowfz2whPEbbyJfPik5yxL4/hhIaIt+xkRcheSQlF4GXrgXOKxFDio1+a0j6JA
 hduM4UfAsA1FZ8ANA+9oGitqmvtz4mibNZHsQ7OyS7qas35TBJo1PfuLUoNGrewz
 OqntlgY/wgw+Xrcc6YXxKx7OYTk8DEAx0ptd8szJL6/f67WWuDvf8sO7U5DwMBF1
 7Ygb0dujW5e7bIIPFim4dZBwJPdhTZ8jJle0N4E/IvpGnVL+po3JaK4fD3ThcGa6
 CpBrl1Uxhm4P1Zv/HNHsuwdddWRI0TzuvxC/mQz6M7ACQo6GVExoizUJVKrYGMyX
 xMTK0N009dC7zWh7Ceg0jTzoXHmdb3sHfaZ5fsGnaXnB31+bCWVOeltNxUm+WxoC
 1smSAWdXrc82d8CXghm4QvcVO2bGcW+t3IFTWCGt+JCQhNRbQN8XHIu5JtInBFvr
 B98bDVTJBI0uZIjID8ohkMQcDUoejJNIloxUKnyn2bCeq/VNU7+WFssNbqsW6SEt
 2NUdP89R4TrhWBtgbzIfphQKQ37llM/mtyIrlZz/tjuqRm6bkCFG5qTr0GqChNQL
 8zo1ETyWiuE2tSm6trQPx/HgAPqsnW60gDuQUyV+QPyOJCQnuRFbglEdQ3cXu03q
 wpVz9ttMdAAxIhOCWKRB
 =XNZw
 -----END PGP SIGNATURE-----

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

Second Round of Renesas ARM Based SoC Cleanup for v4.4

* Remove now unused legacy pm domain code
* Add missing of_node_put to pm-rmobile
* Corresct spelling of interrupt-names in renesas-memory-controller binding
  documentation
* Correct signdness of CPU id in shmobile apmu implementation
* Make some functions static as appropriate

* tag 'renesas-cleanup2-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: R-Mobile: add missing of_node_put
  ARM: shmobile: dt: Rename incorrect interrupt related binding
  ARM: shmobile: apmu: correct type of CPU id
  ARM: shmobile: r8a7779: Remove legacy PM Domain remainings
  ARM: shmobile: r8a7778: Make r8a7778_init_irq_dt() static
  ARM: shmobile: smp: Make shmobile_smp_apmu_cpu_shutdown() static

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-22 09:48:02 -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
Hans de Goede
336263770f ARM: dts: sun4i: Add dts file for the pov protab2-ips9 tablet
The Point of View protab2-ips9 is a tablet with a 9" ips 1024x768 lcd screen,
microsd slot, headphones, mini hdmi, mini usb b and power barrel connectors.

It uses a rtl8188cus usb wifi chip and a RDA 5875Y bluetooth chip attached
to uart2. It has a bma250 accelerometer attached to i2c1 addr 0x18, this
only works when ldo3 is set to 2.8 volt, otherwise i2c1 gets stuck, so
for now we mark i2c1 as failed.

It has a pixcir,pixcir_tangoc compatible touchscreen attached to i2c2 addr
0x5c. This is not enabled in this dts, because this variant of the
pixcir_tangoc has separate wakeup and enable pins both of which need
to be driven low before the touchscreen will work. Before we can enable
this the pixcir driver and devicetree-bindings need to be extended to
support these pins.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-10-22 10:58:12 +02:00
Chen-Yu Tsai
39efe82a02 ARM: sun4i: Enable cubieboard audio codec
The cubieboard uses the internal codec to output sound to its mini-jack.
Enable it.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-10-22 10:57:19 +02:00
Maxime Ripard
e54693ed82 ARM: sun5i: chip: Enable the audio codec
The CHIP v0.2 has a composite output on a mini-jack connector, the audio
part being provided by the on-SoC codec. Enable it.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-22 10:55:53 +02:00
Marcus Cooper
bc8362e6ec ARM: sun4i: Enable audio-codec on Mele A1000
Enable the audio-codec on the Mele A1000 top-set box.

Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-22 10:55:52 +02:00
Maxime Ripard
4d6b0f8e86 ARM: sun7i: Enable cubieboard2 audio codec
The cubieboard2 uses the internal codec to output sound to its mini-jack.
Enable it.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-22 10:55:47 +02:00
Emilio López
faef4af445 ARM: sun7i: dt: enable audio codec on Cubietruck
This commit enables the on-chip audio codec present on the A20 SoC
for the Cubietruck.

Signed-off-by: Emilio López <emilio@elopez.com.ar>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-22 10:55:33 +02:00
Vivien Didelot
844338e5a4 ARM: gemini: remove unnecessary mdio-gpio includes
Remove the inclusion of linux/mdio-gpio.h in nas4220b, wbd111 and wbd222
boards since mdio-gpio is not used.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-21 19:50:43 -07:00
Stephen Boyd
f63d19ef52 Merge branch 'clk-iproc' into clk-next
* clk-iproc:
  clk: iproc: define Broadcom NS2 iProc clock binding
  clk: iproc: define Broadcom NSP iProc clock binding
  clk: ns2: add clock support for Broadcom Northstar 2 SoC
  clk: iproc: Separate status and control variables
  clk: iproc: Split off dig_filter
  clk: iproc: Add PLL base write function
  clk: nsp: add clock support for Broadcom Northstar Plus SoC
  clk: iproc: Add PWRCTRL support
  clk: cygnus: Convert all macros to all caps
  ARM: cygnus: fix link failures when CONFIG_COMMON_CLK_IPROC is disabled
2015-10-21 17:28:19 -07:00
Arnd Bergmann
1e9bc9d636 ARM: cygnus: fix link failures when CONFIG_COMMON_CLK_IPROC is disabled
When CONFIG_CYGNUS is set but CONFIG_COMMON_CLK_IPROC is disabled, the
following link failures are caused:

drivers/built-in.o: In function `cygnus_armpll_init':
:(.init.text+0x1d290): undefined reference to `iproc_armpll_setup'
drivers/built-in.o: In function `cygnus_genpll_clk_init':
:(.init.text+0x1d2c4): undefined reference to `iproc_pll_clk_setup'
drivers/built-in.o: In function `cygnus_lcpll0_clk_init':
:(.init.text+0x1d304): undefined reference to `iproc_pll_clk_setup'
drivers/built-in.o: In function `cygnus_mipipll_clk_init':
:(.init.text+0x1d344): undefined reference to `iproc_pll_clk_setup'
drivers/built-in.o: In function `cygnus_asiu_init':
:(.init.text+0x1d370): undefined reference to `iproc_asiu_setup'

It is fixed it by always selecting COMMON_CLK_IPROC from
ARCH_BCM_IPROC, and making COMMON_CLK_IPROC a silent option (thus
preventing it from being erroneously disabled by a user).

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jon Mason <jonmason@broadcom.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2015-10-21 16:52:57 -07:00
Felipe Balbi
55ee7017ee arm: omap2: board-generic: use omap4_local_timer_init for AM437x
AM437x-based boards, can use omap4_local_timer_init()
just fine. Let's use that instead.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-10-21 16:30:19 -07:00
Emilio López
d5ce107a2f ARM: sun7i: Add sunxi codec device node
The A20 SoC includes the Allwinner audio codec, capable of both 24-bit
playback and capture. This commit adds a device node for it.

Signed-off-by: Emilio López <emilio@elopez.com.ar>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-21 22:43:28 +02:00
Maxime Ripard
44cdcfc2d9 ARM: sun5i: Add the Audio codec DT node
The A13 and A10s also have the audio codec present. List it in the device
tree.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-21 22:43:27 +02:00
Marcus Cooper
bcf884504b ARM: sun4i: Add sunxi codec device node
The A10 SoC includes the Allwinner audio codec, capable of both 24-bit
playback and capture. This commit adds a device node for it.

Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-21 22:43:27 +02:00
Maxime Ripard
dbe4dd1e61 ARM: sun7i: Add audio codec clock
The audio codec functional clock is a child of PLL2 and is used to control
the audio rate, enable it in the DT.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-21 22:43:26 +02:00
Maxime Ripard
ca72f02237 ARM: sun5i: Add audio codec clock
The audio codec functional clock is a child of PLL2 and is used to control
the audio rate, enable it in the DT.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-21 22:43:26 +02:00
Maxime Ripard
b516fa5def ARM: sun4i: Add audio codec clock
The audio codec functional clock is a child of PLL2 and is used to control
the audio rate, enable it in the DT.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-21 22:43:25 +02:00
Maxime Ripard
88a86aaa61 ARM: sun7i: Add audio PLL
The A20 uses the PLL2 as the audio PLL, which is the parent of all the
other audio clocks in the system (i2s, codec, etc.). Add it to the DTSI.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-21 22:43:25 +02:00
Maxime Ripard
6f87abb8cd ARM: sun5i: Add audio PLL
The A13 uses the PLL2 as the audio PLL, which is the parent of all the
other audio clocks in the system (i2s, codec, etc.). However, it has a
different divider configuration than the A10, hence the difference
compatible.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-21 22:43:24 +02:00
Maxime Ripard
6ee93e127f ARM: sun4i: Add audio PLL
The A10 uses the PLL2 as the audio PLL, which is the parent of all the
other audio clocks in the system (i2s, codec, etc.). Add it to the DTSI.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
2015-10-21 22:43:24 +02:00
Paolo Bonzini
ad355e383d A late round of KVM/ARM fixes for v4.3-rc7, fixing:
- A bug where level-triggered interrupts lowered from userspace
    are still routed to the guest
  - A memory leak an a failed initialization path
  - A build error under certain configurations
  - Several timer bugs introduced with moving the timer to the active
    state handling instead of the masking trick.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEbBAABAgAGBQJWJmf7AAoJEEtpOizt6ddy35UH+NCAt1AInvQajAB1rzXzFSYh
 v9PQ5zJ7ZlP8M3HFYjerSl0HrGbi2Cwij5KYE+UAQkXIzCTTdDeB9TUSI/GYQ82M
 axel8Ob3deELp03nS5I+gP1NGX3HPDz445grScg7yl1lMs3uDy4viDDM8Vm8+HUX
 zZWGpDRHNW3b0myS5NVJvOP7Sm5t7DqklsNScZ04Nut7V8gYEUqEu+ZNKerIZkKn
 LrJUVYqqZf33bf6pWle95QZuNQtg84kion3qwWaNl+/8jFkAA8CODyvzar9VMHpf
 xA0xUkK1ERZ+hw2n0/BIgCxI4lXvROAx0YpZKnSMgEU5E5p5gGZYqlHCw8r1Rw==
 =VQSu
 -----END PGP SIGNATURE-----

Merge tag 'kvm-arm-for-v4.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master

A late round of KVM/ARM fixes for v4.3-rc7, fixing:
 - A bug where level-triggered interrupts lowered from userspace
   are still routed to the guest
 - A memory leak an a failed initialization path
 - A build error under certain configurations
 - Several timer bugs introduced with moving the timer to the active
   state handling instead of the masking trick.
2015-10-21 17:46:56 +02:00
Arnd Bergmann
55f4129757 mvebu fixes for 4.3 (part 2)
Fix wrong compatible for A385 DB AP preventing using suspend
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYhNEwACgkQCwYYjhRyO9XX9gCgnabcvdHrfFqAD3IFICLCgkOM
 U1AAnReiDUjcUhz6oTl6I2+e3PLHY7RO
 =BkFw
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-fixes-4.3-2' of git://git.infradead.org/linux-mvebu into fixes

Merge "mvebu fixes for 4.3 (part 2)" from Gregory CLEMENT:

Fix wrong compatible for A385 DB AP preventing using suspend

* tag 'mvebu-fixes-4.3-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: correct a385-db-ap compatible string
2015-10-21 17:03:37 +02:00
Arnd Bergmann
0690f4f2ef Samsung 2nd fixes for v4.3
- fix SOC detection of exynos thermal on exynos5260
 - fix audio card detection on Peach boards
 - fix double of_node_put() when parsing child power domains
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJWIYd6AAoJEA0Cl+kVi2xqgzAQAIoCxYnhMr8I1kiJwFaZ3AKT
 r28RFw1rAhD+u344/5uuMwkJdl15+ubXf/g0uCLSmXwSKeQgJdXfidYEhTpd4OUw
 iVT+F+J8U7z3SaIymEdHp3ACUiU3eb1cW3AfrCU5FPwdVfnvyE7Fp7XPdE9w7GX4
 fMs+qi5BbJP02jO+rHAc2HHHdylSQu5JH0HPIOgBCQVVLQzhs79E5LcrvF0DXc2d
 WmZ+14S/Hc+/heiqc6wGQ75fDdPOGMj8ISo5sx+G0TyCz0r2FXR+yDRrXwCESTtn
 DD7CeQ8GdHT5fUiylU7y0+75h8/i3mNav9+fqF33BcpnGe8LAcB9Q/rDemw9irWp
 baGArheUjeWsql8qVbb7SeOZdzxAHT8QUs+AAxcrxBmv+4yWGhBdvVQfMKVhVcoP
 glnYpxRs1FsODVSfQ4Wp25U4PY49iOB+oND86HkmOZdQI5VrnzxPH1i5nKKRbXB7
 ZjidX3IVuiJtXFcB2ybd5VLzD7Xe6mJE0jYG264u0oXm5IFXXh+dHnDy2fqCJ9OY
 Y0HZX/EOwbDh93H/E3xqItPnWKFW5pp17wG1kIV7pm07d1TQPDjT0D8SLcF37+TW
 X622hnU5D16+qa8mNq+CyG0DZQUteNAi4yf9WiKIswbmW2n581dlmRJpVjlfY90z
 l8AwHcVTybMV1/v8fAmb
 =J4IA
 -----END PGP SIGNATURE-----

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

Merge "Samsung 2nd fixes for v4.3" from Kukjin Kim:

- fix SOC detection of exynos thermal on exynos5260
- fix audio card detection on Peach boards
- fix double of_node_put() when parsing child power domains

* tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  thermal: exynos: Fix register read in TMU
  ARM: dts: Fix audio card detection on Peach boards
  ARM: EXYNOS: Fix double of_node_put() when parsing child power domains
2015-10-21 17:02:13 +02:00
Arnd Bergmann
6701ef0318 Fixes for omaps for v4.3-rc cycle:
- Fix oops with LPAE and moew than 2GB of memory by enabling
   ZONE_DMA for LPAE. Probably no need for stable on this one as we
   only recently ran into this with the mainline kernel
 
 - Fix imprecise external abort caused by bogus SRAM init. This affects
   dm814x recently merged, so no need for stable on this one AFAIK
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWJnm9AAoJEBvUPslcq6VzJHMP/i8DVa6R3OwssmGS3Cp/XKPV
 m1GCXReauql0oUfFR0baiVnBKL6x8jEHW91iQeV3b3cUz+8l3jL7Q4yc+voPyjHz
 ud890cId4wP54PWtDo4lpzDKi3lQkGBI+zJVAyWLfNPt97xcTh1yXW2HdDQ2Hlf4
 nyksDKI1CE42h22l5odB9i0yf7Y/XXl8CYl0ZggHV1XReKSZGveTf8+Qcd1uME2s
 ovLoxEOHDsmxwERXxeSw7Vw4MwefCBdXhKZf1a6l++/pyD/HqWNpJqpS+VEX4yaw
 9ZGT5wmTZQXzzAx60bfO9kokFaKzKiae1UYZusR1aoEKKvFwh8+7ziTTv5q8Do+s
 PRaeczB0tJA9OniwZaZEHNyckMgLlReH3PH5mwYV9DNNnG4LWRDjsx8LWDZ7lcjL
 HxvDjbB6Ir51jGCxa4GVH0NZy0NZ+UHFTMv6bgiEc3uO4PMu35syDXfLws4VJWXZ
 jC4bR2ShUbrAaGQj8R4aYQFus2MzXu58eqwceDGqeuf9M+wn10IO0/OaAXg5oPhk
 TfqB/6+yC8GjyWyRaKV7PrgJKsqcm4S9P2WCuZL+lU5GgnfSrFTb1+OBQl4BQFXD
 89Mj/oYOoKQd3qQFmsk2ZKwRqT9kLixKvih0bvkos4saOJipW2aNpLBTwNpQEpRk
 N9J0CUyn/p1tQEBVCJj5
 =EP6s
 -----END PGP SIGNATURE-----

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

Merge "Fixes for omaps for v4.3-rc cycle" from Tony Lindgren:

- Fix oops with LPAE and moew than 2GB of memory by enabling
  ZONE_DMA for LPAE. Probably no need for stable on this one as we
  only recently ran into this with the mainline kernel

- Fix imprecise external abort caused by bogus SRAM init. This affects
  dm814x recently merged, so no need for stable on this one AFAIK

* tag 'omap-for-v4.3/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Fix imprecise external abort caused by bogus SRAM init
  ARM: OMAP2+: Fix oops with LPAE and more than 2GB of memory
2015-10-21 17:01:14 +02:00
Javier Martinez Canillas
e9a267702d ARM: dts: am335x-base0033: Use IOPAD pinmux macro
Use the AM33XX pinmux IOPAD macro to define the physical address instead
of the offset from the padconf address. It makes the DTS easier to read
since matches the addresses listed in the Technical Reference Manual.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-10-20 09:28:04 -07:00
Javier Martinez Canillas
8a3ecb217f ARM: dts: am335x-igep0033: Use IOPAD pinmux macro
Use the AM33xx pinmux IOPAD macro to define the physical address instead
of the offset from the padconf address. It makes the DTS easier to read
since matches the addresses listed in the Technical Reference Manual.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-10-20 09:28:04 -07:00
Javier Martinez Canillas
fd20719443 ARM: dts: omap3-igep0020: Use IOPAD pinmux macro
Use the OMAP3 pinmux IOPAD macro to define the physical address instead
of the offset from the padconf address. It makes the DTS easier to read
since matches the addresses listed in the Technical Reference Manual.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-10-20 09:28:04 -07:00
Vignesh R
f513d22c9c ARM: dts: am437x-gp-evm: Add wakeup interrupt source for pixcir_i2c_ts
On am437x-gp-evm, pixcir_i2c_ts can wakeup the system from low power
state via pinctrl and IO daisy chain using generic wakeirq framework.
With commit 3fffd1283927 ("i2c: allow specifying separate wakeup
interrupt in device tree") i2c core allows optional wakeirq to be
specified via device tree. Add wakeup irq entry to enable pixcir_i2c_ts
to wake the system from low power state.

Signed-off-by: Vignesh R <vigneshr@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-10-20 09:28:04 -07:00
Javier Martinez Canillas
56a31e549e ARM: dts: Update Javier Martinez Canillas's email
I see that people are still sending emails to my old address (that no
longer exists) since is the one mentioned in the IGEP DTS. Replace it
with my current email address to avoid this.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-10-20 09:28:04 -07:00
Mugunthan V N
36958598b7 ARM: dts: dra72-evm: remove cpsw gpio hogging and add mode-gpios
With the current implementation of GPIO hogging and with
gpio-pcf857x is built as module, ethernet doesn't work on boot
and doesn't throw any error/warning to user. Ethernet becomes
operational when inserting gpio-pcf857x module, even this time
there is no error/warning logs to user that ethernet is
operational.

When using with NFS rootfs and gpio-pcf857x as module, board
doesn't boot as it doesn't get any ip address and doesn't throw
any error/warning. To over come this, now cpsw driver tries to
get mode-gpios. When gpio-pcf857x is built as module it will
throw error, so that user can decide either to built in
gpio-pcf857x to continue with nfs boot or choose alternate rootfs
filesystem like sd/ramdisk.

When using mmc/ramdisk as root fs, cpsw will probe defer and
re-probes again when gpio-pcf857x module is inserted and ethernet
becomes operational.

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-10-20 09:16:21 -07:00
Arnd Bergmann
4a5d69b739 KVM: arm: use GIC support unconditionally
The vgic code on ARM is built for all configurations that enable KVM,
but the parent_data field that it references is only present when
CONFIG_IRQ_DOMAIN_HIERARCHY is set:

virt/kvm/arm/vgic.c: In function 'kvm_vgic_map_phys_irq':
virt/kvm/arm/vgic.c:1781:13: error: 'struct irq_data' has no member named 'parent_data'

This flag is implied by the GIC driver, and indeed the VGIC code only
makes sense if a GIC is present. This changes the CONFIG_KVM symbol
to always select GIC, which avoids the issue.

Fixes: 662d9715840 ("arm/arm64: KVM: Kill CONFIG_KVM_ARM_{VGIC,TIMER}")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2015-10-20 18:04:49 +02:00
Pavel Fedin
399ea0f6bc KVM: arm/arm64: Fix memory leak if timer initialization fails
Jump to correct label and free kvm_host_cpu_state

Reviewed-by: Wei Huang <wei@redhat.com>
Signed-off-by: Pavel Fedin <p.fedin@samsung.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2015-10-20 18:04:48 +02:00
David S. Miller
26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-20 06:08:27 -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
Thierry Reding
481b4f1a3f ARM: tegra: Use consistent indentation for SATA node
The indentation for properties in the SATA device tree node on Tegra124
deviates from the rest of the device tree file. Restore consistency and
get rid of a couple of gratuitous blank lines while at it.

Signed-off-by: Thierry Reding <treding@nvidia.com>
2015-10-20 13:51:52 +02:00
Will Deacon
6e490b0106 ARM, locking/atomics: Implement _relaxed variants of atomic[64]_{inc,dec}
Now that the core code supports acquire/release/relaxed versions of
the atomic_inc family, implement only the _relaxed flavours in the ARM
backend so that we get all of the others for free.

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Davidlohr Bueso <dbueso@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1444227038-12533-1-git-send-email-will.deacon@arm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2015-10-20 10:17:23 +02:00
Ingo Molnar
a1a2ab2ff7 Linux 4.3-rc6
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJWJCaDAAoJEHm+PkMAQRiGvJQH/jGlxawu+mnNFjIRXmk8Zucq
 cxDVTPnQ4S1DJMyRSQTqe6ccDgDM/TEISJPZ0Gwc2SQLda27zdQiz05upbqHSPSH
 /FUHMKiMRhhIBOzdfEGR4Ry2YZID+DlG5EWCgRKf/GlgY3STZSpjIBPYd3Rl3zsU
 qragNjtbCE6eUpnLwkv40Q2mzzR3/fZxJ0drgE/QiSF8P0VmvVbrcQMF58vnUQgy
 9URp48mLhmKj+IrElSnvXMG0XLrKn1tRYXGXd3w+x1Nlr//SHYsIuQHUcp6SAVQh
 p2HXLL7eoy8rs45MCiOfXG7VgNWF6HFjVMtrNUcNfgBsLCx0qFMVrKIILrGtKh0=
 =ETze
 -----END PGP SIGNATURE-----

Merge tag 'v4.3-rc6' into locking/core, to pick up fixes before applying new changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2015-10-20 10:16:46 +02:00
Franklin S Cooper Jr
0fd5eba575 ARM: DRA7/AM335x/AM437x: hwmod: Remove elm address space from hwmod data
ELM address information is provided by device tree. No longer need
to include this information within hwmod.

Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
Acked-by: Roger Quadros <rogerq@ti.com>
[paul@pwsan.com: fixed chip names in subject line; dropped the OMAP4 section
 since the OMAP4 SoC DTS file doesn't have the ELM address space documented
 yet]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
2015-10-20 01:31:56 -06:00
Javier Martinez Canillas
10b294b3dc ARM: OMAP: Remove duplicated operand in OR operation
Commit b483a4a5a711 ("ARM: OMAP4+: hwmod data: Don't prevent RESET of
USB Host module") added the SYSC_HAS_RESET_STATUS flag to both OMAP4
and OMAP5 USB host module hwmon sysconfig but that flag was already
set for OMAP5. So now the flag appears twice in the expression.

make coccicheck complains with the following message:

omap_hwmod_54xx_data.c:1846:37-58: duplicated argument to & or |

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
2015-10-20 01:29:40 -06:00
Patrick Doyle
5fcf8d1a0e ARM: at91: pm: at91_pm_suspend_in_sram() must be 8-byte aligned
fncpy() requires that the source and the destination are both 8-byte
aligned.

Signed-off-by: Patrick Doyle <pdoyle@irobot.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Fixes: d94e688cae56 ("ARM: at91/pm: move the copying the sram function to the sram initialization phase")
Cc: <stable@vger.kernel.org> # 4.1+
2015-10-19 22:58:44 +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